diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..23e0ad7f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.DS_Store
+*.jar
+*.jnilib
+bin/
+target/
+.*
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2544679e..00000000
--- a/Makefile
+++ /dev/null
@@ -1,263 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: Makefile,v 1.19 2008/04/17 20:06:22 rzr Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: rzr $
-#licence: LGPL-2.1
-#------------------------------------------------------------------------------
-default: build
-
-PACKAGE?=tuxguitar
-
-JNI_OS?=linux
-JAVA_HOME?=/usr/lib/jvm/java-6-sun/
-JAVA_VERS?=1.4
-
-ITEXT_JAR?=/usr/share/java/itext.jar
-
-SWT_JAR?=$(shell echo ` \
-    ( t=/usr/share/java/swt.jar && test -r "$$t" && echo $$t ) \
- || ( t=/usr/lib/java/swt.jar && test -r "$$t" && echo $$t ) \
- || ( t=/usr/lib/java/swt-gtk-3.5.1.jar && test -r "$$t" && echo $$t ) \
- || ( t=/usr/lib/java/swt-gtk-3.5.jar && test -r "$$t" && echo $$t ) \
- || ( t=/etc/alternatives/swt.jar && test -r "$$t" && echo $$t ) \
-` )
-SWT_PATH?=${SWT_JAR}
-
-PACKAGE_JAR?=${CURDIR}/TuxGuitar/${PACKAGE}.jar
-TUXGUITAR_PATH?=${PACKAGE_JAR}
-
-PACKAGE_EXEC?=${CURDIR}/misc/${PACKAGE}.sh
-
-JNILIB_SUFFIX?=.so
-JNILIB_PREFIX?=lib
-
-subdirs?=\
- TuxGuitar \
- TuxGuitar-compat \
- TuxGuitar-ascii \
- TuxGuitar-gtp \
- TuxGuitar-musicxml \
- TuxGuitar-ptb \
- TuxGuitar-tef \
-\
- TuxGuitar-pdf \
- TuxGuitar-midi \
- TuxGuitar-tray \
- TuxGuitar-lilypond \
-\
- TuxGuitar-jsa \
-\
- TuxGuitar-converter \
- TuxGuitar-community \
- TuxGuitar-tuner \
-#}subdirs
-
-subdirs_jni?=\
- TuxGuitar-alsa \
- TuxGuitar-oss \
- TuxGuitar-fluidsynth \
- TuxGuitar-jack \
- #}subdirs_jni
-
-#
-export PACKAGE_JAR
-###
-
-out_java?=\
- ./TuxGuitar/tuxguitar.jar \
- ./TuxGuitar-compat/tuxguitar-compat.jar \
- ./TuxGuitar-lilypond/tuxguitar-lilypond.jar \
- ./TuxGuitar-midi/tuxguitar-midi.jar \
- ./TuxGuitar-gtp/tuxguitar-gtp.jar \
- ./TuxGuitar-pdf/tuxguitar-pdf.jar \
- ./TuxGuitar-tef/tuxguitar-tef.jar \
- ./TuxGuitar-ascii/tuxguitar-ascii.jar \
- ./TuxGuitar-tray/tuxguitar-tray.jar \
- ./TuxGuitar-ptb/tuxguitar-ptb.jar \
- ./TuxGuitar-musicxml/tuxguitar-musicxml.jar \
- ./TuxGuitar-converter/tuxguitar-converter.jar \
- ./TuxGuitar-community/tuxguitar-community.jar \
- ./TuxGuitar-tuner/tuxguitar-tuner.jar \
- #}out_java
-
-out_jsa?=TuxGuitar-jsa/tuxguitar-jsa.jar
-
-out_sun?=\
- TuxGuitar-library-ftp/tuxguitar-browser-ftp.jar \
- TuxGuitar-library-http/tuxguitar-library-http.jar \
- #}out_sun
-
-out_linux?=\
- ./TuxGuitar-alsa/tuxguitar-alsa.jar \
- ./TuxGuitar-alsa/jni/libtuxguitar-alsa-jni.so \
- ./TuxGuitar-oss/tuxguitar-oss.jar \
- ./TuxGuitar-oss/jni/libtuxguitar-oss-jni.so \
- ./TuxGuitar-fluidsynth/tuxguitar-fluidsynth.jar \
- ./TuxGuitar-fluidsynth/jni/libtuxguitar-fluidsynth-jni.so \
- ./TuxGuitar-jack/tuxguitar-jack.jar \
- ./TuxGuitar-jack/jni/libtuxguitar-jack-jni.so \
- #}out_linux
-
-out_windows?=TuxGuitar-winmm/tuxguitar-winmm.jar
-
-out_macos?=TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar
-
-#all?=${out_java} out_${JNI_OS} ${out_jsa} ${out_sun}  # TODO
-all?=${out_java} ${out_${JNI_OS}} ${out_jsa}
-
-###
-
-ANT_FLAGS?=\
- -Dpath.tuxguitar="${PACKAGE_JAR}" \
- -Dpath.itext="${ITEXT_JAR}" \
- -Dpath.swt="${SWT_JAR}" \
- -Dlib.swt.jar="${SWT_JAR}" \
- -Ddist.version="java" \
- -Ddist.file="NOT_EXISTENT_FILE" \
- -Dant.build.javac.source=${JAVA_VERS} \
- -Dant.build.javac.target=${JAVA_VERS} \
- -Dbuild.jni.library.dir=. \
- -Dbuild.jni.library.extension=${JNILIB_SUFFIX} \
- -Dbuild.jni.library.prefix=${JNILIB_PREFIX} \
- -lib ${CURDIR}/TuxGuitar \
- #}ANT_FLAGS
-
-CFLAGS?=\
- -I$(shell gcj -print-file-name=include/)
-
-CFLAGS+= \
--I${JAVA_HOME}/include/ \
--I${JAVA_HOME}/include/${JNI_OS}
-
-MAKE_FLAGS+=\
- SWT_PATH=${SWT_PATH} \
- JAVA_HOME=${JAVA_HOME} \
- JNILIB_SUFFIX=${JNILIB_SUFFIX} \
- JNILIB_PREFIX=${JNILIB_PREFIX} \
- CFLAGS=${CFLAGS}
- #} MAKE_FLAGS
-
-PREFIX?=${DESTDIR}/usr
-INSTALL_BIN_DIR?=${PREFIX}/bin/
-INSTALL_LIB_DIR?=${PREFIX}/lib/jni/
-INSTALL_DOC_DIR?=${PREFIX}/share/${PACKAGE}/doc/
-INSTALL_SHARE_DIR?=${PREFIX}/share/${PACKAGE}/
-INSTALL_JAR_DIR?=${INSTALL_SHARE_DIR}/
-
-build: help all
-
-rebuild: clean fix build
-
-all: ${all}
-
-all-java: ${out_java}
-
-all-linux: ${out_linux}
-
-all-sun: ${out_sun}
-
-%.jar:
-	cd ${@D} && ant -v -d ${ANT_FLAGS} all
-
-%.so:
-	${MAKE} -C ${@D}/../jni/ ${@F}
-
-#%.native:
-#	 make -C $$t  ${MAKE_FLAGS} library_jni
-
-subdirs: ${subdirs}
-	for t in $^ ; do \
-	 cd "${CURDIR}/$$t" && ant -v -d ${ANT_FLAGS} build ; \
-	done
-
-fix: overide
-
-overide: COPYING
-
-COPYING: TuxGuitar
-	-@cp -a $</doc/LICENSE ./COPYING
-	-@cp -a $</doc/LICENSE ./
-	-@cp -a $</doc/CHANGES ChangeLog
-	-@cp -a $</doc/README ./
-	-@cp -a $</doc/AUTHORS ./
-
-install: ${all}
-	-install -d ${PREFIX}
-	-install -d ${INSTALL_BIN_DIR}
-	-install -d ${INSTALL_JAR_DIR}
-	-install -d ${INSTALL_SHARE_DIR}
-	-install -d ${INSTALL_DOC_DIR}
-#	-install -m 755 ./TuxGuitar/${PACKAGE} ${INSTALL_BIN_DIR}/${PACKAGE}
-	-install -m 644 ${PACKAGE_JAR} ${INSTALL_JAR_DIR}/${PACKAGE}.jar
-	install -d ${INSTALL_BIN_DIR}
-	mkdir -p  ./TuxGuitar/share/plugins/
-	for t in ${subdirs} ; do cp $$t/*.jar ./TuxGuitar/share/plugins/ ; done
-#	-find . -iname "*.jar" -exec cp {} ./TuxGuitar/share/plugins/ \;
-	cp -rfa ./TuxGuitar/doc/* ${INSTALL_DOC_DIR}/
-#	cp -rfa ./TuxGuitar/share/* ${INSTALL_SHARE_DIR} # TODO
-	cp -rfa ./TuxGuitar/share/help ${INSTALL_SHARE_DIR} # TODO
-	cp -rfa ./TuxGuitar/share/lang ${INSTALL_SHARE_DIR} # TODO
-	cp -rfa ./TuxGuitar/share/scales ${INSTALL_SHARE_DIR} # TODO
-	cp -rfa ./TuxGuitar/share/skins ${INSTALL_SHARE_DIR} # TODO
-	-cp -a misc/${PACKAGE}.tg ${INSTALL_SHARE_DIR} # TODO
-	-install -T ${PACKAGE_EXEC} ${INSTALL_BIN_DIR}/${PACKAGE}
-#	-${MAKE} install-jni
-
-install-linux:
-	install -d ${INSTALL_LIB_DIR}
-	install -s TuxGuitar*/jni/lib*.so ${INSTALL_LIB_DIR}
-
-clean:
-	find . -iname "*.class" -exec rm -fv "{}" \;
-	find . -iname "*.jar" -exec rm -fv "{}" \;
-	find . -iname "*.jnilib" -exec rm -fv "{}" \;
-	find . -iname "*.o" -exec rm -fv "{}" \;
-	find . -iname "*.so" -exec rm -fv "{}" \;
-	find . -type l -exec rm -fv "{}" \;
-	rm -rf TuxGuitar/tmp
-
-run: ${PACKAGE_EXEC}
-	cd ./TuxGuitar && APP_HOME=. ; ${SHELL} $<
-
-test: ${PACKAGE_EXEC}
-	cd TuxGuitar && APP_HOME=. ; \
-	 export PACKAGE_CLASSPATH="${PACKAGE_JAR}:." ;\
-	 DEBUG=1 ${SHELL} $< --version
-
-help:
-	@echo "# JAVA_HOME=${JAVA_HOME}"
-	@echo "# JAVA=${JAVA}"
-	@echo "# JAVAC=${JAVAC}"
-	@echo "# SWT_JAR=${SWT_JAR}"
-	-which javac
-	-which java
-#	java -version
-
-version?=$(shell date +%Y%m%d)
-scmroot?=https://${PACKAGE}.svn.sourceforge.net/svnroot/${PACKAGE}/trunk
-
-package_version?=0.0.${version}
-snapshot_dir?=${PACKAGE}-snapshot-${package_version}
-release_dir?=${PACKAGE}-${package_version}
-
-dist tarball: snapshot
-
-
-snapshot: ../${snapshot_dir}.tar.gz
-
-../${snapshot_dir}.tar.gz: ../${snapshot_dir}
-	cd ${@D} && tar czf ${@F}.tar.gz \
-	 --exclude="debian" \
-	 ${@D}
-
-release:  ../${release_dir}.tar.gz
-
-../${release_dir}.tar.gz: ../${release_dir}
-	cd ${@D} && tar czf ${@F}.tar.gz \
-	 --exclude="debian" --exclude "CVS" --exclude ".svn"\
-	 ${@D}
-
-../${snapshot_dir} ../${release_dir}:
-	svn co ${scmroot} $@
-
-#eof "$Id: Makefile,v 1.19 2008/04/17 20:06:22 rzr Exp $"
diff --git a/README b/README
deleted file mode 100644
index 50983423..00000000
--- a/README
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION:
-TuxGuitar is a multitrack tablature editor and player written in Java-SWT.
-
-LICENSE:
-TuxGuitar is released under the GNU Lesser General Public License.
-
-REQUIREMENTS:
-Java Runtime Environment 1.4.X or later installed in your system.
-
-PROBLEMS:
-
-    * SWT:
-
-If you see an error like "java.lang.UnsatisfiedLinkError", you will need to replace your swt shared library files and jar 
-packages compiled for your system. TuxGuitar comes with SWT for linux-x86, linux-x86_64, mac and win32-x86. make sure download 
-the correct file. if you need another version, download your SWT and replace in lib folder.             
-If you don't have SWT installed in one of this locations: /lib, /usr/lib, /usr/local/lib or TuxGuitar/lib.  You will need to 
-add its path to the LD_LIBRARY_PATH and CLASSPATH environment vars.
-
-Export LD_LIBRARY_PATH and CLASSPATH:
-$export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/your_swt_library_folder/
-$export CLASSPATH=$CLASSPATH:/your_swt_library_folder/swt.jar
-$/home/user/TuxGuitar-*/TuxGuitar
-
-    * UNSUPPORTED CLASS VERSION:
-
-java.lang.UnsupportedClassVersionError. This means that your JVM is not compatible with the JVM used to create the binaries.  
-If you see a message like this, you will need to rebuild TuxGuitar from sources.
-
-    * FAILDED TO LOAD PLUGINS:
-
-TuxGuitar 1.0 has better JVM compatibility than older releases. But some plugins (e.g: Java Sound Api plugin) still depends 
-on Sun Java(TM) Development Kit (JDK) 5.0. if you have installed more than one JVM in your system, you can use one of these 
-environment vars:  JAVA or JAVA_HOME to run TuxGuitar with a specified JVM.
-
-Export JAVA:
-$export JAVA=/usr/lib/jvm/java-1.5.0-sun/bin/java
-$/home/user/TuxGuitar-*/tuxguitar
-
-Export JAVA_HOME:
-$export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
-$/home/user/TuxGuitar-*/tuxguitar           
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..f0523001
--- /dev/null
+++ b/README.md
@@ -0,0 +1,62 @@
+TuxGuitar 1.3-SNAPSHOT
+======================
+
+[TuxGuitar](http://tuxguitar.herac.com.ar/) is a multitrack tablature editor and player written in Java [SWT](http://www.eclipse.org/swt/).
+
+This fork of TuxGuitar feature a build process with [Maven](http://http://maven.apache.org/), and some improvments here there.
+For example you can now load a tuning for Ukulele, instead of editing strings one by one.
+
+Using only Maven for building is maybe not especially a good idea with JNI modules :-D Anyway, right now, it works with Ubuntu. Help to improve portability is welcome.
+
+Build Java
+----------
+
+This command build all pure Java code and plugins
+
+    $ mvn clean package
+
+Build JNI plugins
+-----------------
+
+Another profile allow to build all JNI plugins available for Linux.
+Before that, it is needed to install all expected headers and lib.
+
+    $ sudo apt-get install libfluidsynth-dev oss4-dev libjack-dev libasound2-dev
+
+Then...
+
+    $ mvn clean package -Plinux-jni
+
+If you dont have all this dependencies, you can use the next command.
+
+    $ mvn clean package -Plinux-jni --fail-never
+
+Execute
+-------
+
+To lautch the application you can use this command.
+
+    $ cd TuxGuitar
+    $ mvn exec:exec
+
+License
+-------
+TuxGuitar is released under the [GNU Lesser General Public License 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) or any later version.
+
+Requirements
+------------
+Java Runtime Environment 1.6.X or later installed in your system.
+
+Todo
+----
+
+* Portability
+    * Fix plugins loading in a portable way (at the moment it use links inside ./TuxGuitar/share/plugins, but maybe we also work around classpath)
+    * Portable compilation of JNI module
+        * Use third party jar module instead of JNI when it is possible
+    * Improve tuxguitar-swt description
+    * Merge Mac OS integration to Maven
+* Allow to exec the appli from the main parent pom
+* Target to package dist into a ZIP
+* Check if it is possible to compile with Linux JNI plugins for other platform
+* Use pom name/description/version to provide java plugin name/description/version?
diff --git a/TuxGuitar-AudioUnit/build.properties b/TuxGuitar-AudioUnit/build.properties
deleted file mode 100644
index 74b25aa9..00000000
--- a/TuxGuitar-AudioUnit/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/build
\ No newline at end of file
diff --git a/TuxGuitar-AudioUnit/build.xml b/TuxGuitar-AudioUnit/build.xml
deleted file mode 100644
index ebd892bf..00000000
--- a/TuxGuitar-AudioUnit/build.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="tuxguitar-audiounit" basedir="." default="all">
-	<description>
-		TuxGuitar audiounit
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.jni.path" value="jni" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-audiounit.jar" />
-	
-	<property name="service.class" value="org.herac.tuxguitar.app.system.plugins.TGPlugin" />
-	<property name="service.provider" value="org.herac.tuxguitar.player.impl.midiport.audiounit.MidiPortReaderPlugin" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   T U X G U I T A R  -  audiounit         |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<mkdir dir="${build.path}/META-INF/services" />
-		<echo file="${build.path}/META-INF/services/${service.class}" append="false">${service.provider}</echo>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        B U I L D I N G   N A T I V E - L I B R A R I E S           |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<exec dir="${build.jni.path}" executable="make" failonerror="yes" >
-			<env key="JAVA_HOME" path="${java.home}/../"/>
-		</exec>
-		
-		<copy todir="${build.path}/../"><fileset file="${build.jni.path}/*.jnilib"/></copy>
-		<chmod dir="${build.path}" perm="644" includes="*.jnilib"/>
-		<exec dir="${build.jni.path}" executable="make" ><arg value="clean"/></exec>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   T U X G U I T A R  -  AUDIOUNIT         |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-AudioUnit/jni/Makefile b/TuxGuitar-AudioUnit/jni/Makefile
deleted file mode 100644
index aa9c8bd7..00000000
--- a/TuxGuitar-AudioUnit/jni/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-CXX = g++
-
-SDK = /Developer/SDKs/MacOSX10.5.sdk
-SDK64 = /Developer/SDKs/MacOSX10.5.sdk
-JAVA_FRAMEWORK = $(SDK)/System/Library/Frameworks/JavaVM.framework
-JAVA_FRAMEWORK64 = $(SDK64)/System/Library/Frameworks/JavaVM.framework
-
-INCLUDES = -I $(JAVA_FRAMEWORK)/Headers/
-INCLUDES64 = -I $(JAVA_FRAMEWORK64)/Headers/
-
-LIBRARIES = -framework CoreAudio -framework JavaVM -framework AudioUnit -framework AudioToolbox -framework CoreServices
-
-LIBRARY = libtuxguitar-audiounit-jni.jnilib
-
-FILENAME = org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
-
-all:	$(LIBRARY)
-
-$(LIBRARY):	clean
-	g++ $(INCLUDES) -isysroot $(SDK) -arch ppc $(LIBRARIES) -msse -bundle -o ppc_$(LIBRARY) $(FILENAME)
-	g++ $(INCLUDES) -isysroot $(SDK) -arch i386 $(LIBRARIES) -msse -bundle -o intel_$(LIBRARY) $(FILENAME)
-	g++ $(INCLUDES64) -isysroot $(SDK64) -arch x86_64 $(LIBRARIES) -msse -bundle -o intel64_$(LIBRARY) $(FILENAME)
-	lipo -create ppc_$(LIBRARY) intel_$(LIBRARY) intel64_$(LIBRARY) -output $(LIBRARY)
-
-clean:
-	rm -f ppc_$(LIBRARY) intel_$(LIBRARY) intel64_$(LIBRARY) $(LIBRARY)
\ No newline at end of file
diff --git a/TuxGuitar-AudioUnit/libtuxguitar-audiounit-jni.jnilib b/TuxGuitar-AudioUnit/libtuxguitar-audiounit-jni.jnilib
deleted file mode 100644
index b7177e73..00000000
Binary files a/TuxGuitar-AudioUnit/libtuxguitar-audiounit-jni.jnilib and /dev/null differ
diff --git a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java b/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java
deleted file mode 100644
index d6db8f12..00000000
--- a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.audiounit;
-
-import java.io.File;
-
-public class JNILibraryLoader {
-	
-	private static final String JNI_EXTENSION = ".jnilib";	
-	
-	//private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
-	
-	public static void loadLibrary(String libname){
-		System.out.println("trying to load" + libname + " (void loadLibrary)");
-		JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION);
-		/*
-		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
-			//System.loadLibrary(libname);
-		}
-		 */
-	}
-	
-	private static boolean loadFromClassPath(String filename){
-		System.out.println("trying to load" + filename + " (bool loadFromClassPath)");
-		
-		File file = new File(/*JNI_TMP_PATH +*/ filename);
-		/*
-		try{
-			if(!file.exists()){
-				OutputStream outputStream = new FileOutputStream(file);
-				InputStream inputStream = JNILibraryLoader.class.getClassLoader().getResourceAsStream(filename);
-				if (inputStream != null) {
-					int read;
-					byte [] buffer = new byte [4096];
-					while ((read = inputStream.read (buffer)) != -1) {
-						outputStream.write(buffer, 0, read);
-					}
-					outputStream.close();
-					inputStream.close();
-				}
-			}
-			*/
-			if(file.exists()){
-				System.out.println("calling file.getAbsolutePath() : "+ file.getAbsolutePath());
-				System.load(file.getAbsolutePath());
-				//System.load(file.getAbsolutePath());
-				return true;
-			}
-			//else
-			//{
-				System.out.println("Can't find file " + file.getAbsolutePath());
-				return false;
-			//}
-			/*
-		}catch(Throwable throwable){
-			return false;
-		}finally{
-			if(file.exists()){
-				file.delete();
-			}
-		}
-		return false;
-			 */
-	}
-}	
-	
-
diff --git a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java b/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java
deleted file mode 100644
index 3c20e83d..00000000
--- a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.audiounit;
-
-import org.herac.tuxguitar.player.base.MidiOutputPort;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiPortImpl implements MidiOutputPort{
-	
-	private String key;
-	private String name;
-	private MidiReceiverImpl receiver;
-
-	public MidiPortImpl(MidiReceiverImpl midiOut,String name,String key){
-        this.key = key;
-        this.name = name;
-		this.receiver = midiOut;		
-	}
-	
-	public void open(){
-		if(!this.receiver.isConnected()){
-			this.receiver.connect();
-		}
-	}
-	
-	public void close(){
-		this.receiver.disconnect();
-	}
-	
-	public MidiReceiver getReceiver(){
-		this.open();
-		return this.receiver;
-	}
-	
-	public void check(){
-		// Not implemented
-	}
-	
-	public String getKey(){
-		return this.key;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java b/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java
deleted file mode 100644
index 385e3375..00000000
--- a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.audiounit;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiPortReaderPlugin extends TGMidiOutputPortProviderPlugin{
-
-	protected MidiOutputPortProvider getProvider() {
-		return new MidiPortReaderAudioUnit();
-	}
-
-	public String getAuthor() {
-		return "Auria";
-	}
-
-	public String getDescription() {		
-		return "Core Audio output plugin";
-	}
-
-	public String getName() {
-		return "Core Audio output plugin";
-	}
-
-	public String getVersion() {
-		return "1.0";
-	}
-	
-}
diff --git a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java b/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java
deleted file mode 100644
index 7f4bd005..00000000
--- a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.audiounit;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiControllers;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiReceiverImpl extends MidiReceiverJNI implements MidiReceiver{
-	private boolean open; // unncessary
-    private boolean connected;	
-	private List ports;
-	
-	public MidiReceiverImpl(){
-		this.ports = new ArrayList();	
-        this.connected = false;
-	}
-
-	public void open(){
-		super.open();
-		this.open = true;
-	}
-
-	public void close(){
-		if(this.isOpen()){
-			this.disconnect();
-			super.close();
-			this.open = false;
-		}
-	}	
-		
-	public boolean isOpen(){
-		return (this.open);
-	}	
-			
-	public boolean isConnected(){
-		return (this.isOpen() && this.connected);
-	}	
-			
-    public void connect(){
-        if(isOpen()){
-            if(!isConnected()){             
-                this.connected = true;
-                this.openDevice();
-            }
-        }
-    }
-
-	public void disconnect() {
-		if(isConnected()){
-			this.closeDevice();
-			this.connected = false;
-		}
-	}		
-		
-	public List listPorts(){
-		if(isOpen()){
-			this.ports.clear();
-			this.ports.add(new MidiPortImpl(this, "AudioUnit graph midi playback" , "audiounit" ));
-			return this.ports;
-		}
-		return Collections.EMPTY_LIST;
-	}		
-
-	public void sendSystemReset() {
-		if(isOpen()){
-			//not implemented
-		}
-	}
-	
-	public void sendAllNotesOff() {
-		for(int i = 0; i < 16; i ++){
-			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);		
-		}
-	}
-
-	public void sendControlChange(int channel, int controller, int value) {
-		if(isOpen()){
-			super.controlChange(channel, controller, value);
-		}
-	}
-
-	public void sendNoteOff(int channel, int key, int velocity) {
-		if(isOpen()){
-			super.noteOff(channel, key, velocity);
-		}
-	}
-
-	public void sendNoteOn(int channel, int key, int velocity) {
-		if(isOpen()){
-			super.noteOn(channel, key, velocity);
-		}
-	}
-
-	public void sendPitchBend(int channel, int value) {
-		if(isOpen()){
-			super.pitchBend(channel, value);
-		}
-	}
-
-	public void sendProgramChange(int channel, int value) {
-		if(isOpen()){
-			super.programChange(channel, value);
-		}
-	}
-}
diff --git a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java b/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java
deleted file mode 100644
index 61c6f663..00000000
--- a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.audiounit;
-
-public abstract class MidiReceiverJNI{	
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-audiounit-jni");
-	
-	static{
-		System.loadLibrary (JNI_LIBRARY_NAME);
-	}
-	
-	public MidiReceiverJNI() {
-		super();
-	}
-	
-	protected native void open();
-	
-	protected native void close();	
-	
-	//protected native void findDevices();
-	
-	protected native void openDevice();
-	
-	protected native void closeDevice();
-	
-	protected native void noteOn(int channel,int note,int velocity);
-	
-	protected native void noteOff(int channel,int note,int velocity);
-
-	protected native void controlChange(int channel,int control,int value);
-	
-	protected native void programChange(int channel,int program);
-	
-	protected native void pitchBend(int channel,int value);
-
-	
-	//protected abstract void addDevice(String name);
-}
diff --git a/TuxGuitar-AudioUnit/tuxguitar-audiounit.jar b/TuxGuitar-AudioUnit/tuxguitar-audiounit.jar
deleted file mode 100644
index 7d322344..00000000
Binary files a/TuxGuitar-AudioUnit/tuxguitar-audiounit.jar and /dev/null differ
diff --git a/TuxGuitar-CoreAudio/build.properties b/TuxGuitar-CoreAudio/build.properties
deleted file mode 100644
index 74b25aa9..00000000
--- a/TuxGuitar-CoreAudio/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/build
\ No newline at end of file
diff --git a/TuxGuitar-CoreAudio/build.xml b/TuxGuitar-CoreAudio/build.xml
deleted file mode 100644
index fbd0ebd8..00000000
--- a/TuxGuitar-CoreAudio/build.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="tuxguitar-coreaudio" basedir="." default="all">
-	<description>
-		TuxGuitar coreaudio
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.jni.path" value="jni" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-coreaudio.jar" />
-	
-	<property name="service.class" value="org.herac.tuxguitar.app.system.plugins.TGPlugin" />
-	<property name="service.provider" value="org.herac.tuxguitar.player.impl.midiport.coreaudio.MidiPortReaderPlugin" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   T U X G U I T A R  -  COREAUDIO         |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<mkdir dir="${build.path}/META-INF/services" />
-		<echo file="${build.path}/META-INF/services/${service.class}" append="false">${service.provider}</echo>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        B U I L D I N G   N A T I V E - L I B R A R I E S           |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<exec dir="${build.jni.path}" executable="make" failonerror="yes" >
-			<env key="JAVA_HOME" path="${java.home}/../"/>
-		</exec>
-		
-		<copy todir="${build.path}/../"><fileset file="${build.jni.path}/*.jnilib"/></copy>
-		<chmod dir="${build.path}" perm="644" includes="*.jnilib"/>
-		<exec dir="${build.jni.path}" executable="make" ><arg value="clean"/></exec>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   T U X G U I T A R  -  COREAUDIO         |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-CoreAudio/jni/Makefile b/TuxGuitar-CoreAudio/jni/Makefile
deleted file mode 100644
index 2a4ab985..00000000
--- a/TuxGuitar-CoreAudio/jni/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-CXX = g++
-
-SDK = /Developer/SDKs/MacOSX10.4u.sdk
-JAVA_FRAMEWORK = $(SDK)/System/Library/Frameworks/JavaVM.framework
-
-INCLUDES = -I $(JAVA_FRAMEWORK)/Headers/
-
-LIBRARIES = -framework CoreAudio -framework JavaVM -framework AudioUnit -framework AudioToolbox -framework Carbon
-
-LIBRARY = libtuxguitar-coreaudio-jni.jnilib
-
-FILENAME = org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.cpp
-
-all:	$(LIBRARY)
-
-$(LIBRARY):	clean
-	g++ $(INCLUDES) -isysroot $(SDK) -arch ppc $(LIBRARIES) -msse -dynamiclib -o ppc_$(LIBRARY) $(FILENAME)
-	g++ $(INCLUDES) -isysroot $(SDK) -arch i386 $(LIBRARIES) -msse -dynamiclib -o intel_$(LIBRARY) $(FILENAME)
-	lipo -create ppc_$(LIBRARY) intel_$(LIBRARY) -output $(LIBRARY)
-
-clean:
-	rm -f ppc_$(LIBRARY) intel_$(LIBRARY) $(LIBRARY)
\ No newline at end of file
diff --git a/TuxGuitar-CoreAudio/libtuxguitar-coreaudio-jni.jnilib b/TuxGuitar-CoreAudio/libtuxguitar-coreaudio-jni.jnilib
deleted file mode 100644
index 8c5ba716..00000000
Binary files a/TuxGuitar-CoreAudio/libtuxguitar-coreaudio-jni.jnilib and /dev/null differ
diff --git a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/JNILibraryLoader.java b/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/JNILibraryLoader.java
deleted file mode 100644
index 44fb7d1a..00000000
--- a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/JNILibraryLoader.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.coreaudio;
-
-import java.io.File;
-
-public class JNILibraryLoader {
-	
-	private static final String JNI_EXTENSION = ".jnilib";	
-	
-	//private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
-	
-	public static void loadLibrary(String libname){
-		System.out.println("trying to load" + libname + " (void loadLibrary)");
-		JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION);
-		/*
-		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
-			//System.loadLibrary(libname);
-		}
-		 */
-	}
-	
-	private static boolean loadFromClassPath(String filename){
-		System.out.println("trying to load" + filename + " (bool loadFromClassPath)");
-		
-		File file = new File(/*JNI_TMP_PATH +*/ filename);
-		/*
-		try{
-			if(!file.exists()){
-				OutputStream outputStream = new FileOutputStream(file);
-				InputStream inputStream = JNILibraryLoader.class.getClassLoader().getResourceAsStream(filename);
-				if (inputStream != null) {
-					int read;
-					byte [] buffer = new byte [4096];
-					while ((read = inputStream.read (buffer)) != -1) {
-						outputStream.write(buffer, 0, read);
-					}
-					outputStream.close();
-					inputStream.close();
-				}
-			}
-			*/
-			if(file.exists()){
-				System.out.println("calling file.getAbsolutePath() : "+ file.getAbsolutePath());
-				System.load(file.getAbsolutePath());
-				//System.load(file.getAbsolutePath());
-				return true;
-			}
-			//else
-			//{
-				System.out.println("Can't find file " + file.getAbsolutePath());
-				return false;
-			//}
-			/*
-		}catch(Throwable throwable){
-			return false;
-		}finally{
-			if(file.exists()){
-				file.delete();
-			}
-		}
-		return false;
-			 */
-	}
-}	
-	
-
diff --git a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java b/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java
deleted file mode 100644
index 18de30a7..00000000
--- a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.coreaudio;
-
-import org.herac.tuxguitar.player.base.MidiOutputPort;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiPortImpl implements MidiOutputPort{
-	
-	private String key;
-	private String name;
-	private MidiReceiverImpl receiver;
-
-	public MidiPortImpl(MidiReceiverImpl midiOut,String name,String key){
-        this.key = key;
-        this.name = name;
-		this.receiver = midiOut;		
-	}
-	
-	public void open(){
-		if(!this.receiver.isConnected()){
-			this.receiver.connect();
-		}
-	}
-	
-	public void close(){
-		this.receiver.disconnect();
-	}
-	
-	public MidiReceiver getReceiver(){
-		this.open();
-		return this.receiver;
-	}
-	
-	public void check(){
-		// Not implemented
-	}
-	
-	public String getKey(){
-		return this.key;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderPlugin.java b/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderPlugin.java
deleted file mode 100644
index 8cf7ec63..00000000
--- a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderPlugin.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.coreaudio;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiPortReaderPlugin extends TGMidiOutputPortProviderPlugin{
-
-	protected MidiOutputPortProvider getProvider() {
-		return new MidiPortReaderCoreAudio();
-	}
-
-	public String getAuthor() {
-		return "Auria";
-	}
-
-	public String getDescription() {		
-		return "Core Audio output plugin";
-	}
-
-	public String getName() {
-		return "Core Audio output plugin";
-	}
-
-	public String getVersion() {
-		return "1.0";
-	}
-	
-}
diff --git a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverImpl.java b/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverImpl.java
deleted file mode 100644
index 3caf2c1d..00000000
--- a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverImpl.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.coreaudio;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiControllers;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiReceiverImpl extends MidiReceiverJNI implements MidiReceiver{
-	private boolean open; // unncessary
-    private boolean connected;	
-	private List ports;
-	
-	public MidiReceiverImpl(){
-		this.ports = new ArrayList();	
-        this.connected = false;
-	}
-
-	public void open(){
-		super.open();
-		this.open = true;
-	}
-
-	public void close(){
-		if(this.isOpen()){
-			this.disconnect();
-			super.close();
-			this.open = false;
-		}
-	}	
-		
-	public boolean isOpen(){
-		return (this.open);
-	}	
-			
-	public boolean isConnected(){
-		return (this.isOpen() && this.connected);
-	}	
-			
-    public void connect(){
-        if(isOpen()){
-            if(!isConnected()){             
-                this.connected = true;
-                this.openDevice();
-            }
-        }
-    }
-
-	public void disconnect() {
-		if(isConnected()){
-			this.closeDevice();
-			this.connected = false;
-		}
-	}		
-		
-	public List listPorts(){
-		if(isOpen()){
-			this.ports.clear();
-			this.ports.add(new MidiPortImpl(this, "Core Audio midi playback" , "coreaudio" ));
-			return this.ports;
-		}
-		return Collections.EMPTY_LIST;
-	}		
-
-	public void sendSystemReset() {
-		if(isOpen()){
-			//not implemented
-		}
-	}
-	
-	public void sendAllNotesOff() {
-		for(int i = 0; i < 16; i ++){
-			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);		
-		}
-	}
-
-	public void sendControlChange(int channel, int controller, int value) {
-		if(isOpen()){
-			super.controlChange(channel, controller, value);
-		}
-	}
-
-	public void sendNoteOff(int channel, int key, int velocity) {
-		if(isOpen()){
-			super.noteOff(channel, key, velocity);
-		}
-	}
-
-	public void sendNoteOn(int channel, int key, int velocity) {
-		if(isOpen()){
-			super.noteOn(channel, key, velocity);
-		}
-	}
-
-	public void sendPitchBend(int channel, int value) {
-		if(isOpen()){
-			super.pitchBend(channel, value);
-		}
-	}
-
-	public void sendProgramChange(int channel, int value) {
-		if(isOpen()){
-			super.programChange(channel, value);
-		}
-	}
-}
diff --git a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverJNI.java b/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverJNI.java
deleted file mode 100644
index a267518c..00000000
--- a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverJNI.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.coreaudio;
-
-public abstract class MidiReceiverJNI{	
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-coreaudio-jni");
-	
-	static{
-		System.loadLibrary (JNI_LIBRARY_NAME);
-	}
-	
-	public MidiReceiverJNI() {
-		super();
-	}
-	
-	protected native void open();
-	
-	protected native void close();	
-	
-	//protected native void findDevices();
-	
-	protected native void openDevice();
-	
-	protected native void closeDevice();
-	
-	protected native void noteOn(int channel,int note,int velocity);
-	
-	protected native void noteOff(int channel,int note,int velocity);
-
-	protected native void controlChange(int channel,int control,int value);
-	
-	protected native void programChange(int channel,int program);
-	
-	protected native void pitchBend(int channel,int value);
-
-	
-	//protected abstract void addDevice(String name);
-}
diff --git a/TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar b/TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar
deleted file mode 100644
index 672d91f6..00000000
Binary files a/TuxGuitar-CoreAudio/tuxguitar-coreaudio.jar and /dev/null differ
diff --git a/TuxGuitar-abc/GNUmakefile b/TuxGuitar-abc/GNUmakefile
deleted file mode 100644
index 9d8495ca..00000000
--- a/TuxGuitar-abc/GNUmakefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:45 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-abc
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
diff --git a/TuxGuitar-abc/TuxGuitar-abc.MF b/TuxGuitar-abc/TuxGuitar-abc.MF
deleted file mode 100644
index 58630c02..00000000
--- a/TuxGuitar-abc/TuxGuitar-abc.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/TuxGuitar-abc/build.properties b/TuxGuitar-abc/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-abc/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-abc/build.xml b/TuxGuitar-abc/build.xml
deleted file mode 100644
index 8424a774..00000000
--- a/TuxGuitar-abc/build.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-abc" basedir="." default="all">
-	<description>
-		TuxGuitar ABC Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-abc.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<mkdir dir="${build.path}${file.separator}lang" />
-		<copy todir="${build.path}${file.separator}lang">
-			<fileset dir="${build.share.path}${file.separator}lang"/>
-		</copy>
-		
-		<mkdir dir="${build.path}/META-INF/services" />
-		<echo file="${build.path}/META-INF/services/${service.class}" append="false">${service.provider}</echo>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.5 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-abc/buildjar.jardesc b/TuxGuitar-abc/buildjar.jardesc
deleted file mode 100644
index 2b4ed84c..00000000
--- a/TuxGuitar-abc/buildjar.jardesc
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jardesc>
-    <jar path="TuxGuitar-abc/tuxguitar-abc.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/TuxGuitar-abc/buildjar.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-    <selectedProjects/>
-    <manifest generateManifest="false" manifestLocation="/TuxGuitar-abc/TuxGuitar-abc.MF" manifestVersion="1.0" reuseManifest="true" saveManifest="true" usesManifest="true">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <folder path="/TuxGuitar-abc/lang"/>
-        <folder path="/TuxGuitar-abc/doc"/>
-        <folder path="/TuxGuitar-abc/META-INF"/>
-        <file path="/TuxGuitar-abc/.project"/>
-        <javaElement handleIdentifier="=TuxGuitar-abc/src"/>
-        <file path="/TuxGuitar-abc/.classpath"/>
-        <file path="/TuxGuitar-abc/javadoc.xml"/>
-        <file path="/TuxGuitar-abc/buildjar.jardesc"/>
-    </selectedElements>
-</jardesc>
diff --git a/TuxGuitar-abc/buildplugin.jardesc b/TuxGuitar-abc/buildplugin.jardesc
deleted file mode 100644
index af296dd5..00000000
--- a/TuxGuitar-abc/buildplugin.jardesc
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<jardesc>
-    <jar path="/home/peter/tuxguitar-1.2/share/plugins/tuxguitar-abc.jar"/>
-    <options buildIfNeeded="true" compress="true" descriptionLocation="/TuxGuitar-abc/buildplugin.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="true" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
-    <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
-    <selectedProjects/>
-    <manifest generateManifest="false" manifestLocation="/TuxGuitar-abc/TuxGuitar-abc.MF" manifestVersion="1.0" reuseManifest="true" saveManifest="true" usesManifest="true">
-        <sealing sealJar="false">
-            <packagesToSeal/>
-            <packagesToUnSeal/>
-        </sealing>
-    </manifest>
-    <selectedElements exportClassFiles="true" exportJavaFiles="true" exportOutputFolder="false">
-        <folder path="/TuxGuitar-abc/lang"/>
-        <folder path="/TuxGuitar-abc/doc"/>
-        <folder path="/TuxGuitar-abc/META-INF"/>
-        <file path="/TuxGuitar-abc/.project"/>
-        <javaElement handleIdentifier="=TuxGuitar-abc/src"/>
-        <file path="/TuxGuitar-abc/.classpath"/>
-        <file path="/TuxGuitar-abc/buildplugin.jardesc"/>
-        <file path="/TuxGuitar-abc/javadoc.xml"/>
-        <file path="/TuxGuitar-abc/buildjar.jardesc"/>
-    </selectedElements>
-</jardesc>
diff --git a/TuxGuitar-abc/doc/allclasses-frame.html b/TuxGuitar-abc/doc/allclasses-frame.html
deleted file mode 100644
index c0349b63..00000000
--- a/TuxGuitar-abc/doc/allclasses-frame.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-All Classes
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCChord</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCComponent</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCComponentChord</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCComponentNote</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCEvent</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCExportSettingsDialog</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCImportSettingsDialog</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCInfo</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCInputStream</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCLocation</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCMacro</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCOctaveDatabase</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCOutputStream</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCPluginExporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCPluginImporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCPluginList</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCRepeat</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCSettings</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCSong</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCSongExporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCSongImporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCSymbol</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTempo</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTempoChange</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCText</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTimeSignature</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTimeSignatureChange</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTrack</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/allclasses-noframe.html b/TuxGuitar-abc/doc/allclasses-noframe.html
deleted file mode 100644
index 953af5d1..00000000
--- a/TuxGuitar-abc/doc/allclasses-noframe.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-All Classes
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameHeadingFont">
-<B>All Classes</B></FONT>
-<BR>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCExportSettingsDialog</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCImportSettingsDialog</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCInputStream</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCOutputStream</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>
-<BR>
-<A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<BR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/constant-values.html b/TuxGuitar-abc/doc/constant-values.html
deleted file mode 100644
index ef12b658..00000000
--- a/TuxGuitar-abc/doc/constant-values.html
+++ /dev/null
@@ -1,814 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Constant Field Values
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Constant Field Values";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-Constant Field Values</H1>
-</CENTER>
-<HR SIZE="4" NOSHADE>
-<B>Contents</B><UL>
-<LI><A HREF="#org.herac">org.herac.*</A>
-</UL>
-
-<A NAME="org.herac"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD ALIGN="left"><FONT SIZE="+2">
-<B>org.herac.*</B></FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.ABCSettings.ALL_TRACKS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html#ALL_TRACKS">ALL_TRACKS</A></CODE></TD>
-<TD ALIGN="right"><CODE>-1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.ABCSettings.AUTO_MEASURES"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html#AUTO_MEASURES">AUTO_MEASURES</A></CODE></TD>
-<TD ALIGN="right"><CODE>0</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.ABCSettings.AUTO_TRACK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html#AUTO_TRACK">AUTO_TRACK</A></CODE></TD>
-<TD ALIGN="right"><CODE>0</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.ABCSettings.FIRST_MEASURE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html#FIRST_MEASURE">FIRST_MEASURE</A></CODE></TD>
-<TD ALIGN="right"><CODE>-1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.ABCSettings.LAST_MEASURE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html#LAST_MEASURE">LAST_MEASURE</A></CODE></TD>
-<TD ALIGN="right"><CODE>-1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.ABCSettings.NO_TRACK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html#NO_TRACK">NO_TRACK</A></CODE></TD>
-<TD ALIGN="right"><CODE>-2</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ACCENT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ACCENT">ACCENT</A></CODE></TD>
-<TD ALIGN="right"><CODE>4</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ALCODA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ALCODA">ALCODA</A></CODE></TD>
-<TD ALIGN="right"><CODE>30</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ALFINE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ALFINE">ALFINE</A></CODE></TD>
-<TD ALIGN="right"><CODE>32</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ANNOTATION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ANNOTATION">ANNOTATION</A></CODE></TD>
-<TD ALIGN="right"><CODE>11</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ARPEGGIO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ARPEGGIO">ARPEGGIO</A></CODE></TD>
-<TD ALIGN="right"><CODE>56</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.BAR"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR">BAR</A></CODE></TD>
-<TD ALIGN="right"><CODE>0</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.BAR_BAR"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR_BAR">BAR_BAR</A></CODE></TD>
-<TD ALIGN="right"><CODE>1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.BAR_FATBAR"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR_FATBAR">BAR_FATBAR</A></CODE></TD>
-<TD ALIGN="right"><CODE>2</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.BASSPROG"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#BASSPROG">BASSPROG</A></CODE></TD>
-<TD ALIGN="right"><CODE>-6</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.BASSVOL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#BASSVOL">BASSVOL</A></CODE></TD>
-<TD ALIGN="right"><CODE>-7</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.BREATH"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#BREATH">BREATH</A></CODE></TD>
-<TD ALIGN="right"><CODE>20</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.CHORD_BEGIN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_BEGIN">CHORD_BEGIN</A></CODE></TD>
-<TD ALIGN="right"><CODE>12</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.CHORD_CLOSE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_CLOSE">CHORD_CLOSE</A></CODE></TD>
-<TD ALIGN="right"><CODE>15</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.CHORD_SYMBOL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_SYMBOL">CHORD_SYMBOL</A></CODE></TD>
-<TD ALIGN="right"><CODE>10</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.CHORDPROG"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORDPROG">CHORDPROG</A></CODE></TD>
-<TD ALIGN="right"><CODE>-4</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.CHORDVOL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORDVOL">CHORDVOL</A></CODE></TD>
-<TD ALIGN="right"><CODE>-5</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.CODA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#CODA">CODA</A></CODE></TD>
-<TD ALIGN="right"><CODE>34</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DACAPO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DACAPO">DACAPO</A></CODE></TD>
-<TD ALIGN="right"><CODE>29</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DACODA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DACODA">DACODA</A></CODE></TD>
-<TD ALIGN="right"><CODE>28</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DC"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DC">DC</A></CODE></TD>
-<TD ALIGN="right"><CODE>27</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DECORATION"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DECORATION">DECORATION</A></CODE></TD>
-<TD ALIGN="right"><CODE>16</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DOWNBOW"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DOWNBOW">DOWNBOW</A></CODE></TD>
-<TD ALIGN="right"><CODE>51</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DRONE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONE">DRONE</A></CODE></TD>
-<TD ALIGN="right"><CODE>-13</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DRONEOFF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONEOFF">DRONEOFF</A></CODE></TD>
-<TD ALIGN="right"><CODE>-12</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DRONEON"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONEON">DRONEON</A></CODE></TD>
-<TD ALIGN="right"><CODE>-11</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DRUM"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUM">DRUM</A></CODE></TD>
-<TD ALIGN="right"><CODE>-10</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DRUMOFF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUMOFF">DRUMOFF</A></CODE></TD>
-<TD ALIGN="right"><CODE>-9</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DRUMON"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUMON">DRUMON</A></CODE></TD>
-<TD ALIGN="right"><CODE>-8</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DS">DS</A></CODE></TD>
-<TD ALIGN="right"><CODE>25</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.DSS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#DSS">DSS</A></CODE></TD>
-<TD ALIGN="right"><CODE>26</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ENDCRESCENDO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDCRESCENDO">ENDCRESCENDO</A></CODE></TD>
-<TD ALIGN="right"><CODE>36</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ENDDIMINUENDO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDDIMINUENDO">ENDDIMINUENDO</A></CODE></TD>
-<TD ALIGN="right"><CODE>38</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ENDTRILL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDTRILL">ENDTRILL</A></CODE></TD>
-<TD ALIGN="right"><CODE>58</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.F"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#F">F</A></CODE></TD>
-<TD ALIGN="right"><CODE>45</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FATBAR_BAR"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FATBAR_BAR">FATBAR_BAR</A></CODE></TD>
-<TD ALIGN="right"><CODE>3</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FERMATA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FERMATA">FERMATA</A></CODE></TD>
-<TD ALIGN="right"><CODE>5</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FF">FF</A></CODE></TD>
-<TD ALIGN="right"><CODE>46</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FFF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FFF">FFF</A></CODE></TD>
-<TD ALIGN="right"><CODE>47</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FFFF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FFFF">FFFF</A></CODE></TD>
-<TD ALIGN="right"><CODE>48</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINE">FINE</A></CODE></TD>
-<TD ALIGN="right"><CODE>33</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_0"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_0">FINGERING_0</A></CODE></TD>
-<TD ALIGN="right"><CODE>8</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_1"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_1">FINGERING_1</A></CODE></TD>
-<TD ALIGN="right"><CODE>9</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_2"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_2">FINGERING_2</A></CODE></TD>
-<TD ALIGN="right"><CODE>10</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_3"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_3">FINGERING_3</A></CODE></TD>
-<TD ALIGN="right"><CODE>11</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_4"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_4">FINGERING_4</A></CODE></TD>
-<TD ALIGN="right"><CODE>12</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_5"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_5">FINGERING_5</A></CODE></TD>
-<TD ALIGN="right"><CODE>13</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.GCHORD"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORD">GCHORD</A></CODE></TD>
-<TD ALIGN="right"><CODE>-3</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.GCHORDOFF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORDOFF">GCHORDOFF</A></CODE></TD>
-<TD ALIGN="right"><CODE>-2</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.GCHORDON"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORDON">GCHORDON</A></CODE></TD>
-<TD ALIGN="right"><CODE>-1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.INVERTEDFERMATA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDFERMATA">INVERTEDFERMATA</A></CODE></TD>
-<TD ALIGN="right"><CODE>6</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.INVERTEDTURN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDTURN">INVERTEDTURN</A></CODE></TD>
-<TD ALIGN="right"><CODE>54</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.INVERTEDTURNX"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDTURNX">INVERTEDTURNX</A></CODE></TD>
-<TD ALIGN="right"><CODE>55</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.LINE_BREAK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#LINE_BREAK">LINE_BREAK</A></CODE></TD>
-<TD ALIGN="right"><CODE>17</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.LONGPHRASE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#LONGPHRASE">LONGPHRASE</A></CODE></TD>
-<TD ALIGN="right"><CODE>23</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.LOWERMORDENT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#LOWERMORDENT">LOWERMORDENT</A></CODE></TD>
-<TD ALIGN="right"><CODE>2</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.MEDIUMPHRASE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#MEDIUMPHRASE">MEDIUMPHRASE</A></CODE></TD>
-<TD ALIGN="right"><CODE>22</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.MF"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#MF">MF</A></CODE></TD>
-<TD ALIGN="right"><CODE>44</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.MP"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#MP">MP</A></CODE></TD>
-<TD ALIGN="right"><CODE>43</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.NOT_RELEVANT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#NOT_RELEVANT">NOT_RELEVANT</A></CODE></TD>
-<TD ALIGN="right"><CODE>18</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.NOTE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#NOTE">NOTE</A></CODE></TD>
-<TD ALIGN="right"><CODE>14</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.OPEN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#OPEN">OPEN</A></CODE></TD>
-<TD ALIGN="right"><CODE>16</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.P"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#P">P</A></CODE></TD>
-<TD ALIGN="right"><CODE>42</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.PLUS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#PLUS">PLUS</A></CODE></TD>
-<TD ALIGN="right"><CODE>14</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.PP"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#PP">PP</A></CODE></TD>
-<TD ALIGN="right"><CODE>41</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.PPP"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#PPP">PPP</A></CODE></TD>
-<TD ALIGN="right"><CODE>40</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.PPPP"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#PPPP">PPPP</A></CODE></TD>
-<TD ALIGN="right"><CODE>39</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.REPEAT_BEGIN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_BEGIN">REPEAT_BEGIN</A></CODE></TD>
-<TD ALIGN="right"><CODE>4</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.REPEAT_END"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_END">REPEAT_END</A></CODE></TD>
-<TD ALIGN="right"><CODE>5</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.REPEAT_END_AND_START"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_END_AND_START">REPEAT_END_AND_START</A></CODE></TD>
-<TD ALIGN="right"><CODE>6</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.REST"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#REST">REST</A></CODE></TD>
-<TD ALIGN="right"><CODE>13</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.ROLL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#ROLL">ROLL</A></CODE></TD>
-<TD ALIGN="right"><CODE>19</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.SEGNO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#SEGNO">SEGNO</A></CODE></TD>
-<TD ALIGN="right"><CODE>24</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.SFZ"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#SFZ">SFZ</A></CODE></TD>
-<TD ALIGN="right"><CODE>49</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.SHORTPHRASE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#SHORTPHRASE">SHORTPHRASE</A></CODE></TD>
-<TD ALIGN="right"><CODE>21</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.SLIDE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#SLIDE">SLIDE</A></CODE></TD>
-<TD ALIGN="right"><CODE>52</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.STACATODOT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#STACATODOT">STACATODOT</A></CODE></TD>
-<TD ALIGN="right"><CODE>59</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.STARTCRESCENDO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTCRESCENDO">STARTCRESCENDO</A></CODE></TD>
-<TD ALIGN="right"><CODE>35</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.STARTDIMINUENDO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTDIMINUENDO">STARTDIMINUENDO</A></CODE></TD>
-<TD ALIGN="right"><CODE>37</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.STARTTRILL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTTRILL">STARTTRILL</A></CODE></TD>
-<TD ALIGN="right"><CODE>57</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TEMPO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TEMPO">TEMPO</A></CODE></TD>
-<TD ALIGN="right"><CODE>9</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TENUTO"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TENUTO">TENUTO</A></CODE></TD>
-<TD ALIGN="right"><CODE>7</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.THUMB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#THUMB">THUMB</A></CODE></TD>
-<TD ALIGN="right"><CODE>17</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TIME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TIME">TIME</A></CODE></TD>
-<TD ALIGN="right"><CODE>8</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TOCODA"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TOCODA">TOCODA</A></CODE></TD>
-<TD ALIGN="right"><CODE>31</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TRILL"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TRILL">TRILL</A></CODE></TD>
-<TD ALIGN="right"><CODE>1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TURN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TURN">TURN</A></CODE></TD>
-<TD ALIGN="right"><CODE>18</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.TURNX"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#TURNX">TURNX</A></CODE></TD>
-<TD ALIGN="right"><CODE>53</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.UPBOW"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#UPBOW">UPBOW</A></CODE></TD>
-<TD ALIGN="right"><CODE>50</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.UPPERMORDENT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#UPPERMORDENT">UPPERMORDENT</A></CODE></TD>
-<TD ALIGN="right"><CODE>3</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.VARIANT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#VARIANT">VARIANT</A></CODE></TD>
-<TD ALIGN="right"><CODE>7</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCEvent.WEDGE"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html#WEDGE">WEDGE</A></CODE></TD>
-<TD ALIGN="right"><CODE>15</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCSong.TICKS_PER_QUART"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCSong.html#TICKS_PER_QUART">TICKS_PER_QUART</A></CODE></TD>
-<TD ALIGN="right"><CODE>192</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-
-<TABLE BORDER="0" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=3><B>org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_DOUBLE_STRINGS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_DOUBLE_STRINGS">FLAG_DOUBLE_STRINGS</A></CODE></TD>
-<TD ALIGN="right"><CODE>1</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_EFFECT_CHANNEL_DISABLED"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_EFFECT_CHANNEL_DISABLED">FLAG_EFFECT_CHANNEL_DISABLED</A></CODE></TD>
-<TD ALIGN="right"><CODE>8</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_LET_RING"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_LET_RING">FLAG_LET_RING</A></CODE></TD>
-<TD ALIGN="right"><CODE>2</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_PEDAL_SABCEL_GUITAR"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_PEDAL_SABCEL_GUITAR">FLAG_PEDAL_SABCEL_GUITAR</A></CODE></TD>
-<TD ALIGN="right"><CODE>4</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_RHYTHM_TRACK"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_RHYTHM_TRACK">FLAG_RHYTHM_TRACK</A></CODE></TD>
-<TD ALIGN="right"><CODE>16</CODE></TD>
-</TR>
-</FONT></TD>
-</TR>
-</TABLE>
-
-<P>
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="constant-values.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/deprecated-list.html b/TuxGuitar-abc/doc/deprecated-list.html
deleted file mode 100644
index 90a13e9c..00000000
--- a/TuxGuitar-abc/doc/deprecated-list.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-Deprecated List
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Deprecated List";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Deprecated API</B></H2>
-</CENTER>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Deprecated</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="deprecated-list.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/help-doc.html b/TuxGuitar-abc/doc/help-doc.html
deleted file mode 100644
index 2bc16e39..00000000
--- a/TuxGuitar-abc/doc/help-doc.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-API Help
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="API Help";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H1>
-How This API Document Is Organized</H1>
-</CENTER>
-This API (Application Programming Interface) document has pages corresponding to the items in the navigation bar, described as follows.<H3>
-Overview</H3>
-<BLOCKQUOTE>
-
-<P>
-The <A HREF="overview-summary.html">Overview</A> page is the front page of this API document and provides a list of all packages with a summary for each.  This page can also contain an overall description of the set of packages.</BLOCKQUOTE>
-<H3>
-Package</H3>
-<BLOCKQUOTE>
-
-<P>
-Each package has a page that contains a list of its classes and interfaces, with a summary for each. This page can contain four categories:<UL>
-<LI>Interfaces (italic)<LI>Classes<LI>Exceptions<LI>Errors</UL>
-</BLOCKQUOTE>
-<H3>
-Class/Interface</H3>
-<BLOCKQUOTE>
-
-<P>
-Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:<UL>
-<LI>Class inheritance diagram<LI>Direct Subclasses<LI>All Known Subinterfaces<LI>All Known Implementing Classes<LI>Class/interface declaration<LI>Class/interface description
-<P>
-<LI>Nested Class Summary<LI>Field Summary<LI>Constructor Summary<LI>Method Summary
-<P>
-<LI>Field Detail<LI>Constructor Detail<LI>Method Detail</UL>
-Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.</BLOCKQUOTE>
-<H3>
-Use</H3>
-<BLOCKQUOTE>
-Each documented package, class and interface has its own Use page.  This page describes what packages, classes, methods, constructors and fields use any part of the given class or package. Given a class or interface A, its Use page includes subclasses of A, fields declared as A, methods that return A, and methods and constructors with parameters of type A.  You can access this page by first going to the package, class or interface, then clicking on the "Use" link in the navigation bar.</BLOCKQUOTE>
-<H3>
-Tree (Class Hierarchy)</H3>
-<BLOCKQUOTE>
-There is a <A HREF="overview-tree.html">Class Hierarchy</A> page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. The classes are organized by inheritance structure starting with <code>java.lang.Object</code>. The interfaces do not inherit from <code>java.lang.Object</code>.<UL>
-<LI>When viewing the Overview page, clicking on "Tree" displays the hierarchy for all packages.<LI>When viewing a particular package, class or interface page, clicking "Tree" displays the hierarchy for only that package.</UL>
-</BLOCKQUOTE>
-<H3>
-Deprecated API</H3>
-<BLOCKQUOTE>
-The <A HREF="deprecated-list.html">Deprecated API</A> page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.</BLOCKQUOTE>
-<H3>
-Index</H3>
-<BLOCKQUOTE>
-The <A HREF="index-files/index-1.html">Index</A> contains an alphabetic list of all classes, interfaces, constructors, methods, and fields.</BLOCKQUOTE>
-<H3>
-Prev/Next</H3>
-These links take you to the next or previous class, interface, package, or related page.<H3>
-Frames/No Frames</H3>
-These links show and hide the HTML frames.  All pages are available with or without frames.
-<P>
-<H3>
-Serialized Form</H3>
-Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.
-<P>
-<FONT SIZE="-1">
-<EM>
-This help file applies to API documentation generated using the standard doclet.</EM>
-</FONT>
-<BR>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Help</B></FONT>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="help-doc.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-1.html b/TuxGuitar-abc/doc/index-files/index-1.html
deleted file mode 100644
index f0a8c08c..00000000
--- a/TuxGuitar-abc/doc/index-files/index-1.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-A-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="A-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV LETTER&nbsp;
-&nbsp;<A HREF="index-2.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-1.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_A_"><!-- --></A><H2>
-<B>A</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCChord</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#ABCChord(java.lang.String)"><B>ABCChord(String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponent</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html#ABCComponent(int, int, int)"><B>ABCComponent(int, int, int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponentChord</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html#ABCComponentChord(int, int, int, int)"><B>ABCComponentChord(int, int, int, int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponentNote</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#ABCComponentNote(int, int, int, int, int, int, int)"><B>ABCComponentNote(int, int, int, int, int, int, int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCEvent</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ABCEvent(int, java.lang.String, int)"><B>ABCEvent(int, String, int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ABCEvent(org.herac.tuxguitar.io.abc.base.ABCSong, java.lang.String)"><B>ABCEvent(ABCSong, String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCExportSettingsDialog</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCExportSettingsDialog</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html#ABCExportSettingsDialog()"><B>ABCExportSettingsDialog()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCExportSettingsDialog</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCImportSettingsDialog</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCImportSettingsDialog</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html#ABCImportSettingsDialog()"><B>ABCImportSettingsDialog()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCImportSettingsDialog</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCInfo</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#ABCInfo(java.lang.String, java.lang.String, java.lang.String)"><B>ABCInfo(String, String, String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCInputStream</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCInputStream</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCInputStream.html#ABCInputStream(java.io.InputStream, org.herac.tuxguitar.io.abc.ABCSettings)"><B>ABCInputStream(InputStream, ABCSettings)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCInputStream</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCLocation</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#ABCLocation(java.lang.String, int, int, int, org.herac.tuxguitar.io.abc.base.ABCChord, org.herac.tuxguitar.io.abc.base.ABCEvent)"><B>ABCLocation(String, int, int, int, ABCChord, ABCEvent)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCMacro</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html#ABCMacro(java.lang.String)"><B>ABCMacro(String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCOctaveDatabase</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#ABCOctaveDatabase()"><B>ABCOctaveDatabase()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCOutputStream</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCOutputStream</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCOutputStream.html#ABCOutputStream(java.io.OutputStream, org.herac.tuxguitar.io.abc.ABCSettings)"><B>ABCOutputStream(OutputStream, ABCSettings)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCOutputStream</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginExporter</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#ABCPluginExporter()"><B>ABCPluginExporter()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginImporter</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#ABCPluginImporter()"><B>ABCPluginImporter()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginList</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html#ABCPluginList()"><B>ABCPluginList()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCRepeat</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#ABCRepeat(int, int)"><B>ABCRepeat(int, int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSettings</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#ABCSettings()"><B>ABCSettings()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCSong</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#ABCSong()"><B>ABCSong()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSongExporter</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html#ABCSongExporter()"><B>ABCSongExporter()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSongImporter</B></A> - class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#ABCSongImporter()"><B>ABCSongImporter()</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCSymbol</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#ABCSymbol(java.lang.String)"><B>ABCSymbol(String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTempo</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html#ABCTempo(int)"><B>ABCTempo(int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html#ABCTempo(java.lang.String)"><B>ABCTempo(String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTempoChange</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#ABCTempoChange(int, int)"><B>ABCTempoChange(int, int)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCText</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html#ABCText(java.lang.String)"><B>ABCText(String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignature</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#ABCTimeSignature(int, int, boolean)"><B>ABCTimeSignature(int, int, boolean)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignatureChange</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#ABCTimeSignatureChange(int, org.herac.tuxguitar.io.abc.base.ABCTimeSignature)"><B>ABCTimeSignatureChange(int, ABCTimeSignature)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTrack</B></A> - class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>.<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#ABCTrack(java.lang.String)"><B>ABCTrack(String)</B></A> - 
-Constructor for class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ACCENT"><B>ACCENT</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ALCODA"><B>ALCODA</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ALFINE"><B>ALFINE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#ALL_TRACKS"><B>ALL_TRACKS</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ANNOTATION"><B>ANNOTATION</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ARPEGGIO"><B>ARPEGGIO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#AUTO_MEASURES"><B>AUTO_MEASURES</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#AUTO_TRACK"><B>AUTO_TRACK</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addChord(java.lang.String)"><B>addChord(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#addHistory(java.lang.String)"><B>addHistory(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addHistory(java.lang.String)"><B>addHistory(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addLyrics(java.lang.String)"><B>addLyrics(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addMacro(java.lang.String)"><B>addMacro(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addMusic(java.lang.String)"><B>addMusic(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#addNote(java.lang.String)"><B>addNote(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addNote(java.lang.String)"><B>addNote(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addRedefinable(java.lang.String)"><B>addRedefinable(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addRemarks(java.lang.String)"><B>addRemarks(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addSymbols(java.lang.String)"><B>addSymbols(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addTempoChange(org.herac.tuxguitar.io.abc.base.ABCTempoChange)"><B>addTempoChange(ABCTempoChange)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addTimeSignatureChange(org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange)"><B>addTimeSignatureChange(ABCTimeSignatureChange)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addVoice(java.lang.String)"><B>addVoice(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#addWords(java.lang.String)"><B>addWords(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#alterString(int, int[])"><B>alterString(int, int[])</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV LETTER&nbsp;
-&nbsp;<A HREF="index-2.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-1.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-10.html b/TuxGuitar-abc/doc/index-files/index-10.html
deleted file mode 100644
index be02efed..00000000
--- a/TuxGuitar-abc/doc/index-files/index-10.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-M-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="M-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-9.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-11.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-10.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_M_"><!-- --></A><H2>
-<B>M</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#MEDIUMPHRASE"><B>MEDIUMPHRASE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#MF"><B>MF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#MP"><B>MP</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#midiCommand(java.lang.String)"><B>midiCommand(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-9.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-11.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-10.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-11.html b/TuxGuitar-abc/doc/index-files/index-11.html
deleted file mode 100644
index bbe865be..00000000
--- a/TuxGuitar-abc/doc/index-files/index-11.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-N-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="N-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-10.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-12.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-11.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_N_"><!-- --></A><H2>
-<B>N</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#NOTE"><B>NOTE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#NOT_RELEVANT"><B>NOT_RELEVANT</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#NO_TRACK"><B>NO_TRACK</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-10.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-12.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-11.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-12.html b/TuxGuitar-abc/doc/index-files/index-12.html
deleted file mode 100644
index 2f08fa62..00000000
--- a/TuxGuitar-abc/doc/index-files/index-12.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-O-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="O-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-11.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-13.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-12.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_O_"><!-- --></A><H2>
-<B>O</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#OPEN"><B>OPEN</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html#open()"><B>open()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCExportSettingsDialog</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html#open()"><B>open()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCImportSettingsDialog</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/package-summary.html"><B>org.herac.tuxguitar.io.abc</B></A> - package org.herac.tuxguitar.io.abc<DD>&nbsp;<DT><A HREF="../org/herac/tuxguitar/io/abc/base/package-summary.html"><B>org.herac.tuxguitar.io.abc.base</B></A> - package org.herac.tuxguitar.io.abc.base<DD>&nbsp;</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-11.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-13.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-12.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-13.html b/TuxGuitar-abc/doc/index-files/index-13.html
deleted file mode 100644
index b3104d98..00000000
--- a/TuxGuitar-abc/doc/index-files/index-13.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-P-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="P-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-12.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-14.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-13.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_P_"><!-- --></A><H2>
-<B>P</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#P"><B>P</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#PERCUSSION_TUNINGS"><B>PERCUSSION_TUNINGS</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PLUS"><B>PLUS</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PP"><B>PP</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PPP"><B>PPP</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PPPP"><B>PPPP</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#postprocessor()"><B>postprocessor()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-12.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-14.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-13.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-14.html b/TuxGuitar-abc/doc/index-files/index-14.html
deleted file mode 100644
index d2830a3a..00000000
--- a/TuxGuitar-abc/doc/index-files/index-14.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-R-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="R-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-13.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-15.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-14.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_R_"><!-- --></A><H2>
-<B>R</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_BEGIN"><B>REPEAT_BEGIN</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_END"><B>REPEAT_END</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_END_AND_START"><B>REPEAT_END_AND_START</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REST"><B>REST</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ROLL"><B>ROLL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCInputStream.html#readSong()"><B>readSong()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCInputStream</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#recall(int)"><B>recall(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#reset()"><B>reset()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#resetScale()"><B>resetScale()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-13.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-15.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-14.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-15.html b/TuxGuitar-abc/doc/index-files/index-15.html
deleted file mode 100644
index 33f4a467..00000000
--- a/TuxGuitar-abc/doc/index-files/index-15.html
+++ /dev/null
@@ -1,502 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-S-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="S-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-14.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-16.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-15.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_S_"><!-- --></A><H2>
-<B>S</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SEGNO"><B>SEGNO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SFZ"><B>SFZ</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SHORTPHRASE"><B>SHORTPHRASE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SLIDE"><B>SLIDE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STACATODOT"><B>STACATODOT</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTCRESCENDO"><B>STARTCRESCENDO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTDIMINUENDO"><B>STARTDIMINUENDO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTTRILL"><B>STARTTRILL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setArea(java.lang.String)"><B>setArea(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setArea(java.lang.String)"><B>setArea(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setArtist(java.lang.String)"><B>setArtist(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setArtist(java.lang.String)"><B>setArtist(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBarkey(java.lang.String)"><B>setBarkey(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setBaseTrack(int)"><B>setBaseTrack(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBassprog(int)"><B>setBassprog(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBassvol(int)"><B>setBassvol(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setBook(java.lang.String)"><B>setBook(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBook(java.lang.String)"><B>setBook(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setCapo(int)"><B>setCapo(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setChord(org.herac.tuxguitar.io.abc.base.ABCChord)"><B>setChord(ABCChord)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChord(int, org.herac.tuxguitar.io.abc.base.ABCChord)"><B>setChord(int, ABCChord)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setChordDiagramEnabled(boolean)"><B>setChordDiagramEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setChordEnabled(boolean)"><B>setChordEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setChordTrack(int)"><B>setChordTrack(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChordprog(int)"><B>setChordprog(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChords(int)"><B>setChords(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChordvol(int)"><B>setChordvol(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setClefNumber(int)"><B>setClefNumber(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setClefType(int)"><B>setClefType(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setComments(java.lang.String)"><B>setComments(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setComments(java.lang.String)"><B>setComments(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setComponist(java.lang.String)"><B>setComponist(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setComponist(java.lang.String)"><B>setComponist(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDefaultNoteLength(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)"><B>setDefaultNoteLength(ABCTimeSignature)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setDenominator(int)"><B>setDenominator(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setDiagramTrack(int)"><B>setDiagramTrack(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setDiscography(java.lang.String)"><B>setDiscography(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDiscography(java.lang.String)"><B>setDiscography(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDrone(java.lang.String)"><B>setDrone(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setDroneEnabled(boolean)"><B>setDroneEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setDroneTrack(int)"><B>setDroneTrack(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDroneon(boolean)"><B>setDroneon(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDrum(java.lang.String)"><B>setDrum(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDrumon(boolean)"><B>setDrumon(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setFilename(java.lang.String)"><B>setFilename(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setFilename(java.lang.String)"><B>setFilename(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setFlags(int)"><B>setFlags(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setGchord(java.lang.String)"><B>setGchord(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setGchordon(boolean)"><B>setGchordon(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setGrace(boolean)"><B>setGrace(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setGroup(java.lang.String)"><B>setGroup(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setGroup(java.lang.String)"><B>setGroup(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInfo(org.herac.tuxguitar.io.abc.base.ABCInfo)"><B>setInfo(ABCInfo)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setInformation(java.lang.String)"><B>setInformation(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInformation(java.lang.String)"><B>setInformation(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setInstrument(int)"><B>setInstrument(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInstrumentOffset(int)"><B>setInstrumentOffset(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setInstrumentsStartAt1(boolean)"><B>setInstrumentsStartAt1(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setKey(java.lang.String)"><B>setKey(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setLegato(boolean)"><B>setLegato(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setLegato(int)"><B>setLegato(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setLyrics(java.lang.String)"><B>setLyrics(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setLyricsEnabled(boolean)"><B>setLyricsEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setMeasure(int)"><B>setMeasure(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setMeasureFrom(int)"><B>setMeasureFrom(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setMeasureTo(int)"><B>setMeasureTo(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setMeasuresPerLine(int)"><B>setMeasuresPerLine(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setNumerator(int)"><B>setNumerator(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setOrigin(java.lang.String)"><B>setOrigin(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setOrigin(java.lang.String)"><B>setOrigin(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setPan(int)"><B>setPan(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setPart(java.lang.String)"><B>setPart(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setPart(java.lang.String)"><B>setPart(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setParts(java.lang.String)"><B>setParts(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setPitchStringAndFret(int, int[])"><B>setPitchStringAndFret(int, int[])</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRepeat(int, org.herac.tuxguitar.io.abc.base.ABCRepeat)"><B>setRepeat(int, ABCRepeat)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRepeats(int)"><B>setRepeats(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRhythm(java.lang.String)"><B>setRhythm(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>Abc also includes a rhythm field, 
- R:, which is used for cataloguing and sorting collections of abc tunes:
- this is entirely free text (although there are obvious 'standard' entries eg R:reel, R:jig, R:schottische).
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setScoreEnabled(boolean)"><B>setScoreEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setSequence(int)"><B>setSequence(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setSource(java.lang.String)"><B>setSource(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setSource(java.lang.String)"><B>setSource(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setStacato(boolean)"><B>setStacato(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setStrings(int)"><B>setStrings(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setStrings(int[])"><B>setStrings(int[])</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setSubtitle(java.lang.String)"><B>setSubtitle(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setTablatureEnabled(boolean)"><B>setTablatureEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setTempo(int)"><B>setTempo(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTempo(java.lang.String)"><B>setTempo(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setText(int, org.herac.tuxguitar.io.abc.base.ABCText)"><B>setText(int, ABCText)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setTextEnabled(boolean)"><B>setTextEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTexts(int)"><B>setTexts(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTicks(int)"><B>setTicks(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setTicks(int)"><B>setTicks(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTied(boolean)"><B>setTied(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setTied(boolean)"><B>setTied(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTimeSignature(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)"><B>setTimeSignature(ABCTimeSignature)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setTitle(java.lang.String)"><B>setTitle(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTitle(java.lang.String)"><B>setTitle(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setToEnd(boolean)"><B>setToEnd(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setTrack(int)"><B>setTrack(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTrack(int, org.herac.tuxguitar.io.abc.base.ABCTrack)"><B>setTrack(int, ABCTrack)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setTrackGroupEnabled(boolean)"><B>setTrackGroupEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setTrackNameEnabled(boolean)"><B>setTrackNameEnabled(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTracks(int)"><B>setTracks(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setTranscriptor(java.lang.String)"><B>setTranscriptor(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTranscriptor(java.lang.String)"><B>setTranscriptor(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTriplet(boolean)"><B>setTriplet(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTriplet(int, int, int)"><B>setTriplet(int, int, int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTripletP(int)"><B>setTripletP(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTripletQ(int)"><B>setTripletQ(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTripletR(int)"><B>setTripletR(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setType(int)"><B>setType(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setValue(int)"><B>setValue(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setVelocity(int)"><B>setVelocity(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setVoice(java.lang.String)"><B>setVoice(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setVolume(int)"><B>setVolume(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#setX(int)"><B>setX(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#setX(int)"><B>setX(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#size()"><B>size()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#sortEvents()"><B>sortEvents()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#store(int, int)"><B>store(int, int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-14.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-16.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-15.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-16.html b/TuxGuitar-abc/doc/index-files/index-16.html
deleted file mode 100644
index cd49dab2..00000000
--- a/TuxGuitar-abc/doc/index-files/index-16.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-T-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="T-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-15.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-17.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-16.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_T_"><!-- --></A><H2>
-<B>T</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TEMPO"><B>TEMPO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TENUTO"><B>TENUTO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#THUMB"><B>THUMB</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#TICKS_PER_QUART"><B>TICKS_PER_QUART</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TIME"><B>TIME</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TOCODA"><B>TOCODA</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TRILL"><B>TRILL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TURN"><B>TURN</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TURNX"><B>TURNX</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#toString()"><B>toString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-15.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-17.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-16.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-17.html b/TuxGuitar-abc/doc/index-files/index-17.html
deleted file mode 100644
index 9a60da48..00000000
--- a/TuxGuitar-abc/doc/index-files/index-17.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-U-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="U-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-16.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-18.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-17.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_U_"><!-- --></A><H2>
-<B>U</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#UPBOW"><B>UPBOW</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#UPPERMORDENT"><B>UPPERMORDENT</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-16.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-18.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-17.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-18.html b/TuxGuitar-abc/doc/index-files/index-18.html
deleted file mode 100644
index dd7799b8..00000000
--- a/TuxGuitar-abc/doc/index-files/index-18.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-V-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="V-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-17.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-19.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-18.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_V_"><!-- --></A><H2>
-<B>V</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#VARIANT"><B>VARIANT</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-17.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-19.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-18.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-19.html b/TuxGuitar-abc/doc/index-files/index-19.html
deleted file mode 100644
index 5a21f94a..00000000
--- a/TuxGuitar-abc/doc/index-files/index-19.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-W-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="W-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-18.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;NEXT LETTER</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-19.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_W_"><!-- --></A><H2>
-<B>W</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#WEDGE"><B>WEDGE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCOutputStream.html#writeSong(org.herac.tuxguitar.song.models.TGSong)"><B>writeSong(TGSong)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCOutputStream</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-18.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;NEXT LETTER</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-19.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-2.html b/TuxGuitar-abc/doc/index-files/index-2.html
deleted file mode 100644
index 5e7020a4..00000000
--- a/TuxGuitar-abc/doc/index-files/index-2.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-B-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="B-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-1.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-3.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-2.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_B_"><!-- --></A><H2>
-<B>B</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR"><B>BAR</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR_BAR"><B>BAR_BAR</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR_FATBAR"><B>BAR_FATBAR</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BASSPROG"><B>BASSPROG</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BASSVOL"><B>BASSVOL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BREATH"><B>BREATH</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-1.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-3.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-2.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-3.html b/TuxGuitar-abc/doc/index-files/index-3.html
deleted file mode 100644
index dde9df90..00000000
--- a/TuxGuitar-abc/doc/index-files/index-3.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-C-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="C-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-2.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-4.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-3.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_C_"><!-- --></A><H2>
-<B>C</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORDPROG"><B>CHORDPROG</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORDVOL"><B>CHORDVOL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_BEGIN"><B>CHORD_BEGIN</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_CLOSE"><B>CHORD_CLOSE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_SYMBOL"><B>CHORD_SYMBOL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CODA"><B>CODA</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#check()"><B>check()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#clone()"><B>clone()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#clone(java.lang.String, int)"><B>clone(String, int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#compareTo(java.lang.Object)"><B>compareTo(Object)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#compareTo(java.lang.Object)"><B>compareTo(Object)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#computePitch(org.herac.tuxguitar.io.abc.base.ABCEvent, char[])"><B>computePitch(ABCEvent, char[])</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html#configure(boolean)"><B>configure(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#configure(boolean)"><B>configure(boolean)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html#copy()"><B>copy()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-2.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-4.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-3.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-4.html b/TuxGuitar-abc/doc/index-files/index-4.html
deleted file mode 100644
index d02dc139..00000000
--- a/TuxGuitar-abc/doc/index-files/index-4.html
+++ /dev/null
@@ -1,176 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-D-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="D-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-3.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-5.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-4.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_D_"><!-- --></A><H2>
-<B>D</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DACAPO"><B>DACAPO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DACODA"><B>DACODA</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DC"><B>DC</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DECORATION"><B>DECORATION</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DOWNBOW"><B>DOWNBOW</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONE"><B>DRONE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONEOFF"><B>DRONEOFF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONEON"><B>DRONEON</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUM"><B>DRUM</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUMOFF"><B>DRUMOFF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUMON"><B>DRUMON</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DS"><B>DS</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DSS"><B>DSS</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#directive(java.lang.String)"><B>directive(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-3.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-5.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-4.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-5.html b/TuxGuitar-abc/doc/index-files/index-5.html
deleted file mode 100644
index e37c3070..00000000
--- a/TuxGuitar-abc/doc/index-files/index-5.html
+++ /dev/null
@@ -1,152 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-E-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="E-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-4.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-6.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-5.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_E_"><!-- --></A><H2>
-<B>E</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDCRESCENDO"><B>ENDCRESCENDO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDDIMINUENDO"><B>ENDDIMINUENDO</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDTRILL"><B>ENDTRILL</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html#execute(java.lang.String)"><B>execute(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#execute(java.lang.String)"><B>execute(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html#exportSong(org.herac.tuxguitar.song.models.TGSong)"><B>exportSong(TGSong)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-4.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-6.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-5.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-6.html b/TuxGuitar-abc/doc/index-files/index-6.html
deleted file mode 100644
index ee055b15..00000000
--- a/TuxGuitar-abc/doc/index-files/index-6.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-F-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="F-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-5.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-7.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-6.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_F_"><!-- --></A><H2>
-<B>F</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#F"><B>F</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FATBAR_BAR"><B>FATBAR_BAR</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FERMATA"><B>FERMATA</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FF"><B>FF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FFF"><B>FFF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FFFF"><B>FFFF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINE"><B>FINE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_0"><B>FINGERING_0</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_1"><B>FINGERING_1</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_2"><B>FINGERING_2</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_3"><B>FINGERING_3</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_4"><B>FINGERING_4</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_5"><B>FINGERING_5</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#FIRST_MEASURE"><B>FIRST_MEASURE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_DOUBLE_STRINGS"><B>FLAG_DOUBLE_STRINGS</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_EFFECT_CHANNEL_DISABLED"><B>FLAG_EFFECT_CHANNEL_DISABLED</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_LET_RING"><B>FLAG_LET_RING</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_PEDAL_SABCEL_GUITAR"><B>FLAG_PEDAL_SABCEL_GUITAR</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_RHYTHM_TRACK"><B>FLAG_RHYTHM_TRACK</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-5.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-7.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-6.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-7.html b/TuxGuitar-abc/doc/index-files/index-7.html
deleted file mode 100644
index 4d1ad5d9..00000000
--- a/TuxGuitar-abc/doc/index-files/index-7.html
+++ /dev/null
@@ -1,524 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-G-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="G-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-6.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-8.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-7.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_G_"><!-- --></A><H2>
-<B>G</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORD"><B>GCHORD</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORDOFF"><B>GCHORDOFF</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORDON"><B>GCHORDON</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getArea()"><B>getArea()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getArtist()"><B>getArtist()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getAuthor()"><B>getAuthor()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getAuthor()"><B>getAuthor()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html#getAuthor()"><B>getAuthor()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getBarkey()"><B>getBarkey()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getBaseTrack()"><B>getBaseTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getBassprog()"><B>getBassprog()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getBassvol()"><B>getBassvol()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getBook()"><B>getBook()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getCapo()"><B>getCapo()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html#getChord()"><B>getChord()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getChord()"><B>getChord()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getChordTrack()"><B>getChordTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getChordnum()"><B>getChordnum()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChordprog()"><B>getChordprog()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChords()"><B>getChords()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChordvol()"><B>getChordvol()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getClefNumber()"><B>getClefNumber()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getClefType()"><B>getClefType()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getComments()"><B>getComments()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getComponist()"><B>getComponist()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#getData1()"><B>getData1()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#getData2()"><B>getData2()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getDeclaration()"><B>getDeclaration()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getDecoration()"><B>getDecoration()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDefaultNoteLength()"><B>getDefaultNoteLength()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getDefaults()"><B>getDefaults()</B></A> - 
-Static method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getDenominator()"><B>getDenominator()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#getDenominator()"><B>getDenominator()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getDescription()"><B>getDescription()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getDescription()"><B>getDescription()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html#getDescription()"><B>getDescription()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getDiagramTrack()"><B>getDiagramTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getDiscography()"><B>getDiscography()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDrone()"><B>getDrone()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getDroneTrack()"><B>getDroneTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDrum()"><B>getDrum()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getDuration()"><B>getDuration()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getDynamic()"><B>getDynamic()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getEffect()"><B>getEffect()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getEvent()"><B>getEvent()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getEvents()"><B>getEvents()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html#getExportName()"><B>getExportName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html#getFileFormat()"><B>getFileFormat()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#getFileFormat()"><B>getFileFormat()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getFilename()"><B>getFilename()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getFlags()"><B>getFlags()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getFret()"><B>getFret()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getFret()"><B>getFret()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getGchord()"><B>getGchord()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#getGchordChar(int)"><B>getGchordChar(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getGroup()"><B>getGroup()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getHistory()"><B>getHistory()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#getImportName()"><B>getImportName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getInfo()"><B>getInfo()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getInformation()"><B>getInformation()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getInstrument()"><B>getInstrument()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getKeySignature()"><B>getKeySignature()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getLegato()"><B>getLegato()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getLyrics()"><B>getLyrics()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getMeasure()"><B>getMeasure()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getMeasure()"><B>getMeasure()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#getMeasure()"><B>getMeasure()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#getMeasure()"><B>getMeasure()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getMeasureFrom()"><B>getMeasureFrom()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getMeasureTo()"><B>getMeasureTo()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getMeasures()"><B>getMeasures()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getMeasuresPerLine()"><B>getMeasuresPerLine()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getName()"><B>getName()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#getNote(char)"><B>getNote(char)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getNotes()"><B>getNotes()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getNumerator()"><B>getNumerator()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#getNumerator()"><B>getNumerator()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getOrigin()"><B>getOrigin()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getPan()"><B>getPan()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getParm()"><B>getParm()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getPart()"><B>getPart()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getPitch()"><B>getPitch()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getPosition()"><B>getPosition()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getRepeats()"><B>getRepeats()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getSequence()"><B>getSequence()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getSource()"><B>getSource()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getString()"><B>getString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getString()"><B>getString()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html#getStrings()"><B>getStrings()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getStrings()"><B>getStrings()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getStrings()"><B>getStrings()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getSubtitle()"><B>getSubtitle()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getTempo()"><B>getTempo()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTempo()"><B>getTempo()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTempo(int)"><B>getTempo(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#getTempo()"><B>getTempo()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTexts()"><B>getTexts()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTicks()"><B>getTicks()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getTicks()"><B>getTicks()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTimeSignature()"><B>getTimeSignature()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTimeSignature(int)"><B>getTimeSignature(int)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#getTimeSignature()"><B>getTimeSignature()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getTitle()"><B>getTitle()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getTrack()"><B>getTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getTrack()"><B>getTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTrack()"><B>getTrack()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTracks()"><B>getTracks()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getTranscriptor()"><B>getTranscriptor()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTripletP()"><B>getTripletP()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTripletQ()"><B>getTripletQ()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTripletR()"><B>getTripletR()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getType()"><B>getType()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getValue()"><B>getValue()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html#getValue()"><B>getValue()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html#getValue()"><B>getValue()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getVariant()"><B>getVariant()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getVelocity()"><B>getVelocity()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getVersion()"><B>getVersion()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getVersion()"><B>getVersion()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html#getVersion()"><B>getVersion()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#getVoice(java.lang.String)"><B>getVoice(String)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getVolume()"><B>getVolume()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#getX()"><B>getX()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-6.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-8.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-7.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-8.html b/TuxGuitar-abc/doc/index-files/index-8.html
deleted file mode 100644
index 16644119..00000000
--- a/TuxGuitar-abc/doc/index-files/index-8.html
+++ /dev/null
@@ -1,239 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-I-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="I-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-7.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-9.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-8.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_I_"><!-- --></A><H2>
-<B>I</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDFERMATA"><B>INVERTEDFERMATA</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDTURN"><B>INVERTEDTURN</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDTURNX"><B>INVERTEDTURNX</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#importSong()"><B>importSong()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html#init(org.herac.tuxguitar.song.factory.TGFactory, java.io.OutputStream)"><B>init(TGFactory, OutputStream)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html#init(org.herac.tuxguitar.song.factory.TGFactory, java.io.InputStream)"><B>init(TGFactory, InputStream)</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#initBody()"><B>initBody()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#initHead()"><B>initHead()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#isBagpipe()"><B>isBagpipe()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isChordDiagramEnabled()"><B>isChordDiagramEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isChordEnabled()"><B>isChordEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isDroneEnabled()"><B>isDroneEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#isDroneon()"><B>isDroneon()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#isDrumon()"><B>isDrumon()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#isGchordon()"><B>isGchordon()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isGrace()"><B>isGrace()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html#isHornpipe()"><B>isHornpipe()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isInstrumentsStartAt1()"><B>isInstrumentsStartAt1()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isLegato()"><B>isLegato()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isLyricsEnabled()"><B>isLyricsEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#isNil()"><B>isNil()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html#isPercussion()"><B>isPercussion()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isScoreEnabled()"><B>isScoreEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isStacato()"><B>isStacato()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isTablatureEnabled()"><B>isTablatureEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isTextEnabled()"><B>isTextEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isTied()"><B>isTied()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html#isTied()"><B>isTied()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isToEnd()"><B>isToEnd()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#isToEnd()"><B>isToEnd()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isTrackGroupEnabled()"><B>isTrackGroupEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#isTrackNameEnabled()"><B>isTrackNameEnabled()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isTriplet()"><B>isTriplet()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html#isValid()"><B>isValid()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#isValid()"><B>isValid()</B></A> - 
-Method in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-7.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-9.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-8.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index-files/index-9.html b/TuxGuitar-abc/doc/index-files/index-9.html
deleted file mode 100644
index 5e548930..00000000
--- a/TuxGuitar-abc/doc/index-files/index-9.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-L-Index
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="L-Index";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-8.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-10.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-9.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-<A NAME="_L_"><!-- --></A><H2>
-<B>L</B></H2>
-<DL>
-<DT><A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html#LAST_MEASURE"><B>LAST_MEASURE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.<A HREF="../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#LINE_BREAK"><B>LINE_BREAK</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#LONGPHRASE"><B>LONGPHRASE</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-<DT><A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html#LOWERMORDENT"><B>LOWERMORDENT</B></A> - 
-Static variable in class org.herac.tuxguitar.io.abc.base.<A HREF="../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>
-<DD>&nbsp;
-</DL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Index</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="index-8.html"><B>PREV LETTER</B></A>&nbsp;
-&nbsp;<A HREF="index-10.html"><B>NEXT LETTER</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="index-9.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<A HREF="index-1.html">A</A> <A HREF="index-2.html">B</A> <A HREF="index-3.html">C</A> <A HREF="index-4.html">D</A> <A HREF="index-5.html">E</A> <A HREF="index-6.html">F</A> <A HREF="index-7.html">G</A> <A HREF="index-8.html">I</A> <A HREF="index-9.html">L</A> <A HREF="index-10.html">M</A> <A HREF="index-11.html">N</A> <A HREF="index-12.html">O</A> <A HREF="index-13.html">P</A> <A HREF="index-14.html">R</A> <A HREF="index-15.html">S</A> <A HREF="index-16.html">T</A> <A HREF="index-17.html">U</A> <A HREF="index-18.html">V</A> <A HREF="index-19.html">W</A> <HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/index.html b/TuxGuitar-abc/doc/index.html
deleted file mode 100644
index 971c213b..00000000
--- a/TuxGuitar-abc/doc/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc on Fri Jul 15 19:51:32 GMT+01:00 2011-->
-<TITLE>
-Generated Documentation (Untitled)
-</TITLE>
-</HEAD>
-<FRAMESET cols="20%,80%">
-<FRAMESET rows="30%,70%">
-<FRAME src="overview-frame.html" name="packageListFrame" title="All Packages">
-<FRAME src="allclasses-frame.html" name="packageFrame" title="All classes and interfaces (except non-static nested types)">
-</FRAMESET>
-<FRAME src="overview-summary.html" name="classFrame" title="Package, class and interface descriptions">
-<NOFRAMES>
-<H2>
-Frame Alert</H2>
-
-<P>
-This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client.
-<BR>
-Link to<A HREF="overview-summary.html">Non-frame version.</A>
-</NOFRAMES>
-</FRAMESET>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html
deleted file mode 100644
index 170fcef1..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-ABCExportSettingsDialog
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCExportSettingsDialog class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCExportSettingsDialog";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCExportSettingsDialog.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCExportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCExportSettingsDialog</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCExportSettingsDialog</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCExportSettingsDialog</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html#ABCExportSettingsDialog()">ABCExportSettingsDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html#open()">open</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCExportSettingsDialog()"><!-- --></A><H3>
-ABCExportSettingsDialog</H3>
-<PRE>
-public <B>ABCExportSettingsDialog</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="open()"><!-- --></A><H3>
-open</H3>
-<PRE>
-public <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A> <B>open</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCExportSettingsDialog.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCExportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html
deleted file mode 100644
index a905fb24..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-ABCImportSettingsDialog
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCImportSettingsDialog class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCImportSettingsDialog";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCImportSettingsDialog.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCImportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCImportSettingsDialog</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCImportSettingsDialog</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCImportSettingsDialog</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html#ABCImportSettingsDialog()">ABCImportSettingsDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html#open()">open</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCImportSettingsDialog()"><!-- --></A><H3>
-ABCImportSettingsDialog</H3>
-<PRE>
-public <B>ABCImportSettingsDialog</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="open()"><!-- --></A><H3>
-open</H3>
-<PRE>
-public <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A> <B>open</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCImportSettingsDialog.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCImportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCInputStream.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCInputStream.html
deleted file mode 100644
index 828ac63a..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCInputStream.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCInputStream
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCInputStream class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCInputStream";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCInputStream.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCInputStream</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCInputStream</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCInputStream</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html#ABCInputStream(java.io.InputStream, org.herac.tuxguitar.io.abc.ABCSettings)">ABCInputStream</A></B>(java.io.InputStream&nbsp;stream,
-               <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>&nbsp;settings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html#readSong()">readSong</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCInputStream(java.io.InputStream, org.herac.tuxguitar.io.abc.ABCSettings)"><!-- --></A><H3>
-ABCInputStream</H3>
-<PRE>
-public <B>ABCInputStream</B>(java.io.InputStream&nbsp;stream,
-                      <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>&nbsp;settings)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="readSong()"><!-- --></A><H3>
-readSong</H3>
-<PRE>
-public <A HREF="../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A> <B>readSong</B>()
-                 throws org.herac.tuxguitar.io.base.TGFileFormatException</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>org.herac.tuxguitar.io.base.TGFileFormatException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCInputStream.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCOutputStream.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCOutputStream.html
deleted file mode 100644
index 8d60e6ad..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCOutputStream.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCOutputStream
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCOutputStream class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCOutputStream";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCOutputStream.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOutputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCOutputStream</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCOutputStream</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCOutputStream</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html#ABCOutputStream(java.io.OutputStream, org.herac.tuxguitar.io.abc.ABCSettings)">ABCOutputStream</A></B>(java.io.OutputStream&nbsp;stream,
-                <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>&nbsp;settings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html#writeSong(org.herac.tuxguitar.song.models.TGSong)">writeSong</A></B>(org.herac.tuxguitar.song.models.TGSong&nbsp;song)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCOutputStream(java.io.OutputStream, org.herac.tuxguitar.io.abc.ABCSettings)"><!-- --></A><H3>
-ABCOutputStream</H3>
-<PRE>
-public <B>ABCOutputStream</B>(java.io.OutputStream&nbsp;stream,
-                       <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>&nbsp;settings)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="writeSong(org.herac.tuxguitar.song.models.TGSong)"><!-- --></A><H3>
-writeSong</H3>
-<PRE>
-public void <B>writeSong</B>(org.herac.tuxguitar.song.models.TGSong&nbsp;song)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCOutputStream.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOutputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginExporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginExporter.html
deleted file mode 100644
index cc2db93b..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginExporter.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCPluginExporter
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCPluginExporter class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCPluginExporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPluginExporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCPluginExporter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">org.herac.tuxguitar.gui.system.plugins.base.TGPluginAdapter
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">org.herac.tuxguitar.gui.system.plugins.base.TGExporterPlugin
-          <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCPluginExporter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>org.herac.tuxguitar.gui.system.plugins.TGPlugin</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCPluginExporter</B><DT>extends org.herac.tuxguitar.gui.system.plugins.base.TGExporterPlugin</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#ABCPluginExporter()">ABCPluginExporter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getAuthor()">getAuthor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getDescription()">getDescription</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_org.herac.tuxguitar.gui.system.plugins.base.TGExporterPlugin"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class org.herac.tuxguitar.gui.system.plugins.base.TGExporterPlugin</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>close, init, setEnabled</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCPluginExporter()"><!-- --></A><H3>
-ABCPluginExporter</H3>
-<PRE>
-public <B>ABCPluginExporter</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getAuthor()"><!-- --></A><H3>
-getAuthor</H3>
-<PRE>
-public java.lang.String <B>getAuthor</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDescription()"><!-- --></A><H3>
-getDescription</H3>
-<PRE>
-public java.lang.String <B>getDescription</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public java.lang.String <B>getVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPluginExporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginImporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginImporter.html
deleted file mode 100644
index 4f32f4e6..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginImporter.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCPluginImporter
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCPluginImporter class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCPluginImporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPluginImporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCPluginImporter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">org.herac.tuxguitar.gui.system.plugins.base.TGPluginAdapter
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">org.herac.tuxguitar.gui.system.plugins.base.TGImporterPlugin
-          <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCPluginImporter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>org.herac.tuxguitar.gui.system.plugins.TGPlugin</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCPluginImporter</B><DT>extends org.herac.tuxguitar.gui.system.plugins.base.TGImporterPlugin</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#ABCPluginImporter()">ABCPluginImporter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getAuthor()">getAuthor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getDescription()">getDescription</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_org.herac.tuxguitar.gui.system.plugins.base.TGImporterPlugin"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class org.herac.tuxguitar.gui.system.plugins.base.TGImporterPlugin</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>close, init, setEnabled</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCPluginImporter()"><!-- --></A><H3>
-ABCPluginImporter</H3>
-<PRE>
-public <B>ABCPluginImporter</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getAuthor()"><!-- --></A><H3>
-getAuthor</H3>
-<PRE>
-public java.lang.String <B>getAuthor</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDescription()"><!-- --></A><H3>
-getDescription</H3>
-<PRE>
-public java.lang.String <B>getDescription</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public java.lang.String <B>getVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPluginImporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginList.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginList.html
deleted file mode 100644
index 4d8dcba6..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCPluginList.html
+++ /dev/null
@@ -1,323 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCPluginList
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCPluginList class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCPluginList";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPluginList.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginList.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCPluginList</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">org.herac.tuxguitar.gui.system.plugins.base.TGPluginAdapter
-      <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by">org.herac.tuxguitar.gui.system.plugins.base.TGPluginList
-          <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCPluginList</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>org.herac.tuxguitar.gui.system.plugins.TGPlugin</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCPluginList</B><DT>extends org.herac.tuxguitar.gui.system.plugins.base.TGPluginList</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html#ABCPluginList()">ABCPluginList</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html#getAuthor()">getAuthor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html#getDescription()">getDescription</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html#getVersion()">getVersion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_org.herac.tuxguitar.gui.system.plugins.base.TGPluginList"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class org.herac.tuxguitar.gui.system.plugins.base.TGPluginList</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>close, init, setEnabled</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCPluginList()"><!-- --></A><H3>
-ABCPluginList</H3>
-<PRE>
-public <B>ABCPluginList</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getAuthor()"><!-- --></A><H3>
-getAuthor</H3>
-<PRE>
-public java.lang.String <B>getAuthor</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDescription()"><!-- --></A><H3>
-getDescription</H3>
-<PRE>
-public java.lang.String <B>getDescription</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVersion()"><!-- --></A><H3>
-getVersion</H3>
-<PRE>
-public java.lang.String <B>getVersion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPluginList.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginList.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSettings.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSettings.html
deleted file mode 100644
index 4d92eb5f..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSettings.html
+++ /dev/null
@@ -1,1121 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCSettings
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCSettings class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCSettings";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSettings.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCSettings</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCSettings</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCSettings</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#ALL_TRACKS">ALL_TRACKS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#AUTO_MEASURES">AUTO_MEASURES</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#AUTO_TRACK">AUTO_TRACK</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#FIRST_MEASURE">FIRST_MEASURE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#LAST_MEASURE">LAST_MEASURE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#NO_TRACK">NO_TRACK</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#ABCSettings()">ABCSettings</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#check()">check</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getBaseTrack()">getBaseTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getChordTrack()">getChordTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getDefaults()">getDefaults</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getDiagramTrack()">getDiagramTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getDroneTrack()">getDroneTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getMeasureFrom()">getMeasureFrom</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getMeasuresPerLine()">getMeasuresPerLine</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getMeasureTo()">getMeasureTo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getTrack()">getTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getX()">getX</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isChordDiagramEnabled()">isChordDiagramEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isChordEnabled()">isChordEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isDroneEnabled()">isDroneEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isInstrumentsStartAt1()">isInstrumentsStartAt1</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isLyricsEnabled()">isLyricsEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isScoreEnabled()">isScoreEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isTablatureEnabled()">isTablatureEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isTextEnabled()">isTextEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isTrackGroupEnabled()">isTrackGroupEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#isTrackNameEnabled()">isTrackNameEnabled</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setBaseTrack(int)">setBaseTrack</A></B>(int&nbsp;baseTrack)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setChordDiagramEnabled(boolean)">setChordDiagramEnabled</A></B>(boolean&nbsp;chordDiagramEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setChordEnabled(boolean)">setChordEnabled</A></B>(boolean&nbsp;chordEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setChordTrack(int)">setChordTrack</A></B>(int&nbsp;chordTrack)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setDiagramTrack(int)">setDiagramTrack</A></B>(int&nbsp;diagramTrack)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setDroneEnabled(boolean)">setDroneEnabled</A></B>(boolean&nbsp;droneEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setDroneTrack(int)">setDroneTrack</A></B>(int&nbsp;droneTrack)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setInstrumentsStartAt1(boolean)">setInstrumentsStartAt1</A></B>(boolean&nbsp;instrumentsStartAt1)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setLyricsEnabled(boolean)">setLyricsEnabled</A></B>(boolean&nbsp;lyricsEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setMeasureFrom(int)">setMeasureFrom</A></B>(int&nbsp;measureFrom)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setMeasuresPerLine(int)">setMeasuresPerLine</A></B>(int&nbsp;measuresPerLine)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setMeasureTo(int)">setMeasureTo</A></B>(int&nbsp;measureTo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setScoreEnabled(boolean)">setScoreEnabled</A></B>(boolean&nbsp;scoreEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setTablatureEnabled(boolean)">setTablatureEnabled</A></B>(boolean&nbsp;tablatureEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setTextEnabled(boolean)">setTextEnabled</A></B>(boolean&nbsp;textEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setTrack(int)">setTrack</A></B>(int&nbsp;track)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setTrackGroupEnabled(boolean)">setTrackGroupEnabled</A></B>(boolean&nbsp;trackGroupEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setTrackNameEnabled(boolean)">setTrackNameEnabled</A></B>(boolean&nbsp;trackNameEnabled)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#setX(int)">setX</A></B>(int&nbsp;x)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ALL_TRACKS"><!-- --></A><H3>
-ALL_TRACKS</H3>
-<PRE>
-public static final int <B>ALL_TRACKS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#org.herac.tuxguitar.io.abc.ABCSettings.ALL_TRACKS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FIRST_MEASURE"><!-- --></A><H3>
-FIRST_MEASURE</H3>
-<PRE>
-public static final int <B>FIRST_MEASURE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#org.herac.tuxguitar.io.abc.ABCSettings.FIRST_MEASURE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LAST_MEASURE"><!-- --></A><H3>
-LAST_MEASURE</H3>
-<PRE>
-public static final int <B>LAST_MEASURE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#org.herac.tuxguitar.io.abc.ABCSettings.LAST_MEASURE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="AUTO_MEASURES"><!-- --></A><H3>
-AUTO_MEASURES</H3>
-<PRE>
-public static final int <B>AUTO_MEASURES</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#org.herac.tuxguitar.io.abc.ABCSettings.AUTO_MEASURES">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="AUTO_TRACK"><!-- --></A><H3>
-AUTO_TRACK</H3>
-<PRE>
-public static final int <B>AUTO_TRACK</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#org.herac.tuxguitar.io.abc.ABCSettings.AUTO_TRACK">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="NO_TRACK"><!-- --></A><H3>
-NO_TRACK</H3>
-<PRE>
-public static final int <B>NO_TRACK</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../constant-values.html#org.herac.tuxguitar.io.abc.ABCSettings.NO_TRACK">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCSettings()"><!-- --></A><H3>
-ABCSettings</H3>
-<PRE>
-public <B>ABCSettings</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getMeasureFrom()"><!-- --></A><H3>
-getMeasureFrom</H3>
-<PRE>
-public int <B>getMeasureFrom</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMeasureFrom(int)"><!-- --></A><H3>
-setMeasureFrom</H3>
-<PRE>
-public void <B>setMeasureFrom</B>(int&nbsp;measureFrom)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMeasureTo()"><!-- --></A><H3>
-getMeasureTo</H3>
-<PRE>
-public int <B>getMeasureTo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMeasureTo(int)"><!-- --></A><H3>
-setMeasureTo</H3>
-<PRE>
-public void <B>setMeasureTo</B>(int&nbsp;measureTo)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTrack()"><!-- --></A><H3>
-getTrack</H3>
-<PRE>
-public int <B>getTrack</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTrack(int)"><!-- --></A><H3>
-setTrack</H3>
-<PRE>
-public void <B>setTrack</B>(int&nbsp;track)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTrackGroupEnabled()"><!-- --></A><H3>
-isTrackGroupEnabled</H3>
-<PRE>
-public boolean <B>isTrackGroupEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTrackGroupEnabled(boolean)"><!-- --></A><H3>
-setTrackGroupEnabled</H3>
-<PRE>
-public void <B>setTrackGroupEnabled</B>(boolean&nbsp;trackGroupEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTrackNameEnabled()"><!-- --></A><H3>
-isTrackNameEnabled</H3>
-<PRE>
-public boolean <B>isTrackNameEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTrackNameEnabled(boolean)"><!-- --></A><H3>
-setTrackNameEnabled</H3>
-<PRE>
-public void <B>setTrackNameEnabled</B>(boolean&nbsp;trackNameEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isScoreEnabled()"><!-- --></A><H3>
-isScoreEnabled</H3>
-<PRE>
-public boolean <B>isScoreEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setScoreEnabled(boolean)"><!-- --></A><H3>
-setScoreEnabled</H3>
-<PRE>
-public void <B>setScoreEnabled</B>(boolean&nbsp;scoreEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTablatureEnabled()"><!-- --></A><H3>
-isTablatureEnabled</H3>
-<PRE>
-public boolean <B>isTablatureEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTablatureEnabled(boolean)"><!-- --></A><H3>
-setTablatureEnabled</H3>
-<PRE>
-public void <B>setTablatureEnabled</B>(boolean&nbsp;tablatureEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isLyricsEnabled()"><!-- --></A><H3>
-isLyricsEnabled</H3>
-<PRE>
-public boolean <B>isLyricsEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLyricsEnabled(boolean)"><!-- --></A><H3>
-setLyricsEnabled</H3>
-<PRE>
-public void <B>setLyricsEnabled</B>(boolean&nbsp;lyricsEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isChordDiagramEnabled()"><!-- --></A><H3>
-isChordDiagramEnabled</H3>
-<PRE>
-public boolean <B>isChordDiagramEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChordDiagramEnabled(boolean)"><!-- --></A><H3>
-setChordDiagramEnabled</H3>
-<PRE>
-public void <B>setChordDiagramEnabled</B>(boolean&nbsp;chordDiagramEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTextEnabled()"><!-- --></A><H3>
-isTextEnabled</H3>
-<PRE>
-public boolean <B>isTextEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTextEnabled(boolean)"><!-- --></A><H3>
-setTextEnabled</H3>
-<PRE>
-public void <B>setTextEnabled</B>(boolean&nbsp;textEnabled)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="check()"><!-- --></A><H3>
-check</H3>
-<PRE>
-public void <B>check</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDefaults()"><!-- --></A><H3>
-getDefaults</H3>
-<PRE>
-public static <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A> <B>getDefaults</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getX()"><!-- --></A><H3>
-getX</H3>
-<PRE>
-public int <B>getX</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the x</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setX(int)"><!-- --></A><H3>
-setX</H3>
-<PRE>
-public void <B>setX</B>(int&nbsp;x)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>x</CODE> - the x to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isInstrumentsStartAt1()"><!-- --></A><H3>
-isInstrumentsStartAt1</H3>
-<PRE>
-public boolean <B>isInstrumentsStartAt1</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the instrumentsStartAt1</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setInstrumentsStartAt1(boolean)"><!-- --></A><H3>
-setInstrumentsStartAt1</H3>
-<PRE>
-public void <B>setInstrumentsStartAt1</B>(boolean&nbsp;instrumentsStartAt1)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>instrumentsStartAt1</CODE> - the instrumentsStartAt1 to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMeasuresPerLine()"><!-- --></A><H3>
-getMeasuresPerLine</H3>
-<PRE>
-public int <B>getMeasuresPerLine</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMeasuresPerLine(int)"><!-- --></A><H3>
-setMeasuresPerLine</H3>
-<PRE>
-public void <B>setMeasuresPerLine</B>(int&nbsp;measuresPerLine)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>measuresPerLine</CODE> - the measuresPerLine to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBaseTrack()"><!-- --></A><H3>
-getBaseTrack</H3>
-<PRE>
-public int <B>getBaseTrack</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the baseTrack</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBaseTrack(int)"><!-- --></A><H3>
-setBaseTrack</H3>
-<PRE>
-public void <B>setBaseTrack</B>(int&nbsp;baseTrack)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>baseTrack</CODE> - the baseTrack to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChordTrack()"><!-- --></A><H3>
-getChordTrack</H3>
-<PRE>
-public int <B>getChordTrack</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the chordTrack</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChordTrack(int)"><!-- --></A><H3>
-setChordTrack</H3>
-<PRE>
-public void <B>setChordTrack</B>(int&nbsp;chordTrack)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>chordTrack</CODE> - the chordTrack to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDiagramTrack()"><!-- --></A><H3>
-getDiagramTrack</H3>
-<PRE>
-public int <B>getDiagramTrack</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the diagramTrack</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDiagramTrack(int)"><!-- --></A><H3>
-setDiagramTrack</H3>
-<PRE>
-public void <B>setDiagramTrack</B>(int&nbsp;diagramTrack)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>diagramTrack</CODE> - the diagramTrack to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDroneTrack()"><!-- --></A><H3>
-getDroneTrack</H3>
-<PRE>
-public int <B>getDroneTrack</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDroneTrack(int)"><!-- --></A><H3>
-setDroneTrack</H3>
-<PRE>
-public void <B>setDroneTrack</B>(int&nbsp;droneTrack)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>droneTrack</CODE> - the droneTrack to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isDroneEnabled()"><!-- --></A><H3>
-isDroneEnabled</H3>
-<PRE>
-public boolean <B>isDroneEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the droneEnabled</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDroneEnabled(boolean)"><!-- --></A><H3>
-setDroneEnabled</H3>
-<PRE>
-public void <B>setDroneEnabled</B>(boolean&nbsp;droneEnabled)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>droneEnabled</CODE> - the droneEnabled to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isChordEnabled()"><!-- --></A><H3>
-isChordEnabled</H3>
-<PRE>
-public boolean <B>isChordEnabled</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the chordEnabled</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChordEnabled(boolean)"><!-- --></A><H3>
-setChordEnabled</H3>
-<PRE>
-public void <B>setChordEnabled</B>(boolean&nbsp;chordEnabled)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>chordEnabled</CODE> - the chordEnabled to set</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSettings.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSettingsDialog.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSettingsDialog.html
deleted file mode 100644
index ee4f3c2a..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSettingsDialog.html
+++ /dev/null
@@ -1,252 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Sun Jun 26 09:16:56 GMT+01:00 2011 -->
-<TITLE>
-ABCSettingsDialog
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCSettingsDialog class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCSettingsDialog";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSettingsDialog.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCSettingsDialog</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCSettingsDialog</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCSettingsDialog</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettingsDialog.html#ABCSettingsDialog()">ABCSettingsDialog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettingsDialog.html#open()">open</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCSettingsDialog()"><!-- --></A><H3>
-ABCSettingsDialog</H3>
-<PRE>
-public <B>ABCSettingsDialog</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="open()"><!-- --></A><H3>
-open</H3>
-<PRE>
-public <A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A> <B>open</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSettingsDialog.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSongExporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSongExporter.html
deleted file mode 100644
index 2cdb9315..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSongExporter.html
+++ /dev/null
@@ -1,348 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCSongExporter
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCSongExporter class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCSongExporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSongExporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCSongExporter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCSongExporter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>org.herac.tuxguitar.io.base.TGLocalFileExporter, org.herac.tuxguitar.io.base.TGRawExporter</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCSongExporter</B><DT>extends java.lang.Object<DT>implements org.herac.tuxguitar.io.base.TGLocalFileExporter</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html#ABCSongExporter()">ABCSongExporter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html#configure(boolean)">configure</A></B>(boolean&nbsp;setDefaults)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html#exportSong(org.herac.tuxguitar.song.models.TGSong)">exportSong</A></B>(org.herac.tuxguitar.song.models.TGSong&nbsp;song)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html#getExportName()">getExportName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.herac.tuxguitar.io.base.TGFileFormat</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html#getFileFormat()">getFileFormat</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html#init(org.herac.tuxguitar.song.factory.TGFactory, java.io.OutputStream)">init</A></B>(org.herac.tuxguitar.song.factory.TGFactory&nbsp;factory,
-     java.io.OutputStream&nbsp;stream)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCSongExporter()"><!-- --></A><H3>
-ABCSongExporter</H3>
-<PRE>
-public <B>ABCSongExporter</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getExportName()"><!-- --></A><H3>
-getExportName</H3>
-<PRE>
-public java.lang.String <B>getExportName</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>getExportName</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGRawExporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFileFormat()"><!-- --></A><H3>
-getFileFormat</H3>
-<PRE>
-public org.herac.tuxguitar.io.base.TGFileFormat <B>getFileFormat</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>getFileFormat</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGLocalFileExporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="configure(boolean)"><!-- --></A><H3>
-configure</H3>
-<PRE>
-public boolean <B>configure</B>(boolean&nbsp;setDefaults)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>configure</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGLocalFileExporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="init(org.herac.tuxguitar.song.factory.TGFactory, java.io.OutputStream)"><!-- --></A><H3>
-init</H3>
-<PRE>
-public void <B>init</B>(org.herac.tuxguitar.song.factory.TGFactory&nbsp;factory,
-                 java.io.OutputStream&nbsp;stream)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>init</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGLocalFileExporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="exportSong(org.herac.tuxguitar.song.models.TGSong)"><!-- --></A><H3>
-exportSong</H3>
-<PRE>
-public void <B>exportSong</B>(org.herac.tuxguitar.song.models.TGSong&nbsp;song)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>exportSong</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGRawExporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSongExporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSongImporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSongImporter.html
deleted file mode 100644
index 3fd641c4..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/ABCSongImporter.html
+++ /dev/null
@@ -1,382 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCSongImporter
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.ABCSongImporter class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCSongImporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSongImporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc</FONT>
-<BR>
-Class ABCSongImporter</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.ABCSongImporter</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>org.herac.tuxguitar.io.base.TGLocalFileImporter, org.herac.tuxguitar.io.base.TGRawImporter</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCSongImporter</B><DT>extends java.lang.Object<DT>implements org.herac.tuxguitar.io.base.TGLocalFileImporter</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int[][]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#PERCUSSION_TUNINGS">PERCUSSION_TUNINGS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#ABCSongImporter()">ABCSongImporter</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#configure(boolean)">configure</A></B>(boolean&nbsp;setDefaults)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.herac.tuxguitar.io.base.TGFileFormat</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#getFileFormat()">getFileFormat</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#getImportName()">getImportName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.herac.tuxguitar.song.models.TGSong</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#importSong()">importSong</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html#init(org.herac.tuxguitar.song.factory.TGFactory, java.io.InputStream)">init</A></B>(org.herac.tuxguitar.song.factory.TGFactory&nbsp;factory,
-     java.io.InputStream&nbsp;stream)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="PERCUSSION_TUNINGS"><!-- --></A><H3>
-PERCUSSION_TUNINGS</H3>
-<PRE>
-public static final int[][] <B>PERCUSSION_TUNINGS</B></PRE>
-<DL>
-<DL>
-</DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCSongImporter()"><!-- --></A><H3>
-ABCSongImporter</H3>
-<PRE>
-public <B>ABCSongImporter</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getFileFormat()"><!-- --></A><H3>
-getFileFormat</H3>
-<PRE>
-public org.herac.tuxguitar.io.base.TGFileFormat <B>getFileFormat</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>getFileFormat</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGLocalFileImporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getImportName()"><!-- --></A><H3>
-getImportName</H3>
-<PRE>
-public java.lang.String <B>getImportName</B>()</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>getImportName</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGRawImporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="configure(boolean)"><!-- --></A><H3>
-configure</H3>
-<PRE>
-public boolean <B>configure</B>(boolean&nbsp;setDefaults)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>configure</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGLocalFileImporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="init(org.herac.tuxguitar.song.factory.TGFactory, java.io.InputStream)"><!-- --></A><H3>
-init</H3>
-<PRE>
-public void <B>init</B>(org.herac.tuxguitar.song.factory.TGFactory&nbsp;factory,
-                 java.io.InputStream&nbsp;stream)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>init</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGLocalFileImporter</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="importSong()"><!-- --></A><H3>
-importSong</H3>
-<PRE>
-public org.herac.tuxguitar.song.models.TGSong <B>importSong</B>()
-                                                  throws org.herac.tuxguitar.io.base.TGFileFormatException</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>importSong</CODE> in interface <CODE>org.herac.tuxguitar.io.base.TGRawImporter</CODE></DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE>org.herac.tuxguitar.io.base.TGFileFormatException</CODE></DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSongImporter.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCChord.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCChord.html
deleted file mode 100644
index b7a14522..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCChord.html
+++ /dev/null
@@ -1,347 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCChord
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCChord class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCChord";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCChord.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCChord</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCChord</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCChord</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#ABCChord(java.lang.String)">ABCChord</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;char</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#getGchordChar(int)">getGchordChar</A></B>(int&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#getNote(char)">getNote</A></B>(char&nbsp;c)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;byte[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#getStrings()">getStrings</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#size()">size</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCChord(java.lang.String)"><!-- --></A><H3>
-ABCChord</H3>
-<PRE>
-public <B>ABCChord</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getStrings()"><!-- --></A><H3>
-getStrings</H3>
-<PRE>
-public byte[] <B>getStrings</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="size()"><!-- --></A><H3>
-size</H3>
-<PRE>
-public int <B>size</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNote(char)"><!-- --></A><H3>
-getNote</H3>
-<PRE>
-public java.lang.String <B>getNote</B>(char&nbsp;c)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGchordChar(int)"><!-- --></A><H3>
-getGchordChar</H3>
-<PRE>
-public char <B>getGchordChar</B>(int&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCChord.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV CLASS&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponent.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponent.html
deleted file mode 100644
index 98f7835c..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponent.html
+++ /dev/null
@@ -1,297 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCComponent
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCComponent class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCComponent";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCComponent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCComponent</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCComponent</B>
-</PRE>
-<DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A>, <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A></DD>
-</DL>
-<HR>
-<DL>
-<DT>public abstract class <B>ABCComponent</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#ABCComponent(int, int, int)">ABCComponent</A></B>(int&nbsp;position,
-             int&nbsp;measure,
-             int&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getMeasure()">getMeasure</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getPosition()">getPosition</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getString()">getString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCComponent(int, int, int)"><!-- --></A><H3>
-ABCComponent</H3>
-<PRE>
-public <B>ABCComponent</B>(int&nbsp;position,
-                    int&nbsp;measure,
-                    int&nbsp;string)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getPosition()"><!-- --></A><H3>
-getPosition</H3>
-<PRE>
-public int <B>getPosition</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMeasure()"><!-- --></A><H3>
-getMeasure</H3>
-<PRE>
-public int <B>getMeasure</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getString()"><!-- --></A><H3>
-getString</H3>
-<PRE>
-public int <B>getString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCComponent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponentChord.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponentChord.html
deleted file mode 100644
index c3db2d04..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponentChord.html
+++ /dev/null
@@ -1,287 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCComponentChord
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCComponentChord class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCComponentChord";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCComponentChord.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCComponentChord</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">org.herac.tuxguitar.io.abc.base.ABCComponent</A>
-      <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCComponentChord</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCComponentChord</B><DT>extends <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A></DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html#ABCComponentChord(int, int, int, int)">ABCComponentChord</A></B>(int&nbsp;position,
-                  int&nbsp;measure,
-                  int&nbsp;string,
-                  int&nbsp;chord)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html#getChord()">getChord</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_org.herac.tuxguitar.io.abc.base.ABCComponent"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getMeasure()">getMeasure</A>, <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getPosition()">getPosition</A>, <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getString()">getString</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCComponentChord(int, int, int, int)"><!-- --></A><H3>
-ABCComponentChord</H3>
-<PRE>
-public <B>ABCComponentChord</B>(int&nbsp;position,
-                         int&nbsp;measure,
-                         int&nbsp;string,
-                         int&nbsp;chord)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getChord()"><!-- --></A><H3>
-getChord</H3>
-<PRE>
-public int <B>getChord</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCComponentChord.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponentNote.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponentNote.html
deleted file mode 100644
index 795d9b43..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCComponentNote.html
+++ /dev/null
@@ -1,350 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCComponentNote
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCComponentNote class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCComponentNote";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCComponentNote.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentNote.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCComponentNote</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">org.herac.tuxguitar.io.abc.base.ABCComponent</A>
-      <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCComponentNote</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCComponentNote</B><DT>extends <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A></DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#ABCComponentNote(int, int, int, int, int, int, int)">ABCComponentNote</A></B>(int&nbsp;position,
-                 int&nbsp;measure,
-                 int&nbsp;string,
-                 int&nbsp;fret,
-                 int&nbsp;duration,
-                 int&nbsp;dynamic,
-                 int&nbsp;effect)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getDuration()">getDuration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getDynamic()">getDynamic</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getEffect()">getEffect</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#getFret()">getFret</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_org.herac.tuxguitar.io.abc.base.ABCComponent"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A></B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getMeasure()">getMeasure</A>, <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getPosition()">getPosition</A>, <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html#getString()">getString</A></CODE></TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCComponentNote(int, int, int, int, int, int, int)"><!-- --></A><H3>
-ABCComponentNote</H3>
-<PRE>
-public <B>ABCComponentNote</B>(int&nbsp;position,
-                        int&nbsp;measure,
-                        int&nbsp;string,
-                        int&nbsp;fret,
-                        int&nbsp;duration,
-                        int&nbsp;dynamic,
-                        int&nbsp;effect)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getDuration()"><!-- --></A><H3>
-getDuration</H3>
-<PRE>
-public int <B>getDuration</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDynamic()"><!-- --></A><H3>
-getDynamic</H3>
-<PRE>
-public int <B>getDynamic</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEffect()"><!-- --></A><H3>
-getEffect</H3>
-<PRE>
-public int <B>getEffect</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFret()"><!-- --></A><H3>
-getFret</H3>
-<PRE>
-public int <B>getFret</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCComponentNote.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentNote.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCEvent.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCEvent.html
deleted file mode 100644
index 8de40d6b..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCEvent.html
+++ /dev/null
@@ -1,2988 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCEvent
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCEvent class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCEvent";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCEvent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCEvent</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCEvent</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Comparable</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCEvent</B><DT>extends java.lang.Object<DT>implements java.lang.Comparable</DL>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>peter</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ACCENT">ACCENT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ALCODA">ALCODA</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ALFINE">ALFINE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ANNOTATION">ANNOTATION</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ARPEGGIO">ARPEGGIO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR">BAR</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR_BAR">BAR_BAR</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BAR_FATBAR">BAR_FATBAR</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BASSPROG">BASSPROG</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BASSVOL">BASSVOL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#BREATH">BREATH</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_BEGIN">CHORD_BEGIN</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_CLOSE">CHORD_CLOSE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORD_SYMBOL">CHORD_SYMBOL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORDPROG">CHORDPROG</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CHORDVOL">CHORDVOL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#CODA">CODA</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DACAPO">DACAPO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DACODA">DACODA</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DC">DC</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DECORATION">DECORATION</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DOWNBOW">DOWNBOW</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONE">DRONE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONEOFF">DRONEOFF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRONEON">DRONEON</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUM">DRUM</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUMOFF">DRUMOFF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DRUMON">DRUMON</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DS">DS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#DSS">DSS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDCRESCENDO">ENDCRESCENDO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDDIMINUENDO">ENDDIMINUENDO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ENDTRILL">ENDTRILL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#F">F</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FATBAR_BAR">FATBAR_BAR</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FERMATA">FERMATA</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FF">FF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FFF">FFF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FFFF">FFFF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINE">FINE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_0">FINGERING_0</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_1">FINGERING_1</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_2">FINGERING_2</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_3">FINGERING_3</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_4">FINGERING_4</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#FINGERING_5">FINGERING_5</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORD">GCHORD</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORDOFF">GCHORDOFF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#GCHORDON">GCHORDON</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDFERMATA">INVERTEDFERMATA</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDTURN">INVERTEDTURN</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#INVERTEDTURNX">INVERTEDTURNX</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#LINE_BREAK">LINE_BREAK</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#LONGPHRASE">LONGPHRASE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#LOWERMORDENT">LOWERMORDENT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#MEDIUMPHRASE">MEDIUMPHRASE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#MF">MF</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#MP">MP</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#NOT_RELEVANT">NOT_RELEVANT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#NOTE">NOTE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#OPEN">OPEN</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#P">P</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PLUS">PLUS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PP">PP</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PPP">PPP</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#PPPP">PPPP</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_BEGIN">REPEAT_BEGIN</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_END">REPEAT_END</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REPEAT_END_AND_START">REPEAT_END_AND_START</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#REST">REST</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ROLL">ROLL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SEGNO">SEGNO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SFZ">SFZ</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SHORTPHRASE">SHORTPHRASE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#SLIDE">SLIDE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STACATODOT">STACATODOT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTCRESCENDO">STARTCRESCENDO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTDIMINUENDO">STARTDIMINUENDO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#STARTTRILL">STARTTRILL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TEMPO">TEMPO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TENUTO">TENUTO</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#THUMB">THUMB</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TIME">TIME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TOCODA">TOCODA</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TRILL">TRILL</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TURN">TURN</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#TURNX">TURNX</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#UPBOW">UPBOW</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#UPPERMORDENT">UPPERMORDENT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#VARIANT">VARIANT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#WEDGE">WEDGE</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ABCEvent(org.herac.tuxguitar.io.abc.base.ABCSong, java.lang.String)">ABCEvent</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>&nbsp;song,
-         java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ABCEvent(int, java.lang.String, int)">ABCEvent</A></B>(int&nbsp;type,
-         java.lang.String&nbsp;parm,
-         int&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#alterString(int, int[])">alterString</A></B>(int&nbsp;string,
-            int[]&nbsp;strings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.Object</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#clone()">clone</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#compareTo(java.lang.Object)">compareTo</A></B>(java.lang.Object&nbsp;o)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getChordnum()">getChordnum</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getDecoration()">getDecoration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getDenominator()">getDenominator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getFret()">getFret</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getLyrics()">getLyrics</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getNumerator()">getNumerator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getParm()">getParm</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getPitch()">getPitch</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getSequence()">getSequence</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getString()">getString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTicks()">getTicks</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTripletP()">getTripletP</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTripletQ()">getTripletQ</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getTripletR()">getTripletR</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getType()">getType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getValue()">getValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getVariant()">getVariant</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#getVelocity()">getVelocity</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isGrace()">isGrace</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isLegato()">isLegato</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isStacato()">isStacato</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isTied()">isTied</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isToEnd()">isToEnd</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#isTriplet()">isTriplet</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setDenominator(int)">setDenominator</A></B>(int&nbsp;d)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setGrace(boolean)">setGrace</A></B>(boolean&nbsp;b)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setLegato(boolean)">setLegato</A></B>(boolean&nbsp;legato)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setLyrics(java.lang.String)">setLyrics</A></B>(java.lang.String&nbsp;lyrics)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setNumerator(int)">setNumerator</A></B>(int&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setPitchStringAndFret(int, int[])">setPitchStringAndFret</A></B>(int&nbsp;pitch,
-                      int[]&nbsp;strings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setSequence(int)">setSequence</A></B>(int&nbsp;sequence)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setStacato(boolean)">setStacato</A></B>(boolean&nbsp;stacato)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTicks(int)">setTicks</A></B>(int&nbsp;ticks)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTied(boolean)">setTied</A></B>(boolean&nbsp;b)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setToEnd(boolean)">setToEnd</A></B>(boolean&nbsp;b)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTriplet(boolean)">setTriplet</A></B>(boolean&nbsp;triplet)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTriplet(int, int, int)">setTriplet</A></B>(int&nbsp;p,
-           int&nbsp;q,
-           int&nbsp;r)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTripletP(int)">setTripletP</A></B>(int&nbsp;tripletP)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTripletQ(int)">setTripletQ</A></B>(int&nbsp;tripletQ)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setTripletR(int)">setTripletR</A></B>(int&nbsp;tripletR)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setType(int)">setType</A></B>(int&nbsp;type)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setValue(int)">setValue</A></B>(int&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#setVelocity(int)">setVelocity</A></B>(int&nbsp;velocity)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="BAR"><!-- --></A><H3>
-BAR</H3>
-<PRE>
-public static final int <B>BAR</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.BAR">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BAR_BAR"><!-- --></A><H3>
-BAR_BAR</H3>
-<PRE>
-public static final int <B>BAR_BAR</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.BAR_BAR">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BAR_FATBAR"><!-- --></A><H3>
-BAR_FATBAR</H3>
-<PRE>
-public static final int <B>BAR_FATBAR</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.BAR_FATBAR">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FATBAR_BAR"><!-- --></A><H3>
-FATBAR_BAR</H3>
-<PRE>
-public static final int <B>FATBAR_BAR</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FATBAR_BAR">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="REPEAT_BEGIN"><!-- --></A><H3>
-REPEAT_BEGIN</H3>
-<PRE>
-public static final int <B>REPEAT_BEGIN</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.REPEAT_BEGIN">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="REPEAT_END"><!-- --></A><H3>
-REPEAT_END</H3>
-<PRE>
-public static final int <B>REPEAT_END</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.REPEAT_END">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="REPEAT_END_AND_START"><!-- --></A><H3>
-REPEAT_END_AND_START</H3>
-<PRE>
-public static final int <B>REPEAT_END_AND_START</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.REPEAT_END_AND_START">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="VARIANT"><!-- --></A><H3>
-VARIANT</H3>
-<PRE>
-public static final int <B>VARIANT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.VARIANT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TIME"><!-- --></A><H3>
-TIME</H3>
-<PRE>
-public static final int <B>TIME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TIME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TEMPO"><!-- --></A><H3>
-TEMPO</H3>
-<PRE>
-public static final int <B>TEMPO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TEMPO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="CHORD_SYMBOL"><!-- --></A><H3>
-CHORD_SYMBOL</H3>
-<PRE>
-public static final int <B>CHORD_SYMBOL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.CHORD_SYMBOL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ANNOTATION"><!-- --></A><H3>
-ANNOTATION</H3>
-<PRE>
-public static final int <B>ANNOTATION</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ANNOTATION">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="CHORD_BEGIN"><!-- --></A><H3>
-CHORD_BEGIN</H3>
-<PRE>
-public static final int <B>CHORD_BEGIN</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.CHORD_BEGIN">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="REST"><!-- --></A><H3>
-REST</H3>
-<PRE>
-public static final int <B>REST</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.REST">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="NOTE"><!-- --></A><H3>
-NOTE</H3>
-<PRE>
-public static final int <B>NOTE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.NOTE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="CHORD_CLOSE"><!-- --></A><H3>
-CHORD_CLOSE</H3>
-<PRE>
-public static final int <B>CHORD_CLOSE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.CHORD_CLOSE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DECORATION"><!-- --></A><H3>
-DECORATION</H3>
-<PRE>
-public static final int <B>DECORATION</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DECORATION">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LINE_BREAK"><!-- --></A><H3>
-LINE_BREAK</H3>
-<PRE>
-public static final int <B>LINE_BREAK</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.LINE_BREAK">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="NOT_RELEVANT"><!-- --></A><H3>
-NOT_RELEVANT</H3>
-<PRE>
-public static final int <B>NOT_RELEVANT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.NOT_RELEVANT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TRILL"><!-- --></A><H3>
-TRILL</H3>
-<PRE>
-public static final int <B>TRILL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TRILL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LOWERMORDENT"><!-- --></A><H3>
-LOWERMORDENT</H3>
-<PRE>
-public static final int <B>LOWERMORDENT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.LOWERMORDENT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="UPPERMORDENT"><!-- --></A><H3>
-UPPERMORDENT</H3>
-<PRE>
-public static final int <B>UPPERMORDENT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.UPPERMORDENT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ACCENT"><!-- --></A><H3>
-ACCENT</H3>
-<PRE>
-public static final int <B>ACCENT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ACCENT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FERMATA"><!-- --></A><H3>
-FERMATA</H3>
-<PRE>
-public static final int <B>FERMATA</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FERMATA">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="INVERTEDFERMATA"><!-- --></A><H3>
-INVERTEDFERMATA</H3>
-<PRE>
-public static final int <B>INVERTEDFERMATA</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.INVERTEDFERMATA">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TENUTO"><!-- --></A><H3>
-TENUTO</H3>
-<PRE>
-public static final int <B>TENUTO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TENUTO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINGERING_0"><!-- --></A><H3>
-FINGERING_0</H3>
-<PRE>
-public static final int <B>FINGERING_0</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_0">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINGERING_1"><!-- --></A><H3>
-FINGERING_1</H3>
-<PRE>
-public static final int <B>FINGERING_1</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_1">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINGERING_2"><!-- --></A><H3>
-FINGERING_2</H3>
-<PRE>
-public static final int <B>FINGERING_2</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_2">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINGERING_3"><!-- --></A><H3>
-FINGERING_3</H3>
-<PRE>
-public static final int <B>FINGERING_3</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_3">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINGERING_4"><!-- --></A><H3>
-FINGERING_4</H3>
-<PRE>
-public static final int <B>FINGERING_4</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_4">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINGERING_5"><!-- --></A><H3>
-FINGERING_5</H3>
-<PRE>
-public static final int <B>FINGERING_5</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINGERING_5">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PLUS"><!-- --></A><H3>
-PLUS</H3>
-<PRE>
-public static final int <B>PLUS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.PLUS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="WEDGE"><!-- --></A><H3>
-WEDGE</H3>
-<PRE>
-public static final int <B>WEDGE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.WEDGE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="OPEN"><!-- --></A><H3>
-OPEN</H3>
-<PRE>
-public static final int <B>OPEN</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.OPEN">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="THUMB"><!-- --></A><H3>
-THUMB</H3>
-<PRE>
-public static final int <B>THUMB</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.THUMB">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TURN"><!-- --></A><H3>
-TURN</H3>
-<PRE>
-public static final int <B>TURN</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TURN">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ROLL"><!-- --></A><H3>
-ROLL</H3>
-<PRE>
-public static final int <B>ROLL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ROLL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BREATH"><!-- --></A><H3>
-BREATH</H3>
-<PRE>
-public static final int <B>BREATH</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.BREATH">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SHORTPHRASE"><!-- --></A><H3>
-SHORTPHRASE</H3>
-<PRE>
-public static final int <B>SHORTPHRASE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.SHORTPHRASE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MEDIUMPHRASE"><!-- --></A><H3>
-MEDIUMPHRASE</H3>
-<PRE>
-public static final int <B>MEDIUMPHRASE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.MEDIUMPHRASE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="LONGPHRASE"><!-- --></A><H3>
-LONGPHRASE</H3>
-<PRE>
-public static final int <B>LONGPHRASE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.LONGPHRASE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SEGNO"><!-- --></A><H3>
-SEGNO</H3>
-<PRE>
-public static final int <B>SEGNO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.SEGNO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DS"><!-- --></A><H3>
-DS</H3>
-<PRE>
-public static final int <B>DS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DSS"><!-- --></A><H3>
-DSS</H3>
-<PRE>
-public static final int <B>DSS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DSS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DC"><!-- --></A><H3>
-DC</H3>
-<PRE>
-public static final int <B>DC</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DC">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DACODA"><!-- --></A><H3>
-DACODA</H3>
-<PRE>
-public static final int <B>DACODA</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DACODA">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DACAPO"><!-- --></A><H3>
-DACAPO</H3>
-<PRE>
-public static final int <B>DACAPO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DACAPO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ALCODA"><!-- --></A><H3>
-ALCODA</H3>
-<PRE>
-public static final int <B>ALCODA</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ALCODA">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TOCODA"><!-- --></A><H3>
-TOCODA</H3>
-<PRE>
-public static final int <B>TOCODA</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TOCODA">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ALFINE"><!-- --></A><H3>
-ALFINE</H3>
-<PRE>
-public static final int <B>ALFINE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ALFINE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FINE"><!-- --></A><H3>
-FINE</H3>
-<PRE>
-public static final int <B>FINE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FINE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="CODA"><!-- --></A><H3>
-CODA</H3>
-<PRE>
-public static final int <B>CODA</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.CODA">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="STARTCRESCENDO"><!-- --></A><H3>
-STARTCRESCENDO</H3>
-<PRE>
-public static final int <B>STARTCRESCENDO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.STARTCRESCENDO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ENDCRESCENDO"><!-- --></A><H3>
-ENDCRESCENDO</H3>
-<PRE>
-public static final int <B>ENDCRESCENDO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ENDCRESCENDO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="STARTDIMINUENDO"><!-- --></A><H3>
-STARTDIMINUENDO</H3>
-<PRE>
-public static final int <B>STARTDIMINUENDO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.STARTDIMINUENDO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ENDDIMINUENDO"><!-- --></A><H3>
-ENDDIMINUENDO</H3>
-<PRE>
-public static final int <B>ENDDIMINUENDO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ENDDIMINUENDO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PPPP"><!-- --></A><H3>
-PPPP</H3>
-<PRE>
-public static final int <B>PPPP</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.PPPP">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PPP"><!-- --></A><H3>
-PPP</H3>
-<PRE>
-public static final int <B>PPP</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.PPP">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="PP"><!-- --></A><H3>
-PP</H3>
-<PRE>
-public static final int <B>PP</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.PP">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="P"><!-- --></A><H3>
-P</H3>
-<PRE>
-public static final int <B>P</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.P">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MP"><!-- --></A><H3>
-MP</H3>
-<PRE>
-public static final int <B>MP</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.MP">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="MF"><!-- --></A><H3>
-MF</H3>
-<PRE>
-public static final int <B>MF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.MF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="F"><!-- --></A><H3>
-F</H3>
-<PRE>
-public static final int <B>F</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.F">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FF"><!-- --></A><H3>
-FF</H3>
-<PRE>
-public static final int <B>FF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FFF"><!-- --></A><H3>
-FFF</H3>
-<PRE>
-public static final int <B>FFF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FFF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FFFF"><!-- --></A><H3>
-FFFF</H3>
-<PRE>
-public static final int <B>FFFF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.FFFF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SFZ"><!-- --></A><H3>
-SFZ</H3>
-<PRE>
-public static final int <B>SFZ</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.SFZ">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="UPBOW"><!-- --></A><H3>
-UPBOW</H3>
-<PRE>
-public static final int <B>UPBOW</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.UPBOW">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DOWNBOW"><!-- --></A><H3>
-DOWNBOW</H3>
-<PRE>
-public static final int <B>DOWNBOW</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DOWNBOW">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="SLIDE"><!-- --></A><H3>
-SLIDE</H3>
-<PRE>
-public static final int <B>SLIDE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.SLIDE">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TURNX"><!-- --></A><H3>
-TURNX</H3>
-<PRE>
-public static final int <B>TURNX</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.TURNX">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="INVERTEDTURN"><!-- --></A><H3>
-INVERTEDTURN</H3>
-<PRE>
-public static final int <B>INVERTEDTURN</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.INVERTEDTURN">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="INVERTEDTURNX"><!-- --></A><H3>
-INVERTEDTURNX</H3>
-<PRE>
-public static final int <B>INVERTEDTURNX</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.INVERTEDTURNX">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ARPEGGIO"><!-- --></A><H3>
-ARPEGGIO</H3>
-<PRE>
-public static final int <B>ARPEGGIO</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ARPEGGIO">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="STARTTRILL"><!-- --></A><H3>
-STARTTRILL</H3>
-<PRE>
-public static final int <B>STARTTRILL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.STARTTRILL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="ENDTRILL"><!-- --></A><H3>
-ENDTRILL</H3>
-<PRE>
-public static final int <B>ENDTRILL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.ENDTRILL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="STACATODOT"><!-- --></A><H3>
-STACATODOT</H3>
-<PRE>
-public static final int <B>STACATODOT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.STACATODOT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="GCHORDON"><!-- --></A><H3>
-GCHORDON</H3>
-<PRE>
-public static final int <B>GCHORDON</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.GCHORDON">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="GCHORDOFF"><!-- --></A><H3>
-GCHORDOFF</H3>
-<PRE>
-public static final int <B>GCHORDOFF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.GCHORDOFF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="GCHORD"><!-- --></A><H3>
-GCHORD</H3>
-<PRE>
-public static final int <B>GCHORD</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.GCHORD">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="CHORDPROG"><!-- --></A><H3>
-CHORDPROG</H3>
-<PRE>
-public static final int <B>CHORDPROG</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.CHORDPROG">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="CHORDVOL"><!-- --></A><H3>
-CHORDVOL</H3>
-<PRE>
-public static final int <B>CHORDVOL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.CHORDVOL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BASSPROG"><!-- --></A><H3>
-BASSPROG</H3>
-<PRE>
-public static final int <B>BASSPROG</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.BASSPROG">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="BASSVOL"><!-- --></A><H3>
-BASSVOL</H3>
-<PRE>
-public static final int <B>BASSVOL</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.BASSVOL">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DRUMON"><!-- --></A><H3>
-DRUMON</H3>
-<PRE>
-public static final int <B>DRUMON</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DRUMON">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DRUMOFF"><!-- --></A><H3>
-DRUMOFF</H3>
-<PRE>
-public static final int <B>DRUMOFF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DRUMOFF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DRUM"><!-- --></A><H3>
-DRUM</H3>
-<PRE>
-public static final int <B>DRUM</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DRUM">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DRONEON"><!-- --></A><H3>
-DRONEON</H3>
-<PRE>
-public static final int <B>DRONEON</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DRONEON">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DRONEOFF"><!-- --></A><H3>
-DRONEOFF</H3>
-<PRE>
-public static final int <B>DRONEOFF</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DRONEOFF">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DRONE"><!-- --></A><H3>
-DRONE</H3>
-<PRE>
-public static final int <B>DRONE</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCEvent.DRONE">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCEvent(int, java.lang.String, int)"><!-- --></A><H3>
-ABCEvent</H3>
-<PRE>
-public <B>ABCEvent</B>(int&nbsp;type,
-                java.lang.String&nbsp;parm,
-                int&nbsp;value)</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="ABCEvent(org.herac.tuxguitar.io.abc.base.ABCSong, java.lang.String)"><!-- --></A><H3>
-ABCEvent</H3>
-<PRE>
-public <B>ABCEvent</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>&nbsp;song,
-                java.lang.String&nbsp;name)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="clone()"><!-- --></A><H3>
-clone</H3>
-<PRE>
-public java.lang.Object <B>clone</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPitchStringAndFret(int, int[])"><!-- --></A><H3>
-setPitchStringAndFret</H3>
-<PRE>
-public void <B>setPitchStringAndFret</B>(int&nbsp;pitch,
-                                  int[]&nbsp;strings)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="compareTo(java.lang.Object)"><!-- --></A><H3>
-compareTo</H3>
-<PRE>
-public int <B>compareTo</B>(java.lang.Object&nbsp;o)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>compareTo</CODE> in interface <CODE>java.lang.Comparable</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFret()"><!-- --></A><H3>
-getFret</H3>
-<PRE>
-public int <B>getFret</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the fret</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the name</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getParm()"><!-- --></A><H3>
-getParm</H3>
-<PRE>
-public java.lang.String <B>getParm</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the name</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPitch()"><!-- --></A><H3>
-getPitch</H3>
-<PRE>
-public int <B>getPitch</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the pitch</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getValue()"><!-- --></A><H3>
-getValue</H3>
-<PRE>
-public int <B>getValue</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the pitch</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getString()"><!-- --></A><H3>
-getString</H3>
-<PRE>
-public int <B>getString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the string</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTicks()"><!-- --></A><H3>
-getTicks</H3>
-<PRE>
-public int <B>getTicks</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the ticks</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getType()"><!-- --></A><H3>
-getType</H3>
-<PRE>
-public int <B>getType</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the type</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTicks(int)"><!-- --></A><H3>
-setTicks</H3>
-<PRE>
-public void <B>setTicks</B>(int&nbsp;ticks)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>ticks</CODE> - the ticks to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDecoration()"><!-- --></A><H3>
-getDecoration</H3>
-<PRE>
-public int <B>getDecoration</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChordnum()"><!-- --></A><H3>
-getChordnum</H3>
-<PRE>
-public int <B>getChordnum</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="alterString(int, int[])"><!-- --></A><H3>
-alterString</H3>
-<PRE>
-public void <B>alterString</B>(int&nbsp;string,
-                        int[]&nbsp;strings)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setType(int)"><!-- --></A><H3>
-setType</H3>
-<PRE>
-public void <B>setType</B>(int&nbsp;type)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setValue(int)"><!-- --></A><H3>
-setValue</H3>
-<PRE>
-public void <B>setValue</B>(int&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setNumerator(int)"><!-- --></A><H3>
-setNumerator</H3>
-<PRE>
-public void <B>setNumerator</B>(int&nbsp;value)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDenominator(int)"><!-- --></A><H3>
-setDenominator</H3>
-<PRE>
-public void <B>setDenominator</B>(int&nbsp;d)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVelocity()"><!-- --></A><H3>
-getVelocity</H3>
-<PRE>
-public int <B>getVelocity</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setVelocity(int)"><!-- --></A><H3>
-setVelocity</H3>
-<PRE>
-public void <B>setVelocity</B>(int&nbsp;velocity)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>velocity</CODE> - the velocity to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTied(boolean)"><!-- --></A><H3>
-setTied</H3>
-<PRE>
-public void <B>setTied</B>(boolean&nbsp;b)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTied()"><!-- --></A><H3>
-isTied</H3>
-<PRE>
-public boolean <B>isTied</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the tied</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setToEnd(boolean)"><!-- --></A><H3>
-setToEnd</H3>
-<PRE>
-public void <B>setToEnd</B>(boolean&nbsp;b)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isToEnd()"><!-- --></A><H3>
-isToEnd</H3>
-<PRE>
-public boolean <B>isToEnd</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the toEnd</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVariant()"><!-- --></A><H3>
-getVariant</H3>
-<PRE>
-public int <B>getVariant</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNumerator()"><!-- --></A><H3>
-getNumerator</H3>
-<PRE>
-public int <B>getNumerator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDenominator()"><!-- --></A><H3>
-getDenominator</H3>
-<PRE>
-public int <B>getDenominator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGrace(boolean)"><!-- --></A><H3>
-setGrace</H3>
-<PRE>
-public void <B>setGrace</B>(boolean&nbsp;b)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isGrace()"><!-- --></A><H3>
-isGrace</H3>
-<PRE>
-public boolean <B>isGrace</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the grace</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSequence()"><!-- --></A><H3>
-getSequence</H3>
-<PRE>
-public int <B>getSequence</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSequence(int)"><!-- --></A><H3>
-setSequence</H3>
-<PRE>
-public void <B>setSequence</B>(int&nbsp;sequence)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTriplet()"><!-- --></A><H3>
-isTriplet</H3>
-<PRE>
-public boolean <B>isTriplet</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTriplet(boolean)"><!-- --></A><H3>
-setTriplet</H3>
-<PRE>
-public void <B>setTriplet</B>(boolean&nbsp;triplet)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTripletP()"><!-- --></A><H3>
-getTripletP</H3>
-<PRE>
-public int <B>getTripletP</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTripletP(int)"><!-- --></A><H3>
-setTripletP</H3>
-<PRE>
-public void <B>setTripletP</B>(int&nbsp;tripletP)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTripletQ()"><!-- --></A><H3>
-getTripletQ</H3>
-<PRE>
-public int <B>getTripletQ</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTripletQ(int)"><!-- --></A><H3>
-setTripletQ</H3>
-<PRE>
-public void <B>setTripletQ</B>(int&nbsp;tripletQ)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTripletR()"><!-- --></A><H3>
-getTripletR</H3>
-<PRE>
-public int <B>getTripletR</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTripletR(int)"><!-- --></A><H3>
-setTripletR</H3>
-<PRE>
-public void <B>setTripletR</B>(int&nbsp;tripletR)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTriplet(int, int, int)"><!-- --></A><H3>
-setTriplet</H3>
-<PRE>
-public void <B>setTriplet</B>(int&nbsp;p,
-                       int&nbsp;q,
-                       int&nbsp;r)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLyrics()"><!-- --></A><H3>
-getLyrics</H3>
-<PRE>
-public java.lang.String[] <B>getLyrics</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLyrics(java.lang.String)"><!-- --></A><H3>
-setLyrics</H3>
-<PRE>
-public void <B>setLyrics</B>(java.lang.String&nbsp;lyrics)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isStacato()"><!-- --></A><H3>
-isStacato</H3>
-<PRE>
-public boolean <B>isStacato</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the stacato</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setStacato(boolean)"><!-- --></A><H3>
-setStacato</H3>
-<PRE>
-public void <B>setStacato</B>(boolean&nbsp;stacato)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>stacato</CODE> - the stacato to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isLegato()"><!-- --></A><H3>
-isLegato</H3>
-<PRE>
-public boolean <B>isLegato</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the legato</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLegato(boolean)"><!-- --></A><H3>
-setLegato</H3>
-<PRE>
-public void <B>setLegato</B>(boolean&nbsp;legato)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>legato</CODE> - the legato to set</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCEvent.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCInfo.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCInfo.html
deleted file mode 100644
index 3e9804b4..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCInfo.html
+++ /dev/null
@@ -1,876 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCInfo
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCInfo class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCInfo";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCInfo.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInfo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCInfo</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCInfo</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCInfo</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#ABCInfo(java.lang.String, java.lang.String, java.lang.String)">ABCInfo</A></B>(java.lang.String&nbsp;title,
-        java.lang.String&nbsp;subtitle,
-        java.lang.String&nbsp;comments)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#addHistory(java.lang.String)">addHistory</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#addNote(java.lang.String)">addNote</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getArea()">getArea</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getArtist()">getArtist</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getBook()">getBook</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getComments()">getComments</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getComponist()">getComponist</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getDiscography()">getDiscography</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getFilename()">getFilename</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getGroup()">getGroup</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.List</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getHistory()">getHistory</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getInformation()">getInformation</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getNotes()">getNotes</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getOrigin()">getOrigin</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getSource()">getSource</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getSubtitle()">getSubtitle</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getTitle()">getTitle</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#getTranscriptor()">getTranscriptor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setArea(java.lang.String)">setArea</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setArtist(java.lang.String)">setArtist</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setBook(java.lang.String)">setBook</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setComments(java.lang.String)">setComments</A></B>(java.lang.String&nbsp;comments)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setComponist(java.lang.String)">setComponist</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setDiscography(java.lang.String)">setDiscography</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setFilename(java.lang.String)">setFilename</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setGroup(java.lang.String)">setGroup</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setInformation(java.lang.String)">setInformation</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setOrigin(java.lang.String)">setOrigin</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setSource(java.lang.String)">setSource</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setSubtitle(java.lang.String)">setSubtitle</A></B>(java.lang.String&nbsp;subtitle)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setTitle(java.lang.String)">setTitle</A></B>(java.lang.String&nbsp;title)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#setTranscriptor(java.lang.String)">setTranscriptor</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCInfo(java.lang.String, java.lang.String, java.lang.String)"><!-- --></A><H3>
-ABCInfo</H3>
-<PRE>
-public <B>ABCInfo</B>(java.lang.String&nbsp;title,
-               java.lang.String&nbsp;subtitle,
-               java.lang.String&nbsp;comments)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getComments()"><!-- --></A><H3>
-getComments</H3>
-<PRE>
-public java.lang.String <B>getComments</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSubtitle()"><!-- --></A><H3>
-getSubtitle</H3>
-<PRE>
-public java.lang.String <B>getSubtitle</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTitle()"><!-- --></A><H3>
-getTitle</H3>
-<PRE>
-public java.lang.String <B>getTitle</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNotes()"><!-- --></A><H3>
-getNotes</H3>
-<PRE>
-public java.lang.String <B>getNotes</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setComments(java.lang.String)"><!-- --></A><H3>
-setComments</H3>
-<PRE>
-public void <B>setComments</B>(java.lang.String&nbsp;comments)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>comments</CODE> - the comments to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSubtitle(java.lang.String)"><!-- --></A><H3>
-setSubtitle</H3>
-<PRE>
-public void <B>setSubtitle</B>(java.lang.String&nbsp;subtitle)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>subtitle</CODE> - the subtitle to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTitle(java.lang.String)"><!-- --></A><H3>
-setTitle</H3>
-<PRE>
-public void <B>setTitle</B>(java.lang.String&nbsp;title)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>title</CODE> - the title to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setArtist(java.lang.String)"><!-- --></A><H3>
-setArtist</H3>
-<PRE>
-public void <B>setArtist</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getArtist()"><!-- --></A><H3>
-getArtist</H3>
-<PRE>
-public java.lang.String <B>getArtist</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the artist</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setComponist(java.lang.String)"><!-- --></A><H3>
-setComponist</H3>
-<PRE>
-public void <B>setComponist</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setArea(java.lang.String)"><!-- --></A><H3>
-setArea</H3>
-<PRE>
-public void <B>setArea</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getArea()"><!-- --></A><H3>
-getArea</H3>
-<PRE>
-public java.lang.String <B>getArea</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the area</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getComponist()"><!-- --></A><H3>
-getComponist</H3>
-<PRE>
-public java.lang.String <B>getComponist</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the componist</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBook(java.lang.String)"><!-- --></A><H3>
-setBook</H3>
-<PRE>
-public void <B>setBook</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBook()"><!-- --></A><H3>
-getBook</H3>
-<PRE>
-public java.lang.String <B>getBook</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the book</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDiscography(java.lang.String)"><!-- --></A><H3>
-setDiscography</H3>
-<PRE>
-public void <B>setDiscography</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDiscography()"><!-- --></A><H3>
-getDiscography</H3>
-<PRE>
-public java.lang.String <B>getDiscography</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the discography</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setFilename(java.lang.String)"><!-- --></A><H3>
-setFilename</H3>
-<PRE>
-public void <B>setFilename</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFilename()"><!-- --></A><H3>
-getFilename</H3>
-<PRE>
-public java.lang.String <B>getFilename</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the filename</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGroup(java.lang.String)"><!-- --></A><H3>
-setGroup</H3>
-<PRE>
-public void <B>setGroup</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGroup()"><!-- --></A><H3>
-getGroup</H3>
-<PRE>
-public java.lang.String <B>getGroup</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the group</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addHistory(java.lang.String)"><!-- --></A><H3>
-addHistory</H3>
-<PRE>
-public void <B>addHistory</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setInformation(java.lang.String)"><!-- --></A><H3>
-setInformation</H3>
-<PRE>
-public void <B>setInformation</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getHistory()"><!-- --></A><H3>
-getHistory</H3>
-<PRE>
-public java.util.List <B>getHistory</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the history</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInformation()"><!-- --></A><H3>
-getInformation</H3>
-<PRE>
-public java.lang.String <B>getInformation</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the information</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addNote(java.lang.String)"><!-- --></A><H3>
-addNote</H3>
-<PRE>
-public void <B>addNote</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setOrigin(java.lang.String)"><!-- --></A><H3>
-setOrigin</H3>
-<PRE>
-public void <B>setOrigin</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSource(java.lang.String)"><!-- --></A><H3>
-setSource</H3>
-<PRE>
-public void <B>setSource</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTranscriptor(java.lang.String)"><!-- --></A><H3>
-setTranscriptor</H3>
-<PRE>
-public void <B>setTranscriptor</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getOrigin()"><!-- --></A><H3>
-getOrigin</H3>
-<PRE>
-public java.lang.String <B>getOrigin</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the origin</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getSource()"><!-- --></A><H3>
-getSource</H3>
-<PRE>
-public java.lang.String <B>getSource</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the source</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTranscriptor()"><!-- --></A><H3>
-getTranscriptor</H3>
-<PRE>
-public java.lang.String <B>getTranscriptor</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the transcriptor</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCInfo.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInfo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCLocation.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCLocation.html
deleted file mode 100644
index db3986a0..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCLocation.html
+++ /dev/null
@@ -1,654 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCLocation
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCLocation class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCLocation";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCLocation.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCLocation.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCLocation</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCLocation</B>
-</PRE>
-<DL>
-<DT><B>All Implemented Interfaces:</B> <DD>java.lang.Comparable</DD>
-</DL>
-<HR>
-<DL>
-<DT>public class <B>ABCLocation</B><DT>extends java.lang.Object<DT>implements java.lang.Comparable</DL>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>peter</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#ABCLocation(java.lang.String, int, int, int, org.herac.tuxguitar.io.abc.base.ABCChord, org.herac.tuxguitar.io.abc.base.ABCEvent)">ABCLocation</A></B>(java.lang.String&nbsp;part,
-            int&nbsp;track,
-            int&nbsp;measure,
-            int&nbsp;ticks,
-            <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord,
-            <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#compareTo(java.lang.Object)">compareTo</A></B>(java.lang.Object&nbsp;o)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getChord()">getChord</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getEvent()">getEvent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getLegato()">getLegato</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getMeasure()">getMeasure</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getPart()">getPart</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getTempo()">getTempo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getTicks()">getTicks</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getTrack()">getTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#isTied()">isTied</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setChord(org.herac.tuxguitar.io.abc.base.ABCChord)">setChord</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setLegato(int)">setLegato</A></B>(int&nbsp;legato)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setMeasure(int)">setMeasure</A></B>(int&nbsp;measure)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setPart(java.lang.String)">setPart</A></B>(java.lang.String&nbsp;part)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setTempo(int)">setTempo</A></B>(int&nbsp;tempo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setTicks(int)">setTicks</A></B>(int&nbsp;ticks)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setTied(boolean)">setTied</A></B>(boolean&nbsp;tied)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCLocation(java.lang.String, int, int, int, org.herac.tuxguitar.io.abc.base.ABCChord, org.herac.tuxguitar.io.abc.base.ABCEvent)"><!-- --></A><H3>
-ABCLocation</H3>
-<PRE>
-public <B>ABCLocation</B>(java.lang.String&nbsp;part,
-                   int&nbsp;track,
-                   int&nbsp;measure,
-                   int&nbsp;ticks,
-                   <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord,
-                   <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMeasure()"><!-- --></A><H3>
-getMeasure</H3>
-<PRE>
-public int <B>getMeasure</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the measure</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPart()"><!-- --></A><H3>
-getPart</H3>
-<PRE>
-public java.lang.String <B>getPart</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the part</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTicks()"><!-- --></A><H3>
-getTicks</H3>
-<PRE>
-public int <B>getTicks</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the ticks</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTrack()"><!-- --></A><H3>
-getTrack</H3>
-<PRE>
-public int <B>getTrack</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the track</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEvent()"><!-- --></A><H3>
-getEvent</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A> <B>getEvent</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the event</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="compareTo(java.lang.Object)"><!-- --></A><H3>
-compareTo</H3>
-<PRE>
-public int <B>compareTo</B>(java.lang.Object&nbsp;o)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE>compareTo</CODE> in interface <CODE>java.lang.Comparable</CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setMeasure(int)"><!-- --></A><H3>
-setMeasure</H3>
-<PRE>
-public void <B>setMeasure</B>(int&nbsp;measure)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>measure</CODE> - the measure to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPart(java.lang.String)"><!-- --></A><H3>
-setPart</H3>
-<PRE>
-public void <B>setPart</B>(java.lang.String&nbsp;part)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>part</CODE> - the part to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTicks(int)"><!-- --></A><H3>
-setTicks</H3>
-<PRE>
-public void <B>setTicks</B>(int&nbsp;ticks)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>ticks</CODE> - the ticks to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChord(org.herac.tuxguitar.io.abc.base.ABCChord)"><!-- --></A><H3>
-setChord</H3>
-<PRE>
-public void <B>setChord</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChord()"><!-- --></A><H3>
-getChord</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A> <B>getChord</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the chord</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTied(boolean)"><!-- --></A><H3>
-setTied</H3>
-<PRE>
-public void <B>setTied</B>(boolean&nbsp;tied)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isTied()"><!-- --></A><H3>
-isTied</H3>
-<PRE>
-public boolean <B>isTied</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the tied</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTempo()"><!-- --></A><H3>
-getTempo</H3>
-<PRE>
-public int <B>getTempo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTempo(int)"><!-- --></A><H3>
-setTempo</H3>
-<PRE>
-public void <B>setTempo</B>(int&nbsp;tempo)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getLegato()"><!-- --></A><H3>
-getLegato</H3>
-<PRE>
-public int <B>getLegato</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the legato</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setLegato(int)"><!-- --></A><H3>
-setLegato</H3>
-<PRE>
-public void <B>setLegato</B>(int&nbsp;legato)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>legato</CODE> - the legato to set</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCLocation.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCLocation.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCMacro.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCMacro.html
deleted file mode 100644
index 6ce89547..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCMacro.html
+++ /dev/null
@@ -1,416 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCMacro
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCMacro class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCMacro";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCMacro.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCMacro.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCMacro</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCMacro</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCMacro</B><DT>extends java.lang.Object</DL>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>peter
- <p>
- <b>Macros</b>
- <p>
-  This standard defines an optional system of macros which is principally used to define the way in which ornament symbols 
-  such as the tilde ~ are played (although it could be used for many other purposes).
-  <p> 
-  Software implementing these macros, should first expand the macros defined in this section, 
-  and only afterwards apply any relevant U: replacement (see section Redefinable symbols). 
-  <p>
-  When these macros are stored in an ABC Header file (see section Include field), they may form a powerful library. 
-  <p>
-  There are two kinds of macro, called Static and Transposing.
-  <p> 
- <b>Static macros</b>
- <p>
-  You define a static macro by writing into the tune header something like this:
-  <p> 
-  m: ~G3 = G{A}G{F}G
-  <p>
-  When you play the tune, the program searches the tune header for macro definitions, 
-  then does a search and replace on its internal copy of the text before passing that 
-  to the parser which plays the tune. Every occurence of ~G3 in the tune is replaced 
-  by G{A}G{F}G, and that is what gets played. Only ~G3 notes are affected,
-  ~G2, ~g3, ~F3 etc. are ignored. 
-  <p>
-  You can put in as many macros as you want, and indeed, if you only use static macros 
-  you will need to write a separate macro for each combination of pitch and note-length. 
-  Here is an example:
-  <pre> 
- X:50
- T:Apples in Winter
- S:Trad, arr. Paddy O'Brien
- R:jig
- E:9
- m: ~g2 = {a}g{f}g
- m: ~D2 = {E}D{C}D
- M:6/8
- K:D
- G/2A/2|BEE dEE|BAG FGE|~D2D FDF|ABc ded|
- BEE BAB|def ~g2 e|fdB AGF|GEE E2:|
- d|efe edB|ege fdB|dec dAF|DFA def|
- [1efe edB|def ~g2a|bgb afa|gee e2:|
- [2edB def|gba ~g2e|fdB AGF|GEE E2||
- </pre>
- <p>
-  Here I have put in two static macros, since there are two different notes in the tune marked with a tilde. 
-  <p>
-  A static macro definition consists of four parts:
-  <ul><li> 
-  the field identifier m:
-  </li><li>
-  the target string - e.g ~G3
-  </li><li>
-  the equals sign
-  </li><li>
-  the replacement string - e.g. G{A}G{F}G
-  </li></ul>
-  <p>
-  The target string can consist of any string up to 31 characters in length, 
-  except that it may not include the letter 'n', for reasons which will become obvious later. 
-  You don't have to use the tilde, but of course if you don't use a legal combination of abc, 
-  other programs will not be able to play your tune. 
-  <p>
-  The replacement string consists of any legal abc text up to 200 characters in length. 
-  It's up to you to ensure that the target and replacement strings occupy the same time 
-  interval (the program does not check this). Both the target and replacement strings may 
-  have spaces embedded if necessary, but leading and trailing spaces are stripped off so 
-  <p>
- m:~g2={a}g{f}g
- <p>
-  is perfectly OK, although less readable. 
- <p><b>Transposing macros</b>
-  If your tune has ornaments on lots of different notes, and you want them to all play 
-  with the same ornament pattern, you can use transposing macros to achieve this. 
-  Transposing macros are written in exactly the same way as static macros, except that 
-  the note symbol in the target string is represented by 'n' (meaning any note) and the 
-  note symbols in the replacement string by other letters (h to z) which are interpreted 
-  according to their position in the alphabet relative to n.
-  <p> 
-  So, for example I could re-write the static macro m: ~G3 = G{A}G{F}G as a transposing 
-  macro m: ~n3 = n{o}n{m}n. When the transposing macro is expanded, any note of the form 
-  ~n3 will be replaced by the appropriate pattern of notes. 
-  Notes of the form ~n2 (or other lengths) will be ignored, so you will have to write 
-  separate transposing macros for each note length. 
-  <p>
-  Here's an example:
-  <pre> 
- X:35
- T:Down the Broom
- S:Trad, arr. Paddy O'Brien
- R:reel
- M:C|
- m: ~n2 = (3o/n/m/ n                % One macro does for all four rolls
- K:ADor
- EAAG~A2 Bd|eg~g2 egdc|BGGF GAGE|~D2B,D GABG|
- EAAG ~A2 Bd|eg~g2 egdg|eg~g2 dgba|gedB BAA2:|
- ~a2ea agea|agbg agef|~g2dg Bgdg|gfga gede|
- ~a2 ea agea|agbg ageg|dg~g2 dgba|gedB BA A2:|
- </pre>
- <p>
-  A transposing macro definition consists of four parts:
-  <ul><li> 
-  the field identifier m:
-  </li><li>
-  the target string - e.g ~n3
-  </li><li>
-  the equals sign
-  </li><li>
-  the replacement string - e.g. n{o}n{m}n
-  </li></ul>
-  <p>
-  The target string can consist of any string up to 31 characters in length, 
-  except that it must conclude with the letter 'n', followed by a number 
-  which specifies the note length. 
-  <p>
-  The replacement string consists of any legal abc text up to 200 characters in length, 
-  where note pitches are defined by the letters h - z, the pitches being interpreted 
-  relative to that of the letter n. Once again you should ensure that the time intervals match. 
-  You should not use accidentals in transposing macros (I can't for the life of me think of a way 
-  to transpose ~=a3 or ~^G2 which will work correctly under all circumstances, so if you need to 
-  do this you must use a static macro.) 
- <p></DD>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><CODE>ABCSymbol</CODE></A></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html#ABCMacro(java.lang.String)">ABCMacro</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html#execute(java.lang.String)">execute</A></B>(java.lang.String&nbsp;line)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html#isValid()">isValid</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCMacro(java.lang.String)"><!-- --></A><H3>
-ABCMacro</H3>
-<PRE>
-public <B>ABCMacro</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="execute(java.lang.String)"><!-- --></A><H3>
-execute</H3>
-<PRE>
-public java.lang.String <B>execute</B>(java.lang.String&nbsp;line)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isValid()"><!-- --></A><H3>
-isValid</H3>
-<PRE>
-public boolean <B>isValid</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCMacro.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCMacro.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html
deleted file mode 100644
index 666cb863..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html
+++ /dev/null
@@ -1,296 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCOctaveDatabase
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCOctaveDatabase class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCOctaveDatabase";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCOctaveDatabase.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOctaveDatabase.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCOctaveDatabase</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCOctaveDatabase</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCOctaveDatabase</B><DT>extends java.lang.Object</DL>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>peter</DD>
-</DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#ABCOctaveDatabase()">ABCOctaveDatabase</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#recall(int)">recall</A></B>(int&nbsp;pitch)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#reset()">reset</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html#store(int, int)">store</A></B>(int&nbsp;i,
-      int&nbsp;pitch)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCOctaveDatabase()"><!-- --></A><H3>
-ABCOctaveDatabase</H3>
-<PRE>
-public <B>ABCOctaveDatabase</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="store(int, int)"><!-- --></A><H3>
-store</H3>
-<PRE>
-public void <B>store</B>(int&nbsp;i,
-                  int&nbsp;pitch)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="recall(int)"><!-- --></A><H3>
-recall</H3>
-<PRE>
-public int <B>recall</B>(int&nbsp;pitch)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="reset()"><!-- --></A><H3>
-reset</H3>
-<PRE>
-public void <B>reset</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCOctaveDatabase.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOctaveDatabase.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCPercussion.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCPercussion.html
deleted file mode 100644
index 21b09d2d..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCPercussion.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Tue May 17 20:18:19 GMT+01:00 2011 -->
-<TITLE>
-ABCPercussion
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCPercussion class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCPercussion";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPercussion.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPercussion.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCPercussion</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCPercussion</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCPercussion</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html#ABCPercussion(java.lang.String, int)">ABCPercussion</A></B>(java.lang.String&nbsp;name,
-              int&nbsp;volume)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html#getVolume()">getVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCPercussion(java.lang.String, int)"><!-- --></A><H3>
-ABCPercussion</H3>
-<PRE>
-public <B>ABCPercussion</B>(java.lang.String&nbsp;name,
-                     int&nbsp;volume)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVolume()"><!-- --></A><H3>
-getVolume</H3>
-<PRE>
-public int <B>getVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCPercussion.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPercussion.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCRepeat.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCRepeat.html
deleted file mode 100644
index 55703396..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCRepeat.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCRepeat
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCRepeat class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCRepeat";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCRepeat.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRepeat.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCRepeat</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCRepeat</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCRepeat</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#ABCRepeat(int, int)">ABCRepeat</A></B>(int&nbsp;data1,
-          int&nbsp;data2)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#getData1()">getData1</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#getData2()">getData2</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCRepeat(int, int)"><!-- --></A><H3>
-ABCRepeat</H3>
-<PRE>
-public <B>ABCRepeat</B>(int&nbsp;data1,
-                 int&nbsp;data2)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getData1()"><!-- --></A><H3>
-getData1</H3>
-<PRE>
-public int <B>getData1</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getData2()"><!-- --></A><H3>
-getData2</H3>
-<PRE>
-public int <B>getData2</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCRepeat.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRepeat.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCRhythm.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCRhythm.html
deleted file mode 100644
index db08df9a..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCRhythm.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Tue May 17 20:18:19 GMT+01:00 2011 -->
-<TITLE>
-ABCRhythm
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCRhythm class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCRhythm";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCRhythm.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRhythm.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCRhythm</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCRhythm</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCRhythm</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html#ABCRhythm(java.lang.String, int, int)">ABCRhythm</A></B>(java.lang.String&nbsp;name,
-          int&nbsp;volume,
-          int&nbsp;instrument)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html#getInstrument()">getInstrument</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html#getVolume()">getVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCRhythm(java.lang.String, int, int)"><!-- --></A><H3>
-ABCRhythm</H3>
-<PRE>
-public <B>ABCRhythm</B>(java.lang.String&nbsp;name,
-                 int&nbsp;volume,
-                 int&nbsp;instrument)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getInstrument()"><!-- --></A><H3>
-getInstrument</H3>
-<PRE>
-public int <B>getInstrument</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVolume()"><!-- --></A><H3>
-getVolume</H3>
-<PRE>
-public int <B>getVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCRhythm.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRhythm.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCSong.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCSong.html
deleted file mode 100644
index ee18fba1..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCSong.html
+++ /dev/null
@@ -1,2139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCSong
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCSong class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCSong";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSong.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSong.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCSong</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCSong</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCSong</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#TICKS_PER_QUART">TICKS_PER_QUART</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#ABCSong()">ABCSong</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addChord(java.lang.String)">addChord</A></B>(java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addHistory(java.lang.String)">addHistory</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addLyrics(java.lang.String)">addLyrics</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addMacro(java.lang.String)">addMacro</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addMusic(java.lang.String)">addMusic</A></B>(java.lang.String&nbsp;line)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addNote(java.lang.String)">addNote</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addRedefinable(java.lang.String)">addRedefinable</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addRemarks(java.lang.String)">addRemarks</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addSymbols(java.lang.String)">addSymbols</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addTempoChange(org.herac.tuxguitar.io.abc.base.ABCTempoChange)">addTempoChange</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>&nbsp;tChange)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addTimeSignatureChange(org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange)">addTimeSignatureChange</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>&nbsp;tsChange)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addVoice(java.lang.String)">addVoice</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addWords(java.lang.String)">addWords</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#computePitch(org.herac.tuxguitar.io.abc.base.ABCEvent, char[])">computePitch</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event,
-             char[]&nbsp;a)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#directive(java.lang.String)">directive</A></B>(java.lang.String&nbsp;line)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getBarkey()">getBarkey</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getBassprog()">getBassprog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getBassvol()">getBassvol</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChordprog()">getChordprog</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChords()">getChords</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChordvol()">getChordvol</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDefaultNoteLength()">getDefaultNoteLength</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDrone()">getDrone</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDrum()">getDrum</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.util.ArrayList</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getEvents()">getEvents</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getGchord()">getGchord</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getInfo()">getInfo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getKeySignature()">getKeySignature</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getMeasures()">getMeasures</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getRepeats()">getRepeats</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getStrings()">getStrings</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTempo()">getTempo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTempo(int)">getTempo</A></B>(int&nbsp;measure)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTexts()">getTexts</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTimeSignature()">getTimeSignature</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTimeSignature(int)">getTimeSignature</A></B>(int&nbsp;measure)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTrack()">getTrack</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTracks()">getTracks</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getVoice(java.lang.String)">getVoice</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#initBody()">initBody</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#initHead()">initHead</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#isDroneon()">isDroneon</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#isDrumon()">isDrumon</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#isGchordon()">isGchordon</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#isHornpipe()">isHornpipe</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#midiCommand(java.lang.String)">midiCommand</A></B>(java.lang.String&nbsp;line)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#postprocessor()">postprocessor</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#resetScale()">resetScale</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setArea(java.lang.String)">setArea</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setArtist(java.lang.String)">setArtist</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBarkey(java.lang.String)">setBarkey</A></B>(java.lang.String&nbsp;scale)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBassprog(int)">setBassprog</A></B>(int&nbsp;bassprog)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBassvol(int)">setBassvol</A></B>(int&nbsp;bassvol)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setBook(java.lang.String)">setBook</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChord(int, org.herac.tuxguitar.io.abc.base.ABCChord)">setChord</A></B>(int&nbsp;index,
-         <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChordprog(int)">setChordprog</A></B>(int&nbsp;chordprog)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChords(int)">setChords</A></B>(int&nbsp;length)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChordvol(int)">setChordvol</A></B>(int&nbsp;chordvol)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setComments(java.lang.String)">setComments</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setComponist(java.lang.String)">setComponist</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDefaultNoteLength(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)">setDefaultNoteLength</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;signature)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDiscography(java.lang.String)">setDiscography</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDrone(java.lang.String)">setDrone</A></B>(java.lang.String&nbsp;drone)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDroneon(boolean)">setDroneon</A></B>(boolean&nbsp;droneon)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDrum(java.lang.String)">setDrum</A></B>(java.lang.String&nbsp;drum)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDrumon(boolean)">setDrumon</A></B>(boolean&nbsp;drumon)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setFilename(java.lang.String)">setFilename</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setGchord(java.lang.String)">setGchord</A></B>(java.lang.String&nbsp;gchord)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setGchordon(boolean)">setGchordon</A></B>(boolean&nbsp;gchordon)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setGroup(java.lang.String)">setGroup</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInfo(org.herac.tuxguitar.io.abc.base.ABCInfo)">setInfo</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>&nbsp;info)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInformation(java.lang.String)">setInformation</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInstrumentOffset(int)">setInstrumentOffset</A></B>(int&nbsp;instrumentOffset)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setKey(java.lang.String)">setKey</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setOrigin(java.lang.String)">setOrigin</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setPart(java.lang.String)">setPart</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setParts(java.lang.String)">setParts</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRepeat(int, org.herac.tuxguitar.io.abc.base.ABCRepeat)">setRepeat</A></B>(int&nbsp;index,
-          <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>&nbsp;repeat)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRepeats(int)">setRepeats</A></B>(int&nbsp;length)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRhythm(java.lang.String)">setRhythm</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Abc also includes a rhythm field, 
- R:, which is used for cataloguing and sorting collections of abc tunes:
- this is entirely free text (although there are obvious 'standard' entries eg R:reel, R:jig, R:schottische).</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setSource(java.lang.String)">setSource</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setStrings(int)">setStrings</A></B>(int&nbsp;strings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTempo(java.lang.String)">setTempo</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setText(int, org.herac.tuxguitar.io.abc.base.ABCText)">setText</A></B>(int&nbsp;index,
-        <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTexts(int)">setTexts</A></B>(int&nbsp;length)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTimeSignature(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)">setTimeSignature</A></B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;timeSignature)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTitle(java.lang.String)">setTitle</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTrack(int, org.herac.tuxguitar.io.abc.base.ABCTrack)">setTrack</A></B>(int&nbsp;index,
-         <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>&nbsp;track)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTracks(int)">setTracks</A></B>(int&nbsp;length)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTranscriptor(java.lang.String)">setTranscriptor</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setVoice(java.lang.String)">setVoice</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setX(int)">setX</A></B>(int&nbsp;i)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#sortEvents()">sortEvents</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="TICKS_PER_QUART"><!-- --></A><H3>
-TICKS_PER_QUART</H3>
-<PRE>
-public static final int <B>TICKS_PER_QUART</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCSong.TICKS_PER_QUART">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCSong()"><!-- --></A><H3>
-ABCSong</H3>
-<PRE>
-public <B>ABCSong</B>()</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getChords()"><!-- --></A><H3>
-getChords</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>[] <B>getChords</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChords(int)"><!-- --></A><H3>
-setChords</H3>
-<PRE>
-public void <B>setChords</B>(int&nbsp;length)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChord(int, org.herac.tuxguitar.io.abc.base.ABCChord)"><!-- --></A><H3>
-setChord</H3>
-<PRE>
-public void <B>setChord</B>(int&nbsp;index,
-                     <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInfo()"><!-- --></A><H3>
-getInfo</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A> <B>getInfo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setInfo(org.herac.tuxguitar.io.abc.base.ABCInfo)"><!-- --></A><H3>
-setInfo</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A> <B>setInfo</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>&nbsp;info)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getRepeats()"><!-- --></A><H3>
-getRepeats</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>[] <B>getRepeats</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setRepeats(int)"><!-- --></A><H3>
-setRepeats</H3>
-<PRE>
-public void <B>setRepeats</B>(int&nbsp;length)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setRepeat(int, org.herac.tuxguitar.io.abc.base.ABCRepeat)"><!-- --></A><H3>
-setRepeat</H3>
-<PRE>
-public void <B>setRepeat</B>(int&nbsp;index,
-                      <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>&nbsp;repeat)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTexts()"><!-- --></A><H3>
-getTexts</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>[] <B>getTexts</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTexts(int)"><!-- --></A><H3>
-setTexts</H3>
-<PRE>
-public void <B>setTexts</B>(int&nbsp;length)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setText(int, org.herac.tuxguitar.io.abc.base.ABCText)"><!-- --></A><H3>
-setText</H3>
-<PRE>
-public void <B>setText</B>(int&nbsp;index,
-                    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>&nbsp;text)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTracks()"><!-- --></A><H3>
-getTracks</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>[] <B>getTracks</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTracks(int)"><!-- --></A><H3>
-setTracks</H3>
-<PRE>
-public void <B>setTracks</B>(int&nbsp;length)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTrack(int, org.herac.tuxguitar.io.abc.base.ABCTrack)"><!-- --></A><H3>
-setTrack</H3>
-<PRE>
-public void <B>setTrack</B>(int&nbsp;index,
-                     <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>&nbsp;track)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTimeSignature()"><!-- --></A><H3>
-getTimeSignature</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A> <B>getTimeSignature</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTimeSignature(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)"><!-- --></A><H3>
-setTimeSignature</H3>
-<PRE>
-public void <B>setTimeSignature</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;timeSignature)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTempo()"><!-- --></A><H3>
-getTempo</H3>
-<PRE>
-public int <B>getTempo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getStrings()"><!-- --></A><H3>
-getStrings</H3>
-<PRE>
-public int <B>getStrings</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setStrings(int)"><!-- --></A><H3>
-setStrings</H3>
-<PRE>
-public void <B>setStrings</B>(int&nbsp;strings)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getMeasures()"><!-- --></A><H3>
-getMeasures</H3>
-<PRE>
-public int <B>getMeasures</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addTempoChange(org.herac.tuxguitar.io.abc.base.ABCTempoChange)"><!-- --></A><H3>
-addTempoChange</H3>
-<PRE>
-public void <B>addTempoChange</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>&nbsp;tChange)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addTimeSignatureChange(org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange)"><!-- --></A><H3>
-addTimeSignatureChange</H3>
-<PRE>
-public void <B>addTimeSignatureChange</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>&nbsp;tsChange)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTimeSignature(int)"><!-- --></A><H3>
-getTimeSignature</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A> <B>getTimeSignature</B>(int&nbsp;measure)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTempo(int)"><!-- --></A><H3>
-getTempo</H3>
-<PRE>
-public int <B>getTempo</B>(int&nbsp;measure)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTitle(java.lang.String)"><!-- --></A><H3>
-setTitle</H3>
-<PRE>
-public void <B>setTitle</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setComments(java.lang.String)"><!-- --></A><H3>
-setComments</H3>
-<PRE>
-public void <B>setComments</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setArtist(java.lang.String)"><!-- --></A><H3>
-setArtist</H3>
-<PRE>
-public void <B>setArtist</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setComponist(java.lang.String)"><!-- --></A><H3>
-setComponist</H3>
-<PRE>
-public void <B>setComponist</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setArea(java.lang.String)"><!-- --></A><H3>
-setArea</H3>
-<PRE>
-public void <B>setArea</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBook(java.lang.String)"><!-- --></A><H3>
-setBook</H3>
-<PRE>
-public void <B>setBook</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDiscography(java.lang.String)"><!-- --></A><H3>
-setDiscography</H3>
-<PRE>
-public void <B>setDiscography</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDefaultNoteLength(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)"><!-- --></A><H3>
-setDefaultNoteLength</H3>
-<PRE>
-public void <B>setDefaultNoteLength</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;signature)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDefaultNoteLength()"><!-- --></A><H3>
-getDefaultNoteLength</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A> <B>getDefaultNoteLength</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the defaultNoteLength</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setFilename(java.lang.String)"><!-- --></A><H3>
-setFilename</H3>
-<PRE>
-public void <B>setFilename</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGroup(java.lang.String)"><!-- --></A><H3>
-setGroup</H3>
-<PRE>
-public void <B>setGroup</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addHistory(java.lang.String)"><!-- --></A><H3>
-addHistory</H3>
-<PRE>
-public void <B>addHistory</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setInformation(java.lang.String)"><!-- --></A><H3>
-setInformation</H3>
-<PRE>
-public void <B>setInformation</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setKey(java.lang.String)"><!-- --></A><H3>
-setKey</H3>
-<PRE>
-public void <B>setKey</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="resetScale()"><!-- --></A><H3>
-resetScale</H3>
-<PRE>
-public void <B>resetScale</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addNote(java.lang.String)"><!-- --></A><H3>
-addNote</H3>
-<PRE>
-public void <B>addNote</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setOrigin(java.lang.String)"><!-- --></A><H3>
-setOrigin</H3>
-<PRE>
-public void <B>setOrigin</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setParts(java.lang.String)"><!-- --></A><H3>
-setParts</H3>
-<PRE>
-public void <B>setParts</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTempo(java.lang.String)"><!-- --></A><H3>
-setTempo</H3>
-<PRE>
-public void <B>setTempo</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setRhythm(java.lang.String)"><!-- --></A><H3>
-setRhythm</H3>
-<PRE>
-public void <B>setRhythm</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD>Abc also includes a rhythm field, 
- R:, which is used for cataloguing and sorting collections of abc tunes:
- this is entirely free text (although there are obvious 'standard' entries eg R:reel, R:jig, R:schottische).
-<P>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setSource(java.lang.String)"><!-- --></A><H3>
-setSource</H3>
-<PRE>
-public void <B>setSource</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addWords(java.lang.String)"><!-- --></A><H3>
-addWords</H3>
-<PRE>
-public void <B>addWords</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setTranscriptor(java.lang.String)"><!-- --></A><H3>
-setTranscriptor</H3>
-<PRE>
-public void <B>setTranscriptor</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addRedefinable(java.lang.String)"><!-- --></A><H3>
-addRedefinable</H3>
-<PRE>
-public void <B>addRedefinable</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addMacro(java.lang.String)"><!-- --></A><H3>
-addMacro</H3>
-<PRE>
-public void <B>addMacro</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setX(int)"><!-- --></A><H3>
-setX</H3>
-<PRE>
-public void <B>setX</B>(int&nbsp;i)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPart(java.lang.String)"><!-- --></A><H3>
-setPart</H3>
-<PRE>
-public void <B>setPart</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addSymbols(java.lang.String)"><!-- --></A><H3>
-addSymbols</H3>
-<PRE>
-public void <B>addSymbols</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>string</CODE> - <p>
-	Adding many symbols to a line of music can make a tune difficult to read.<br>
-	In such cases, a symbol line (a line that contains only +...+ decorations and "..." chord symbols or annotations) can be used, 
-	analogous to a lyrics line.<br>
-	A symbol line starts with s:, followed by a line of symbols.<br> 
-	Matching of notes and symbols follows the rules defined in section Lyrics.<br>
-<pre> 
-	 Example: 
-	   CDEF    | G'''AB'c
-	s: "^slow" | +f+ ** +fff+
-</pre><DT><B>See Also:</B><DD><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addLyrics(java.lang.String)"><CODE>addLyrics(String)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addLyrics(java.lang.String)"><!-- --></A><H3>
-addLyrics</H3>
-<PRE>
-public void <B>addLyrics</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>string</CODE> - <p>
-	 The w field (lowercase w) in the body, supplies a line of lyrics to be aligned syllable 
-   by syllable below the previous line of notes.<br>
-   Syllables are not aligned on grace notes and tied notes are treated as two separate notes;
-   slurred or beamed notes are also treated as separate notes in this context. <br>
-   Note that lyrics are always aligned to the beginning of the preceding music line.<br> 
-	 It is possible for a music line to be followed by several w fields.<br>
-   This can be used together with the part notation to create verses.<br>
-   The first w field is used the first time that part is played, then the second and so on.<br> 
-	 The lyrics lines are treated as an ABC string.<br>
-   Within the lyrics, the words should be separated by one or more spaces
-   and to correctly align them the following symbols may be used:
-   <p>
-   <table>
-    <tr><th>Symbol</th><th>Meaning</th></tr> 
-	  <tr><td>-    (hyphen)</td><td>break between syllables within a word</td></tr> 
-	  <tr><td>_    (underscore)</td><td> last syllable is to be held for an extra note</td></tr> 
-	  <tr><td>*    </td><td>one note is skipped (i.e. * is equivalent to a blank syllable) </td></tr>
-	  <tr><td>~    </td><td>appears as a space; aligns multiple words under one note </td></tr>
-	  <tr><td>\-   </td><td>appears as hyphen; aligns multiple syllables under one note </td></tr>
-	  <tr><td>|    </td><td>advances to the next bar </td></tr>
-   </table>
-   <p>
-	 Note that if - is preceded by a space or another hyphen, it is regarded as a separate syllable.<br> 
-	 When an underscore is used next to a hyphen, the hyphen must always come first. <br>
-	 If there are not as many syllables as notes in a measure, typing a | automatically advances to the next bar;
-	 if there are enough syllables the '|' is just ignored. 
-<p>
-	 <b>Some examples:</b>
-<pre> 
-	w: syll-a-ble    is aligned with three notes
-	w: syll-a--ble   is aligned with four notes
-	w: syll-a -ble   (equivalent to the previous line)
-	w: time__        is aligned with three notes
-	w: of~the~day    is treated as one syllable (i.e. aligned with one note)
-	                 but appears as three separate words
-	 gf|e2dc B2A2|B2G2 E2D2|.G2.G2 GABc|d4 B2
-	w: Sa-ys my au-l' wan to your aul' wan\
-	   Will~ye come to the Wa-x-ies dar-gle?
-</pre>
-<p>
-	 Please see section Continuation of input lines for the meaning of the backslash (\) character. 
-<p>
-	 If a word starts with a digit, this is interpreted as numbering of a stanza and is pushed forward a bit.<br> 
-   In other words, use something like <br>
-	   w: 1.~Three blind mice<br>
-	 to put a number before Three.
-<p><DT><B>See Also:</B><DD><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addSymbols(java.lang.String)"><CODE>addSymbols(String)</CODE></A></DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addVoice(java.lang.String)"><!-- --></A><H3>
-addVoice</H3>
-<PRE>
-public void <B>addVoice</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setVoice(java.lang.String)"><!-- --></A><H3>
-setVoice</H3>
-<PRE>
-public void <B>setVoice</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addRemarks(java.lang.String)"><!-- --></A><H3>
-addRemarks</H3>
-<PRE>
-public void <B>addRemarks</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addMusic(java.lang.String)"><!-- --></A><H3>
-addMusic</H3>
-<PRE>
-public void <B>addMusic</B>(java.lang.String&nbsp;line)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVoice(java.lang.String)"><!-- --></A><H3>
-getVoice</H3>
-<PRE>
-public int <B>getVoice</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBarkey()"><!-- --></A><H3>
-getBarkey</H3>
-<PRE>
-public java.lang.String <B>getBarkey</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBarkey(java.lang.String)"><!-- --></A><H3>
-setBarkey</H3>
-<PRE>
-public void <B>setBarkey</B>(java.lang.String&nbsp;scale)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getEvents()"><!-- --></A><H3>
-getEvents</H3>
-<PRE>
-public java.util.ArrayList <B>getEvents</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the events</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="addChord(java.lang.String)"><!-- --></A><H3>
-addChord</H3>
-<PRE>
-public int <B>addChord</B>(java.lang.String&nbsp;name)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBassprog()"><!-- --></A><H3>
-getBassprog</H3>
-<PRE>
-public int <B>getBassprog</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the bassprog</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBassprog(int)"><!-- --></A><H3>
-setBassprog</H3>
-<PRE>
-public void <B>setBassprog</B>(int&nbsp;bassprog)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>bassprog</CODE> - the bassprog to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getBassvol()"><!-- --></A><H3>
-getBassvol</H3>
-<PRE>
-public int <B>getBassvol</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the bassvol</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setBassvol(int)"><!-- --></A><H3>
-setBassvol</H3>
-<PRE>
-public void <B>setBassvol</B>(int&nbsp;bassvol)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>bassvol</CODE> - the bassvol to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChordprog()"><!-- --></A><H3>
-getChordprog</H3>
-<PRE>
-public int <B>getChordprog</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the chordprog</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChordprog(int)"><!-- --></A><H3>
-setChordprog</H3>
-<PRE>
-public void <B>setChordprog</B>(int&nbsp;chordprog)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>chordprog</CODE> - the chordprog to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getChordvol()"><!-- --></A><H3>
-getChordvol</H3>
-<PRE>
-public int <B>getChordvol</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the chordvol</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setChordvol(int)"><!-- --></A><H3>
-setChordvol</H3>
-<PRE>
-public void <B>setChordvol</B>(int&nbsp;chordvol)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>chordvol</CODE> - the chordvol to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDrone()"><!-- --></A><H3>
-getDrone</H3>
-<PRE>
-public java.lang.String <B>getDrone</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the drone</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDrone(java.lang.String)"><!-- --></A><H3>
-setDrone</H3>
-<PRE>
-public void <B>setDrone</B>(java.lang.String&nbsp;drone)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>drone</CODE> - the drone to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isDroneon()"><!-- --></A><H3>
-isDroneon</H3>
-<PRE>
-public boolean <B>isDroneon</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the droneon</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDroneon(boolean)"><!-- --></A><H3>
-setDroneon</H3>
-<PRE>
-public void <B>setDroneon</B>(boolean&nbsp;droneon)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>droneon</CODE> - the droneon to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDrum()"><!-- --></A><H3>
-getDrum</H3>
-<PRE>
-public java.lang.String <B>getDrum</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the drum</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDrum(java.lang.String)"><!-- --></A><H3>
-setDrum</H3>
-<PRE>
-public void <B>setDrum</B>(java.lang.String&nbsp;drum)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>drum</CODE> - the drum to set
- <p>
- %%MIDI drum dzddd2dz 35 39 39 35 39 127 80 80 127 80
- % Bass Drum 1 + Electric Snare</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isDrumon()"><!-- --></A><H3>
-isDrumon</H3>
-<PRE>
-public boolean <B>isDrumon</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the drumon</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setDrumon(boolean)"><!-- --></A><H3>
-setDrumon</H3>
-<PRE>
-public void <B>setDrumon</B>(boolean&nbsp;drumon)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>drumon</CODE> - the drumon to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getGchord()"><!-- --></A><H3>
-getGchord</H3>
-<PRE>
-public java.lang.String <B>getGchord</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the gchord</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGchord(java.lang.String)"><!-- --></A><H3>
-setGchord</H3>
-<PRE>
-public void <B>setGchord</B>(java.lang.String&nbsp;gchord)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>gchord</CODE> - the gchord to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isGchordon()"><!-- --></A><H3>
-isGchordon</H3>
-<PRE>
-public boolean <B>isGchordon</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the gchordon</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setGchordon(boolean)"><!-- --></A><H3>
-setGchordon</H3>
-<PRE>
-public void <B>setGchordon</B>(boolean&nbsp;gchordon)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>gchordon</CODE> - the gchordon to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTrack()"><!-- --></A><H3>
-getTrack</H3>
-<PRE>
-public int <B>getTrack</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getKeySignature()"><!-- --></A><H3>
-getKeySignature</H3>
-<PRE>
-public int <B>getKeySignature</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the keySignature</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="midiCommand(java.lang.String)"><!-- --></A><H3>
-midiCommand</H3>
-<PRE>
-public void <B>midiCommand</B>(java.lang.String&nbsp;line)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setInstrumentOffset(int)"><!-- --></A><H3>
-setInstrumentOffset</H3>
-<PRE>
-public void <B>setInstrumentOffset</B>(int&nbsp;instrumentOffset)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>instrumentOffset</CODE> - the instrumentOffset to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="postprocessor()"><!-- --></A><H3>
-postprocessor</H3>
-<PRE>
-public void <B>postprocessor</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="sortEvents()"><!-- --></A><H3>
-sortEvents</H3>
-<PRE>
-public void <B>sortEvents</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="initBody()"><!-- --></A><H3>
-initBody</H3>
-<PRE>
-public void <B>initBody</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isHornpipe()"><!-- --></A><H3>
-isHornpipe</H3>
-<PRE>
-public boolean <B>isHornpipe</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="initHead()"><!-- --></A><H3>
-initHead</H3>
-<PRE>
-public void <B>initHead</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="computePitch(org.herac.tuxguitar.io.abc.base.ABCEvent, char[])"><!-- --></A><H3>
-computePitch</H3>
-<PRE>
-public int <B>computePitch</B>(<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event,
-                        char[]&nbsp;a)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="directive(java.lang.String)"><!-- --></A><H3>
-directive</H3>
-<PRE>
-public void <B>directive</B>(java.lang.String&nbsp;line)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>line</CODE> - </DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSong.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSong.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCSymbol.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCSymbol.html
deleted file mode 100644
index ae3d039f..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCSymbol.html
+++ /dev/null
@@ -1,364 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCSymbol
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCSymbol class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCSymbol";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSymbol.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSymbol.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCSymbol</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCSymbol</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCSymbol</B><DT>extends java.lang.Object</DL>
-
-<P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>peter
- <p>
- <b>Redefinable symbols</b>
- <p>
- As a short cut to writing symbols which avoids the +symbol+ syntax (see decorations),
- the letters H-W and h-w and the symbol ~ can be assigned with the U: field.<br>
- For example, to assign the letter T to represent the trill, you can write: 
- <pre>
-     U: T = +trill+
- </pre>
- You can also use "^text" etc (see Annotations below) in definitions, e.g. 
- <pre>
-     U: X = ''^+''
- </pre>
- to print a plus sign over notes with X before them. 
- <p>
- Symbol definitions can be written in the file header, in which case they apply to all
- the tunes in that file, or in a tune header, when they apply only to that tune, and 
- override any previous definitions.
- <p> 
- Programs may also make use of a set of global default definitions, which apply 
- everywhere unless overridden by local definitions. <br>
- You can assign the same symbol to two or more letters e.g. 
- <pre>
-     U: T = +trill+
-     U: U = +trill+
- </pre>
- in which case the same visible symbol will be produced by both letters 
- (but they may be played differently), 
- and you can de-assign a symbol by writing: 
- <pre>
-     U: T = +nil+
- </pre>
- or 
- <pre>
-     U: T = +none+
- </pre>
- The standard set of definitions (if you do not redefine them) is: 
- <pre>
-     U: ~ = +roll+
-     U: T = +trill+
-     U: H = +fermata+
-     U: L = +emphasis+
-     U: M = +lowermordent+
-     U: P = +uppermordent+
-     U: S = +segno+
-     U: O = +coda+
-     U: u = +upbow+
-     U: v = +downbow+
- </pre>
- Please see ABCMacro for an advanced macro mechanism.
- <p></DD>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><CODE>ABCMacro</CODE></A></DL>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#ABCSymbol(java.lang.String)">ABCSymbol</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#execute(java.lang.String)">execute</A></B>(java.lang.String&nbsp;line)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;char</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#isNil()">isNil</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html#isValid()">isValid</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCSymbol(java.lang.String)"><!-- --></A><H3>
-ABCSymbol</H3>
-<PRE>
-public <B>ABCSymbol</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="execute(java.lang.String)"><!-- --></A><H3>
-execute</H3>
-<PRE>
-public java.lang.String <B>execute</B>(java.lang.String&nbsp;line)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public char <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isValid()"><!-- --></A><H3>
-isValid</H3>
-<PRE>
-public boolean <B>isValid</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isNil()"><!-- --></A><H3>
-isNil</H3>
-<PRE>
-public boolean <B>isNil</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCSymbol.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSymbol.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTempo.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTempo.html
deleted file mode 100644
index 458e28bf..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTempo.html
+++ /dev/null
@@ -1,332 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCTempo
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCTempo class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCTempo";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTempo.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCTempo</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCTempo</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCTempo</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html#ABCTempo(int)">ABCTempo</A></B>(int&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html#ABCTempo(java.lang.String)">ABCTempo</A></B>(java.lang.String&nbsp;string)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html#copy()">copy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html#getValue()">getValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCTempo(int)"><!-- --></A><H3>
-ABCTempo</H3>
-<PRE>
-public <B>ABCTempo</B>(int&nbsp;value)</PRE>
-<DL>
-</DL>
-<HR>
-
-<A NAME="ABCTempo(java.lang.String)"><!-- --></A><H3>
-ABCTempo</H3>
-<PRE>
-public <B>ABCTempo</B>(java.lang.String&nbsp;string)</PRE>
-<DL>
-<DT><B>Parameters:</B><DD><CODE>string</CODE> - <p>
- "the actual number of beats per minute in a piece marked allergro (for example),
-  will depend on the music itself.
-  A piece consisting mainly of 'half notes' can be played very much quicker in
-  terms of bpm than a piece consisting mainly of 'sixteenth notes', 
-  but still be described with the same word."
-  <p>
- Here are the best descriptions for the following tempo markings:<br>
- <table border="2">
- <tr><th>Beats/minute</th><th>marking</th><th>description</th></tr>
- <tr><td>20</td><td>Larghissimo/td><td>very, very slow (20 bpm and below)</td></tr>
- <tr><td>40</td><td>Grave/td><td>slow and solemn (20-40 bpm)</td></tr>
- <tr><td>50</td><td>Lento/td><td>very slow (40-60 bpm)</td></tr>
- <tr><td>60</td><td>Largo/td><td>very slow (40-60 bpm), like lento</td></tr>
- <tr><td>65</td><td>Larghetto</td><td>rather broadly (60-66 bpm)</td></tr> 
- <tr><td>76</td><td>Adagio</td><td>slowly </td></tr>
- <tr><td>80</td><td>Andante</td><td>at a walking pace</td></tr> 
- <tr><td>90</td><td>Andante Moderato</td><td>a bit faster than andante</td></tr>
- <tr><td>100</td><td>Andantino</td><td>slightly faster than andante</td></tr>
- <tr><td>105</td><td>Moderato</td><td>moderately (101-110 bpm)</td></tr>
- <tr><td>110</td><td>Allegretto</td><td>moderately fast (but less so than allegro)</td></tr>
- <tr><td>120</td><td>Allegro moderato</td><td>moderately quick (112-124 bpm)</td></tr>
- <tr><td>130</td><td>Allegro</td><td>fast, quickly and bright (120-139 bpm)</td></tr>
- <tr><td>140</td><td>Vivace</td><td>lively and fast (~140 bpm) (quicker than allegro)</td></tr>
- <tr><td>150</td><td>Vivacissimo</td><td>very fast and lively</td></tr>
- <tr><td>160</td><td>Allegrissimo</td><td>very fast</td></tr>
- <tr><td>180</td><td>Presto</td><td>very fast (168-200 bpm)</td></tr>
- <tr><td>220</td><td>Prestissimo</td><td>extremely fast (more than 200bpm)</td></tr>
- </table></DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getValue()"><!-- --></A><H3>
-getValue</H3>
-<PRE>
-public int <B>getValue</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="copy()"><!-- --></A><H3>
-copy</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A> <B>copy</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTempo.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTempoChange.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTempoChange.html
deleted file mode 100644
index 6296d454..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTempoChange.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCTempoChange
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCTempoChange class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCTempoChange";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTempoChange.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempoChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCTempoChange</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCTempoChange</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCTempoChange</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#ABCTempoChange(int, int)">ABCTempoChange</A></B>(int&nbsp;measure,
-               int&nbsp;tempo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#getMeasure()">getMeasure</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#getTempo()">getTempo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCTempoChange(int, int)"><!-- --></A><H3>
-ABCTempoChange</H3>
-<PRE>
-public <B>ABCTempoChange</B>(int&nbsp;measure,
-                      int&nbsp;tempo)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getMeasure()"><!-- --></A><H3>
-getMeasure</H3>
-<PRE>
-public int <B>getMeasure</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTempo()"><!-- --></A><H3>
-getTempo</H3>
-<PRE>
-public int <B>getTempo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTempoChange.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempoChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCText.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCText.html
deleted file mode 100644
index b58983c3..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCText.html
+++ /dev/null
@@ -1,271 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCText
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCText class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCText";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCText.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCText.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCText</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCText</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCText</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html#ABCText(java.lang.String)">ABCText</A></B>(java.lang.String&nbsp;value)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html#getValue()">getValue</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCText(java.lang.String)"><!-- --></A><H3>
-ABCText</H3>
-<PRE>
-public <B>ABCText</B>(java.lang.String&nbsp;value)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getValue()"><!-- --></A><H3>
-getValue</H3>
-<PRE>
-public java.lang.String <B>getValue</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCText.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCText.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html
deleted file mode 100644
index b0c7ce9b..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html
+++ /dev/null
@@ -1,314 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCTimeSignature
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCTimeSignature class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCTimeSignature";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTimeSignature.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignature.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCTimeSignature</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCTimeSignature</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCTimeSignature</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#ABCTimeSignature(int, int, boolean)">ABCTimeSignature</A></B>(int&nbsp;numerator,
-                 int&nbsp;denominator,
-                 boolean&nbsp;toEnd)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#getDenominator()">getDenominator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#getNumerator()">getNumerator</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#isToEnd()">isToEnd</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCTimeSignature(int, int, boolean)"><!-- --></A><H3>
-ABCTimeSignature</H3>
-<PRE>
-public <B>ABCTimeSignature</B>(int&nbsp;numerator,
-                        int&nbsp;denominator,
-                        boolean&nbsp;toEnd)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDenominator()"><!-- --></A><H3>
-getDenominator</H3>
-<PRE>
-public int <B>getDenominator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getNumerator()"><!-- --></A><H3>
-getNumerator</H3>
-<PRE>
-public int <B>getNumerator</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isToEnd()"><!-- --></A><H3>
-isToEnd</H3>
-<PRE>
-public boolean <B>isToEnd</B>()</PRE>
-<DL>
-<DD><DL>
-
-<DT><B>Returns:</B><DD>the toEnd</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTimeSignature.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignature.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html
deleted file mode 100644
index ef3b594d..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html
+++ /dev/null
@@ -1,292 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCTimeSignatureChange
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCTimeSignatureChange";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTimeSignatureChange.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignatureChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCTimeSignatureChange</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCTimeSignatureChange</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#ABCTimeSignatureChange(int, org.herac.tuxguitar.io.abc.base.ABCTimeSignature)">ABCTimeSignatureChange</A></B>(int&nbsp;measure,
-                       <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;timeSignature)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#getMeasure()">getMeasure</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#getTimeSignature()">getTimeSignature</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCTimeSignatureChange(int, org.herac.tuxguitar.io.abc.base.ABCTimeSignature)"><!-- --></A><H3>
-ABCTimeSignatureChange</H3>
-<PRE>
-public <B>ABCTimeSignatureChange</B>(int&nbsp;measure,
-                              <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;timeSignature)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getMeasure()"><!-- --></A><H3>
-getMeasure</H3>
-<PRE>
-public int <B>getMeasure</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getTimeSignature()"><!-- --></A><H3>
-getTimeSignature</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A> <B>getTimeSignature</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTimeSignatureChange.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><B>NEXT CLASS</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignatureChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;FIELD&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTrack.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTrack.html
deleted file mode 100644
index 36f117f2..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/ABCTrack.html
+++ /dev/null
@@ -1,756 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:33 GMT+01:00 2011 -->
-<TITLE>
-ABCTrack
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base.ABCTrack class">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="ABCTrack";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTrack.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTrack.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<!-- ======== START OF CLASS DATA ======== -->
-<H2>
-<FONT SIZE="-1">
-org.herac.tuxguitar.io.abc.base</FONT>
-<BR>
-Class ABCTrack</H2>
-<PRE>
-java.lang.Object
-  <IMG SRC="../../../../../../resources/inherit.gif" ALT="extended by"><B>org.herac.tuxguitar.io.abc.base.ABCTrack</B>
-</PRE>
-<HR>
-<DL>
-<DT>public class <B>ABCTrack</B><DT>extends java.lang.Object</DL>
-
-<P>
-<HR>
-
-<P>
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-
-
-<!-- =========== FIELD SUMMARY =========== -->
-
-<A NAME="field_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Field Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_DOUBLE_STRINGS">FLAG_DOUBLE_STRINGS</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_EFFECT_CHANNEL_DISABLED">FLAG_EFFECT_CHANNEL_DISABLED</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_LET_RING">FLAG_LET_RING</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_PEDAL_SABCEL_GUITAR">FLAG_PEDAL_SABCEL_GUITAR</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#FLAG_RHYTHM_TRACK">FLAG_RHYTHM_TRACK</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-
-<A NAME="constructor_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Constructor Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#ABCTrack(java.lang.String)">ABCTrack</A></B>(java.lang.String&nbsp;declaration)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<!-- ========== METHOD SUMMARY =========== -->
-
-<A NAME="method_summary"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Method Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#clone(java.lang.String, int)">clone</A></B>(java.lang.String&nbsp;name,
-      int&nbsp;numstrings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getCapo()">getCapo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getClefNumber()">getClefNumber</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getClefType()">getClefType</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getDeclaration()">getDeclaration</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getFlags()">getFlags</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getInstrument()">getInstrument</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getName()">getName</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getPan()">getPan</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int[]</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getStrings()">getStrings</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#getVolume()">getVolume</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#isBagpipe()">isBagpipe</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;boolean</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#isPercussion()">isPercussion</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setCapo(int)">setCapo</A></B>(int&nbsp;capo)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setClefNumber(int)">setClefNumber</A></B>(int&nbsp;clefNumber)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setClefType(int)">setClefType</A></B>(int&nbsp;clefType)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setFlags(int)">setFlags</A></B>(int&nbsp;flags)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setInstrument(int)">setInstrument</A></B>(int&nbsp;instrument)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setPan(int)">setPan</A></B>(int&nbsp;pan)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setStrings(int[])">setStrings</A></B>(int[]&nbsp;s)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#setVolume(int)">setVolume</A></B>(int&nbsp;volume)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;java.lang.String</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#toString()">toString</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;<A NAME="methods_inherited_from_class_java.lang.Object"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TD><B>Methods inherited from class java.lang.Object</B></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</CODE></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<!-- ============ FIELD DETAIL =========== -->
-
-<A NAME="field_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Field Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="FLAG_DOUBLE_STRINGS"><!-- --></A><H3>
-FLAG_DOUBLE_STRINGS</H3>
-<PRE>
-public static final int <B>FLAG_DOUBLE_STRINGS</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_DOUBLE_STRINGS">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FLAG_LET_RING"><!-- --></A><H3>
-FLAG_LET_RING</H3>
-<PRE>
-public static final int <B>FLAG_LET_RING</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_LET_RING">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FLAG_PEDAL_SABCEL_GUITAR"><!-- --></A><H3>
-FLAG_PEDAL_SABCEL_GUITAR</H3>
-<PRE>
-public static final int <B>FLAG_PEDAL_SABCEL_GUITAR</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_PEDAL_SABCEL_GUITAR">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FLAG_EFFECT_CHANNEL_DISABLED"><!-- --></A><H3>
-FLAG_EFFECT_CHANNEL_DISABLED</H3>
-<PRE>
-public static final int <B>FLAG_EFFECT_CHANNEL_DISABLED</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_EFFECT_CHANNEL_DISABLED">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="FLAG_RHYTHM_TRACK"><!-- --></A><H3>
-FLAG_RHYTHM_TRACK</H3>
-<PRE>
-public static final int <B>FLAG_RHYTHM_TRACK</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../../../constant-values.html#org.herac.tuxguitar.io.abc.base.ABCTrack.FLAG_RHYTHM_TRACK">Constant Field Values</A></DL>
-</DL>
-
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-
-<A NAME="constructor_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Constructor Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="ABCTrack(java.lang.String)"><!-- --></A><H3>
-ABCTrack</H3>
-<PRE>
-public <B>ABCTrack</B>(java.lang.String&nbsp;declaration)</PRE>
-<DL>
-</DL>
-
-<!-- ============ METHOD DETAIL ========== -->
-
-<A NAME="method_detail"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=1><FONT SIZE="+2">
-<B>Method Detail</B></FONT></TD>
-</TR>
-</TABLE>
-
-<A NAME="getCapo()"><!-- --></A><H3>
-getCapo</H3>
-<PRE>
-public int <B>getCapo</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getClefNumber()"><!-- --></A><H3>
-getClefNumber</H3>
-<PRE>
-public int <B>getClefNumber</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getClefType()"><!-- --></A><H3>
-getClefType</H3>
-<PRE>
-public int <B>getClefType</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getFlags()"><!-- --></A><H3>
-getFlags</H3>
-<PRE>
-public int <B>getFlags</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getName()"><!-- --></A><H3>
-getName</H3>
-<PRE>
-public java.lang.String <B>getName</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getPan()"><!-- --></A><H3>
-getPan</H3>
-<PRE>
-public int <B>getPan</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isPercussion()"><!-- --></A><H3>
-isPercussion</H3>
-<PRE>
-public boolean <B>isPercussion</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getStrings()"><!-- --></A><H3>
-getStrings</H3>
-<PRE>
-public int[] <B>getStrings</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getVolume()"><!-- --></A><H3>
-getVolume</H3>
-<PRE>
-public int <B>getVolume</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getInstrument()"><!-- --></A><H3>
-getInstrument</H3>
-<PRE>
-public int <B>getInstrument</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="toString()"><!-- --></A><H3>
-toString</H3>
-<PRE>
-public java.lang.String <B>toString</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="getDeclaration()"><!-- --></A><H3>
-getDeclaration</H3>
-<PRE>
-public java.lang.String <B>getDeclaration</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setCapo(int)"><!-- --></A><H3>
-setCapo</H3>
-<PRE>
-public void <B>setCapo</B>(int&nbsp;capo)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>capo</CODE> - the capo to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setClefNumber(int)"><!-- --></A><H3>
-setClefNumber</H3>
-<PRE>
-public void <B>setClefNumber</B>(int&nbsp;clefNumber)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>clefNumber</CODE> - the clefNumber to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setClefType(int)"><!-- --></A><H3>
-setClefType</H3>
-<PRE>
-public void <B>setClefType</B>(int&nbsp;clefType)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>clefType</CODE> - the clefType to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setInstrument(int)"><!-- --></A><H3>
-setInstrument</H3>
-<PRE>
-public void <B>setInstrument</B>(int&nbsp;instrument)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>instrument</CODE> - the instrument to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setPan(int)"><!-- --></A><H3>
-setPan</H3>
-<PRE>
-public void <B>setPan</B>(int&nbsp;pan)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>pan</CODE> - the pan to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setVolume(int)"><!-- --></A><H3>
-setVolume</H3>
-<PRE>
-public void <B>setVolume</B>(int&nbsp;volume)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>volume</CODE> - the volume to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setFlags(int)"><!-- --></A><H3>
-setFlags</H3>
-<PRE>
-public void <B>setFlags</B>(int&nbsp;flags)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Parameters:</B><DD><CODE>flags</CODE> - the flags to set</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="clone(java.lang.String, int)"><!-- --></A><H3>
-clone</H3>
-<PRE>
-public <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A> <B>clone</B>(java.lang.String&nbsp;name,
-                      int&nbsp;numstrings)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="setStrings(int[])"><!-- --></A><H3>
-setStrings</H3>
-<PRE>
-public void <B>setStrings</B>(int[]&nbsp;s)</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="isBagpipe()"><!-- --></A><H3>
-isBagpipe</H3>
-<PRE>
-public boolean <B>isBagpipe</B>()</PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<!-- ========= END OF CLASS DATA ========= -->
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Class</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="class-use/ABCTrack.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTrack.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-<TR>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-  SUMMARY:&nbsp;NESTED&nbsp;|&nbsp;<A HREF="#field_summary">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_summary">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_summary">METHOD</A></FONT></TD>
-<TD VALIGN="top" CLASS="NavBarCell3"><FONT SIZE="-2">
-DETAIL:&nbsp;<A HREF="#field_detail">FIELD</A>&nbsp;|&nbsp;<A HREF="#constructor_detail">CONSTR</A>&nbsp;|&nbsp;<A HREF="#method_detail">METHOD</A></FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCChord.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCChord.html
deleted file mode 100644
index e93e97ed..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCChord.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCChord
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCChord";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCChord</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getChords()">getChords</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></CODE></FONT></TD>
-<TD><CODE><B>ABCLocation.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getChord()">getChord</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setChord(int, org.herac.tuxguitar.io.abc.base.ABCChord)">setChord</A></B>(int&nbsp;index,
-         <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCLocation.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#setChord(org.herac.tuxguitar.io.abc.base.ABCChord)">setChord</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Constructors in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#ABCLocation(java.lang.String, int, int, int, org.herac.tuxguitar.io.abc.base.ABCChord, org.herac.tuxguitar.io.abc.base.ABCEvent)">ABCLocation</A></B>(java.lang.String&nbsp;part,
-            int&nbsp;track,
-            int&nbsp;measure,
-            int&nbsp;ticks,
-            <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord,
-            <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponent.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponent.html
deleted file mode 100644
index dc4dd45b..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponent.html
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCComponent
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCComponent";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCComponent</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Subclasses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;class</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponentChord.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponentChord.html
deleted file mode 100644
index 765dc590..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponentChord.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCComponentChord
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCComponentChord";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCComponentChord</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.base.ABCComponentChord
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentChord.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponentNote.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponentNote.html
deleted file mode 100644
index 6c7ab159..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCComponentNote.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCComponentNote
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCComponentNote";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentNote.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCComponentNote</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.base.ABCComponentNote
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCComponentNote.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCEvent.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCEvent.html
deleted file mode 100644
index dbe48ebf..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCEvent.html
+++ /dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCEvent
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCEvent";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCEvent</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></CODE></FONT></TD>
-<TD><CODE><B>ABCLocation.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#getEvent()">getEvent</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;int</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#computePitch(org.herac.tuxguitar.io.abc.base.ABCEvent, char[])">computePitch</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event,
-             char[]&nbsp;a)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Constructors in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html#ABCLocation(java.lang.String, int, int, int, org.herac.tuxguitar.io.abc.base.ABCChord, org.herac.tuxguitar.io.abc.base.ABCEvent)">ABCLocation</A></B>(java.lang.String&nbsp;part,
-            int&nbsp;track,
-            int&nbsp;measure,
-            int&nbsp;ticks,
-            <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A>&nbsp;chord,
-            <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A>&nbsp;event)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCEvent.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCInfo.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCInfo.html
deleted file mode 100644
index c2418219..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCInfo.html
+++ /dev/null
@@ -1,196 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCInfo
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCInfo";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInfo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCInfo</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getInfo()">getInfo</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInfo(org.herac.tuxguitar.io.abc.base.ABCInfo)">setInfo</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>&nbsp;info)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setInfo(org.herac.tuxguitar.io.abc.base.ABCInfo)">setInfo</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A>&nbsp;info)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInfo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCLocation.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCLocation.html
deleted file mode 100644
index 3ea989bf..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCLocation.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCLocation
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCLocation";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCLocation.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCLocation</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.base.ABCLocation
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCLocation.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCMacro.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCMacro.html
deleted file mode 100644
index 6825a347..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCMacro.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCMacro
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCMacro";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCMacro.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCMacro</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.base.ABCMacro
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCMacro.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCOctaveDatabase.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCOctaveDatabase.html
deleted file mode 100644
index eddd10dd..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCOctaveDatabase.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCOctaveDatabase
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCOctaveDatabase";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOctaveDatabase.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCOctaveDatabase</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.base.ABCOctaveDatabase
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOctaveDatabase.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCPercussion.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCPercussion.html
deleted file mode 100644
index d4cae451..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCPercussion.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Tue May 17 20:18:18 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCPercussion
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCPercussion";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPercussion.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCPercussion</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base">ABCPercussion</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base">ABCPercussion</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base">ABCPercussion</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base">ABCPercussion</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getPercussions()">getPercussions</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base">ABCPercussion</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setPercussion(int, org.herac.tuxguitar.io.abc.base.ABCPercussion)">setPercussion</A></B>(int&nbsp;index,
-              <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base">ABCPercussion</A>&nbsp;percussions)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCPercussion.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPercussion.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCRepeat.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCRepeat.html
deleted file mode 100644
index 10fe8d9a..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCRepeat.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCRepeat
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCRepeat";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRepeat.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCRepeat</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getRepeats()">getRepeats</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRepeat(int, org.herac.tuxguitar.io.abc.base.ABCRepeat)">setRepeat</A></B>(int&nbsp;index,
-          <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A>&nbsp;repeat)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRepeat.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCRhythm.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCRhythm.html
deleted file mode 100644
index f842f105..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCRhythm.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Tue May 17 20:18:18 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCRhythm
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCRhythm";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRhythm.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCRhythm</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRhythm</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRhythm</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRhythm</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRhythm</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getRhythms()">getRhythms</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRhythm</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setRhythm(int, org.herac.tuxguitar.io.abc.base.ABCRhythm)">setRhythm</A></B>(int&nbsp;index,
-          <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRhythm</A>&nbsp;rhythm)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCRhythm.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCRhythm.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCSong.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCSong.html
deleted file mode 100644
index 8e1d83ce..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCSong.html
+++ /dev/null
@@ -1,200 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCSong
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCSong";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSong.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCSong</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc"><B>org.herac.tuxguitar.io.abc</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></CODE></FONT></TD>
-<TD><CODE><B>ABCInputStream.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html#readSong()">readSong</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Constructors in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html#ABCEvent(org.herac.tuxguitar.io.abc.base.ABCSong, java.lang.String)">ABCEvent</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A>&nbsp;song,
-         java.lang.String&nbsp;name)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSong.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCSymbol.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCSymbol.html
deleted file mode 100644
index fffb8a14..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCSymbol.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCSymbol
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCSymbol";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSymbol.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCSymbol</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.base.ABCSymbol
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSymbol.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTempo.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTempo.html
deleted file mode 100644
index e7f8d68b..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTempo.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCTempo
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCTempo";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCTempo</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A></CODE></FONT></TD>
-<TD><CODE><B>ABCTempo.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html#copy()">copy</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempo.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTempoChange.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTempoChange.html
deleted file mode 100644
index 0f89768e..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTempoChange.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCTempoChange
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCTempoChange";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempoChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCTempoChange</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addTempoChange(org.herac.tuxguitar.io.abc.base.ABCTempoChange)">addTempoChange</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A>&nbsp;tChange)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTempoChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCText.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCText.html
deleted file mode 100644
index 3633cea4..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCText.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCText
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCText";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCText.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCText</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTexts()">getTexts</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setText(int, org.herac.tuxguitar.io.abc.base.ABCText)">setText</A></B>(int&nbsp;index,
-        <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A>&nbsp;text)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCText.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignature.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignature.html
deleted file mode 100644
index f4a359b2..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignature.html
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCTimeSignature
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCTimeSignature";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignature.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCTimeSignature</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B>ABCTimeSignatureChange.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#getTimeSignature()">getTimeSignature</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTimeSignature()">getTimeSignature</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTimeSignature(int)">getTimeSignature</A></B>(int&nbsp;measure)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getDefaultNoteLength()">getDefaultNoteLength</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTimeSignature(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)">setTimeSignature</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;timeSignature)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setDefaultNoteLength(org.herac.tuxguitar.io.abc.base.ABCTimeSignature)">setDefaultNoteLength</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;signature)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Constructors in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html#ABCTimeSignatureChange(int, org.herac.tuxguitar.io.abc.base.ABCTimeSignature)">ABCTimeSignatureChange</A></B>(int&nbsp;measure,
-                       <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A>&nbsp;timeSignature)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignature.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignatureChange.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignatureChange.html
deleted file mode 100644
index 7878b0ce..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignatureChange.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignatureChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#addTimeSignatureChange(org.herac.tuxguitar.io.abc.base.ABCTimeSignatureChange)">addTimeSignatureChange</A></B>(<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A>&nbsp;tsChange)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTimeSignatureChange.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTrack.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTrack.html
deleted file mode 100644
index 14fe8eff..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/class-use/ABCTrack.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.base.ABCTrack
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.base.ABCTrack";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTrack.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.base.ABCTrack</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A> in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> that return <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>[]</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#getTracks()">getTracks</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></CODE></FONT></TD>
-<TD><CODE><B>ABCTrack.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html#clone(java.lang.String, int)">clone</A></B>(java.lang.String&nbsp;name,
-      int&nbsp;numstrings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> with parameters of type <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B>ABCSong.</B><B><A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html#setTrack(int, org.herac.tuxguitar.io.abc.base.ABCTrack)">setTrack</A></B>(int&nbsp;index,
-         <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A>&nbsp;track)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCTrack.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-frame.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-frame.html
deleted file mode 100644
index 65143ea9..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-frame.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-org.herac.tuxguitar.io.abc.base
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html" target="classFrame">org.herac.tuxguitar.io.abc.base</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCChord</A>
-<BR>
-<A HREF="ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCComponent</A>
-<BR>
-<A HREF="ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCComponentChord</A>
-<BR>
-<A HREF="ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCComponentNote</A>
-<BR>
-<A HREF="ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCEvent</A>
-<BR>
-<A HREF="ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCInfo</A>
-<BR>
-<A HREF="ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCLocation</A>
-<BR>
-<A HREF="ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCMacro</A>
-<BR>
-<A HREF="ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCOctaveDatabase</A>
-<BR>
-<A HREF="ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCRepeat</A>
-<BR>
-<A HREF="ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCSong</A>
-<BR>
-<A HREF="ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCSymbol</A>
-<BR>
-<A HREF="ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTempo</A>
-<BR>
-<A HREF="ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTempoChange</A>
-<BR>
-<A HREF="ABCText.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCText</A>
-<BR>
-<A HREF="ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTimeSignature</A>
-<BR>
-<A HREF="ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTimeSignatureChange</A>
-<BR>
-<A HREF="ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base" target="classFrame">ABCTrack</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-summary.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-summary.html
deleted file mode 100644
index 0e366728..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-summary.html
+++ /dev/null
@@ -1,216 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-org.herac.tuxguitar.io.abc.base
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc.base package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="org.herac.tuxguitar.io.abc.base";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package org.herac.tuxguitar.io.abc.base
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCChord</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponent</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentChord</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base">ABCComponentNote</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base">ABCEvent</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCInfo</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base">ABCLocation</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base">ABCMacro</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base">ABCOctaveDatabase</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base">ABCRepeat</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSong</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base">ABCSymbol</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempo</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTempoChange</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base">ABCText</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignature</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTimeSignatureChange</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base">ABCTrack</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;NEXT PACKAGE</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-tree.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-tree.html
deleted file mode 100644
index 2f60d247..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-tree.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-org.herac.tuxguitar.io.abc.base Class Hierarchy
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="org.herac.tuxguitar.io.abc.base Class Hierarchy";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package org.herac.tuxguitar.io.abc.base
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.Object<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCChord</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponent</B></A><UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponentChord</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponentNote</B></A></UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCEvent</B></A> (implements java.lang.Comparable)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCInfo</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCLocation</B></A> (implements java.lang.Comparable)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCMacro</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCOctaveDatabase</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCRepeat</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCSong</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCSymbol</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTempo</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTempoChange</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCText</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignature</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignatureChange</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTrack</B></A></UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-use.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-use.html
deleted file mode 100644
index 27ed24db..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/base/package-use.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Package org.herac.tuxguitar.io.abc.base
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package org.herac.tuxguitar.io.abc.base";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>org.herac.tuxguitar.io.abc.base</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc"><B>org.herac.tuxguitar.io.abc</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc.base"><B>org.herac.tuxguitar.io.abc.base</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> used by <A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCSong.html#org.herac.tuxguitar.io.abc"><B>ABCSong</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc.base"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A> used by <A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCChord.html#org.herac.tuxguitar.io.abc.base"><B>ABCChord</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCComponent.html#org.herac.tuxguitar.io.abc.base"><B>ABCComponent</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCEvent.html#org.herac.tuxguitar.io.abc.base"><B>ABCEvent</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCInfo.html#org.herac.tuxguitar.io.abc.base"><B>ABCInfo</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCRepeat.html#org.herac.tuxguitar.io.abc.base"><B>ABCRepeat</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCSong.html#org.herac.tuxguitar.io.abc.base"><B>ABCSong</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCTempo.html#org.herac.tuxguitar.io.abc.base"><B>ABCTempo</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCTempoChange.html#org.herac.tuxguitar.io.abc.base"><B>ABCTempoChange</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCText.html#org.herac.tuxguitar.io.abc.base"><B>ABCText</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignature.html#org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignature</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCTimeSignatureChange.html#org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignatureChange</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/base/class-use/ABCTrack.html#org.herac.tuxguitar.io.abc.base"><B>ABCTrack</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCExportSettingsDialog.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCExportSettingsDialog.html
deleted file mode 100644
index f17fa417..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCExportSettingsDialog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCExportSettingsDialog
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCExportSettingsDialog";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCExportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCExportSettingsDialog</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCExportSettingsDialog
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCExportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCImportSettingsDialog.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCImportSettingsDialog.html
deleted file mode 100644
index 0d95b530..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCImportSettingsDialog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCImportSettingsDialog
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCImportSettingsDialog";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCImportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCImportSettingsDialog</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCImportSettingsDialog
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCImportSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCInputStream.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCInputStream.html
deleted file mode 100644
index f8285126..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCInputStream.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCInputStream
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCInputStream";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCInputStream</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCInputStream
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCInputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCOutputStream.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCOutputStream.html
deleted file mode 100644
index 535703dd..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCOutputStream.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCOutputStream
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCOutputStream";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOutputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCOutputStream</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCOutputStream
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCOutputStream.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginExporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginExporter.html
deleted file mode 100644
index 999fc508..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginExporter.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCPluginExporter
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCPluginExporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCPluginExporter</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCPluginExporter
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginImporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginImporter.html
deleted file mode 100644
index d10291ca..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginImporter.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCPluginImporter
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCPluginImporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCPluginImporter</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCPluginImporter
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginList.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginList.html
deleted file mode 100644
index 3f5f5892..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCPluginList.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCPluginList
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCPluginList";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginList.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCPluginList</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCPluginList
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCPluginList.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSettings.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSettings.html
deleted file mode 100644
index 4c0309f3..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSettings.html
+++ /dev/null
@@ -1,210 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCSettings
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCSettings";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCSettings</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc"><B>org.herac.tuxguitar.io.abc</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Uses of <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A> in <A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A></FONT></TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Methods in <A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A> that return <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B>ABCExportSettingsDialog.</B><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html#open()">open</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B>ABCImportSettingsDialog.</B><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html#open()">open</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></CODE></FONT></TD>
-<TD><CODE><B>ABCSettings.</B><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html#getDefaults()">getDefaults</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableSubHeadingColor">
-<TD COLSPAN=2>Constructors in <A HREF="../../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A> with parameters of type <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html#ABCInputStream(java.io.InputStream, org.herac.tuxguitar.io.abc.ABCSettings)">ABCInputStream</A></B>(java.io.InputStream&nbsp;stream,
-               <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>&nbsp;settings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><CODE><B><A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html#ABCOutputStream(java.io.OutputStream, org.herac.tuxguitar.io.abc.ABCSettings)">ABCOutputStream</A></B>(java.io.OutputStream&nbsp;stream,
-                <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A>&nbsp;settings)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettings.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSettingsDialog.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSettingsDialog.html
deleted file mode 100644
index 4ca61376..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSettingsDialog.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Sun Jun 26 09:16:54 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCSettingsDialog
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCSettingsDialog";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCSettingsDialog</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCSettingsDialog
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSettingsDialog.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSongExporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSongExporter.html
deleted file mode 100644
index f6ffcc52..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSongExporter.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCSongExporter
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCSongExporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCSongExporter</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCSongExporter
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongExporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSongImporter.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSongImporter.html
deleted file mode 100644
index 091301e1..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/class-use/ABCSongImporter.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Class org.herac.tuxguitar.io.abc.ABCSongImporter
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Class org.herac.tuxguitar.io.abc.ABCSongImporter";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Class<br>org.herac.tuxguitar.io.abc.ABCSongImporter</B></H2>
-</CENTER>
-No usage of org.herac.tuxguitar.io.abc.ABCSongImporter
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><FONT CLASS="NavBarFont1"><B>Class</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="ABCSongImporter.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-frame.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-frame.html
deleted file mode 100644
index 0fb06eee..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-frame.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-org.herac.tuxguitar.io.abc
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-<FONT size="+1" CLASS="FrameTitleFont">
-<A HREF="../../../../../org/herac/tuxguitar/io/abc/package-summary.html" target="classFrame">org.herac.tuxguitar.io.abc</A></FONT>
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameHeadingFont">
-Classes</FONT>&nbsp;
-<FONT CLASS="FrameItemFont">
-<BR>
-<A HREF="ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCExportSettingsDialog</A>
-<BR>
-<A HREF="ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCImportSettingsDialog</A>
-<BR>
-<A HREF="ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCInputStream</A>
-<BR>
-<A HREF="ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCOutputStream</A>
-<BR>
-<A HREF="ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCPluginExporter</A>
-<BR>
-<A HREF="ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCPluginImporter</A>
-<BR>
-<A HREF="ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCPluginList</A>
-<BR>
-<A HREF="ABCSettings.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCSettings</A>
-<BR>
-<A HREF="ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCSongExporter</A>
-<BR>
-<A HREF="ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc" target="classFrame">ABCSongImporter</A></FONT></TD>
-</TR>
-</TABLE>
-
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-summary.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-summary.html
deleted file mode 100644
index 3e8605a8..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-summary.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-org.herac.tuxguitar.io.abc
-</TITLE>
-
-<META NAME="keywords" CONTENT="org.herac.tuxguitar.io.abc package">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="org.herac.tuxguitar.io.abc";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<H2>
-Package org.herac.tuxguitar.io.abc
-</H2>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Class Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCExportSettingsDialog</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc">ABCImportSettingsDialog</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCInputStream</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc">ABCOutputStream</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginExporter</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginImporter</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc">ABCPluginList</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc">ABCSettings</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongExporter</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc">ABCSongImporter</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Package</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-use.html"><FONT CLASS="NavBarFont1"><B>Use</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/base/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-tree.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-tree.html
deleted file mode 100644
index 043419a1..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-tree.html
+++ /dev/null
@@ -1,156 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-org.herac.tuxguitar.io.abc Class Hierarchy
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="org.herac.tuxguitar.io.abc Class Hierarchy";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/base/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For Package org.herac.tuxguitar.io.abc
-</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="../../../../../overview-tree.html">All Packages</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.Object<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCExportSettingsDialog</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCImportSettingsDialog</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCInputStream</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCOutputStream</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSettings</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSongExporter</B></A> (implements org.herac.tuxguitar.io.base.TGLocalFileExporter)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSongImporter</B></A> (implements org.herac.tuxguitar.io.base.TGLocalFileImporter)
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGPluginAdapter (implements org.herac.tuxguitar.gui.system.plugins.TGPlugin)
-<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGExporterPlugin<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginExporter</B></A></UL>
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGImporterPlugin<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginImporter</B></A></UL>
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGPluginList<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="../../../../../org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginList</B></A></UL>
-</UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../../../org/herac/tuxguitar/io/abc/base/package-tree.html"><B>NEXT</B></A></FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-use.html b/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-use.html
deleted file mode 100644
index 6cb96610..00000000
--- a/TuxGuitar-abc/doc/org/herac/tuxguitar/io/abc/package-use.html
+++ /dev/null
@@ -1,162 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:31 GMT+01:00 2011 -->
-<TITLE>
-Uses of Package org.herac.tuxguitar.io.abc
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../../stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Uses of Package org.herac.tuxguitar.io.abc";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-<B>Uses of Package<br>org.herac.tuxguitar.io.abc</B></H2>
-</CENTER>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Packages that use <A HREF="../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><A HREF="#org.herac.tuxguitar.io.abc"><B>org.herac.tuxguitar.io.abc</B></A></TD>
-<TD>&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<A NAME="org.herac.tuxguitar.io.abc"><!-- --></A>
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-Classes in <A HREF="../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A> used by <A HREF="../../../../../org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD><B><A HREF="../../../../../org/herac/tuxguitar/io/abc/class-use/ABCSettings.html#org.herac.tuxguitar.io.abc"><B>ABCSettings</B></A></B>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-</TABLE>
-&nbsp;
-<P>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-summary.html"><FONT CLASS="NavBarFont1"><B>Package</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Use</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="package-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="../../../../../help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="../../../../../index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="package-use.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="../../../../../allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/overview-frame.html b/TuxGuitar-abc/doc/overview-frame.html
deleted file mode 100644
index 79ceae11..00000000
--- a/TuxGuitar-abc/doc/overview-frame.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-Overview
-</TITLE>
-
-<META NAME="keywords" CONTENT="Overview">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT size="+1" CLASS="FrameTitleFont">
-<B></B></FONT></TD>
-</TR>
-</TABLE>
-
-<TABLE BORDER="0" WIDTH="100%" SUMMARY="">
-<TR>
-<TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="allclasses-frame.html" target="packageFrame">All Classes</A></FONT>
-<P>
-<FONT size="+1" CLASS="FrameHeadingFont">
-Packages</FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/herac/tuxguitar/io/abc/package-frame.html" target="packageFrame">org.herac.tuxguitar.io.abc</A></FONT>
-<BR>
-<FONT CLASS="FrameItemFont"><A HREF="org/herac/tuxguitar/io/abc/base/package-frame.html" target="packageFrame">org.herac.tuxguitar.io.abc.base</A></FONT>
-<BR>
-</TD>
-</TR>
-</TABLE>
-
-<P>
-&nbsp;
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/overview-summary.html b/TuxGuitar-abc/doc/overview-summary.html
deleted file mode 100644
index b60eced0..00000000
--- a/TuxGuitar-abc/doc/overview-summary.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-Overview
-</TITLE>
-
-<META NAME="keywords" CONTENT="Overview">
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Overview";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-
-<TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
-<TR BGCOLOR="#CCCCFF" CLASS="TableHeadingColor">
-<TD COLSPAN=2><FONT SIZE="+2">
-<B>Packages</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/herac/tuxguitar/io/abc/package-summary.html">org.herac.tuxguitar.io.abc</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="20%"><B><A HREF="org/herac/tuxguitar/io/abc/base/package-summary.html">org.herac.tuxguitar.io.abc.base</A></B></TD>
-<TD>&nbsp;</TD>
-</TR>
-</TABLE>
-
-<P>
-&nbsp;<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Overview</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-tree.html"><FONT CLASS="NavBarFont1"><B>Tree</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/overview-tree.html b/TuxGuitar-abc/doc/overview-tree.html
deleted file mode 100644
index 70659e7b..00000000
--- a/TuxGuitar-abc/doc/overview-tree.html
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-Class Hierarchy
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-<SCRIPT type="text/javascript">
-function windowTitle()
-{
-    parent.document.title="Class Hierarchy";
-}
-</SCRIPT>
-
-</HEAD>
-
-<BODY BGCOLOR="white" onload="windowTitle();">
-
-
-<!-- ========= START OF TOP NAVBAR ======= -->
-<A NAME="navbar_top"><!-- --></A>
-<A HREF="#skip-navbar_top" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_top_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_top"></A>
-<!-- ========= END OF TOP NAVBAR ========= -->
-
-<HR>
-<CENTER>
-<H2>
-Hierarchy For All Packages</H2>
-</CENTER>
-<DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="org/herac/tuxguitar/io/abc/package-tree.html">org.herac.tuxguitar.io.abc</A>, <A HREF="org/herac/tuxguitar/io/abc/base/package-tree.html">org.herac.tuxguitar.io.abc.base</A></DL>
-<HR>
-<H2>
-Class Hierarchy
-</H2>
-<UL>
-<LI TYPE="circle">class java.lang.Object<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCChord</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponent</B></A><UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponentChord.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponentChord</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCComponentNote.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCComponentNote</B></A></UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCEvent.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCEvent</B></A> (implements java.lang.Comparable)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCExportSettingsDialog</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCImportSettingsDialog</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCInfo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCInfo</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCInputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCInputStream</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCLocation.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCLocation</B></A> (implements java.lang.Comparable)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCMacro.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCMacro</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCOctaveDatabase</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCOutputStream.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCOutputStream</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCRepeat.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCRepeat</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCSettings.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSettings</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCSong.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCSong</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCSongExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSongExporter</B></A> (implements org.herac.tuxguitar.io.base.TGLocalFileExporter)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCSongImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCSongImporter</B></A> (implements org.herac.tuxguitar.io.base.TGLocalFileImporter)
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCSymbol.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCSymbol</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCTempo.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTempo</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCTempoChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTempoChange</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCText.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCText</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCTimeSignature.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignature</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTimeSignatureChange</B></A><LI TYPE="circle">class org.herac.tuxguitar.io.abc.base.<A HREF="org/herac/tuxguitar/io/abc/base/ABCTrack.html" title="class in org.herac.tuxguitar.io.abc.base"><B>ABCTrack</B></A><LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGPluginAdapter (implements org.herac.tuxguitar.gui.system.plugins.TGPlugin)
-<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGExporterPlugin<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCPluginExporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginExporter</B></A></UL>
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGImporterPlugin<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCPluginImporter.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginImporter</B></A></UL>
-<LI TYPE="circle">class org.herac.tuxguitar.gui.system.plugins.base.TGPluginList<UL>
-<LI TYPE="circle">class org.herac.tuxguitar.io.abc.<A HREF="org/herac/tuxguitar/io/abc/ABCPluginList.html" title="class in org.herac.tuxguitar.io.abc"><B>ABCPluginList</B></A></UL>
-</UL>
-</UL>
-</UL>
-<HR>
-
-
-<!-- ======= START OF BOTTOM NAVBAR ====== -->
-<A NAME="navbar_bottom"><!-- --></A>
-<A HREF="#skip-navbar_bottom" title="Skip navigation links"></A>
-<TABLE BORDER="0" WIDTH="100%" CELLPADDING="1" CELLSPACING="0" SUMMARY="">
-<TR>
-<TD COLSPAN=3 BGCOLOR="#EEEEFF" CLASS="NavBarCell1">
-<A NAME="navbar_bottom_firstrow"><!-- --></A>
-<TABLE BORDER="0" CELLPADDING="0" CELLSPACING="3" SUMMARY="">
-  <TR ALIGN="center" VALIGN="top">
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="overview-summary.html"><FONT CLASS="NavBarFont1"><B>Overview</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Package</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Class</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <FONT CLASS="NavBarFont1">Use</FONT>&nbsp;</TD>
-  <TD BGCOLOR="#FFFFFF" CLASS="NavBarCell1Rev"> &nbsp;<FONT CLASS="NavBarFont1Rev"><B>Tree</B></FONT>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="deprecated-list.html"><FONT CLASS="NavBarFont1"><B>Deprecated</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="index-files/index-1.html"><FONT CLASS="NavBarFont1"><B>Index</B></FONT></A>&nbsp;</TD>
-  <TD BGCOLOR="#EEEEFF" CLASS="NavBarCell1">    <A HREF="help-doc.html"><FONT CLASS="NavBarFont1"><B>Help</B></FONT></A>&nbsp;</TD>
-  </TR>
-</TABLE>
-</TD>
-<TD ALIGN="right" VALIGN="top" ROWSPAN=3><EM>
-</EM>
-</TD>
-</TR>
-
-<TR>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;PREV&nbsp;
-&nbsp;NEXT</FONT></TD>
-<TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-  <A HREF="index.html" target="_top"><B>FRAMES</B></A>  &nbsp;
-&nbsp;<A HREF="overview-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
-&nbsp;<SCRIPT type="text/javascript">
-  <!--
-  if(window==top) {
-    document.writeln('<A HREF="allclasses-noframe.html"><B>All Classes</B></A>');
-  }
-  //-->
-</SCRIPT>
-<NOSCRIPT>
-  <A HREF="allclasses-noframe.html"><B>All Classes</B></A>
-</NOSCRIPT>
-
-</FONT></TD>
-</TR>
-</TABLE>
-<A NAME="skip-navbar_bottom"></A>
-<!-- ======== END OF BOTTOM NAVBAR ======= -->
-
-<HR>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/package-list b/TuxGuitar-abc/doc/package-list
deleted file mode 100644
index 2706e808..00000000
--- a/TuxGuitar-abc/doc/package-list
+++ /dev/null
@@ -1,2 +0,0 @@
-org.herac.tuxguitar.io.abc
-org.herac.tuxguitar.io.abc.base
diff --git a/TuxGuitar-abc/doc/packages.html b/TuxGuitar-abc/doc/packages.html
deleted file mode 100644
index 8715df81..00000000
--- a/TuxGuitar-abc/doc/packages.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<!--NewPage-->
-<HTML>
-<HEAD>
-<!-- Generated by javadoc (build 1.4.2_13) on Fri Jul 15 19:51:32 GMT+01:00 2011 -->
-<TITLE>
-
-</TITLE>
-
-
-<LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
-
-
-</HEAD>
-
-<BODY BGCOLOR="white">
-
-<BR>
-
-<BR>
-
-<BR>
-<CENTER>
-The front page has been relocated.Please see:
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="index.html">Frame version</A>
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<A HREF="overview-summary.html">Non-frame version.</A></CENTER>
-
-</BODY>
-</HTML>
diff --git a/TuxGuitar-abc/doc/resources/inherit.gif b/TuxGuitar-abc/doc/resources/inherit.gif
deleted file mode 100644
index c814867a..00000000
Binary files a/TuxGuitar-abc/doc/resources/inherit.gif and /dev/null differ
diff --git a/TuxGuitar-abc/doc/stylesheet.css b/TuxGuitar-abc/doc/stylesheet.css
deleted file mode 100644
index 6d31fdbc..00000000
--- a/TuxGuitar-abc/doc/stylesheet.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Javadoc style sheet */
-
-/* Define colors, fonts and other style attributes here to override the defaults */
-
-/* Page background color */
-body { background-color: #FFFFFF }
-
-/* Headings */
-h1 { font-size: 145% }
-
-/* Table colors */
-.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
-
-/* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-
-/* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
-
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-
diff --git a/TuxGuitar-abc/javadoc.xml b/TuxGuitar-abc/javadoc.xml
deleted file mode 100644
index 057c2d8d..00000000
--- a/TuxGuitar-abc/javadoc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="javadoc">
-    <target name="javadoc">
-        <javadoc access="public" author="true" classpath="../TuxGuitar/bin:/home/peter/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_3.2.0.v3232m.jar" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="org.herac.tuxguitar.io.abc,org.herac.tuxguitar.io.abc.base" source="1.4" sourcepath="src" splitindex="true" use="true" version="true"/>
-    </target>
-</project>
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginList.java b/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginList.java
deleted file mode 100644
index 063a586d..00000000
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginList.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.herac.tuxguitar.io.abc;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
-
-public class ABCPluginList extends TGPluginList{
-	
-	protected List getPlugins() {
-		List plugins = new ArrayList();
-		plugins.add(new ABCPluginImporter());
-		plugins.add(new ABCPluginExporter());
-		return plugins;
-	}
-	
-	public String getAuthor() {
-		return "Peter Grootswagers <pgrootswagers@planet.nl>";
-	}
-	
-	public String getDescription() {
-		return "ABC file format import-export plugin";
-	}
-	
-	public String getName() {
-		return "ABC file format import-export plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-}
diff --git a/TuxGuitar-alsa/GNUmakefile b/TuxGuitar-alsa/GNUmakefile
deleted file mode 100644
index 824bfd26..00000000
--- a/TuxGuitar-alsa/GNUmakefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.10 2008/04/17 20:06:34 rzr Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: rzr $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-alsa
-LIBRARY?=lib$(PACKAGE).so
-LIBRARY_JNI?=lib$(PACKAGE)-jni.so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_LIBRARY_PATH_JNI?=$(TG_PREFIX)/lib/jni
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_JNI_DIR?=$(TG_LIBRARY_PATH_JNI)
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-JAVA_SOURCE_PATH?=./src/
-JAVA_SOURCES?=$(shell find $(JAVA_SOURCE_PATH) -name "*.java")
-JAVA_OBJECTS?=$(PACKAGE).o
-JNI_SOURCE_PATH?=./jni/
-JNI_SOURCES?=$(shell find $(JNI_SOURCE_PATH) -name "*.c")
-JNI_OBJECTS?=$(JNI_SOURCES:%.c=%.o)
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(JAVA_SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH) 
-
-CC=gcc
-CFLAGS=-fPIC -I $(shell $(GCJ) -print-file-name=include/)
-
-default: all
-
-all: objects library library_jni
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(JAVA_OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-library_jni: $(LIBRARY_JNI)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-install $(LIBRARY_JNI) $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $(@F) $<
-
-$(PACKAGE).o: $(JAVA_SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(JAVA_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) -ltuxguitar -L$(TG_LIBRARY_PATH)
-
-$(LIBRARY_JNI): $(JNI_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) -lasound -lpthread
-
-#eof "$Id: GNUmakefile,v 1.10 2008/04/17 20:06:34 rzr Exp $"
diff --git a/TuxGuitar-alsa/build.properties b/TuxGuitar-alsa/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-alsa/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-alsa/build.xml b/TuxGuitar-alsa/build.xml
deleted file mode 100644
index 8fa49e86..00000000
--- a/TuxGuitar-alsa/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-alsa" basedir="." default="all">
-	<description>
-		TuxGuitar Alsa
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-alsa.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   T U X G U I T A R  -  A L S A           |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   T U X G U I T A R  -  A L S A           |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-alsa/jni/GNUmakefile b/TuxGuitar-alsa/jni/GNUmakefile
deleted file mode 100644
index 695cb650..00000000
--- a/TuxGuitar-alsa/jni/GNUmakefile
+++ /dev/null
@@ -1,24 +0,0 @@
-CFLAGS?=-I$(shell gcj -print-file-name=include/)
-CFLAGS+=-fPIC
-LDFLAGS?=
-LDLIBS?=-lasound
-LDPATH?=-L/usr/lib
-LIBRARY_PREFIX?=lib
-LIBRARY_NAME?=tuxguitar-alsa-jni
-LIBRARY_EXTENSION?=.so
-
-LIBRARY=$(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
-OBJECTS=org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all:    $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(CC) $(LDFLAGS) -shared -o $(LIBRARY) $(OBJECTS) $(LDPATH) $(LDLIBS)
-
-clean: 
-	rm -f $(OBJECTS) $(LIBRARY)
-
-#eof "$Id: GNUmakefile,v 1.10 2008/04/17 20:06:34 rzr Exp $"
diff --git a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java b/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java
deleted file mode 100644
index 9e6f5663..00000000
--- a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.alsa;
-
-import org.herac.tuxguitar.player.base.MidiOutputPort;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiOutputPortImpl implements MidiOutputPort{
-	
-	private int port;
-	private int client;
-	private String clientName;
-	private MidiReceiverImpl receiver;
-	
-	public MidiOutputPortImpl(MidiSystem midiSystem,String clientName,int client,int port){
-		this.port = port;
-		this.client = client;
-		this.clientName = clientName;
-		this.receiver = new MidiReceiverImpl(this,midiSystem);
-	}
-	
-	public void open(){
-		if(!this.receiver.isConnected()){
-			this.receiver.connect();
-		}
-	}
-	
-	public void close(){
-		this.receiver.disconnect();
-	}
-	
-	public MidiReceiver getReceiver(){
-		this.open();
-		return this.receiver;
-	}
-	
-	public void check(){
-		// Not implemented
-	}
-	
-	public int getPort() {
-		return this.port;
-	}
-	
-	public int getClient() {
-		return this.client;
-	}
-	
-	public String getKey(){
-		return ("tuxguitar-alsa_" + this.client + "-" + this.port);
-	}
-	
-	public String getName(){
-		return (this.clientName +" [" + this.client + ":" + this.port + "]");
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderImpl.java b/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderImpl.java
deleted file mode 100644
index 5cfd1381..00000000
--- a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderImpl.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.alsa;
-
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
-	
-	private MidiSystem midiSystem;
-	
-	public MidiOutputPortProviderImpl(){
-		super();
-	}
-	
-	public List listPorts() {
-		if(this.midiSystem == null){
-			this.midiSystem = new MidiSystem();
-		}
-		if(!this.midiSystem.isOpen()){
-			this.midiSystem.open();
-		}
-		return this.midiSystem.findPorts();
-	}
-	
-	public void closeAll(){
-		if(this.midiSystem != null){
-			this.midiSystem.close();
-			this.midiSystem.finalize();
-			this.midiSystem = null;
-		}
-	}
-}
diff --git a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderPlugin.java b/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderPlugin.java
deleted file mode 100644
index f1b52fa3..00000000
--- a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderPlugin.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.alsa;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin{
-	
-	protected MidiOutputPortProvider getProvider() {
-		return new MidiOutputPortProviderImpl();
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "ALSA output plugin";
-	}
-	
-	public String getName() {
-		return "ALSA output plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-	
-}
diff --git a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiReceiverImpl.java b/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiReceiverImpl.java
deleted file mode 100644
index 7ea520b2..00000000
--- a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiReceiverImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.alsa;
-
-import org.herac.tuxguitar.player.base.MidiControllers;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiReceiverImpl implements MidiReceiver{
-	
-	private boolean connected;
-	private MidiOutputPortImpl midiPort;
-	private MidiSystem midiSystem;
-	
-	public MidiReceiverImpl(MidiOutputPortImpl midiPort, MidiSystem midiSystem){
-		this.midiPort = midiPort;
-		this.midiSystem = midiSystem;
-		this.connected = false;
-	}
-	
-	public boolean isConnected(){
-		return this.connected;
-	}
-	
-	public void connect(){
-		if(!isConnected()){
-			this.midiSystem.openPort(this.midiPort.getClient(),this.midiPort.getPort());
-			this.connected = true;
-		}
-	}
-	
-	public void disconnect() {
-		if(isConnected()){
-			this.midiSystem.closePort();
-			this.connected = false;
-		}
-	}
-	
-	public void sendAllNotesOff() {
-		for(int i = 0; i < 16; i ++){
-			this.sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
-		}
-	}
-	
-	public void sendControlChange(int channel, int controller, int value) {
-		if(isConnected()){
-			this.midiSystem.controlChange(channel, controller, value);
-		}
-	}
-	
-	public void sendNoteOff(int channel, int key, int velocity) {
-		if(isConnected()){
-			this.midiSystem.noteOff(channel, key, velocity);
-		}
-	}
-	
-	public void sendNoteOn(int channel, int key, int velocity) {
-		if(isConnected()){
-			this.midiSystem.noteOn(channel, key, velocity);
-		}
-	}
-	
-	public void sendPitchBend(int channel, int value) {
-		if(isConnected()){
-			this.midiSystem.pitchBend(channel, value);
-		}
-	}
-	
-	public void sendProgramChange(int channel, int value) {
-		if(isConnected()){
-			this.midiSystem.programChange(channel, value);
-		}
-	}
-	
-	public void sendSystemReset() {
-		//not implemented
-	}
-}
diff --git a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiSystem.java b/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiSystem.java
deleted file mode 100644
index 4a55ba71..00000000
--- a/TuxGuitar-alsa/src/org/herac/tuxguitar/player/impl/midiport/alsa/MidiSystem.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.alsa;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MidiSystem{
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-alsa-jni");
-	
-	static{
-		System.loadLibrary(JNI_LIBRARY_NAME);
-	}
-	
-	private long instance;
-	private boolean open;
-	private List ports;
-	
-	public MidiSystem() {
-		this.instance = malloc();
-		this.open = false;
-		this.ports = new ArrayList();
-	}
-	
-	public boolean isOpen(){
-		return (this.instance != 0 && this.open);
-	}
-	
-	public void finalize(){
-		if(this.instance != 0){
-			this.free(this.instance);
-			this.instance = 0;
-		}
-	}
-	
-	public void open(){
-		if(this.instance != 0 && !this.open){
-			this.open(this.instance);
-			this.open = true;
-		}
-	}
-	
-	public void close(){
-		if(this.instance != 0 && this.open){
-			this.close(this.instance);
-			this.open = false;
-		}
-	}
-	
-	public List findPorts(){
-		this.ports.clear();
-		if(this.instance != 0 && this.open){
-			this.findPorts(this.instance);
-		}
-		return this.ports;
-	}
-	
-	public void openPort(int client,int port){
-		if(this.instance != 0 && this.open){
-			this.openPort(this.instance, client, port);
-		}
-	}
-	
-	public void closePort(){
-		if(this.instance != 0 && this.open){
-			this.closePort(this.instance);
-		}
-	}
-	
-	public void noteOn(int channel,int note,int velocity){
-		if(this.instance != 0 && this.open){
-			this.noteOn(this.instance, channel, note, velocity);
-		}
-	}
-	
-	public void noteOff(int channel,int note,int velocity){
-		if(this.instance != 0 && this.open){
-			this.noteOff(this.instance, channel, note, velocity);
-		}
-	}
-	
-	public void controlChange(int channel,int control,int value){
-		if(this.instance != 0 && this.open){
-			this.controlChange(this.instance, channel, control, value);
-		}
-	}
-	
-	public void programChange(int channel,int program){
-		if(this.instance != 0 && this.open){
-			this.programChange(this.instance, channel, program);
-		}
-	}
-	
-	public void pitchBend(int channel,int value){
-		if(this.instance != 0 && this.open){
-			this.pitchBend(this.instance, channel, value);
-		}
-	}
-	
-	protected void addPort(String name,int client,int port){
-		this.ports.add(new MidiOutputPortImpl(this,name,client,port));
-	}
-	
-	private native long malloc();
-	
-	private native void free(long instance);
-	
-	private native void open(long instance);
-	
-	private native void close(long instance);
-	
-	private native void findPorts(long instance);
-	
-	private native void openPort(long instance,int client,int port);
-	
-	private native void closePort(long instance);
-	
-	private native void noteOn(long instance,int channel,int note,int velocity);
-	
-	private native void noteOff(long instance,int channel,int note,int velocity);
-	
-	private native void controlChange(long instance,int channel,int control,int value);
-	
-	private native void programChange(long instance,int channel,int program);
-	
-	private native void pitchBend(long instance,int channel,int value);
-	
-}
diff --git a/TuxGuitar-ascii/GNUmakefile b/TuxGuitar-ascii/GNUmakefile
deleted file mode 100644
index 26e08833..00000000
--- a/TuxGuitar-ascii/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:31 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-ascii
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:31 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-ascii/build.properties b/TuxGuitar-ascii/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-ascii/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-ascii/build.xml b/TuxGuitar-ascii/build.xml
deleted file mode 100644
index 2bbf51a7..00000000
--- a/TuxGuitar-ascii/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-ascii" basedir="." default="all">
-	<description>
-		TuxGuitar ASCII Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-ascii.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-browser-ftp/GNUmakefile b/TuxGuitar-browser-ftp/GNUmakefile
deleted file mode 100644
index 37f62461..00000000
--- a/TuxGuitar-browser-ftp/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:31 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-browser-ftp
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:31 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-browser-ftp/build.properties b/TuxGuitar-browser-ftp/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-browser-ftp/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-browser-ftp/build.xml b/TuxGuitar-browser-ftp/build.xml
deleted file mode 100644
index 05e70c4b..00000000
--- a/TuxGuitar-browser-ftp/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-browser-ftp" basedir="." default="all">
-	<description>
-		TGBrowser FTP Plugin
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-browser-ftp.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   L I B R A R Y        |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   L I B R A R Y      |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.6 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserDataImpl.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserDataImpl.java
deleted file mode 100644
index 9b5ba68e..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserDataImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
-import org.herac.tuxguitar.app.tools.browser.ftp.utils.Base64Decoder;
-import org.herac.tuxguitar.app.tools.browser.ftp.utils.Base64Encoder;
-
-public class TGBrowserDataImpl implements TGBrowserData{
-	
-	private static final String STRING_SEPARATOR = ";";
-	
-	private String name;
-	private String host;
-	private String path;
-	private String username;
-	private String password;
-	private String proxyUser;
-	private String proxyPwd;
-	private String proxyHost;
-	private int proxyPort;
-	
-	public TGBrowserDataImpl(String name, String host, String path, String username, String password, String proxyUser, String proxyPwd, String proxyHost, int proxyPort) {
-		this.name = name;
-		this.host = host;
-		this.path = path;
-		this.username = username;
-		this.password = password;
-		this.proxyUser = proxyUser;
-		this.proxyPwd = proxyPwd;
-		this.proxyHost = proxyHost;
-		this.proxyPort = proxyPort;
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-	
-	public String getHost() {
-		return this.host;
-	}
-	
-	public String getPath() {
-		return this.path;
-	}
-	
-	public String getPassword() {
-		return ((this.username != null && this.username.length() > 0)?this.password:TGBrowserFTPClient.DEFAULT_USER_PASSWORD);
-	}
-	
-	public String getUsername() {
-		return ((this.username != null && this.username.length() > 0)?this.username:TGBrowserFTPClient.DEFAULT_USER_NAME);
-	}
-	
-	public String getTitle(){
-		return getName();
-	}
-	
-	public String getProxyHost() {
-		return this.proxyHost;
-	}
-
-	public int getProxyPort() {
-		return this.proxyPort;
-	}
-
-	public String getProxyUser() {
-		return this.proxyUser;
-	}
-
-	public String getProxyPwd() {
-		return this.proxyPwd;
-	}
-
-	public String toString(){
-		String username = new String( Base64Encoder.encode( getUsername().getBytes() ) );
-		String password = new String( Base64Encoder.encode( getPassword().getBytes() ) );
-		String	proxyUser = new String( Base64Encoder.encode( getProxyUser().getBytes() ));
-		String	proxyPwd = new String( Base64Encoder.encode( getProxyPwd().getBytes() ));
-		
-		return getName() + STRING_SEPARATOR + getHost() + STRING_SEPARATOR
-				+ getPath() + STRING_SEPARATOR + username + STRING_SEPARATOR
-				+ password + STRING_SEPARATOR + proxyUser + STRING_SEPARATOR
-				+ proxyPwd + STRING_SEPARATOR + getProxyHost()
-				+ STRING_SEPARATOR + getProxyPort();
-	}
-	
-	public static TGBrowserData fromString(String string) {
-		String[] data = string.split(STRING_SEPARATOR);
-		if(data.length == 9){
-			String username = new String( Base64Decoder.decode( data[3].getBytes() ) );
-			String password = new String( Base64Decoder.decode( data[4].getBytes() ) );
-			String proxyUser = new String( Base64Decoder.decode( data[5].getBytes() ));
-			String proxyPwd = new String( Base64Decoder.decode( data[6].getBytes() ) );
-			return new TGBrowserDataImpl(data[0], data[1], data[2], username, password,  proxyUser, proxyPwd, data[7], Integer.parseInt(data[8]));
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementComparator.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementComparator.java
deleted file mode 100644
index 5536dee3..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementComparator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp;
-
-import java.util.Comparator;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserElementComparator implements Comparator {
-	
-	private static final int RESULT_LESS = -1;
-	
-	private static final int RESULT_EQUAL = 0;
-	
-	private static final int RESULT_GREATER = 1;
-	
-	private static final int DIRECTION = 1;
-	
-	private static final int DIRECTION_FOLDER = 1;
-	
-	public int compare(Object o1, Object o2) {
-		if(o1 instanceof TGBrowserElement && o2 instanceof TGBrowserElement){
-			TGBrowserElement element1 = (TGBrowserElement)o1;
-			TGBrowserElement element2 = (TGBrowserElement)o2;
-			
-			if(element1.isFolder() && !element2.isFolder()){
-				return (DIRECTION_FOLDER * RESULT_LESS);
-			}
-			if(element2.isFolder() && !element1.isFolder()){
-				return (DIRECTION_FOLDER * RESULT_GREATER);
-			}
-			
-			return (DIRECTION * (element1.getName().compareTo(element2.getName())));
-		}
-		return RESULT_EQUAL;
-	}
-	
-}
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementImpl.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementImpl.java
deleted file mode 100644
index 85b3d8a0..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp;
-
-import java.io.InputStream;
-
-import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserElementImpl extends TGBrowserElement{
-	
-	private TGBrowserImpl browser;
-	private String path;
-	private String info;
-	
-	public TGBrowserElementImpl(TGBrowserImpl browser,String name,String info,String path) {
-		super(name);
-		this.browser = browser;
-		this.info = info;
-		this.path = path;
-	}
-	
-	public boolean isFolder(){
-		return (this.info != null && this.info.length() > 0 && this.info.charAt(0) == 'd');
-	}
-	
-	public boolean isSymLink() {
-		return (this.info != null && this.info.length() > 0 && this.info.charAt(0) == 'l');
-	}
-	
-	public InputStream getInputStream()throws TGBrowserException {
-		return this.browser.getInputStream(this.path,this);
-	}
-	
-}
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFactoryImpl.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFactoryImpl.java
deleted file mode 100644
index 37fb5af7..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFactoryImpl.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.tools.browser.TGBrowserCollection;
-import org.herac.tuxguitar.app.tools.browser.TGBrowserManager;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
-import org.herac.tuxguitar.app.util.DialogUtils;
-import org.herac.tuxguitar.app.util.MessageDialog;
-
-public class TGBrowserFactoryImpl implements TGBrowserFactory{
-	
-	public TGBrowserFactoryImpl() {
-		super();
-	}
-	
-	public String getType(){
-		return "ftp";
-	}
-	
-	public String getName(){
-		return "FTP";
-	}
-	
-	public TGBrowser newTGBrowser(TGBrowserData data) {
-		if(data instanceof TGBrowserDataImpl){
-			return new TGBrowserImpl((TGBrowserDataImpl)data);
-		}
-		return null;
-	}
-	
-	public TGBrowserData parseData(String string) {
-		return TGBrowserDataImpl.fromString(string);
-	}
-	
-	public TGBrowserData dataDialog(Shell parent) {
-		return new TGBrowserDataDialog().show(parent);
-	}
-	
-}
-class TGBrowserDataDialog{
-	
-	protected TGBrowserDataImpl data;
-	
-	public TGBrowserDataImpl show(final Shell parent){
-		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
-		dialog.setLayout(new GridLayout());
-		dialog.setText(TuxGuitar.getProperty("FTP Location"));
-		
-		//-------------LIBRARY DATA-----------------------------------------------
-		Composite composite = new Composite(dialog, SWT.NONE);
-		composite.setLayout(new GridLayout(2,false));
-		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
-		GridData textData = new GridData(SWT.FILL,SWT.FILL,true,true);
-		textData.minimumWidth = 300;
-		
-		//name
-		Label nameLabel = new Label(composite, SWT.NULL);
-		nameLabel.setText(TuxGuitar.getProperty("Name"));
-		final Text nameText = new Text(composite,SWT.BORDER);
-		nameText.setLayoutData(textData);
-		
-		
-		//host
-		Label hostLabel = new Label(composite, SWT.NULL);
-		hostLabel.setText(TuxGuitar.getProperty("Host"));
-		final Text hostText = new Text(composite,SWT.BORDER);
-		hostText.setLayoutData(textData);
-		
-		//path
-		Label pathLabel = new Label(composite, SWT.NULL);
-		pathLabel.setText(TuxGuitar.getProperty("Path"));
-		final Text pathText = new Text(composite,SWT.BORDER);
-		pathText.setLayoutData(textData);
-		
-		//user
-		Label userLabel = new Label(composite, SWT.NULL);
-		userLabel.setText(TuxGuitar.getProperty("Login name"));
-		final Text userText = new Text(composite,SWT.BORDER);
-		userText.setLayoutData(textData);
-		
-		//password
-		Label passwordLabel = new Label(composite, SWT.NULL);
-		passwordLabel.setText(TuxGuitar.getProperty("Password"));
-		final Text passwordText = new Text(composite,SWT.BORDER | SWT.PASSWORD);
-		passwordText.setLayoutData(textData);
-		
-		// Proxy
-		final Button hasProxy = new Button(composite,SWT.CHECK);
-		hasProxy.setText("Connect via Proxy Server");
-		Label dummyLabel = new Label(composite, SWT.NULL);
-		dummyLabel.setLayoutData(textData);
-		
-		//proxy host
-		final Label proxyHostLabel = new Label(composite, SWT.NULL);
-		proxyHostLabel.setText(TuxGuitar.getProperty("Proxy Server Host"));
-		final Text proxyHostText = new Text(composite,SWT.BORDER);
-		proxyHostText.setLayoutData(textData);
-		
-		//proxy port
-		final Label proxyPortLabel = new Label(composite, SWT.NULL); 
-		proxyPortLabel.setText(TuxGuitar.getProperty("Proxy Server Port"));
-		final Text proxyPortText = new Text(composite,SWT.BORDER);
-		proxyPortText.setText("1080");
-		proxyPortText.setLayoutData(textData);
-		
-		//proxy user
-		final Label proxyUserLabel = new Label(composite, SWT.NULL);
-		proxyUserLabel.setText(TuxGuitar.getProperty("Proxy Server User"));
-		final Text proxyUserText = new Text(composite,SWT.BORDER);
-		proxyUserText.setLayoutData(textData);
-		
-		//proxy password
-		final Label proxyPwdLabel = new Label(composite, SWT.NULL);
-		proxyPwdLabel.setText(TuxGuitar.getProperty("Proxy Server Password"));
-		final Text proxyPwdText = new Text(composite,SWT.BORDER | SWT.PASSWORD);
-		proxyPwdText.setLayoutData(textData);
-		
-		proxyHostText.setEnabled(false);
-		proxyPortText.setEnabled(false);
-		proxyUserText.setEnabled(false);
-		proxyPwdText.setEnabled(false);
-		
-		hasProxy.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-				proxyHostText.setEnabled(hasProxy.getSelection());
-				proxyPortText.setEnabled(hasProxy.getSelection());
-				proxyUserText.setEnabled(hasProxy.getSelection());
-				proxyPwdText.setEnabled(hasProxy.getSelection());
-			}
-		});
-	
-		
-		//------------------BUTTONS--------------------------
-		Composite buttons = new Composite(dialog, SWT.NONE);
-		buttons.setLayout(new GridLayout(2,false));
-		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
-		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
-		data.minimumWidth = 80;
-		data.minimumHeight = 25;
-		
-		final Button buttonOk = new Button(buttons, SWT.PUSH);
-		buttonOk.setText(TuxGuitar.getProperty("ok"));
-		buttonOk.setLayoutData(data);
-		buttonOk.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				String name = nameText.getText();
-				String host = hostText.getText();
-				String path = pathText.getText();
-				String user = userText.getText();
-				String password = passwordText.getText();
-				String proxyHost = proxyHostText.getText();
-				String proxyPortStr = proxyPortText.getText();
-				String proxyUser = proxyUserText.getText();
-				String proxyPwd = proxyPwdText.getText();
-				
-				List errors = validate(name, host, proxyHost, proxyPortStr, hasProxy.getSelection());
-				if( !errors.isEmpty() ){
-					StringWriter buffer = new StringWriter();
-					PrintWriter writer = new PrintWriter( buffer );
-					Iterator it = errors.iterator();
-					while( it.hasNext() ){
-						writer.println( "*" + (String)it.next() );
-					}
-					MessageDialog.errorMessage(parent, buffer.getBuffer().toString() );
-				}else{
-					int proxyPort = Integer.parseInt( proxyPortStr );
-					TGBrowserDataDialog.this.data = new TGBrowserDataImpl(name, host, path, user, password, proxyUser, proxyPwd, proxyHost, proxyPort);
-				
-					dialog.dispose();
-				}
-			}
-		});
-		
-		Button buttonCancel = new Button(buttons, SWT.PUSH);
-		buttonCancel.setLayoutData(data);
-		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
-		buttonCancel.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				dialog.dispose();
-			}
-		});
-		
-		dialog.setDefaultButton( buttonOk );
-		
-		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
-		return this.data;
-	}
-	
-	protected List validate(String name, String host, String pHost, String pPort, boolean pEnabled){
-		List errors = new ArrayList();
-		// Check the Name
-		if (name == null || name.trim().length() == 0) {
-			errors.add("Please enter the Name");
-		}else{
-			Iterator it = TGBrowserManager.instance().getCollections();
-			while(it.hasNext()){
-				TGBrowserCollection collection = (TGBrowserCollection)it.next();
-				if(name.equals(collection.getData().getTitle())){
-					errors.add("A collection named \"" + name + "\" already exists");
-					break;
-				}
-			}
-		}
-		if (host == null || host.trim().length() == 0) {
-			errors.add("Please enter the Host");
-		}
-		if( pEnabled ){
-			if(pHost == null || pHost.trim().length() == 0){
-				errors.add("Please enter Proxy Host");
-			}
-			if(pPort == null || pPort.trim().length() == 0){
-				errors.add("Please enter Proxy Port");
-			}else if(!isNumber(pPort)){
-				errors.add("Proxy Port should be a valid number");
-			}
-		}
-		
-		return errors;
-	}
-	
-	private boolean isNumber( String s ){
-		try {
-			Integer.parseInt(s);
-		} catch (Throwable e) {
-			return false;
-		}
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserImpl.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserImpl.java
deleted file mode 100644
index 16892dae..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserImpl extends TGBrowser{
-	
-	private TGBrowserDataImpl data;
-	private String root; 
-	private String path; 
-	private TGBrowserFTPClient client;
-	
-	public TGBrowserImpl(TGBrowserDataImpl data){
-		this.data = data;
-	}
-	
-	private String getRoot(){
-		if(this.root == null){
-			this.root = "/";
-			if(this.data.getPath() != null && this.data.getPath().length() > 0){
-				this.root = this.data.getPath();
-				if(this.root.indexOf("/") != 0){
-					this.root = ("/" + this.root);
-				}
-			}
-		}
-		return this.root;
-	}
-	
-	public void open() throws TGBrowserException{
-		try {
-			checkForProxy();
-			this.client = new TGBrowserFTPClient();
-			this.client.open(this.data.getHost(), TGBrowserFTPClient.DEFAULT_PORT);
-			this.client.login(this.data.getUsername(),this.data.getPassword());
-			this.cdRoot();
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-	}
-
-	
-	public void close() throws TGBrowserException{
-		try {
-			closeProxy();
-			this.client.close();
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-	}
-	
-	public void cdElement(TGBrowserElement element) throws TGBrowserException {
-		try {
-			boolean isCDSuccess = this.client.cd(element.getName());
-			if(!isCDSuccess)
-				throw new TGBrowserException("could not cd to "+element.getName());
-			this.path = this.client.pwd();
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-	}
-	
-	public void cdRoot() throws TGBrowserException {
-		try {
-			this.client.cd(getRoot());
-			this.path = this.client.pwd();
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-	}
-	
-	public void cdUp() throws TGBrowserException {
-		try {
-			this.client.cdUp();
-			this.path = this.client.pwd();
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-	}
-	
-	public List listElements() throws TGBrowserException {
-		List elements = new ArrayList();
-		try {
-			this.client.binary();
-			String[] names = this.client.listNames();
-			String[] infos = this.client.listDetails();
-			
-			if(names.length > 0 && infos.length > 0){
-				for(int i = 0;i < names.length;i++){
-					String name = names[i].trim();
-					
-					if(name.indexOf(this.path) == 0 && name.length() > this.path.length()){
-						name = name.substring(this.path.length());
-					}
-					while(name.indexOf("/") == 0){
-						name = name.substring(1);
-					}
-					if( name.length() > 0 ){
-						for(int j = 0;j < infos.length;j++){
-							String info = infos[j].trim();
-							if(info.indexOf(name) > 0){
-								elements.add(new TGBrowserElementImpl(this,name,info,this.path));
-								break;
-							}
-						}
-					}
-				}
-			}
-			if( !elements.isEmpty() ){
-				Collections.sort(elements,new TGBrowserElementComparator());
-			}
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-		return elements;
-	}
-	
-	public InputStream getInputStream(String path,TGBrowserElement element)throws TGBrowserException {
-		try {
-			this.client.cd(path);
-			this.client.binary();
-			
-			byte[] bytes = this.client.get(element.getName());
-			
-			return new ByteArrayInputStream( bytes );
-		} catch (Throwable throwable) {
-			throw new TGBrowserException(throwable);
-		}
-	}
-	
-	private void checkForProxy() {
-		if (this.data.getProxyHost() != null && this.data.getProxyPort() > 0) {
-			System.setProperty("socksProxyHost", this.data.getProxyHost());
-			System.setProperty("socksProxyPort", String.valueOf(this.data.getProxyPort()));
-			if (this.data.getProxyUser() != null && this.data.getProxyUser().trim().length() > 0) {
-				System.setProperty("java.net.socks.username", this.data.getProxyUser());
-				System.setProperty("java.net.socks.password", this.data.getProxyPwd());
-				Authenticator.setDefault(new ProxyAuthenticator(this.data.getProxyUser(), this.data.getProxyPwd()));
-			}
-		} else {
-			closeProxy();
-		}
-	}
-
-	private void closeProxy() {
-		Properties sysProperties = System.getProperties();
-		sysProperties.remove("socksProxyHost");
-		sysProperties.remove("socksProxyPort");
-		sysProperties.remove("java.net.socks.username");
-		sysProperties.remove("java.net.socks.password");
-	}
-
-	private final class ProxyAuthenticator extends Authenticator {
-		private PasswordAuthentication auth;
-
-		protected ProxyAuthenticator(String user, String pass) {
-			this.auth = new PasswordAuthentication(user, pass.toCharArray());
-		}
-
-		protected PasswordAuthentication getPasswordAuthentication() {
-			return this.auth;
-		}
-	}
-}
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserPluginImpl.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserPluginImpl.java
deleted file mode 100644
index a5f41ae6..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserPluginImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGBrowserPlugin;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
-
-public class TGBrowserPluginImpl extends TGBrowserPlugin {
-	
-	protected TGBrowserFactory getFactory() {
-		return new TGBrowserFactoryImpl();
-	}
-	
-	public String getName() {
-		return "FTP Plugin for TGBrowser";
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "FTP Plugin for TGBrowser";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-}
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Decoder.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Decoder.java
deleted file mode 100644
index 7486c9a0..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Decoder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-public class Base64Decoder {
-	
-	private static final int BUFFER_SIZE = 1024;
-	
-	private static int get1(byte buf[], int off) {
-		return ((buf[off] & 0x3f) << 2) | ((buf[off + 1] & 0x30) >>> 4);
-	}
-	
-	private static int get2(byte buf[], int off) {
-		return ((buf[off + 1] & 0x0f) << 4) | ((buf[off + 2] & 0x3c) >>> 2);
-	}
-	
-	private static int get3(byte buf[], int off) {
-		return ((buf[off + 2] & 0x03) << 6) | (buf[off + 3] & 0x3f);
-	}
-	
-	private static int check(int ch) {
-		if ((ch >= 'A') && (ch <= 'Z')) {
-			return ch - 'A';
-		} else if ((ch >= 'a') && (ch <= 'z')) {
-			return ch - 'a' + 26;
-		} else if ((ch >= '0') && (ch <= '9')) {
-			return ch - '0' + 52;
-		} else {
-			switch (ch) {
-				case '=':
-					return 65;
-				case '+':
-					return 62;
-				case '/':
-					return 63;
-				default:
-					return -1;
-			}
-		}
-	}
-	
-	public static byte[] decode(byte[] bytes){
-		try{
-			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			
-			byte buffer[] = new byte[BUFFER_SIZE];
-			byte chunk[] = new byte[4];
-			int got = -1;
-			int ready = 0;
-			
-			fill: while ((got = in.read(buffer)) > 0) {
-				int skiped = 0;
-				
-				while (skiped < got) {
-					
-					while (ready < 4) {
-						if (skiped >= got){ 
-							continue fill;
-						}
-						int ch = check(buffer[skiped++]);
-						if (ch >= 0) {
-							chunk[ready++] = (byte) ch;
-						}
-					}
-					
-					if (chunk[2] == 65) {
-						out.write(get1(chunk, 0));
-						return out.toByteArray();
-					} 
-					else if (chunk[3] == 65) {
-						out.write(get1(chunk, 0));
-						out.write(get2(chunk, 0));
-						return out.toByteArray();
-					} 
-					else {
-						out.write(get1(chunk, 0));
-						out.write(get2(chunk, 0));
-						out.write(get3(chunk, 0));
-					}
-					ready = 0;
-				}
-			}
-			if (ready == 0){
-				out.flush();
-				return out.toByteArray();
-			}
-			
-		}catch(Throwable throwable){
-			throwable.printStackTrace();
-		}
-		
-		return bytes;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Encoder.java b/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Encoder.java
deleted file mode 100644
index f27cc664..00000000
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Encoder.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.ftp.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-public class Base64Encoder {
-	
-	private static final int BUFFER_SIZE = 1024;
-	
-	private static byte ENCODING[] = { 
-		(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H',
-		(byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
-		(byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X',
-		(byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f',
-		(byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n',
-		(byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', (byte) 'v',
-		(byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
-		(byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) '+', (byte) '/',
-		(byte) '='
-	};
-	
-	private static int get1(byte buf[], int off) {
-		return (buf[off] & 0xfc) >> 2;
-	}
-	
-	private static int get2(byte buf[], int off) {
-		return ((buf[off] & 0x3) << 4) | ((buf[off + 1] & 0xf0) >>> 4);
-	}
-	
-	private static int get3(byte buf[], int off) {
-		return ((buf[off + 1] & 0x0f) << 2) | ((buf[off + 2] & 0xc0) >>> 6);
-	}
-	
-	private static int get4(byte buf[], int off) {
-		return buf[off + 2] & 0x3f;
-	}
-	
-	public static byte[] encode(byte[] bytes) {
-		try{
-			
-			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			
-			byte buffer[] = new byte[BUFFER_SIZE];
-			int got = -1;
-			int off = 0;
-			int count = 0;
-			while ((got = in.read(buffer, off, BUFFER_SIZE - off)) > 0) {
-				if ((got + off) >= 3) {
-					got += off;
-					off = 0;
-					while (off + 3 <= got) {
-						int c1 = get1(buffer, off);
-						int c2 = get2(buffer, off);
-						int c3 = get3(buffer, off);
-						int c4 = get4(buffer, off);
-						switch (count) {
-							case 73:
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write('\n');
-								out.write(ENCODING[c4]);
-								count = 1;
-								break;
-							case 74:
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write('\n');
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count = 2;
-								break;
-							case 75:
-								out.write(ENCODING[c1]);
-								out.write('\n');
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count = 3;
-								break;
-							case 76:
-								out.write('\n');
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count = 4;
-								break;
-							default:
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count += 4;
-								break;
-						}
-						off += 3;
-					}
-					
-					for (int i = 0; i < 3; i++){
-						buffer[i] = (i < got - off) ? buffer[off + i] : ((byte) 0);
-					}
-					off = got - off;
-				} else {
-					off += got;
-				}
-			}
-			
-			switch (off) {
-				case 1:
-					out.write(ENCODING[get1(buffer, 0)]);
-					out.write(ENCODING[get2(buffer, 0)]);
-					out.write('=');
-					out.write('=');
-					break;
-				case 2:
-					out.write(ENCODING[get1(buffer, 0)]);
-					out.write(ENCODING[get2(buffer, 0)]);
-					out.write(ENCODING[get3(buffer, 0)]);
-					out.write('=');
-			}
-			
-			return out.toByteArray();
-			
-		}catch(Throwable throwable){
-			throwable.printStackTrace();
-		}
-		
-		return bytes;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-carbon-integration/build.properties b/TuxGuitar-carbon-integration/build.properties
deleted file mode 100644
index b427978a..00000000
--- a/TuxGuitar-carbon-integration/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/build
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-carbon-integration/build.xml b/TuxGuitar-carbon-integration/build.xml
deleted file mode 100644
index 95295065..00000000
--- a/TuxGuitar-carbon-integration/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-carbon-integration" basedir="." default="all">
-	<description>
-		TuxGuitar-carbon-integration
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-carbon-integration.jar" />
-	
-	<property name="service.class" value="org.herac.tuxguitar.app.system.plugins.TGPlugin" />
-	<property name="service.provider" value="org.herac.tuxguitar.carbon.TGCarbonIntegrationPlugin" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   L I B R A R Y        |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<mkdir dir="${build.path}/META-INF/services" />
-		<echo file="${build.path}/META-INF/services/${service.class}" append="false">${service.provider}</echo>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   L I B R A R Y      |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.6 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-carbon-integration/jni/Makefile b/TuxGuitar-carbon-integration/jni/Makefile
deleted file mode 100644
index ad926a70..00000000
--- a/TuxGuitar-carbon-integration/jni/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-CXX = g++
-
-SDK = /Developer/SDKs/MacOSX10.4u.sdk
-JAVA_FRAMEWORK = $(SDK)/System/Library/Frameworks/JavaVM.framework
-
-INCLUDES = -I $(JAVA_FRAMEWORK)/Headers/
-
-LIBRARIES = -framework JavaVM -framework Carbon -framework ApplicationServices
-LIBRARY = libtuxguitar-carbon-integration.jnilib
-
-FILENAME = org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.cpp
-
-all:	$(LIBRARY)
-
-$(LIBRARY):	clean
-	g++ $(INCLUDES) -isysroot $(SDK) -arch ppc $(LIBRARIES) -msse -dynamiclib -o ppc_$(LIBRARY) $(FILENAME)
-	g++ $(INCLUDES) -isysroot $(SDK) -arch i386 $(LIBRARIES) -msse -dynamiclib -o intel_$(LIBRARY) $(FILENAME)
-	lipo -create ppc_$(LIBRARY) intel_$(LIBRARY) -output $(LIBRARY)
-
-clean:
-	rm -f ppc_$(LIBRARY) intel_$(LIBRARY) $(LIBRARY)
\ No newline at end of file
diff --git a/TuxGuitar-carbon-integration/jni/libtuxguitar-carbon-integration.jnilib b/TuxGuitar-carbon-integration/jni/libtuxguitar-carbon-integration.jnilib
deleted file mode 100755
index 2e19b779..00000000
Binary files a/TuxGuitar-carbon-integration/jni/libtuxguitar-carbon-integration.jnilib and /dev/null differ
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/TGCarbonIntegrationPlugin.java b/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/TGCarbonIntegrationPlugin.java
deleted file mode 100644
index 31aff1c7..00000000
--- a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/TGCarbonIntegrationPlugin.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.herac.tuxguitar.carbon;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
-import org.herac.tuxguitar.carbon.menu.MacMenuPlugin;
-import org.herac.tuxguitar.carbon.opendoc.OpenDocPlugin;
-
-public class TGCarbonIntegrationPlugin extends TGPluginList {
-
-	private List plugins; 
-	
-	protected List getPlugins() {
-		if( this.plugins == null ){
-			this.plugins = new ArrayList();
-			
-			this.plugins.add(new OpenDocPlugin());
-			this.plugins.add(new MacMenuPlugin());
-		}
-		return this.plugins;
-	}
-	
-	
-
-}
diff --git a/TuxGuitar-carbon-integration/tuxguitar-carbon-integration.jar b/TuxGuitar-carbon-integration/tuxguitar-carbon-integration.jar
deleted file mode 100644
index d5c3c25a..00000000
Binary files a/TuxGuitar-carbon-integration/tuxguitar-carbon-integration.jar and /dev/null differ
diff --git a/TuxGuitar-cocoa-integration/build.properties b/TuxGuitar-cocoa-integration/build.properties
deleted file mode 100644
index dba8bef2..00000000
--- a/TuxGuitar-cocoa-integration/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/build
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-cocoa-integration/build.xml b/TuxGuitar-cocoa-integration/build.xml
deleted file mode 100644
index 7a756499..00000000
--- a/TuxGuitar-cocoa-integration/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-cocoa-integration" basedir="." default="all">
-	<description>
-		TuxGuitar-cocoa-integration
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-cocoa-integration.jar" />
-	
-	<property name="service.class" value="org.herac.tuxguitar.app.system.plugins.TGPlugin" />
-	<property name="service.provider" value="org.herac.tuxguitar.cocoa.TGCocoaIntegrationPlugin" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   L I B R A R Y        |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<mkdir dir="${build.path}/META-INF/services" />
-		<echo file="${build.path}/META-INF/services/${service.class}" append="false">${service.provider}</echo>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   L I B R A R Y      |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.6 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java b/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java
deleted file mode 100644
index ae458cfc..00000000
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.herac.tuxguitar.cocoa.toolbar;
-
-import org.eclipse.swt.internal.cocoa.NSObject;
-
-public class MacToolbarDelegate extends NSObject {
-	
-	public MacToolbarDelegate() {
-		super();
-	}
-}
diff --git a/TuxGuitar-community/GNUmakefile b/TuxGuitar-community/GNUmakefile
deleted file mode 100644
index dc4e779d..00000000
--- a/TuxGuitar-community/GNUmakefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:24 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-community
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
diff --git a/TuxGuitar-community/build.properties b/TuxGuitar-community/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-community/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-community/build.xml b/TuxGuitar-community/build.xml
deleted file mode 100644
index bbdee88d..00000000
--- a/TuxGuitar-community/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-community" basedir="." default="all">
-	<description>
-	TuxGuitar Community Integration
-	</description>
-		
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-community.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java
deleted file mode 100644
index 10cc9c18..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.herac.tuxguitar.community.auth.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-public class Base64Decoder {
-	
-	private static final int BUFFER_SIZE = 1024;
-	
-	private static int get1(byte buf[], int off) {
-		return ((buf[off] & 0x3f) << 2) | ((buf[off + 1] & 0x30) >>> 4);
-	}
-	
-	private static int get2(byte buf[], int off) {
-		return ((buf[off + 1] & 0x0f) << 4) | ((buf[off + 2] & 0x3c) >>> 2);
-	}
-	
-	private static int get3(byte buf[], int off) {
-		return ((buf[off + 2] & 0x03) << 6) | (buf[off + 3] & 0x3f);
-	}
-	
-	private static int check(int ch) {
-		if ((ch >= 'A') && (ch <= 'Z')) {
-			return ch - 'A';
-		} else if ((ch >= 'a') && (ch <= 'z')) {
-			return ch - 'a' + 26;
-		} else if ((ch >= '0') && (ch <= '9')) {
-			return ch - '0' + 52;
-		} else {
-			switch (ch) {
-				case '=':
-					return 65;
-				case '+':
-					return 62;
-				case '/':
-					return 63;
-				default:
-					return -1;
-			}
-		}
-	}
-	
-	public static byte[] decode(byte[] bytes){
-		try{
-			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			
-			byte buffer[] = new byte[BUFFER_SIZE];
-			byte chunk[] = new byte[4];
-			int got = -1;
-			int ready = 0;
-			
-			fill: while ((got = in.read(buffer)) > 0) {
-				int skiped = 0;
-				
-				while (skiped < got) {
-					
-					while (ready < 4) {
-						if (skiped >= got){ 
-							continue fill;
-						}
-						int ch = check(buffer[skiped++]);
-						if (ch >= 0) {
-							chunk[ready++] = (byte) ch;
-						}
-					}
-					
-					if (chunk[2] == 65) {
-						out.write(get1(chunk, 0));
-						return out.toByteArray();
-					} 
-					else if (chunk[3] == 65) {
-						out.write(get1(chunk, 0));
-						out.write(get2(chunk, 0));
-						return out.toByteArray();
-					} 
-					else {
-						out.write(get1(chunk, 0));
-						out.write(get2(chunk, 0));
-						out.write(get3(chunk, 0));
-					}
-					ready = 0;
-				}
-			}
-			if (ready == 0){
-				out.flush();
-				return out.toByteArray();
-			}
-			
-		}catch(Throwable throwable){
-			throwable.printStackTrace();
-		}
-		
-		return bytes;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java
deleted file mode 100644
index dddd6181..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.herac.tuxguitar.community.auth.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-public class Base64Encoder {
-	
-	private static final int BUFFER_SIZE = 1024;
-	
-	private static byte ENCODING[] = { 
-		(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H',
-		(byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
-		(byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X',
-		(byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f',
-		(byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n',
-		(byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', (byte) 'v',
-		(byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
-		(byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) '+', (byte) '/',
-		(byte) '='
-	};
-	
-	private static int get1(byte buf[], int off) {
-		return (buf[off] & 0xfc) >> 2;
-	}
-	
-	private static int get2(byte buf[], int off) {
-		return ((buf[off] & 0x3) << 4) | ((buf[off + 1] & 0xf0) >>> 4);
-	}
-	
-	private static int get3(byte buf[], int off) {
-		return ((buf[off + 1] & 0x0f) << 2) | ((buf[off + 2] & 0xc0) >>> 6);
-	}
-	
-	private static int get4(byte buf[], int off) {
-		return buf[off + 2] & 0x3f;
-	}
-	
-	public static byte[] encode(byte[] bytes) {
-		try{
-			
-			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
-			ByteArrayOutputStream out = new ByteArrayOutputStream();
-			
-			byte buffer[] = new byte[BUFFER_SIZE];
-			int got = -1;
-			int off = 0;
-			int count = 0;
-			while ((got = in.read(buffer, off, BUFFER_SIZE - off)) > 0) {
-				if ((got + off) >= 3) {
-					got += off;
-					off = 0;
-					while (off + 3 <= got) {
-						int c1 = get1(buffer, off);
-						int c2 = get2(buffer, off);
-						int c3 = get3(buffer, off);
-						int c4 = get4(buffer, off);
-						switch (count) {
-							case 73:
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write('\n');
-								out.write(ENCODING[c4]);
-								count = 1;
-								break;
-							case 74:
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write('\n');
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count = 2;
-								break;
-							case 75:
-								out.write(ENCODING[c1]);
-								out.write('\n');
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count = 3;
-								break;
-							case 76:
-								out.write('\n');
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count = 4;
-								break;
-							default:
-								out.write(ENCODING[c1]);
-								out.write(ENCODING[c2]);
-								out.write(ENCODING[c3]);
-								out.write(ENCODING[c4]);
-								count += 4;
-								break;
-						}
-						off += 3;
-					}
-					
-					for (int i = 0; i < 3; i++){
-						buffer[i] = (i < got - off) ? buffer[off + i] : ((byte) 0);
-					}
-					off = got - off;
-				} else {
-					off += got;
-				}
-			}
-			
-			switch (off) {
-				case 1:
-					out.write(ENCODING[get1(buffer, 0)]);
-					out.write(ENCODING[get2(buffer, 0)]);
-					out.write('=');
-					out.write('=');
-					break;
-				case 2:
-					out.write(ENCODING[get1(buffer, 0)]);
-					out.write(ENCODING[get2(buffer, 0)]);
-					out.write(ENCODING[get3(buffer, 0)]);
-					out.write('=');
-			}
-			
-			return out.toByteArray();
-			
-		}catch(Throwable throwable){
-			throwable.printStackTrace();
-		}
-		
-		return bytes;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserConnection.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserConnection.java
deleted file mode 100644
index db063885..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserConnection.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.herac.tuxguitar.community.browser;
-
-import java.util.List;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
-import org.herac.tuxguitar.community.TGCommunitySingleton;
-import org.herac.tuxguitar.community.auth.TGCommunityAuth;
-import org.herac.tuxguitar.community.auth.TGCommunityAuthDialog;
-
-public class TGBrowserConnection {
-	
-	private static final String HTTP_STATUS_OK = "200";
-	private static final String HTTP_STATUS_UNAUTHORIZED = "401";
-	
-	private TGCommunityAuth auth;
-	
-	public TGBrowserConnection(){
-		this.auth = TGCommunitySingleton.getInstance().getAuth();
-		this.auth.update();
-	}
-	
-	public void getElements( List elements, TGBrowserElementImpl element ) throws TGBrowserException{
-		try {
-			TGBrowserRequest request = new TGBrowserRequest(this.auth, element);
-			TGBrowserResponse response = request.getResponse();
-			
-			String status = response.getStatus();
-			if( status != null && status.equals(HTTP_STATUS_OK) ){
-				response.loadElements( elements );
-			}else if( status != null && status.equals(HTTP_STATUS_UNAUTHORIZED) ){
-				TGCommunityAuthDialog authDialog = new TGCommunityAuthDialog();
-				if( !TuxGuitar.instance().getBrowser().isDisposed() ){
-					authDialog.open( TuxGuitar.instance().getBrowser().getShell() );
-					if( authDialog.isAccepted() ){
-						this.auth.update();
-						this.getElements(elements, element );
-					}
-				}
-			}
-		}catch(Throwable throwable){
-			throw new TGBrowserException(throwable);
-		}
-	}
-}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java
deleted file mode 100644
index 51ef6377..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.herac.tuxguitar.community.browser;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
-
-public class TGBrowserDataImpl implements TGBrowserData {
-	
-	public TGBrowserDataImpl(){
-		super();
-	}
-	
-	public String getTitle() {
-		return "TuxGuitar Community";
-	}
-	
-	public String toString(){
-		return getTitle();
-	}
-}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java
deleted file mode 100644
index c93bf1fb..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.herac.tuxguitar.community.browser;
-
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserElementImpl extends TGBrowserElement {
-	
-	private TGBrowserElementImpl parent;
-	private Map properties;
-	private String url;
-	
-	public TGBrowserElementImpl(String name) {
-		super(name);
-		this.url = null;
-		this.properties = new HashMap();
-	}
-	
-	public TGBrowserElementImpl getParent() {
-		return this.parent;
-	}
-	
-	public void setParent(TGBrowserElementImpl parent) {
-		this.parent = parent;
-	}
-	
-	public String getUrl() {
-		return this.url;
-	}
-	
-	public void setUrl(String url) {
-		this.url = url;
-	}
-	
-	public void addProperty( String key, String value ){
-		this.properties.put( key, value );
-	}
-	
-	public String getProperty( String key ){
-		return (String)this.properties.get( key );
-	}
-	
-	public Iterator getProperties(){
-		return this.properties.entrySet().iterator();
-	}
-	
-	public boolean isFolder() {
-		return (this.url == null || this.url.length() == 0 );
-	}
-	
-	public InputStream getInputStream() throws TGBrowserException {
-		try {
-			if( ! this.isFolder() ){
-				URL url = new URL( this.url );
-				InputStream stream = url.openStream();
-				
-				return stream;
-			}
-		} catch ( Throwable throwable ){
-			throw new TGBrowserException( throwable );
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java
deleted file mode 100644
index 10eb4203..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.herac.tuxguitar.community.browser;
-
-import org.eclipse.swt.widgets.Shell;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
-
-public class TGBrowserFactoryImpl implements TGBrowserFactory {
-	
-	private TGBrowserDataImpl data;
-	
-	public TGBrowserFactoryImpl(){
-		this.data = new TGBrowserDataImpl();
-	}
-	
-	public String getName() {
-		return "Community Files";
-	}
-	
-	public String getType() {
-		return "community";
-	}
-	
-	public TGBrowser newTGBrowser(TGBrowserData data) {
-		return new TGBrowserImpl( (TGBrowserDataImpl)data );
-	}
-	
-	public TGBrowserData parseData(String string) {
-		return this.data;
-	}
-	
-	public TGBrowserData dataDialog(Shell parent) {
-		TGBrowserAuthDialog authDialog = new TGBrowserAuthDialog();
-		authDialog.open( parent );
-		if( authDialog.isAccepted() ){
-			return this.data;
-		}
-		return null;
-	}
-
-}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserImpl.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserImpl.java
deleted file mode 100644
index 53cc7678..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.herac.tuxguitar.community.browser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserImpl extends TGBrowser {
-	
-	private TGBrowserConnection connection;
-	private TGBrowserElementImpl element;
-	
-	public TGBrowserImpl(TGBrowserDataImpl data){
-		this.element = null;
-		this.connection = new TGBrowserConnection();
-	}
-	
-	public void open() throws TGBrowserException {
-		// TODO Auto-generated method stub
-	}
-	
-	public void close() throws TGBrowserException {
-		// TODO Auto-generated method stub
-	}
-	
-	public void cdRoot() throws TGBrowserException {
-		this.element = null;
-	}
-	
-	public void cdUp() throws TGBrowserException {
-		if( this.element != null ){
-			this.element = this.element.getParent();
-		}
-	}
-	
-	public void cdElement(TGBrowserElement element) throws TGBrowserException {
-		if( element instanceof TGBrowserElementImpl ){
-			TGBrowserElementImpl nextElement = (TGBrowserElementImpl)element;
-			nextElement.setParent( this.element );
-			this.element = nextElement;
-		}
-	}
-	
-	public List listElements() throws TGBrowserException {
-		List elements = new ArrayList();
-		this.connection.getElements(elements , this.element );
-		return elements;
-	}
-}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java b/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java
deleted file mode 100644
index ca886ea9..00000000
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.herac.tuxguitar.community.browser;
-
-import org.herac.tuxguitar.app.system.plugins.TGPluginException;
-import org.herac.tuxguitar.app.system.plugins.base.TGBrowserPlugin;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
-
-public class TGBrowserPluginImpl extends TGBrowserPlugin {
-	
-	protected TGBrowserFactory getFactory() throws TGPluginException {
-		return new TGBrowserFactoryImpl();
-	}
-	
-}
diff --git a/TuxGuitar-compat/GNUmakefile b/TuxGuitar-compat/GNUmakefile
deleted file mode 100644
index 3743c481..00000000
--- a/TuxGuitar-compat/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:26 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-compat
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:26 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-compat/build.properties b/TuxGuitar-compat/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-compat/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-compat/build.xml b/TuxGuitar-compat/build.xml
deleted file mode 100644
index de95e894..00000000
--- a/TuxGuitar-compat/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-compat" basedir="." default="all">
-	<description>
-		TuxGuitar file format compatibility
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-compat.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v07/TGInputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v07/TGInputStream.java
deleted file mode 100644
index 47a8f139..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v07/TGInputStream.java
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v07;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream implements TGInputStreamBase{
-	private static final String TG_VERSION = "TG_DEVEL-0.01";
-	
-	private DataInputStream dataInputStream;
-	private TGFactory factory;
-	private String version;
-	
-	public TGInputStream(){
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Exception e){
-			return false;
-		}catch(Error e){
-			return false;
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readString();
-		}
-	}
-	
-	public TGSong readSong()throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		}catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readString());
-		
-		//leo el artista
-		song.setArtist(readString());
-		
-		//leo el album
-		song.setAlbum(readString());
-		
-		//leo el autor
-		song.setAuthor(readString());
-		
-		//leo la cantidad de pistas
-		int trackCount = readInt();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(song));
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(TGSong song){
-		TGTrack track = this.factory.newTrack();
-		
-		//leo el numero
-		track.setNumber((int)readLong());
-		
-		//leo el nombre
-		track.setName(readString());
-		
-		//leo el canal
-		readChannel(song,track);
-		
-		//leo el solo
-		track.setSolo(readBoolean());
-		
-		//leo el mute
-		track.setMute(readBoolean());
-		
-		//leo la cantidad de compases
-		int measureCount = readInt();
-		
-		if(song.countMeasureHeaders() == 0){
-			for(int i = 0;i < measureCount;i++){
-				TGMeasureHeader header = this.factory.newHeader();
-				song.addMeasureHeader(header);
-			}
-		}
-		
-		//leo los compases
-		for(int i = 0;i < measureCount;i++){
-			track.addMeasure(readMeasure(song.getMeasureHeader(i)));
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readInt();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString());
-		}
-		
-		//leo el color
-		readColor(track.getColor());
-		
-		return track;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader header){
-		TGMeasure measure = this.factory.newMeasure(header);
-		
-		//leo el number
-		header.setNumber(readInt());
-		
-		//leo el start
-		header.setStart( (TGDuration.QUARTER_TIME * readLong() / 1000) );
-		
-		//leo la cantidad de notas
-		int noteCount = readInt();
-		
-		//leo las notas
-		TGBeat previous = null;
-		for(int i = 0;i < noteCount;i++){
-			previous = readNote(measure,previous);
-		}
-		
-		//leo la cantidad de silencios
-		int silenceCount = readInt();
-		
-		//leo los silencios
-		previous = null;
-		for(int i = 0;i < silenceCount;i++){
-			previous = readSilence(measure,previous);
-		}
-		
-		//leo el time signature
-		readTimeSignature(header.getTimeSignature());
-		
-		//leo el tempo
-		readTempo(header.getTempo());
-		
-		//leo la clave
-		measure.setClef(readInt());
-		
-		//leo el key signature
-		measure.setKeySignature(readInt());
-		
-		//leo el comienzo de la repeticion
-		header.setRepeatOpen(readBoolean());
-		
-		//leo el numero de repeticiones
-		header.setRepeatClose(readInt());
-		
-		return measure;
-		
-	}
-	
-	private TGBeat readNote(TGMeasure measure, TGBeat previous){
-		TGBeat beat = previous;
-		
-		//leo el valor
-		int value = readInt();
-		
-		//leo el start
-		long start = (TGDuration.QUARTER_TIME * readLong() / 1000);
-		if(beat == null || beat.getStart() != start){
-			beat = this.factory.newBeat();
-			beat.setStart(start);
-			measure.addBeat(beat);
-		}
-		TGVoice voice = beat.getVoice(0);
-		voice.setEmpty( false );
-		
-		//leo la duracion
-		readDuration(voice.getDuration());
-		
-		TGNote note = this.factory.newNote();
-		
-		note.setValue(value);
-		
-		//leo el velocity
-		note.setVelocity(readInt());
-		
-		//leo la cuerda
-		note.setString(readInt());
-		
-		//leo la ligadura
-		note.setTiedNote(readBoolean());
-		
-		//leo los efectos
-		readNoteEffect(note.getEffect());
-		
-		voice.addNote(note);
-		return beat;
-	}
-	
-	private void readChannel(TGSong song, TGTrack track){
-		TGChannel channel = this.factory.newChannel();
-		
-		//leo el canal
-		channel.setChannel(readShort());
-		
-		//leo el canal de efectos
-		channel.setEffectChannel(readShort());
-		
-		//leo el instrumento
-		channel.setProgram(readShort());
-		
-		//leo el volumen
-		channel.setVolume(readShort());
-		
-		//leo el balance
-		channel.setBalance(readShort());
-		
-		//leo el chorus
-		channel.setChorus(readShort());
-		
-		//leo el reverb
-		channel.setReverb(readShort());
-		
-		//leo el phaser
-		channel.setPhaser(readShort());
-		
-		//leo el tremolo
-		channel.setTremolo(readShort());
-		
-		//------------------------------------------//
-		for( int i = 0 ; i < song.countChannels() ; i ++ ){
-			TGChannel channelAux = song.getChannel(i);
-			if( channelAux.getChannel() == channel.getChannel() ){
-				channel.setChannelId(channelAux.getChannelId());
-			}
-		}
-		if( channel.getChannelId() <= 0 ){
-			channel.setChannelId( song.countChannels() + 1 );
-			channel.setName(("#" + channel.getChannelId()));
-			song.addChannel(channel);
-		}
-		track.setChannelId(channel.getChannelId());
-	}
-	
-	private TGBeat readSilence(TGMeasure measure, TGBeat previous){
-		TGBeat beat = previous;
-		
-		//leo el start
-		long start = (TGDuration.QUARTER_TIME * readLong() / 1000);
-		if(beat == null || beat.getStart() != start){
-			beat = this.factory.newBeat();
-			beat.setStart(start);
-			measure.addBeat(beat);
-		}
-		TGVoice voice = beat.getVoice(0);
-		voice.setEmpty( false );
-		
-		//leo la duracion
-		readDuration(voice.getDuration());
-		
-		return beat;
-	}
-	
-	private TGString readInstrumentString(){
-		TGString string = this.factory.newString();
-		
-		//leo el numero
-		string.setNumber( readInt() );
-		
-		//leo el valor
-		string.setValue(readInt());
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readInt());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readInt());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		//leo el valor
-		duration.setValue( readInt() );
-		
-		//leo el puntillo
-		duration.setDotted( readBoolean() );
-		
-		//leo el doble puntillo
-		duration.setDoubleDotted( readBoolean() );
-		
-		//leo el tipo de divisiones
-		readDivisionType(duration.getDivision());
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readInt());
-		
-		//leo los tiempos
-		divisionType.setTimes(readInt());
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		//leo el vibrato
-		effect.setVibrato(readBoolean());
-		
-		//leo el bend
-		if(readBoolean()){
-			effect.setBend(readBendEffect());
-		}
-		
-		//leo la nota muerta
-		effect.setDeadNote(readBoolean());
-		
-		//leo el slide
-		effect.setSlide(readBoolean());
-		
-		//leo el hammer
-		effect.setHammer(readBoolean());
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readInt();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readInt();
-			
-			//leo el valor
-			int value = readInt();
-			
-			//agrego el punto
-			bend.addPoint(position,((value > 0)?value / 2:value));
-		}
-		return bend;
-	}
-	
-	private void readColor(TGColor color){
-		//escribo el RGB
-		color.setR(readInt());
-		color.setG(readInt());
-		color.setB(readInt());
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readInt(){
-		try {
-			return this.dataInputStream.readInt();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private long readLong(){
-		try {
-			return this.dataInputStream.readLong();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readString(){
-		try {
-			int length = this.dataInputStream.read();
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-		
-	}
-	
-	private boolean readBoolean(){
-		try {
-			return this.dataInputStream.readBoolean();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGInputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGInputStream.java
deleted file mode 100644
index fa84d13f..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGInputStream.java
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v08;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream extends TGStream implements TGInputStreamBase{
-	
-	private DataInputStream dataInputStream;
-	private TGFactory factory;
-	private String version;
-	
-	public TGInputStream(){
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Throwable throwable){
-			return false;
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readString();
-		}
-	}
-	
-	public TGSong readSong() throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		} catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readString());
-		
-		//leo el artista
-		song.setArtist(readString());
-		
-		//leo el album
-		song.setAlbum(readString());
-		
-		//leo el autor
-		song.setAuthor(readString());
-		
-		//leo la cantidad de measure headers
-		int headerCount = readShort();
-		
-		//leo las pistas
-		long headerStart = TGDuration.QUARTER_TIME;
-		TGMeasureHeader lastHeader = null;
-		for(int i = 0;i < headerCount;i++){
-			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
-			song.addMeasureHeader(header);
-			headerStart += header.getLength();
-			lastHeader = header;
-		}
-		
-		//leo la cantidad de pistas
-		int trackCount = readByte();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(i + 1,song));
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(int number,TGSong song){
-		TGTrack track = this.factory.newTrack();
-		
-		track.setNumber(number);
-		
-		//leo el nombre
-		track.setName(readString());
-		
-		//leo el canal
-		readChannel(song, track);
-		
-		//leo la cantidad de compases
-		int measureCount = song.countMeasureHeaders();
-		
-		//leo los compases
-		TGMeasure lastMeasure = null;
-		for(int i = 0;i < measureCount;i++){
-			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
-			track.addMeasure(measure);
-			lastMeasure = measure;
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readByte();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString(i + 1));
-		}
-		
-		//leo el offset
-		track.setOffset((TGTrack.MIN_OFFSET + readByte()));
-		
-		//leo el color
-		readColor(track.getColor());
-		
-		return track;
-	}
-	
-	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
-		int header = readHeader();
-		
-		TGMeasureHeader measureHeader = this.factory.newHeader();
-		measureHeader.setNumber(number);
-		measureHeader.setStart(start);
-		
-		//leo el time signature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			readTimeSignature(measureHeader.getTimeSignature());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
-		}
-		
-		//leo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			readTempo(measureHeader.getTempo());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
-		}
-		
-		//leo el comienzo de la repeticion
-		measureHeader.setRepeatOpen( ((header & MEASURE_HEADER_OPEN_REPEAT) != 0) );
-		
-		//leo el numero de repeticiones
-		if(((header & MEASURE_HEADER_CLOSE_REPEAT) != 0)){
-			measureHeader.setRepeatClose(readShort());
-		}
-		
-		//leo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			measureHeader.setMarker(readMarker(number));
-		}
-		
-		measureHeader.setTripletFeel( ((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE) );
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			measureHeader.setTripletFeel( readByte() );
-		}
-		return measureHeader;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
-		int header = readHeader();
-		
-		TGMeasure measure = this.factory.newMeasure(measureHeader);
-		
-		//leo la cantidad de componentes
-		TGBeat previous = null;
-		int componentCount = readShort();
-		for(int i = 0;i < componentCount;i++){
-			previous = readComponent(measure,previous);
-		}
-		
-		//leo la clave
-		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
-		if(((header & MEASURE_CLEF) != 0)){
-			measure.setClef(readByte());
-		}
-		
-		//leo el key signature
-		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			measure.setKeySignature(readByte());
-		}
-		
-		return measure;
-	}
-	
-	private void readChannel(TGSong song, TGTrack track){
-		int header = readHeader();
-		
-		TGChannel channel = this.factory.newChannel();
-		
-		//leo el canal
-		channel.setChannel((short)readByte());
-		
-		//leo el canal de efectos
-		channel.setEffectChannel((short)readByte());
-		
-		//leo el instrumento
-		channel.setProgram((short)readByte());
-		
-		//leo el volumen
-		channel.setVolume((short)readByte());
-		
-		//leo el balance
-		channel.setBalance((short)readByte());
-		
-		//leo el chorus
-		channel.setChorus((short)readByte());
-		
-		//leo el reverb
-		channel.setReverb((short)readByte());
-		
-		//leo el phaser
-		channel.setPhaser((short)readByte());
-		
-		//leo el tremolo
-		channel.setTremolo((short)readByte());
-		
-		//leo el solo
-		track.setSolo(((header & CHANNEL_SOLO) != 0));
-		
-		//leo el mute
-		track.setMute(((header & CHANNEL_MUTE) != 0));
-		
-		//------------------------------------------//
-		for( int i = 0 ; i < song.countChannels() ; i ++ ){
-			TGChannel channelAux = song.getChannel(i);
-			if( channelAux.getChannel() == channel.getChannel() ){
-				channel.setChannelId(channelAux.getChannelId());
-			}
-		}
-		if( channel.getChannelId() <= 0 ){
-			channel.setChannelId( song.countChannels() + 1 );
-			channel.setName(("#" + channel.getChannelId()));
-			song.addChannel(channel);
-		}
-		track.setChannelId(channel.getChannelId());
-	}
-	
-	private TGBeat readComponent(TGMeasure measure,TGBeat previous){
-		TGBeat beat = previous;
-		
-		int header = readHeader();
-		
-		//leo el start
-		if(beat == null){
-			beat = this.factory.newBeat();
-			beat.setStart(measure.getStart());
-			measure.addBeat(beat);
-		}else if(((header & COMPONENT_NEXT_BEAT) != 0)){
-			beat = this.factory.newBeat();
-			beat.setStart(previous.getStart() + previous.getVoice(0).getDuration().getTime());
-			measure.addBeat(beat);
-		}
-		TGVoice voice = beat.getVoice(0);
-		voice.setEmpty(false);
-		
-		//leo la duracion
-		if(((header & COMPONENT_NEXT_DURATION) != 0)){
-			readDuration(voice.getDuration());
-		}else if(previous != null && !previous.equals(beat)){
-			previous.getVoice(0).getDuration().copy( voice.getDuration() );
-		}
-		
-		if(((header & COMPONENT_NOTE) != 0)){
-			TGNote note = this.factory.newNote();
-			
-			//leo el valor
-			note.setValue(readByte());
-			
-			//leo el velocity
-			note.setVelocity( readByte() );
-			
-			//leo la cuerda
-			note.setString(readByte());
-			
-			//leo la ligadura
-			note.setTiedNote(((header & COMPONENT_TIEDNOTE) != 0));
-			
-			//leo los efectos
-			if(((header & COMPONENT_EFFECT) != 0)){
-				readNoteEffect(note.getEffect());
-			}
-			
-			voice.addNote(note);
-		}
-		return beat;
-	}
-	
-	private TGString readInstrumentString(int number){
-		TGString string = this.factory.newString();
-		
-		//leo el numero
-		string.setNumber(number);
-		
-		//leo el valor
-		string.setValue(readByte());
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readShort());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readByte());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		int header = readHeader();
-		
-		duration.setDotted((header & DURATION_DOTTED) != 0);
-		
-		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
-		
-		//leo el valor
-		duration.setValue(readByte());
-		
-		//leo el tipo de divisiones
-		if(((header & DURATION_TUPLETO) != 0)){
-			readDivisionType(duration.getDivision());
-		}
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readByte());
-		
-		//leo los tiempos
-		divisionType.setTimes(readByte());
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		int header = readHeader();
-		
-		//leo el vibrato
-		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
-		
-		//leo la nota muerta
-		effect.setDeadNote(((header & EFFECT_DEAD_NOTE) != 0));
-		
-		//leo el slide
-		effect.setSlide(((header & EFFECT_SLIDE) != 0));
-		
-		//leo el hammer
-		effect.setHammer(((header & EFFECT_HAMMER) != 0));
-		
-		//leo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			effect.setBend(readBendEffect());
-		}
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value = readByte();
-			
-			//agrego el punto
-			bend.addPoint(position,((value > 0)?value / 2:value));
-		}
-		return bend;
-	}
-	
-	private TGMarker readMarker(int measure){
-		TGMarker marker = this.factory.newMarker();
-		
-		//leo el compas
-		marker.setMeasure(measure);
-		
-		//leo el titulo
-		marker.setTitle(readString());
-		
-		//leo el color
-		readColor(marker.getColor());
-		
-		return marker;
-	}
-	
-	private void readColor(TGColor color){
-		//escribo el RGB
-		color.setR(readShort());
-		color.setG(readShort());
-		color.setB(readShort());
-	}
-	
-	private int readByte(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readString(){
-		try {
-			int length = this.dataInputStream.read();
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGStream.java
deleted file mode 100644
index a3a12220..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v08/TGStream.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.herac.tuxguitar.io.tg.v08;
-
-public class TGStream {
-	
-	protected static final String TG_VERSION = ("TG_DEVEL-0.8");
-	
-	protected static final int CHANNEL_SOLO = 0x01;
-	
-	protected static final int CHANNEL_MUTE = 0x02;
-	
-	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
-	
-	protected static final int MEASURE_HEADER_TEMPO = 0x02;
-	
-	protected static final int MEASURE_HEADER_OPEN_REPEAT = 0x04;
-	
-	protected static final int MEASURE_HEADER_CLOSE_REPEAT = 0x08;
-	
-	protected static final int MEASURE_HEADER_MARKER = 0x10;
-	
-	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x20;
-	
-	protected static final int MEASURE_CLEF = 0x01;
-	
-	protected static final int MEASURE_KEYSIGNATURE = 0x02;
-	
-	protected static final int COMPONENT_NOTE = 0x01;
-	
-	protected static final int COMPONENT_SILENCE = 0x02;
-	
-	protected static final int COMPONENT_TIEDNOTE = 0x04;
-	
-	protected static final int COMPONENT_EFFECT = 0x08;
-	
-	protected static final int COMPONENT_NEXT_BEAT = 0x10;
-	
-	protected static final int COMPONENT_NEXT_DURATION = 0x20;
-	
-	protected static final int DURATION_DOTTED = 0x01;
-	
-	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
-	
-	protected static final int DURATION_TUPLETO = 0x04;
-	
-	protected static final int EFFECT_VIBRATO = 0x01;
-	
-	protected static final int EFFECT_BEND = 0x02;
-	
-	protected static final int EFFECT_DEAD_NOTE = 0x04;
-	
-	protected static final int EFFECT_SLIDE = 0x08;
-	
-	protected static final int EFFECT_HAMMER = 0x10;
-	
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGInputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGInputStream.java
deleted file mode 100644
index fe6a6a8e..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGInputStream.java
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v09;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVelocities;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream extends TGStream implements TGInputStreamBase{
-	
-	private DataInputStream dataInputStream;
-	private String version;
-	private TGFactory factory;
-	
-	private int velocity;
-	
-	public TGInputStream() {
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Throwable throwable){
-			return false;
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readString();
-		}
-	}
-	
-	public TGSong readSong() throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		} catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readString());
-		
-		//leo el artista
-		song.setArtist(readString());
-		
-		//leo el album
-		song.setAlbum(readString());
-		
-		//leo el autor
-		song.setAuthor(readString());
-		
-		//leo la cantidad de measure headers
-		int headerCount = readShort();
-		
-		//leo las pistas
-		long headerStart = TGDuration.QUARTER_TIME;
-		TGMeasureHeader lastHeader = null;
-		for(int i = 0;i < headerCount;i++){
-			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
-			song.addMeasureHeader(header);
-			headerStart += header.getLength();
-			lastHeader = header;
-		}
-		
-		//leo la cantidad de pistas
-		int trackCount = readByte();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(i + 1,song) );
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(int number,TGSong song){
-		//header
-		int header = readHeader();
-		
-		TGTrack track = this.factory.newTrack();
-		
-		track.setNumber(number);
-		
-		//leo el nombre
-		track.setName( readString() );
-		
-		//leo el canal
-		readChannel(song, track);
-		
-		//leo la cantidad de compases
-		int measureCount = song.countMeasureHeaders();
-		
-		//leo los compases
-		TGMeasure lastMeasure = null;
-		for(int i = 0;i < measureCount;i++){
-			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
-			track.addMeasure(measure);
-			lastMeasure = measure;
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readByte();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString(i + 1));
-		}
-		
-		//leo el offset
-		track.setOffset( (TGTrack.MIN_OFFSET + readByte()) );
-		
-		//leo el color
-		readColor(track.getColor());
-		
-		//leo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			readLyrics(track.getLyrics());
-		}
-		
-		return track;
-	}
-	
-	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
-		int header = readHeader();
-		
-		TGMeasureHeader measureHeader = this.factory.newHeader();
-		measureHeader.setNumber(number);
-		measureHeader.setStart(start);
-		
-		//leo el time signature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			readTimeSignature(measureHeader.getTimeSignature());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
-		}
-		
-		//leo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			readTempo(measureHeader.getTempo());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
-		}
-		
-		//leo el comienzo de la repeticion
-		measureHeader.setRepeatOpen((header & MEASURE_HEADER_OPEN_REPEAT) != 0);
-		
-		//leo el numero de repeticiones
-		if(((header & MEASURE_HEADER_CLOSE_REPEAT) != 0)){
-			measureHeader.setRepeatClose(readShort());
-		}
-		
-		//leo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			measureHeader.setMarker(readMarker(number));
-		}
-		
-		measureHeader.setTripletFeel ((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			measureHeader.setTripletFeel( readByte() );
-		}
-		
-		return measureHeader;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
-		this.velocity = TGVelocities.DEFAULT;
-		
-		int header = readHeader();
-		
-		TGMeasure measure = this.factory.newMeasure(measureHeader);
-		
-		//leo la cantidad de componentes
-		TGBeat previous = null;
-		int componentCount = readShort();
-		for(int i = 0;i < componentCount;i++){
-			previous = readComponent(measure,previous);
-		}
-		
-		//leo la clave
-		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
-		if(((header & MEASURE_CLEF) != 0)){
-			measure.setClef( readByte() );
-		}
-		
-		//leo el key signature
-		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			measure.setKeySignature(readByte());
-		}
-		
-		return measure;
-		
-	}
-	
-	private void readChannel(TGSong song, TGTrack track){
-		int header = readHeader();
-		
-		TGChannel channel = this.factory.newChannel();
-		
-		//leo el canal
-		channel.setChannel( (short)readByte() );
-		
-		//leo el canal de efectos
-		channel.setEffectChannel( (short)readByte() );
-		
-		//leo el instrumento
-		channel.setProgram( (short)readByte() );
-		
-		//leo el volumen
-		channel.setVolume( (short)readByte() );
-		
-		//leo el balance
-		channel.setBalance( (short)readByte() );
-		
-		//leo el chorus
-		channel.setChorus( (short)readByte() );
-		
-		//leo el reverb
-		channel.setReverb( (short)readByte() );
-		
-		//leo el phaser
-		channel.setPhaser( (short)readByte() );
-		
-		//leo el tremolo
-		channel.setTremolo( (short)readByte() );
-		
-		//leo el solo
-		track.setSolo( ((header & CHANNEL_SOLO) != 0) );
-		
-		//leo el mute
-		track.setMute( ((header & CHANNEL_MUTE) != 0) );
-		
-		//------------------------------------------//
-		for( int i = 0 ; i < song.countChannels() ; i ++ ){
-			TGChannel channelAux = song.getChannel(i);
-			if( channelAux.getChannel() == channel.getChannel() ){
-				channel.setChannelId(channelAux.getChannelId());
-			}
-		}
-		if( channel.getChannelId() <= 0 ){
-			channel.setChannelId( song.countChannels() + 1 );
-			channel.setName(("#" + channel.getChannelId()));
-			song.addChannel(channel);
-		}
-		track.setChannelId(channel.getChannelId());
-	}
-	
-	private TGBeat readComponent(TGMeasure measure,TGBeat previous){
-		TGBeat beat = previous;
-		
-		int header = readHeader();
-		
-		//leo el start
-		if(beat == null){
-			beat = this.factory.newBeat();
-			beat.setStart(measure.getStart());
-			measure.addBeat(beat);
-		}else if(((header & COMPONENT_NEXT_BEAT) != 0)){
-			beat = this.factory.newBeat();
-			beat.setStart(previous.getStart() + previous.getVoice(0).getDuration().getTime());
-			measure.addBeat(beat);
-		}
-		TGVoice voice = beat.getVoice(0);
-		voice.setEmpty(false);
-		
-		//leo la duracion
-		if(((header & COMPONENT_NEXT_DURATION) != 0)){
-			readDuration(voice.getDuration());
-		}else if(previous != null && !previous.equals(beat)){
-			previous.getVoice(0).getDuration().copy( voice.getDuration() );
-		}
-		
-		if(((header & COMPONENT_NOTE) != 0)){
-			TGNote note = this.factory.newNote();
-			
-			//leo el valor
-			note.setValue(readByte());
-			
-			//leo la cuerda
-			note.setString(readByte());
-			
-			//leo la ligadura
-			note.setTiedNote((header & COMPONENT_TIEDNOTE) != 0);
-			
-			//leo el velocity
-			if(((header & COMPONENT_VELOCITY) != 0)){
-				this.velocity = readByte();
-			}
-			note.setVelocity(this.velocity);
-			
-			//leo los efectos
-			if(((header & COMPONENT_EFFECT) != 0)){
-				readNoteEffect(note.getEffect());
-			}
-			voice.addNote(note);
-		}
-		return beat;
-	}
-	
-	private TGString readInstrumentString(int number){
-		TGString string = this.factory.newString();
-		
-		string.setNumber(number);
-		
-		//leo el valor
-		string.setValue( readByte() );
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readShort());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readByte());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		int header = readHeader();
-		
-		// leo el puntillo
-		duration.setDotted((header & DURATION_DOTTED) != 0);
-		
-		//leo el doble puntillo
-		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
-		
-		//leo el valor
-		duration.setValue(readByte());
-		
-		//leo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			readDivisionType(duration.getDivision());
-		}
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readByte());
-		
-		//leo los tiempos
-		divisionType.setTimes(readByte());
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		int header = readHeader(3);
-		
-		//leo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			effect.setBend(readBendEffect());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			effect.setTremoloBar(readTremoloBarEffect());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			effect.setHarmonic(readHarmonicEffect());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			effect.setGrace(readGraceEffect());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			effect.setTrill(readTrillEffect());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			effect.setTremoloPicking(readTremoloPickingEffect());
-		}
-		
-		//vibrato
-		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
-		
-		//dead note
-		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
-		
-		//slide
-		effect.setSlide(((header & EFFECT_SLIDE) != 0));
-		
-		//hammer-on/pull-off
-		effect.setHammer(((header & EFFECT_HAMMER) != 0));
-		
-		//ghost note
-		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
-		
-		//accentuated note
-		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
-		
-		//heavy accentuated note
-		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
-		
-		//palm mute
-		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
-		
-		//staccato
-		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
-		
-		//tapping
-		effect.setTapping(((header & EFFECT_TAPPING) != 0));
-		
-		//slapping
-		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
-		
-		//popping
-		effect.setPopping(((header & EFFECT_POPPING) != 0));
-		
-		//fade in
-		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value = readByte();
-			
-			//agrego el punto
-			bend.addPoint(position,value);
-		}
-		return bend;
-	}
-	
-	private TGEffectTremoloBar readTremoloBarEffect(){
-		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
-			
-			//agrego el punto
-			tremoloBar.addPoint(position,value);
-		}
-		return tremoloBar;
-	}
-	
-	private TGEffectHarmonic readHarmonicEffect(){
-		TGEffectHarmonic harmonic = this.factory.newEffectHarmonic();
-		
-		//leo el tipo
-		harmonic.setType(readByte());
-		
-		//leo la data
-		if(harmonic.getType() == TGEffectHarmonic.TYPE_ARTIFICIAL){
-			harmonic.setData(TGEffectHarmonic.MIN_ARTIFICIAL_OFFSET + readByte());
-		}else if(harmonic.getType() == TGEffectHarmonic.TYPE_TAPPED){
-			harmonic.setData(readByte());
-		}
-		return harmonic;
-	}
-	
-	private TGEffectGrace readGraceEffect(){
-		TGEffectGrace grace = this.factory.newEffectGrace();
-		
-		int header = readHeader();
-		
-		grace.setDead(((header & GRACE_FLAG_DEAD) != 0));
-		
-		grace.setOnBeat(((header & GRACE_FLAG_ON_BEAT) != 0));
-		
-		//leo el fret
-		grace.setFret(readByte());
-		
-		//leo la duracion
-		grace.setDuration(readByte());
-		
-		//leo el velocity
-		grace.setDynamic(readByte());
-		
-		//leo la transicion
-		grace.setTransition(readByte());
-		
-		return grace;
-	}
-	
-	private TGEffectTremoloPicking readTremoloPickingEffect(){
-		TGEffectTremoloPicking tremoloPicking = this.factory.newEffectTremoloPicking();
-		
-		//leo la duracion
-		tremoloPicking.getDuration().setValue(readByte());
-		
-		return tremoloPicking;
-	}
-	
-	private TGEffectTrill readTrillEffect(){
-		TGEffectTrill trill = this.factory.newEffectTrill();
-		
-		//leo el fret
-		trill.setFret(readByte());
-		
-		//leo la duracion
-		trill.getDuration().setValue(readByte());
-		
-		return trill;
-	}
-	
-	private TGMarker readMarker(int measure){
-		TGMarker marker = this.factory.newMarker();
-		
-		marker.setMeasure(measure);
-		
-		//leo el titulo
-		marker.setTitle(readString());
-		
-		//leo el color
-		readColor(marker.getColor());
-		
-		return marker;
-	}
-	
-	private void readColor(TGColor color){
-		//leo el RGB
-		color.setR(readShort());
-		color.setG(readShort());
-		color.setB(readShort());
-	}
-	
-	private void readLyrics(TGLyric lyrics){
-		//leo el compas de comienzo
-		lyrics.setFrom(readShort());
-		
-		//leo el texto
-		lyrics.setLyrics(readString());
-	}
-	
-	private int readByte(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(int bCount){
-		int header = 0;
-		for(int i = bCount; i > 0; i --){
-			header += ( readHeader() << ( (8 * i) - 8 ) );
-		}
-		return header;
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readString(){
-		try {
-			int length = this.dataInputStream.read();
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-		
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGStream.java
deleted file mode 100644
index 65f771bc..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v09/TGStream.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.herac.tuxguitar.io.tg.v09;
-
-public class TGStream {
-	
-	protected static final String TG_VERSION = ("TuxGuitar File Format - 0.9");
-	
-	protected static final int TRACK_LYRICS = 0x01;
-	
-	protected static final int CHANNEL_SOLO = 0x01;
-	
-	protected static final int CHANNEL_MUTE = 0x02;
-	
-	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
-	
-	protected static final int MEASURE_HEADER_TEMPO = 0x02;
-	
-	protected static final int MEASURE_HEADER_OPEN_REPEAT = 0x04;
-	
-	protected static final int MEASURE_HEADER_CLOSE_REPEAT = 0x08;
-	
-	protected static final int MEASURE_HEADER_MARKER = 0x10;
-	
-	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x20;
-	
-	protected static final int MEASURE_CLEF = 0x01;
-	
-	protected static final int MEASURE_KEYSIGNATURE = 0x02;
-	
-	protected static final int COMPONENT_NOTE = 0x01;
-	
-	protected static final int COMPONENT_SILENCE = 0x02;
-	
-	protected static final int COMPONENT_TIEDNOTE = 0x04;
-	
-	protected static final int COMPONENT_EFFECT = 0x08;
-	
-	protected static final int COMPONENT_NEXT_BEAT = 0x10;
-	
-	protected static final int COMPONENT_NEXT_DURATION = 0x20;
-	
-	protected static final int COMPONENT_VELOCITY = 0x40;
-	
-	protected static final int DURATION_DOTTED = 0x01;
-	
-	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
-	
-	protected static final int DURATION_NO_TUPLET = 0x04;
-	
-	protected static final int EFFECT_BEND = 0x01;
-	
-	protected static final int EFFECT_TREMOLO_BAR = 0x02;
-	
-	protected static final int EFFECT_HARMONIC = 0x04;
-	
-	protected static final int EFFECT_GRACE = 0x08;
-	
-	protected static final int EFFECT_TRILL = 0x010;
-	
-	protected static final int EFFECT_TREMOLO_PICKING = 0x020;
-	
-	protected static final int EFFECT_VIBRATO = 0x040;
-	
-	protected static final int EFFECT_DEAD = 0x080;
-	
-	protected static final int EFFECT_SLIDE = 0x0100;
-	
-	protected static final int EFFECT_HAMMER = 0x0200;
-	
-	protected static final int EFFECT_GHOST = 0x0400;
-	
-	protected static final int EFFECT_ACCENTUATED = 0x0800;
-	
-	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x01000;
-	
-	protected static final int EFFECT_PALM_MUTE = 0x02000;
-	
-	protected static final int EFFECT_STACCATO = 0x04000;
-	
-	protected static final int EFFECT_TAPPING = 0x08000;
-	
-	protected static final int EFFECT_SLAPPING = 0x010000;
-	
-	protected static final int EFFECT_POPPING = 0x020000;
-	
-	protected static final int EFFECT_FADE_IN = 0x040000;
-	
-	protected static final int GRACE_FLAG_DEAD = 0x01;
-	
-	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGInputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGInputStream.java
deleted file mode 100644
index d1bcd02d..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGInputStream.java
+++ /dev/null
@@ -1,729 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v10;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream extends TGStream implements TGInputStreamBase{
-	
-	private DataInputStream dataInputStream;
-	private String version;
-	private TGFactory factory;
-	
-	public TGInputStream() {
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_FORMAT_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Throwable throwable){
-			return false;
-		}
-	}
-	
-	public TGSong readSong() throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		} catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readUnsignedByteString();
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readUnsignedByteString());
-		
-		//leo el artista
-		song.setArtist(readUnsignedByteString());
-		
-		//leo el album
-		song.setAlbum(readUnsignedByteString());
-		
-		//leo el autor
-		song.setAuthor(readUnsignedByteString());
-		
-		//leo la cantidad de measure headers
-		int headerCount = readShort();
-		
-		//leo las pistas
-		TGMeasureHeader lastHeader = null;
-		long headerStart = TGDuration.QUARTER_TIME;
-		for(int i = 0;i < headerCount;i++){
-			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
-			song.addMeasureHeader(header);
-			headerStart += header.getLength();
-			lastHeader = header;
-		}
-		
-		//leo la cantidad de pistas
-		int trackCount = readByte();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(i + 1,song));
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(int number,TGSong song){
-		//header
-		int header = readHeader();
-		
-		TGTrack track = this.factory.newTrack();
-		
-		track.setNumber(number);
-		
-		//leo el nombre
-		track.setName(readUnsignedByteString());
-		
-		//leo el canal
-		readChannel(song, track);
-		
-		//leo la cantidad de compases
-		int measureCount = song.countMeasureHeaders();
-		
-		//leo los compases
-		TGMeasure lastMeasure = null;
-		for(int i = 0;i < measureCount;i++){
-			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
-			track.addMeasure(measure);
-			lastMeasure = measure;
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readByte();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString(i + 1));
-		}
-		
-		//leo el offset
-		track.setOffset(TGTrack.MIN_OFFSET + readByte());
-		
-		//leo el color
-		readRGBColor(track.getColor());
-		
-		//leo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			readLyrics(track.getLyrics());
-		}
-		
-		return track;
-	}
-	
-	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
-		int header = readHeader();
-		
-		TGMeasureHeader measureHeader = this.factory.newHeader();
-		measureHeader.setNumber(number);
-		measureHeader.setStart(start);
-		
-		//leo el time signature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			readTimeSignature(measureHeader.getTimeSignature());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
-		}
-		
-		//leo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			readTempo(measureHeader.getTempo());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
-		}
-		
-		//leo el comienzo de la repeticion
-		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
-		
-		//leo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			 measureHeader.setRepeatClose(readShort());
-		}
-		
-		//leo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			 measureHeader.setRepeatAlternative(readByte());
-		}
-		
-		//leo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			measureHeader.setMarker(readMarker(number));
-		}
-		
-		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			measureHeader.setTripletFeel(readByte());
-		}
-		
-		return measureHeader;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
-		int header = readHeader();
-		
-		TGMeasure measure = this.factory.newMeasure(measureHeader);
-		TGBeatData data = new TGBeatData(measure);
-		
-		//leo la los beats
-		readBeats(measure, data);
-		
-		//leo la clave
-		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
-		if(((header & MEASURE_CLEF) != 0)){
-			measure.setClef(readByte());
-		}
-		
-		//leo el key signature
-		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			measure.setKeySignature(readByte());
-		}
-		
-		return measure;
-	}
-	
-	private void readChannel(TGSong song, TGTrack track){
-		int header = readHeader();
-		
-		TGChannel channel = this.factory.newChannel();
-		
-		//leo el canal
-		channel.setChannel(readByte());
-		
-		//leo el canal de efectos
-		channel.setEffectChannel(readByte());
-		
-		//leo el instrumento
-		channel.setProgram(readByte());
-		
-		//leo el volumen
-		channel.setVolume(readByte());
-		
-		//leo el balance
-		channel.setBalance(readByte());
-		
-		//leo el chorus
-		channel.setChorus(readByte());
-		
-		//leo el reverb
-		channel.setReverb(readByte());
-		
-		//leo el phaser
-		channel.setPhaser(readByte());
-		
-		//leo el tremolo
-		channel.setTremolo(readByte());
-		
-		//leo el solo
-		track.setSolo((header & CHANNEL_SOLO) != 0);
-		
-		//leo el mute
-		track.setMute((header & CHANNEL_MUTE) != 0);
-		
-		//------------------------------------------//
-		for( int i = 0 ; i < song.countChannels() ; i ++ ){
-			TGChannel channelAux = song.getChannel(i);
-			if( channelAux.getChannel() == channel.getChannel() ){
-				channel.setChannelId(channelAux.getChannelId());
-			}
-		}
-		if( channel.getChannelId() <= 0 ){
-			channel.setChannelId( song.countChannels() + 1 );
-			channel.setName(("#" + channel.getChannelId()));
-			song.addChannel(channel);
-		}
-		track.setChannelId(channel.getChannelId());
-	}
-	
-	private void readBeats(TGMeasure measure,TGBeatData data){
-		int header = BEAT_HAS_NEXT;
-		while(((header & BEAT_HAS_NEXT) != 0)){
-			header = readHeader();
-			readBeat(header, measure, data);
-		}
-	}
-	
-	private void readBeat(int header, TGMeasure measure,TGBeatData data){
-		TGBeat beat = this.factory.newBeat();
-		TGVoice voice = beat.getVoice(0);
-		
-		beat.setStart(data.getStart());
-		voice.setEmpty( false );
-		
-		//leo la duracion
-		if(((header & BEAT_NEXT_DURATION) != 0)){
-			readDuration(data.getDuration());
-		}
-		
-		//leo las notas
-		if(((header & BEAT_HAS_NOTES) != 0)){
-			readNotes(beat, data);
-		}
-		
-		//leo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			readChord(beat);
-		}
-		
-		//leo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			readText(beat);
-		}
-		
-		data.getDuration().copy(voice.getDuration());
-		
-		measure.addBeat(beat);
-		
-		data.setStart(data.getStart() + data.getDuration().getTime());
-	}
-	
-	private void readNotes(TGBeat beat,TGBeatData data){
-		int header = NOTE_HAS_NEXT;
-		while(((header & NOTE_HAS_NEXT) != 0)){
-			header = readHeader();
-			readNote(header, beat, data);
-		}
-	}
-	
-	private void readNote(int header,TGBeat beat,TGBeatData data){
-		TGNote note = this.factory.newNote();
-		TGVoice voice = beat.getVoice(0);
-		
-		//leo el valor
-		note.setValue(readByte());
-		
-		//leo la cuerda
-		note.setString(readByte());
-		
-		//leo la ligadura
-		note.setTiedNote((header & NOTE_TIED) != 0);
-		
-		//leo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			data.setVelocity(readByte());
-		}
-		note.setVelocity(data.getVelocity());
-		
-		//leo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			readNoteEffect(note.getEffect());
-		}
-		
-		voice.addNote(note);
-	}
-	
-	private void readChord(TGBeat beat){
-		TGChord chord = this.factory.newChord(readByte());
-		
-		//leo el nombre
-		chord.setName( readUnsignedByteString() );
-		
-		//leo el primer fret
-		chord.setFirstFret(readByte());
-		
-		//leo las cuerdas
-		for(int string = 0; string < chord.countStrings(); string ++){
-			chord.addFretValue(string, readByte());
-		}
-		beat.setChord(chord);
-	}
-	
-	private void readText(TGBeat beat){
-		TGText text = this.factory.newText();
-		
-		//leo el texto
-		text.setValue(readUnsignedByteString());
-		
-		beat.setText(text);
-	}
-	
-	private TGString readInstrumentString(int number){
-		TGString string = this.factory.newString();
-		
-		string.setNumber(number);
-		
-		//leo el valor
-		string.setValue(readByte());
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readShort());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readByte());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		int header = readHeader();
-		
-		// leo el puntillo
-		duration.setDotted((header & DURATION_DOTTED) != 0);
-		
-		//leo el doble puntillo
-		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
-		
-		//leo el valor
-		duration.setValue(readByte());
-		
-		//leo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLE) != 0)){
-			readDivisionType(duration.getDivision());
-		}
-		else{
-			TGDivisionType.NORMAL.copy(duration.getDivision());
-		}
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readByte());
-		
-		//leo los tiempos
-		divisionType.setTimes(readByte());
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		int header = readHeader(3);
-		
-		//leo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			effect.setBend(readBendEffect());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			effect.setTremoloBar(readTremoloBarEffect());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			effect.setHarmonic(readHarmonicEffect());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			effect.setGrace(readGraceEffect());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			effect.setTrill(readTrillEffect());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			effect.setTremoloPicking(readTremoloPickingEffect());
-		}
-		
-		//vibrato
-		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
-		
-		//dead note
-		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
-		
-		//slide
-		effect.setSlide(((header & EFFECT_SLIDE) != 0));
-		
-		//hammer-on/pull-off
-		effect.setHammer(((header & EFFECT_HAMMER) != 0));
-		
-		//ghost note
-		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
-		
-		//accentuated note
-		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
-		
-		//heavy accentuated note
-		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
-		
-		//palm mute
-		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
-		
-		//staccato
-		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
-		
-		//tapping
-		effect.setTapping(((header & EFFECT_TAPPING) != 0));
-		
-		//slapping
-		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
-		
-		//popping
-		effect.setPopping(((header & EFFECT_POPPING) != 0));
-		
-		//fade in
-		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value = readByte();
-			
-			//agrego el punto
-			bend.addPoint(position,value);
-		}
-		return bend;
-	}
-	
-	private TGEffectTremoloBar readTremoloBarEffect(){
-		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
-			
-			//agrego el punto
-			tremoloBar.addPoint(position,value);
-		}
-		return tremoloBar;
-	}
-	
-	private TGEffectHarmonic readHarmonicEffect(){
-		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
-		
-		//leo el tipo
-		effect.setType(readByte());
-		
-		//leo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			effect.setData(readByte());
-		}
-		return effect;
-	}
-	
-	private TGEffectGrace readGraceEffect(){
-		int header = readHeader();
-		
-		TGEffectGrace effect = this.factory.newEffectGrace();
-		
-		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
-		
-		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.setDuration(readByte());
-		
-		//leo el velocity
-		effect.setDynamic(readByte());
-		
-		//leo la transicion
-		effect.setTransition(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTremoloPicking readTremoloPickingEffect(){
-		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTrill readTrillEffect(){
-		TGEffectTrill effect = this.factory.newEffectTrill();
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGMarker readMarker(int measure){
-		TGMarker marker = this.factory.newMarker();
-		
-		marker.setMeasure(measure);
-		
-		//leo el titulo
-		marker.setTitle(readUnsignedByteString());
-		
-		//leo el color
-		readRGBColor(marker.getColor());
-		
-		return marker;
-	}
-	
-	private void readRGBColor(TGColor color){
-		//leo el RGB
-		color.setR((readByte() & 0xff));
-		color.setG((readByte() & 0xff));
-		color.setB((readByte() & 0xff));
-	}
-	
-	private void readLyrics(TGLyric lyrics){
-		//leo el compas de comienzo
-		lyrics.setFrom(readShort());
-		
-		//leo el texto
-		lyrics.setLyrics(readIntegerString());
-	}
-	
-	private byte readByte(){
-		try {
-			return (byte)this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(int bCount){
-		int header = 0;
-		for(int i = bCount; i > 0; i --){
-			header += ( readHeader() << ( (8 * i) - 8 ) );
-		}
-		return header;
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readUnsignedByteString(){
-		try {
-			return readString( (this.dataInputStream.read() & 0xFF ));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readIntegerString(){
-		try {
-			return readString(this.dataInputStream.readInt());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readString(int length){
-		try {
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java
deleted file mode 100644
index 0eda77c5..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v10;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGLocalFileExporter;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.managers.TGSongManager;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGOutputStream extends TGStream implements TGLocalFileExporter{
-	
-	private TGFactory factory;
-	private TGChannel channelAux;
-	private DataOutputStream dataOutputStream;
-	
-	public boolean isSupportedExtension(String extension) {
-		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
-	}
-	
-	public String getExportName(){
-		return "TuxGuitar 1.0";
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean configure(boolean setDefaults){
-		return true;
-	}
-	
-	public void init(TGFactory factory,OutputStream stream){
-		this.factory = factory;
-		this.channelAux = null;
-		this.dataOutputStream = new DataOutputStream(stream);
-	}
-	
-	public void exportSong(TGSong song) throws TGFileFormatException {
-		try{
-			this.writeVersion();
-			this.write(song);
-			this.dataOutputStream.flush();
-			this.dataOutputStream.close();
-		}catch( Throwable throwable){
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void writeVersion(){
-		writeUnsignedByteString(TG_FORMAT_VERSION);
-	}
-	
-	private void write(TGSong song){
-		//escribo el nombre
-		writeUnsignedByteString(song.getName());
-		
-		//escribo el artista
-		writeUnsignedByteString(song.getArtist());
-		
-		//escribo el album
-		writeUnsignedByteString(song.getAlbum());
-		
-		//escribo el autor
-		writeUnsignedByteString(song.getAuthor());
-		
-		//escribo la cantidad de measure headers 
-		writeShort((short)song.countMeasureHeaders());
-		
-		//escribo las pistas
-		TGMeasureHeader lastHeader = null;
-		Iterator headers = song.getMeasureHeaders();
-		while(headers.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)headers.next();
-			writeMeasureHeader(header,lastHeader);
-			lastHeader = header;
-		}
-		
-		//escribo la cantidad de pistas
-		writeByte(song.countTracks());
-		
-		//escribo las pistas
-		for(int i = 0;i < song.countTracks();i++){
-			TGTrack track = song.getTrack(i);
-			writeTrack(track);
-		}
-	}
-	
-	private void writeTrack(TGTrack track){
-		//header
-		int header = 0;
-		if(!track.getLyrics().isEmpty()){
-			header |= TRACK_LYRICS;
-		}
-		writeHeader(header);
-		
-		//escribo el nombre
-		writeUnsignedByteString(track.getName());
-		
-		//escribo el canal
-		writeChannel(track);
-		
-		//escribo los compases
-		TGMeasure lastMeasure = null;
-		Iterator measures  = track.getMeasures();
-		while(measures.hasNext()){
-			TGMeasure measure = (TGMeasure)measures.next();
-			writeMeasure(measure,lastMeasure);
-			lastMeasure = measure;
-		}
-		
-		//escribo la cantidad de cuerdas 
-		writeByte(track.getStrings().size());
-		
-		//escribo las cuerdas
-		Iterator stringIt  = track.getStrings().iterator();
-		while(stringIt.hasNext()){
-			TGString string = (TGString)stringIt.next();
-			writeInstrumentString(string);
-		}
-		
-		//escribo el offset
-		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
-		
-		//escribo el color
-		writeRGBColor(track.getColor());
-		
-		//escribo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			writeLyrics(track.getLyrics());
-		}
-	}
-	
-	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
-		int header = 0;
-		if(lastMeasureHeader == null){
-			header |= MEASURE_HEADER_TIMESIGNATURE;
-			header |= MEASURE_HEADER_TEMPO;
-			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}else{
-			//Time Signature
-			int numerator = measureheader.getTimeSignature().getNumerator();
-			int value = measureheader.getTimeSignature().getDenominator().getValue();
-			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
-			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
-			if(numerator != prevNumerator || value != prevValue){
-				header |= MEASURE_HEADER_TIMESIGNATURE;
-			}
-			//Tempo
-			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
-				header |= MEASURE_HEADER_TEMPO;
-			}
-			//Triplet Feel
-			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}
-		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
-		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
-		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
-		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
-		
-		writeHeader(header);
-		
-		//escribo el timeSignature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			writeTimeSignature(measureheader.getTimeSignature());
-		}
-		
-		//escribo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			writeTempo(measureheader.getTempo());
-		}
-		
-		//escribo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			writeShort((short)measureheader.getRepeatClose());
-		}
-		
-		//escribo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			writeByte(measureheader.getRepeatAlternative());
-		}
-		
-		//escribo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			writeMarker(measureheader.getMarker());
-		}
-		
-		//escribo el triplet feel
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			writeByte(measureheader.getTripletFeel());
-		}
-	}
-	
-	private void writeMeasure(TGMeasure srcMeasure,TGMeasure lastMeasure){
-		TGMeasure measure = new TGVoiceJoiner(new TGFactory(),srcMeasure).process();
-		
-		int header = 0;
-		if(lastMeasure == null){
-			header |= MEASURE_CLEF;
-			header |= MEASURE_KEYSIGNATURE;
-		}else{
-			//Clef
-			if(measure.getClef() != lastMeasure.getClef()){
-				header |= MEASURE_CLEF;
-			}
-			//KeySignature
-			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
-				header |= MEASURE_KEYSIGNATURE;
-			}
-		}
-		//escribo la cabecera
-		writeHeader(header);
-		
-		//escribo los beats
-		TGBeatData data = new TGBeatData(measure);
-		writeBeats(measure, data);
-		
-		//escribo la clave
-		if(((header & MEASURE_CLEF) != 0)){
-			writeByte(measure.getClef());
-		}
-		
-		//escribo el key signature
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			writeByte(measure.getKeySignature());
-		}
-	}
-	
-	private void writeChannel(TGTrack track){
-		int header = 0;
-		header = (track.isSolo())?header |= CHANNEL_SOLO:header;
-		header = (track.isMute())?header |= CHANNEL_MUTE:header;
-		writeHeader(header);
-		
-		TGChannel channel = getChannel(track.getSong(), track);
-		
-		//escribo el canal
-		writeByte(channel.getChannel());
-		
-		//escribo el canal de efectos
-		writeByte(channel.getEffectChannel());
-		
-		//escribo el instrumento
-		writeByte(channel.getProgram());
-		
-		//escribo el volumen
-		writeByte(channel.getVolume());
-		
-		//escribo el balance
-		writeByte(channel.getBalance());
-		
-		//escribo el chorus
-		writeByte(channel.getChorus());
-		
-		//escribo el reverb
-		writeByte(channel.getReverb());
-		
-		//escribo el phaser
-		writeByte(channel.getPhaser());
-		
-		//escribo el tremolo
-		writeByte(channel.getTremolo());
-	}
-	
-	private void writeBeats(TGMeasure measure,TGBeatData data){
-		int count = measure.countBeats();
-		for(int i = 0; i < count; i ++){
-			TGBeat beat = measure.getBeat(i);
-			writeBeat(beat,data, (i + 1 < count ));
-		}
-	}
-	
-	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
-		TGVoice voice = beat.getVoice( 0 );
-		
-		int header = hasNext ? BEAT_HAS_NEXT : 0;
-		
-		//Berifico si hay cambio de duracion
-		if(!voice.getDuration().isEqual(data.getDuration())){
-			header |= BEAT_NEXT_DURATION;
-			data.setDuration(voice.getDuration());
-		}
-		
-		//Berifico si tiene notas
-		if(!beat.isRestBeat()){
-			header |= BEAT_HAS_NOTES;
-		}
-		
-		//Berifico si tiene acorde
-		if(beat.getChord() != null){
-			header |= BEAT_HAS_CHORD;
-		}
-		
-		//Berifico si tiene texto
-		if(beat.getText() != null){
-			header |= BEAT_HAS_TEXT;
-		}
-		
-		// escribo la cabecera
-		writeHeader(header);
-		
-		//escribo la duracion
-		if(((header & BEAT_NEXT_DURATION) != 0)){
-			writeDuration(voice.getDuration());
-		}
-		
-		//escribo las notas
-		if(((header & BEAT_HAS_NOTES) != 0)){
-			writeNotes(voice, data);
-		}
-		
-		//escribo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			writeChord(beat.getChord());
-		}
-		
-		//escribo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			writeText(beat.getText());
-		}
-	}
-	
-	private void writeNotes(TGVoice voice,TGBeatData data){
-		for( int i = 0 ; i < voice.countNotes() ; i ++){
-			TGNote note = voice.getNote(i);
-			
-			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
-			header = (note.isTiedNote())?header |= NOTE_TIED:header;
-			if(note.getVelocity() != data.getVelocity()){
-				data.setVelocity(note.getVelocity());
-				header |= NOTE_VELOCITY;
-			}
-			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
-			
-			writeHeader(header);
-			
-			writeNote(header,note);
-		}
-	}
-	
-	private void writeNote(int header,TGNote note){
-		//escribo el valor
-		writeByte(note.getValue());
-		
-		//escribo la cuerda
-		writeByte(note.getString());
-		
-		//escribo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			writeByte(note.getVelocity());
-		}
-		
-		//escribo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			writeNoteEffect(note.getEffect());
-		}
-	}
-	
-	private void writeChord(TGChord chord){
-		//escribo la cantidad de cuerdas
-		writeByte(chord.countStrings());
-		
-		//escribo el nombre
-		writeUnsignedByteString(chord.getName());
-		
-		//escribo el primer fret
-		writeByte(chord.getFirstFret());
-		
-		//escribo el valor de cada cuerda
-		for(int string = 0; string < chord.countStrings(); string ++){
-			writeByte(chord.getFretValue(string));
-		}
-	}
-	
-	private void writeText(TGText text){
-		//escribo el texto
-		writeUnsignedByteString(text.getValue());
-	}
-	
-	private void writeInstrumentString(TGString string){
-		//escribo el valor
-		writeByte(string.getValue());
-	}
-	
-	private void writeTempo(TGTempo tempo){
-		//escribo el valor
-		writeShort((short)tempo.getValue());
-	}
-	
-	private void writeTimeSignature(TGTimeSignature timeSignature){
-		//escribo el numerador
-		writeByte(timeSignature.getNumerator());
-		
-		//escribo el denominador
-		writeDuration(timeSignature.getDenominator());
-	}
-	
-	private void writeDuration(TGDuration duration){
-		int header = 0;
-		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
-		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
-		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLE:header;
-		writeHeader(header);
-		
-		//escribo el valor
-		writeByte(duration.getValue());
-		
-		//escribo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLE) != 0)){
-			writeDivisionType(duration.getDivision());
-		}
-	}
-	
-	private void writeDivisionType(TGDivisionType divisionType){
-		//escribo los enters
-		writeByte(divisionType.getEnters());
-		
-		//escribo los tiempos
-		writeByte(divisionType.getTimes());
-	}
-	
-	private void writeNoteEffect(TGNoteEffect effect){
-		int header = 0;
-		
-		header = (effect.isBend())?header |= EFFECT_BEND:header;
-		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
-		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
-		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
-		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
-		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
-		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
-		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
-		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
-		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
-		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
-		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
-		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
-		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
-		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
-		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
-		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
-		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
-		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
-		
-		writeHeader(header,3);
-		
-		//escribo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			writeBendEffect(effect.getBend());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			writeTremoloBarEffect(effect.getTremoloBar());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			writeHarmonicEffect(effect.getHarmonic());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			writeGraceEffect(effect.getGrace());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			writeTrillEffect(effect.getTrill());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			writeTremoloPickingEffect(effect.getTremoloPicking());
-		}
-	}
-	
-	private void writeBendEffect(TGEffectBend effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte(point.getValue());
-		}
-	}
-	
-	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
-		}
-	}
-	
-	private void writeHarmonicEffect(TGEffectHarmonic effect){
-		//excribo el tipo
-		writeByte(effect.getType());
-		
-		//excribo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			writeByte(effect.getData());
-		}
-	}
-	
-	private void writeGraceEffect(TGEffectGrace effect){
-		int header = 0;
-		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
-		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
-		
-		//excribo el header
-		writeHeader(header);
-		
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration());
-		
-		//excribo el velocity
-		writeByte(effect.getDynamic());
-		
-		//excribo la transicion
-		writeByte(effect.getTransition());
-	}
-	
-	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeTrillEffect(TGEffectTrill effect){
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeMarker(TGMarker marker){
-		//escribo el titulo
-		writeUnsignedByteString(marker.getTitle());
-		
-		//escribo el color
-		writeRGBColor(marker.getColor());
-	}
-	
-	private void writeRGBColor(TGColor color){
-		//escribo el RGB
-		writeByte(color.getR());
-		writeByte(color.getG());
-		writeByte(color.getB());
-	}
-	
-	private void writeLyrics(TGLyric lyrics){
-		//escribo el compas de comienzo
-		writeShort((short)lyrics.getFrom());
-		
-		//escribo el texto
-		writeIntegerString(lyrics.getLyrics());
-	}
-	
-	public void writeByte(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeUnsignedByteString(String v){
-		try {
-			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
-			this.dataOutputStream.write(byteString.length());
-			this.dataOutputStream.writeChars(byteString);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeIntegerString(String v){
-		try {
-			this.dataOutputStream.writeInt(v.length());
-			this.dataOutputStream.writeChars(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v,int bCount){
-		for(int i = bCount; i > 0; i --){
-			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
-		}
-	}
-	
-	public void writeShort(short v){
-		try {
-			this.dataOutputStream.writeShort(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private TGChannel getChannel( TGSong song, TGTrack track ){
-		TGSongManager tgSongManager = new TGSongManager(this.factory);
-		tgSongManager.setSong( song );
-		
-		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
-		if( tgChannel != null ){
-			return tgChannel;
-		}
-		if( this.channelAux == null ){
-			this.channelAux = tgSongManager.createChannel();
-			if( this.channelAux.getChannel() < 0 && song.countChannels() > 0 ){
-				this.channelAux = (song.getChannel(song.countChannels() - 1));
-			}
-		}
-		return this.channelAux;
-	}
-	
-	public class TGVoiceJoiner {
-		private TGFactory factory;
-		private TGMeasure measure;
-		
-		public TGVoiceJoiner(TGFactory factory,TGMeasure measure){
-			this.factory = factory;
-			this.measure = measure.clone(factory, measure.getHeader());
-			this.measure.setTrack( measure.getTrack() );
-		}
-		
-		public TGMeasure process(){
-			this.orderBeats();
-			this.joinBeats();
-			return this.measure;
-		}
-		
-		public void joinBeats(){
-			TGBeat previous = null;
-			boolean finish = true;
-			
-			long measureStart = this.measure.getStart();
-			long measureEnd = (measureStart + this.measure.getLength());
-			for(int i = 0;i < this.measure.countBeats();i++){
-				TGBeat beat = this.measure.getBeat( i );
-				TGVoice voice = beat.getVoice(0);
-				for(int v = 1; v < beat.countVoices(); v++ ){
-					TGVoice currentVoice = beat.getVoice(v);
-					if(!currentVoice.isEmpty()){
-						for(int n = 0 ; n < currentVoice.countNotes() ; n++ ){
-							TGNote note = currentVoice.getNote( n );
-							voice.addNote( note );
-						}
-					}
-				}
-				if( voice.isEmpty() ){
-					this.measure.removeBeat(beat);
-					finish = false;
-					break;
-				}
-				
-				long beatStart = beat.getStart();
-				if(previous != null){
-					long previousStart = previous.getStart();
-					
-					TGDuration previousBestDuration = null;
-					for(int v = /*1*/0; v < previous.countVoices(); v++ ){
-						TGVoice previousVoice = previous.getVoice(v);
-						if(!previousVoice.isEmpty()){
-							long length = previousVoice.getDuration().getTime();
-							if( (previousStart + length) <= beatStart){
-								if( previousBestDuration == null || length > previousBestDuration.getTime() ){
-									previousBestDuration = previousVoice.getDuration();
-								}
-							}
-						}
-					}
-					
-					if(previousBestDuration != null){
-						previousBestDuration.copy( previous.getVoice(0).getDuration() );
-					}else{
-						if(voice.isRestVoice()){
-							this.measure.removeBeat(beat);
-							finish = false;
-							break;
-						}
-						TGDuration duration = TGDuration.fromTime(this.factory, (beatStart - previousStart) );
-						duration.copy( previous.getVoice(0).getDuration() );
-					}
-				}
-				
-				TGDuration beatBestDuration = null;
-				for(int v = /*1*/0; v < beat.countVoices(); v++ ){
-					TGVoice currentVoice = beat.getVoice(v);
-					if(!currentVoice.isEmpty()){
-						long length = currentVoice.getDuration().getTime();
-						if( (beatStart + length) <= measureEnd ){
-							if( beatBestDuration == null || length > beatBestDuration.getTime() ){
-								beatBestDuration = currentVoice.getDuration();
-							}
-						}
-					}
-				}
-				
-				if(beatBestDuration == null){
-					if(voice.isRestVoice()){
-						this.measure.removeBeat(beat);
-						finish = false;
-						break;
-					}
-					TGDuration duration = TGDuration.fromTime(this.factory, (measureEnd - beatStart) );
-					duration.copy( voice.getDuration() );
-				}
-				previous = beat;
-			}
-			if(!finish){
-				joinBeats();
-			}
-		}
-		
-		public void orderBeats(){
-			for(int i = 0;i < this.measure.countBeats();i++){
-				TGBeat minBeat = null;
-				for(int j = i;j < this.measure.countBeats();j++){
-					TGBeat beat = this.measure.getBeat(j);
-					if(minBeat == null || beat.getStart() < minBeat.getStart()){
-						minBeat = beat;
-					}
-				}
-				this.measure.moveBeat(i, minBeat);
-			}
-		}
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGStream.java
deleted file mode 100644
index 65da0044..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v10/TGStream.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.herac.tuxguitar.io.tg.v10;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGVelocities;
-import org.herac.tuxguitar.util.TGVersion;
-
-public class TGStream {
-	
-	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
-	
-	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + new TGVersion(1,0,0).getVersion() );
-	
-	public static final String TG_FORMAT_EXTENSION = (".tg");
-	
-	protected static final int TRACK_LYRICS = 0x01;
-	
-	protected static final int CHANNEL_SOLO = 0x01;
-	
-	protected static final int CHANNEL_MUTE = 0x02;
-	
-	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
-	
-	protected static final int MEASURE_HEADER_TEMPO = 0x02;
-	
-	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
-	
-	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
-	
-	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
-	
-	protected static final int MEASURE_HEADER_MARKER = 0x20;
-	
-	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
-	
-	protected static final int MEASURE_CLEF = 0x01;
-	
-	protected static final int MEASURE_KEYSIGNATURE = 0x02;
-	
-	protected static final int BEAT_HAS_NEXT = 0x01;
-	
-	protected static final int BEAT_NEXT_DURATION = 0x02;
-	
-	protected static final int BEAT_HAS_NOTES = 0x04;
-	
-	protected static final int BEAT_HAS_CHORD = 0x08;
-	
-	protected static final int BEAT_HAS_TEXT = 0x10;
-	
-	protected static final int NOTE_HAS_NEXT = 0x01;
-	
-	protected static final int NOTE_TIED = 0x02;
-	
-	protected static final int NOTE_EFFECT = 0x04;
-	
-	protected static final int NOTE_VELOCITY = 0x08;
-	
-	protected static final int DURATION_DOTTED = 0x01;
-	
-	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
-	
-	protected static final int DURATION_NO_TUPLE = 0x04;
-	
-	protected static final int EFFECT_BEND = 0x01;
-	
-	protected static final int EFFECT_TREMOLO_BAR = 0x02;
-	
-	protected static final int EFFECT_HARMONIC = 0x04;
-	
-	protected static final int EFFECT_GRACE = 0x08;
-	
-	protected static final int EFFECT_TRILL = 0x010;
-	
-	protected static final int EFFECT_TREMOLO_PICKING = 0x020;
-	
-	protected static final int EFFECT_VIBRATO = 0x040;
-	
-	protected static final int EFFECT_DEAD = 0x080;
-	
-	protected static final int EFFECT_SLIDE = 0x0100;
-	
-	protected static final int EFFECT_HAMMER = 0x0200;
-	
-	protected static final int EFFECT_GHOST = 0x0400;
-	
-	protected static final int EFFECT_ACCENTUATED = 0x0800;
-	
-	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x01000;
-	
-	protected static final int EFFECT_PALM_MUTE = 0x02000;
-	
-	protected static final int EFFECT_STACCATO = 0x04000;
-	
-	protected static final int EFFECT_TAPPING = 0x08000;
-	
-	protected static final int EFFECT_SLAPPING = 0x010000;
-	
-	protected static final int EFFECT_POPPING = 0x020000;
-	
-	protected static final int EFFECT_FADE_IN = 0x040000;
-	
-	protected static final int GRACE_FLAG_DEAD = 0x01;
-	
-	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
-	
-	protected class TGBeatData {
-		private long start;
-		private int velocity;
-		private TGDuration duration;
-		
-		protected TGBeatData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.setStart(measure.getStart());
-			this.setVelocity(TGVelocities.DEFAULT);
-			this.setDuration(new TGFactory().newDuration());
-		}
-		
-		public TGDuration getDuration() {
-			return this.duration;
-		}
-		
-		public void setDuration(TGDuration duration) {
-			this.duration = duration;
-		}
-		
-		public long getStart() {
-			return this.start;
-		}
-		
-		public void setStart(long start) {
-			this.start = start;
-		}
-		
-		public int getVelocity() {
-			return this.velocity;
-		}
-		
-		public void setVelocity(int velocity) {
-			this.velocity = velocity;
-		}
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGInputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGInputStream.java
deleted file mode 100644
index 30b6e89d..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGInputStream.java
+++ /dev/null
@@ -1,764 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v11;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream extends TGStream implements TGInputStreamBase{
-	
-	private DataInputStream dataInputStream;
-	private String version;
-	private TGFactory factory;
-	
-	public TGInputStream() {
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_FORMAT_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Throwable throwable){
-			return false;
-		}
-	}
-	
-	public TGSong readSong() throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		} catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readUnsignedByteString();
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readUnsignedByteString());
-		
-		//leo el artista
-		song.setArtist(readUnsignedByteString());
-		
-		//leo el album
-		song.setAlbum(readUnsignedByteString());
-		
-		//leo el autor
-		song.setAuthor(readUnsignedByteString());
-		
-		//leo la cantidad de measure headers
-		int headerCount = readShort();
-		
-		//leo las pistas
-		TGMeasureHeader lastHeader = null;
-		long headerStart = TGDuration.QUARTER_TIME;
-		for(int i = 0;i < headerCount;i++){
-			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
-			song.addMeasureHeader(header);
-			headerStart += header.getLength();
-			lastHeader = header;
-		}
-		
-		//leo la cantidad de pistas
-		int trackCount = readByte();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(i + 1,song));
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(int number,TGSong song){
-		//header
-		int header = readHeader();
-		
-		TGTrack track = this.factory.newTrack();
-		
-		track.setNumber(number);
-		
-		//leo el nombre
-		track.setName(readUnsignedByteString());
-		
-		//leo el solo
-		track.setSolo((header & TRACK_SOLO) != 0);
-		
-		//leo el mute
-		track.setMute((header & TRACK_MUTE) != 0);
-		
-		//leo el canal
-		readChannel(song, track);
-		
-		//leo la cantidad de compases
-		int measureCount = song.countMeasureHeaders();
-		
-		//leo los compases
-		TGMeasure lastMeasure = null;
-		for(int i = 0;i < measureCount;i++){
-			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
-			track.addMeasure(measure);
-			lastMeasure = measure;
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readByte();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString(i + 1));
-		}
-		
-		//leo el offset
-		track.setOffset(TGTrack.MIN_OFFSET + readByte());
-		
-		//leo el color
-		readRGBColor(track.getColor());
-		
-		//leo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			readLyrics(track.getLyrics());
-		}
-		
-		return track;
-	}
-	
-	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
-		int header = readHeader();
-		
-		TGMeasureHeader measureHeader = this.factory.newHeader();
-		measureHeader.setNumber(number);
-		measureHeader.setStart(start);
-		
-		//leo el time signature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			readTimeSignature(measureHeader.getTimeSignature());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
-		}
-		
-		//leo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			readTempo(measureHeader.getTempo());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
-		}
-		
-		//leo el comienzo de la repeticion
-		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
-		
-		//leo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			 measureHeader.setRepeatClose(readShort());
-		}
-		
-		//leo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			 measureHeader.setRepeatAlternative(readByte());
-		}
-		
-		//leo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			measureHeader.setMarker(readMarker(number));
-		}
-		
-		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			measureHeader.setTripletFeel(readByte());
-		}
-		
-		return measureHeader;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
-		int header = readHeader();
-		
-		TGMeasure measure = this.factory.newMeasure(measureHeader);
-		TGBeatData data = new TGBeatData(measure);
-		
-		//leo la los beats
-		readBeats(measure, data);
-		
-		//leo la clave
-		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
-		if(((header & MEASURE_CLEF) != 0)){
-			measure.setClef(readByte());
-		}
-		
-		//leo el key signature
-		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			measure.setKeySignature(readByte());
-		}
-		
-		return measure;
-	}
-	
-	private void readChannel(TGSong song, TGTrack track){
-		TGChannel channel = this.factory.newChannel();
-		
-		//leo el canal
-		channel.setChannel(readByte());
-		
-		//leo el canal de efectos
-		channel.setEffectChannel(readByte());
-		
-		//leo el instrumento
-		channel.setProgram(readByte());
-		
-		//leo el volumen
-		channel.setVolume(readByte());
-		
-		//leo el balance
-		channel.setBalance(readByte());
-		
-		//leo el chorus
-		channel.setChorus(readByte());
-		
-		//leo el reverb
-		channel.setReverb(readByte());
-		
-		//leo el phaser
-		channel.setPhaser(readByte());
-		
-		//leo el tremolo
-		channel.setTremolo(readByte());
-		
-		//------------------------------------------//
-		for( int i = 0 ; i < song.countChannels() ; i ++ ){
-			TGChannel channelAux = song.getChannel(i);
-			if( channelAux.getChannel() == channel.getChannel() ){
-				channel.setChannelId(channelAux.getChannelId());
-			}
-		}
-		if( channel.getChannelId() <= 0 ){
-			channel.setChannelId( song.countChannels() + 1 );
-			channel.setName(("#" + channel.getChannelId()));
-			song.addChannel(channel);
-		}
-		track.setChannelId(channel.getChannelId());
-	}
-	
-	private void readBeats(TGMeasure measure,TGBeatData data){
-		int header = BEAT_HAS_NEXT;
-		while(((header & BEAT_HAS_NEXT) != 0)){
-			header = readHeader();
-			readBeat(header, measure, data);
-		}
-	}
-	
-	private void readBeat(int header, TGMeasure measure,TGBeatData data){
-		TGBeat beat = this.factory.newBeat();
-		
-		beat.setStart(data.getCurrentStart());
-		
-		readVoices(header, beat, data);
-		
-		//leo el stroke
-		if(((header & BEAT_HAS_STROKE) != 0)){
-			readStroke(beat.getStroke());
-		}
-		
-		//leo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			readChord(beat);
-		}
-		
-		//leo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			readText(beat);
-		}
-		
-		measure.addBeat(beat);
-	}
-	
-	private void readVoices(int header, TGBeat beat, TGBeatData data){
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			
-			beat.getVoice(i).setEmpty(true);
-			
-			if(((header & (BEAT_HAS_VOICE << shift)) != 0)){
-				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
-					data.getVoice(i).setFlags( readHeader() );
-				}
-				
-				int flags = data.getVoice(i).getFlags();
-				
-				//leo la duracion
-				if(((flags & VOICE_NEXT_DURATION) != 0)){
-					readDuration(data.getVoice(i).getDuration());
-				}
-				
-				//leo las notas
-				if(((flags & VOICE_HAS_NOTES) != 0)){
-					readNotes(beat.getVoice(i), data);
-				}
-				
-				//leo la direccion
-				if(((flags & VOICE_DIRECTION_UP) != 0)){
-					beat.getVoice(i).setDirection( TGVoice.DIRECTION_UP );
-				}
-				else if(((flags & VOICE_DIRECTION_DOWN) != 0)){
-					beat.getVoice(i).setDirection( TGVoice.DIRECTION_DOWN );
-				}
-				data.getVoice(i).getDuration().copy(beat.getVoice(i).getDuration());
-				data.getVoice(i).setStart(data.getVoice(i).getStart() + beat.getVoice(i).getDuration().getTime());
-				
-				beat.getVoice(i).setEmpty(false);
-			}
-		}
-	}
-	
-	private void readNotes(TGVoice voice,TGBeatData data){
-		int header = NOTE_HAS_NEXT;
-		while(((header & NOTE_HAS_NEXT) != 0)){
-			header = readHeader();
-			readNote(header, voice, data);
-		}
-	}
-	
-	private void readNote(int header,TGVoice voice,TGBeatData data){
-		TGNote note = this.factory.newNote();
-		
-		//leo el valor
-		note.setValue(readByte());
-		
-		//leo la cuerda
-		note.setString(readByte());
-		
-		//leo la ligadura
-		note.setTiedNote((header & NOTE_TIED) != 0);
-		
-		//leo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			data.getVoice(voice.getIndex()).setVelocity(readByte());
-		}
-		note.setVelocity(data.getVoice(voice.getIndex()).getVelocity());
-		
-		//leo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			readNoteEffect(note.getEffect());
-		}
-		
-		voice.addNote(note);
-	}
-	
-	private void readChord(TGBeat beat){
-		TGChord chord = this.factory.newChord(readByte());
-		
-		//leo el nombre
-		chord.setName( readUnsignedByteString() );
-		
-		//leo el primer fret
-		chord.setFirstFret(readByte());
-		
-		//leo las cuerdas
-		for(int string = 0; string < chord.countStrings(); string ++){
-			chord.addFretValue(string, readByte());
-		}
-		beat.setChord(chord);
-	}
-	
-	private void readText(TGBeat beat){
-		TGText text = this.factory.newText();
-		
-		//leo el texto
-		text.setValue(readUnsignedByteString());
-		
-		beat.setText(text);
-	}
-	
-	private TGString readInstrumentString(int number){
-		TGString string = this.factory.newString();
-		
-		string.setNumber(number);
-		
-		//leo el valor
-		string.setValue(readByte());
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readShort());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readByte());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		int header = readHeader();
-		
-		// leo el puntillo
-		duration.setDotted((header & DURATION_DOTTED) != 0);
-		
-		//leo el doble puntillo
-		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
-		
-		//leo el valor
-		duration.setValue(readByte());
-		
-		//leo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			readDivisionType(duration.getDivision());
-		}
-		else{
-			TGDivisionType.NORMAL.copy(duration.getDivision());
-		}
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readByte());
-		
-		//leo los tiempos
-		divisionType.setTimes(readByte());
-	}
-	
-	private void readStroke(TGStroke stroke){
-		//leo la direccion
-		stroke.setDirection( readByte() );
-		
-		//leo el valor
-		stroke.setValue( readByte() );
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		int header = readHeader(3);
-		
-		//leo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			effect.setBend(readBendEffect());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			effect.setTremoloBar(readTremoloBarEffect());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			effect.setHarmonic(readHarmonicEffect());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			effect.setGrace(readGraceEffect());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			effect.setTrill(readTrillEffect());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			effect.setTremoloPicking(readTremoloPickingEffect());
-		}
-		
-		//vibrato
-		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
-		
-		//dead note
-		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
-		
-		//slide
-		effect.setSlide(((header & EFFECT_SLIDE) != 0));
-		
-		//hammer-on/pull-off
-		effect.setHammer(((header & EFFECT_HAMMER) != 0));
-		
-		//ghost note
-		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
-		
-		//accentuated note
-		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
-		
-		//heavy accentuated note
-		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
-		
-		//palm mute
-		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
-		
-		//staccato
-		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
-		
-		//tapping
-		effect.setTapping(((header & EFFECT_TAPPING) != 0));
-		
-		//slapping
-		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
-		
-		//popping
-		effect.setPopping(((header & EFFECT_POPPING) != 0));
-		
-		//fade in
-		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value = readByte();
-			
-			//agrego el punto
-			bend.addPoint(position,value);
-		}
-		return bend;
-	}
-	
-	private TGEffectTremoloBar readTremoloBarEffect(){
-		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
-			
-			//agrego el punto
-			tremoloBar.addPoint(position,value);
-		}
-		return tremoloBar;
-	}
-	
-	private TGEffectHarmonic readHarmonicEffect(){
-		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
-		
-		//leo el tipo
-		effect.setType(readByte());
-		
-		//leo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			effect.setData(readByte());
-		}
-		return effect;
-	}
-	
-	private TGEffectGrace readGraceEffect(){
-		int header = readHeader();
-		
-		TGEffectGrace effect = this.factory.newEffectGrace();
-		
-		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
-		
-		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.setDuration(readByte());
-		
-		//leo el velocity
-		effect.setDynamic(readByte());
-		
-		//leo la transicion
-		effect.setTransition(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTremoloPicking readTremoloPickingEffect(){
-		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTrill readTrillEffect(){
-		TGEffectTrill effect = this.factory.newEffectTrill();
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGMarker readMarker(int measure){
-		TGMarker marker = this.factory.newMarker();
-		
-		marker.setMeasure(measure);
-		
-		//leo el titulo
-		marker.setTitle(readUnsignedByteString());
-		
-		//leo el color
-		readRGBColor(marker.getColor());
-		
-		return marker;
-	}
-	
-	private void readRGBColor(TGColor color){
-		//leo el RGB
-		color.setR((readByte() & 0xff));
-		color.setG((readByte() & 0xff));
-		color.setB((readByte() & 0xff));
-	}
-	
-	private void readLyrics(TGLyric lyrics){
-		//leo el compas de comienzo
-		lyrics.setFrom(readShort());
-		
-		//leo el texto
-		lyrics.setLyrics(readIntegerString());
-	}
-	
-	private byte readByte(){
-		try {
-			return (byte)this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(int bCount){
-		int header = 0;
-		for(int i = bCount; i > 0; i --){
-			header += ( readHeader() << ( (8 * i) - 8 ) );
-		}
-		return header;
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readUnsignedByteString(){
-		try {
-			return readString( (this.dataInputStream.read() & 0xFF ));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readIntegerString(){
-		try {
-			return readString(this.dataInputStream.readInt());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readString(int length){
-		try {
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java
deleted file mode 100644
index a7ea146f..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java
+++ /dev/null
@@ -1,727 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v11;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGLocalFileExporter;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.managers.TGSongManager;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGOutputStream extends TGStream implements TGLocalFileExporter{
-	
-	private TGFactory factory;
-	private TGChannel channelAux;
-	private DataOutputStream dataOutputStream;
-	
-	public boolean isSupportedExtension(String extension) {
-		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
-	}
-	
-	public String getExportName(){
-		return "TuxGuitar 1.1";
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean configure(boolean setDefaults){
-		return true;
-	}
-	
-	public void init(TGFactory factory,OutputStream stream){
-		this.factory = factory;
-		this.channelAux = null;
-		this.dataOutputStream = new DataOutputStream(stream);
-	}
-	
-	public void exportSong(TGSong song) throws TGFileFormatException {
-		try{
-			this.writeVersion();
-			this.write(song);
-			this.dataOutputStream.flush();
-			this.dataOutputStream.close();
-		}catch( Throwable throwable){
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void writeVersion(){
-		writeUnsignedByteString(TG_FORMAT_VERSION);
-	}
-	
-	private void write(TGSong song){
-		//escribo el nombre
-		writeUnsignedByteString(song.getName());
-		
-		//escribo el artista
-		writeUnsignedByteString(song.getArtist());
-		
-		//escribo el album
-		writeUnsignedByteString(song.getAlbum());
-		
-		//escribo el autor
-		writeUnsignedByteString(song.getAuthor());
-		
-		//escribo la cantidad de measure headers 
-		writeShort((short)song.countMeasureHeaders());
-		
-		//escribo las pistas
-		TGMeasureHeader lastHeader = null;
-		Iterator headers = song.getMeasureHeaders();
-		while(headers.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)headers.next();
-			writeMeasureHeader(header,lastHeader);
-			lastHeader = header;
-		}
-		
-		//escribo la cantidad de pistas
-		writeByte(song.countTracks());
-		
-		//escribo las pistas
-		for(int i = 0;i < song.countTracks();i++){
-			TGTrack track = song.getTrack(i);
-			writeTrack(track);
-		}
-	}
-	
-	private void writeTrack(TGTrack track){
-		//header
-		int header = 0;
-		if (track.isSolo()) {
-			header |= TRACK_SOLO;
-		}
-		if (track.isMute()) {
-			header |= TRACK_MUTE;
-		}
-		if(!track.getLyrics().isEmpty()){
-			header |= TRACK_LYRICS;
-		}
-		writeHeader(header);
-		
-		//escribo el nombre
-		writeUnsignedByteString(track.getName());
-		
-		//escribo el canal
-		writeChannel(getChannel(track.getSong(), track));
-		
-		//escribo los compases
-		TGMeasure lastMeasure = null;
-		Iterator measures  = track.getMeasures();
-		while(measures.hasNext()){
-			TGMeasure measure = (TGMeasure)measures.next();
-			writeMeasure(measure,lastMeasure);
-			lastMeasure = measure;
-		}
-		
-		//escribo la cantidad de cuerdas 
-		writeByte(track.getStrings().size());
-		
-		//escribo las cuerdas
-		Iterator stringIt  = track.getStrings().iterator();
-		while(stringIt.hasNext()){
-			TGString string = (TGString)stringIt.next();
-			writeInstrumentString(string);
-		}
-		
-		//escribo el offset
-		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
-		
-		//escribo el color
-		writeRGBColor(track.getColor());
-		
-		//escribo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			writeLyrics(track.getLyrics());
-		}
-	}
-	
-	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
-		int header = 0;
-		if(lastMeasureHeader == null){
-			header |= MEASURE_HEADER_TIMESIGNATURE;
-			header |= MEASURE_HEADER_TEMPO;
-			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}else{
-			//Time Signature
-			int numerator = measureheader.getTimeSignature().getNumerator();
-			int value = measureheader.getTimeSignature().getDenominator().getValue();
-			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
-			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
-			if(numerator != prevNumerator || value != prevValue){
-				header |= MEASURE_HEADER_TIMESIGNATURE;
-			}
-			//Tempo
-			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
-				header |= MEASURE_HEADER_TEMPO;
-			}
-			//Triplet Feel
-			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}
-		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
-		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
-		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
-		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
-		
-		writeHeader(header);
-		
-		//escribo el timeSignature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			writeTimeSignature(measureheader.getTimeSignature());
-		}
-		
-		//escribo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			writeTempo(measureheader.getTempo());
-		}
-		
-		//escribo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			writeShort((short)measureheader.getRepeatClose());
-		}
-		
-		//escribo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			writeByte(measureheader.getRepeatAlternative());
-		}
-		
-		//escribo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			writeMarker(measureheader.getMarker());
-		}
-		
-		//escribo el triplet feel
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			writeByte(measureheader.getTripletFeel());
-		}
-	}
-	
-	private void writeMeasure(TGMeasure measure,TGMeasure lastMeasure){
-		int header = 0;
-		if(lastMeasure == null){
-			header |= MEASURE_CLEF;
-			header |= MEASURE_KEYSIGNATURE;
-		}else{
-			//Clef
-			if(measure.getClef() != lastMeasure.getClef()){
-				header |= MEASURE_CLEF;
-			}
-			//KeySignature
-			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
-				header |= MEASURE_KEYSIGNATURE;
-			}
-		}
-		//escribo la cabecera
-		writeHeader(header);
-		
-		//escribo los beats
-		TGBeatData data = new TGBeatData(measure);
-		writeBeats(measure, data);
-		
-		//escribo la clave
-		if(((header & MEASURE_CLEF) != 0)){
-			writeByte(measure.getClef());
-		}
-		
-		//escribo el key signature
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			writeByte(measure.getKeySignature());
-		}
-	}
-	
-	private void writeChannel(TGChannel channel){
-		//escribo el canal
-		writeByte(channel.getChannel());
-		
-		//escribo el canal de efectos
-		writeByte(channel.getEffectChannel());
-		
-		//escribo el instrumento
-		writeByte(channel.getProgram());
-		
-		//escribo el volumen
-		writeByte(channel.getVolume());
-		
-		//escribo el balance
-		writeByte(channel.getBalance());
-		
-		//escribo el chorus
-		writeByte(channel.getChorus());
-		
-		//escribo el reverb
-		writeByte(channel.getReverb());
-		
-		//escribo el phaser
-		writeByte(channel.getPhaser());
-		
-		//escribo el tremolo
-		writeByte(channel.getTremolo());
-	}
-	
-	private void writeBeats(TGMeasure measure,TGBeatData data){
-		int count = measure.countBeats();
-		for(int i = 0; i < count; i ++){
-			TGBeat beat = measure.getBeat(i);
-			writeBeat(beat,data, (i + 1 < count ));
-		}
-	}
-	
-	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
-		int header = hasNext ? BEAT_HAS_NEXT : 0;
-		
-		//Berifico si hay cambios en las voces
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			if(!beat.getVoice(i).isEmpty()){
-				header |= ( BEAT_HAS_VOICE << shift ); 
-				
-				int flags = ( beat.getVoice(i).isRestVoice() ? 0 : VOICE_HAS_NOTES );
-				if(!beat.getVoice(i).getDuration().isEqual(data.getVoice(i).getDuration())){
-					flags |= VOICE_NEXT_DURATION;
-					data.getVoice(i).setDuration(beat.getVoice(i).getDuration());
-				}
-				if(beat.getVoice(i).getDirection() != TGVoice.DIRECTION_NONE ){
-					if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_UP ){
-						flags |= VOICE_DIRECTION_UP;
-					}
-					else if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_DOWN ){
-						flags |= VOICE_DIRECTION_DOWN;
-					}
-				}
-				if( data.getVoice(i).getFlags() != flags ){
-					header |= ( BEAT_HAS_VOICE_CHANGES << shift ); 
-					data.getVoice(i).setFlags( flags );
-				}
-			}
-			
-		}
-		//Berifico si tiene stroke
-		if(beat.getStroke().getDirection() != TGStroke.STROKE_NONE){
-			header |= BEAT_HAS_STROKE;
-		}
-		//Berifico si tiene acorde
-		if(beat.getChord() != null){
-			header |= BEAT_HAS_CHORD;
-		}
-		//Berifico si tiene texto
-		if(beat.getText() != null){
-			header |= BEAT_HAS_TEXT;
-		}
-		
-		// escribo la cabecera
-		writeHeader(header);
-		
-		//escribo las voces
-		writeVoices(header, beat, data);
-		
-		//escribo el stroke
-		if(((header & BEAT_HAS_STROKE) != 0)){
-			writeStroke(beat.getStroke());
-		}
-		
-		//escribo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			writeChord(beat.getChord());
-		}
-		
-		//escribo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			writeText(beat.getText());
-		}
-	}
-	
-	private void writeVoices(int header, TGBeat beat,TGBeatData data){
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			if((( header & (BEAT_HAS_VOICE << shift)) != 0)){
-				
-				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
-					writeHeader( data.getVoice(i).getFlags() );
-				}
-				
-				//escribo la duracion
-				if((( data.getVoice(i).getFlags() & VOICE_NEXT_DURATION) != 0)){
-					writeDuration(beat.getVoice(i).getDuration());
-				}
-				
-				//escribo las notas
-				if((( data.getVoice(i).getFlags() & VOICE_HAS_NOTES) != 0)){
-					writeNotes(beat.getVoice(i), data);
-				}
-			}
-		}
-	}
-	
-	private void writeNotes(TGVoice voice,TGBeatData data){
-		for( int i = 0 ; i < voice.countNotes() ; i ++){
-			TGNote note = voice.getNote(i);
-			
-			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
-			header = (note.isTiedNote())?header |= NOTE_TIED:header;
-			if(note.getVelocity() != data.getVoice(voice.getIndex()).getVelocity()){
-				data.getVoice(voice.getIndex()).setVelocity(note.getVelocity());
-				header |= NOTE_VELOCITY;
-			}
-			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
-			
-			writeHeader(header);
-			
-			writeNote(header,note);
-		}
-	}
-	
-	private void writeNote(int header,TGNote note){
-		//escribo el valor
-		writeByte(note.getValue());
-		
-		//escribo la cuerda
-		writeByte(note.getString());
-		
-		//escribo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			writeByte(note.getVelocity());
-		}
-		
-		//escribo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			writeNoteEffect(note.getEffect());
-		}
-	}
-	
-	private void writeStroke(TGStroke stroke){
-		//escribo la direccion
-		writeByte(stroke.getDirection());
-		
-		//escribo el valor
-		writeByte(stroke.getValue());
-	}
-	
-	private void writeChord(TGChord chord){
-		//escribo la cantidad de cuerdas
-		writeByte(chord.countStrings());
-		
-		//escribo el nombre
-		writeUnsignedByteString(chord.getName());
-		
-		//escribo el primer fret
-		writeByte(chord.getFirstFret());
-		
-		//escribo el valor de cada cuerda
-		for(int string = 0; string < chord.countStrings(); string ++){
-			writeByte(chord.getFretValue(string));
-		}
-	}
-	
-	private void writeText(TGText text){
-		//escribo el texto
-		writeUnsignedByteString(text.getValue());
-	}
-	
-	private void writeInstrumentString(TGString string){
-		//escribo el valor
-		writeByte(string.getValue());
-	}
-	
-	private void writeTempo(TGTempo tempo){
-		//escribo el valor
-		writeShort((short)tempo.getValue());
-	}
-	
-	private void writeTimeSignature(TGTimeSignature timeSignature){
-		//escribo el numerador
-		writeByte(timeSignature.getNumerator());
-		
-		//escribo el denominador
-		writeDuration(timeSignature.getDenominator());
-	}
-	
-	private void writeDuration(TGDuration duration){
-		int header = 0;
-		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
-		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
-		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLET:header;
-		writeHeader(header);
-		
-		//escribo el valor
-		writeByte(duration.getValue());
-		
-		//escribo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			writeDivisionType(duration.getDivision());
-		}
-	}
-	
-	private void writeDivisionType(TGDivisionType divisionType){
-		//escribo los enters
-		writeByte(divisionType.getEnters());
-		
-		//escribo los tiempos
-		writeByte(divisionType.getTimes());
-	}
-	
-	private void writeNoteEffect(TGNoteEffect effect){
-		int header = 0;
-		
-		header = (effect.isBend())?header |= EFFECT_BEND:header;
-		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
-		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
-		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
-		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
-		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
-		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
-		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
-		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
-		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
-		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
-		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
-		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
-		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
-		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
-		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
-		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
-		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
-		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
-		
-		writeHeader(header,3);
-		
-		//escribo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			writeBendEffect(effect.getBend());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			writeTremoloBarEffect(effect.getTremoloBar());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			writeHarmonicEffect(effect.getHarmonic());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			writeGraceEffect(effect.getGrace());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			writeTrillEffect(effect.getTrill());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			writeTremoloPickingEffect(effect.getTremoloPicking());
-		}
-	}
-	
-	private void writeBendEffect(TGEffectBend effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte(point.getValue());
-		}
-	}
-	
-	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
-		}
-	}
-	
-	private void writeHarmonicEffect(TGEffectHarmonic effect){
-		//excribo el tipo
-		writeByte(effect.getType());
-		
-		//excribo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			writeByte(effect.getData());
-		}
-	}
-	
-	private void writeGraceEffect(TGEffectGrace effect){
-		int header = 0;
-		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
-		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
-		
-		//excribo el header
-		writeHeader(header);
-		
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration());
-		
-		//excribo el velocity
-		writeByte(effect.getDynamic());
-		
-		//excribo la transicion
-		writeByte(effect.getTransition());
-	}
-	
-	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeTrillEffect(TGEffectTrill effect){
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeMarker(TGMarker marker){
-		//escribo el titulo
-		writeUnsignedByteString(marker.getTitle());
-		
-		//escribo el color
-		writeRGBColor(marker.getColor());
-	}
-	
-	private void writeRGBColor(TGColor color){
-		//escribo el RGB
-		writeByte(color.getR());
-		writeByte(color.getG());
-		writeByte(color.getB());
-	}
-	
-	private void writeLyrics(TGLyric lyrics){
-		//escribo el compas de comienzo
-		writeShort((short)lyrics.getFrom());
-		
-		//escribo el texto
-		writeIntegerString(lyrics.getLyrics());
-	}
-	
-	public void writeByte(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeUnsignedByteString(String v){
-		try {
-			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
-			this.dataOutputStream.write(byteString.length());
-			this.dataOutputStream.writeChars(byteString);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeIntegerString(String v){
-		try {
-			this.dataOutputStream.writeInt(v.length());
-			this.dataOutputStream.writeChars(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v,int bCount){
-		for(int i = bCount; i > 0; i --){
-			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
-		}
-	}
-	
-	public void writeShort(short v){
-		try {
-			this.dataOutputStream.writeShort(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private TGChannel getChannel( TGSong song, TGTrack track ){
-		TGSongManager tgSongManager = new TGSongManager(this.factory);
-		tgSongManager.setSong( song );
-		
-		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
-		if( tgChannel != null ){
-			return tgChannel;
-		}
-		if( this.channelAux == null ){
-			this.channelAux = tgSongManager.createChannel();
-			if( this.channelAux.getChannel() < 0 && song.countChannels() > 0 ){
-				this.channelAux = (song.getChannel(song.countChannels() - 1));
-			}
-		}
-		return this.channelAux;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGStream.java
deleted file mode 100644
index 7b38ee78..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v11/TGStream.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.herac.tuxguitar.io.tg.v11;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGVelocities;
-import org.herac.tuxguitar.util.TGVersion;
-
-public class TGStream {
-	
-	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
-	
-	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + new TGVersion(1,1,0).getVersion() );
-	
-	public static final String TG_FORMAT_EXTENSION = (".tg");
-	
-	protected static final int TRACK_SOLO = 0x01;
-	
-	protected static final int TRACK_MUTE = 0x02;
-	
-	protected static final int TRACK_LYRICS = 0x04;
-	
-	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
-	
-	protected static final int MEASURE_HEADER_TEMPO = 0x02;
-	
-	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
-	
-	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
-	
-	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
-	
-	protected static final int MEASURE_HEADER_MARKER = 0x20;
-	
-	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
-	
-	protected static final int MEASURE_CLEF = 0x01;
-	
-	protected static final int MEASURE_KEYSIGNATURE = 0x02;
-	
-	protected static final int BEAT_HAS_NEXT = 0x01;
-	
-	protected static final int BEAT_HAS_STROKE = 0x02;
-	
-	protected static final int BEAT_HAS_CHORD = 0x04;
-	
-	protected static final int BEAT_HAS_TEXT = 0x08;
-	
-	protected static final int BEAT_HAS_VOICE = 0x10;
-	
-	protected static final int BEAT_HAS_VOICE_CHANGES = 0x20;
-	
-	protected static final int VOICE_HAS_NOTES = 0x01;
-	
-	protected static final int VOICE_NEXT_DURATION = 0x02;
-	
-	protected static final int VOICE_DIRECTION_UP = 0x04;
-	
-	protected static final int VOICE_DIRECTION_DOWN = 0x08;
-	
-	protected static final int NOTE_HAS_NEXT = 0x01;
-	
-	protected static final int NOTE_TIED = 0x02;
-	
-	protected static final int NOTE_EFFECT = 0x04;
-	
-	protected static final int NOTE_VELOCITY = 0x08;
-	
-	protected static final int DURATION_DOTTED = 0x01;
-	
-	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
-	
-	protected static final int DURATION_NO_TUPLET = 0x04;
-	
-	protected static final int EFFECT_BEND = 0x01;
-	
-	protected static final int EFFECT_TREMOLO_BAR = 0x02;
-	
-	protected static final int EFFECT_HARMONIC = 0x04;
-	
-	protected static final int EFFECT_GRACE = 0x08;
-	
-	protected static final int EFFECT_TRILL = 0x010;
-	
-	protected static final int EFFECT_TREMOLO_PICKING = 0x020;
-	
-	protected static final int EFFECT_VIBRATO = 0x040;
-	
-	protected static final int EFFECT_DEAD = 0x080;
-	
-	protected static final int EFFECT_SLIDE = 0x0100;
-	
-	protected static final int EFFECT_HAMMER = 0x0200;
-	
-	protected static final int EFFECT_GHOST = 0x0400;
-	
-	protected static final int EFFECT_ACCENTUATED = 0x0800;
-	
-	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x01000;
-	
-	protected static final int EFFECT_PALM_MUTE = 0x02000;
-	
-	protected static final int EFFECT_STACCATO = 0x04000;
-	
-	protected static final int EFFECT_TAPPING = 0x08000;
-	
-	protected static final int EFFECT_SLAPPING = 0x010000;
-	
-	protected static final int EFFECT_POPPING = 0x020000;
-	
-	protected static final int EFFECT_FADE_IN = 0x040000;
-	
-	protected static final int GRACE_FLAG_DEAD = 0x01;
-	
-	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
-	
-	protected class TGBeatData {
-		private long currentStart;
-		private TGVoiceData[] voices;
-		
-		protected TGBeatData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.currentStart = measure.getStart();
-			this.voices = new TGVoiceData[TGBeat.MAX_VOICES];
-			for(int i = 0 ; i < this.voices.length ; i ++ ){
-				this.voices[i] = new TGVoiceData(measure);
-			}
-		}
-		
-		protected TGVoiceData getVoice(int index){
-			return this.voices[index];
-		}
-		
-		public long getCurrentStart(){
-			long minimumStart = -1;
-			for(int i = 0 ; i < this.voices.length ; i ++ ){
-				if( this.voices[i].getStart() > this.currentStart ){
-					if( minimumStart < 0 || this.voices[i].getStart() < minimumStart ){
-						minimumStart = this.voices[i].getStart();
-					}
-				}
-			}
-			if( minimumStart > this.currentStart ){
-				this.currentStart = minimumStart;
-			}
-			return this.currentStart;
-		}
-	}
-	
-	protected class TGVoiceData {
-		private long start;
-		private int velocity;
-		private int flags;
-		private TGDuration duration;
-		
-		protected TGVoiceData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.flags = 0;
-			this.setStart(measure.getStart());
-			this.setVelocity(TGVelocities.DEFAULT);
-			this.setDuration(new TGFactory().newDuration());
-		}
-		
-		public TGDuration getDuration() {
-			return this.duration;
-		}
-		
-		public void setDuration(TGDuration duration) {
-			this.duration = duration;
-		}
-		
-		public long getStart() {
-			return this.start;
-		}
-		
-		public void setStart(long start) {
-			this.start = start;
-		}
-		
-		public int getVelocity() {
-			return this.velocity;
-		}
-		
-		public void setVelocity(int velocity) {
-			this.velocity = velocity;
-		}
-		
-		public int getFlags() {
-			return this.flags;
-		}
-		
-		public void setFlags(int flags) {
-			this.flags = flags;
-		}
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGInputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGInputStream.java
deleted file mode 100644
index e2cc20d4..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGInputStream.java
+++ /dev/null
@@ -1,782 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v12;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream extends TGStream implements TGInputStreamBase{
-	
-	private DataInputStream dataInputStream;
-	private String version;
-	private TGFactory factory;
-	
-	public TGInputStream() {
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_FORMAT_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Throwable throwable){
-			return false;
-		}
-	}
-	
-	public TGSong readSong() throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		} catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readUnsignedByteString();
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readUnsignedByteString());
-		
-		//leo el artista
-		song.setArtist(readUnsignedByteString());
-		
-		//leo el album
-		song.setAlbum(readUnsignedByteString());
-		
-		//leo el autor
-		song.setAuthor(readUnsignedByteString());
-		
-		//leo la fecha
-		song.setDate(readUnsignedByteString());
-		
-		//leo el copyright
-		song.setCopyright(readUnsignedByteString());
-		
-		//leo el creador
-		song.setWriter(readUnsignedByteString());
-		
-		//leo el transcriptor
-		song.setTranscriber(readUnsignedByteString());
-		
-		//leo los comentarios
-		song.setComments(readIntegerString());
-		
-		//leo la cantidad de measure headers
-		int headerCount = readShort();
-		
-		//leo las pistas
-		TGMeasureHeader lastHeader = null;
-		long headerStart = TGDuration.QUARTER_TIME;
-		for(int i = 0;i < headerCount;i++){
-			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
-			song.addMeasureHeader(header);
-			headerStart += header.getLength();
-			lastHeader = header;
-		}
-		
-		//leo la cantidad de pistas
-		int trackCount = readByte();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(i + 1,song));
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(int number,TGSong song){
-		//header
-		int header = readHeader();
-		
-		TGTrack track = this.factory.newTrack();
-		
-		track.setNumber(number);
-		
-		//leo el nombre
-		track.setName(readUnsignedByteString());
-		
-		//leo el solo
-		track.setSolo((header & TRACK_SOLO) != 0);
-		
-		//leo el mute
-		track.setMute((header & TRACK_MUTE) != 0);
-		
-		//leo el canal
-		readChannel(song, track);
-		
-		//leo la cantidad de compases
-		int measureCount = song.countMeasureHeaders();
-		
-		//leo los compases
-		TGMeasure lastMeasure = null;
-		for(int i = 0;i < measureCount;i++){
-			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
-			track.addMeasure(measure);
-			lastMeasure = measure;
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readByte();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString(i + 1));
-		}
-		
-		//leo el offset
-		track.setOffset(TGTrack.MIN_OFFSET + readByte());
-		
-		//leo el color
-		readRGBColor(track.getColor());
-		
-		//leo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			readLyrics(track.getLyrics());
-		}
-		
-		return track;
-	}
-	
-	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
-		int header = readHeader();
-		
-		TGMeasureHeader measureHeader = this.factory.newHeader();
-		measureHeader.setNumber(number);
-		measureHeader.setStart(start);
-		
-		//leo el time signature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			readTimeSignature(measureHeader.getTimeSignature());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
-		}
-		
-		//leo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			readTempo(measureHeader.getTempo());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
-		}
-		
-		//leo el comienzo de la repeticion
-		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
-		
-		//leo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			 measureHeader.setRepeatClose(readShort());
-		}
-		
-		//leo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			 measureHeader.setRepeatAlternative(readByte());
-		}
-		
-		//leo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			measureHeader.setMarker(readMarker(number));
-		}
-		
-		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			measureHeader.setTripletFeel(readByte());
-		}
-		
-		return measureHeader;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
-		int header = readHeader();
-		
-		TGMeasure measure = this.factory.newMeasure(measureHeader);
-		TGBeatData data = new TGBeatData(measure);
-		
-		//leo la los beats
-		readBeats(measure, data);
-		
-		//leo la clave
-		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
-		if(((header & MEASURE_CLEF) != 0)){
-			measure.setClef(readByte());
-		}
-		
-		//leo el key signature
-		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			measure.setKeySignature(readByte());
-		}
-		
-		return measure;
-	}
-	
-	private void readChannel(TGSong song, TGTrack track){
-		TGChannel channel = this.factory.newChannel();
-		
-		//leo el canal
-		channel.setChannel(readByte());
-		
-		//leo el canal de efectos
-		channel.setEffectChannel(readByte());
-		
-		//leo el instrumento
-		channel.setProgram(readByte());
-		
-		//leo el volumen
-		channel.setVolume(readByte());
-		
-		//leo el balance
-		channel.setBalance(readByte());
-		
-		//leo el chorus
-		channel.setChorus(readByte());
-		
-		//leo el reverb
-		channel.setReverb(readByte());
-		
-		//leo el phaser
-		channel.setPhaser(readByte());
-		
-		//leo el tremolo
-		channel.setTremolo(readByte());
-		
-		//------------------------------------------//
-		for( int i = 0 ; i < song.countChannels() ; i ++ ){
-			TGChannel channelAux = song.getChannel(i);
-			if( channelAux.getChannel() == channel.getChannel() ){
-				channel.setChannelId(channelAux.getChannelId());
-			}
-		}
-		if( channel.getChannelId() <= 0 ){
-			channel.setChannelId( song.countChannels() + 1 );
-			channel.setName(("#" + channel.getChannelId()));
-			song.addChannel(channel);
-		}
-		track.setChannelId(channel.getChannelId());
-	}
-	
-	private void readBeats(TGMeasure measure,TGBeatData data){
-		int header = BEAT_HAS_NEXT;
-		while(((header & BEAT_HAS_NEXT) != 0)){
-			header = readHeader();
-			readBeat(header, measure, data);
-		}
-	}
-	
-	private void readBeat(int header, TGMeasure measure,TGBeatData data){
-		TGBeat beat = this.factory.newBeat();
-		
-		beat.setStart(data.getCurrentStart());
-		
-		readVoices(header, beat, data);
-		
-		//leo el stroke
-		if(((header & BEAT_HAS_STROKE) != 0)){
-			readStroke(beat.getStroke());
-		}
-		
-		//leo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			readChord(beat);
-		}
-		
-		//leo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			readText(beat);
-		}
-		
-		measure.addBeat(beat);
-	}
-	
-	private void readVoices(int header, TGBeat beat, TGBeatData data){
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			
-			beat.getVoice(i).setEmpty(true);
-			
-			if(((header & (BEAT_HAS_VOICE << shift)) != 0)){
-				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
-					data.getVoice(i).setFlags( readHeader() );
-				}
-				
-				int flags = data.getVoice(i).getFlags();
-				
-				//leo la duracion
-				if(((flags & VOICE_NEXT_DURATION) != 0)){
-					readDuration(data.getVoice(i).getDuration());
-				}
-				
-				//leo las notas
-				if(((flags & VOICE_HAS_NOTES) != 0)){
-					readNotes(beat.getVoice(i), data);
-				}
-				
-				//leo la direccion
-				if(((flags & VOICE_DIRECTION_UP) != 0)){
-					beat.getVoice(i).setDirection( TGVoice.DIRECTION_UP );
-				}
-				else if(((flags & VOICE_DIRECTION_DOWN) != 0)){
-					beat.getVoice(i).setDirection( TGVoice.DIRECTION_DOWN );
-				}
-				data.getVoice(i).getDuration().copy(beat.getVoice(i).getDuration());
-				data.getVoice(i).setStart(data.getVoice(i).getStart() + beat.getVoice(i).getDuration().getTime());
-				
-				beat.getVoice(i).setEmpty(false);
-			}
-		}
-	}
-	
-	private void readNotes(TGVoice voice,TGBeatData data){
-		int header = NOTE_HAS_NEXT;
-		while(((header & NOTE_HAS_NEXT) != 0)){
-			header = readHeader();
-			readNote(header, voice, data);
-		}
-	}
-	
-	private void readNote(int header,TGVoice voice,TGBeatData data){
-		TGNote note = this.factory.newNote();
-		
-		//leo el valor
-		note.setValue(readByte());
-		
-		//leo la cuerda
-		note.setString(readByte());
-		
-		//leo la ligadura
-		note.setTiedNote((header & NOTE_TIED) != 0);
-		
-		//leo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			data.getVoice(voice.getIndex()).setVelocity(readByte());
-		}
-		note.setVelocity(data.getVoice(voice.getIndex()).getVelocity());
-		
-		//leo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			readNoteEffect(note.getEffect());
-		}
-		
-		voice.addNote(note);
-	}
-	
-	private void readChord(TGBeat beat){
-		TGChord chord = this.factory.newChord(readByte());
-		
-		//leo el nombre
-		chord.setName( readUnsignedByteString() );
-		
-		//leo el primer fret
-		chord.setFirstFret(readByte());
-		
-		//leo las cuerdas
-		for(int string = 0; string < chord.countStrings(); string ++){
-			chord.addFretValue(string, readByte());
-		}
-		beat.setChord(chord);
-	}
-	
-	private void readText(TGBeat beat){
-		TGText text = this.factory.newText();
-		
-		//leo el texto
-		text.setValue(readUnsignedByteString());
-		
-		beat.setText(text);
-	}
-	
-	private TGString readInstrumentString(int number){
-		TGString string = this.factory.newString();
-		
-		string.setNumber(number);
-		
-		//leo el valor
-		string.setValue(readByte());
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readShort());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readByte());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		int header = readHeader();
-		
-		// leo el puntillo
-		duration.setDotted((header & DURATION_DOTTED) != 0);
-		
-		//leo el doble puntillo
-		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
-		
-		//leo el valor
-		duration.setValue(readByte());
-		
-		//leo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			readDivisionType(duration.getDivision());
-		}
-		else{
-			TGDivisionType.NORMAL.copy(duration.getDivision());
-		}
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readByte());
-		
-		//leo los tiempos
-		divisionType.setTimes(readByte());
-	}
-	
-	private void readStroke(TGStroke stroke){
-		//leo la direccion
-		stroke.setDirection( readByte() );
-		
-		//leo el valor
-		stroke.setValue( readByte() );
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		int header = readHeader(3);
-		
-		//leo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			effect.setBend(readBendEffect());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			effect.setTremoloBar(readTremoloBarEffect());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			effect.setHarmonic(readHarmonicEffect());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			effect.setGrace(readGraceEffect());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			effect.setTrill(readTrillEffect());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			effect.setTremoloPicking(readTremoloPickingEffect());
-		}
-		
-		//vibrato
-		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
-		
-		//dead note
-		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
-		
-		//slide
-		effect.setSlide(((header & EFFECT_SLIDE) != 0));
-		
-		//hammer-on/pull-off
-		effect.setHammer(((header & EFFECT_HAMMER) != 0));
-		
-		//ghost note
-		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
-		
-		//accentuated note
-		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
-		
-		//heavy accentuated note
-		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
-		
-		//palm mute
-		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
-		
-		//staccato
-		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
-		
-		//tapping
-		effect.setTapping(((header & EFFECT_TAPPING) != 0));
-		
-		//slapping
-		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
-		
-		//popping
-		effect.setPopping(((header & EFFECT_POPPING) != 0));
-		
-		//fade in
-		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
-		
-		//let ring
-		effect.setLetRing(((header & EFFECT_LET_RING) != 0));
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value = readByte();
-			
-			//agrego el punto
-			bend.addPoint(position,value);
-		}
-		return bend;
-	}
-	
-	private TGEffectTremoloBar readTremoloBarEffect(){
-		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
-			
-			//agrego el punto
-			tremoloBar.addPoint(position,value);
-		}
-		return tremoloBar;
-	}
-	
-	private TGEffectHarmonic readHarmonicEffect(){
-		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
-		
-		//leo el tipo
-		effect.setType(readByte());
-		
-		//leo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			effect.setData(readByte());
-		}
-		return effect;
-	}
-	
-	private TGEffectGrace readGraceEffect(){
-		int header = readHeader();
-		
-		TGEffectGrace effect = this.factory.newEffectGrace();
-		
-		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
-		
-		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.setDuration(readByte());
-		
-		//leo el velocity
-		effect.setDynamic(readByte());
-		
-		//leo la transicion
-		effect.setTransition(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTremoloPicking readTremoloPickingEffect(){
-		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTrill readTrillEffect(){
-		TGEffectTrill effect = this.factory.newEffectTrill();
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGMarker readMarker(int measure){
-		TGMarker marker = this.factory.newMarker();
-		
-		marker.setMeasure(measure);
-		
-		//leo el titulo
-		marker.setTitle(readUnsignedByteString());
-		
-		//leo el color
-		readRGBColor(marker.getColor());
-		
-		return marker;
-	}
-	
-	private void readRGBColor(TGColor color){
-		//leo el RGB
-		color.setR((readByte() & 0xff));
-		color.setG((readByte() & 0xff));
-		color.setB((readByte() & 0xff));
-	}
-	
-	private void readLyrics(TGLyric lyrics){
-		//leo el compas de comienzo
-		lyrics.setFrom(readShort());
-		
-		//leo el texto
-		lyrics.setLyrics(readIntegerString());
-	}
-	
-	private byte readByte(){
-		try {
-			return (byte)this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(int bCount){
-		int header = 0;
-		for(int i = bCount; i > 0; i --){
-			header += ( readHeader() << ( (8 * i) - 8 ) );
-		}
-		return header;
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readUnsignedByteString(){
-		try {
-			return readString( (this.dataInputStream.read() & 0xFF ));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readIntegerString(){
-		try {
-			return readString(this.dataInputStream.readInt());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readString(int length){
-		try {
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGOutputStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGOutputStream.java
deleted file mode 100644
index 38b610a4..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGOutputStream.java
+++ /dev/null
@@ -1,743 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg.v12;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGLocalFileExporter;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.managers.TGSongManager;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGOutputStream extends TGStream implements TGLocalFileExporter{
-	
-	private TGFactory factory;
-	private TGChannel channelAux;
-	private DataOutputStream dataOutputStream;
-	
-	public boolean isSupportedExtension(String extension) {
-		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
-	}
-	
-	public String getExportName(){
-		return "TuxGuitar 1.2";
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean configure(boolean setDefaults){
-		return true;
-	}
-	
-	public void init(TGFactory factory,OutputStream stream) {
-		this.factory = factory;
-		this.channelAux = null;
-		this.dataOutputStream = new DataOutputStream(stream);
-	}
-	
-	public void exportSong(TGSong song) throws TGFileFormatException {
-		try{
-			this.writeVersion();
-			this.write(song);
-			this.dataOutputStream.flush();
-			this.dataOutputStream.close();
-		}catch( Throwable throwable){
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void writeVersion(){
-		writeUnsignedByteString(TG_FORMAT_VERSION);
-	}
-	
-	private void write(TGSong song){
-		//escribo el nombre
-		writeUnsignedByteString(song.getName());
-		
-		//escribo el artista
-		writeUnsignedByteString(song.getArtist());
-		
-		//escribo el album
-		writeUnsignedByteString(song.getAlbum());
-		
-		//escribo el autor
-		writeUnsignedByteString(song.getAuthor());
-		
-		//escribo la fecha
-		writeUnsignedByteString(song.getDate());
-		
-		//escribo el copyright
-		writeUnsignedByteString(song.getCopyright());
-		
-		//escribo el creador
-		writeUnsignedByteString(song.getWriter());
-		
-		//escribo el transcriptor
-		writeUnsignedByteString(song.getTranscriber());
-		
-		//escribo los comentarios
-		writeIntegerString(song.getComments());
-		
-		//escribo la cantidad de measure headers 
-		writeShort((short)song.countMeasureHeaders());
-		
-		//escribo las pistas
-		TGMeasureHeader lastHeader = null;
-		Iterator headers = song.getMeasureHeaders();
-		while(headers.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)headers.next();
-			writeMeasureHeader(header,lastHeader);
-			lastHeader = header;
-		}
-		
-		//escribo la cantidad de pistas
-		writeByte(song.countTracks());
-		
-		//escribo las pistas
-		for(int i = 0;i < song.countTracks();i++){
-			TGTrack track = song.getTrack(i);
-			writeTrack(track);
-		}
-	}
-	
-	private void writeTrack(TGTrack track){
-		//header
-		int header = 0;
-		if (track.isSolo()) {
-			header |= TRACK_SOLO;
-		}
-		if (track.isMute()) {
-			header |= TRACK_MUTE;
-		}
-		if(!track.getLyrics().isEmpty()){
-			header |= TRACK_LYRICS;
-		}
-		writeHeader(header);
-		
-		//escribo el nombre
-		writeUnsignedByteString(track.getName());
-		
-		//escribo el canal
-		writeChannel(getChannel(track.getSong(), track));
-		
-		//escribo los compases
-		TGMeasure lastMeasure = null;
-		Iterator measures  = track.getMeasures();
-		while(measures.hasNext()){
-			TGMeasure measure = (TGMeasure)measures.next();
-			writeMeasure(measure,lastMeasure);
-			lastMeasure = measure;
-		}
-		
-		//escribo la cantidad de cuerdas 
-		writeByte(track.getStrings().size());
-		
-		//escribo las cuerdas
-		Iterator stringIt  = track.getStrings().iterator();
-		while(stringIt.hasNext()){
-			TGString string = (TGString)stringIt.next();
-			writeInstrumentString(string);
-		}
-		
-		//escribo el offset
-		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
-		
-		//escribo el color
-		writeRGBColor(track.getColor());
-		
-		//escribo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			writeLyrics(track.getLyrics());
-		}
-	}
-	
-	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
-		int header = 0;
-		if(lastMeasureHeader == null){
-			header |= MEASURE_HEADER_TIMESIGNATURE;
-			header |= MEASURE_HEADER_TEMPO;
-			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}else{
-			//Time Signature
-			int numerator = measureheader.getTimeSignature().getNumerator();
-			int value = measureheader.getTimeSignature().getDenominator().getValue();
-			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
-			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
-			if(numerator != prevNumerator || value != prevValue){
-				header |= MEASURE_HEADER_TIMESIGNATURE;
-			}
-			//Tempo
-			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
-				header |= MEASURE_HEADER_TEMPO;
-			}
-			//Triplet Feel
-			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}
-		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
-		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
-		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
-		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
-		
-		writeHeader(header);
-		
-		//escribo el timeSignature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			writeTimeSignature(measureheader.getTimeSignature());
-		}
-		
-		//escribo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			writeTempo(measureheader.getTempo());
-		}
-		
-		//escribo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			writeShort((short)measureheader.getRepeatClose());
-		}
-		
-		//escribo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			writeByte(measureheader.getRepeatAlternative());
-		}
-		
-		//escribo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			writeMarker(measureheader.getMarker());
-		}
-		
-		//escribo el triplet feel
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			writeByte(measureheader.getTripletFeel());
-		}
-	}
-	
-	private void writeMeasure(TGMeasure measure,TGMeasure lastMeasure){
-		int header = 0;
-		if(lastMeasure == null){
-			header |= MEASURE_CLEF;
-			header |= MEASURE_KEYSIGNATURE;
-		}else{
-			//Clef
-			if(measure.getClef() != lastMeasure.getClef()){
-				header |= MEASURE_CLEF;
-			}
-			//KeySignature
-			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
-				header |= MEASURE_KEYSIGNATURE;
-			}
-		}
-		//escribo la cabecera
-		writeHeader(header);
-		
-		//escribo los beats
-		TGBeatData data = new TGBeatData(measure);
-		writeBeats(measure, data);
-		
-		//escribo la clave
-		if(((header & MEASURE_CLEF) != 0)){
-			writeByte(measure.getClef());
-		}
-		
-		//escribo el key signature
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			writeByte(measure.getKeySignature());
-		}
-	}
-	
-	private void writeChannel(TGChannel channel){
-		//escribo el canal
-		writeByte(channel.getChannel());
-		
-		//escribo el canal de efectos
-		writeByte(channel.getEffectChannel());
-		
-		//escribo el instrumento
-		writeByte(channel.getProgram());
-		
-		//escribo el volumen
-		writeByte(channel.getVolume());
-		
-		//escribo el balance
-		writeByte(channel.getBalance());
-		
-		//escribo el chorus
-		writeByte(channel.getChorus());
-		
-		//escribo el reverb
-		writeByte(channel.getReverb());
-		
-		//escribo el phaser
-		writeByte(channel.getPhaser());
-		
-		//escribo el tremolo
-		writeByte(channel.getTremolo());
-	}
-	
-	private void writeBeats(TGMeasure measure,TGBeatData data){
-		int count = measure.countBeats();
-		for(int i = 0; i < count; i ++){
-			TGBeat beat = measure.getBeat(i);
-			writeBeat(beat,data, (i + 1 < count ));
-		}
-	}
-	
-	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
-		int header = hasNext ? BEAT_HAS_NEXT : 0;
-		
-		//Berifico si hay cambios en las voces
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			if(!beat.getVoice(i).isEmpty()){
-				header |= ( BEAT_HAS_VOICE << shift ); 
-				
-				int flags = ( beat.getVoice(i).isRestVoice() ? 0 : VOICE_HAS_NOTES );
-				if(!beat.getVoice(i).getDuration().isEqual(data.getVoice(i).getDuration())){
-					flags |= VOICE_NEXT_DURATION;
-					data.getVoice(i).setDuration(beat.getVoice(i).getDuration());
-				}
-				if(beat.getVoice(i).getDirection() != TGVoice.DIRECTION_NONE ){
-					if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_UP ){
-						flags |= VOICE_DIRECTION_UP;
-					}
-					else if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_DOWN ){
-						flags |= VOICE_DIRECTION_DOWN;
-					}
-				}
-				if( data.getVoice(i).getFlags() != flags ){
-					header |= ( BEAT_HAS_VOICE_CHANGES << shift ); 
-					data.getVoice(i).setFlags( flags );
-				}
-			}
-			
-		}
-		//Berifico si tiene stroke
-		if(beat.getStroke().getDirection() != TGStroke.STROKE_NONE){
-			header |= BEAT_HAS_STROKE;
-		}
-		//Berifico si tiene acorde
-		if(beat.getChord() != null){
-			header |= BEAT_HAS_CHORD;
-		}
-		//Berifico si tiene texto
-		if(beat.getText() != null){
-			header |= BEAT_HAS_TEXT;
-		}
-		
-		// escribo la cabecera
-		writeHeader(header);
-		
-		//escribo las voces
-		writeVoices(header, beat, data);
-		
-		//escribo el stroke
-		if(((header & BEAT_HAS_STROKE) != 0)){
-			writeStroke(beat.getStroke());
-		}
-		
-		//escribo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			writeChord(beat.getChord());
-		}
-		
-		//escribo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			writeText(beat.getText());
-		}
-	}
-	
-	private void writeVoices(int header, TGBeat beat,TGBeatData data){
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			if((( header & (BEAT_HAS_VOICE << shift)) != 0)){
-				
-				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
-					writeHeader( data.getVoice(i).getFlags() );
-				}
-				
-				//escribo la duracion
-				if((( data.getVoice(i).getFlags() & VOICE_NEXT_DURATION) != 0)){
-					writeDuration(beat.getVoice(i).getDuration());
-				}
-				
-				//escribo las notas
-				if((( data.getVoice(i).getFlags() & VOICE_HAS_NOTES) != 0)){
-					writeNotes(beat.getVoice(i), data);
-				}
-			}
-		}
-	}
-	
-	private void writeNotes(TGVoice voice,TGBeatData data){
-		for( int i = 0 ; i < voice.countNotes() ; i ++){
-			TGNote note = voice.getNote(i);
-			
-			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
-			header = (note.isTiedNote())?header |= NOTE_TIED:header;
-			if(note.getVelocity() != data.getVoice(voice.getIndex()).getVelocity()){
-				data.getVoice(voice.getIndex()).setVelocity(note.getVelocity());
-				header |= NOTE_VELOCITY;
-			}
-			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
-			
-			writeHeader(header);
-			
-			writeNote(header,note);
-		}
-	}
-	
-	private void writeNote(int header,TGNote note){
-		//escribo el valor
-		writeByte(note.getValue());
-		
-		//escribo la cuerda
-		writeByte(note.getString());
-		
-		//escribo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			writeByte(note.getVelocity());
-		}
-		
-		//escribo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			writeNoteEffect(note.getEffect());
-		}
-	}
-	
-	private void writeStroke(TGStroke stroke){
-		//escribo la direccion
-		writeByte(stroke.getDirection());
-		
-		//escribo el valor
-		writeByte(stroke.getValue());
-	}
-	
-	private void writeChord(TGChord chord){
-		//escribo la cantidad de cuerdas
-		writeByte(chord.countStrings());
-		
-		//escribo el nombre
-		writeUnsignedByteString(chord.getName());
-		
-		//escribo el primer fret
-		writeByte(chord.getFirstFret());
-		
-		//escribo el valor de cada cuerda
-		for(int string = 0; string < chord.countStrings(); string ++){
-			writeByte(chord.getFretValue(string));
-		}
-	}
-	
-	private void writeText(TGText text){
-		//escribo el texto
-		writeUnsignedByteString(text.getValue());
-	}
-	
-	private void writeInstrumentString(TGString string){
-		//escribo el valor
-		writeByte(string.getValue());
-	}
-	
-	private void writeTempo(TGTempo tempo){
-		//escribo el valor
-		writeShort((short)tempo.getValue());
-	}
-	
-	private void writeTimeSignature(TGTimeSignature timeSignature){
-		//escribo el numerador
-		writeByte(timeSignature.getNumerator());
-		
-		//escribo el denominador
-		writeDuration(timeSignature.getDenominator());
-	}
-	
-	private void writeDuration(TGDuration duration){
-		int header = 0;
-		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
-		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
-		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLET:header;
-		writeHeader(header);
-		
-		//escribo el valor
-		writeByte(duration.getValue());
-		
-		//escribo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			writeDivisionType(duration.getDivision());
-		}
-	}
-	
-	private void writeDivisionType(TGDivisionType divisionType){
-		//escribo los enters
-		writeByte(divisionType.getEnters());
-		
-		//escribo los tiempos
-		writeByte(divisionType.getTimes());
-	}
-	
-	private void writeNoteEffect(TGNoteEffect effect){
-		int header = 0;
-		
-		header = (effect.isBend())?header |= EFFECT_BEND:header;
-		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
-		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
-		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
-		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
-		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
-		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
-		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
-		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
-		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
-		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
-		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
-		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
-		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
-		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
-		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
-		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
-		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
-		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
-		header = (effect.isLetRing())?header |= EFFECT_LET_RING:header;
-		
-		writeHeader(header,3);
-		
-		//escribo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			writeBendEffect(effect.getBend());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			writeTremoloBarEffect(effect.getTremoloBar());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			writeHarmonicEffect(effect.getHarmonic());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			writeGraceEffect(effect.getGrace());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			writeTrillEffect(effect.getTrill());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			writeTremoloPickingEffect(effect.getTremoloPicking());
-		}
-	}
-	
-	private void writeBendEffect(TGEffectBend effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte(point.getValue());
-		}
-	}
-	
-	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
-		}
-	}
-	
-	private void writeHarmonicEffect(TGEffectHarmonic effect){
-		//excribo el tipo
-		writeByte(effect.getType());
-		
-		//excribo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			writeByte(effect.getData());
-		}
-	}
-	
-	private void writeGraceEffect(TGEffectGrace effect){
-		int header = 0;
-		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
-		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
-		
-		//excribo el header
-		writeHeader(header);
-		
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration());
-		
-		//excribo el velocity
-		writeByte(effect.getDynamic());
-		
-		//excribo la transicion
-		writeByte(effect.getTransition());
-	}
-	
-	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeTrillEffect(TGEffectTrill effect){
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeMarker(TGMarker marker){
-		//escribo el titulo
-		writeUnsignedByteString(marker.getTitle());
-		
-		//escribo el color
-		writeRGBColor(marker.getColor());
-	}
-	
-	private void writeRGBColor(TGColor color){
-		//escribo el RGB
-		writeByte(color.getR());
-		writeByte(color.getG());
-		writeByte(color.getB());
-	}
-	
-	private void writeLyrics(TGLyric lyrics){
-		//escribo el compas de comienzo
-		writeShort((short)lyrics.getFrom());
-		
-		//escribo el texto
-		writeIntegerString(lyrics.getLyrics());
-	}
-	
-	public void writeByte(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeUnsignedByteString(String v){
-		try {
-			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
-			this.dataOutputStream.write(byteString.length());
-			this.dataOutputStream.writeChars(byteString);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeIntegerString(String v){
-		try {
-			this.dataOutputStream.writeInt(v.length());
-			this.dataOutputStream.writeChars(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v,int bCount){
-		for(int i = bCount; i > 0; i --){
-			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
-		}
-	}
-	
-	public void writeShort(short v){
-		try {
-			this.dataOutputStream.writeShort(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private TGChannel getChannel( TGSong song, TGTrack track ){
-		TGSongManager tgSongManager = new TGSongManager(this.factory);
-		tgSongManager.setSong( song );
-		
-		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
-		if( tgChannel != null ){
-			return tgChannel;
-		}
-		if( this.channelAux == null ){
-			this.channelAux = tgSongManager.createChannel();
-			if( this.channelAux.getChannel() < 0 && song.countChannels() > 0 ){
-				this.channelAux = (song.getChannel(song.countChannels() - 1));
-			}
-		}
-		return this.channelAux;
-	}
-}
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGStream.java b/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGStream.java
deleted file mode 100644
index f8458338..00000000
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/v12/TGStream.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.herac.tuxguitar.io.tg.v12;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGVelocities;
-import org.herac.tuxguitar.util.TGVersion;
-
-public class TGStream {
-	
-	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
-	
-	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + new TGVersion(1,2,0).getVersion() );
-	
-	public static final String TG_FORMAT_EXTENSION = (".tg");
-	
-	protected static final int TRACK_SOLO = 0x01;
-	
-	protected static final int TRACK_MUTE = 0x02;
-	
-	protected static final int TRACK_LYRICS = 0x04;
-	
-	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
-	
-	protected static final int MEASURE_HEADER_TEMPO = 0x02;
-	
-	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
-	
-	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
-	
-	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
-	
-	protected static final int MEASURE_HEADER_MARKER = 0x20;
-	
-	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
-	
-	protected static final int MEASURE_CLEF = 0x01;
-	
-	protected static final int MEASURE_KEYSIGNATURE = 0x02;
-	
-	protected static final int BEAT_HAS_NEXT = 0x01;
-	
-	protected static final int BEAT_HAS_STROKE = 0x02;
-	
-	protected static final int BEAT_HAS_CHORD = 0x04;
-	
-	protected static final int BEAT_HAS_TEXT = 0x08;
-	
-	protected static final int BEAT_HAS_VOICE = 0x10;
-	
-	protected static final int BEAT_HAS_VOICE_CHANGES = 0x20;
-	
-	protected static final int VOICE_HAS_NOTES = 0x01;
-	
-	protected static final int VOICE_NEXT_DURATION = 0x02;
-	
-	protected static final int VOICE_DIRECTION_UP = 0x04;
-	
-	protected static final int VOICE_DIRECTION_DOWN = 0x08;
-	
-	protected static final int NOTE_HAS_NEXT = 0x01;
-	
-	protected static final int NOTE_TIED = 0x02;
-	
-	protected static final int NOTE_EFFECT = 0x04;
-	
-	protected static final int NOTE_VELOCITY = 0x08;
-	
-	protected static final int DURATION_DOTTED = 0x01;
-	
-	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
-	
-	protected static final int DURATION_NO_TUPLET = 0x04;
-	
-	protected static final int EFFECT_BEND = 0x000001;
-	
-	protected static final int EFFECT_TREMOLO_BAR = 0x000002;
-	
-	protected static final int EFFECT_HARMONIC = 0x000004;
-	
-	protected static final int EFFECT_GRACE = 0x000008;
-	
-	protected static final int EFFECT_TRILL = 0x000010;
-	
-	protected static final int EFFECT_TREMOLO_PICKING = 0x000020;
-	
-	protected static final int EFFECT_VIBRATO = 0x000040;
-	
-	protected static final int EFFECT_DEAD = 0x000080;
-	
-	protected static final int EFFECT_SLIDE = 0x000100;
-	
-	protected static final int EFFECT_HAMMER = 0x000200;
-	
-	protected static final int EFFECT_GHOST = 0x000400;
-	
-	protected static final int EFFECT_ACCENTUATED = 0x000800;
-	
-	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x001000;
-	
-	protected static final int EFFECT_PALM_MUTE = 0x002000;
-	
-	protected static final int EFFECT_STACCATO = 0x004000;
-	
-	protected static final int EFFECT_TAPPING = 0x008000;
-	
-	protected static final int EFFECT_SLAPPING = 0x010000;
-	
-	protected static final int EFFECT_POPPING = 0x020000;
-	
-	protected static final int EFFECT_FADE_IN = 0x040000;
-	
-	protected static final int EFFECT_LET_RING = 0x080000;
-	
-	protected static final int GRACE_FLAG_DEAD = 0x01;
-	
-	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
-	
-	protected class TGBeatData {
-		private long currentStart;
-		private TGVoiceData[] voices;
-		
-		protected TGBeatData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.currentStart = measure.getStart();
-			this.voices = new TGVoiceData[TGBeat.MAX_VOICES];
-			for(int i = 0 ; i < this.voices.length ; i ++ ){
-				this.voices[i] = new TGVoiceData(measure);
-			}
-		}
-		
-		protected TGVoiceData getVoice(int index){
-			return this.voices[index];
-		}
-		
-		public long getCurrentStart(){
-			long minimumStart = -1;
-			for(int i = 0 ; i < this.voices.length ; i ++ ){
-				if( this.voices[i].getStart() > this.currentStart ){
-					if( minimumStart < 0 || this.voices[i].getStart() < minimumStart ){
-						minimumStart = this.voices[i].getStart();
-					}
-				}
-			}
-			if( minimumStart > this.currentStart ){
-				this.currentStart = minimumStart;
-			}
-			return this.currentStart;
-		}
-	}
-	
-	protected class TGVoiceData {
-		private long start;
-		private int velocity;
-		private int flags;
-		private TGDuration duration;
-		
-		protected TGVoiceData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.flags = 0;
-			this.setStart(measure.getStart());
-			this.setVelocity(TGVelocities.DEFAULT);
-			this.setDuration(new TGFactory().newDuration());
-		}
-		
-		public TGDuration getDuration() {
-			return this.duration;
-		}
-		
-		public void setDuration(TGDuration duration) {
-			this.duration = duration;
-		}
-		
-		public long getStart() {
-			return this.start;
-		}
-		
-		public void setStart(long start) {
-			this.start = start;
-		}
-		
-		public int getVelocity() {
-			return this.velocity;
-		}
-		
-		public void setVelocity(int velocity) {
-			this.velocity = velocity;
-		}
-		
-		public int getFlags() {
-			return this.flags;
-		}
-		
-		public void setFlags(int flags) {
-			this.flags = flags;
-		}
-	}
-}
diff --git a/TuxGuitar-converter/GNUmakefile b/TuxGuitar-converter/GNUmakefile
deleted file mode 100644
index d9f0197c..00000000
--- a/TuxGuitar-converter/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:26 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-converter
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:26 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-converter/build.properties b/TuxGuitar-converter/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-converter/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-converter/build.xml b/TuxGuitar-converter/build.xml
deleted file mode 100644
index f001fcaf..00000000
--- a/TuxGuitar-converter/build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-converter" basedir="." default="all">
-	<description>
-		TuxGuitar-converter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-converter.jar" />
-	
-	<property name="build.src.path" value="src" />
-	<property name="build.path" value="build" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   L I B R A R Y        |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   L I B R A R Y      |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-fluidsynth/GNUmakefile b/TuxGuitar-fluidsynth/GNUmakefile
deleted file mode 100644
index 0caea11a..00000000
--- a/TuxGuitar-fluidsynth/GNUmakefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-fluidsynth
-LIBRARY?=lib$(PACKAGE).so
-LIBRARY_JNI?=lib$(PACKAGE)-jni.so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_LIBRARY_PATH_JNI?=$(TG_PREFIX)/lib/jni
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_JNI_DIR?=$(TG_LIBRARY_PATH_JNI)
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-JAVA_SOURCE_PATH?=./src/
-JAVA_SOURCES?=$(shell find $(JAVA_SOURCE_PATH) -name "*.java")
-JAVA_OBJECTS?=$(PACKAGE).o
-JNI_SOURCE_PATH?=./jni/
-JNI_SOURCES?=$(shell find $(JNI_SOURCE_PATH) -name "*.c")
-JNI_OBJECTS?=$(JNI_SOURCES:%.c=%.o)
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(JAVA_SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH) 
-
-CC=gcc
-CFLAGS=-fPIC -I $(shell $(GCJ) -print-file-name=include/)
-
-default: all
-
-all: objects library library_jni
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(JAVA_OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-library_jni: $(LIBRARY_JNI)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-install $(LIBRARY_JNI) $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $(@F) $<
-
-$(PACKAGE).o: $(JAVA_SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(JAVA_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) -ltuxguitar -L$(TG_LIBRARY_PATH)
-
-$(LIBRARY_JNI): $(JNI_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) -lfluidsynth
-
-#------------------------------------------------------------------------------
diff --git a/TuxGuitar-fluidsynth/build.properties b/TuxGuitar-fluidsynth/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-fluidsynth/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-fluidsynth/build.xml b/TuxGuitar-fluidsynth/build.xml
deleted file mode 100644
index f93a299a..00000000
--- a/TuxGuitar-fluidsynth/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="tuxguitar-fluidsynth" basedir="." default="all">
-	<description>
-		TuxGuitar Fluidsynth
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-fluidsynth.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|    B U I L D I N G   T U X G U I T A R  -  F L U I D S Y N T H     |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+----------------------------------------------------------------------+</echo>
-		<echo>|    P A C K A G I N G   T U X G U I T A R  -  F L U I D S Y N T H     |</echo>
-		<echo>+----------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-fluidsynth/jni/GNUmakefile b/TuxGuitar-fluidsynth/jni/GNUmakefile
deleted file mode 100644
index 81e00e8c..00000000
--- a/TuxGuitar-fluidsynth/jni/GNUmakefile
+++ /dev/null
@@ -1,22 +0,0 @@
-CFLAGS?=-I$(shell gcj -print-file-name=include/)
-CFLAGS+=-fPIC
-LDFLAGS?=
-LDLIBS?=-lfluidsynth
-LDPATH?=-L/usr/lib
-LIBRARY_PREFIX?=lib
-LIBRARY_NAME?=tuxguitar-fluidsynth-jni
-LIBRARY_EXTENSION?=.so
-
-LIBRARY=$(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
-OBJECTS=org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all:    $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(CC) $(LDFLAGS) -shared -o $(LIBRARY) $(OBJECTS) $(LDPATH) $(LDLIBS)
-
-clean: 
-	rm -f $(OBJECTS) $(LIBRARY)
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java b/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java
deleted file mode 100644
index 6de8f673..00000000
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
-
-import java.io.File;
-
-import org.herac.tuxguitar.player.base.MidiOutputPort;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiOutputPortImpl implements MidiOutputPort{
-	
-	private String key;
-	private String name;
-	private MidiSynth synth;
-	private MidiReceiverImpl receiver;
-	private String soundFont;
-	
-	public MidiOutputPortImpl(MidiSynth synth,File soundfont){
-		this.key = getUniqueKey(soundfont);
-		this.name = getUniqueName(soundfont);
-		this.soundFont = soundfont.getAbsolutePath();
-		this.receiver = new MidiReceiverImpl(synth);
-		this.synth = synth;
-	}
-	
-	public void open(){
-		if(!this.synth.isConnected(this)){
-			this.synth.connect(this);
-		}
-	}
-	
-	public void close(){
-		if(this.synth.isConnected(this)){
-			this.synth.disconnect(this);
-		}
-	}
-	
-	public MidiReceiver getReceiver(){
-		this.open();
-		return this.receiver;
-	}
-	
-	public void check(){
-		// Not implemented
-	}
-	
-	public String getSoundFont() {
-		return this.soundFont;
-	}
-	
-	public String getKey(){
-		return this.key;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-	
-	public String getUniqueKey(File soundfont){
-		return ("tuxguitar-fluidsynth_" + soundfont.getAbsolutePath());
-	}
-	
-	private String getUniqueName(File soundfont){
-		String name = soundfont.getName();
-		int extensionIndex = name.lastIndexOf(".");
-		if( extensionIndex > 0 ){
-			name = name.substring( 0, extensionIndex );
-		}
-		return ("TG Fluidsynth " + "[" + name + "]");
-	}
-}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java b/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java
deleted file mode 100644
index cb1f4f09..00000000
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
-	
-	private MidiSynth synth;
-	private MidiOutputPortSettings settings;
-	
-	public MidiOutputPortProviderImpl(){
-		super();
-	}
-	
-	public List listPorts() throws MidiPlayerException {
-		try{
-			List ports = new ArrayList();
-			Iterator it = getSettings().getSoundfonts().iterator();
-			while(it.hasNext()){
-				String path = (String)it.next();
-				File soundfont = new File( path );
-				if( soundfont.exists() && !soundfont.isDirectory() ){
-					ports.add( new MidiOutputPortImpl( getSynth(), soundfont ) );
-				}
-			}
-			return ports;
-		}catch(Throwable throwable){
-			throw new MidiPlayerException(throwable.getMessage(), throwable);
-		}
-	}
-	
-	public void closeAll() throws MidiPlayerException {
-		try{
-			if(this.synth != null && this.synth.isInitialized()){
-				this.synth.finalize();
-				this.synth = null;
-			}
-		}catch(Throwable throwable){
-			throw new MidiPlayerException(throwable.getMessage(), throwable);
-		}
-	}
-	
-	public MidiSynth getSynth(){
-		if(this.synth == null || !this.synth.isInitialized()){
-			this.synth = new MidiSynth();
-			this.getSettings().apply();
-		}
-		return this.synth;
-	}
-	
-	public MidiOutputPortSettings getSettings(){
-		if(this.settings == null){
-			this.settings = new MidiOutputPortSettings( this );
-		}
-		return this.settings;
-	}
-}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderPlugin.java b/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderPlugin.java
deleted file mode 100644
index 95ae24e2..00000000
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderPlugin.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
-
-import org.eclipse.swt.widgets.Shell;
-import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin implements TGPluginSetup{
-	
-	private MidiOutputPortProviderImpl provider;
-	
-	protected MidiOutputPortProvider getProvider() {
-		return getProviderImpl();
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "FluidSynth output plugin";
-	}
-	
-	public String getName() {
-		return "FluidSynth output plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-	
-	public void setupDialog(Shell parent) {
-		getProviderImpl().getSettings().configure(parent);
-	}
-	
-	private MidiOutputPortProviderImpl getProviderImpl() {
-		if(this.provider == null){
-			this.provider = new MidiOutputPortProviderImpl();
-		}
-		return this.provider;
-	}
-}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiReceiverImpl.java b/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiReceiverImpl.java
deleted file mode 100644
index b5377fc9..00000000
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiReceiverImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
-
-import org.herac.tuxguitar.player.base.MidiControllers;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiReceiverImpl implements MidiReceiver{
-	
-	private MidiSynth synth;
-	
-	public MidiReceiverImpl(MidiSynth synth){
-		this.synth = synth;
-	}
-	
-	public void sendSystemReset() {
-		this.synth.sendSystemReset();
-	}
-	
-	public void sendNoteOn(int channel, int key, int velocity) {
-		this.synth.sendNoteOn(channel, key, velocity);
-	}
-	
-	public void sendNoteOff(int channel, int key, int velocity) {
-		this.synth.sendNoteOff(channel, key, velocity);
-	}
-	
-	public void sendControlChange(int channel, int controller, int value) {
-		this.synth.sendControlChange(channel, controller, value);
-	}
-	
-	public void sendProgramChange(int channel, int value) {
-		this.synth.sendProgramChange(channel, value);
-	}
-	
-	public void sendPitchBend(int channel, int value) {
-		this.synth.sendPitchBend(channel, value);
-	}
-	
-	public void sendAllNotesOff() {
-		for(int i = 0; i < 16; i ++){
-			this.sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
-		}
-	}
-}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java b/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java
deleted file mode 100644
index 91d0d0cc..00000000
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.app.system.config.TGConfigManager;
-import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
-
-public class MidiSettings {
-	
-	public static final String AUDIO_DRIVER = "audio.driver";
-	public static final String AUDIO_SAMPLE_FORMAT = "audio.sample-format";
-	public static final String AUDIO_PERIOD_SIZE = "audio.period-size";
-	public static final String AUDIO_PERIOD_COUNT = "audio.periods";
-	public static final String SYNTH_GAIN = "synth.gain";
-	public static final String SYNTH_POLYPHONY = "synth.polyphony";
-	public static final String SYNTH_SAMPLE_RATE = "synth.sample-rate";
-	public static final String SYNTH_REVERB_ACTIVE = "synth.reverb.active";
-	public static final String SYNTH_CHORUS_ACTIVE = "synth.chorus.active";
-	
-	public static final String SYNTH_AUDIO_CHANNELS = "synth.audio-channels";
-	public static final String SYNTH_AUDIO_GROUPS = "synth.audio-groups";
-	
-	private TGConfigManager config;
-	private MidiOutputPortProviderImpl provider;
-	
-	private boolean restartSynth;
-	
-	public MidiSettings(MidiOutputPortProviderImpl provider){
-		this.provider = provider;
-	}
-	
-	public MidiSynth getSynth(){
-		return this.provider.getSynth();
-	}
-	
-	public TGConfigManager getConfig(){
-		if(this.config == null){
-			this.config = new TGPluginConfigManager("tuxguitar-fluidsynth");
-			this.config.init();
-		}
-		return this.config;
-	}
-	
-	public double getDoubleValue( String property ){
-		return getConfig().getDoubleConfigValue(property, this.getSynth().getDoubleProperty( property ));
-	}
-	
-	public int getIntegerValue( String property ){
-		return getConfig().getIntConfigValue(property, this.getSynth().getIntegerProperty( property ));
-	}
-	
-	public String getStringValue( String property ){
-		return getConfig().getStringConfigValue(property, this.getSynth().getStringProperty( property ));
-	}
-	
-	public boolean getBooleanValue( String property ){
-		String value = this.getStringValue(property);
-		return (value != null && value.equals("yes"));
-	}
-	
-	public void setDoubleValue( String property , double value ){
-		getConfig().setProperty( property , value );
-	}
-	
-	public void setIntegerValue( String property , int value ){
-		getConfig().setProperty( property , value );
-	}
-		
-	public void setStringValue( String property , String value ){
-		if( value == null ){
-			getConfig().removeProperty( property );
-		}else{
-			getConfig().setProperty( property , value );
-		}
-	}
-	
-	public void setBooleanValue( String property , boolean value ){
-		this.setStringValue(property, ( value ? "yes" : "no" ) );
-	}
-	
-	public List getSoundfonts(){
-		List ports = new ArrayList();
-		TGConfigManager config = getConfig();
-		
-		int count = config.getIntConfigValue("soundfont.count");
-		for(int i = 0; i < count;i ++){
-			String path = config.getStringConfigValue("soundfont.path" + i);
-			if(path != null && path.length() > 0 ){
-				ports.add( path );
-			}
-		}
-		return ports;
-	}
-	
-	public void setSoundfonts(List soundfonts){
-		TGConfigManager config = getConfig();
-		config.setProperty("soundfont.count", soundfonts.size() );
-		for( int i = 0 ; i < soundfonts.size() ; i ++ ){
-			String path = (String)soundfonts.get( i );
-			config.setProperty("soundfont.path" + i, path );
-		}
-	}
-	
-	public void save(){
-		this.getConfig().save();
-	}
-	
-	public void apply(){
-		if(this.getSynth() != null && this.getSynth().isInitialized()){
-			this.restartSynth = false;
-			this.applyStringProperty( AUDIO_DRIVER );
-			this.applyStringProperty( AUDIO_SAMPLE_FORMAT );
-			this.applyIntegerProperty(AUDIO_PERIOD_SIZE );
-			this.applyIntegerProperty(AUDIO_PERIOD_COUNT );
-			this.applyDoubleProperty(SYNTH_GAIN );
-			this.applyDoubleProperty(SYNTH_SAMPLE_RATE );
-			this.applyStringProperty(SYNTH_REVERB_ACTIVE );
-			this.applyStringProperty(SYNTH_CHORUS_ACTIVE );
-			this.applyIntegerProperty(SYNTH_POLYPHONY );
-			if( this.restartSynth ){
-				this.getSynth().reconnect();
-				this.restartSynth = false;
-			}
-		}
-	}
-	
-	private void applyStringProperty( String property ){
-		String newValue = this.getStringValue( property );
-		String oldValue = this.getSynth().getStringProperty( property );
-		if( newValue != null ){
-			if( oldValue == null || !newValue.equals( oldValue ) ){
-				this.getSynth().setStringProperty( property, newValue );
-				this.restartSynth = (this.restartSynth || !this.getSynth().isRealtimeProperty( property ));
-			}
-		}
-	}
-	
-	private void applyDoubleProperty( String property ){
-		double newValue = this.getDoubleValue( property );
-		double oldValue = this.getSynth().getDoubleProperty( property );
-		if( newValue != oldValue ){
-			this.getSynth().setDoubleProperty( property, newValue );
-			this.restartSynth = (this.restartSynth || !this.getSynth().isRealtimeProperty( property ));
-		}
-	}
-	
-	private void applyIntegerProperty( String property ){
-		int newValue = this.getIntegerValue( property );
-		int oldValue = this.getSynth().getIntegerProperty( property );
-		if( newValue != oldValue ){
-			this.getSynth().setIntegerProperty( property, newValue );
-			this.restartSynth = (this.restartSynth || !this.getSynth().isRealtimeProperty( property ));
-		}
-	}
-}
diff --git a/TuxGuitar-fluidsynth/winbuild/GNUmakefile b/TuxGuitar-fluidsynth/winbuild/GNUmakefile
deleted file mode 100644
index bc1bffbd..00000000
--- a/TuxGuitar-fluidsynth/winbuild/GNUmakefile
+++ /dev/null
@@ -1,21 +0,0 @@
-CFLAGS?=-mno-cygwin -I./include -I$(shell gcj -print-file-name=include/)
-LDFLAGS?=-mno-cygwin -Wl,--kill-at
-LDLIBS?=-llibfluidsynth-1
-LDPATH?=-L./
-LIBRARY_PREFIX?=
-LIBRARY_NAME?=tuxguitar-fluidsynth-jni
-LIBRARY_EXTENSION?=.dll
-
-LIBRARY=$(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
-OBJECTS=../jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all:    $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(CC) $(LDFLAGS) -shared -o $(LIBRARY) $(OBJECTS) $(LDPATH) $(LDLIBS)
-
-clean: 
-	rm -f $(OBJECTS) $(LIBRARY)
diff --git a/TuxGuitar-fluidsynth/winbuild/tuxguitar-fluidsynth.jar b/TuxGuitar-fluidsynth/winbuild/tuxguitar-fluidsynth.jar
deleted file mode 100644
index 756ede06..00000000
Binary files a/TuxGuitar-fluidsynth/winbuild/tuxguitar-fluidsynth.jar and /dev/null differ
diff --git a/TuxGuitar-gervill/build.properties b/TuxGuitar-gervill/build.properties
deleted file mode 100644
index 0dc1adb2..00000000
--- a/TuxGuitar-gervill/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.gervill=../TuxGuitar/lib/gervill.jar
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-gervill/build.xml b/TuxGuitar-gervill/build.xml
deleted file mode 100644
index 6a95f638..00000000
--- a/TuxGuitar-gervill/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-gervill" basedir="." default="all">
-	<description>
-		TuxGuitar Gervill
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-gervill.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.gervill}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiMessageUtils.java b/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiMessageUtils.java
deleted file mode 100644
index 301bc328..00000000
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiMessageUtils.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.herac.tuxguitar.io.gervill;
-
-import javax.sound.midi.InvalidMidiDataException;
-import javax.sound.midi.MetaMessage;
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.ShortMessage;
-
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiMessageUtils {
-	
-	public static final byte TICK_MOVE = 0x01;
-	
-	private static int fixValue(int value){
-		int fixedValue = value;
-		fixedValue = Math.min(fixedValue,127);
-		fixedValue = Math.max(fixedValue,0);
-		return fixedValue;
-	}
-	
-	private static int fixChannel(int channel){
-		int fixedChannel = channel;
-		fixedChannel = Math.min(fixedChannel,15);
-		fixedChannel = Math.max(fixedChannel,0);
-		return fixedChannel;
-	}
-	
-	public static MidiMessage noteOn(int channel,int note,int velocity){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.NOTE_ON, fixChannel(channel), fixValue(note), fixValue(velocity));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage noteOff(int channel,int note,int velocity){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.NOTE_OFF, fixChannel(channel), fixValue(note), fixValue(velocity));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage controlChange(int channel,int controller,int value){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.CONTROL_CHANGE,fixChannel(channel),fixValue(controller), fixValue(value));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage programChange(int channel,int instrument){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.PROGRAM_CHANGE, fixChannel(channel), fixValue(instrument), 0);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage pitchBend(int channel,int value){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.PITCH_BEND, fixChannel(channel), 0, fixValue(value));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage systemReset(){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.SYSTEM_RESET);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage tempoInUSQ(int usq){
-		try {
-			MetaMessage message = new MetaMessage();
-			message.setMessage(0x51, new byte[]{ (byte)((usq >> 16) & 0x00FF),(byte)((usq >> 8) & 0x00FF),(byte)((usq) & 0x00FF) }, 3);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage timeSignature(TGTimeSignature ts){
-		try {
-			MetaMessage message = new MetaMessage();
-			message.setMessage(0x58, new byte[]{  (byte)ts.getNumerator(),(byte)ts.getDenominator().getIndex(),(byte)(96 / ts.getDenominator().getValue()),8 }, 4);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiSequenceHandlerImpl.java b/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiSequenceHandlerImpl.java
deleted file mode 100644
index 9c30df1a..00000000
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiSequenceHandlerImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.herac.tuxguitar.io.gervill;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.sound.midi.MidiEvent;
-
-import org.herac.tuxguitar.player.base.MidiSequenceHandler;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
-	
-	private List events;
-	
-	public MidiSequenceHandlerImpl(int tracks ){
-		super(tracks);
-		this.events = new ArrayList();
-	}
-	
-	public void addControlChange(long tick,int track,int channel, int controller, int value) {
-		this.events.add(new MidiEvent(MidiMessageUtils.controlChange(channel, controller, value), tick ));
-	}
-	
-	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
-		this.events.add(new MidiEvent(MidiMessageUtils.noteOff(channel, note, velocity), tick ));
-	}
-	
-	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
-		this.events.add(new MidiEvent(MidiMessageUtils.noteOn(channel, note, velocity), tick ));
-	}
-	
-	public void addPitchBend(long tick,int track,int channel, int value) {
-		this.events.add(new MidiEvent(MidiMessageUtils.pitchBend(channel, value), tick ));
-	}
-	
-	public void addProgramChange(long tick,int track,int channel, int instrument) {
-		this.events.add(new MidiEvent(MidiMessageUtils.programChange(channel, instrument), tick ));
-	}
-	
-	public void addTempoInUSQ(long tick,int track,int usq) {
-		this.events.add(new MidiEvent(MidiMessageUtils.tempoInUSQ(usq), tick ));
-	}
-	
-	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
-		this.events.add(new MidiEvent(MidiMessageUtils.timeSignature(ts), tick ));
-	}
-	
-	public void notifyFinish() {
-		// not implemented
-	}
-	
-	public List getEvents(){
-		return this.events;
-	}
-}
diff --git a/TuxGuitar-gpx/GNUmakefile b/TuxGuitar-gpx/GNUmakefile
deleted file mode 100644
index e8fdf943..00000000
--- a/TuxGuitar-gpx/GNUmakefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/make -f
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-gpx
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
diff --git a/TuxGuitar-gpx/build.properties b/TuxGuitar-gpx/build.properties
deleted file mode 100644
index 9169fabc..00000000
--- a/TuxGuitar-gpx/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
diff --git a/TuxGuitar-gpx/build.xml b/TuxGuitar-gpx/build.xml
deleted file mode 100644
index b78d3a6a..00000000
--- a/TuxGuitar-gpx/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-gpx" basedir="." default="all">
-	<description>
-	TuxGuitar GPX File Format Support
-	</description>
-		
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-gpx.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXDocument.java b/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXDocument.java
deleted file mode 100644
index d9ce1719..00000000
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXDocument.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.herac.tuxguitar.io.gpx.score;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class GPXDocument {
-	
-	private GPXScore score;
-	private List tracks;
-	private List masterBars;
-	private List bars;
-	private List voices;
-	private List beats;
-	private List notes;
-	private List rhythms;
-	private List automations;
-	
-	public GPXDocument(){
-		this.score = new GPXScore();
-		this.tracks = new ArrayList();
-		this.masterBars = new ArrayList();
-		this.bars = new ArrayList();
-		this.voices = new ArrayList();
-		this.beats = new ArrayList();
-		this.notes = new ArrayList();
-		this.rhythms = new ArrayList();
-		this.automations = new ArrayList();
-	}
-	
-	public GPXScore getScore(){
-		return this.score;
-	}
-	
-	public List getTracks() {
-		return this.tracks;
-	}
-	
-	public List getMasterBars() {
-		return this.masterBars;
-	}
-	
-	public List getBars() {
-		return this.bars;
-	}
-	
-	public List getVoices() {
-		return this.voices;
-	}
-	
-	public List getBeats() {
-		return this.beats;
-	}
-	
-	public List getNotes() {
-		return this.notes;
-	}
-	
-	public List getRhythms() {
-		return this.rhythms;
-	}
-	
-	public List getAutomations() {
-		return this.automations;
-	}
-	
-	public GPXBar getBar( int id ){
-		Iterator it = this.bars.iterator();
-		while( it.hasNext() ){
-			GPXBar bar = (GPXBar)it.next();
-			if( bar.getId() == id ){
-				return bar;
-			}
-		}
-		return null;
-	}
-	
-	public GPXVoice getVoice( int id ){
-		Iterator it = this.voices.iterator();
-		while( it.hasNext() ){
-			GPXVoice voice = (GPXVoice)it.next();
-			if( voice.getId() == id ){
-				return voice;
-			}
-		}
-		return null;
-	}
-	
-	public GPXBeat getBeat( int id ){
-		Iterator it = this.beats.iterator();
-		while( it.hasNext() ){
-			GPXBeat beat = (GPXBeat)it.next();
-			if( beat.getId() == id ){
-				return beat;
-			}
-		}
-		return null;
-	}
-	
-	public GPXNote getNote( int id ){
-		Iterator it = this.notes.iterator();
-		while( it.hasNext() ){
-			GPXNote note = (GPXNote)it.next();
-			if( note.getId() == id ){
-				return note;
-			}
-		}
-		return null;
-	}
-	
-	public GPXRhythm getRhythm( int id ){
-		Iterator it = this.rhythms.iterator();
-		while( it.hasNext() ){
-			GPXRhythm rhythm = (GPXRhythm)it.next();
-			if( rhythm.getId() == id ){
-				return rhythm;
-			}
-		}
-		return null;
-	}
-	
-	public GPXAutomation getAutomation( String type, int untilBarId ){
-		GPXAutomation result = null;
-		
-		Iterator it = this.automations.iterator();
-		while( it.hasNext() ){
-			GPXAutomation automation = (GPXAutomation)it.next();
-			if( automation.getType() != null && automation.getType().equals( type ) ){
-				if( automation.getBarId() <= untilBarId  && ( result == null || automation.getBarId() > result.getBarId() )){
-					result = automation;
-				}
-			}
-		}
-		return result;
-	}
-}
diff --git a/TuxGuitar-gtp/GNUmakefile b/TuxGuitar-gtp/GNUmakefile
deleted file mode 100644
index 6ca2d24d..00000000
--- a/TuxGuitar-gtp/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:24 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-gtp
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:25:24 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-gtp/build.properties b/TuxGuitar-gtp/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-gtp/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-gtp/build.xml b/TuxGuitar-gtp/build.xml
deleted file mode 100644
index 3e843ea4..00000000
--- a/TuxGuitar-gtp/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-gtp" basedir="." default="all">
-	<description>
-	TuxGuitar GPx File Format Support
-	</description>
-		
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-gtp.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-image/GNUmakefile b/TuxGuitar-image/GNUmakefile
deleted file mode 100644
index 5a3dc5d6..00000000
--- a/TuxGuitar-image/GNUmakefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-image
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/TuxGuitar-image/build.properties b/TuxGuitar-image/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-image/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-image/build.xml b/TuxGuitar-image/build.xml
deleted file mode 100644
index b6986f60..00000000
--- a/TuxGuitar-image/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-image" basedir="." default="all">
-	<description>
-		TuxGuitar Image Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-image.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.swt}"/>
-		<pathelement location="${path.tuxguitar}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-jack/GNUmakefile b/TuxGuitar-jack/GNUmakefile
deleted file mode 100644
index d251fa3a..00000000
--- a/TuxGuitar-jack/GNUmakefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-jack
-LIBRARY?=lib$(PACKAGE).so
-LIBRARY_JNI?=lib$(PACKAGE)-jni.so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_LIBRARY_PATH_JNI?=$(TG_PREFIX)/lib/jni
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_JNI_DIR?=$(TG_LIBRARY_PATH_JNI)
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-JAVA_SOURCE_PATH?=./src/
-JAVA_SOURCES?=$(shell find $(JAVA_SOURCE_PATH) -name "*.java")
-JAVA_OBJECTS?=$(PACKAGE).o
-JNI_SOURCE_PATH?=./jni/
-JNI_SOURCES?=$(shell find $(JNI_SOURCE_PATH) -name "*.c")
-JNI_OBJECTS?=$(JNI_SOURCES:%.c=%.o)
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(JAVA_SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH) 
-
-CC=gcc
-CFLAGS=-fPIC -I $(shell $(GCJ) -print-file-name=include/)
-
-default: all
-
-all: objects library library_jni
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(JAVA_OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-library_jni: $(LIBRARY_JNI)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-install $(LIBRARY_JNI) $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $(@F) $<
-
-$(PACKAGE).o: $(JAVA_SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(JAVA_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) -ltuxguitar -L$(TG_LIBRARY_PATH)
-
-$(LIBRARY_JNI): $(JNI_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) `pkg-config --libs jack`
-
-#------------------------------------------------------------------------------
diff --git a/TuxGuitar-jack/build.properties b/TuxGuitar-jack/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-jack/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-jack/build.xml b/TuxGuitar-jack/build.xml
deleted file mode 100644
index 88d66032..00000000
--- a/TuxGuitar-jack/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-jack" basedir="." default="all">
-	<description>
-	TuxGuitar JACK Audio Connection Kit
-	</description>
-		
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-jack.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-jack/jni/GNUmakefile b/TuxGuitar-jack/jni/GNUmakefile
deleted file mode 100644
index 595dd9d1..00000000
--- a/TuxGuitar-jack/jni/GNUmakefile
+++ /dev/null
@@ -1,24 +0,0 @@
-CFLAGS?=-I$(shell gcj -print-file-name=include/)
-CFLAGS+=-fPIC
-LDFLAGS?=
-LDLIBS?=`pkg-config --libs jack`
-LDPATH?=
-LIBRARY_PREFIX?=lib
-LIBRARY_NAME?=tuxguitar-jack-jni
-LIBRARY_EXTENSION?=.so
-
-LIBRARY=$(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
-OBJECTS=org_herac_tuxguitar_jack_JackClient.o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all:    $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(CC) $(LDFLAGS) -shared -o $(LIBRARY) $(OBJECTS) $(LDPATH) $(LDLIBS)
-
-clean: 
-	rm -f $(OBJECTS) $(LIBRARY)
-
-#eof "$Id: GNUmakefile,v 1.10 2008/04/17 20:06:34 rzr Exp $"
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java b/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java
deleted file mode 100644
index 64b777b5..00000000
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.herac.tuxguitar.jack.sequencer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.jack.JackClient;
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-import org.herac.tuxguitar.player.base.MidiSequencer;
-import org.herac.tuxguitar.player.base.MidiSequencerProvider;
-
-public class JackSequencerProvider implements MidiSequencerProvider{
-	
-	private List jackSequencerProviders;
-	private JackClient jackClient;
-	
-	public JackSequencerProvider(JackClient jackClient){
-		this.jackClient = jackClient;
-	}
-	
-	public List listSequencers() throws MidiPlayerException {
-		if(this.jackSequencerProviders == null){
-			this.jackSequencerProviders = new ArrayList();
-			this.jackSequencerProviders.add(new JackSequencer(this.jackClient));
-		}
-		return this.jackSequencerProviders;
-	}
-	
-	public void closeAll() throws MidiPlayerException {
-		Iterator it = listSequencers().iterator();
-		while(it.hasNext()){
-			MidiSequencer sequencer = (MidiSequencer)it.next();
-			sequencer.close();
-		}
-	}
-	
-}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTickController.java b/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTickController.java
deleted file mode 100644
index c4b06402..00000000
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTickController.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.herac.tuxguitar.jack.sequencer;
-
-import java.util.List;
-
-import org.herac.tuxguitar.jack.JackClient;
-import org.herac.tuxguitar.song.models.TGDuration;
-
-public class JackTickController {
-	
-	private static final int TRANSPORT_FRAME_WAIT_TIME = 10;
-	private static final int TRANSPORT_FRAME_WAIT_COUNT = 10;
-	
-	private int tempo;
-	private long frame;
-	private long lastFrame;
-	private long tickLength;
-	private double tick;
-	
-	private Object lock;
-	private JackSequencer sequencer;
-	
-	public JackTickController(JackSequencer sequencer){
-		this.lock = new Object();
-		this.sequencer = sequencer;
-	}
-	
-	public void process() {
-		synchronized (this.lock) {
-			long frameRate = this.sequencer.getJackClient().getTransportFrameRate();
-			this.lastFrame = this.frame;
-			this.frame = this.sequencer.getJackClient().getTransportFrame();
-			this.tick += ((double)TGDuration.QUARTER_TIME * ((double)getTempo() * (double)(this.frame - this.lastFrame) / 60.00) / (double)frameRate);
-		}
-	}
-	
-	public void setTick(long tick , boolean updateTransport ) {
-		synchronized (this.lock) {
-			long frameRate = this.sequencer.getJackClient().getTransportFrameRate();
-			if( updateTransport ){
-				this.setTransportFrame(Math.round( tickToFrame(tick, frameRate )));
-			}
-			this.frame = this.sequencer.getJackClient().getTransportFrame();
-			this.tick = this.frameToTick( this.frame , frameRate );
-		}
-	}
-	
-	public double getTick() {
-		return this.tick;
-	}
-	
-	public long getTickLength() {
-		return this.tickLength;
-	}
-	
-	public void clearTick(){
-		this.tickLength = 0;
-	}
-	
-	public void notifyTick(long tick){
-		this.tickLength = Math.max(this.tickLength,tick);
-	}
-	
-	public void setTempo(int tempo) {
-		this.tempo = tempo;
-	}
-	
-	public int getTempo() {
-		return this.tempo;
-	}
-	
-	public void setTransportFrame( long frame ){
-		JackClient jackClient = this.sequencer.getJackClient();
-		jackClient.setTransportFrame( frame );
-		try{
-			Object transportFrameLock = new Object();
-			
-			int tryIndex = 0;
-			int tryCount = TRANSPORT_FRAME_WAIT_COUNT;
-			while(!jackClient.isTransportRunning() && jackClient.getTransportFrame() != frame && (tryIndex++ < tryCount)){
-				synchronized (transportFrameLock) {
-					transportFrameLock.wait(TRANSPORT_FRAME_WAIT_TIME);
-				}
-			}
-		}catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public double frameToTick( long frame , long frameRate ){
-		double framePos = 0;
-		double tempo = 120;
-		double tick = TGDuration.QUARTER_TIME;
-		
-		List tempoChanges = this.sequencer.getJackEventController().getTempoChanges();
-		for(int i = 0; i < tempoChanges.size(); i ++){
-			long[] tc = (long[])tempoChanges.get(i);
-			double tcTick = tc[0];
-			double tcValue = tc[1];
-			
-			double tickFrames = ( (((double)frameRate * (tcTick - tick)) / (double)TGDuration.QUARTER_TIME ) * (60.00 / tempo) );
-			if( framePos + tickFrames <= frame ){
-				framePos += tickFrames;
-				tempo = tcValue;
-				tick = tcTick;
-			}else{
-				break;
-			}
-		}
-		if( frame > framePos ){
-			double timeFrame = ( ( (double)(frame - framePos) / (double)frameRate ) * 1000.00 );
-			double timeTick =  ( ( timeFrame * (double)TGDuration.QUARTER_TIME ) / 1000.00 );
-			
-			tick += ( timeTick * ( tempo / 60.00 ) );
-		}
-		
-		return tick;
-	}
-	
-	public double tickToFrame( long tick , long frameRate ){
-		double tickPos = TGDuration.QUARTER_TIME;
-		double tempo = 120;
-		double frame = 0;
-		
-		List tempoChanges = this.sequencer.getJackEventController().getTempoChanges();
-		for(int i = 0; i < tempoChanges.size(); i ++){
-			long[] tc = (long[])tempoChanges.get(i);
-			double tcTick = tc[0];
-			double tcValue = tc[1];
-			
-			double tickFrames = ((((double) frameRate * (tcTick - tickPos)) / (double)TGDuration.QUARTER_TIME ) * (60.00 / tempo));
-			if( tcTick <= tick ){
-				frame += tickFrames;
-				tempo = tcValue;
-				tickPos = tcTick;
-			}else{
-				break;
-			}
-		}
-		if( tick > tickPos ){
-			double timeTick = ( ( (double)( tick - tickPos ) / (double)TGDuration.QUARTER_TIME ) * 1000.00 );
-			double timeFrame = ( ( timeTick * (double)frameRate ) / 1000.00 );
-			
-			frame += (timeFrame * ( 60.00 / tempo));
-		}
-		
-		return frame;
-	}
-}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java b/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java
deleted file mode 100644
index 5435acb4..00000000
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.herac.tuxguitar.jack.synthesizer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.jack.JackClient;
-import org.herac.tuxguitar.jack.settings.JackSettings;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class JackOutputPortProvider implements MidiOutputPortProvider{
-	
-	private List jackOutputPorts;
-	private JackClient jackClient;
-	private JackSettings jackSettings;
-	
-	public JackOutputPortProvider(JackClient jackClient,JackSettings jackSettings){
-		this.jackClient = jackClient;
-		this.jackSettings = jackSettings;
-	}
-	
-	public List listPorts() {
-		if(this.jackOutputPorts == null){
-			this.jackOutputPorts = new ArrayList();
-			this.jackOutputPorts.add(new JackOutputPort( this.jackClient , this.jackSettings ));
-		}
-		return this.jackOutputPorts;
-	}
-	
-	public void closeAll(){
-		if(this.jackClient.isPortsOpen()){
-			this.jackClient.closePorts();
-		}
-	}
-	
-}
diff --git a/TuxGuitar-jsa/build.properties b/TuxGuitar-jsa/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-jsa/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-jsa/build.xml b/TuxGuitar-jsa/build.xml
deleted file mode 100644
index db71335e..00000000
--- a/TuxGuitar-jsa/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-jsa" basedir="." default="all">
-	<description>
-		TuxGuitar Java Sound Api
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-jsa.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   T U X G U I T A R  -  J S A           |</echo>
-		<echo>+------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   T U X G U I T A R  -  J S A           |</echo>
-		<echo>+------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.4 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/MidiPluginList.java b/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/MidiPluginList.java
deleted file mode 100644
index 0020da1d..00000000
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/MidiPluginList.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.widgets.Shell;
-import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiSequencerProviderPlugin;
-import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-import org.herac.tuxguitar.player.base.MidiSequencerProvider;
-import org.herac.tuxguitar.player.impl.jsa.midiport.MidiPortProviderImpl;
-import org.herac.tuxguitar.player.impl.jsa.sequencer.MidiSequencerProviderImpl;
-import org.herac.tuxguitar.player.impl.jsa.utils.MidiConfigUtils;
-
-public class MidiPluginList extends TGPluginList implements TGPluginSetup{
-	
-	protected List getPlugins() {
-		List plugins = new ArrayList();
-		plugins.add(new TGMidiOutputPortProviderPlugin() {
-			protected MidiOutputPortProvider getProvider() {
-				return new MidiPortProviderImpl();
-			}
-		});
-		plugins.add(new TGMidiSequencerProviderPlugin() {
-			protected MidiSequencerProvider getProvider() {
-				return new MidiSequencerProviderImpl();
-			}
-		});
-		return plugins;
-	}
-	
-	public void setupDialog(Shell parent) {
-		MidiConfigUtils.setupDialog(parent);
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "Java Sound Api plugin";
-	}
-	
-	public String getName() {
-		return "Java Sound Api plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java b/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
deleted file mode 100644
index aa87fe2c..00000000
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa.sequencer;
-
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.Receiver;
-import javax.sound.midi.ShortMessage;
-
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-
-public class MidiReceiverImpl implements Receiver{
-	
-	private MidiSequencerImpl sequencer;
-	
-	public MidiReceiverImpl(MidiSequencerImpl sequencer){
-		this.sequencer = sequencer;
-	}
-	
-	public void send(MidiMessage message, long timeStamp) {
-		try {
-			if( this.sequencer.isRunning() ){
-				parseMessage(message.getMessage());
-			}
-		} catch (MidiPlayerException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void close(){
-		//not implemented
-	}
-	
-	private void parseMessage(byte[] data) throws MidiPlayerException{
-		int length = data.length;
-		
-		//NOTE ON
-		if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.NOTE_ON){
-			parseNoteOn(data);
-		}
-		//NOTE OFF
-		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.NOTE_OFF){
-			parseNoteOff(data);
-		}
-		//PROGRAM CHANGE
-		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.PROGRAM_CHANGE){
-			parseProgramChange(data);
-		}
-		//CONTROL CHANGE
-		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.CONTROL_CHANGE){
-			parseControlChange(data);
-		}
-		//PITCH BEND
-		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.PITCH_BEND){
-			parsePitchBend(data);
-		}
-	}
-	
-	private void parseNoteOn(byte[] data) throws MidiPlayerException{
-		int length = data.length;
-		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):0;
-		int value = (length > 1)?(data[1] & 0xFF):0;
-		int velocity = (length > 2)?(data[2] & 0xFF):0;
-		
-		if(velocity == 0){
-			parseNoteOff(data);
-		}else if(value > 0){
-			this.sequencer.getTransmitter().sendNoteOn(channel,value,velocity);
-		}
-	}
-	
-	private void parseNoteOff(byte[] data) throws MidiPlayerException{
-		int length = data.length;
-		
-		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):0;
-		int value = (length > 1)?(data[1] & 0xFF):0;
-		int velocity = (length > 2)?(data[2] & 0xFF):0;
-		
-		this.sequencer.getTransmitter().sendNoteOff(channel,value,velocity);
-	}
-	
-	private void parseProgramChange(byte[] data) throws MidiPlayerException{
-		int length = data.length;
-		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
-		int instrument = (length > 1)?(data[1] & 0xFF):-1;
-		if(channel != -1 && instrument != -1){
-			this.sequencer.getTransmitter().sendProgramChange(channel,instrument);
-		}
-	}
-	
-	private void parseControlChange(byte[] data) throws MidiPlayerException{
-		int length = data.length;
-		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
-		int control = (length > 1)?(data[1] & 0xFF):-1;
-		int value = (length > 2)?(data[2] & 0xFF):-1;
-		if(channel != -1 && control != -1 && value != -1){
-			this.sequencer.getTransmitter().sendControlChange(channel,control,value);
-		}
-	}
-	
-	private void parsePitchBend(byte[] data) throws MidiPlayerException{
-		int length = data.length;
-		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
-		int value = (length > 2)?(data[2] & 0xFF):-1;
-		if(channel != -1 && value != -1){
-			this.sequencer.getTransmitter().sendPitchBend(channel,value);
-		}
-	}
-}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java b/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
deleted file mode 100644
index 1f61ced3..00000000
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa.sequencer;
-
-import javax.sound.midi.Sequence;
-import javax.sound.midi.Sequencer;
-import javax.sound.midi.Track;
-import javax.sound.midi.Transmitter;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-import org.herac.tuxguitar.player.base.MidiSequenceHandler;
-import org.herac.tuxguitar.player.base.MidiSequencer;
-import org.herac.tuxguitar.player.base.MidiTransmitter;
-
-public class MidiSequencerImpl implements MidiSequencer,MidiSequenceLoader{
-	
-	private static final int TICK_MOVE = 1;
-	
-	private Object lock;
-	private Sequencer sequencer;
-	private Transmitter sequencerTransmitter;
-	private MidiTransmitter transmitter;
-	
-	public MidiSequencerImpl(Sequencer sequencer){
-		this.lock = new Object();
-		this.sequencer = sequencer;
-	}
-	
-	public synchronized void open() {
-		try {
-			if(!this.sequencer.isOpen()){
-				this.sequencer.open();
-				this.closeTransmitter();
-				this.openTransmitter();
-			}
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public synchronized void close() {
-		try {
-			if(this.sequencer.isOpen()){
-				this.sequencer.close();
-				this.closeTransmitter();
-			}
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void openTransmitter(){
-		try {
-			this.sequencerTransmitter = getSequencer().getTransmitter();
-			this.sequencerTransmitter.setReceiver( new MidiReceiverImpl(this) );
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void closeTransmitter(){
-		try {
-			if(this.sequencerTransmitter != null){
-				this.sequencerTransmitter.close();
-				this.sequencerTransmitter = null;
-			}
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	protected Sequencer getSequencer(boolean open) {
-		if( open ){
-			this.open();
-		}
-		return this.sequencer;
-	}
-	
-	protected Sequencer getSequencer() {
-		return this.getSequencer(true);
-	}
-	
-	public MidiSequenceHandler createSequence(int tracks) {
-		this.resetTracks();
-		return new MidiSequenceHandlerImpl(this,tracks);
-	}
-	
-	public synchronized MidiTransmitter getTransmitter() {
-		return this.transmitter;
-	}
-	
-	public synchronized void setTransmitter(MidiTransmitter transmitter) {
-		this.transmitter = transmitter;
-	}
-	
-	public long getTickLength() {
-		try {
-			return getSequencer().getTickLength();
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-		return 0;
-	}
-	
-	public long getTickPosition() {
-		try {
-			return (getSequencer().getTickPosition() + TICK_MOVE);
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-		return 0;
-	}
-	
-	public void setTickPosition(long tickPosition) {
-		try {
-			this.getSequencer().setTickPosition(tickPosition - TICK_MOVE);
-			this.reset();
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void setMute(int index, boolean mute) {
-		try {
-			getSequencer().setTrackMute(index, mute);
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void setSolo(int index, boolean solo) {
-		try {
-			getSequencer().setTrackSolo(index, solo);
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void setSequence(Sequence sequence){
-		try {
-			getSequencer().setSequence(sequence);
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void start() {
-		try {
-			this.setRunning( true );
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void stop() {
-		try {
-			this.setRunning( false );
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public boolean isRunning() {
-		try {
-			return ( getSequencer( false ) != null && getSequencer( false ).isRunning() );
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-		return false;
-	}
-	
-	public void setRunning( boolean running ) {
-		try {
-			synchronized ( this.lock ) {
-				if( running && !this.isRunning() ){
-					this.getSequencer().start();
-				}else if( !running && this.isRunning() ){
-					this.getSequencer().stop();
-					this.reset();
-				}
-			}
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void reset(){
-		try {
-			this.getTransmitter().sendAllNotesOff();
-			for(int channel = 0; channel < 16;channel ++){
-				this.getTransmitter().sendPitchBend(channel, 64);
-			}
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public void resetTracks(){
-		try {
-			Sequence sequence = this.getSequencer().getSequence();
-			if(sequence != null){
-				Track[] tracks = sequence.getTracks();
-				if( tracks != null ){
-					int count = tracks.length;
-					for( int i = 0 ; i < count; i++ ){
-						this.setSolo( i , false );
-						this.setMute( i , false );
-					}
-				}
-			}
-		} catch (Throwable throwable) {
-			throwable.printStackTrace();
-		}
-	}
-	
-	public String getKey() {
-		return this.sequencer.getDeviceInfo().getName();
-	}
-	
-	public String getName() {
-		return this.sequencer.getDeviceInfo().getName();
-	}
-	
-	public void check() throws MidiPlayerException {
-		this.getSequencer( true );
-		if( this.sequencer == null || !this.sequencer.isOpen() ){
-			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.midi.unavailable"));
-		}
-	}
-}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java b/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
deleted file mode 100644
index 1b42af1c..00000000
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa.sequencer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.sound.midi.MidiDevice;
-import javax.sound.midi.MidiSystem;
-import javax.sound.midi.MidiUnavailableException;
-import javax.sound.midi.Sequencer;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-import org.herac.tuxguitar.player.base.MidiSequencer;
-import org.herac.tuxguitar.player.base.MidiSequencerProvider;
-
-public class MidiSequencerProviderImpl implements MidiSequencerProvider{
-	
-	public MidiSequencerProviderImpl(){
-		super();
-	}
-	
-	public List listSequencers() throws MidiPlayerException {
-		try {
-			List sequencers = new ArrayList();
-			MidiDevice.Info[] infos = MidiSystem.getMidiDeviceInfo();
-			for(int i = 0; i < infos.length; i++){
-				try {
-					Iterator it = sequencers.iterator();
-					boolean exists = false;
-					while(it.hasNext()){
-						if( ((MidiSequencer)it.next()).getKey().equals(infos[i].getName()) ){
-							exists = true;
-							break;
-						}
-					}
-					if(!exists){
-						MidiDevice device = MidiSystem.getMidiDevice(infos[i]);
-						if(device instanceof Sequencer){
-							sequencers.add(new MidiSequencerImpl((Sequencer)device));
-						}
-					}
-				} catch (MidiUnavailableException e) {
-					throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.midi.unavailable"),e);
-				}
-			}
-			return sequencers;
-		}catch (Throwable t) {
-			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.unknown"),t);
-		}
-	}
-	
-	public void closeAll() throws MidiPlayerException {
-		// Not implemented
-	}
-}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiConfigUtils.java b/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiConfigUtils.java
deleted file mode 100644
index cd70ac44..00000000
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiConfigUtils.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa.utils;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.system.config.TGConfigManager;
-import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
-import org.herac.tuxguitar.app.util.DialogUtils;
-import org.herac.tuxguitar.app.util.FileChooser;
-import org.herac.tuxguitar.app.util.MessageDialog;
-
-public class MidiConfigUtils {
-	
-	public static final String SOUNDBANK_KEY = "soundbank.custom.path";
-	
-	public static TGConfigManager getConfig(){
-		TGConfigManager config = new TGPluginConfigManager("tuxguitar-jsa");
-		config.init();
-		return config;
-	}
-	
-	public static String getSoundbankPath(){
-		return getSoundbankPath(getConfig());
-	}
-	
-	public static String getSoundbankPath(final TGConfigManager config){
-		return config.getStringConfigValue(SOUNDBANK_KEY);
-	}
-	
-	public static void setupDialog(Shell parent) {
-		setupDialog(parent,getConfig());
-	}
-	
-	public static void setupDialog(Shell parent,final TGConfigManager config) {
-		final String soundbank = getSoundbankPath(config);
-		
-		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		dialog.setLayout(new GridLayout());
-		dialog.setText(TuxGuitar.getProperty("jsa.settings.title"));
-		
-		//------------------SOUNDBANK-----------------------
-		
-		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
-		group.setLayout(new GridLayout());
-		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		group.setText(TuxGuitar.getProperty("jsa.settings.soundbank.tip"));
-		
-		final Button sbDefault = new Button(group,SWT.RADIO);
-		sbDefault.setText(TuxGuitar.getProperty("jsa.settings.soundbank.default"));
-		sbDefault.setSelection( (soundbank == null) );
-		
-		final Button sbCustom = new Button(group,SWT.RADIO);
-		sbCustom.setText(TuxGuitar.getProperty("jsa.settings.soundbank.custom"));
-		sbCustom.setSelection( (soundbank != null) );
-		
-		Composite chooser = new Composite(group,SWT.NONE);
-		chooser.setLayout(new GridLayout(2,false));
-		
-		final Text sbCustomPath = new Text(chooser,SWT.BORDER);
-		sbCustomPath.setLayoutData(new GridData(350,SWT.DEFAULT));
-		sbCustomPath.setText( (soundbank == null ? new String() : soundbank)  );
-		
-		final Button sbCustomChooser = new Button(chooser,SWT.PUSH);
-		sbCustomChooser.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
-		sbCustomChooser.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				String fileName = FileChooser.instance().open(dialog,FileChooser.ALL_FORMATS);
-				if(fileName != null){
-					sbCustomPath.setText(fileName);
-				}
-			}
-		});
-		
-		//------------------BUTTONS--------------------------
-		Composite buttons = new Composite(dialog, SWT.NONE);
-		buttons.setLayout(new GridLayout(2,false));
-		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
-		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
-		data.minimumWidth = 80;
-		data.minimumHeight = 25;
-		
-		final Button buttonOK = new Button(buttons, SWT.PUSH);
-		buttonOK.setText(TuxGuitar.getProperty("ok"));
-		buttonOK.setLayoutData(data);
-		buttonOK.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				String selection = ( sbCustom.getSelection() ? sbCustomPath.getText() : null);
-				
-				boolean changed = false;
-				changed = (selection == null && soundbank != null);
-				changed = changed || (selection != null && soundbank == null);
-				changed = changed || (selection != null && !selection.equals(soundbank) ) ;
-				if(changed){
-					if(selection != null){
-						config.setProperty(SOUNDBANK_KEY,selection);
-					}else{
-						config.removeProperty(SOUNDBANK_KEY);
-					}
-					config.save();
-					
-					MessageDialog.infoMessage(TuxGuitar.getProperty("warning"), TuxGuitar.getProperty("jsa.settings.soundbank-restart-message"));
-				}
-				dialog.dispose();
-			}
-		});
-		
-		Button buttonCancel = new Button(buttons, SWT.PUSH);
-		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
-		buttonCancel.setLayoutData(data);
-		buttonCancel.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				dialog.dispose();
-			}
-		});
-		
-		dialog.setDefaultButton( buttonOK );
-		
-		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-	}
-}
diff --git a/TuxGuitar-jws/build.properties b/TuxGuitar-jws/build.properties
deleted file mode 100644
index 7498a8da..00000000
--- a/TuxGuitar-jws/build.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-tuxguitar.share.path=../TuxGuitar/share
-
-tuxguitar.path=\
-../TuxGuitar/src${path.separator}\
-../TuxGuitar-ascii/src${path.separator}\
-../TuxGuitar-compat/src${path.separator}\
-../TuxGuitar-converter/src${path.separator}\
-../TuxGuitar-gtp/src${path.separator}\
-../TuxGuitar-jsa/src${path.separator}\
-../TuxGuitar-lilypond/src${path.separator}\
-../TuxGuitar-midi/src${path.separator}\
-../TuxGuitar-musicxml/src${path.separator}\
-../TuxGuitar-ptb/src${path.separator}\
-../TuxGuitar-tef/src${path.separator}\
-../TuxGuitar-community/src${path.separator}\
-
-tuxguitar.locale.path=\
-../TuxGuitar/share/lang${path.separator}\
-../TuxGuitar-ascii/share/lang${path.separator}\
-../TuxGuitar-compat/share/lang${path.separator}\
-../TuxGuitar-converter/share/lang${path.separator}\
-../TuxGuitar-gtp/share/lang${path.separator}\
-../TuxGuitar-jsa/share/lang${path.separator}\
-../TuxGuitar-lilypond/share/lang${path.separator}\
-../TuxGuitar-midi/share/lang${path.separator}\
-../TuxGuitar-musicxml/share/lang${path.separator}\
-../TuxGuitar-ptb/share/lang${path.separator}\
-../TuxGuitar-tef/share/lang${path.separator}\
-../TuxGuitar-community/share/lang${path.separator}\
-
-tuxguitar.plugin-classes=\
-org.herac.tuxguitar.io.ascii.ASCIIPluginExporter${line.separator}\
-org.herac.tuxguitar.io.tg.TGPluginListImpl${line.separator}\
-org.herac.tuxguitar.app.tools.custom.converter.TGConverterPlugin${line.separator}\
-org.herac.tuxguitar.io.gtp.GTPPluginList${line.separator}\
-org.herac.tuxguitar.player.impl.jsa.MidiPluginList${line.separator}\
-org.herac.tuxguitar.io.lilypond.LilypondPluginExporter${line.separator}\
-org.herac.tuxguitar.io.midi.MidiPluginList${line.separator}\
-org.herac.tuxguitar.io.musicxml.MusicXMLPluginExporter${line.separator}\
-org.herac.tuxguitar.io.ptb.PTInputStreamPlugin${line.separator}\
-org.herac.tuxguitar.io.tef.TEPluginImporter${line.separator}\
-org.herac.tuxguitar.community.TGCommunityPluginImpl${line.separator}\
diff --git a/TuxGuitar-jws/build.xml b/TuxGuitar-jws/build.xml
deleted file mode 100644
index 36c6d7a6..00000000
--- a/TuxGuitar-jws/build.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-jws" basedir="." default="all">
-	<description>
-		TuxGuitar JWS
-	</description>
-	
-	<property file="build.properties" />
-	
-	<property name="src.dir" value="./src" />
-	
-	<property name="build.dir" value="build" />
-	<property name="build.jar" value="./jws/files/tuxguitar-jws.jar" />
-	
-	<property name="plugin.class" value="org.herac.tuxguitar.app.system.plugins.TGPlugin" />
-	
-	<path id="class.path">
-		<pathelement location="${build.dir}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.dir}" />
-	</target>
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.dir}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+------------------------------------------------------------------+</echo>
-		<echo>|                B U I L D I N G   T U X G U I T A R               |</echo>
-		<echo>+------------------------------------------------------------------+</echo>
-		<javac srcdir="${tuxguitar.path}" destdir="${build.dir}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<echo>+------------------------------------------------------------------+</echo>
-		<echo>|     B U I L D I N G   T U X G U I T A R  -  R E S O U R C E S    |</echo>
-		<echo>+------------------------------------------------------------------+</echo>
-		
-		<antcall target="build.plugins" />
-		<antcall target="build.locales" />
-		<antcall target="build.skins" />
-		<antcall target="build.help" />
-		<antcall target="build.scales" />
-		<antcall target="build.templates" />
-		
-		<echo>+------------------------------------------------------------------+</echo>
-		<echo>|          P A C K A G I N G   T U X G U I T A R  -  J W S         |</echo>
-		<echo>+------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.dir}" />
-		
-	</target>
-	
-	<target name="build.plugins" >
-		<mkdir dir="${build.dir}/META-INF/services" />
-		<echo file="${build.dir}/META-INF/services/${plugin.class}" append="false">#Default Plugins${line.separator}</echo>
-		<echo file="${build.dir}/META-INF/services/${plugin.class}" append="true">${tuxguitar.plugin-classes}</echo>
-	</target>
-	
-	<target name="build.skins" >
-		<mkdir dir="${build.dir}/skins" />
-		<copy todir="${build.dir}/skins">
-			<fileset dir="${tuxguitar.share.path}/skins"/>
-		</copy>
-		
-		<touch file="${build.dir}/skins/list.properties" />
-		<pathconvert property="list.properties" pathsep="${line.separator}">
-			<path>
-				<dirset dir="${build.dir}/skins">
-					<include name="*"/>
-				</dirset>
-			</path>
-			<flattenmapper/>
-		</pathconvert>
-		<echo file="${build.dir}/skins/list.properties" append="false">${list.properties}</echo>
-	</target>
-	
-	<target name="build.help" >
-		<mkdir dir="${build.dir}/help" />
-		<copy todir="${build.dir}/help">
-			<fileset dir="${tuxguitar.share.path}/help"/>
-		</copy>
-		
-		<touch file="${build.dir}/help/list.properties" />
-		<pathconvert property="list.properties" pathsep="${line.separator}">
-			<path>
-				<fileset dir="${build.dir}/help" />
-			</path>
-			<regexpmapper from="/?help/(.*)" to="\1" casesensitive="true"/>
-		</pathconvert>
-		<echo file="${build.dir}/help/list.properties" append="false">${list.properties}</echo>
-	</target>
-	
-	<target name="build.scales" >
-		<mkdir dir="${build.dir}/scales" />
-		<copy todir="${build.dir}/scales">
-			<fileset dir="${tuxguitar.share.path}/scales"/>
-		</copy>
-	</target>
-	
-	<target name="build.templates" >
-		<mkdir dir="${build.dir}/templates" />
-		<copy todir="${build.dir}/templates">
-			<fileset dir="${tuxguitar.share.path}/templates"/>
-		</copy>
-	</target>
-	
-	<target name="build.locales" >
-		<mkdir dir="${build.dir}/lang" />
-		<touch file="${build.dir}/lang/list.properties" />
-		
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_bg.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_el.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_en.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_es.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_nl.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_sr.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_ca.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_fr.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_pl.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_sv.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_cs.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_hu.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_uk.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_de.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_it.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_pt.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_vi.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_ja.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_ru.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_eu.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_fi.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_zh_TW.properties"/>
-		</antcall>
-		<antcall target="build.locale">
-			<param name="locale.file" value="messages_zh_GB.properties"/>
-		</antcall>
-	</target>
-	
-	<target name="build.locale" >
-		<pathconvert property="locale.path" targetos="unix">
-			<path path="${tuxguitar.locale.path}"/>
-			<regexpmapper from="(.*)" to="\0/${locale.file}" casesensitive="true"/>
-		</pathconvert>
-		<concat destfile="${build.dir}/lang/${locale.file}" fixlastline="true" >
-			<path>
-				<pathelement path="${locale.path}" />
-			</path>
-		</concat>
-		<echo file="${build.dir}/lang/list.properties" append="true">${locale.file}${line.separator}</echo>
-	</target>
-	
-	<target name="keystore" depends="build">
-		<genkey alias="tuxguitar" storepass="tuxguitar" keystore="${build.dir}/tuxguitar-keystore" >
-			<dname>
-				<param name="CN" value="TuxGuitar"/>
-				<param name="OU" value="TuxGuitar"/>
-				<param name="O"  value="Herac"/>
-				<param name="C"  value="AR"/>
-			</dname>
-		</genkey>
-	</target>
-	
-	<target name="signjars" depends="keystore">
-		<signjar alias="tuxguitar" keystore="${build.dir}/tuxguitar-keystore" storepass="tuxguitar" keypass="tuxguitar">
-			<fileset dir="./jws/files" includes="**/*.jar" />
-		</signjar>
-	</target>
-	
-	<target name="all" depends="signjars" />
-</project>
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/swt.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86-64/swt.jar
deleted file mode 100644
index 0f1f8acf..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/swt.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-alsa-jni.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-alsa-jni.jar
deleted file mode 100644
index f58504e5..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-alsa-jni.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-alsa.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-alsa.jar
deleted file mode 100644
index c3e45c7c..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-alsa.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-dist.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-dist.jar
deleted file mode 100644
index 950780c8..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86-64/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86/swt.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86/swt.jar
deleted file mode 100644
index d944ae7a..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86/swt.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-alsa-jni.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-alsa-jni.jar
deleted file mode 100644
index 5ad30739..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-alsa-jni.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-alsa.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-alsa.jar
deleted file mode 100644
index 63860431..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-alsa.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-dist.jar b/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-dist.jar
deleted file mode 100644
index da7da7a2..00000000
Binary files a/TuxGuitar-jws/jws/files/gnu-linux-x86/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86/swt.jar b/TuxGuitar-jws/jws/files/macosx-x86/swt.jar
deleted file mode 100644
index 52e12f3b..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86/swt.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-audiounit-jni.jar b/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-audiounit-jni.jar
deleted file mode 100644
index 0ebfddbf..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-audiounit-jni.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-audiounit.jar b/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-audiounit.jar
deleted file mode 100644
index be0fad1e..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-audiounit.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-cocoa-integration.jar b/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-cocoa-integration.jar
deleted file mode 100644
index ff04b76f..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-cocoa-integration.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-dist.jar b/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-dist.jar
deleted file mode 100644
index 95e743d6..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86_64/swt.jar b/TuxGuitar-jws/jws/files/macosx-x86_64/swt.jar
deleted file mode 100644
index bb60c63b..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86_64/swt.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-audiounit-jni.jar b/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-audiounit-jni.jar
deleted file mode 100644
index 7b152371..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-audiounit-jni.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-audiounit.jar b/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-audiounit.jar
deleted file mode 100644
index a58519e8..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-audiounit.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-cocoa-integration.jar b/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-cocoa-integration.jar
deleted file mode 100644
index 9fec167a..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-cocoa-integration.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-dist.jar b/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-dist.jar
deleted file mode 100644
index 5aec1194..00000000
Binary files a/TuxGuitar-jws/jws/files/macosx-x86_64/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/tuxguitar-jws.jar b/TuxGuitar-jws/jws/files/tuxguitar-jws.jar
deleted file mode 100644
index 44770874..00000000
Binary files a/TuxGuitar-jws/jws/files/tuxguitar-jws.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/windows-x86/swt.jar b/TuxGuitar-jws/jws/files/windows-x86/swt.jar
deleted file mode 100644
index ad4daf22..00000000
Binary files a/TuxGuitar-jws/jws/files/windows-x86/swt.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/files/windows-x86/tuxguitar-dist.jar b/TuxGuitar-jws/jws/files/windows-x86/tuxguitar-dist.jar
deleted file mode 100644
index 6c4ed5d6..00000000
Binary files a/TuxGuitar-jws/jws/files/windows-x86/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-jws/jws/tuxguitar.jnlp b/TuxGuitar-jws/jws/tuxguitar.jnlp
deleted file mode 100644
index 3dd5c5fb..00000000
--- a/TuxGuitar-jws/jws/tuxguitar.jnlp
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<jnlp spec="1.0+" codebase="http://localhost/TuxGuitar-jws/jws/" href="tuxguitar.jnlp">
-	<information>
-  		<title>TuxGuitar</title>
-  		<vendor>Herac Modern Solutions</vendor>
-  		<homepage href="http://www.herac.com.ar" />
-		<offline-allowed/>
-	</information>
-	
-	<security>
-		<all-permissions />
-	</security>
-	
-	<resources>
-		<jar href="files/tuxguitar-jws.jar" />
-	</resources>
-	
-	<resources os="Windows">
-		<j2se version="1.5+" />
-		<jar href="files/windows-x86/swt.jar" />
-		<jar href="files/windows-x86/tuxguitar-dist.jar" />
-	</resources>
-	
-	<resources os="Linux" arch="x86 i386">
-		<j2se version="1.5+" />
-		<jar href="files/gnu-linux-x86/swt.jar" />
-		<jar href="files/gnu-linux-x86/tuxguitar-dist.jar" />
-		<jar href="files/gnu-linux-x86/tuxguitar-alsa.jar" />
-		<nativelib href="files/gnu-linux-x86/tuxguitar-alsa-jni.jar" />
-	</resources>
-	
-	<resources os="Linux" arch="x86_64">
-		<j2se version="1.5+" />
-		<jar href="files/gnu-linux-x86-64/swt.jar" />
-		<jar href="files/gnu-linux-x86-64/tuxguitar-dist.jar" />
-		<jar href="files/gnu-linux-x86-64/tuxguitar-alsa.jar" />
-		<nativelib href="files/gnu-linux-x86-64/tuxguitar-alsa-jni.jar" />
-	</resources>
-	
-	<resources os="Mac\ OS\ X" arch="i386">
-		<j2se version="1.5+" java-vm-args="-XstartOnFirstThread"/>
-		<jar href="files/macosx-x86/swt.jar" />
-		<jar href="files/macosx-x86/tuxguitar-dist.jar" />
-		<jar href="files/macosx-x86/tuxguitar-cocoa-integration.jar" />
-		<jar href="files/macosx-x86/tuxguitar-audiounit.jar" />
-		<nativelib href="files/macosx-x86/tuxguitar-audiounit-jni.jar" />
-	</resources>
-	
-	<resources os="Mac\ OS\ X" arch="x86_64">
-		<j2se version="1.5+" java-vm-args="-XstartOnFirstThread"/>
-		<jar href="files/macosx-x86_64/swt.jar" />
-		<jar href="files/macosx-x86_64/tuxguitar-dist.jar" />
-		<jar href="files/macosx-x86_64/tuxguitar-cocoa-integration.jar" />
-		<jar href="files/macosx-x86_64/tuxguitar-audiounit.jar" />
-		<nativelib href="files/macosx-x86_64/tuxguitar-audiounit-jni.jar" />
-	</resources>
-	
-	<application-desc main-class="org.herac.tuxguitar.app.TGMain" />
-</jnlp>
diff --git a/TuxGuitar-lilypond/GNUmakefile b/TuxGuitar-lilypond/GNUmakefile
deleted file mode 100644
index 00708fd1..00000000
--- a/TuxGuitar-lilypond/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:45 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-lilypond
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:45 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-lilypond/build.properties b/TuxGuitar-lilypond/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-lilypond/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-lilypond/build.xml b/TuxGuitar-lilypond/build.xml
deleted file mode 100644
index 64d8b98d..00000000
--- a/TuxGuitar-lilypond/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-lilypond" basedir="." default="all">
-	<description>
-		TuxGuitar Lilypond Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-lilypond.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.5 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-midi-input/build.properties b/TuxGuitar-midi-input/build.properties
deleted file mode 100644
index 7627ddf7..00000000
--- a/TuxGuitar-midi-input/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-midi-input/build.xml b/TuxGuitar-midi-input/build.xml
deleted file mode 100644
index 64e697f5..00000000
--- a/TuxGuitar-midi-input/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-midi-input" basedir="." default="all">
-	<description>
-		TuxGuitar Midi-Input
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-midi-input.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N   M I D I - I N P U T       |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N   M I D I - I N P U T       |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaff.java b/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaff.java
deleted file mode 100644
index f6caa96d..00000000
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaff.java
+++ /dev/null
@@ -1,439 +0,0 @@
-package org.herac.tuxguitar.midiinput;
-
-import java.util.Iterator;
-import java.util.TreeMap;
-import java.util.ArrayList;
-import java.util.Map;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.song.managers.TGSongManager;
-import org.herac.tuxguitar.song.managers.TGTrackManager;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGNote;
-
-
-class MiStaff
-{
-	private TreeMap	f_Events				= new TreeMap();	// staff events map
-	private TGTrack	f_TgTrack				= null;				// work track
-	private	boolean	f_Dump_Input			= false;			// for debugging...
-	private	boolean	f_Dump_TrackGeneration	= false;			// for debugging...
-
-
-	MiStaff(
-		final ArrayList	inBufferNotes,		// MIDI input notes from buffer [microseconds]
-		int				inTempo,			// quarters per minute
-		long			inStartTime,		// first MIDI time stamp [microseconds]
-		long			inStopTime,			// last MIDI time stamp [microseconds]
-		long			inStartPosition,	// recording start position [ticks]
-		String			inTrackName)		// name for the TuxGuitar track to be created
-	{
-	ArrayList	midiNotes = new ArrayList();
-
-	// make a deep copy of input buffer notes
-	for(Iterator it = inBufferNotes.iterator(); it.hasNext();)
-		midiNotes.add(new MiNote((MiNote)it.next()));
-
-	// convert time stamps from absolute microseconds to song relative ticks
-	for(Iterator it = midiNotes.iterator(); it.hasNext();)
-		{
-		MiNote	note	= (MiNote)it.next();
-		long	timeOn	= note.getTimeOn(),
-				timeOff	= note.getTimeOff();
-
-		// absolute to relative time stamps
-		timeOn	-= inStartTime;
-		timeOff	-= inStartTime;
-
-		// time stamps to ticks
-		timeOn	= inStartPosition + timestampToTicks(inTempo, timeOn);
-		timeOff	= inStartPosition + timestampToTicks(inTempo, timeOff);
-
-		// update values
-		note.setTimeOn(timeOn);
-		note.setTimeOff(timeOff);
-		}
-
-	if(f_Dump_Input)
-		{
-		MiBuffer.dump(inBufferNotes, "input buffer MIDI notes");
-		MiBuffer.dump(midiNotes, "converted MIDI notes");
-		}
-
-	TGSongManager	tgSongMgr		= TuxGuitar.instance().getSongManager();
-	long			startTick		= inStartPosition,
-					stopTick		= inStartPosition + timestampToTicks(inTempo, inStopTime - inStartTime);
-	TGMeasureHeader	mh				= tgSongMgr.getMeasureHeaderAt(startTick);
-	long			firstBarTick	= mh.getStart();
-
-	// insert bars into staff
-	for(long tick = firstBarTick; tick <= stopTick; tick += 4 * TGDuration.QUARTER_TIME)
-		addBar(tick);
-
-	// insert note events into staff
-	for(Iterator it = midiNotes.iterator(); it.hasNext();)
-		addNote((MiNote)it.next());
-
-	// generate bars
-	createMeasures();
-
-	// generate beats
-	insertNotesIntoTrack(inTrackName);
-	}
-
-
-	static	long	timestampToTicks(int inTempo, long inTimeStamp)
-	{
-	long	ticks = (inTimeStamp * inTempo * TGDuration.QUARTER_TIME) / 60000000L;
-
-	return(ticks);
-	}
-
-
-	static	long	ticksToTimestamp(int inTempo, long inTicks)
-	{
-	long	timeStamp = (inTicks * 60000000L) / (inTempo * TGDuration.QUARTER_TIME);
-
-	return(timeStamp);
-	}
-
-
-	void	addBar(long inTime)
-	{
-	MiStaffEvent	se = (MiStaffEvent)f_Events.get( new Long(inTime) );
-
-	if(se == null)
-		{
-		se = new MiStaffEvent(inTime);
-		f_Events.put( new Long(inTime) , se);
-		}
-
-	se.markAsBar();
-	}
-
-
-	void	addNote(MiNote inNote)
-	{
-	MiStaffEvent	se;
-
-	se = (MiStaffEvent)f_Events.get( new Long(inNote.getTimeOn()) );
-
-	if(se == null)
-		{
-		se = new MiStaffEvent(inNote.getTimeOn());
-		f_Events.put( new Long(inNote.getTimeOn()) , se);
-		}
-
-	se.addNoteOn(inNote);
-	}
-
-
-	private void	mergeEvent(TreeMap inEventsMap, MiStaffEvent inSE)
-	{
-	MiStaffEvent	se = (MiStaffEvent)inEventsMap.get( new Long(inSE.getBeginTime()) );
-
-	if(se == null)
-		inEventsMap.put( new Long(inSE.getBeginTime()) , inSE);
-	else
-		se.merge(inSE);
-	}
-
-
-	private void	addTiedNote(long inTime, MiStaffNote inSN, long inResidualDuration)
-	{
-	MiStaffEvent	se = (MiStaffEvent)f_Events.get( new Long(inTime) );
-
-	if(se == null)
-		{
-		se = new MiStaffEvent(inTime);
-		f_Events.put( new Long(inTime), se);
-		}
-
-	MiStaffNote sn = new MiStaffNote(inSN);
-
-	sn.setDuration(inResidualDuration);
-	se.addTiedNote(sn);
-	}
-
-
-	private void	dump(String inTitle)
-	{
-	Iterator	it = f_Events.keySet().iterator();
-
-	System.out.println();
-	System.out.println("MiStaff dump " + inTitle + "...");
-	System.out.println();
-
-	while(it.hasNext())
-		{
-		Long			time	= (Long)it.next();
-		MiStaffEvent	se		= (MiStaffEvent)f_Events.get(time);
-
-		System.out.print(se);
-		}
-	}
-
-
-	void	createMeasures()
-	{
-	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
-	Iterator		it			= f_Events.keySet().iterator();
-
-	while(it.hasNext())
-		{
-		Long			key	= (Long)it.next();
-		MiStaffEvent	se	= (MiStaffEvent)f_Events.get(key);
-
-		if(	se.isBar() &&
-			tgSongMgr.getMeasureHeaderAt(key.longValue()) == null)
-			{
-			tgSongMgr.addNewMeasure(tgSongMgr.getSong().countMeasureHeaders() + 1);
-			}
-		}
-	}
-
-
-	private TGBeat	getEventBeat(long inTime)
-	{
-	MiStaffEvent	se		= (MiStaffEvent)f_Events.get( new Long(inTime) );
-	TGBeat			tgBeat	= se.getBeat();
-
-	// creates a TGBeat if needed
-	if(tgBeat == null)
-		{
-		TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
-		TGTrackManager	tgTrackMgr	= tgSongMgr.getTrackManager();
-		TGMeasure		tgMeasure	= tgTrackMgr.getMeasureAt(f_TgTrack, inTime);
-		
-		if(tgMeasure != null)
-			{
-			tgBeat = tgSongMgr.getFactory().newBeat();
-
-			tgBeat.setStart(inTime);
-			tgMeasure.addBeat(tgBeat);
-			se.setBeat(tgBeat);
-			}
-		}
-
-	return(tgBeat);
-	}
-
-
-	private void	insertNoteIntoTrack(TGBeat inTgBeat, MiStaffNote inSN)
-	{
-	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
-	TGNote			tgNote		= tgSongMgr.getFactory().newNote();
-	TGDuration		tgDuration	= tgSongMgr.getFactory().newDuration();
-
-	tgNote.setString	(inSN.getString());
-	tgNote.setValue		(inSN.getFret());
-	tgNote.setVelocity	(inSN.getVelocity());
-	tgNote.setTiedNote	(inSN.isTied());
-
-	int		noteType = MiStaffNote.durationToNoteType(inSN.getNominalDuration());
-
-	tgDuration.setValue(noteType);
-	tgDuration.setDotted(inSN.getDotCount() == 1);
-	tgDuration.setDoubleDotted(inSN.getDotCount() == 2);
-
-	if(f_Dump_TrackGeneration)
-		{
-		System.out.println(
-				"" + inTgBeat.getMeasure().getNumber() + " " + inTgBeat.getStart() +
-				" (" + tgNote.getString() + "," + tgNote.getValue() + "," + tgNote.getVelocity() + ") " +
-				"1/"	+ tgDuration.getValue() +
-				", d: "	+ tgDuration.getTime() +
-				(tgNote.isTiedNote() ? " (tied)" : "") +
-				(tgDuration.getTime() != inSN.getOverallDuration() ? " snDur=" + inSN.getOverallDuration() : ""));
-		}
-
-	// here we probably should choose the voice
-	// it would be nice to have one voice for each string...
-	inTgBeat.getVoice(0).setDuration(tgDuration);
-	inTgBeat.getVoice(0).addNote(tgNote);
-	}
-	
-
-	private void	generateTrack(String inTrackName)
-	{
-	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
-	TGTrack			tgTrack		= tgSongMgr.addTrack();
-	Iterator		eventsIt;
-
-	if(f_Dump_TrackGeneration)
-		{
-		System.out.println();
-		System.out.println("generating track: " + inTrackName + "...");
-		System.out.println();
-		}
-
-	tgTrack.setName(inTrackName);
-
-	f_TgTrack = tgTrack;
-
-	// clears events TGBeats
-	for(eventsIt = f_Events.keySet().iterator(); eventsIt.hasNext();)
-		{
-		Long			time	= (Long)eventsIt.next();
-		MiStaffEvent	se		= (MiStaffEvent)f_Events.get(time);
-
-		se.setBeat(null);
-		}
-
-	// generate TuxGuitar track
-	for(eventsIt = f_Events.keySet().iterator(); eventsIt.hasNext();)
-		{
-		Long			time	= (Long)eventsIt.next();
-		MiStaffEvent	se		= (MiStaffEvent)f_Events.get(time);
-
-		if(se.isOnBeat() || se.isTieBeat())
-			{
-			TGBeat		tgBeat	= getEventBeat(se.getBeginTime());
-			Iterator	it		= se.getNotes().iterator();
-
-			while(it.hasNext())
-				{
-				MiStaffNote	sn = (MiStaffNote)it.next();
-
-				insertNoteIntoTrack(tgBeat, sn);
-				}
-			}
-		}
-	}
-
-
-	void	insertNotesIntoTrack(String inTrackName)
-	{
-	// normalize beats
-	TreeMap		normalizedEvents = new TreeMap();
-
-	for(Iterator eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
-		{
-		Map.Entry		me	= (Map.Entry)eventsIt.next();
-		MiStaffEvent	se	= (MiStaffEvent)me.getValue();
-
-		se.normalizeBeat(TGDuration.SIXTY_FOURTH);
-		mergeEvent(normalizedEvents, se);
-		}
-
-	f_Events = normalizedEvents;
-
-	dump("after beat normalization");
-	generateTrack("after beat normalization");
-
-	// add tie events due to bar crossing at the beginning of each crossed bar
-	boolean	keepGoing = true;
-
-	while(keepGoing)
-		{
-		long	nextBarBeginTime = 0;
-
-		keepGoing = false;
-	
-		for(Iterator eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
-			{
-			Map.Entry		me	= (Map.Entry)eventsIt.next();
-			MiStaffEvent	se	= (MiStaffEvent)me.getValue();
-
-			if(se.isBar())
-				nextBarBeginTime = se.getBeginTime() + 4 * TGDuration.QUARTER_TIME;	// bar length should be a MiStaff member
-
-			for(Iterator snIt = se.getNotes().iterator(); snIt.hasNext();)
-				{
-				MiStaffNote	sn = (MiStaffNote)snIt.next();
-
-				if(se.getBeginTime() + sn.getOverallDuration() > nextBarBeginTime)
-					{
-					long	limitedDuration		= (nextBarBeginTime - se.getBeginTime()),
-							residualDuration	= sn.getOverallDuration() - limitedDuration;
-
-					sn.setDuration(limitedDuration);
-					addTiedNote(nextBarBeginTime, sn, residualDuration);
-					keepGoing = true;
-					break;
-					}
-				}
-
-			if(keepGoing)
-				break;
-			}
-		}
-
-	dump("after tied due to bar crossing");
-	generateTrack("after tied due to bar crossing");
-
-	// normalize durations
-	for(Iterator eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
-		{
-		Map.Entry		me	= (Map.Entry)eventsIt.next();
-		MiStaffEvent	se	= (MiStaffEvent)me.getValue();
-
-		se.normalizeDurations();
-		}
-
-	dump("after duration normalization");
-	generateTrack("after duration normalization");
-
-	// add tie events due to note crossing
-	keepGoing = true;
-
-	while(keepGoing)
-		{
-		keepGoing = false;
-
-		Iterator eventsIt2 = f_Events.keySet().iterator();
-
-		if(eventsIt2.hasNext())
-			eventsIt2.next();
-
-		for(Iterator eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
-			{
-			Map.Entry		me	= (Map.Entry)eventsIt.next();
-			MiStaffEvent	se	= (MiStaffEvent)me.getValue();
-
-			if(eventsIt.hasNext() && eventsIt2.hasNext())
-				{
-				long	nextTime	= ((Long)eventsIt2.next()).longValue();
-
-				for(Iterator snIt = se.getNotes().iterator(); snIt.hasNext();)
-					{
-					MiStaffNote	sn = (MiStaffNote)snIt.next();
-
-					if(se.getBeginTime() + sn.getOverallDuration() > nextTime)
-						{
-						long	limitedDuration		= (nextTime - se.getBeginTime()),
-								residualDuration	= sn.getOverallDuration() - limitedDuration;
-
-						sn.setDuration(limitedDuration);
-						addTiedNote(nextTime, sn, residualDuration);
-						keepGoing = true;
-						break;
-						}
-					}
-
-				if(keepGoing)
-					break;
-				}
-			}
-		}
-
-	dump("after tied due to note crossing");
-	generateTrack("after tied due to note crossing");
-
-	// normalize durations
-	for(Iterator eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
-		{
-		Map.Entry		me	= (Map.Entry)eventsIt.next();
-		MiStaffEvent	se	= (MiStaffEvent)me.getValue();
-
-		se.normalizeDurations();
-		}
-
-	dump("after duration normalization 2");
-	generateTrack("after duration normalization 2");
-	}
-}
diff --git a/TuxGuitar-midi/GNUmakefile b/TuxGuitar-midi/GNUmakefile
deleted file mode 100644
index 0eba15d6..00000000
--- a/TuxGuitar-midi/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.3 2008/02/26 15:24:13 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-midi
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.3 2008/02/26 15:24:13 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-midi/build.properties b/TuxGuitar-midi/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-midi/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-midi/build.xml b/TuxGuitar-midi/build.xml
deleted file mode 100644
index 43b29311..00000000
--- a/TuxGuitar-midi/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-midi" basedir="." default="all">
-	<description>
-		TuxGuitar Midi File Format
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-midi.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiMessageUtils.java b/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiMessageUtils.java
deleted file mode 100644
index 6f69e66d..00000000
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiMessageUtils.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.herac.tuxguitar.io.midi;
-
-import org.herac.tuxguitar.io.midi.base.MidiMessage;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiMessageUtils {
-	
-	public static final byte TICK_MOVE = 0x01;
-	
-	private static int fixValue(int value){
-		int fixedValue = value;
-		fixedValue = Math.min(fixedValue,127);
-		fixedValue = Math.max(fixedValue,0);
-		return fixedValue;
-	}
-	
-	private static int fixChannel(int channel){
-		int fixedChannel = channel;
-		fixedChannel = Math.min(fixedChannel,15);
-		fixedChannel = Math.max(fixedChannel,0);
-		return fixedChannel;
-	}
-	
-	public static MidiMessage noteOn(int channel,int note,int velocity){
-		return MidiMessage.shortMessage(MidiMessage.NOTE_ON, fixChannel(channel), fixValue(note), fixValue(velocity));
-	}
-	
-	public static MidiMessage noteOff(int channel,int note,int velocity){
-		return MidiMessage.shortMessage(MidiMessage.NOTE_OFF, fixChannel(channel), fixValue(note), fixValue(velocity));
-	}
-	
-	public static MidiMessage controlChange(int channel,int controller,int value){
-		return MidiMessage.shortMessage(MidiMessage.CONTROL_CHANGE, fixChannel(channel), fixValue(controller), fixValue(value));
-	}
-	
-	public static MidiMessage programChange(int channel,int instrument){
-		return MidiMessage.shortMessage(MidiMessage.PROGRAM_CHANGE, fixChannel(channel), fixValue(instrument));
-	}
-	
-	public static MidiMessage pitchBend(int channel,int value){
-		return MidiMessage.shortMessage(MidiMessage.PITCH_BEND, fixChannel(channel), 0, fixValue(value));
-	}
-	
-	public static MidiMessage systemReset(){
-		return MidiMessage.shortMessage(MidiMessage.SYSTEM_RESET);
-	}
-	
-	public static MidiMessage tempoInUSQ(int usq){
-		MidiMessage message = new MidiMessage(MidiMessage.TYPE_META, MidiMessage.TEMPO_CHANGE);
-		message.setData(new byte[]{(byte)((usq >> 16) & 0xff),(byte)((usq >> 8) & 0xff),(byte)((usq) & 0xff) });
-		//message.setData(new byte[]{(byte)((usq >> 16) & 0x00FF),(byte)((usq >> 8) & 0x00FF),(byte)((usq) & 0x00FF) });
-		return message;
-	}
-	
-	public static MidiMessage timeSignature(TGTimeSignature ts){
-		MidiMessage message = new MidiMessage(MidiMessage.TYPE_META, MidiMessage.TIME_SIGNATURE_CHANGE);
-		message.setData(new byte[]{  (byte)ts.getNumerator(),(byte)ts.getDenominator().getIndex(),(byte)(96 / ts.getDenominator().getValue()),8 });
-		return message;
-	}
-	
-	public static MidiMessage endOfTrack(){
-		return MidiMessage.metaMessage(47,new byte[]{});
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginList.java b/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginList.java
deleted file mode 100644
index 50636fcb..00000000
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginList.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.herac.tuxguitar.io.midi;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
-
-public class MidiPluginList extends TGPluginList{
-	
-	protected List getPlugins() {
-		List plugins = new ArrayList();
-		plugins.add(new MidiPluginImporter());
-		plugins.add(new MidiPluginExporter());
-		return plugins;
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "Midi file format import-export plugin";
-	}
-	
-	public String getName() {
-		return "Midi file format import-export plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSequenceHandlerImpl.java b/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSequenceHandlerImpl.java
deleted file mode 100644
index 118d3e2b..00000000
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSequenceHandlerImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.herac.tuxguitar.io.midi;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.herac.tuxguitar.io.midi.base.MidiEvent;
-import org.herac.tuxguitar.io.midi.base.MidiSequence;
-import org.herac.tuxguitar.io.midi.base.MidiTrack;
-import org.herac.tuxguitar.player.base.MidiSequenceHandler;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
-	
-	private OutputStream stream;
-	private MidiSequence sequence;
-	
-	public MidiSequenceHandlerImpl(int tracks,OutputStream stream){
-		super(tracks);
-		this.stream = stream;
-		this.init();
-	}
-	
-	private void init(){
-		this.sequence = new MidiSequence(MidiSequence.PPQ,(int)TGDuration.QUARTER_TIME);
-		for (int i = 0; i < getTracks(); i++) {
-			this.sequence.addTrack(new MidiTrack());
-		}
-	}
-	
-	public MidiSequence getSequence(){
-		return this.sequence;
-	}
-	
-	public void addEvent(int track, MidiEvent event) {
-		if(track >= 0 && track < getSequence().countTracks()){
-			getSequence().getTrack(track).add(event);
-		}
-	}
-	
-	public void addControlChange(long tick,int track,int channel, int controller, int value) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.controlChange(channel, controller, value), tick ));
-	}
-	
-	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.noteOff(channel, note, velocity), tick ));
-	}
-	
-	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.noteOn(channel, note, velocity), tick ));
-	}
-	
-	public void addPitchBend(long tick,int track,int channel, int value) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.pitchBend(channel, value), tick ));
-	}
-	
-	public void addProgramChange(long tick,int track,int channel, int instrument) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.programChange(channel, instrument), tick ));
-	}
-	
-	public void addTempoInUSQ(long tick,int track,int usq) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.tempoInUSQ(usq), tick ));
-	}
-	
-	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.timeSignature(ts), tick ));
-	}
-	
-	public void notifyFinish() {
-		try {
-			getSequence().finish();
-			new MidiFileWriter().write(getSequence(),1,this.stream);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSettings.java b/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSettings.java
deleted file mode 100644
index e6e85222..00000000
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSettings.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.herac.tuxguitar.io.midi;
-
-public class MidiSettings {
-	
-	private int transpose;
-	
-	public MidiSettings(){
-		this.transpose = 0;
-	}
-	
-	public int getTranspose() {
-		return this.transpose;
-	}
-	
-	public void setTranspose(int transpose) {
-		this.transpose = transpose;
-	}
-	
-	public static MidiSettings getDefaults(){
-		return new MidiSettings();
-	}
-}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiEvent.java b/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiEvent.java
deleted file mode 100644
index 40f34a13..00000000
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiEvent.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.herac.tuxguitar.io.midi.base;
-
-public class MidiEvent {
-	
-	private long tick;
-	private MidiMessage message;
-	
-	public MidiEvent(MidiMessage message, long tick){
-		this.message = message;
-		this.tick = tick;
-	}
-	
-	public MidiMessage getMessage() {
-		return this.message;
-	}
-	
-	public long getTick() {
-		return this.tick;
-	}
-}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiTrack.java b/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiTrack.java
deleted file mode 100644
index 69d24daa..00000000
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiTrack.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.herac.tuxguitar.io.midi.base;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class MidiTrack {
-	
-	private long ticks;
-	private List events = new ArrayList();
-	
-	public void add(MidiEvent event) {
-		this.events.add(event);
-		this.ticks = Math.max(this.ticks,event.getTick());
-	}
-	
-	public MidiEvent get(int index){
-		return (MidiEvent)this.events.get(index);
-	}
-	
-	public int size(){
-		return this.events.size();
-	}
-	
-	public long ticks(){
-		return this.ticks;
-	}
-	
-	public void sort(){
-		final Comparator comparator = new Comparator() {
-			public int compare(Object o1, Object o2) {
-				if(o1 instanceof MidiEvent && o2 instanceof MidiEvent){
-					MidiEvent e1 = (MidiEvent)o1;
-					MidiEvent e2 = (MidiEvent)o2;
-					if(e1.getTick() == e2.getTick()){
-						return 0;
-					}
-					return (e1.getTick() > e2.getTick() ? 1 : -1);
-				}
-				return 0;
-			}
-		};
-		Collections.sort(this.events,comparator);
-	}
-}
diff --git a/TuxGuitar-musicxml/GNUmakefile b/TuxGuitar-musicxml/GNUmakefile
deleted file mode 100644
index a9fcb7e1..00000000
--- a/TuxGuitar-musicxml/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:12 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-musicxml
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:12 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-musicxml/build.properties b/TuxGuitar-musicxml/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-musicxml/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-musicxml/build.xml b/TuxGuitar-musicxml/build.xml
deleted file mode 100644
index 2d714afc..00000000
--- a/TuxGuitar-musicxml/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-musicxml" basedir="." default="all">
-	<description>
-		TuxGuitar MusicXML Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-musicxml.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-oss/GNUmakefile b/TuxGuitar-oss/GNUmakefile
deleted file mode 100644
index 1453fc48..00000000
--- a/TuxGuitar-oss/GNUmakefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.7 2008/02/26 15:24:15 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-oss
-LIBRARY?=lib$(PACKAGE).so
-LIBRARY_JNI?=lib$(PACKAGE)-jni.so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_LIBRARY_PATH_JNI?=$(TG_PREFIX)/lib/jni
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_JNI_DIR?=$(TG_LIBRARY_PATH_JNI)
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-JAVA_SOURCE_PATH?=./src/
-JAVA_SOURCES?=$(shell find $(JAVA_SOURCE_PATH) -name "*.java")
-JAVA_OBJECTS?=$(PACKAGE).o
-JNI_SOURCE_PATH?=./jni/
-JNI_SOURCES?=$(shell find $(JNI_SOURCE_PATH) -name "*.c")
-JNI_OBJECTS?=$(JNI_SOURCES:%.c=%.o)
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(JAVA_SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-CC=gcc
-CFLAGS=-fPIC -I $(shell $(GCJ) -print-file-name=include/)
-
-default: all
-
-all: objects library library_jni
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(JAVA_OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-library_jni: $(LIBRARY_JNI)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-install $(LIBRARY_JNI) $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_JNI_DIR)/$(LIBRARY_JNI)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $(@F) $<
-
-$(PACKAGE).o: $(JAVA_SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(JAVA_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F) -ltuxguitar -L$(TG_LIBRARY_PATH)
-
-$(LIBRARY_JNI): $(JNI_OBJECTS)
-	$(GCJ) -shared -o $@ $(^F)
-
-#eof "$Id: GNUmakefile,v 1.7 2008/02/26 15:24:15 akdmia Exp $"
diff --git a/TuxGuitar-oss/build.properties b/TuxGuitar-oss/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-oss/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-oss/build.xml b/TuxGuitar-oss/build.xml
deleted file mode 100644
index de7b01d0..00000000
--- a/TuxGuitar-oss/build.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="tuxguitar-oss" basedir="." default="all">
-	<description>
-		TuxGuitar OSS
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-oss.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.swt}"/>
-		<pathelement location="${path.tuxguitar}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   T U X G U I T A R  -  O S S             |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   T U X G U I T A R  -  O S S             |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.10 2008/04/17 12:35:07 akdmia Exp $" -->
diff --git a/TuxGuitar-oss/jni/GNUmakefile b/TuxGuitar-oss/jni/GNUmakefile
deleted file mode 100644
index 248465d0..00000000
--- a/TuxGuitar-oss/jni/GNUmakefile
+++ /dev/null
@@ -1,24 +0,0 @@
-CFLAGS?=-I$(shell gcj -print-file-name=include/)
-CFLAGS+=-fPIC
-LDFLAGS?=
-LDLIBS?=
-LDPATH?=
-LIBRARY_PREFIX?=lib
-LIBRARY_NAME?=tuxguitar-oss-jni
-LIBRARY_EXTENSION?=.so
-
-LIBRARY=$(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
-OBJECTS=org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all:    $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(CC) $(LDFLAGS) -shared -o $(LIBRARY) $(OBJECTS) $(LDPATH) $(LDLIBS)
-
-clean: 
-	rm -f $(OBJECTS) $(LIBRARY)
-
-#eof "$Id: GNUmakefile,v 1.10 2008/04/17 20:06:34 rzr Exp $"
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/JNILibraryLoader.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/JNILibraryLoader.java
deleted file mode 100644
index 5b109291..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/JNILibraryLoader.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.herac.tuxguitar.util.TGClassLoader;
-
-public class JNILibraryLoader {
-	
-	private static final String JNI_EXTENSION = ".jnilib";
-	
-	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
-	
-	public static void loadLibrary(String libname){
-		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
-			System.loadLibrary(libname);
-		}
-	}
-	
-	private static boolean loadFromClassPath(String filename){
-		File file = new File(JNI_TMP_PATH + filename);
-		try{
-			if(!file.exists()){
-				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
-				if (inputStream != null) {
-					OutputStream outputStream = new FileOutputStream(file);
-					
-					int read;
-					byte [] buffer = new byte [4096];
-					while ((read = inputStream.read (buffer)) != -1) {
-						outputStream.write(buffer, 0, read);
-					}
-					outputStream.close();
-					inputStream.close();
-				}
-			}
-			if(file.exists()){
-				System.load(file.getAbsolutePath());
-				return true;
-			}
-		}catch(Throwable throwable){
-			return false;
-		}finally{
-			if(file.exists()){
-				file.delete();
-			}
-		}
-		return false;
-	}
-}
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiConfigUtils.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiConfigUtils.java
deleted file mode 100644
index 74cd0a88..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiConfigUtils.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.system.config.TGConfigManager;
-import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
-import org.herac.tuxguitar.app.util.DialogUtils;
-
-public class MidiConfigUtils {
-	
-	public static final String DEVICE_KEY = "oss.device";
-	
-	public static final String DEVICE_DEFAULT = "/dev/sequencer";
-	
-	public static TGConfigManager getConfig(){
-		TGConfigManager config = new TGPluginConfigManager("tuxguitar-oss");
-		config.init();
-		return config;
-	}
-	
-	public static String getDevice(){
-		return getDevice(getConfig());
-	}
-	
-	public static String getDevice(final TGConfigManager config){
-		return config.getStringConfigValue(DEVICE_KEY,DEVICE_DEFAULT);
-	}
-	
-	public static void setupDialog(Shell parent,final MidiOutputPortProviderImpl provider) {
-		setupDialog(parent,provider,getConfig());
-	}
-	
-	public static void setupDialog(Shell parent,final MidiOutputPortProviderImpl provider,final TGConfigManager config) {
-		final String device = getDevice(config);
-		
-		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		dialog.setLayout(new GridLayout());
-		dialog.setText("Configuration");
-		
-		//------------------DEVICE-----------------------
-		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
-		group.setLayout(new GridLayout(2,false));
-		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		group.setText("Device Configuration");
-		
-		final Label deviceLabel = new Label(group,SWT.LEFT);
-		deviceLabel.setText("Device:");
-		
-		final Text deviceValue = new Text(group,SWT.BORDER);
-		deviceValue.setLayoutData(new GridData(250,SWT.DEFAULT));
-		deviceValue.setText( (device == null ? new String() : device) );
-		
-		//------------------BUTTONS--------------------------
-		Composite buttons = new Composite(dialog, SWT.NONE);
-		buttons.setLayout(new GridLayout(2,false));
-		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
-		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
-		data.minimumWidth = 80;
-		data.minimumHeight = 25;
-		
-		final Button buttonOK = new Button(buttons, SWT.PUSH);
-		buttonOK.setText(TuxGuitar.getProperty("ok"));
-		buttonOK.setLayoutData(data);
-		buttonOK.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				String selection = deviceValue.getText();
-				
-				String value1 = (device == null ? new String() : device);
-				String value2 = (selection == null ? new String() : selection);
-				if(!value1.equals(value2)){
-					if(selection != null){
-						config.setProperty(DEVICE_KEY,selection);
-					}else{
-						config.removeProperty(DEVICE_KEY);
-					}
-					config.save();
-					provider.updateDevice(selection);
-				}
-				dialog.dispose();
-			}
-		});
-		
-		Button buttonCancel = new Button(buttons, SWT.PUSH);
-		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
-		buttonCancel.setLayoutData(data);
-		buttonCancel.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				dialog.dispose();
-			}
-		});
-		
-		dialog.setDefaultButton( buttonOK );
-		
-		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-	}
-}
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java
deleted file mode 100644
index 1f43b084..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import org.herac.tuxguitar.player.base.MidiOutputPort;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiOutputPortImpl implements MidiOutputPort{
-	
-	private int device;
-	private String name;
-	private MidiReceiverImpl receiver;
-	
-	public MidiOutputPortImpl(MidiSystem midiSystem,String name,int device){
-		this.name = name;
-		this.device = device;
-		this.receiver = new MidiReceiverImpl(this,midiSystem);
-	}
-	
-	public void open(){
-		if(!this.receiver.isConnected()){
-			this.receiver.connect();
-		}
-	}
-	
-	public void close(){
-		this.receiver.disconnect();
-	}
-	
-	public MidiReceiver getReceiver(){
-		this.open();
-		return this.receiver;
-	}
-	
-	public void check(){
-		// Not implemented
-	}
-	
-	public int getDevice() {
-		return this.device;
-	}
-	
-	public String getKey(){
-		return ("tuxguitar-oss_" + this.device);
-	}
-	
-	public String getName(){
-		return (this.name +" #" + this.device);
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderImpl.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderImpl.java
deleted file mode 100644
index 4314a11d..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
-	
-	private MidiSystem midiSystem;
-	
-	public MidiOutputPortProviderImpl(){
-		super();
-	}
-	
-	public List listPorts() {
-		if(this.midiSystem == null){
-			this.midiSystem = new MidiSystem();
-		}
-		if(!this.midiSystem.isOpen()){
-			this.midiSystem.open(MidiConfigUtils.getDevice());
-		}
-		return this.midiSystem.findPorts();
-	}
-	
-	public void closeAll(){
-		if(this.midiSystem != null){
-			this.midiSystem.close();
-			this.midiSystem.finalize();
-			this.midiSystem = null;
-		}
-	}
-	
-	public void updateDevice(String device){
-		if(this.midiSystem != null && this.midiSystem.isOpen()){
-			MidiOutputPortImpl connection = this.midiSystem.getConnection();
-			if(connection != null){
-				connection.close();
-			}
-			this.midiSystem.close();
-			this.midiSystem.open(device);
-			if(connection != null){
-				connection.open();
-			}
-		}
-	}
-}
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderPlugin.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderPlugin.java
deleted file mode 100644
index 27acbf88..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderPlugin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import org.eclipse.swt.widgets.Shell;
-import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin implements TGPluginSetup{
-	
-	private MidiOutputPortProviderImpl portReader;
-	
-	protected MidiOutputPortProvider getProvider() {
-		if(this.portReader == null){
-			this.portReader = new MidiOutputPortProviderImpl();
-		}
-		return this.portReader;
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "OSS output plugin";
-	}
-	
-	public String getName() {
-		return "OSS output plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-	
-	public void setupDialog(Shell parent) {
-		MidiConfigUtils.setupDialog(parent,(MidiOutputPortProviderImpl)getProvider());
-	}
-}
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiReceiverImpl.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiReceiverImpl.java
deleted file mode 100644
index b8c2d934..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiReceiverImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import org.herac.tuxguitar.player.base.MidiControllers;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiReceiverImpl implements MidiReceiver{
-	
-	private boolean connected;
-	private MidiOutputPortImpl midiPort;
-	private MidiSystem midiSystem;
-	
-	public MidiReceiverImpl(MidiOutputPortImpl midiPort, MidiSystem midiSystem){
-		this.midiPort = midiPort;
-		this.midiSystem = midiSystem;
-		this.connected = false;
-	}
-	
-	public boolean isConnected(){
-		return this.connected;
-	}
-	
-	public void connect(){
-		if(!isConnected()){
-			this.midiSystem.openPort(this.midiPort);
-			this.connected = true;
-		}
-	}
-	
-	public void disconnect() {
-		if(isConnected()){
-			this.midiSystem.closePort();
-			this.connected = false;
-		}
-	}
-	
-	public void sendAllNotesOff() {
-		for(int i = 0; i < 16; i ++){
-			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
-		}
-	}
-	
-	public void sendControlChange(int channel, int controller, int value) {
-		if(isConnected()){
-			this.midiSystem.controlChange(channel, controller, value);
-		}
-	}
-	
-	public void sendNoteOff(int channel, int key, int velocity) {
-		if(isConnected()){
-			this.midiSystem.noteOff(channel, key, velocity);
-		}
-	}
-	
-	public void sendNoteOn(int channel, int key, int velocity) {
-		if(isConnected()){
-			this.midiSystem.noteOn(channel, key, velocity);
-		}
-	}
-	
-	public void sendPitchBend(int channel, int value) {
-		if(isConnected()){
-			this.midiSystem.pitchBend(channel, value);
-		}
-	}
-	
-	public void sendProgramChange(int channel, int value) {
-		if(isConnected()){
-			this.midiSystem.programChange(channel, value);
-		}
-	}
-	
-	public void sendSystemReset() {
-		//not implemented
-	}
-}
diff --git a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiSystem.java b/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiSystem.java
deleted file mode 100644
index b07074f0..00000000
--- a/TuxGuitar-oss/src/org/herac/tuxguitar/player/impl/midiport/oss/MidiSystem.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.oss;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MidiSystem{
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-oss-jni");
-	
-	static{
-		System.loadLibrary(JNI_LIBRARY_NAME);
-	}
-	
-	private long instance;
-	private boolean open;
-	private List ports;
-	private MidiOutputPortImpl connection;
-	
-	public MidiSystem() {
-		this.instance = malloc();
-		this.open = false;
-		this.ports = new ArrayList();
-		this.connection = null;
-	}
-	
-	public void finalize(){
-		if(this.instance != 0 ){
-			this.free(this.instance);
-			this.instance = 0;
-		}
-	}
-	
-	public boolean isOpen(){
-		return (this.instance != 0 && this.open);
-	}
-	
-	public void open(String device){
-		if(this.instance != 0 && !this.open){
-			this.open(this.instance,device);
-			this.open = true;
-		}
-	}
-	
-	public void close(){
-		if(this.instance != 0 && this.open){
-			this.close(this.instance);
-			this.open = false;
-		}
-	}
-	
-	public List findPorts(){
-		this.ports.clear();
-		if(this.instance != 0 && this.open){
-			this.findPorts(this.instance);
-		}
-		return this.ports;
-	}
-	
-	public void openPort(MidiOutputPortImpl port){
-		if(this.instance != 0 && this.open){
-			this.openPort(this.instance, port.getDevice());
-			this.connection = port;
-		}
-	}
-	
-	public void closePort(){
-		if(this.instance != 0 && this.open){
-			this.closePort(this.instance);
-			this.connection = null;
-		}
-	}
-	
-	public void noteOn(int channel,int note,int velocity){
-		if(this.instance != 0 && this.open){
-			this.noteOn(this.instance, channel, note, velocity);
-		}
-	}
-	
-	public void noteOff(int channel,int note,int velocity){
-		if(this.instance != 0 && this.open){
-			this.noteOff(this.instance, channel, note, velocity);
-		}
-	}
-	
-	public void controlChange(int channel,int control,int value){
-		if(this.instance != 0 && this.open){
-			this.controlChange(this.instance, channel, control, value);
-		}
-	}
-	
-	public void programChange(int channel,int program){
-		if(this.instance != 0 && this.open){
-			this.programChange(this.instance, channel, program);
-		}
-	}
-	
-	public void pitchBend(int channel,int value){
-		if(this.instance != 0 && this.open){
-			this.pitchBend(this.instance, channel, value);
-		}
-	}
-	
-	public MidiOutputPortImpl getConnection(){
-		return this.connection;
-	}
-	
-	protected void addPort(String name,int device){
-		this.ports.add(new MidiOutputPortImpl(this,name,device));
-	}
-	
-	private native long malloc();
-	
-	private native void free(long instance);
-	
-	protected native void open(long instance,String device);
-	
-	protected native void close(long instance);
-	
-	protected native void findPorts(long instance);
-	
-	protected native void openPort(long instance,int device);
-	
-	protected native void closePort(long instance);
-	
-	protected native void noteOn(long instance,int channel,int note,int velocity);
-	
-	protected native void noteOff(long instance,int channel,int note,int velocity);
-	
-	protected native void controlChange(long instance,int channel,int control,int value);
-	
-	protected native void programChange(long instance,int channel,int program);
-	
-	protected native void pitchBend(long instance,int channel,int value);
-	
-}
diff --git a/TuxGuitar-pdf/build.properties b/TuxGuitar-pdf/build.properties
deleted file mode 100644
index 027507e8..00000000
--- a/TuxGuitar-pdf/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.itext=../TuxGuitar/lib/itext.jar
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-pdf/build.xml b/TuxGuitar-pdf/build.xml
deleted file mode 100644
index 55049761..00000000
--- a/TuxGuitar-pdf/build.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-pdf" basedir="." default="all">
-	<description>
-		TuxGuitar PDF Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-pdf.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.itext}"/>
-		<pathelement location="${path.swt}"/>
-		<pathelement location="${path.tuxguitar}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N   P D F  |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-
-<!-- eof "$Id: build.xml,v 1.7 2008/02/28 00:35:01 rzr Exp $" -->
diff --git a/TuxGuitar-ptb/GNUmakefile b/TuxGuitar-ptb/GNUmakefile
deleted file mode 100644
index a02490b4..00000000
--- a/TuxGuitar-ptb/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:16 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-ptb
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:24:16 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-ptb/build.properties b/TuxGuitar-ptb/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-ptb/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-ptb/build.xml b/TuxGuitar-ptb/build.xml
deleted file mode 100644
index 6b51e394..00000000
--- a/TuxGuitar-ptb/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-ptb" basedir="." default="all">
-	<description>
-		TuxGuitar PTB File Format plugin
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-ptb.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTPosition.java b/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTPosition.java
deleted file mode 100644
index 8e141fce..00000000
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTPosition.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.herac.tuxguitar.io.ptb.base;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class PTPosition {
-	
-	private int position;
-	private List components;
-	
-	public PTPosition(int position){
-		this.position = position;
-		this.components = new ArrayList();
-	}
-	
-	public int getPosition() {
-		return this.position;
-	}
-	
-	public List getComponents() {
-		return this.components;
-	}
-	
-	public void addComponent(PTComponent component){
-		this.components.add(component);
-	}
-	
-	public void sort(){
-		Collections.sort( getComponents(), new Comparator() {
-			public int compare(Object o1, Object o2) {
-				if( o1 instanceof PTDirection ){
-					return 1;
-				}
-				if( o2 instanceof PTDirection ){
-					return -1;
-				}
-				return 0;
-			}
-		});
-	}
-}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTrack.java b/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTrack.java
deleted file mode 100644
index b3e17ad3..00000000
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTrack.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.herac.tuxguitar.io.ptb.base;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PTTrack {
-	
-	private List sections;
-	private List infos;
-	
-	public PTTrack(){
-		this.sections = new ArrayList();
-		this.infos = new ArrayList();
-	}
-	
-	public List getInfos(){
-		return this.infos;
-	}
-	
-	public List getSections(){
-		return this.sections;
-	}
-	
-	public PTSection getSection(int index){
-		for(int i = getSections().size(); i <= index; i ++){
-			getSections().add(new PTSection(i));
-		}
-		return (PTSection)getSections().get(index);
-	}
-	
-	public PTTrackInfo getInfo(int number){
-		for(int i = 0; i < getInfos().size(); i++){
-			PTTrackInfo info = (PTTrackInfo)getInfos().get(i);
-			if( (  (1 << info.getNumber()) & number ) != 0 ){
-				return info;
-			}
-		}
-		return null;
-	}
-	
-	public PTTrackInfo getDefaultInfo(){
-		PTTrackInfo defaultInfo = null;
-		for(int i = 0; i < getInfos().size(); i++){
-			PTTrackInfo info = (PTTrackInfo)getInfos().get(i);
-			if( defaultInfo == null || info.getNumber() < defaultInfo.getNumber() ){
-				defaultInfo = info;
-			}
-		}
-		return defaultInfo;
-	}
-}
diff --git a/TuxGuitar-svg/GNUmakefile b/TuxGuitar-svg/GNUmakefile
deleted file mode 100644
index 5531cfbd..00000000
--- a/TuxGuitar-svg/GNUmakefile
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/make -f
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-svg
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
diff --git a/TuxGuitar-svg/build.properties b/TuxGuitar-svg/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-svg/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-svg/build.xml b/TuxGuitar-svg/build.xml
deleted file mode 100644
index 28318efe..00000000
--- a/TuxGuitar-svg/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-svg" basedir="." default="all">
-	<description>
-		TuxGuitar SVG Exporter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-svg.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-<!-- eof "$Id: build.xml,v 1.5 2008/02/28 00:35:00 rzr Exp $" -->
diff --git a/TuxGuitar-swt/pom.xml b/TuxGuitar-swt/pom.xml
new file mode 100644
index 00000000..f9f61b35
--- /dev/null
+++ b/TuxGuitar-swt/pom.xml
@@ -0,0 +1,141 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-swt</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>pom</packaging>
+	<name>TuxGuitar :: SWT</name>
+	<description>TuxGuitar SWT dependancies</description>
+
+	<repositories>
+		<repository>
+			<id>testing.nexus.eclipse.org</id>
+			<url>http://maven.eclipse.org/nexus/content/repositories/testing/</url>
+			<!-- http://maven.eclipse.org/nexus/content/repositories/testing/org/eclipse/swt/ -->
+		</repository>
+	</repositories>
+
+	<!-- TODO fix activation keys, i found no documentation at all -->
+
+	<profiles>
+		<profile>
+			<id>macosx_cocoa_x86_64</id>
+			<activation>
+				<os>
+					<family>mac</family>
+					<version>[10,11)</version>
+					<arch>x86_64</arch>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt</groupId>
+					<artifactId>org.eclipse.swt.cocoa.macosx</artifactId>
+					<version>3.6.2</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>macosx_cocoa</id>
+			<activation>
+				<os>
+					<family>mac</family>
+					<version>[9,11)</version>
+					<arch>x86</arch>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt</groupId>
+					<artifactId>org.eclipse.swt.cocoa.macosx</artifactId>
+					<version>3.6.2</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>macosx_carbon</id>
+			<activation>
+				<os>
+					<family>mac</family>
+					<version>[8,10)</version>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt</groupId>
+					<artifactId>org.eclipse.swt.carbon.macosx</artifactId>
+					<version>3.6.2</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>windows_x86</id>
+			<activation>
+				<os>
+					<family>Windows</family>
+					<arch>x86</arch>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt</groupId>
+					<artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+					<version>3.6.2</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>gtk_linux_x86</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<arch>x86</arch>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt</groupId>
+					<artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
+					<version>3.6.2</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>gtk_linux_x86_64</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<arch>amd64</arch>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.eclipse.swt</groupId>
+					<artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+					<version>3.6.2</version>
+					<scope>compile</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+</project>
diff --git a/TuxGuitar-tef/GNUmakefile b/TuxGuitar-tef/GNUmakefile
deleted file mode 100644
index 12ab35a3..00000000
--- a/TuxGuitar-tef/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:23:54 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-tef
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:23:54 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-tef/build.properties b/TuxGuitar-tef/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-tef/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-tef/build.xml b/TuxGuitar-tef/build.xml
deleted file mode 100644
index 42aff205..00000000
--- a/TuxGuitar-tef/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-tef" basedir="." default="all">
-	<description>
-		TuxGuitar Tabledit File Format Importer
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-tef.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-testing/build.xml b/TuxGuitar-testing/build.xml
deleted file mode 100644
index 28d170a7..00000000
--- a/TuxGuitar-testing/build.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-testing" basedir="." default="all">
-	<description>
-		TuxGuitar Testing
-	</description>
-	
-	<property name="platform-all.path" value="platform-all" />
-	<property name="platform-all.share.path" value="platform-all/share" />
-	<property name="platform-all.doc.path" value="platform-all/doc" />
-	
-	<property name="platform-win32.share.path" value="platform-win32/share" />
-	<property name="platform-linux-x86.share.path" value="platform-linux-x86/share" />
-	<property name="platform-linux-x86_64.share.path" value="platform-linux-x86_64/share" />
-	
-	<target name="clean" >
-		<delete quiet="true">
-			<fileset file="${platform-all.path}${file.separator}tuxguitar.jar"/>
-			<fileset dir="${platform-all.doc.path}" excludes="**/.svn"/>
-			<fileset dir="${platform-all.share.path}" excludes="**/.svn"/>
-			<fileset dir="${platform-win32.share.path}" excludes="**/.svn"/>
-			<fileset dir="${platform-linux-x86.share.path}" excludes="**/.svn"/>
-			<fileset dir="${platform-linux-x86_64.share.path}" excludes="**/.svn"/>
-		</delete>
-	</target>
-	
-	<target name="build" depends="clean" >
-		<mkdir dir="${platform-all.doc.path}" />
-		<mkdir dir="${platform-all.share.path}" />
-		<mkdir dir="${platform-win32.share.path}" />
-		<mkdir dir="${platform-linux-x86.share.path}" />
-		<mkdir dir="${platform-linux-x86_64.share.path}" />
-		
-		
-		<!-- Build Application --> 
-		<ant dir="..${file.separator}TuxGuitar" >
-			<property name="dist.file" value="" />
-			<property name="build.dist.path" value="..${file.separator}TuxGuitar-testing${file.separator}/build_dist" />
-		</ant>
-		<ant dir="..${file.separator}TuxGuitar" target="install" >
-			<property name="dist.file" value="" />
-			<property name="dist.dst.path" value="..${file.separator}TuxGuitar-testing${file.separator}" />
-			<property name="dist.jar.path" value="${platform-all.path}" />
-			<property name="dist.share.path" value="${platform-all.share.path}" />
-			<property name="dist.doc.path" value="${platform-all.doc.path}" />
-		</ant>
-		<ant dir="..${file.separator}TuxGuitar" target="clean" >
-			<property name="dist.file" value="" />
-		</ant>
-		
-		<!-- Build Multiplatform Plugins -->
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-abc"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-ascii"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-browser-ftp"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-community"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-compat"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-converter"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-gervill"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-gpx"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-gtp"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-image"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-jsa"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-lilypond"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-midi"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-musicxml"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-pdf"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-ptb"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-svg"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-tef"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-tray"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-tuner"/>
-			<param name="plugin.dst.path" value="${platform-all.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<!-- Build Linux x86 Plugins -->
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-alsa"/>
-			<param name="plugin.dst.path" value="${platform-linux-x86.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-fluidsynth"/>
-			<param name="plugin.dst.path" value="${platform-linux-x86.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-jack"/>
-			<param name="plugin.dst.path" value="${platform-linux-x86.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<!-- Build Linux x86_64 Plugins -->
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-alsa"/>
-			<param name="plugin.dst.path" value="${platform-linux-x86_64.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<!-- Build Win 32 Plugins -->
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-fluidsynth"/>
-			<param name="plugin.dst.path" value="${platform-win32.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-		<antcall target="build-plugin">
-			<param name="plugin.src.path" value="..${file.separator}TuxGuitar-jack"/>
-			<param name="plugin.dst.path" value="${platform-win32.share.path}${file.separator}plugins"/>
-		</antcall>
-		
-	</target>
-	
-	<target name="build-plugin" >
-		<ant dir="${plugin.src.path}" target="build" >
-			<property name="path.tuxguitar" value="..${file.separator}TuxGuitar-testing${file.separator}${platform-all.path}${file.separator}tuxguitar.jar" />
-		</ant>
-		
-		<copy todir="${plugin.dst.path}">
-			<fileset dir="${plugin.src.path}" includes="tuxguitar-*.jar" />
-		</copy>
-		
-		<ant dir="${plugin.src.path}" target="clean" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-testing/platform-all/doc/AUTHORS b/TuxGuitar-testing/platform-all/doc/AUTHORS
deleted file mode 100644
index 063ed71b..00000000
--- a/TuxGuitar-testing/platform-all/doc/AUTHORS
+++ /dev/null
@@ -1,195 +0,0 @@
-Julian Gabriel Casadesus
-
-    * Project Admin
-    * Developer
-    * Contact: <julian@casadesus.com.ar> http://www.herac.com.ar
-
-Hernan Andres Casadesus 
-
-    * Developer
-    * Contact: <hernan@casadesus.com.ar> http://www.herac.com.ar
-
-Nahuel Portilla 
-
-    * Developer
-    * Contact: <nahu51@hotmail.com>
-
-Nikola Kolarovic
-
-    * Developer
-    * Documentation
-    * Serbian translation
-    * Contact: <nikola.kolarovic@gmail.com>
-
-Aaron Spike
-
-    * Developer
-    * Contact: <aaron@ekips.org> http://www.ekips.org
-
-Ersplus
-
-    * French translation
-    * Ersplus Icon Theme
-    * Contact: <ersplus@gmail.com> http://ersplus.free.fr
-
-Licnep
-
-    * Blue Serious Icon Theme
-    * Contact: <licnep@users.sourceforge.net>
-
-Sascha Riemer
-
-    * Lavender Icon Theme
-    * Contact: <saschariemer@compuserve.de>
-
-Auria
-
-    * CoreAudio Plugin for MacOS
-    * Contact: <auria@users.sourceforge.net>
-
-Herak
-
-    * Developer
-    * Contact: <herak.sen@gmail.com>
-
-Tomasz Bojczuk
-
-    * Polish translation
-    * Contact: <tomaszbojczuk@plusnet.pl>
-
-Jose Gato
-
-    * Mac version
-    * Contact: <jgato@gsyc.info>
-
-Benjamin Scherrer
-
-    * Deutsch translation
-
-Thomas Thiel
-
-    * Deutsch translation
-    * Contact: <kv@wolfchild.de> http://www.wolfchild.de
-
-Sergio Abreu
-
-    * Portuguese translation
-    * Contact: <dosergio@ubbi.com.br> http://sitedosergio.sitesbr.net
-
-Markon
-
-    * Italian translation
-    * Contact: <marco.buccini@alice.it>
-
-Zdenek Kunicky
-
-    * Czech translation
-    * Contact: <zdenekkunicky@seznam.cz>
-
-Máté Huszár
-
-    * Hungarian translation
-
-Tim Loo
-
-    * Chinese (Taiwan) translation
-    * Contact: http://www.sinan-melody.co.cc/wordpress_1/
-
-PTT Team
-
-    * Chinese (Taiwan) translation
-    * Contact: http://www.ptt.cc
-
-Shuo Huang
-
-    * Chinese (GB) translation
-    * Contact: <ucudbm@hotmail.com> http://www.cucum.cn
-
-Philippe Coval
-
-    * Debian/Ubuntu package maintainer ; Startup script
-    * French translation
-    * Contact: <rzr@users.sf.net> http://rzr.online.fr/contrib.htm
-
-Orcan Ogetbil
-
-    * Fedora package maintainer
-    * Contact: <orcanbahri@yahoo.com>
-
-John Gustafsson
-
-    * Swedish translation
-    * Contact: <jamminjohn@users.sourceforge.net>
-
-Pietro Cerutti
-
-    * FreeBSD port maintainer
-    * Contact: <gahr@gahr.ch> http://www.gahr.ch/
-
-Facundo Corradini
-
-    * Documentation
-    * Contact: <facundocorradini@gmail.com> http://www.exitoweb.com.ar
-
-Gabe Hargrave
-
-    * Documentation
-    * Contact: <rinkrinkerfink@gmail.com>
-
-Vadim Ipatov
-
-    * Russian translation
-    * Contact: <euphoria.vi@gmail.com> http://www.kmtn.ru/~euphoria
-
-Zoya Ignatova
-
-    * Russian translation
-    * Contact: <grotty@yandex.ru>
-
-Serge van Namen
-    * Dutch translation
-    * Contact: <serge@easyict.net>
-
-Yuriy Shakalov
-    * Ukrainian translation
-    * Contact: <yuriy.shakalov@gmail.com>
-
-Nguyen Dinh Trung
-    * Vietnamese translation
-    * Contact: <nguyendinhtrung141@gmail.com>
-
-Keisuke Kato
-    * Japanese translation
-    * Contact: <kisk.kato@gmail.com> http://mingaku.selfip.org/
-
-Beat Weisskopf
-    * Deutsch translation
-    * Contact: <bweisskopf@gmail.com>
-
-Xevi Noe i Nogueiras
-    * Catalan translation
-    * Contact: <xevi.noe@gmail.com>
-
-Jean-Pierre POULIN
-	* Scales contributor
-	* Contact: <jeanpierre.poulin@free.fr> http://www.jeanpierrepoulin.com/
-
-Lobo
-	* Basque translation
-	* Contact: <lobo1985guitarrista@hotmail.es> http://www.myspace.com/lobotheguitardude
-
-Pekka Manninen
-	* Finnish translation
-	* Contact: <pekka.t.manninen@iki.fi>
-
-Rytis Umbrasas
-	* Lithuanian translation
-	* Contact: <rytumb@gmail.com>
-
-Periklis Ntanasis
-	* Greek translation
-	* Contact: <pntanasis@gmail.com> http://www.greekrocktabs.gr
-
-Svetoslav Stefanov
-	* Bulgarian translation
-	* Contact: <lfu.project@gmail.com> http://learnfree.eu
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/doc/CHANGES b/TuxGuitar-testing/platform-all/doc/CHANGES
deleted file mode 100644
index 5c044565..00000000
--- a/TuxGuitar-testing/platform-all/doc/CHANGES
+++ /dev/null
@@ -1,30 +0,0 @@
-TuxGuitar Dev changes:
-
-* Add show/hide toolbars feature.
-* Add let ring support
-* Add count down support
-* Add bank selection support
-* Soundfont selection support in gervill plugin
-* New oxygen skin
---* New abc exporter and importer plugin.
---* New svg exporter plugin
---* New image exporter plugin 
-
-
-TuxGuitar 1.2 changes:
-
-* Fix some bugs
-* Support measure range to loop
-* Transpose notes feature
-* Optionally transpose afected notes when change tuning
-* Move beats left|right support
-* More song properties options.
-* Add multiple measure support
-* Clean multiple measure support
-* Number of pastes support
-* Better lilypond plugin
-* Better fluidsynth plugin
-* New jack plugin
-* New community integration plugin
-* New cocoa integration plugin
-* New audio unit plugin
diff --git a/TuxGuitar-testing/platform-all/doc/LICENSE b/TuxGuitar-testing/platform-all/doc/LICENSE
deleted file mode 100644
index 325b2d3d..00000000
--- a/TuxGuitar-testing/platform-all/doc/LICENSE
+++ /dev/null
@@ -1,162 +0,0 @@
-GNU Lesser General Public License
-
-Version 2.1, February 1999
-
-    Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
-    [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
-
-    These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-    Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
-
-    In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
-
-    a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
-
-    b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
-
-TuxGuitar is a multitrack tablature editor and player.
-Copyright (C) 2005, By Julian Gabriel Casadesus
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/TuxGuitar-testing/platform-all/doc/README b/TuxGuitar-testing/platform-all/doc/README
deleted file mode 100644
index 50983423..00000000
--- a/TuxGuitar-testing/platform-all/doc/README
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION:
-TuxGuitar is a multitrack tablature editor and player written in Java-SWT.
-
-LICENSE:
-TuxGuitar is released under the GNU Lesser General Public License.
-
-REQUIREMENTS:
-Java Runtime Environment 1.4.X or later installed in your system.
-
-PROBLEMS:
-
-    * SWT:
-
-If you see an error like "java.lang.UnsatisfiedLinkError", you will need to replace your swt shared library files and jar 
-packages compiled for your system. TuxGuitar comes with SWT for linux-x86, linux-x86_64, mac and win32-x86. make sure download 
-the correct file. if you need another version, download your SWT and replace in lib folder.             
-If you don't have SWT installed in one of this locations: /lib, /usr/lib, /usr/local/lib or TuxGuitar/lib.  You will need to 
-add its path to the LD_LIBRARY_PATH and CLASSPATH environment vars.
-
-Export LD_LIBRARY_PATH and CLASSPATH:
-$export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/your_swt_library_folder/
-$export CLASSPATH=$CLASSPATH:/your_swt_library_folder/swt.jar
-$/home/user/TuxGuitar-*/TuxGuitar
-
-    * UNSUPPORTED CLASS VERSION:
-
-java.lang.UnsupportedClassVersionError. This means that your JVM is not compatible with the JVM used to create the binaries.  
-If you see a message like this, you will need to rebuild TuxGuitar from sources.
-
-    * FAILDED TO LOAD PLUGINS:
-
-TuxGuitar 1.0 has better JVM compatibility than older releases. But some plugins (e.g: Java Sound Api plugin) still depends 
-on Sun Java(TM) Development Kit (JDK) 5.0. if you have installed more than one JVM in your system, you can use one of these 
-environment vars:  JAVA or JAVA_HOME to run TuxGuitar with a specified JVM.
-
-Export JAVA:
-$export JAVA=/usr/lib/jvm/java-1.5.0-sun/bin/java
-$/home/user/TuxGuitar-*/tuxguitar
-
-Export JAVA_HOME:
-$export JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
-$/home/user/TuxGuitar-*/tuxguitar           
diff --git a/TuxGuitar-testing/platform-all/lib/gervill.jar b/TuxGuitar-testing/platform-all/lib/gervill.jar
deleted file mode 100644
index a26da49a..00000000
Binary files a/TuxGuitar-testing/platform-all/lib/gervill.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/lib/itext.jar b/TuxGuitar-testing/platform-all/lib/itext.jar
deleted file mode 100644
index 3f2c1882..00000000
Binary files a/TuxGuitar-testing/platform-all/lib/itext.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/TuxGuitar-testing/platform-all/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
deleted file mode 100644
index 26c6d3ef..00000000
--- a/TuxGuitar-testing/platform-all/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
+++ /dev/null
@@ -1 +0,0 @@
-# Add here the TGPlugin implementation class names.
diff --git a/TuxGuitar-testing/platform-all/share/help/about.html b/TuxGuitar-testing/platform-all/share/help/about.html
deleted file mode 100644
index 707466d9..00000000
--- a/TuxGuitar-testing/platform-all/share/help/about.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>TuxGuitar project: About</h1>
-						
-						<h2>Description:</h2>
-						
-						<p>
-						TuxGuitar is a multitrack tablature editor and player written in Java unsing SWT Graphic libraries.  
-						It is multi-platform application, available for Linux, Windows, MacOS, FreeBSD and other operating systems. 
-						TuxGuitar is open source software, released under the GNU Lesser General Public License.
-						</p>
-						
-						<h2>Website</h2>
-						
-						<p>
-						You should check TuxGuitar project website on <b>http://www.tuxguitar.com.ar</b><br/><br/>
-						On the website exists a forum where you can find answers for almost all of your TuxGuitar related questions.<br/><br/>
-						There is also a Wiki page on the webite.
-						</p>
-						
-						<h2>Source repository</h2>
-						<p>
-						TuxGuitar source repository can be browsed on  <b>http://tuxguitar.cvs.sourceforge.net</b>. From this CVS repository you can download and compile TuxGuitar "under development" version.
-						</p>
-						
-						
-						<h2>Contribution</h2>
-						
-						<p>
-						If you have sufficient skills and some ideas, you are free to join the project.<br/><br/>
-						You can also contribute by paying a small donation to the project. More details on the website (<b>http://www.tuxguitar.com.ar/donate.html</b>).
-						</p>
-						
-						
-						<h2>Authors</h2>
-						<br/>
-						<h4>Juli&aacute;n Gabriel Casades&uacute;s</h4>
-						<ul>
-							<li>Project Admin</li>
-							<li>Developer</li>  
-							<li>Web Page:&nbsp;<b>http://www.herac.com.ar</b></li>
-						</ul>
-						
-						<h4>Hern&aacute;n Andr&eacute;s Casades&uacute;s</h4>
-						<ul>
-							<li>Developer</li>  
-							<li>Web Page:&nbsp;<b>http://www.herac.com.ar</b></li>
-						</ul>
-						
-						<h4>Nahuel Portilla</h4>
-						<ul>
-							<li>Developer</li>
-						</ul>
-						
-						<h4>Nikola Kolarovi&#263;</h4>
-						<ul>
-							<li>Developer</li>
-							<li>Documentation</li>
-							<li>Serbian translation</li>
-						</ul>
-						
-						<h4>Aaron Spike</h4>
-						<ul>
-							<li>Developer</li>
-							<li>Web Page:&nbsp;<b>http://www.ekips.org</b></li>
-						</ul>
-						
-						<h4>Ersplus</h4>
-						<ul>
-							<li>French translation</li>  
-							<li>Ersplus Icon Theme</li>
-							<li>Web Page:&nbsp;<b>http://ersplus.free.fr/</b></li>
-						</ul>
-						
-						<h4>Licnep</h4>
-						<ul>
-							<li>Blue Serious Icon Theme</li>
-						</ul>
-						
-						<h4>Sascha Riemer</h4>
-						<ul>
-							<li>Lavender Icon Theme</li>
-						</ul>
-						
-						<h4>Auria</h4>
-						<ul>
-							<li>CoreAudio service for MacOS</li>
-						</ul>
-						
-						<h4>Tomasz Bojczuk</h4>
-						<ul>
-							<li>Polish translation</li>
-						</ul>
-						
-						<h4>Jose Gato</h4>
-						<ul>
-							<li>Mac version</li>
-						</ul>
-						
-						<h4>Benjamin Scherrer</h4>
-						<ul>
-							<li>Deutsch translation</li>
-						</ul>
-						
-						<h4>Thomas Thiel</h4>
-						<ul>
-							<li>Deutsch translation</li>
-							<li>Web Page:&nbsp;<b>http://www.wolfchild.de</b></li>
-						</ul>
-						
-						<h4>Sergio Abreu</h4>
-						<ul>           
-							<li>Portuguese translation</li>
-							<li>Web Page:&nbsp;<b>http://sitedosergio.sitesbr.net</b></li>
-						</ul>
-						
-						<h4>Markon</h4>
-						<ul>
-							<li>Italian translation</li>
-						</ul>
-						
-						<h4>Zdenek Kunicky</h4>
-						<ul>
-							<li>Czech translation</li>
-						</ul>
-						
-						<h4>M&aacute;t&eacute; Husz&aacute;r</h4>
-						<ul>
-							<li>Hungarian translation</li>
-						</ul>
-						
-						<h4>Tim Loo</h4>
-						<ul>
-							<li>Chinese (Taiwan) translation</li>
-							<li>Web Page:&nbsp;<b>http://www.sinan-melody.co.cc/wordpress_1/</b></li>
-						</ul>    
-						
-						<h4>PTT Team</h4>
-						<ul>
-							<li>Chinese (Taiwan) translation</li>
-							<li>Web Page:&nbsp;<b>http://www.ptt.cc</b></li>
-						</ul>
-						
-						<h4>Shuo Huang</h4>
-						<ul>
-							<li>Chinese (GB) translation</li>
-							<li>Web Page:&nbsp;<b>http://www.cucum.cn</b></li>
-						</ul>
-						
-						<h4>Philippe Coval</h4>
-						<ul>
-							<li>Debian package maintainer</li>
-							<li>French translation</li>
-							<li>Web Page:&nbsp;<b>http://rzr.online.fr/contrib.htm</b></li>
-						</ul>
-						
-						<h4>Orcan Ogetbil</h4>
-						<ul>
-							<li>Fedora package maintainer</li>
-						</ul>
-						
-						<h4>John Gustafsson</h4>
-						<ul>
-							<li>Swedish translation</li>
-						</ul>
-						
-						<h4>Pietro Cerutti</h4>
-						<ul>
-							<li>FreeBSD port maintainer</li>
-							<li>Web Page:&nbsp;<b>http://www.gahr.ch/</b></li>
-						</ul>
-						
-						<h4>Facundo Corradini</h4>
-						<ul>
-							<li>Documentation</li>
-							<li>Web Page:&nbsp;<b>http://www.corradiniestudioweb.com.ar</b></li>
-						</ul>
-						
-						<h4>Gabe Hargrave</h4>
-						<ul>
-							<li>Documentation</li>
-						</ul>
-						
-						<h4>Vadim Ipatov</h4>
-						<ul>
-							<li>Russian translation</li>
-						</ul>
-						
-						<h4>Zoya Ignatova</h4>
-						<ul>
-							<li>Russian translation</li>
-						</ul>
-						
-						<h4>Serge van Namen</h4>
-						<ul>
-							<li>Dutch translation</li>
-						</ul>
-						
-						<h4>Yuriy Shakalov</h4>
-						<ul>
-							<li>Ukrainian translation</li>
-						</ul>
-						
-						<h4>Xevi Noe i Nogueiras</h4>
-						<ul>
-							<li>Catalan translation</li>
-						</ul>
-						
-						<h4>Jean-Pierre POULIN</h4>
-						<ul>
-							<li>Scales contributor</li>
-							<li>Web Page:&nbsp;<b>http://www.jeanpierrepoulin.com/</b></li>
-						</ul>
-						
-						<h4>Lobo</h4>
-						<ul>
-							<li>Basque translation</li>
-							<li>Web Page:&nbsp;<b>http://www.myspace.com/lobotheguitardude</b></li>
-						</ul>
-						
-						<h4>Pekka Manninen</h4>
-						<ul>
-							<li>Finnish translation</li>
-						</ul>
-						
-						<h4>Rytis Umbrasas</h4>
-						<ul>
-							<li>Lithuanian translation</li>
-						</ul>
-						
-						<h4>Periklis Ntanasis</h4>
-						<ul>
-							<li>Greek translation</li>
-							<li>Web Page:&nbsp;<b>http://www.greekrocktabs.gr</b></li>
-						</ul>
-						
-						<h4>Svetoslav Stefanov</h4>
-						<ul>
-							<li>Bulgarian translation</li>
-							<li>Web Page:&nbsp;<b>http://learnfree.eu</b></li>
-						</ul>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
-
diff --git a/TuxGuitar-testing/platform-all/share/help/css/styles.css b/TuxGuitar-testing/platform-all/share/help/css/styles.css
deleted file mode 100644
index 862be303..00000000
--- a/TuxGuitar-testing/platform-all/share/help/css/styles.css
+++ /dev/null
@@ -1,57 +0,0 @@
-/* CSS Document */
-body {
-	color:#666666;
-	background:#ffffff;
-	font-size: small;
-	text-align: left;
-	margin:0;
-}
-
-h1{
-	margin: 0px 0px 10px 0px;
-	padding: 0px 0px 0px 0px;
-	color: #154374;
-	border-bottom: solid #d4d4d4 1px;
-}
-
-h2, h2 a, h2 a:hover{
-	margin: 0px 0px 4px 0px;
-	padding: 0px 0px 0px 0px;
-	color: #154374;
-	/*color: #cc6600;*/
-	font-size: 16px;
-}
-
-h3, h3 a, h3 a:hover{
-	margin: 0px 0px 4px 0px;
-	padding: 0px 0px 0px 0px;
-	color: #053364;
-	font-size: 12px;
-}
-
-h4, h4 a, h4 a:hover{
-	margin: 0px 0px 4px 0px;
-	padding: 0px 0px 0px 0px;
-	color: #053364;
-	font-size: 12px;
-}
-
-p{
-	margin: 0px 0px 15px 0px;
-	padding: 0px 0px 0px 0px;
-	color:#666666;
-}
-
-a, a:hover {
-	color: #154374;
-	text-decoration: none;
-}
-
-#PageMenu {
-	width: 250px;
-	margin-right: 10px;
-}
-
-#PageContent {
-	margin: 10px 0px 10px 0px;
-}
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/help/edit_chord.html b/TuxGuitar-testing/platform-all/share/help/edit_chord.html
deleted file mode 100644
index 664335fc..00000000
--- a/TuxGuitar-testing/platform-all/share/help/edit_chord.html
+++ /dev/null
@@ -1,231 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Chord Editor dialog</h1>
-						
-						
-						<div class="level1">
-						
-						<p>
-						 This is a dialog that allows you to get a chord based on it&rsquo;s theory, recognize a chord based on the tab, memorize or get a chord from a library, and few more things. This is also the only way to add a chord name or/and diagram in the tab.
-						</p>
-						
-						<p>
-						<img src="images/edit/chord_dialog.png" title=" The Dialog " alt=" The Dialog " />
-						</p>
-						
-						<p>
-						As you can see chord dialog consists of many things, but is still easy to use. Nevertheless, every feature of the dialog will be explained here.
-						</p>
-						</div>
-						
-						<h2><a name="opening_the_dialog" id="opening_the_dialog">Opening the dialog</a></h2>
-						<div class="level2">
-						
-						<p>
-						 When you open the dialog by clicking on it&rsquo;s icon (or hitting &ldquo;<strong>A</strong>&rdquo; key as shortcut), the first thing you will notice is that the notes from your tab are now in the chord dialog <strong>editor</strong>, the chord is recognized according to the theory and you can hear the sound preview of it.
-						</p>
-						</div>
-						
-						<h2><a name="editor" id="editor">Editor</a></h2>
-						<div class="level2">
-						
-						<p>
-						 In <strong>editor</strong> you can compose your own chord by simple drawing. You should first choose the starting fret with the slider on the right side of the <strong>editor</strong> and then put the black dots on the frets. Clicking above the line on the editor changes the note between the &ldquo;empty-string&rdquo; (white dot) or &ldquo;don&rsquo;t play this string&rdquo; sign (marked with <strong>X</strong>). The span of the editor is 5 frets, but you will have to admit that you rarely play chords by stratching the fingers to 6-fret span. :)
-						</p>
-						
-						<p>
-						While you are &ldquo;drawing&rdquo; the chord, it will constantly be recognized, which can be seen in recognizer window.
-						</p>
-						
-						<p>
-						After composing your chord you can save it to library, or simply press OK and add it to tab.
-						</p>
-						</div>
-						
-						<h2><a name="chord" id="chord">Chord</a></h2>
-						<div class="level2">
-						
-						<p>
-						 This bunch of controls is used to compose a chord based on it&rsquo;s name (theory).
-						</p>
-						
-						<p>
-						You should first choose chord root, either in sharp or flat. Then you should choose chord flavor (major, maj7, sus2, sus4...).
-						</p>
-						
-						<p>
-						Next, you can alterate the chord. You can make <strong>/9</strong> chord (adds b7 and 9 tones), <strong>/11</strong> chord (adds b7, 9 and 11 tones) and <strong>/13</strong> chord (adds b7, 9, 11 and 13 tones). By enabling the &ldquo;add&rdquo; checkbox you get the &ldquo;<strong>add</strong>&rdquo; chord (which means add13 chord has only 13 note, without b7, 9 and 11).
-						</p>
-						
-						<p>
-						 You can modify the selected alteration with <strong>+/-</strong> control, and other alterations with appropriate +/- box (rightmost of the <strong>Chord</strong> controls).
-						</p>
-						
-						<p>
-						On the bottom of <strong>chord</strong> controls is a bass note. If you choose a different bass note than the chord root you will get so-called inverted chord.
-						</p>
-						</div>
-						
-						<h2><a name="proposals" id="proposals">Proposals</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Based on the chosen chord theory, you will get proposals for the fingerings. On the proposal thumbnails you can see the chord position and the fingering. The chord proposals are generated and sorted, so don&rsquo;t be too dissapointed if you don&rsquo;t see your favourite chord on the second position.
-						</p>
-						
-						<p>
-						On the other hand, proposals are generated for any tunning and any criteria the same way. You may be surprised when it digs some convenient fingering for a chord you had trouble with.
-						</p>
-						
-						<p>
-						After you click on the proposal, it will appear in <strong>editor</strong>, it&rsquo;s <strong>name</strong> would be written and you should hear the way it sounds.
-						</p>
-						</div>
-						
-						<h2><a name="name" id="name">Name</a></h2>
-						<div class="level2">
-						
-						<p>
-						 The title of the chord is changed every time you choose one of the proposals. The chord name isn&rsquo;t displayed while you edit the chord because you would loose the chord name you typed in the first place.
-						</p>
-						</div>
-						
-						<h2><a name="recognized" id="recognized">Recognized</a></h2>
-						<div class="level2">
-						
-						<p>
-						 The <strong>recognized</strong> window contains the proposals of the chord title, according to the theory. Besides the chord name you will see the probability of a chord. The probability is less when a chord is missing some tone to be complete.
-						</p>
-						
-						<p>
-						When you click on an item in recognition window, the <strong>chord</strong> controls should change based on the chord you chose, it&rsquo;s name will be displayed in title window, and the <strong>proposals</strong> of more fingering positions should be generated below.
-						</p>
-						</div>
-						
-						<h2><a name="library" id="library">Library</a></h2>
-						<div class="level2">
-						
-						<p>
-						 When you compose a convenient chord, you can add it into <strong>library</strong>. Once added, it can be accessed outside the chord dialog - by clicking on the arrow besides <strong>Chord Editor</strong> icon in the toolbar. When you add a chord to a tab that way, it&rsquo;s name and/or diagram will be displayed in the tab.
-						</p>
-						
-						<p>
-						In Chord Editor dialog you can manipulate the library list: add, rename or remove chord from a library.
-						</p>
-						</div>
-						
-						<h2><a name="settings" id="settings">Settings</a></h2>
-						<div class="level2">
-						
-						<p>
-						 In the <strong>Settings dialog</strong> are some options which can customize and improve the chord proposal assembly process.
-						</p>
-						
-						<p>
-						<img src="images/edit/chord_settings_dialog.png" title=" Chord Settings " alt=" Chord Settings " />
-						</p>
-						
-						<p>
-						<strong>Chords to display</strong> is the number of the best chord proposals to be considered into proposal list. Note that this number of proposals wouldn&rsquo;t be displayed, because the very similar fingerings (like x02210 and x0221x for <em>Am</em>) will not be included.
-						</p>
-						
-						<p>
-						 <strong>Chord type</strong> is a very important property. Besides the &ldquo;<strong>Most common</strong>&rdquo; chords, here you can choose between &ldquo;<strong>Open-voiced chords</strong>&ldquo;, &ldquo;<strong>Closed-voiced chords</strong>&rdquo; and &ldquo;<strong>Chord inversions</strong>&ldquo;. While chord inversions mean that the bass note isn&rsquo;t the root note of the chord, open- and closed-voiced chords are a little bit more specific: closed voice have tones very close (tonically) to each other, while open-voiced tend to distribute the notes of the chord in different octaves.
-						</p>
-						
-						<p>
-						<strong>Open chords</strong> include empty strings into chord composition, so you get &ldquo;open chords&rdquo;. For example, famous &ldquo;Hendrix chord&rdquo; is an open chord ( 076780 ). <strong>Open chords</strong> are another <strong>chord type</strong>, but can be used in combination with any of them.
-						</p>
-						
-						<p>
-						<strong>Search frets</strong> is an option for you if you are looking for a chord on a specific position. Normally all the chords from fret 0 to fret 15 will be proposed, but you can narrow (or expand!) the search by modifying the starting and ending fret. If <strong>open chords</strong> is selected, zero-fret will be included in the search, too.
-						</p>
-						
-						<p>
-						By clicking on the OK button your changes will be applied, but they won&rsquo;t be remembered next time you run TuxGuitar.
-						</p>
-						</div>
-						
-						<h2><a name="chord_layout" id="chord_layout">Chord layout</a></h2>
-						<div class="level2">
-						
-						<p>
-						 When you insert a chord it will be displayed on the main tab view. There are two different views of a chord, plus mixed one. It is changed in the main menu, checking one or both of the items from <strong>Layout&rarr;Chord_Style</strong>.
-						</p>
-						
-						<p>
-						You can view the chord as a diagram (where to put the fingers), only its name (entered in the library), or both. 
-						</p>
-						
-						</div><br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/edit_effects.html b/TuxGuitar-testing/platform-all/share/help/edit_effects.html
deleted file mode 100644
index 908384d6..00000000
--- a/TuxGuitar-testing/platform-all/share/help/edit_effects.html
+++ /dev/null
@@ -1,424 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Note effects</h1>
-						
-						
-						<div class="level1">
-						
-						<p>
-						 As you already know, playing guitar (and any other instrument) isn&rsquo;t just playing the notes in the right duration and dynamics. There are several &ldquo;tricks&rdquo; that are unique for any instrument. TuxGuitar supports effects specific for guitar and bass guitar.
-						</p>
-						
-						<p>
-						Almost all note effects have an icon on the toolbar, but also can be accessed in <strong>Note&rarr;Effects</strong> menu. The effect is applied on the current cursor position.
-						</p>
-						<p> <img src="images/start/tb_effects.png" alt=" Effects toolbar" /></p>
-						</div>
-						
-						<h2><a name="dead_note" id="dead_note">Dead note</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Dead note (sometimes referred as rake) is a playing effect which produces more of a percussive effect than a regular note with it&rsquo;s pitch. Dead note has short and &ldquo;clicking&rdquo; sound. It is used very often by guitar players. 
-						</p>
-						
-						<p>
-						Because of the MIDI standard, all MIDI tab editing applications (Guitar Pro, Tabledit, TuxGuitar...) have a little bit different dead note implementation - it is not exactly dead. It is short, it is percussive, but you can adjust the pitch of the dead note.
-						</p>
-						
-						<p>
-						So in TuxGuitar, if you put a dead note in the scores it will be heard like a muted zero-fret string. If you put a regular fret value and mark that note as dead, it will become a dead note, but will retain the previous pitch.
-						</p>
-						
-						<p>
-						Dead note is marked with &ldquo;<strong>X</strong>&rdquo; sign in the tab.
-						</p>
-						
-						</div>
-						
-						<h2><a name="ghost_note" id="ghost_note">Ghost note</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Ghost note is effect that changes note&rsquo;s dynamics (loudness) to <strong>more quiet</strong>. The difference between the Ghost note and lesser dynamics is seen only visually, while it sounds the same.
-						</p>
-						
-						<p>
-						Ghost note is marked by a note between parentheses <strong>( )</strong>.
-						</p>
-						
-						</div>
-						
-						<h2><a name="accentuated_and_heavy_accentuated_note" id="accentuated_and_heavy_accentuated_note">Accentuated and heavy accentuated note</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Like Ghost note, these effects change note&rsquo;s volume. Accentuated note gives it a little louder dynamics, and heavy accentuated note makes the note even louder.
-						</p>
-						
-						<p>
-						Accentuated note is marked with a &ldquo;<strong>&gt;</strong>&rdquo; sign, and heavy accentuated with &ldquo;<strong>^</strong>&rdquo; sign.
-						</p>
-						
-						</div>
-						
-						<h2><a name="harmonics" id="harmonics">Harmonics</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Guitar harmonics are somewhat special note effect, because the result is a note with different pitch.
-						</p>
-						
-						<p>
-						After you choose harmonics effect, a dialog would appear. You are able to choose between <strong>artificial</strong>, <strong>pinched</strong>, <strong>tapped</strong> and <strong>semi</strong> harmonics.
-						</p>
-						
-						<p>
-						If you wrote a note on fret 3,4,5,7,9,12,16,19... you will get the option to choose the <strong>Natural harmonic</strong> effect. It would sound like natural harmonic on the same fret and string.
-						</p>
-						
-						<p>
-						Otherwise, if you choose <strong>artificial</strong>, <strong>pinched</strong>, <strong>tapped</strong> or <strong>semi</strong> harmonics, you should choose a value from the combo box on the bottom of the dialog. If you chose artificial harmonic, you would be able to choose between these values:
-						</p>
-						<p align="center">
-						<table border="1px">
-							<tr>
-								<td> <strong>A.H(12)</strong> </td><td> artificial harmonic one octave (12 frets) higher than the original note </td>
-							</tr>
-							<tr>
-								<td align="center"> <strong>A.H(9)</strong>  </td><td> artificial harmonic two octaves+major third (28 frets) higher than the original note </td>
-							</tr>
-							<tr>
-								<td align="center"> <strong>A.H(5)</strong> </td><td> artificial harmonic two octaves (24 frets) higher than the original note </td>
-							</tr>
-							<tr>
-								<td align="center"> <strong>A.H(7)</strong> </td><td> artificial harmonic octave+fifth (19 frets) higher than the original note </td>
-							</tr>
-							<tr>
-								<td align="center"> <strong>A.H(4)</strong> </td><td> artificial harmonic two octaves+major third (28 frets) higher than the original note </td>
-							</tr>
-							<tr>
-								<td align="center"> <strong>A.H(3)</strong> </td><td> artificial harmonic two octaves+fifth (31 frets) higher than the original note </td>
-							</tr>
-						</table>
-						<br/>
-						</p>
-						
-						<p>
-						 Note that A.H(4) and A.H(9) sound the same... The number besides denotes the &ldquo;fret offset&rdquo; between the original note and the harmonic &ldquo;hot spot&rdquo;.
-						</p>
-						
-						<p>
-						The difference between <strong>artificial</strong>, <strong>pinched</strong> and <strong>tapped</strong> harmonics is only in the playing technique, but <strong>semi-harmonics</strong> even sound different on TuxGuitar - you can hear the original note along with the harmonic note.
-						</p>
-						
-						</div>
-						
-						<h2><a name="grace_note" id="grace_note">Grace note</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Grace note is a music ornament. You can hear it very often in music, and it sounds like an attempt to play a note as <strong>short</strong> as possible. Grace notes in tabs are displayed smaller than the regular notes, and seem to have no duration. In sheet music grace notes are represented as a small note before a regular note, sometimes with a slash through the note stem.
-						</p>
-						
-						<p>
-						In TuxGuitar grace note can be applied on a position where a note already exists. Choosing to insert a grace note brings you the grace note editor dialog.
-						</p>
-						
-						<p><img src="images/edit/effects_grace.png" title="Grace note editor dialog" alt="Grace note editor dialog"/></p>
-						<p>
-						On guitar, grace notes are most usually played on the same string as the ordinary note, so you will first want to enter the <strong>fret</strong> on which grace note is played. If you check a <span class="curid"><a href="#dead_note"> dead note</a></span>, muted percussive note will be played instead. Select the <strong>position</strong> of the grace note. &ldquo;Before beat&rdquo; places your grace note before the ordinary note, which is played in exact time it is displayed in tab/scores. If you choose &ldquo;On beat&rdquo;, grace note will be played on beat and original note immidiately after grace note.
-						</p>
-						
-						<p>
-						Next you can choose <strong>note duration</strong>. &ldquo;As short as possible&rdquo; is welcome, so 1/64 note is default, but you can also pick 1/32 and 1/16 note if it suits your needs. <strong>Dynamics</strong> of the grace note is also an important property. By default dynamics of a &ldquo;normal&rdquo; note is selected, but in editor dialog you can make grace note louder or more quiet than the succeeding note.
-						</p>
-						
-						<p>
-						At last, you can choose type of the <strong>transition</strong>, which marks the playing style. The default transition is <em>None</em>, which marks no distinct transition. Other available transitions are <em>Bend</em> and <em>Slide</em> (which also effect the way note is heard), and also a <em>Hammer</em> to mark that grace note is played by hammer on-pull off technique.
-						</p>
-						
-						<p>
-						If you have an existing grace note effect applied to the note and click on the &ldquo;Clear&rdquo; button in the dialog, the effect will be removed.
-						</p>
-						
-						</div>
-						
-						<h2><a name="vibrato" id="vibrato">Vibrato</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Vibrato is a note playing technique which makes the frequency (pitch) of a note oscilate a little bit in either direction (lower or higher). It makes the tone more colourful and accentuated. On guitar vibrato is played by slightly moving the finger upside-down or in left-right direction, which playes the sound in slightly higher pitch according to your moves.
-						</p>
-						
-						<p>
-						In TuxGuitar vibrato effect has no special parameters - applying vibrato effect on a note will make a typical vibrato effect, and also mark the tone with the &ldquo;vibrating waves&rdquo; in the tab view.
-						</p>
-						
-						</div>
-						
-						<h2><a name="bend" id="bend">Bend</a></h2>
-						<div class="level2">
-						
-						<p>
-						 String bending effect modifies the pitch of the played tone, but much more than <span class="curid"><a href="#vibrato"> vibrato</a></span> effect. Most often the result of bending a note is gradual pitch shift to another note. By the nature of bending that note has higher frequency then the note on the same fret without bend, because you <strong>bend</strong> the string thus adding more tension to the string. 
-						</p>
-						
-						<p>
-						In TuxGuitar, applying a bend effect to the note opens the Bend Editor dialog, which allows you fine tuning of the bend, showing you exactly how much tension your finger should use. Of course, the result of your modification can be heard.
-						</p>
-						
-						<p><img src="images/edit/effects_bend.png" title="Bend editor" alt="Bend editor" /> </p>
-						<p>
-						First, notice the listbox on the right of the dialog. Those are the presets which are most often used: <em>bend, bend-release, bend-release-bend, prebend</em> and <em>prebend-release</em>. <em>Bend</em> only makes gradual transition to the target note, while <em>bend-release</em> also returns it to the beginning note. <em>Prebend</em> is played when you first bend (add tension) to the string, and <strong>after that</strong> pick the string, so the first tone heard has higher pitch, and then gradually returns to the original note. You should notice that all the presets make bend 1 note (2 frets) higher, so you may need some intervention in the Editor to make the bend sound properly.
-						</p>
-						
-						<p>
-						The Editor allows you fine bend tuning by drawing a graphic function of the bending amount (or pitch modulation/string tension). It works by placing dots in a diagram which are automatically connected with lines. The higher the dot is placed, the greater the bending amount will be. Notice that the diagram is separated horizontally with gray and red lines. Each full red line represents the pitch shift by 1 tone (2 frets), and each dashed red line represents the pitch shift by a semitone (1 fret). Gray line represents the pitch shift of 1/4 of a tone, which is 1/2 of a fret which is called a non-tempered note or &ldquo;blue&rdquo; note. The vertical blue lines divide the note duration on quarters, and dashed blue lines divide your note duration in 1/12 segments. You can place the dot only on intersection of a blue line and red/gray line. Left click places a dot, and right click on the dot removes it.
-						</p>
-						
-						<p>
-						So the bend represented on the picture above is a complex one: the first peak is almost a 2-tone bend-release (it is a slight <em>underbend</em>, because it bends for 3.5 frets), the second one is a slight bend shift to one higher half-tone (1 fret) and back, and the third bends one whole-tone (2 frets) and stays there for a little while.
-						</p>
-						
-						<p>
-						If you have an existing vibrato effect applied to the note and click on the &ldquo;Clear&rdquo; button in the dialog, the effect will be removed.
-						</p>
-						
-						<p>
-						When any bend effect is applied to a note, in the note will be displayed with a curved arrow in the tab view.
-						</p>
-						
-						</div>
-						
-						<h2><a name="tremolo_bar" id="tremolo_bar">Tremolo bar</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Tremolo bar is a term in TuxGuitar for all the effects you can make with a guitar tremolo arm. It allows note pitch shift in both directions and with a higher range of modulation. With tremolo bar effect TuxGuitar can modify the original note very precisely with the modulation diagram, allowing the pitch change up and down whole octave (8 tones, 12 frets) from the original tone.
-						</p>
-						
-						<p>
-						When you apply tremolo bar effect on a note, Tremolo bar Editor dialog appears, very similar to the editor for the <span class="curid"><a href="#bend"> Bend effect</a></span>.
-						</p>
-						
-						<p><img src="images/edit/effects_tremolobar.png" title=" Tremolo bar editor" alt=" Tremolo bar editor" /></p>
-						<p>
-						 There are some presets in the listbox placed on the right side of the dialog. <em>Dip</em> effect slowly lowers the pitch, and after returns back. The oposite effect is <em>inverted dip</em> which increases the pitch and returns back. <em>Dive</em> slowly lowers the pitch, but doesn&rsquo;t return back. Opposite effect is <em>return</em>. <em>Release up</em> starts from the lower pitch and gradually returns to the original tone. <em>Release down</em> also ends at the original tone, but starts at higher pitch. Note that all the presets have pitch offset of 1 tone (2 frets), so you might need to modify the tremolo bar diagram to get the desired effect.
-						</p>
-						
-						<p>
-						Tremolo bar diagram editor consists of red and gray horisontal lines. Each red line represents one whole tone pitch offset (2 frets), and gray one semitone offset (1 fret). It is important to notice the black horisontal line in the middle: that is frequency of your original tone (to which you applied the effect). There are 6 red lines in both directions from the black line, which means you can modify the original pitch up and down 8 tones (12 frets). Vertical blue lines separate the tone duration into small pieces. You can place the dot only on intersection of a blue line and red/gray line. Left click places a dot, and right click on the dot removes it. 
-						</p>
-						
-						<p>
-						So the tremolo bar represented on the picture above is a complex one: first tremolo bar increases the pitch by one tone (2 frets), returns back to the original tone, quickly increases to +2 tone offset (4 frets) and then dives and dives until the tone is one octave (12 frets) lower than the original one.
-						</p>
-						
-						<p>
-						If you have an existing tremolo arm effect applied to the note and click on the &ldquo;Clear&rdquo; button in the dialog, the effect will be removed. 
-						</p>
-						
-						<p>
-						When tremolo arm effect is applied to a note, besides the note in the tab view will be displayed an &ldquo;x&rdquo; with an arrow pointing down.
-						</p>
-						
-						</div>
-						
-						<h2><a name="slide" id="slide">Slide</a></h2>
-						<div class="level2">
-						
-						<p>
-						 A slide is a guitar technique where the player sounds one note, and then moves (slides) their finger up or down the fretboard to another fret. If done properly, the notes between should also sound.
-						</p>
-						
-						<p>
-						In TuxGuitar slide connects the current note with the next note on the same string. Then in tab view you can see a line connecting two notes (upwards or downwards).
-						</p>
-						
-						 
-						</div>
-						
-						<h2><a name="hammer_on_pull_off" id="hammer_on_pull_off">Hammer on / Pull off</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Hammer on and pull off are playing techniques which assume playing another note on the same string but without picking a string again. Heavy usage of hammer on/pull off in a short period is often refered as legato style. Hammer on refers to the transition between a previous note and a note with a higher pitch. Pull off is exactly the opposite, transition between a previous note and a note with a lower pitch. 
-						</p>
-						
-						<p>
-						In TuxGuitar <strong>hammer on</strong> and <strong>pull off</strong> are treated and displayed as the same effect. When you apply the effect, a connecting arc will be displayed between the current note and the next note <strong>on the same string</strong>, which marks that notes should be played with hammer on/pull off technique.
-						</p>
-						
-						</div>
-						
-						<h2><a name="trill" id="trill">Trill</a></h2>
-						<div class="level2">
-						
-						<p>
-						 A rapid series of hammer-ons and pull-offs between a single pair of notes is called a trill. So you can write all the trills manually, but TuxGuitar has the trill editor, which sometimes reduces the writing time.
-						</p>
-						
-						<p>
-						Trill effect is applied on an existing note, which is considered the first note in a trill. Then the <strong>trill editor</strong> appears and allows you to choose the second note, and a duration between the hammer-ons and pull-offs. If there is existing trill effect and you select Clear on the trill editor, the effect will be removed.
-						</p>
-						
-						<p>
-						Trill effect is marked in a tab with &ldquo;<strong>tr</strong>&rdquo; mark and a wave along the note duration.
-						</p>
-						
-						</div>
-						
-						<h2><a name="tremolo_picking" id="tremolo_picking">Tremolo picking</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Tremolo picking means that the same note is picked in a rapid manner.
-						</p>
-						
-						<p>
-						So it would be the same if you write dozens of notes by yourself or use a tremolo picking effect, but if you apply the effect the tab will look nicer and it may save some time. Applying the tremolo picking effect on a current note will bring the tremolo picking editor, which allows you to choose how frequently it will be picked. If you already have a tremolo effect and click on &ldquo;Clean&rdquo; in the editor, the effect will be removed.
-						</p>
-						
-						<p>
-						Tremolo picking effect is marked with three diagonal lines (<em>≡</em>) in scores or tab.
-						</p>
-						
-						</div>
-						
-						<h2><a name="palm_mute" id="palm_mute">Palm mute</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Palm mute is an effect which is produced by placing the palm of a picking hand across the strings very close to the bridge. The strings retain their pitch, but the sound is more or less muted.
-						</p>
-						
-						<p>
-						In TuxGuitar you can apply a palm mute effect on any note. It is removed the same way.
-						</p>
-						
-						<p>
-						Palm mute effect is displayed with &ldquo;<strong>P.M.</strong>&rdquo; sign in scores or tab.
-						</p>
-						
-						</div>
-						
-						<h2><a name="staccato" id="staccato">Staccato</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Staccato is a playin technique where the player plays in a distinctive, &ldquo;hopping&rdquo; manner, trying to make note duration shorter than it should be normally.
-						</p>
-						
-						<p>
-						In TuxGuitar staccato effect makes the note duration 50% of its original duration. When staccato effect is applied, a dot shows up above the note in the scores view. When applied again, it is cleared.
-						</p>
-						
-						</div>
-						
-						<h2><a name="tapping" id="tapping">Tapping</a></h2>
-						<div class="level2">
-						
-						<p>
-						  Tapping is a guitar playing technique used more often on electric instruments. It is played using both hands on the fretboard, with a picking hand making hard hammer-ons and pull-offs.
-						</p>
-						
-						<p>
-						In TuxGuitar tapping has no effect on note. Instead, it just marks the tone which should be tapped with a picking hand. Tapped note is marked with a letter &ldquo;<strong>T</strong>&rdquo; above tapped note. Tapped notes can be combined with a slide, bend or hammer on/pull of if you need.
-						</p>
-						
-						</div>
-						
-						<h2><a name="slapping_and_popping" id="slapping_and_popping">Slapping and popping</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Slapping and popping are techniques most commonly used on bass guitar. Slapping assumes hitting a string with the thumb of the strumming hand near the base of the guitar&rsquo;s neck. Popping is often combined with slapping, and assumes snapping the strings (usually) with the index or middle finger of the same hand.
-						</p>
-						
-						<p>
-						In TuxGuitar both slapping and popping don&rsquo;t really affect the sound, but only mark the style of playing. Above the slapping notes letter &ldquo;<strong>S</strong>&rdquo; is placed, and above popping letter &ldquo;<strong>P</strong>&ldquo;.
-						</p>
-						
-						</div>
-						
-						<h2><a name="fade_in" id="fade_in">Fade in</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Fade in is an effect which gradually increases the volume of a note, from zero to the current volume (depends on note dynamics). The effect is applied to each note independantly, and cleared in the same way. Note with a fade in is marked with a &ldquo;<strong>&lt;</strong>&rdquo; sign above the tab. 
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/edit_matrix.html b/TuxGuitar-testing/platform-all/share/help/edit_matrix.html
deleted file mode 100644
index 07734707..00000000
--- a/TuxGuitar-testing/platform-all/share/help/edit_matrix.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Matrix Editor</h1>
-						<div class="level1">
-						
-						<p>
-						 Matrix Editor is a useful tool for editing the percussion tracks. It can alse edit the ordinary tracks, but it is much less useful. It is accessed by <strong>Layout&rarr;Show_Matrix</strong> menu.
-						</p>
-						
-						<p>
-						Basically, it divides the current measure into segments and displays the possible percussion sounds. Not only you can view the measure and the sounds in the matrix, but by clicking on one block of the matrix you add/remove the sound from the tab.
-						</p>
-						
-						<p>
-						<img src="images/edit/matrix_editor.png"/>
-						</p>
-						
-						<p>
-						It is very important to remember that Matrix Editor does not &ldquo;lock&rdquo; the main TuxGuitar window, which means you can use <strong>Note duration</strong> and <strong>Note dynamics</strong> icons from the toolbar, and change the current measure/instrument as well.
-						</p>
-						
-						<p>
-						You can also change the current measure with left/right arrows in the top-left corner of the dialog, and the note duration by the note duration up/down arrows (between the arrows is current note duration).
-						</p>
-						
-						<p>
-						<strong>Number of grids</strong> value in the dialog helps you to determine the position where you should click - it divides one basic duration (denominator of Time Signature) into <em>number</em> segments.
-						</p>
-						
-						<p>
-						Border on the top and the bottom of the Matrix Editor view component (black on the picture) marks your current cursor position - which does not affect your clicking, only writing the numbers in the tab.
-						</p>
-						
-						<p>
-						The hammer icon on the top-right corner of the dialog opens the settings for the Matrix Mixer. There you can adjust colours and font of the Matrix Editor dialog. 
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/editing_song.html b/TuxGuitar-testing/platform-all/share/help/editing_song.html
deleted file mode 100644
index 8d58133a..00000000
--- a/TuxGuitar-testing/platform-all/share/help/editing_song.html
+++ /dev/null
@@ -1,264 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Editing a whole song</h1>
-						
-						<div class="level1">
-						
-						<p>
-						 Song is consisted out of tracks, so when you are editing a song most of the time you edit the tracks, one by one, which is explained in the <a class="PageLink" href="editing_track.html">Editing a track</a> section. But there are some options that affect the song as a whole.
-						</p>
-						
-						</div>
-						
-						<h2><a name="managing_the_tracks" id="managing_the_tracks">Managing the tracks</a></h2>
-						<div class="level2">
-						
-						<p>
-						 <img src="images/start/tb_add_track.png"/>
-						</p>
-						
-						<p>
-						Each song consists out of one or more tracks. In any moment you can add or remove track, create new one by copying contents of the selected one (clone track). If you want to add a percussion track, you have to check the <strong>Percussion Track</strong> box in the Track Properties.
-						</p>
-						
-						<p>
-						All the tracks are displayed in the instrument list, located on the bottom of the application window. You can rearrange the order of the instruments on that list by choosing <strong>Track/Move Up-Down</strong> from the main menu. If you double-click on the instrument name on the list, <strong>Track properties</strong> dialog will appear, where you can modify instrument, track name, colour and tunning.
-						</p>
-						
-						</div>
-						<!--
-						<h2><a name="choosing_the_channels" id="choosing_the_channels">Choosing the channels:</a></h2>
-						<div class="level2">
-						
-						<p>
-						<img src="images/edit/sed_instrument_list.jpg" title="" alt="" width="620" height="144" />
-						</p>
-						
-						<p>
-						There are some numbers in combo boxes on the instrument list - those are channels for the instrument.
-						</p>
-						
-						<p>
-						To understand the way of distributing channels properly, you have to know something about MIDI specification.
-						</p>
-						
-						<p>
-						MIDI uses channels to play music - each <strong>channel has currently assigned instrument (voice)</strong>. There are 16 different channels (marked 0..15) - channel 9 is reserved for drums and percussion.
-						</p>
-						
-						<p>
-						For example, to be able to play a <a href="edit_effects.html#dead_note">dead note</a> and a tone in the same time, TuxGuitar has to occupy two channels for a track, because dead note is one instrument (voice) and guitar tone is another instrument. So every track has its <strong>Channel</strong> (marked green on the picture above), but also needs the <strong>Effect channel</strong> (marked orange on the picture above). Because there are only 16 channels it leads you to conclusion that you cannot have more than 7 instruments (tracks) and a percussion in TuxGuitar. That is not true.
-						</p>
-						
-						<p>
-						It means that as long as you don&rsquo;t have more than 7 instruments and a percussion, you don&rsquo;t have to worry about distributing MIDI channels - TuxGuitar distributes the channels in order. But if you have more tracks you have to be careful. By overlapping MIDI channels you can achieve MIDI reproduction without any problems, but you have to understand the problem.
-						</p>
-						
-						</div>
-						
-						<h5><a name="effect_channel" id="effect_channel">Effect channel</a></h5>
-						<div class="level5">
-						
-						<p>
-						 <strong>Effect channel</strong> is used in certain occasions. One ocasion is when <strong>two different voices</strong> are played in the same time in the same track. In TuxGuitar that can happen if you play dead note or harmonic in the same time with an ordinary instrument tone. 
-						</p>
-						
-						<p>
-						The other occasion effect channel is used is when you apply some <strong>pitch effect</strong> (like bend, slide, vibrato or tremolo bar) on <em class="u"><strong>some of the notes</strong></em> played in the same time in same track/channel. The reason for this is because by MIDI specification effect can be applied only on channel, not on note. So TuxGuitar automatically moves note to Effect channel and apply pitch effect on him. That is also the reason why you cannot apply slide and bend effect in the exact same time in TuxGuitar (but also on real guitar :).
-						</p>
-						
-						</div>
-						
-						<h4><a name="how_to_overlap_channels" id="how_to_overlap_channels">How to overlap channels?</a></h4>
-						<div class="level4">
-						
-						<p>
-						 The safest way is to overlap channels of two tracks that are never played in the same time. The only problem is that <strong>mixer settings</strong> (volume, pan and solo/mute) would have the same value for both the instruments (tracks).
-						</p>
-						
-						<p>
-						You can also try to assign the same channel for channel (CH) and effects channel (EC) if you don&rsquo;t use effects like dead note, harmonics in the same time with an ordinary instrument note, or you don&rsquo;t need to apply &ldquo;pitch&rdquo; effect on only some notes played in the same time with notes without pitch effect. If you do use effects but set the same CH and EC, dead note and harmonics probably wouldn&rsquo;t be heard, and pitch effects would apply on all the notes in the same time.
-						</p>
-						
-						</div>
-						-->
-						<h2><a name="mixer_dialog" id="mixer_dialog">Mixer dialog:</a></h2>
-						<div class="level2">
-						
-						<p>
-						<img src="images/edit/sed_mixer_dialog.png" title="" alt="" />
-						</p>
-						
-						<p>
-						Mixer dialog can be accessed by choosing <em>Layout/Show mixer</em> from the main menu, or by clicking on the icon in the toolbar (in the middle on the picture below).
-						</p>
-						
-						<p>
-						<img src="images/start/tb_view.png" width="91" height="27" />
-						</p>
-						
-						<p>
-						The most insteresting feature of the Mixer dialog is adjusting <strong>volume</strong> for each track (to be more precise: for each MIDI channel). 
-						</p>
-						
-						<p>
-						You can also set <strong>pan</strong> for each track - balance between left and right speaker.
-						</p>
-						
-						<p>
-						In Mixer dialog you can choose to <strong>Mute</strong> (turn off) a specific instrument, and also to play only single instrument by choosing <strong>Solo</strong>.
-						</p>
-						
-						<p>
-						<strong>Metronome</strong> is also placed in Mixer dialog. By clicking on the button you enable and disable it - it is played with each beat determined by denominator in song&rsquo;s <a class="PageLink" href="editing_track.html#before_you_start_with_notes">time signature</a> (e.g. metronome will go in every 1/8 for 7/8 key signature).
-						</p>
-						
-						<p>
-						<em>Changing volume or instrument in the middle of a song is still unsupported by TuxGuitar, but it most probably will in some later versions.</em>
-						</p>
-						
-						<h4 name="choosing_the_channels" id="choosing_the_channels">Choosing the channels:</h4>
-						
-						<div class="level2">
-						
-						<p>
-						There are some numbers in combo boxes on the mixer dialog - those are channels for the track.
-						</p>
-						
-						<p>
-						To understand the way of distributing channels properly, you have to know something about MIDI specification.
-						</p>
-						
-						<p>
-						MIDI uses channels to play music - each <strong>channel has currently assigned instrument (voice)</strong>. There are 16 different channels (marked 0..15) - channel 9 is reserved for drums and percussion.
-						</p>
-						
-						<p>
-						For example, to be able to play a <a class="PageLink" href="edit_effects.html#dead_note">dead note</a> and a tone in the same time, TuxGuitar has to occupy two channels for a track, because dead note is one instrument (voice) and guitar tone is another instrument. So every track has its <strong>Channel</strong> (marked green on the picture above), but also needs the <strong>Effect channel</strong> (marked orange on the picture above). Because there are only 16 channels it leads you to conclusion that you cannot have more than 7 instruments (tracks) and a percussion in TuxGuitar. That is not true.
-						</p>
-						
-						<p>
-						It means that as long as you don&rsquo;t have more than 7 instruments and a percussion, you don&rsquo;t have to worry about distributing MIDI channels - TuxGuitar distributes the channels in order. But if you have more tracks you have to be careful. By overlapping MIDI channels you can achieve MIDI reproduction without any problems, but you have to understand the problem.
-						</p>
-						
-						</div>
-						
-						<h5 name="effect_channel" id="effect_channel">Effect channel</h5>
-						<div class="level4">
-						
-						<p>
-						 <strong>Effect channel</strong> is used in certain occasions. One ocasion is when <strong>two different voices</strong> are played in the same time in the same track. In TuxGuitar that can happen if you play dead note or harmonic in the same time with an ordinary instrument tone. 
-						</p>
-						
-						<p>
-						The other occasion effect channel is used is when you apply some <strong>pitch effect</strong> (like bend, slide, vibrato or tremolo bar) on <em class="u"><strong>some of the notes</strong></em> played in the same time in same track/channel. The reason for this is because by MIDI specification effect can be applied only on channel, not on note. So TuxGuitar automatically moves note to Effect channel and apply pitch effect on him. That is also the reason why you cannot apply slide and bend effect in the exact same time in TuxGuitar (but also on real guitar :).
-						</p>
-						
-						</div>
-						
-						<h5 name="how_to_overlap_channels" id="how_to_overlap_channels">How to overlap channels?</h5>
-						<div class="level4">
-						
-						<p>
-						 The safest way is to overlap channels of two tracks that are never played in the same time. The only problem is that <strong>mixer settings</strong> (volume, pan and solo/mute) would have the same value for both the instruments (tracks).
-						</p>
-						
-						<p>
-						You can also try to assign the same channel for channel (CH) and effects channel (EC) if you don&rsquo;t use effects like dead note, harmonics in the same time with an ordinary instrument note, or you don&rsquo;t need to apply &ldquo;pitch&rdquo; effect on only some notes played in the same time with notes without pitch effect. If you do use effects but set the same CH and EC, dead note and harmonics probably wouldn&rsquo;t be heard, and pitch effects would apply on all the notes in the same time.
-						</p>
-						
-						</div>
-						
-						</div>
-						
-						<h2><a name="composition_properties" id="composition_properties">Composition properties:</a></h2>
-						<div class="level2">
-						
-						<p>
-						 You don&rsquo;t want your transcription to be distributed in cyberspace without any credits. :)
-						</p>
-						
-						<p>
-						By selecting <em>Composition/Properties</em> from the main menu or clicking on appropriate icon you invoke dialog that containst information about the current song.
-						</p>
-						
-						<p>
-						<img src="images/start/tb_properties.png" class="media" title="" alt="" width="28" height="26" />
-						</p>
-						
-						<p>
-						Every song should have name, author and transcriber set, both for archiving and printing purpose. Read <a class="PageLink" href="start_toolbars.html#song_properties">more details</a>.
-						</p>
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/editing_track.html b/TuxGuitar-testing/platform-all/share/help/editing_track.html
deleted file mode 100644
index 4ce2d55f..00000000
--- a/TuxGuitar-testing/platform-all/share/help/editing_track.html
+++ /dev/null
@@ -1,286 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Editing a track</h1>
-						
-						<p>
-						Each song consists of one or more tracks. 
-						</p>
-						
-						<p>
-						Each track is assigned to one instrument. Each instrument sounds the different way.
-						</p>
-						
-						<h2><a name="before_you_start_with_notes" id="before_you_start_with_notes">Before you start with notes:</a></h2>
-						
-						<p>
-						 Before you start inserting notes into a new song, you have to adjust some settings. These are accessed through <em>Composition</em> menu.
-						</p>
-						
-						<p>
-						<strong>Time signature</strong> has to be defined for each song. Usually it is 4/4, but sometimes it has some different value (3/4 for waltz, 7/8, etc.) Time signature applies for all the tracks. It can be changed in the middle of the song - when you change the value time signature will be changed <em class="u">from the current place in the song until the end</em>.
-						</p>
-						
-						<p>
-						<strong>Tempo</strong> is another value each song possess. It indicates how many beats (1/4 notes) song has in a minute - it is marked in BPM&rsquo;s - Beats Per Minute. Tempo also applies for all the tracks in the song, and also can be changed. When you change the value tempo will be changed <em class="u">from the current place in the song until the end</em>.
-						</p>
-						
-						<p>
-						<strong>Clef</strong> affects the song display in scores. Clefs are used to mark the specific pitch of the note, so all other notes&rsquo; pitch can be determined. Clef is placed on the beginning of the scores. There are three types of clef supported in TuxGuitar: treble (default), bass, alto and tenor, which are the most usual clefs. Custom clefs are not supported. Clef can be changed in the middle of the song - when it&rsquo;s changed the scores display changes from that position and further. 
-						</p>
-						
-						<p>
-						<strong>Key signature</strong> affects the way the notes are written in scores. They represent the current scale the song is written in, so there&rsquo;s no need to constantly write <em>sharp</em> and <em>flat</em> marks. When you choose to change the key signature, dialog appears with existing key signatures. <strong>Natural</strong>, for example, represents the C-major, <strong>one flat</strong> represents F-major, etc.
-						</p>
-						
-						<p>
-						<strong>Triplet feel</strong> (also: <em><strong>shuffle</strong> notes</em> or <em><strong>swung</strong> notes</em>) is the rhythmic device in which the duration of the initial note in a pair is augmented and that of the second is diminished. This effect is often used in jazz and blues music. TuxGuitar triplet feel divides the note par in 2:1 ratio. <em class="u"><strong>Triplet 8th</strong></em> divides a pair of 1/8 notes and <em class="u"><strong>Triplet 16th</strong></em> divides a pair of 1/16 notes into 2:1 ratio.</p>
-						
-						<h4><a name="track_properties" id="track_properties">Track properties</a></h4>
-						
-						<p>
-						<strong>Track properties</strong> are the most important and should be adjusted for each track: track name, display color, instrument (from the list of instruments), number of strings and tuning. You can access this dialog by choosing Track/Properties in the main menu.
-						</p>
-						
-						<h2><a name="putting_the_notes_in" id="putting_the_notes_in">Putting the notes in:</a></h2>
-						
-						
-						<h3><a name="note_and_measure_duration" id="note_and_measure_duration">Note and measure duration</a></h3>
-						
-						<p>
-						 The most important property of a note is its duration. The sum of duration of all the notes in a measure is determined by the measure&rsquo;s time signature. TuxGuitar has a system that protects the user of making an irregular measure (longer or shorter).
-						</p>
-						
-						<p>
-						Therefore, every new 4/4 measure can contains only one whole note. When you select a duration of a note you want to enter, TuxGuitar adjusts all the pauses between the current position and the end of a measure (or the next note entered) so you can insert as many notes as possible.
-						</p>
-						
-						<p>
-						You can change time signature in Composition&rarr;Time signature (or on 4/4 icon), and note duration in menu Note&rarr;Duration&rarr;(wanted duration). Note duration icons are also located on the main application toolbar.
-						</p>
-						
-						<h3><a name="navigating" id="navigating">Navigating</a></h3>
-						
-						<p>
-						 You can change the current position of a note you want to enter by clicking on the desired location, or by navigating with arrows of a keyboard. Simply pressing the arrows left and right puts you on the next note in the current track, but Ctrl+(left or right) takes you to the previous or next measure.
-						</p>
-						
-						<p>
-						Arrows up and down navigate you through the strings in tablature editor.
-						</p>
-						
-						<h3><a name="writing_numbers" id="writing_numbers">Writing numbers</a></h3>
-						
-						<p>
-						 <img src="images/edit/typing.png"/>
-						</p>
-						
-						<p>
-						<strong>Tablature editor</strong> is represented by the number of the strings instrument possess. Each line is a string - when you type a number on a string <strong>[0 .. 29]</strong> editor puts on that string a note which is heard if you press a string on typed fret. The note has selected duration and dynamics you can modify afterwards. 
-						</p>
-						
-						<p>
-						If you navigate to an existing note (written as a number) and press Shift+(left or right) you will increase/decrease the pitch (fret) on the current string. If you press Shift+(up or down) you will move the fret value to the string up or down.
-						</p>
-						
-						<h3><a name="clicking_on_the_scores" id="clicking_on_the_scores">Clicking on the scores</a></h3>
-						
-						<p>
-						 To be able to insert notes by clicking on the scores, you should be in the <strong>Score Edition Mode</strong> (you can change mode in Edit menu). When Score Edition Mode is enabled, you can check and uncheck the <strong>Sharp/Flat mode</strong> (in Edit menu, also) by which you can insert sharp notes.
-						</p>
-						
-						<p>
-						Notes are inserted by left-clicking on the score&rsquo;s line or between two lines. If you decide to write notes above or below five existing lines, aditional lines will appear. By clicking a note will appear on the selected place, and also in the tablature editor by appropriate number on appropriate string.
-						</p>
-						
-						<h3><a name="note_dynamics" id="note_dynamics">Note dynamics</a></h3>
-						
-						<p>
-						 Very important property of a note is it&rsquo;s dynamics: the &ldquo;loudness&rdquo; of a note. For each note you can put wanted dynamics.
-						</p>
-						
-						<p>
-						<img src="images/start/tb_dynamics.png"/>
-						</p>
-						
-						<p>
-						When you create a note, it will have dynamics previously selected. If you click on other dynamics&rsquo; icon when positioned on existing note, the note will change its dynamics. In TuxGuitar dynamics is marked in standard manner (<strong><em>mp</em></strong> for <em>mezzo-piano</em>, <strong><em>fff</em></strong> for <em>forte fortissimo</em> etc.)
-						</p>
-						
-						<h3><a name="dotted_and_double-dotted_note" id="dotted_and_double-dotted_note">Dotted and double-dotted note</a></h3>
-						
-						<p>
-						 Dotted note has extended duration by 50%. It means that if you mark a 1/2 note as dotted, its duration will be 1/2 + 1/4 = 3/4. 
-						</p>
-						
-						<p>
-						Double dotted note has duration extended by 75%. That means that 1/4 double dotted note will have duration of 1/4 + 1/8 + 1/16 = 7/16.
-						</p>
-						
-						<h3><a name="tied_note" id="tied_note">Tied note</a></h3>
-						
-						<p>
-						 When a note is played on the end of one measure but lasts in the next measure also, you have to use a <strong>tied note</strong>. You achieve the effect by putting the note on the end of a first measure and then put the same note on the beginning of next measure. <u>Then you mark</u> the second note as a tied note.
-						</p>
-						
-						<p>
-						You can also use a tied note in the situation you need a note which has duration of a 5/16 note - a duration you cannot achieve by dotted or double dotted note. Then you tie a 1/4 and 1/16 note.
-						</p>
-						
-						<h3><a name="insert_chord" id="insert_chord">Insert chord</a></h3>
-						
-						<p>
-						 You can also put some notes into the song by inserting a chord. Chord&rsquo;s duration and dynamics will be those currently selected.
-						</p>
-						
-						<p>
-						<img src="images/edit/insert_named_chord.png"/>
-						</p>
-						
-						<p>
-						You can insert a chord defined earlier (as on picture) or you can use chord wizard to generate a new chord (and even define a name for it for later use). Read more about <a class="PageLink" href="edit_chord.html">Chord Editor dialog</a> in other entry.
-						</p>
-						
-						<h2><a name="after_putting_the_notes" id="after_putting_the_notes">After putting the notes:</a></h2>
-						
-						<p>
-						 After writing the things you wanted, you will probably want to hear what&rsquo;s done. After checking you will probably want to change something - listening and correction makes it perfect.
-						</p>
-						
-						<h3><a name="effects" id="effects">Effects</a></h3>
-						
-						<p>
-						 Playing guitar isn&rsquo;t just playing a note in a right time. There are some little tricks we all use, like bend, palm mute etc. TuxGuitar supports most of them. Many effects are applied on the current note. Read more about <a class="PageLink" href="edit_effects.html">Note effects</a> in this help.
-						</p>
-						
-						<h3><a name="repeat" id="repeat">Repeat</a></h3>
-						
-						<p>
-						 Sometimes in a song all the instrument are played the same way several times (e.g. in chorus). It is more elegant to mark that segment of a song for repetition than to copy/paste that passage again.
-						</p>
-						
-						<p>
-						Repeat is set over one or more measures. It has a beginning, an end and information how many times <em class="u">to repeat</em>. So if you want a passage to be played twice, you start repeat and end it on appropriate place. When asked how many times to repeat you should set 1 if you want it to be played twice.
-						</p>
-						
-						<p>
-						Repeats are even more convenient to use with <strong>alternative endings</strong> - you define different ending measures for each repeat. So after you close a repeat and mark it as an alternative ending the editor will appear to select at which repeats this ending will play. It is a little hard to explain, but if you try the option you will find it self-explanatory.
-						</p>
-						
-						<p>
-						<img src="images/edit/repeats.png"/>
-						</p>
-						
-						<h3><a name="lyrics" id="lyrics">Lyrics</a></h3>
-						
-						<p>
-						 TuxGuitar supports writing lyrics in a track, so you can make a track which contains lyrics and the melody of singing. Lyrics editor is accessed by selecting <em>Track/Lyrics</em> from the main menu.
-						</p>
-						
-						<p>
-						The way the lyrics will be displayed <strong>depends on the content of the measure</strong>. Every word seperated by <em>space</em> or <em>enter</em> belongs to one note in a measure.
-						</p>
-						
-						<p>
-						<img src="images/edit/ed_lyrics.png"/>
-						</p>
-						
-						<p>
-						You have to select the number of a measure where lyrics start. When you type text, it starts below the first note in a measure you have set, and after each <em>space</em> or <em>enter</em> key the next word is displayed below the next <strong>note</strong>. Pauses are ignored. When you type text below every note in a measure, the text automatically move to the next measure.
-						</p>
-						
-						<p>
-						If you want to have some notes without a text below, you should put more <em>space</em> characters.
-						</p>
-						
-						<h3><a name="text" id="text">Text</a></h3>
-						
-						<p>
-						 Similar as lyrics, but the text is not tied to notes. It is most often used as a note to the player or a comment to tab. It is displayed above the note it is assigned to.
-						</p>
-						
-						<h3><a name="just_one_instrument" id="just_one_instrument">Just one instrument?</a></h3>
-						
-						<p>
-						 Well, probably not. But you have to write something to be able to write some more. You will probably want to add more instruments (tracks) and enter the wonderfull world of multi-track editing. :)
-						</p>
-						
-						<p>
-						But even if you have only one track in a song, it is still a song. Song have some of its own properties and editing, so you should check <a class="PageLink" href="editing_song.html">section about editing a song</a>.
-						</p>
-						
-						<h3><a name="the_percussion_track" id="the_percussion_track">The Percussion track</a></h3>
-						
-						<p>
-						 The track for drums and percussions is treated a little bit differently in TuxGuitar than the other, &ldquo;ordinary&rdquo; tracks. It always has to be on MIDI channel 9 - that is achieved by checking the <strong>Percussion Track</strong> option in the Track&rarr;Properties. There is a special tool for editing the percussion track - besides the usual editing (by entering numbers on the tab), you can also use the Matrix Editor from <strong>Layout&rarr;Show_Matrix menu</strong>. Read more about <a class="PageLink" href="edit_matrix.html"> Matrix Editor</a>. 
-						</p>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/file_formats.html b/TuxGuitar-testing/platform-all/share/help/file_formats.html
deleted file mode 100644
index 30fb3281..00000000
--- a/TuxGuitar-testing/platform-all/share/help/file_formats.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1><a name="supported_file_formats_in_tuxguitar" id="supported_file_formats_in_tuxguitar">Supported file formats in TuxGuitar</a></h1>
-						
-						
-						<div class="level1">
-						
-						<p>
-						 Besides TuxGuitar&rsquo;s own file format (with *.tg extension), TuxGuitar can work with various tablature and music file formats.
-						</p>
-						
-						</div>
-						
-						<h2><a name="tablatures" id="tablatures">Tablatures</a></h2>
-						<div class="level2">
-						
-						<p>
-						 <strong>old Guitar Pro</strong> (.gtp) - load
-						</p>
-						
-						<p>
-						<strong>Guitar Pro 3</strong> (.gp3) - load and save
-						</p>
-						
-						<p>
-						<strong>Guitar Pro 4</strong> (.gp4) - load and save
-						</p>
-						
-						<p>
-						<strong>Guitar Pro 5</strong> (.gp5) - load and save
-						</p>
-						
-						<p>
-						<strong>PowerTab</strong> (.ptb) - load
-						</p>
-						
-						<p>
-						<strong>TableEdit</strong> (.tef) - load
-						</p>
-						
-						<p>
-						<strong>LilyPond</strong> (.ly) - export
-						</p>
-						</div>
-						
-						<h2><a name="music_and_sheet" id="music_and_sheet">Music and sheet</a></h2>
-						<div class="level2">
-						
-						<p>
-						 <strong>MIDI</strong> (.mid) - import and export
-						</p>
-						
-						<p>
-						<strong>ASCII</strong> (.txt) - export
-						</p>
-						
-						<p>
-						<strong>MusicXML</strong> (.xml) - export
-						</p>
-						
-						<p>
-						<strong>Adobe PDF</strong> (.pdf) - export
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/chord_dialog.png b/TuxGuitar-testing/platform-all/share/help/images/edit/chord_dialog.png
deleted file mode 100644
index 9e9d0bb5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/chord_dialog.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/chord_settings_dialog.png b/TuxGuitar-testing/platform-all/share/help/images/edit/chord_settings_dialog.png
deleted file mode 100644
index 74c4290a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/chord_settings_dialog.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/ed_lyrics.png b/TuxGuitar-testing/platform-all/share/help/images/edit/ed_lyrics.png
deleted file mode 100644
index 0ca3cf0c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/ed_lyrics.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/effects_bend.png b/TuxGuitar-testing/platform-all/share/help/images/edit/effects_bend.png
deleted file mode 100644
index ec500c0d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/effects_bend.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/effects_grace.png b/TuxGuitar-testing/platform-all/share/help/images/edit/effects_grace.png
deleted file mode 100644
index 6c5f2532..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/effects_grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/effects_tremolobar.png b/TuxGuitar-testing/platform-all/share/help/images/edit/effects_tremolobar.png
deleted file mode 100644
index 83d14905..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/effects_tremolobar.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/insert_named_chord.png b/TuxGuitar-testing/platform-all/share/help/images/edit/insert_named_chord.png
deleted file mode 100644
index 21b0b771..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/insert_named_chord.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/matrix_editor.png b/TuxGuitar-testing/platform-all/share/help/images/edit/matrix_editor.png
deleted file mode 100644
index 290cb289..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/matrix_editor.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/repeats.png b/TuxGuitar-testing/platform-all/share/help/images/edit/repeats.png
deleted file mode 100644
index e0aef24b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/repeats.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/sed_mixer_dialog.png b/TuxGuitar-testing/platform-all/share/help/images/edit/sed_mixer_dialog.png
deleted file mode 100644
index fd04e71d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/sed_mixer_dialog.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/edit/typing.png b/TuxGuitar-testing/platform-all/share/help/images/edit/typing.png
deleted file mode 100644
index a1f82106..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/edit/typing.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/fs_new_file.png b/TuxGuitar-testing/platform-all/share/help/images/start/fs_new_file.png
deleted file mode 100644
index 4bab96a7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/fs_new_file.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/fs_song_table.png b/TuxGuitar-testing/platform-all/share/help/images/start/fs_song_table.png
deleted file mode 100644
index d1e678e7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/fs_song_table.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/fs_track_properties.png b/TuxGuitar-testing/platform-all/share/help/images/start/fs_track_properties.png
deleted file mode 100644
index 5f2a93f1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/fs_track_properties.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/p_mode.png b/TuxGuitar-testing/platform-all/share/help/images/start/p_mode.png
deleted file mode 100644
index b081f11c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/p_mode.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_add_track.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_add_track.png
deleted file mode 100644
index 2c15a141..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_add_track.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_composition.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_composition.png
deleted file mode 100644
index 79232233..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_composition.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_duration.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_duration.png
deleted file mode 100644
index 2a013052..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_duration.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_dynamics.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_dynamics.png
deleted file mode 100644
index 88301a2a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_dynamics.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_edit_menu.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_edit_menu.png
deleted file mode 100644
index ab1a9ad5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_edit_menu.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_edit_mode.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_edit_mode.png
deleted file mode 100644
index 2c85800c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_edit_mode.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_effects.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_effects.png
deleted file mode 100644
index 70111009..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_effects.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_file_menu.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_file_menu.png
deleted file mode 100644
index 8fca7512..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_file_menu.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_layout.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_layout.png
deleted file mode 100644
index 3e12a4d4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_layout.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_markers.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_markers.png
deleted file mode 100644
index 3be92e22..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_markers.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_note.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_note.png
deleted file mode 100644
index e0d6ec46..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_note.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_properties.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_properties.png
deleted file mode 100644
index 357ed7b9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_properties.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_props_diff.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_props_diff.png
deleted file mode 100644
index 23838cf9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_props_diff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_transport.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_transport.png
deleted file mode 100644
index 407dad6f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_transport.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/start/tb_view.png b/TuxGuitar-testing/platform-all/share/help/images/start/tb_view.png
deleted file mode 100644
index 5dad2866..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/start/tb_view.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/tools/converter.png b/TuxGuitar-testing/platform-all/share/help/images/tools/converter.png
deleted file mode 100644
index 49a4203f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/tools/converter.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/tools/keybinding_editor.png b/TuxGuitar-testing/platform-all/share/help/images/tools/keybinding_editor.png
deleted file mode 100644
index c81c04d7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/tools/keybinding_editor.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/tools/plugins_dialog.png b/TuxGuitar-testing/platform-all/share/help/images/tools/plugins_dialog.png
deleted file mode 100644
index 9fac8d0b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/tools/plugins_dialog.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/images/tools/settings_skin.png b/TuxGuitar-testing/platform-all/share/help/images/tools/settings_skin.png
deleted file mode 100644
index dfd20377..00000000
Binary files a/TuxGuitar-testing/platform-all/share/help/images/tools/settings_skin.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/help/index.html b/TuxGuitar-testing/platform-all/share/help/index.html
deleted file mode 100644
index c40fb4de..00000000
--- a/TuxGuitar-testing/platform-all/share/help/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Refresh" content="0; URL=about.html" />
-	</head>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/license.html b/TuxGuitar-testing/platform-all/share/help/license.html
deleted file mode 100644
index d4a6a7f9..00000000
--- a/TuxGuitar-testing/platform-all/share/help/license.html
+++ /dev/null
@@ -1,645 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>GNU Lesser General Public License</h1>
-						
-						<h2>Version 2.1, February 1999</h2>
-						
-						  <p>Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-						59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-						Everyone is permitted to copy and distribute verbatim copies
-						of this license document, but changing it is not allowed.</p>
-						
-						
-						  <p>[This is the first released version of the Lesser GPL.  It also counts
-						 as the successor of the GNU Library Public License, version 2, hence
-						 the version number 2.1.]</p>
-						
-						<h2>Preamble</h2>
-						
-						<p> The licenses for most software are designed to take away your
-						freedom to share and change it. By contrast, the GNU General Public
-						Licenses are intended to guarantee your freedom to share and change
-						free software--to make sure the software is free for all its users. </p>
-						
-						
-						 
-						<p>This license, the Lesser General Public License,
-						applies to some specially designated software packages--typically
-						libraries--of the Free Software Foundation and other authors who decide
-						to use it. You can use it too, but we suggest you first think carefully
-						about whether this license or the ordinary General Public License is
-						the better strategy to use in any particular case, based on the
-						explanations below.
-						</p>
-						
-						<p> When we speak of free software, we are referring to freedom of
-						use, not price. Our General Public Licenses are designed to make sure
-						that you have the freedom to distribute copies of free software (and
-						charge for this service if you wish); that you receive source code or
-						can get it if you want it; that you can change the software and use
-						pieces of it in new free programs; and that you are informed that you
-						can do these things.</p>
-						
-						
-						 
-						<p>To protect your rights, we need to make restrictions
-						that forbid distributors to deny you these rights or to ask you to
-						surrender these rights. These restrictions translate to certain
-						responsibilities for you if you distribute copies of the library or if
-						you modify it.
-						</p>
-						
-						<p> For example, if you distribute copies of the library, whether
-						gratis or for a fee, you must give the recipients all the rights that
-						we gave you. You must make sure that they, too, receive or can get the
-						source code. If you link other code with the library, you must provide
-						complete object files to the recipients, so that they can relink them
-						with the library after making changes to the library and recompiling
-						it. And you must show them these terms so they know their rights. </p>
-						
-						
-						 
-						<p>We protect your rights with a two-step method: (1) we
-						copyright the library, and (2) we offer you this license, which gives
-						you legal permission to copy, distribute and/or modify the library. </p>
-						
-						
-						 
-						<p>To protect each distributor, we want to make it very
-						clear that there is no warranty for the free library. Also, if the
-						library is modified by someone else and passed on, the recipients
-						should know that what they have is not the original version, so that
-						the original author's reputation will not be affected by problems that
-						might be introduced by others. </p>
-						
-						<p>
-						 Finally, software patents pose a constant threat to the existence
-						of any free program. We wish to make sure that a company cannot
-						effectively restrict the users of a free program by obtaining a
-						restrictive license from a patent holder. Therefore, we insist that any
-						patent license obtained for a version of the library must be consistent
-						with the full freedom of use specified in this license. </p>
-						
-						
-						 
-						<p>Most GNU software, including some libraries, is
-						covered by the ordinary GNU General Public License. This license, the
-						GNU Lesser General Public License, applies to certain designated
-						libraries, and is quite different from the ordinary General Public
-						License. We use this license for certain libraries in order to permit
-						linking those libraries into non-free programs. </p>
-						
-						
-						 
-						<p>When a program is linked with a library, whether
-						statically or using a shared library, the combination of the two is
-						legally speaking a combined work, a derivative of the original library.
-						The ordinary General Public License therefore permits such linking only
-						if the entire combination fits its criteria of freedom. The Lesser
-						General Public License permits more lax criteria for linking other code
-						with the library. </p>
-						
-						
-						 
-						<p>We call this license the "Lesser" General Public
-						License because it does Less to protect the user's freedom than the
-						ordinary General Public License. It also provides other free software
-						developers Less of an advantage over competing non-free programs. These
-						disadvantages are the reason we use the ordinary General Public License
-						for many libraries. However, the Lesser license provides advantages in
-						certain special circumstances. </p>
-						
-						
-						 
-						<p>For example, on rare occasions, there may be a special
-						need to encourage the widest possible use of a certain library, so that
-						it becomes a de-facto standard. To achieve this, non-free programs must
-						be allowed to use the library. A more frequent case is that a free
-						library does the same job as widely used non-free libraries. In this
-						case, there is little to gain by limiting the free library to free
-						software only, so we use the Lesser General Public License.
-						</p>
-						
-						 
-						<p>In other cases, permission to use a particular library
-						in non-free programs enables a greater number of people to use a large
-						body of free software. For example, permission to use the GNU C Library
-						in non-free programs enables many more people to use the whole GNU
-						operating system, as well as its variant, the GNU/Linux operating
-						system. </p>
-						
-						
-						<p> Although the Lesser General Public License is Less protective
-						of the users' freedom, it does ensure that the user of a program that
-						is linked with the Library has the freedom and the wherewithal to run
-						that program using a modified version of the Library.
-						</p>
-						
-						 
-						<p>The precise terms and conditions for copying,
-						distribution and modification follow. Pay close attention to the
-						difference between a "work based on the library" and a "work that uses
-						the library". The former contains code derived from the library,
-						whereas the latter must be combined with the library in order to run. </p>
-						
-						
-						<h2>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h2>
-						
-						<p><strong>0.</strong> This License Agreement applies to any
-						software library or other program which contains a notice placed by the
-						copyright holder or other authorized party saying it may be distributed
-						under the terms of this Lesser General Public License (also called
-						"this License"). Each licensee is addressed as "you".</p>
-						
-						
-						<p> A "library" means a collection of software functions and/or
-						data prepared so as to be conveniently linked with application programs
-						(which use some of those functions and data) to form executables. </p>
-						
-						
-						<p> The "Library", below, refers to any such software library or
-						work which has been distributed under these terms. A "work based on the
-						Library" means either the Library or any derivative work under
-						copyright law: that is to say, a work containing the Library or a
-						portion of it, either verbatim or with modifications and/or translated
-						straightforwardly into another language. (Hereinafter, translation is
-						included without limitation in the term "modification".) </p>
-						
-						
-						<p> "Source code" for a work means the preferred form of the work
-						for making modifications to it. For a library, complete source code
-						means all the source code for all modules it contains, plus any
-						associated interface definition files, plus the scripts used to control
-						compilation and installation of the library.</p>
-						
-						
-						 
-						<p>Activities other than copying, distribution and
-						modification are not covered by this License; they are outside its
-						scope. The act of running a program using the Library is not
-						restricted, and output from such a program is covered only if its
-						contents constitute a work based on the Library (independent of the use
-						of the Library in a tool for writing it). Whether that is true depends
-						on what the Library does and what the program that uses the Library
-						does. </p>
-						
-						
-						<p><strong>1.</strong> You may copy and distribute verbatim copies
-						of the Library's complete source code as you receive it, in any medium,
-						provided that you conspicuously and appropriately publish on each copy
-						an appropriate copyright notice and disclaimer of warranty; keep intact
-						all the notices that refer to this License and to the absence of any
-						warranty; and distribute a copy of this License along with the Library.
-						</p>
-						
-						<p> You may charge a fee for the physical act of transferring a
-						copy, and you may at your option offer warranty protection in exchange
-						for a fee. </p>
-						
-						
-						<p><strong>2.</strong> You may modify your copy or copies of the
-						Library or any portion of it, thus forming a work based on the Library,
-						and copy and distribute such modifications or work under the terms of
-						Section 1 above, provided that you also meet all of these conditions:
-						</p>
-						
-						
-						
-						  <p>a) The modified work must itself be a software library. </p>
-						
-						  <p>b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.</p>
-						
-						  <p>c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. </p>
-						
-						  <p>d) If a facility in the modified Library refers to a function or
-						a table of data to be supplied by an application program that uses the
-						facility, other than as an argument passed when the facility is
-						invoked, then you must make a good faith effort to ensure that, in the
-						event an application does not supply such function or table, the
-						facility still operates, and performs whatever part of its purpose
-						remains meaningful. </p>
-						
-						
-						
-						  <p> (For example, a function in a library to compute square roots
-						has a purpose that is entirely well-defined independent of the
-						application. Therefore, Subsection 2d requires that any
-						application-supplied function or table used by this function must be
-						optional: if the application does not supply it, the square root
-						function must still compute square roots.) </p>
-						
-						  <p> These requirements apply to the modified work as a whole. If
-						identifiable sections of that work are not derived from the Library,
-						and can be reasonably considered independent and separate works in
-						themselves, then this License, and its terms, do not apply to those
-						sections when you distribute them as separate works. But when you
-						distribute the same sections as part of a whole which is a work based
-						on the Library, the distribution of the whole must be on the terms of
-						this License, whose permissions for other licensees extend to the
-						entire whole, and thus to each and every part regardless of who wrote
-						it.
-						  </p>
-						
-						   
-						  <p>Thus, it is not the intent of this section to claim
-						rights or contest your rights to work written entirely by you; rather,
-						the intent is to exercise the right to control the distribution of
-						derivative or collective works based on the Library.
-						  </p>
-						
-						  <p> In addition, mere aggregation of another work not based on the
-						Library with the Library (or with a work based on the Library) on a
-						volume of a storage or distribution medium does not bring the other
-						work under the scope of this License.
-						  </p>
-						
-						
-						<p><strong>3.</strong> You may opt to apply the terms of the
-						ordinary GNU General Public License instead of this License to a given
-						copy of the Library. To do this, you must alter all the notices that
-						refer to this License, so that they refer to the ordinary GNU General
-						Public License, version 2, instead of to this License. (If a newer
-						version than version 2 of the ordinary GNU General Public License has
-						appeared, then you can specify that version instead if you wish.) Do
-						not make any other change in these notices. </p>
-						
-						
-						 
-						<p>Once this change is made in a given copy, it is
-						irreversible for that copy, so the ordinary GNU General Public License
-						applies to all subsequent copies and derivative works made from that
-						copy.
-						</p>
-						
-						<p> This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-						</p>
-						
-						<p><strong>4.</strong> You may copy and distribute the Library (or
-						a portion or derivative of it, under Section 2) in object code or
-						executable form under the terms of Sections 1 and 2 above provided that
-						you accompany it with the complete corresponding machine-readable
-						source code, which must be distributed under the terms of Sections 1
-						and 2 above on a medium customarily used for software interchange.
-						</p>
-						
-						
-						 
-						<p>If distribution of object code is made by offering
-						access to copy from a designated place, then offering equivalent access
-						to copy the source code from the same place satisfies the requirement
-						to distribute the source code, even though third parties are not
-						compelled to copy the source along with the object code.</p>
-						
-						
-						<p><strong>5.</strong> A program that contains no derivative of any
-						portion of the Library, but is designed to work with the Library by
-						being compiled or linked with it, is called a "work that uses the
-						Library". Such a work, in isolation, is not a derivative work of the
-						Library, and therefore falls outside the scope of this License. </p>
-						
-						
-						<p> However, linking a "work that uses the Library" with the
-						Library creates an executable that is a derivative of the Library
-						(because it contains portions of the Library), rather than a "work that
-						uses the library". The executable is therefore covered by this License.
-						Section 6 states terms for distribution of such executables. </p>
-						
-						
-						<p> When a "work that uses the Library" uses material from a header
-						file that is part of the Library, the object code for the work may be a
-						derivative work of the Library even though the source code is not.
-						Whether this is true is especially significant if the work can be
-						linked without the Library, or if the work is itself a library. The
-						threshold for this to be true is not precisely defined by law. </p>
-						
-						
-						<p> If such an object file uses only numerical parameters, data
-						structure layouts and accessors, and small macros and small inline
-						functions (ten lines or less in length), then the use of the object
-						file is unrestricted, regardless of whether it is legally a derivative
-						work. (Executables containing this object code plus portions of the
-						Library will still fall under Section 6.) </p>
-						
-						
-						<p>Otherwise, if the work is a derivative of the Library, you may
-						distribute the object code for the work under the terms of Section 6.
-						Any executables containing that work also fall under Section 6, whether
-						or not they are linked directly with the Library itself. </p>
-						
-						
-						<p><strong>6.</strong> As an exception to the Sections above, you
-						may also combine or link a "work that uses the Library" with the
-						Library to produce a work containing portions of the Library, and
-						distribute that work under terms of your choice, provided that the
-						terms permit modification of the work for the customer's own use and
-						reverse engineering for debugging such modifications. </p>
-						
-						<p>
-						 You must give prominent notice with each copy of the work that the
-						Library is used in it and that the Library and its use are covered by
-						this License. You must supply a copy of this License. If the work
-						during execution displays copyright notices, you must include the
-						copyright notice for the Library among them, as well as a reference
-						directing the user to the copy of this License. Also, you must do one
-						of these things: </p>
-						
-						
-						
-						  <p>a) Accompany the work with the complete
-						corresponding machine-readable source code for the Library including
-						whatever changes were used in the work (which must be distributed under
-						Sections 1 and 2 above); and, if the work is an executable linked with
-						the Library, with the complete machine-readable "work that uses the
-						Library", as object code and/or source code, so that the user can
-						modify the Library and then relink to produce a modified executable
-						containing the modified Library. (It is understood that the user who
-						changes the contents of definitions files in the Library will not
-						necessarily be able to recompile the application to use the modified
-						definitions.) </p>
-						
-						
-						  <p>b) Use a suitable shared library mechanism for linking with the
-						Library. A suitable mechanism is one that (1) uses at run time a copy
-						of the library already present on the user's computer system, rather
-						than copying library functions into the executable, and (2) will
-						operate properly with a modified version of the library, if the user
-						installs one, as long as the modified version is interface-compatible
-						with the version that the work was made with. </p>
-						
-						  <p>
-						  c) Accompany the work with a written offer, valid for at least
-						three years, to give the same user the materials specified in
-						Subsection 6a, above, for a charge no more than the cost of performing
-						this distribution. </p>
-						
-						
-						  <p>d) If distribution of the work is made by offering access to
-						copy from a designated place, offer equivalent access to copy the above
-						specified materials from the same place. </p>
-						
-						
-						  <p>e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.</p>
-						
-						
-						
-						
-						 
-						<p>For an executable, the required form of the "work that
-						uses the Library" must include any data and utility programs needed for
-						reproducing the executable from it. However, as a special exception,
-						the materials to be distributed need not include anything that is
-						normally distributed (in either source or binary form) with the major
-						components (compiler, kernel, and so on) of the operating system on
-						which the executable runs, unless that component itself accompanies the
-						executable. </p>
-						
-						
-						<p> It may happen that this requirement contradicts the license
-						restrictions of other proprietary libraries that do not normally
-						accompany the operating system. Such a contradiction means you cannot
-						use both them and the Library together in an executable that you
-						distribute. </p>
-						
-						
-						<p><strong>7.</strong> You may place library facilities that are a
-						work based on the Library side-by-side in a single library together
-						with other library facilities not covered by this License, and
-						distribute such a combined library, provided that the separate
-						distribution of the work based on the Library and of the other library
-						facilities is otherwise permitted, and provided that you do these two
-						things: </p>
-						
-						
-						
-						  <p>a) Accompany the combined library with a copy of the same work
-						based on the Library, uncombined with any other library facilities.
-						This must be distributed under the terms of the Sections above. </p>
-						
-						
-						  <p>b) Give prominent notice with the combined library of the fact
-						that part of it is a work based on the Library, and explaining where to
-						find the accompanying uncombined form of the same work.</p>
-						
-						
-						
-						<p><strong>8.</strong> You may not copy, modify, sublicense, link
-						with, or distribute the Library except as expressly provided under this
-						License. Any attempt otherwise to copy, modify, sublicense, link with,
-						or distribute the Library is void, and will automatically terminate
-						your rights under this License. However, parties who have received
-						copies, or rights, from you under this License will not have their
-						licenses terminated so long as such parties remain in full compliance. </p>
-						
-						<p>
-						<strong>9.</strong> You are not required to accept this License,
-						since you have not signed it. However, nothing else grants you
-						permission to modify or distribute the Library or its derivative works.
-						These actions are prohibited by law if you do not accept this License.
-						Therefore, by modifying or distributing the Library (or any work based
-						on the Library), you indicate your acceptance of this License to do so,
-						and all its terms and conditions for copying, distributing or modifying
-						the Library or works based on it. </p>
-						
-						<p>
-						<strong>10.</strong> Each time you redistribute the Library (or any
-						work based on the Library), the recipient automatically receives a
-						license from the original licensor to copy, distribute, link with or
-						modify the Library subject to these terms and conditions. You may not
-						impose any further restrictions on the recipients' exercise of the
-						rights granted herein. You are not responsible for enforcing compliance
-						by third parties with this License. </p>
-						
-						
-						<p><strong>11.</strong> If, as a consequence of a court judgment or
-						allegation of patent infringement or for any other reason (not limited
-						to patent issues), conditions are imposed on you (whether by court
-						order, agreement or otherwise) that contradict the conditions of this
-						License, they do not excuse you from the conditions of this License. If
-						you cannot distribute so as to satisfy simultaneously your obligations
-						under this License and any other pertinent obligations, then as a
-						consequence you may not distribute the Library at all. For example, if
-						a patent license would not permit royalty-free redistribution of the
-						Library by all those who receive copies directly or indirectly through
-						you, then the only way you could satisfy both it and this License would
-						be to refrain entirely from distribution of the Library. </p>
-						
-						<p>
-						If any portion of this section is held invalid or unenforceable
-						under any particular circumstance, the balance of the section is
-						intended to apply, and the section as a whole is intended to apply in
-						other circumstances. </p>
-						
-						
-						<p>It is not the purpose of this section to induce you to infringe
-						any patents or other property right claims or to contest validity of
-						any such claims; this section has the sole purpose of protecting the
-						integrity of the free software distribution system which is implemented
-						by public license practices. Many people have made generous
-						contributions to the wide range of software distributed through that
-						system in reliance on consistent application of that system; it is up
-						to the author/donor to decide if he or she is willing to distribute
-						software through any other system and a licensee cannot impose that
-						choice. </p>
-						
-						
-						<p>This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. </p>
-						
-						<p>
-						<strong>12.</strong> If the distribution and/or use of the Library
-						is restricted in certain countries either by patents or by copyrighted
-						interfaces, the original copyright holder who places the Library under
-						this License may add an explicit geographical distribution limitation
-						excluding those countries, so that distribution is permitted only in or
-						among countries not thus excluded. In such case, this License
-						incorporates the limitation as if written in the body of this License. </p>
-						
-						<p>
-						<strong>13.</strong> The Free Software Foundation may publish
-						revised and/or new versions of the Lesser General Public License from
-						time to time. Such new versions will be similar in spirit to the
-						present version, but may differ in detail to address new problems or
-						concerns.</p>
-						
-						
-						<p>Each version is given a distinguishing version number. If the
-						Library specifies a version number of this License which applies to it
-						and "any later version", you have the option of following the terms and
-						conditions either of that version or of any later version published by
-						the Free Software Foundation. If the Library does not specify a license
-						version number, you may choose any version ever published by the Free
-						Software Foundation. </p>
-						
-						<p>
-						<strong>14.</strong> If you wish to incorporate parts of the
-						Library into other free programs whose distribution conditions are
-						incompatible with these, write to the author to ask for permission. For
-						software which is copyrighted by the Free Software Foundation, write to
-						the Free Software Foundation; we sometimes make exceptions for this.
-						Our decision will be guided by the two goals of preserving the free
-						status of all derivatives of our free software and of promoting the
-						sharing and reuse of software generally. </p>
-						
-						<p>
-						NO WARRANTY </p>
-						
-						<p>
-						<strong>15. </strong>BECAUSE THE LIBRARY IS LICENSED FREE OF
-						CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED
-						BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-						COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS"
-						WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-						BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-						FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
-						PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
-						DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-						CORRECTION. </p>
-						
-						<p>
-						<strong>16.</strong> IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW
-						OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY
-						WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE
-						LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL
-						OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-						LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-						RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-						FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-						SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-						DAMAGES. </p>
-						
-						
-						<h2>END OF TERMS AND CONDITIONS</h2>
-						
-						<p>
-						TuxGuitar is a multitrack tablature editor and player.<br/>
-						Copyright (C) 2005, By Juli&aacute;n Gabriel Casades&uacute;s
-						</p>
-						<p>
-						This library is free software; you can redistribute it and/or
-						modify it under the terms of the GNU Lesser General Public
-						License as published by the Free Software Foundation; either
-						version 2.1 of the License, or (at your option) any later version.
-						</p>
-						<p>
-						This library is distributed in the hope that it will be useful,
-						but WITHOUT ANY WARRANTY; without even the implied warranty of
-						MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-						Lesser General Public License for more details.
-						</p>
-						<p>
-						You should have received a copy of the GNU Lesser General Public
-						License along with this library; if not, write to the Free Software
-						Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-						</p>
-						
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/start_first_steps.html b/TuxGuitar-testing/platform-all/share/help/start_first_steps.html
deleted file mode 100644
index 21e1f9b0..00000000
--- a/TuxGuitar-testing/platform-all/share/help/start_first_steps.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>The First Steps</h1>
-						
-						<h2>Creating a new file:</h2>
-						
-						<p>
-						 The first thing you need to do is make sure you have a brand new file to work on. 
-						 When you launch TuxGuitar, you should already have a blank tablature document ready for editing. However, 
-						 if you need to start over with another blank document, all you have to do is click the &ldquo;New&rdquo; button (highlighted in red below).
-						</p>
-						
-						<p>
-						 <img src="images/start/fs_new_file.png" />
-						</p>
-						
-						<p>
-						 Wow. That was easy. Now that we have blank document, we just need to set up our first track. Then the real fun can begin.
-						</p>
-						<h2>Preparing your first track for playback:</h2>
-						
-						<p>
-						 At the bottom of the screen, you should see a track list window that will look like the one below. 
-						</p>
-						
-						<p>
-						 <img src="images/start/fs_song_table.png" />
-						</p>
-						
-						<p>
-						 The track list is a very useful yet compact information center which provides quick access to many of the most important aspects of your song. 
-						 There is a lot to be said about the track list, but we will not dig too deep into it right now, lest we should confuse newcomers. So for now, 
-						 let it suffice to say that the track window will help us stay organized while we edit our tablature.
-						</p>
-						
-						<p>
-						As you have probably noticed, there is already one track ready for you when you start a new tab document. You can just think of tracks as instruments. If you have a song with two guitars and one bassline that need transcribing, you will need three tracks. Fairly simple concept. It gets better though: as long as you have a soundbank installed for your Java Virtual Machine, each track will play back a sound when you play the file in TuxGuitar. Now, let&rsquo;s get into setting this up, because as you can see, our first track wants to play back piano sounds, and we&rsquo;re certainly not using TuxGuitar for piano.
-						</p>
-						
-						<p>
-						So: double-click anywhere on &ldquo;Track 1&rdquo; or &ldquo;Piano&rdquo; to open the track properties dialog, as seen below.
-						</p>
-						
-						<h2>Using The Track Properties Dialog:</h2>
-						
-						<p>
-						 <img src="images/start/fs_track_properties.png" />
-						</p>
-						
-						<p>
-						The Properties dialog is where we will go to setup how we want each track to playback. There are three main sections in the Properties box, 
-						and they are laid out as follows (red boxes added for clarity):
-						</p>
-						
-						<h3>#1: Name of the track:</h3>
-						
-						<p>
-						Whatever you type in the box here is what will show up in the track list we looked at earlier. As you can see, 
-						we have named our track &ldquo;Rhythm Guitar,&rdquo; but you can name it anything you like. 
-						You can also set the color the track will display in the track list.
-						</p>
-						
-						
-						<h3>#2: Instrument (i.e.-the sound the track will play back):</h3>
-						
-						
-						<p>
-						This is the sound that your track will play back from your jvm soundbank. Most soundbanks have a plethora of sounds which go far beyond just guitars, 
-						so be as creative as you want. Don&rsquo;t expect the sound quality to be too superb, though. In most cases, 
-						these sounds will be less than &ldquo;realistic&rdquo;. This is really only for referencing purposes. 
-						(It is possible to have this trigger other, possibly better sounds via the tuxguitar-alsa plugin, 
-						but that is a lesson for another day, and perhaps another author.) 
-						</p>
-						
-						<p>
-						You can also check &ldquo;Percussion Track&rdquo; to have it play drum sounds if you wish to include them in the tabs.
-						</p>
-						
-						<p>
-						<em>
-						*A side note on the instrument settings section: If you are not able to change this setting, 
-						you probably have a soundbank problem. This issue has been covered in the TuxGuitar forums as well as in the main documentation, 
-						so check there for help.
-						</em>
-						</p>
-						
-						<h3>#3: Tuning:</h3>
-						
-						
-						<p>
-						This one is pretty self-explanatory. You can set the number of strings for your instrument (i.e. 4 if you&rsquo;re a bass player, 
-						3 if you&rsquo;re in The Presidents of The United States of America) and the tuning of the instrument, in case you use alternate tunings. 
-						It is important to make sure you have your tuning correct, or else the actual score staff of your tabs will be inaccurate, and nobody wants that.
-						</p>
-						
-						<p>
-						Once you have everything set to your liking, click OK. Now, if you look at your track list again, 
-						you will see that your changes have taken affect. And with that, you are ready to start editing tabs with sound.
-						</p>
-						<br/>
-						<br/>
-
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/start_playing.html b/TuxGuitar-testing/platform-all/share/help/start_playing.html
deleted file mode 100644
index a2b94894..00000000
--- a/TuxGuitar-testing/platform-all/share/help/start_playing.html
+++ /dev/null
@@ -1,167 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Playing a song</h1>
-						
-						<h2><a name="opening_an_existing_song" id="opening_an_existing_song">Opening an existing song:</a></h2>
-						
-						<p>
-						 TuxGuitar currently supports several file formats. Besides its internal <em><strong>.tg</strong></em> format (which is recommended), 
-						 it can open and play all Guitar Pro formats (<strong><em>.gtp</em></strong>, <strong><em>.gp3</em></strong>, <strong><em>.gp4</em></strong>, <strong><em>.gp5</em></strong>) 
-						 and also a PowerTab format (<strong><em>.ptb</em></strong>).
-						</p>
-						
-						<p>
-						You can open a file through File/Open dialog in TuxGuitar, but you can also assign a file type association in your operating system.
-						</p>
-						
-						<p>
-						 Another way to open a file is directly from an online resource, by using the <strong>File&rarr;Open_URL</strong> dialog. If you enter the correct URL of an online file TuxGuitar is able to open, you can view and play the file in the same manner as it is open from one of your folders. Of course, you cannot save the file back on the same URL, you can save it only as a local file.
-						</p>
-						
-						
-						<h2><a name="playback" id="playback">Playback:</a></h2>
-						
-						<p>
-						<img src="images/start/tb_transport.png"/>
-						</p>
-						
-						<p>
-						Using playback controls you can play, stop and pause the playback, but also you can navigate through the song (next/previous measure, beginning/end of a song). During the playback currently played note will be coloured in red, so it is easier to see how the current note is played.
-						</p>
-						
-						<p>
-						You can also navigate through the song using the &ldquo;transporter&rdquo; in the bottom-right of the application window, which is the graphical represantation of a song&rsquo;s tracks. It isn&rsquo;t automatically scrolled during the playback, but using the scrollbar on the bottom of the screen you can view the whole song. You can access the wanted instrument and measure by clicking on the proper rectangle in the &ldquo;transporter&rdquo; widget.
-						</p>
-						
-						<p>
-						The song can be navigated also with a &ldquo;Show transport&rdquo; option in <em>Layout</em> menu by which you can navigate through internal representation of a song, quickly getting on any position.
-						</p>
-						
-						<p>
-						The current instrument can be changed by clicking on the instrument name in the bottom-left side of the application window. Display will be changed accordingly to view the wanted instrument&rsquo;s notes.
-						</p>
-						
-						
-						<h2><a name="views" id="views">Views:</a></h2>
-						
-						<p>
-						 During the playback you can change the current view.
-						</p>
-						
-						<p>
-						<img src="images/start/tb_layout.png"/>
-						</p>
-						
-						<p>
-						There are two types of the view: <strong>page layout</strong> or <strong>linear layout</strong>.
-						</p>
-						
-						<p>
-						<strong>Linear layout</strong> displays a track in a single line. It means that on the current sheet  is read in the right direction, and the time is represented by the <strong>width</strong> of current display. <strong>Page layout</strong> displays a track as a page of a sheet - when the notes exceed width of the sheet display, they are displayed in the next line. So sheet is read in the direction from top to bottom, and time is represented by the <strong>heigth</strong> of the current display (in the case of single track view).
-						</p>
-						
-						<p>
-						By enabling <strong>Multitrack</strong> view, in the same line of a layout will be displayed all the instruments. So if you use Linear layout and enable Multitrack view all the instruments will be one beneath each other, and played in the right direction. <em>Using Multitrack view with Page layout can sometimes result in a pretty messy layout.</em>
-						</p>
-						
-						<p>
-						By enabling <strong>Show score</strong> options the scores will be displayed above the tabs.
-						</p>
-						
-						<p>
-						By enabling <strong>Compact</strong> view you can make your tablature view more compact, if you consider it too wide.
-						</p>
-						
-						
-						<h2><a name="play_mode" id="play_mode">Play Mode:</a></h2>
-						
-						<p><img src="images/start/p_mode.png"/></p>
-						
-						<h3><a name="play_mode_simple" id="play_mode_simple">Simple Mode:</a></h3>
-						
-						<p>
-						Simple mode allows the modified tempo during the playback. You can play and examine the song with half of the speed, 
-						1% of the original speed or even with the up-tempo. It is achieved by changing the playback percentage to an arbitrary 
-						value (50% is half of the speed; 200% doubles the tempo).
-						</p>
-						
-						<h3><a name="play_mode_trainer" id="play_mode_trainer">Training Mode:</a></h3>
-						
-						<p>
-						Training mode gives you the opportunity to practice with a gradual tempo incrementation. You can choose to start slowly, 
-						in only half of a tempo, but in every cycle of the tune to increase the tempo by 5%, getting to the full speed after 10 playbacks.  
-						You choose a <em>beginning tempo</em>, <em>ending tempo</em> and an <em>increment</em> (in percentage) that increases the tempo 
-						after each cycle.
-						</p>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/start_toolbars.html b/TuxGuitar-testing/platform-all/share/help/start_toolbars.html
deleted file mode 100644
index 734ab14a..00000000
--- a/TuxGuitar-testing/platform-all/share/help/start_toolbars.html
+++ /dev/null
@@ -1,404 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Understanding the toolbars</h1>
-						
-						<p>
-						By default, you will notice quite a few toolbars lining the top of the screen, giving you one-click access to some of the most used options in TuxGuitar. While they can be a bit intimidating as a whole, they are actually quite simple when you break them down, and can save you a lot of time with some of the more common tasks associated with tablature editing. So let&rsquo;s take a quick look at each of the toolbars. Pre-assigned keyboard shortcuts will be noted in parenthesis, but keep in mind: pre-assigned shortcuts can be re-assigned according to your own preferences, and most unanassigned options can be assigned via Settings &gt; Configure Key Bindings.
-						</p>
-						
-						<p>
-						*A side note on the toolbars&ndash;not only can you select which toolbars are visible by going to Settings &gt; Configure TuxGuitar &gt; Tool Bars, you can also change the order of them to better fit your own needs by clicking and dragging on the &ldquo;handle&rdquo; on the left side of each individual toolbar. 
-						</p>
-						
-						<p>
-						One last thing before we begin: prior knowledge of music theory is assumed on this page. There are a couple of links in the &ldquo;Note Duration&rdquo; section which can help you if you don&rsquo;t know much theory yet, but to cover the actual &ldquo;musical meaning&rdquo; of all of these options would require an entire manual unto itself. This page will only explain the TuxGuitar-related functionality of the toolbars in an effort to avoid any long-winded music theory discussions.
-						</p>
-						
-						
-						<h2><a name="file_management" id="file_management">File Management</a></h2>
-						
-						<p>
-						<img src="images/start/tb_file_menu.png"/>
-						</p>
-						
-						<p>
-						You have seen and used this menu a million times, so we will not spend too much time on it. Basically, the file menu toolbar gives you the following options:
-						</p>
-						<ul>
-							<li class="level2"><div class="li"> Create New File (Ctrl + N)</div>
-						</li>
-							<li class="level2"><div class="li"> Open File (Ctrl + O)</div>
-						</li>
-							<li class="level2"><div class="li"> Save File (Ctrl + S)</div>
-						</li>
-							<li class="level2"><div class="li"> Save File As... (F12)</div>
-						</li>
-							<li class="level2"><div class="li"> Print (Ctrl + P)</div>
-						</li>
-							<li class="level2"><div class="li"> Print Preview</div>
-						</li>
-						</ul>
-						
-						<p>
-						Nothing too complex here, so let&rsquo;s move right along.
-						</p>
-						
-						<p>
-						(These options and more can be accessed via the &ldquo;File&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						<h2><a name="undo_redo" id="undo_redo">Undo/Redo</a></h2>
-						
-						<p><img src="images/start/tb_edit_menu.png"/>
-						</p>
-						
-						<p>
-						Another very common set of options that pretty much explain themselves. The icon on the left will undo your last action (Ctrl + Z), and the icon on the right will redo what you have undone (Ctrl + Y).
-						</p>
-						
-						<p>
-						(These options and more can be accessed via the &ldquo;Edit&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						<h2><a name="edit_mode_applies_only_to_score_editing" id="edit_mode_applies_only_to_score_editing">Edit Mode (Applies only to Score Editing)</a></h2>
-						
-						<p><img src="images/start/tb_edit_mode.png"/>
-						</p>
-						
-						<p>
-						Now we&rsquo;re getting a little more interesting. This menu lays down some options for those who prefer to edit via the score staff instead of using tablature. Keep in mind that these settings only affect the score staff (the upper set of lines with standard musical notation on them). If you only edit via the tablature staff, you can pretty ignore these settings, because they will not make any difference in your work flow.
-						</p>
-						
-						<p>
-						(If your score staff is not visible, scroll down on this page and see the &ldquo;Layout&rdquo; menu.)
-						</p>
-						
-						
-						<h3><a name="selection_mode" id="selection_mode">Selection Mode</a></h3>
-						
-						<p>
-						Clicking on the first icon with the wrench on it will put you in Selection Mode. With this mode selected, you can click your mouse anywhere in the score staff, and it will simply move your playback cursor to that location, without making any changes to the score itself. Good for quickly moving around in your score without worrying about accidently altering notes.
-						</p>
-						
-						
-						<h3><a name="score_edition_mode" id="score_edition_mode">Score Edition Mode</a></h3>
-						
-						<p>
-						Clicking on the middle icon with the pencil on it will put you into Score Edition Mode. With this mode selected, you can enter notes into the score staff simply by clicking where you want the note to go. You can insert notes into lines or spaces, and they will take on the duration you currently have selected in the note duration toolbar (detailed below). One note: this option alone will only insert natural-pitched notes (i.e. no flats or sharps). If you want to insert sharps/flats or change pre-existing notes to sharps/flats, you will need to enter Sharp/Flat Mode.
-						</p>
-						
-						<h3><a name="sharp_flat_mode" id="sharp_flat_mode">Sharp/Flat Mode</a></h3>
-						
-						<p>
-						Clicking on the icon with the sharp/flat symbol on it will take you into Sharp/Flat Mode. As stated above, Sharp/Flat Mode is simply a sub-option of Score Edition Mode. You have to use Sharp/Flat Mode if you want to enter sharp or flat notes or change pre-existing notes to sharp or flat.
-						</p>
-						
-						<p>
-						(These options and more can be accessed via the &ldquo;Edit&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						<h2><a name="song_properties" id="song_properties">Song Properties</a></h2>
-						
-						<p>
-						<img src="images/start/tb_properties.png"/>
-						</p>
-						
-						<p>
-						While the Properties toolbar only really has one icon, it is of particular importance if you plan on printing or exporting your tabs at any point. Clicking on this icon will bring up your song properties tab, wherein you can set the following options: 
-						</p>
-						<ul>
-						<li class="level2"><div class="li"> Name (of song)</div>
-						</li>
-						<li class="level2"><div class="li"> Artist (Performer)</div>
-						</li>
-						<li class="level2"><div class="li"> Author (Copyright owner)</div>
-						</li>
-						<li class="level2"><div class="li"> Album</div>
-						</li>
-						</ul>
-						
-						<p>
-						 The reason these settings are of such importance is that whatever you type in the Name and Author boxes will show up on the first page of your tabs when you print or export them, and if you leave them blank, you will simply get a big, fat &ldquo;Untitled&rdquo; by &ldquo;Anonymous&rdquo; instead. So make sure you set them if you plan viewing these tabs outside of TuxGuitar! The difference can be seen below.
-						</p>
-						
-						<p>
-						<img src="images/start/tb_props_diff.png"/>
-						</p>
-						
-						<p>
-						(These options and more can be accessed via the &ldquo;Composition&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						<h2><a name="add_remove_track" id="add_remove_track">Add/Remove Track</a></h2>
-						
-						<p>
-						<img src="images/start/tb_add_track.png"/>
-						</p>
-						
-						<p>
-						There comes a point in almost any song when one guitar is not enough. When you are ready to start entering tabs for another instrument, simply click the icon with the &ldquo;+&rdquo; sign on it to add a new track.
-						</p>
-						
-						<p>
-						If you decide you don&rsquo;t need a track, click on the icon with the &ldquo;-&rdquo; sign to remove it. The remove track button will remove the track that is currently selected (currently selected track will be highlighted gray in the track list at the bottom of the screen).
-						</p>
-						
-						<p>
-						(These options and more (including a handy &ldquo;Clone Track&rdquo; option) can be accessed via the &ldquo;Track&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						
-						<h2><a name="note_duration" id="note_duration">Note Duration</a></h2>
-						
-						<p>
-						<img src="images/start/tb_duration.png"/>
-						</p>
-						
-						<p>
-						This is another fairly straight-forward toolbar. The first seven icons simply change the note(s) at the current cursor position to whatever you select, ranging from whole-note to sixty-forth-note. This comes in handy if you need to make a change that is more than one note increment (i.e. quarter-note to sixteenth-note). You can alternately use the +/- keys on a standard numeric keypad to move one increment at a time.
-						</p>
-						
-						<p>
-						*A side note on the +/- keys: as of version .9, most laptop keyboards do not support the use of the =/+ key to decrease note duration. The developers are aware of this bug, and are working it out. The &ldquo;-&rdquo; key on laptop keyboards should work, just not the =/+ key.
-						</p>
-						
-						<p>
-						The last three icons will change a note&rsquo;s value to dotted, double-dotted, and a wide variety of &ldquo;division type&rdquo; values.
-						</p>
-						
-						<p>
-						If you do not understand the difference between the various note durations, you may want to research it a bit before you begin editing tabs, as you may find yourself quickly getting lost. Any basic music theory guide should cover these topics. A good starting place (as always) is the wikipedia&rsquo;s pages on music theory and music notation: 
-						</p>
-						<ul>
-						<li class="level1"><div class="li"> http://en.wikipedia.org/wiki/Music_theory</div>
-						</li>
-						<li class="level1"><div class="li"> http://en.wikipedia.org/wiki/Modern_musical_symbols</div>
-						</li>
-						</ul>
-						
-						<p>
-						 (These options and more can be accessed via the &ldquo;Note&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						
-						<h2><a name="note" id="note">Note</a></h2>
-						
-						<p>
-						<img src="images/start/tb_note.png"/>
-						</p>
-						
-						<p>
-						This menu provides you with two more options concerning note editing.
-						</p>
-						
-						<p>
-						Clicking on the first icon will &ldquo;tie&rdquo; the currently selected note to the one before it. This feature basically takes the value of two notes and combines them into one. The most common use for this feature is when you have a note that begins in one measure and ends in the next. Tying notes is really just a way of keeping the score clean and organized. If you need more information, you may want to research musical notation via the links above.
-						</p>
-						
-						<p>
-						Clicking on the second icon with the &ldquo;A7&rdquo; will bring up the chord editor. The chord editor is a handy time-saving tool used to search, build, and insert chord formations into your tablature. While the chord editor does deserve further exploration, it is a topic best left for another page and another day.
-						</p>
-						
-						<p>
-						(These options and more can be accessed via the &ldquo;Note&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						
-						<h2><a name="composition" id="composition">Composition</a></h2>
-						
-						<p>
-						<img src="images/start/tb_composition.png"/>
-						</p>
-						
-						<p>
-						The Composition toolbar gives you a few options for setting the structure and meter of your song. Again, for a deeper explanation of what each of these means and how to fully utilize them, refer to the music theory links under the &ldquo;Note Duration&rdquo; section.
-						</p>
-						
-						<p>
-						Clicking on the first icon with the question mark will allow you to set the tempo of your song. New songs in TuxGuitar default to 100 beats/min, but you can set your own tempo to anything between 30-320 beats/min. TuxGuitar also supports tempo changes throughout the song, and creating them is as easy as placing your playback cursor in the measure at which you want the tempo to change, and clicking on the icon. Any tempo set in the first measure of the song will be the default tempo either throughout the song, or until you set another tempo in any of the following measures.
-						</p>
-						
-						<p>
-						Clicking on the next icon with the 4/4 graphic will bring up the time signature dialog, which is pretty straight-forward. You have a seperate pulldown menu for each half of the time signature, as well as a &ldquo;To the end&rdquo; check box. TuxGuitar supports multiple time signature changes throughout the song, and much like tempo changes, are as easy to create as clicking the icon and setting a new time signature in the measure where you wish it to change. Checking the &ldquo;To the end&rdquo; box will cause your newly-selected time signature to continue either to the end of the song, or until you manually change the time signature in any of the following measures. Unchecking the &ldquo;To the end&rdquo; box will cause the new time signature to span only the measure you add it to, after which it will automatically reset to the time signature used by the previous measure.
-						</p>
-						
-						<p>
-						(These options and more can be accessed via the &ldquo;Composition&rdquo; pulldown menu at the top of the screen.)
-						</p>
-						
-						<p>
-						Next three icons are used for repeating control. Everyone familiar with music notation should be familiar with these - you can open and close repeating section. When closing, you will get a dialog to specify how many repeatings will occur. The last icon is used to mark alternative endings in the repeat. A special dialog will also occur, allowing you to choose in which cycle this ending will be played.
-						</p>
-						
-						<h2><a name="transport" id="transport">Transport</a></h2>
-						
-						<p>
-						<img src="images/start/tb_transport.png"/>
-						</p>
-						
-						<p>
-						These are song playback controls. Buttons are for play/pause, stop playing, previous measure, next measure, beginning of the song and end of the track.
-						</p>
-						
-						
-						<h2><a name="markers" id="markers">Markers</a></h2>
-						
-						<p>
-						<img src="images/start/tb_markers.png"/>
-						</p>
-						
-						<p>
-						It is very useful to add a marker in a song, to mark some part of the song (verse, chorus, solo, etc.)
-						</p>
-						
-						<p>
-						Marker controls on the toolbar allow you to create a marker, list the markers and navigate them (previous, next, first, last).
-						</p>
-						
-						
-						<h2><a name="layout" id="layout">Layout</a></h2>
-						
-						<p>
-						<img src="images/start/tb_layout.png"/>
-						</p>
-						
-						<p>
-						There are several layout types in TuxGuitar. They all change the view of tablature and scores in the main editor window.
-						</p>
-						
-						<p>
-						The first button on the left is <strong>Page layout</strong>. It&rsquo;s alternative is the second button: <strong>Linear layout</strong>. Page layout displays the tablature and scores like on the paper sheets, with the line breaks. On the other side, linear view views the instrument in a single line, expanding to the right.
-						</p>
-						
-						<p>
-						The third button enables <strong>Multitrack</strong> view. When enabled, all the tracks will be displayed in the main window. Depending on your previous choice (Page or Linear layout) you will see different view. In personal experience, good combinations are Linear+Multitrack, and Page layout without multitrack (for single instrument view).
-						</p>
-						
-						<p>
-						The fourth button is <strong>Show scores</strong> button. It simply views the scores (notation) above your tab line.
-						</p>
-						
-						<p>
-						The fifth button is <strong>Compact</strong> view. You would like to enable it when you consider your view too wide.
-						</p>
-						
-						
-						<h2><a name="view" id="view">View</a></h2>
-						
-						<p>
-						<img src="images/start/tb_view.png"/>
-						</p>
-						
-						<p>
-						These three buttons show you various windows.
-						</p>
-						
-						<p>
-						The first button shows you the <strong>fretboard</strong> on the bottom of the main window. Fretboard is usefull to view the exact spots where you should put your fingers in each moment. You can even click on the fretboard to edit your tab. Fretboard view is available for both right- and left-handed guitars.
-						</p>
-						
-						<p>
-						Second button shows <strong>Mixer</strong>. Mixer dialog is very important - there you can change the volume of instruments in your tab, mute/solo single instrument, change panning and assign MIDI channel. Read <a class="PageLink" href="editing_song.html#mixer_dialog"> more about Mixer dialog</a>.
-						</p>
-						
-						<p>
-						The last button shows you player controller window, where you can control the song playback.
-						</p>
-						
-						
-						<h2><a name="effects" id="effects">Effects</a></h2>
-						
-						<p>
-						<img src="images/start/tb_effects.png" class="media" title="" alt="" />
-						</p>
-						
-						<p>
-						These effects are applied with editing cursor positioned on existing note in the tab. Selected effect is then applied to note.
-						</p>
-						
-						<p>
-						Read more about <a class="PageLink" href="edit_effects.html"> note effects</a>.
-						</p>
-						
-						
-						<h2><a name="dynamics" id="dynamics">Dynamics</a></h2>
-						
-						<p>
-						<img src="images/start/tb_dynamics.png"/>
-						</p>
-						
-						<p>
-						By selecting different icon than the current, you change the dynamics of the note you are editing. They gradually scale from <em>Piano Pianissimo</em> which is the most silent, to the <em>Forte Fortissimo</em> which is loudest. 
-						</p>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/tools_converter.html b/TuxGuitar-testing/platform-all/share/help/tools_converter.html
deleted file mode 100644
index 79530920..00000000
--- a/TuxGuitar-testing/platform-all/share/help/tools_converter.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>TuxGuitar-converter</h1>
-						
-						
-						<div class="level1">
-						<pre class="code">
-						</pre>
-						
-						<h2><a name="what_is_tuxguitar-converter" id="what_is_tuxguitar-converter">What is tuxguitar-converter</a></h2>
-						<p>
-						 <strong>tuxguitar-converter</strong> is batch file format converter. It allows you to convert number of files from various file formats (*.gpX, *.ptb, *.tef, *.tg) into destination file format, keeping the file names but changing the format (and extension of a file).
-						</p>
-						
-						<p>
-						Converter simply tries to load every file and save/export it into destination file.
-						</p>
-						
-						<p>
-						So supported input formats are files TuxGuitar can load and import, and destination format is every format TuxGuitar can save into or export. You can check for <a class="PageLink" href="file_formats.html">supported file formats</a>. For some exporter plugins that have various exporting options, default options are used.
-						</p>
-						
-						
-						<h2><a name="how_to_install_tuxguitar-converter" id="how_to_install_tuxguitar-converter">How to install tuxguitar-converter</a></h2>
-						
-						<p>
-						 <strong>tuxguitar-converter</strong> plugin is included on all bytecode TuxGuitar distributions as default. If you downloaded a compiled TuxGuitar package, you shouldn&rsquo;t bother to install it manually.<br/>
-						 Of course you may want rebuild and install the plugin.
-						</p>
-						
-						<p>
-						To install the plugin, you must copy <strong>tuxguitar-converter.jar</strong> into <strong>$TUXGUITAR_HOME\share\plugins</strong>
-						</p>
-						
-						
-						<h2><a name="using_batch_file_format_converter" id="using_batch_file_format_converter">Using batch file format converter</a></h2>
-						
-						<p>
-						 <img src="images/tools/converter.png"/>
-						</p>
-						
-						<p>
-						You access the converter dialog through Tools&rarr;&ldquo;File format batch converter&rdquo;.
-						</p>
-						
-						<p>
-						On the dialog you must specify <strong>input folder</strong>. Input folder <em class="u">and its subfolders</em> contain files that will be converted.
-						</p>
-						
-						<p>
-						<strong>Output folder</strong> is folder in which new files will be stored. If destination folder you specified doesn&rsquo;t exist, it will be created.
-						</p>
-						
-						<p>
-						<strong>Output file format</strong> is used to specify file format of new created files. It will display all supported formats (which might depend on your installed plugins).
-						</p>
-						
-						<p>
-						After you confirm the converting new window will appear showing you the progress. You can cancel the process anytime. 
-						</p>
-						
-						</div>
-						<br/><br/>
-
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/tools_keybinding.html b/TuxGuitar-testing/platform-all/share/help/tools_keybinding.html
deleted file mode 100644
index 321fc218..00000000
--- a/TuxGuitar-testing/platform-all/share/help/tools_keybinding.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Key bindings editor</h1>
-						
-						<div class="level1">
-						
-						<p>
-						 Using key bindings editor you can change a shortcut for almost every action in TuxGuitar. It allows you to view and change default keybindings, as well to add new ones.
-						</p>
-						
-						<p>
-						Key bindings editor dialog is accessed through Tools&rarr;Shortcuts menu.
-						</p>
-						
-						<p>
-						<img src="images/tools/keybinding_editor.png"/>
-						</p>
-						
-						<p>
-						 The editor is a table you can modify. In the left column is the name and type of the action, and in the right one is the shortcut key combination. If you double-click on the combination cell, you will get the chance to insert or change the shortcut, or delete it with <strong>Clear</strong> button.
-						</p>
-						
-						<p>
-						By clicking the<strong> Default</strong> button all of your modifications are reverted to the default keybindings for TuxGuitar. You can see the <a class="PageLink" href="tools_shortcuts.html"> list of default keybindings</a>.
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/tools_plugins.html b/TuxGuitar-testing/platform-all/share/help/tools_plugins.html
deleted file mode 100644
index faaf460b..00000000
--- a/TuxGuitar-testing/platform-all/share/help/tools_plugins.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-											
-						<h1><a name="plugins_dialog" id="plugins_dialog">Plugins dialog</a></h1>
-						<div class="level1">
-						
-						<p>
-						 TuxGuitar supports plugins. Some of the plugins are delivered with the distribution, but there are plugins you can download and enable manually.
-						</p>
-						
-						<p>
-						There are several types of the plugins: 
-						</p>
-						<ol>
-						<li class="level1"><div class="li"> File Format plugins (PowerTab, Lilypond, MIDI, MusicXML) are included as default</div>
-						</li>
-						<li class="level1"><div class="li"> Sound plugins (ALSA, OSS, CoreAudio) are recommended depending of your OS.</div>
-						</li>
-						<li class="level1"><div class="li"> other plugins (like FTP browser, and any other)</div>
-						</li>
-						</ol>
-						
-						<p>
-						The plugins dialog is accessed through the Tools&rarr;Plugins menu. In the dialog is the list of all plugins, with the checkbox enabled if the plugin is working at the moment. Some of the plugins can be configured with the <strong>Configure</strong> button. All of the plugins have their author info.
-						</p>
-						
-						<p>
-						<img src="images/tools/plugins_dialog.png"/>
-						</p>
-						
-						<p>
-						Plugins are single *.jar files. You can install any TuxGuitar plugin by simply copying it to the <em>$TUXGUITAR_DIR</em>\share\plugins\ folder and enabling it in the dialog.
-						</p>
-						
-						<p>
-						Maybe the easiest way to contribute to TuxGuitar functionality is to write a plugin, because it doesn&rsquo;t need synchronisation with the other TuxGuitar developers.
-						</p>
-						
-						<p>
-						You can check the list of available plugins on TuxGuitar download page (<i>other</i>). 
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/tools_shortcuts.html b/TuxGuitar-testing/platform-all/share/help/tools_shortcuts.html
deleted file mode 100644
index 3e58b97e..00000000
--- a/TuxGuitar-testing/platform-all/share/help/tools_shortcuts.html
+++ /dev/null
@@ -1,515 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Default key-bindings (shortcuts)</h1>
-						
-						<ul class="toc">
-						<li class="level1"><div class="li"><span class="li"><a href="#default_key-bindings_shortcuts" class="toc">Default key-bindings (shortcuts)</a></span></div>
-						<ul>
-						<li class="level2"><div class="li"><span class="li"><a href="#edit" class="toc">Edit Actions</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#track" class="toc">Track Actions</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#measure" class="toc">Measure Actions</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#beat" class="toc">Beat Actions</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#note_effects" class="toc">Note Effects</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#marker" class="toc">Marker Actions</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#playback_controls" class="toc">Playback Controls</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#dialogs" class="toc">Dialogs</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#application" class="toc">Application</a></span></div></li></ul>
-						</li></ul>
-						
-						
-						
-						<div class="level1">
-						
-						<p>
-						 This is the list of the default key bindings (keyboard shortcuts) in TuxGuitar 1.0.
-						</p>
-						
-						<p>
-						Of course, these key-bindings list can be modified in <a class="PageLink" href="tools_keybinding.html"> Tools-&gt;Shortcuts dialog</a>.
-						</p>
-						
-						</div>
-						
-						<h2><a name="edit" id="edit">Edit Actions</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Undo action </td><td class="right"> Ctrl+<strong>Z</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Redo action </td><td class="right"> Ctrl+<strong>Y</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Song properties</td><td class="right"> <strong>F5</strong></td>
-							</tr>
-						</table>
-						</div>
-						
-						<h2><a name="track" id="tab_editor">Track Actions</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"><u><strong>key</strong></u> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > View next track </td><td class="right"> Ctrl+<strong>Down</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > View previous track </td><td class="right"> Ctrl+<strong>Up</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > View last track </td><td class="right"> Ctrl+Shift+<strong>Down</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > View first track</td><td class="right"> Ctrl+Shift+<strong>Up</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Add track </td><td class="right"> Ctrl+Shift+<strong>Ins</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Delete track</td><td class="right"> Ctrl+Shift+<strong>Del</strong></td>
-							</tr>
-						</table>
-						
-						</div>
-						
-						
-						<h2><a name="measure" id="tab_editor">Measure Actions</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Go to next measure</td><td class="right"> Ctrl+<strong>Right</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Go to previous measure</td><td class="right"> Ctrl+<strong>Left</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Copy measure</td><td class="right"> Ctrl+<strong>C</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Paste measure </td><td class="right"> Ctrl+<strong>V</strong></td>
-							</tr>
-						</table>
-						
-						</div>
-						
-						
-						
-						<h2><a name="beat" id="tab_editor">Beat Actions</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Clean beat</td><td class="right"> Ctrl+<strong>Del</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Insert beat </td><td class="right"> number 0-29 </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Delete beat/note </td><td class="right"> <strong>Del</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Tied note </td><td class="right"> <strong>L</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Dotted note </td><td class="right"> <strong></strong>* </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Triplet note</td><td class="right"> <strong>/</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Insert text </td><td class="right"> <strong>T</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Move note on string above </td><td class="right"> Shift+<strong>Up</strong></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Move note on string below </td><td class="right"> Shift+<strong>Down</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Increase note pitch </td><td class="right"> Shift+<strong>Right</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Decrease note pitch </td><td class="right"> Shift+<strong>Left</strong></td>
-							</tr>
-						</table>
-						
-						</div>
-						
-						
-						
-						
-						<h2><a name="note_effects" id="note_effects">Note Effects</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Can be applied only when your cursor is positioned on the existing note in a tablature 
-						</p>
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Bend note </td><td class="right"> <strong>B</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Ghost note</td><td class="right"> <strong>O</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Hammer on/Pull off</td><td class="right"> <strong>H</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Slide up/down </td><td class="right"> <strong>S</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Vibrato </td><td class="right"> <strong>V</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Dead note </td><td class="right"> <strong>X</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Palm mute </td><td class="right"> <strong>P</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Fade in </td><td class="right"> <strong>F</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Grace note</td><td class="right"> <strong>G</strong> </td>
-							</tr>
-						</table>
-						
-						</div>
-						
-						
-						
-						<h2><a name="marker" id="marker">Marker Actions</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Add marker</td><td class="right"> Shift+<strong>Ins</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Go to previous marker </td><td class="right"> Alt+<strong>Left</strong></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Go to next marker </td><td class="right"> Alt+<strong>Right</strong> </td>
-							</tr>
-						</table>
-						
-						</div>
-						
-						
-						<!--
-						<h2><a name="tab_editor" id="tab_editor">Tab editor</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr>
-								<td><u><strong>Action</strong></u> </td><td> <u><strong>key</strong></u> </td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Insert note </td><td> number 0-29 </td>
-							</tr>
-							<tr>
-								<td> Delete note </td><td> <strong>Del</strong> </td>
-							</tr>
-							<tr>
-								<td> Clean beat</td><td> Ctrl+<strong>Del</strong></td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Tied note </td><td> <strong>L</strong> </td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Go to next measure</td><td> Ctrl+<strong>Right</strong></td>
-							</tr>
-							<tr>
-								<td> Go to previous measure</td><td> Ctrl+<strong>Left</strong> </td>
-							</tr>
-							<tr>
-								<td> View next track </td><td> Ctrl+<strong>Down</strong> </td>
-							</tr>
-							<tr>
-								<td> View previous track </td><td> Ctrl+<strong>Up</strong> </td>
-							</tr>
-							<tr>
-								<td> View last track </td><td> Ctrl+Shift+<strong>Down</strong> </td>
-							</tr>
-							<tr>
-								<td> View first track</td><td> Ctrl+Shift+<strong>Up</strong> </td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Copy measure</td><td> Ctrl+<strong>C</strong></td>
-							</tr>
-							<tr>
-								<td> Paste measure </td><td> Ctrl+<strong>V</strong></td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Tab properties</td><td> <strong>F5</strong></td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Add track </td><td> Ctrl+Shift+<strong>Ins</strong></td>
-							</tr>
-							<tr>
-								<td> Delete track</td><td> Ctrl+Shift+<strong>Del</strong></td>
-							</tr>
-							<tr>
-								<td> Add marker</td><td> Shift+<strong>Ins</strong> </td>
-							</tr>
-							<tr>
-								<td> Go to previous marker </td><td> Alt+<strong>Left</strong></td>
-							</tr>
-							<tr>
-								<td> Go to next marker </td><td> Alt+<strong>Right</strong> </td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Insert text </td><td> <strong>T</strong> </td>
-							</tr>
-						</table>
-						
-						</div>
-						-->
-						<h2><a name="playback_controls" id="playback_controls">Playback Controls</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Play / Pause</td><td class="right"> <strong>Space</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Go to start </td><td class="right"> Ctrl+Shift+<strong>Right</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Go to end </td><td class="right"> Ctrl+Shift+<strong>Left</strong></td>
-							</tr>
-						</table>
-						
-						</div>
-						<!--
-						<h2><a name="note_effects" id="note_effects">Note effects</a></h2>
-						<div class="level2">
-						
-						<p>
-						 Can be applied only when your cursor is positioned on the existing note in a tablature 
-						</p>
-						<table class="inline">
-							<tr>
-								<td><u><strong>Action</strong></u> </td><td> <u><strong>key</strong></u> </td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Bend note </td><td> <strong>B</strong> </td>
-							</tr>
-							<tr>
-								<td> Ghost note</td><td> <strong>O</strong> </td>
-							</tr>
-							<tr>
-								<td> Hammer on/Pull off</td><td> <strong>H</strong> </td>
-							</tr>
-							<tr>
-								<td> Slide up/down </td><td> <strong>S</strong> </td>
-							</tr>
-							<tr>
-								<td> Vibrato </td><td> <strong>V</strong> </td>
-							</tr>
-							<tr>
-								<td> Dead note </td><td> <strong>X</strong> </td>
-							</tr>
-							<tr>
-								<td> Palm mute </td><td> <strong>P</strong> </td>
-							</tr>
-							<tr>
-								<td> Fade in </td><td> <strong>F</strong> </td>
-							</tr>
-							<tr>
-								<td> Grace note</td><td> <strong>G</strong> </td>
-							</tr>
-							<tr>
-								<td> </td><td> </td>
-							</tr>
-							<tr>
-								<td> Move note on string above </td><td> Shift+<strong>Up</strong></td>
-							</tr>
-							<tr>
-								<td> Move note on string below </td><td> Shift+<strong>Down</strong></td>
-							</tr>
-							<tr>
-								<td> Increase note pitch </td><td> Shift+<strong>Right</strong> </td>
-							</tr>
-							<tr>
-								<td> Decrease note pitch </td><td> Shift+<strong>Left</strong></td>
-							</tr>
-							<tr>
-								<td> Dotted note </td><td> <strong></strong>* </td>
-							</tr>
-							<tr>
-								<td> Triplet note</td><td> <strong>/</strong> </td>
-							</tr>
-						</table>
-						
-						</div>
-						-->
-						<h2><a name="dialogs" id="dialogs">Dialogs</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Custom chord dialog </td><td class="right"> <strong>A</strong></td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Settings</td><td class="right"> <strong>F7</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Mixer </td><td class="right"> Ctrl+<strong>M</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Transport </td><td class="right"> Ctrl+<strong>T</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Collection Browser</td><td class="right"> Ctrl+<strong>B</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Play Mode </td><td class="right"> <strong>F9</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Help</td><td class="right"> <strong>F1</strong> </td>
-							</tr>
-						</table>
-						
-						</div>
-						
-						<h2><a name="application" id="application">Application</a></h2>
-						<div class="level2">
-						<table class="inline">
-							<tr class="header">
-								<td class="left" ><u><strong>Action</strong></u> </td><td class="right"> <u><strong>key</strong></u></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > New tablature </td><td class="right"> Ctrl+<strong>N</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Open file </td><td class="right"> Ctrl+<strong>O</strong> </td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Save file </td><td class="right"> Crtl+<strong>S</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Save as </td><td class="right"> <strong>F12</strong></td>
-							</tr>
-							<tr class="odd">
-								<td class="left" > Print tablature </td><td class="right"> Ctrl+<strong>P</strong> </td>
-							</tr>
-							<tr class="even">
-								<td class="left" > Exit TuxGuitar</td><td class="right"> Alt+<strong>F4</strong> </td>
-							</tr>
-						</table>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/tools_skin.html b/TuxGuitar-testing/platform-all/share/help/tools_skin.html
deleted file mode 100644
index 319e06fd..00000000
--- a/TuxGuitar-testing/platform-all/share/help/tools_skin.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>Changing the skin</h1>
-						
-						
-						<div class="level1">
-						<pre class="code">
-						</pre>
-						
-						<p>
-						TuxGuitar supports custom skins. The skins modify toolbar icons and dialog buttons.
-						</p>
-						
-						<p>
-						The default skin for version 1.0 is Lavender, and currently there are 2 more skins: Ersplus and Blue_serious. You can change the current skin in Tools&rarr;Settings dialog, choosing the Skins tab. Preview of each skin should be available.
-						</p>
-						
-						<p>
-						<img src="images/tools/settings_skin.png"/>
-						</p>
-						
-						<p>
-						To add a new skin, create a new folder in <em>$TUXGUITAR_DIR</em>\share\skins\ and copy the <em class="u">files</em> into that folder. After that skin should be available in the dialog.
-						</p>
-						
-						<p>
-						Skins are contributed by TuxGuitar users, so if you are a talented designer, feel free to make your own skin or modify the existing one! 
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/tools_sound.html b/TuxGuitar-testing/platform-all/share/help/tools_sound.html
deleted file mode 100644
index 92186697..00000000
--- a/TuxGuitar-testing/platform-all/share/help/tools_sound.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1><a name="sound_in_tuxguitar" id="sound_in_tuxguitar">Sound in TuxGuitar</a></h1>
-						
-						<ul class="toc">
-						<li class="level1"><div class="li"><span class="li"><a href="#sound_in_tuxguitar" class="toc">Sound in TuxGuitar</a></span></div>
-						<ul class="toc">
-						<li class="level2"><div class="li"><span class="li"><a href="#java_sound" class="toc">Java Sound</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#platform-dependant_plugins" class="toc">Platform-dependant plugins</a></span></div></li>
-						<li class="level2"><div class="li"><span class="li"><a href="#sequencer" class="toc">Sequencer</a></span></div></li></ul>
-						</li></ul>
-						
-						
-						
-						<div class="level1">
-						
-						<p>
-						 First to mention, TuxGuitar is written in Java programming language. There is dedicated layer in Java for MIDI sound, which uses &ldquo;soundbanks&rdquo;. In TuxGuitar prior to version 1.0, using the soundbanks was the only way to play the sound, and it was totally independent of your system MIDI settings.
-						</p>
-						
-						<p>
-						Since the version 1.0 there are some plugins that enable connection between TuxGuitar and the system MIDI devices. You need the plugin depending on your operating system and audio properties: 
-						</p>
-						<ul>
-						<li class="level2"><div class="li"> Linux (ALSA) - TuxGuitar-alsa</div>
-						</li>
-						<li class="level2"><div class="li"> Linux (OSS) - TuxGuitar-OSS</div>
-						</li>
-						<li class="level2"><div class="li"> MacOS - TuxGuitar-CoreAudio</div>
-						</li>
-						<li class="level2"><div class="li"> Microsoft Windows - <em>integrated in the application</em></div>
-						</li>
-						</ul>
-						
-						<p>
-						 These plugins are included in your distribution package, so there is no need to download them manually. Just be shure that plugins stay enabled in the <a class="PageLink" href="tools_plugins.html"> plugins dialog</a>.
-						</p>
-						
-						</div>
-						
-						<h3><a name="java_sound" id="java_sound">Java Sound</a></h3>
-						<div class="level3">
-						
-						<p>
-						 Java Sound plugin, relying on the soundbanks, is still available in the form of the &ldquo;Java Sound Api plugin&rdquo;. You can adjust and change the soundbank with <strong>Configure</strong> button in the <a class="PageLink" href="tools_plugins.html"> plugins dialog</a>.
-						</p>
-						
-						<p>
-						If the plugin is enabled, in the Sound tab of the Tools&rarr;Settings dialog you can choose &ldquo;Java Sound Synthesizer&rdquo; in the <strong>Midi Port</strong> list. That enables sound output using Java soundbanks.
-						</p>
-						
-						</div>
-						
-						<h3><a name="platform-dependant_plugins" id="platform-dependant_plugins">Platform-dependant plugins</a></h3>
-						<div class="level3">
-						
-						<p>
-						If you have TuxGuitar-alsa, TuxGuitar-OSS, TuxGuitar-CoreAudio plugin enabled or if you are running TuxGuitar on the Windows platform TuxGuitar detects your system MIDI ports (devices).
-						</p>
-						
-						<p>
-						So it depends of your system settings, but anyway, if the proper plugin is enabled and working you should see system ports in the <strong>Midi Port</strong> list in the Sound tab of the Tools&rarr;Settings dialog. Choosing the right one enables your native MIDI sound in TuxGuitar.
-						</p>
-						
-						<p>
-						If you experience problems using your native MIDI output, consult the help of the plugin you are using.
-						</p>
-						
-						</div>
-						
-						<h3><a name="sequencer" id="sequencer">Sequencer</a></h3>
-						<div class="level3">
-						
-						<p>
-						 Beside MIDI Port sound options in the Tools&rarr;Settings&rarr;Sound tab is also <strong>MIDI Sequencer</strong> options. In general, you should use <strong>&ldquo;Real Time Sequencer&rdquo;</strong> because it&rsquo;s faster, but it needs Java Sound plugin to be enabled, which means it requires Sun Java to be installed. In case you use some other JVM, your only choice is <strong>&ldquo;TuxGuitar Sequencer&rdquo;</strong>. Don&rsquo;t worry, it is not as bad as it sounds. :)
-						</p>
-						
-						</div>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/help/whatsnew.html b/TuxGuitar-testing/platform-all/share/help/whatsnew.html
deleted file mode 100644
index dc2c2945..00000000
--- a/TuxGuitar-testing/platform-all/share/help/whatsnew.html
+++ /dev/null
@@ -1,259 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<link type="text/css" rel="stylesheet" href="css/styles.css" ></link>
-	</head>
-	<body>
-		<table>
-			<tr>
-				<td valign="top">
-					<div id="PageMenu" >
-						<ul>
-							<li >
-								<span>Introduction</span>
-								<ul>
-									<li ><a class="PageLink" href="about.html" >About</a></li>
-									<li ><a class="PageLink" href="license.html" >License</a></li>
-									<li ><a class="PageLink" href="whatsnew.html" >What's new</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Getting started</span>
-								<ul>
-									<li ><a class="PageLink" href="start_first_steps.html" >The First Steps</a></li>
-									<li ><a class="PageLink" href="start_toolbars.html" >Toolbars</a></li>
-									<li ><a class="PageLink" href="start_playing.html" >Playing a song</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Making and editing a song</span>
-								<ul>
-									<li><a class="PageLink" href="editing_track.html" >Editing a track</a></li>
-									<li><a class="PageLink" href="editing_song.html" >Editing a whole song</a></li>
-									<li><a class="PageLink" href="edit_effects.html" >Note effects</a></li>
-									<li><a class="PageLink" href="edit_chord.html" >Chord edit dialog</a></li>
-									<li><a class="PageLink" href="edit_matrix.html" >Matrix editor</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li >
-								<span>Tools and settings</span>
-								<ul>
-									<li><a class="PageLink" href="tools_shortcuts.html" >Default shortcuts</a></li>
-									<li><a class="PageLink" href="tools_keybinding.html" >Shortcut editor</a></li>
-									<li><a class="PageLink" href="tools_skin.html" >Changing the skin</a></li>
-									<li><a class="PageLink" href="tools_plugins.html" >Plugins dialog</a></li>
-									<li><a class="PageLink" href="tools_sound.html" >Sound in TuxGuitar</a></li>
-									<li><a class="PageLink" href="tools_converter.html" >File format batch converter</a></li>
-								</ul>
-							</li>
-						</ul>
-						<ul>
-							<li><a class="PageLink" href="file_formats.html" >Supported file formats</a></li>
-						</ul>
-					</div>
-				</td>
-				<td valign="top">
-					<div id="PageContent" >
-						<!-- START OF PAGE CONTENT -->
-						
-						<h1>What's new</h1>
-						
-						<h2>Version 1.1 (2009-xx-xx)</h2>
-						<ul>
-							<li class="level2"><div class="li">Fix some bugs</div></li>
-							<li class="level2"><div class="li">Support measure range to loop</div></li>
-							<li class="level2"><div class="li">Transpose notes feature</div></li>
-							<li class="level2"><div class="li">Optionally transpose afected notes when change tuning</div></li>
-							<li class="level2"><div class="li">Move beats left|right support</div></li>
-							<li class="level2"><div class="li">More song properties options.</div></li>
-							<li class="level2"><div class="li">Add multiple measure support</div></li>
-							<li class="level2"><div class="li">Clean multiple measure support</div></li>
-							<li class="level2"><div class="li">Number of pastes support</div></li>
-							<li class="level2"><div class="li">Better lilypond plugin</div></li>
-							<li class="level2"><div class="li">Better fluidsynth plugin</div></li>
-							<li class="level2"><div class="li">New jack plugin</div></li>
-							<li class="level2"><div class="li">New community integration plugin</div></li>
-							<li class="level2"><div class="li">New cocoa integration plugin</div></li>
-							<li class="level2"><div class="li">New audio unit plugin</div></li>
-						</ul>
-						
-						<h2>Version 1.1 (2009-04-02)</h2>
-						<ul>
-							<li class="level2"><div class="li">Fix mixer bug</div></li>
-							<li class="level2"><div class="li">Fix jre1.4 support bug</div></li>
-							<li class="level2"><div class="li">2 Voice support</div></li>
-							<li class="level2"><div class="li">Chorus/Reverb/Phaser/Tremolo MIDI Controls</div></li>
-							<li class="level2"><div class="li">Upstroke/Downstroke support</div></li>
-							<li class="level2"><div class="li">Stems Up/Down/Auto support</div></li>
-							<li class="level2"><div class="li">Display markers on the score</div></li>	
-							<li class="level2"><div class="li">Encoding option on GTP Plugin</div></li>
-							<li class="level2"><div class="li">FTP Browser plugin now can run on non sun's JVM</div></li>
-						</ul>
-						
-						<h2>Version 1.0 (2008-06-17)</h2>
-						<ul>
-							<li class="level2"><div class="li">Fixed native MIDI Port connection bug under windows</div></li>
-							<li class="level2"><div class="li">Fixed mute/solo mixer bug</div></li>
-							<li class="level2"><div class="li">Fixed copy/paste measure beetween tracks with different strings count</div></li>
-							<li class="level2"><div class="li">Fixed other minor bugs</div></li>
-							<li class="level2"><div class="li">Vietnamese translation</div></li>
-						</ul>
-						
-						<h2>Version 1.0-rc4 (2008-05-05)</h2>
-						<ul>
-							<li class="level2"><div class="li">Bugs Fixed</div></li>
-							<li class="level2"><div class="li">File format converter plugin</div></li>
-							<li class="level2"><div class="li">Dutch translation</div></li>
-							<li class="level2"><div class="li">Russian translation</div></li>
-							<li class="level2"><div class="li">Ukrainian translation</div></li>
-						</ul>
-						
-						<h2>Version 1.0-rc3 (2008-03-25)</h2>
-						<ul>
-							<li class="level2"><div class="li">Fix a several GTP exporter bug</div></li>
-							<li class="level2"><div class="li">Fix a printer bug</div></li>
-							<li class="level2"><div class="li">Fix other minor bugs</div></li>
-						</ul>
-						
-						<h2>Version 1.0-rc2 (2008-03-11)</h2>
-						<ul>
-							<li class="level2"><div class="li">Fix some translation bugs</div></li>
-							<li class="level2"><div class="li">Fix duplicated beat/string notes on MIDI importer</div></li>
-							<li class="level2"><div class="li">Fix a GTP importer bug</div></li>
-							<li class="level2"><div class="li">Fix a PTB importer bug</div></li>
-							<li class="level2"><div class="li">Better Guitar/Bass synchronization on PTB importer</div></li>
-							<li class="level2"><div class="li">Documentation contents added</div></li>
-						</ul>
-						
-						<h2>Version 1.0-rc1 (2008-02-28)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Play mode option: ( Normal | Loop | Speed-Trainer )</div></li>
-							<li class="level2"><div class="li">Alternative endings added</div></li>
-							<li class="level2"><div class="li">Insert text</div></li>
-							<li class="level2"><div class="li">Show chords on the tab</div></li>
-							<li class="level2"><div class="li">Better chord editor</div></li>
-							<li class="level2"><div class="li">Open file from URL</div></li>
-							<li class="level2"><div class="li">Matrix editor</div></li>
-							<li class="level2"><div class="li">A song collection browser</div></li>
-							<li class="level2"><div class="li">Skin support was added</div></li>
-							<li class="level2"><div class="li">Better plugin support</div></li>
-							<li class="level2"><div class="li">Tabledit importer plugin</div></li>
-							<li class="level2"><div class="li">Lilypond exporter plugin</div></li>
-							<li class="level2"><div class="li">MusicXml exporter plugin</div></li>
-						</ul>
-						
-						<h2>Version 0.9 (2007-01-29)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Piano editor</div></li>
-							<li class="level2"><div class="li">Lyric editor</div></li>
-							<li class="level2"><div class="li">Music Scales</div></li>
-							<li class="level2"><div class="li">Simple Score edition</div></li>
-							<li class="level2"><div class="li">Custom Chords</div></li>
-							<li class="level2"><div class="li">Customize ToolBars</div></li>
-							<li class="level2"><div class="li">Metronome</div></li>
-							<li class="level2"><div class="li">Memory Optimization when song is playing</div></li>
-							<li class="level2"><div class="li">Print layout changes: Tablature and Score enabled/disabled options, Measure range.</div></li>
-							<li class="level2"><div class="li">Dynamics</div></li>
-							<li class="level2"><div class="li">Increment-Decrement Semitones.</div></li>
-							<li class="level2"><div class="li">Shift Up/Down</div></li>
-							<li class="level2"><div class="li">New Effects: Tremolo Bar, Harmonics, Grace note, Trill, Tremolo Picking, Ghost note, Accentuated, Heavy Accentuated, Palm mute, Staccato, </div></li>
-							<li class="level2"><div class="li">Tapping, Slapping, Popping, Fade In.</div></li>
-						</ul>
-						
-						<h2>Version 0.8 (2006-08-24)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Power-Tab 1.7 file format importer added</div></li>
-							<li class="level2"><div class="li">MIDI importer added</div></li>
-							<li class="level2"><div class="li">ASCII Tab exporter added</div></li>
-							<li class="level2"><div class="li">Show note played at fretboard</div></li>
-							<li class="level2"><div class="li">Triplet Feels added</div></li>
-							<li class="level2"><div class="li">Markers added</div></li>
-							<li class="level2"><div class="li">Fonts and colors config support added</div></li>
-							<li class="level2"><div class="li">Soundbank config support added</div></li>
-							<li class="level2"><div class="li">History files added</div></li>
-							<li class="level2"><div class="li">Simple plugin support added</div></li>
-						</ul>
-						
-						<h2>Version 0.7 (2006-07-17)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Score Viewer added</div></li>
-							<li class="level2"><div class="li">Transport added</div></li>
-							<li class="level2"><div class="li">Clone Track option added</div></li>
-							<li class="level2"><div class="li">Move track up and down option added</div></li>
-						</ul>
-						
-						<h2>Version 0.6 (2006-05-27)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">GP5 loader added</div></li>
-							<li class="level2"><div class="li">MIDI exporter added</div></li>
-							<li class="level2"><div class="li">PDF exporter added</div></li>
-							<li class="level2"><div class="li">Print option added</div></li>
-							<li class="level2"><div class="li">Print preview added</div></li>
-							<li class="level2"><div class="li">Undo/Redo added</div></li>
-							<li class="level2"><div class="li">Dead note added</div></li>
-							<li class="level2"><div class="li">Page layout upgraded</div></li>
-							<li class="level2"><div class="li">Copy-Paste and Delete upgraded</div></li>
-						</ul>
-						
-						
-						<h2>Version 0.5 (2006-04-07)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Config editor added</div></li>
-							<li class="level2"><div class="li">Key Binding editor added</div></li>
-							<li class="level2"><div class="li">Mixer added</div></li>
-							<li class="level2"><div class="li">Midi sound added, when you insert a note</div></li>
-							<li class="level2"><div class="li">Now can you see beat to beat when the song is playing</div></li>
-							<li class="level2"><div class="li">Now you can select the channel and effect channel for the track</div></li>
-							<li class="level2"><div class="li">Now you can run tuxguitar with arguments (eg.: ./TuxGuitar file.gp3)</div></li>
-						</ul>
-						
-						
-						<h2>Version 0.4.1 (2006-01-26)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Fixed a bug in tunning when you select a percussion track</div></li>
-						</ul>
-						
-						
-						<h2>Version 0.4 (2006-01-25)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Fretboard editor added</div></li>
-							<li class="level2"><div class="li">Song properties viewer added</div></li>
-							<li class="level2"><div class="li">Select instrument bug fixed</div></li>
-							<li class="level2"><div class="li">Change tempo bug fixed</div></li>
-							<li class="level2"><div class="li">Change tunning bug fixed</div></li>
-						</ul>
-						
-						
-						<h2>Version 0.3 (2006-01-11)</h2>
-						
-						<ul>
-							<li class="level2"><div class="li">Now you can choose between linear and page layout view</div></li>
-							<li class="level2"><div class="li">Ability to show/hide multitrack view</div></li>
-							<li class="level2"><div class="li">Multilanguage support has been added</div></li>
-							<li class="level2"><div class="li">You can now export to gp3 and gp4 file formats</div></li>
-							<li class="level2"><div class="li">Double dotted note added</div></li>
-						</ul>
-						<br/><br/>
-						
-						<!-- END OF PAGE CONTENT -->
-					</div>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
diff --git a/TuxGuitar-testing/platform-all/share/lang/last_additions b/TuxGuitar-testing/platform-all/share/lang/last_additions
deleted file mode 100644
index 32bb416b..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/last_additions
+++ /dev/null
@@ -1,59 +0,0 @@
-# 1.3
-
-action.caret.go-up=Move cursor up
-action.caret.go-down=Move cursor down
-action.caret.go-left=Move cursor left
-action.caret.go-right=Move cursor right
-
-beat.insert-rest=Insert Rest Beat
-beat.delete-note-or-rest=Delete Note or Rest
-
-action.beat.general.insert-rest=Insert rest beat
-action.beat.general.delete-note-or-rest=Delete note or rest
-
-action.note.general.set-fret-number-0=Set fret number 0
-action.note.general.set-fret-number-1=Set fret number 1
-action.note.general.set-fret-number-2=Set fret number 2
-action.note.general.set-fret-number-3=Set fret number 3
-action.note.general.set-fret-number-4=Set fret number 4
-action.note.general.set-fret-number-5=Set fret number 5
-action.note.general.set-fret-number-6=Set fret number 6
-action.note.general.set-fret-number-7=Set fret number 7
-action.note.general.set-fret-number-8=Set fret number 8
-action.note.general.set-fret-number-9=Set fret number 9
-
-
-transport.count-down=Count Down
-action.transport.count-down=Count Down
-
-
-track.short-solo-mute=S-M
-track.short-solo-mute.s=(S)
-track.short-solo-mute.m=(M)
-track.short-solo-mute.none=-
-
-action.track.change-solo=Set track solo
-action.track.change-mute=Set track mute
-
-instruments.dialog-title=Instruments
-instrument.percussion-channel=Percussion Channel
-instrument.program=Program
-instrument.bank=Bank
-
-
-
-track.instrument.default-select-option=--- Select ---
-
-export.all-tracks=Export all tracks
-
-view.show-toolbars=Show Toolbars
-view.show-instruments=Show Instruments
-
-
-
-effects.let-ring=Let Ring
-
-action.view.show-toolbars=Show Toolbars
-action.view.show-instruments=Show Instruments
-action.note.effect.change-let-ring=Add/Remove let ring
-
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages.properties b/TuxGuitar-testing/platform-all/share/lang/messages.properties
deleted file mode 100644
index d5ff0a13..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages.properties
+++ /dev/null
@@ -1,866 +0,0 @@
-
-###############################################################
-###                  Default language codes                 ###
-###############################################################
-locale.aa=Afar
-locale.ab=Abkhazian
-locale.af=Afrikaans
-locale.am=Amharic
-locale.ar=Arabic
-locale.as=Assamese
-locale.ay=Aymara
-locale.az=Azerbaijani
-locale.ba=Bashkir
-locale.be=Byelorussian
-locale.bg=Bulgarian
-locale.bh=Bihari
-locale.bi=Bislama
-locale.bn=Bengali
-locale.bo=Tibetan
-locale.br=Breton
-locale.ca=Catalan
-locale.co=Corsican
-locale.cs=Czech
-locale.cy=Welsh
-locale.da=Danish
-locale.de=German
-locale.dz=Bhutani
-locale.el=Greek
-locale.en=English
-locale.en_US=English (United States)
-locale.eo=Esperanto
-locale.es=Spanish
-locale.et=Estonian
-locale.eu=Basque
-locale.fa=Persian
-locale.fi=Finnish
-locale.fj=Fiji
-locale.fo=Faeroese
-locale.fr=French
-locale.fy=Frisian
-locale.ga=Irish
-locale.gd=Gaelic
-locale.gl=Galician
-locale.gn=Guarani
-locale.gu=Gujarati
-locale.ha=Hausa
-locale.hi=Hindi
-locale.hr=Croatian
-locale.hu=Hungarian
-locale.hy=Armenian
-locale.ia=Interlingua
-locale.ie=Interlingue
-locale.ik=Inupiak
-locale.in=Indonesian
-locale.is=Icelandic
-locale.it=Italian
-locale.iw=Hebrew
-locale.ja=Japanese
-locale.ji=Yiddish
-locale.jw=Javanese
-locale.ka=Georgian
-locale.kk=Kazakh
-locale.kl=Greenlandic
-locale.km=Cambodian
-locale.kn=Kannada
-locale.ko=Korean
-locale.ks=Kashmiri
-locale.ku=Kurdish
-locale.ky=Kirghiz
-locale.la=Latin
-locale.ln=Lingala
-locale.lo=Laothian
-locale.lt=Lithuanian
-locale.lv=Latvian
-locale.mg=Malagasy
-locale.mi=Maori
-locale.mk=Macedonian
-locale.ml=Malayalam
-locale.mn=Mongolian
-locale.mo=Moldavian
-locale.mr=Marathi
-locale.ms=Malay
-locale.mt=Maltese
-locale.my=Burmese
-locale.na=Nauru
-locale.ne=Nepali
-locale.nl=Dutch
-locale.no=Norwegian
-locale.oc=Occitan
-locale.om=Oromo
-locale.or=Oriya
-locale.pa=Punjabi
-locale.pl=Polish
-locale.ps=Pashto
-locale.pt=Portuguese
-locale.qu=Quechua
-locale.rm=Rhaeto-Romance
-locale.rn=Kirundi
-locale.ro=Romanian
-locale.ru=Russian
-locale.rw=Kinyarwanda
-locale.sa=Sanskrit
-locale.sd=Sindhi
-locale.sg=Sangro
-locale.sh=Serbo-Croatian
-locale.si=Singhalese
-locale.sk=Slovak
-locale.sl=Slovenian
-locale.sm=Samoan
-locale.sn=Shona
-locale.so=Somali
-locale.sq=Albanian
-locale.sr=Serbian
-locale.ss=Siswati
-locale.st=Sesotho
-locale.su=Sudanese
-locale.sv=Swedish
-locale.sw=Swahili
-locale.ta=Tamil
-locale.te=Tegulu
-locale.tg=Tajik
-locale.th=Thai
-locale.ti=Tigrinya
-locale.tk=Turkmen
-locale.tl=Tagalog
-locale.tn=Setswana
-locale.to=Tonga
-locale.tr=Turkish
-locale.ts=Tsonga
-locale.tt=Tatar
-locale.tw=Twi
-locale.uk=Ukrainian
-locale.ur=Urdu
-locale.uz=Uzbek
-locale.vi=Vietnamese
-locale.vo=Volapuk
-locale.wo=Wolof
-locale.xh=Xhosa
-locale.yo=Yoruba
-locale.zh=Chinese
-locale.zh_TW=Chinese (Taiwan)
-locale.zh_GB=Chinese (GB)
-locale.zu=Zulu
-
-locale.default=(Default System Language)
-###############################################################
-
-ok=Ok
-cancel=Cancel
-yes=Yes
-no=No
-add=Add
-edit=Edit
-remove=Remove
-save=Save
-exit=Exit
-close=Close
-choose=Choose
-color=Color
-title=Title
-go=Go
-warning=Warning
-error=Error
-plugins=Plugins
-options=Options
-defaults=Defaults
-clean=Clean
-rename=Rename
-fret=Fret
-position=Position
-name=Name
-author=Author
-version=Version
-description=Description
-info=Info
-configure=Configure
-url=URL
-
-file=File
-file.new=New
-file.new-song.default-template=New Song
-file.open=Open
-file.save=Save
-file.save-as=Save As
-file.save-changes-question=The song has unsaved changes.\nDo you want to save the changes?
-file.exit=Exit
-file.export=Export
-file.export-midi=Export MIDI
-file.export-pdf=Export PDF
-file.print=Print
-file.print-preview=Print Preview
-file.import=Import
-file.import-midi=Import MIDI
-file.export-ascii=Export ASCII
-file.history=History
-file.open-url=Open URL
-file.open.error=Cannot Open: {0}
-file.save.error=Cannot Save: {0}
-file.import.error=Cannot Import: {0}
-file.export.error=Cannot Export: {0}
-file.overwrite-question=This file already exists. Do you want to overwrite it?
-
-edit.menu=Edit
-edit.undo=Undo
-edit.redo=Redo
-edit.copy=Copy
-edit.from=From
-edit.to=To
-edit.all-tracks=All Tracks
-edit.paste=Paste
-edit.paste.count=Paste Count
-edit.paste.replace-mode=Paste at the Current Measure
-edit.paste.insert-mode=Paste in new Measure
-edit.delete=Delete
-edit.cut=Cut
-edit.mouse-mode-selection=Selection Mode
-edit.mouse-mode-edition=Score Edition Mode
-edit.not-natural-key=Sharp/Flat mode
-edit.voice-1=Select Voice 1
-edit.voice-2=Select Voice 2
-
-view=View
-view.layout=Layout
-view.layout.page=Page Layout
-view.layout.linear=Linear layout
-view.layout.compact=Compact
-view.layout.multitrack=Multitrack
-view.layout.chord-style=Chord Style
-view.layout.chord-name=Chord Name
-view.layout.chord-diagram=Chord Diagram
-view.layout.score-enabled=Show Score
-view.layout.tablature-enabled=Show Tablature
-view.show-toolbars=Show Toolbars
-view.show-instruments=Show Instruments
-view.show-fretboard=Show Fretboard
-view.show-piano=Show Piano
-view.show-matrix=Show Matrix
-view.show-transport=Show Player
-
-fretboard.direction=Direction
-fretboard.right-mode=Right mode
-fretboard.left-mode=Left mode
-fretboard.background-color=Background Color
-fretboard.display-note-text=Display Note Text
-fretboard.display-scale-text=Display Scale Text
-fretboard.font=Font
-fretboard.fretpoint-color=Fret Color
-fretboard.note-color=Note Color
-fretboard.scale-note-color=Scale Note Color
-fretboard.settings=Fretboard Settings
-fretboard.string-color=String Color
-fretboard.settings.options=Options
-
-piano.editor=Piano Editor
-piano.natural-key-color=Natural Key Color
-piano.not-natural-key-color=Unnatural Key Color
-piano.note-color=Note Color
-piano.scale-note-color=Scale Note Color
-piano.settings=Piano Settings
-
-matrix.editor=Matrix Editor
-matrix.grids=Number of Grids
-matrix.border-color=Border Color
-matrix.font=Font
-matrix.foreground-color=Foreground Color
-matrix.line-color-1=Odd Row Color
-matrix.line-color-2=Even Row Color
-matrix.line-color-over=Mouse Over Row Color
-matrix.note-color=Note Color
-matrix.play-note-color=Play Note Color
-matrix.position-color=Position Color
-matrix.settings=Matrix Settings
-
-composition=Composition
-composition.timesignature=Time Signature
-composition.timesignature.Numerator=Numerator
-composition.timesignature.denominator=Denominator
-composition.timesignature.to-the-end=To the end
-composition.tempo=Tempo
-composition.tempo-percent=Percent
-composition.tempo.invalid=Invalid Tempo
-composition.tempo.start-to-end=Apply this tempo in the whole song
-composition.tempo.position-to-end=Apply this tempo to the end
-composition.tempo.position-to-next=Apply this tempo to the next tempo marker
-composition.properties=Properties
-composition.name=Name
-composition.artist=Artist
-composition.album=Album
-composition.author=Author
-composition.date=Date
-composition.copyright=Copyright
-composition.writer=Tab Creator
-composition.transcriber=Transcribed By
-composition.comments=Comments
-composition.tripletfeel=Triplet Feel
-composition.clef=Clef
-composition.clef.treble=Treble
-composition.clef.bass=Bass
-composition.clef.tenor=Tenor
-composition.clef.alto=Alto
-composition.clef.to-the-end=Apply this clef to the end
-composition.keysignature=Key Signature
-composition.keysignature.natural=Natural
-composition.keysignature.sharp-1=1 Sharp
-composition.keysignature.sharp-2=2 Sharps
-composition.keysignature.sharp-3=3 Sharps
-composition.keysignature.sharp-4=4 Sharps
-composition.keysignature.sharp-5=5 Sharps
-composition.keysignature.sharp-6=6 Sharps
-composition.keysignature.sharp-7=7 Sharps
-composition.keysignature.flat-1=1 Flat
-composition.keysignature.flat-2=2 Flats
-composition.keysignature.flat-3=3 Flats
-composition.keysignature.flat-4=4 Flats
-composition.keysignature.flat-5=5 Flats
-composition.keysignature.flat-6=6 Flats
-composition.keysignature.flat-7=7 Flats
-composition.keysignature.to-the-end=Apply this key signature to the end
-composition.tripletfeel=Triplet Feel
-composition.tripletfeel.none=No Triplet Feel
-composition.tripletfeel.eighth=Triplet 8th
-composition.tripletfeel.sixteenth=Triplet 16th
-composition.tripletfeel.to-the-end=Apply this triplet feel to the end
-
-help=Help
-help.help=Help
-help.doc=Documentation
-help.about=About
-help.about.license=License
-help.about.authors=Authors
-help.about.description=Description
-
-track=Track
-track.number=N°
-track.name=Name
-track.color=Color
-track.first=First Track
-track.last=Last Track
-track.previous=Previous Track
-track.next=Next Track
-track.add=Add Track
-track.remove=Remove Track
-track.clone=Clone Track
-track.move-up=Move Up
-track.move-down=Move Down
-track.instrument=Instrument
-track.instrument.default-select-option=--- Select ---
-track.properties=Properties
-track.properties.general=General
-track.name.default-percussion-name=Percussion
-track.lyrics=Lyrics
-track.solo=Solo
-track.mute=Mute
-
-track.short-solo-mute=S-M
-track.short-solo-mute.s=(S)
-track.short-solo-mute.m=(M)
-track.short-solo-mute.none=-
-
-lyric.editor=Lyric Editor
-
-measure=Measure
-measure.first=First Measure
-measure.last=Last Measure
-measure.previous=Previous Measure
-measure.next=Next Measure
-measure.add=Add Measure
-measure.add.count=Add Count
-measure.add-before-current-position=Add measure before the current position
-measure.add-after-current-position=Add measure after the current position
-measure.add-at-end=Add measure at the end
-measure.remove=Remove Measure
-measure.copy=Copy Measure
-measure.paste=Paste Measure
-measure.clean=Clean Measure
-
-duration=Duration
-duration.whole=Whole
-duration.half=Half
-duration.quarter=Quarter
-duration.eighth=Eighth
-duration.sixteenth=Sixteenth
-duration.thirtysecond=Thirty-Second
-duration.sixtyfourth=Sixty-Fourth
-duration.dotted=Dotted
-duration.doubledotted=Double Dotted
-duration.division-type=Triplet
-
-dynamic=Dynamic
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Effects
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Dead Note
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Accentuated Note
-effects.heavyaccentuatednote=Heavy Accentuated Note
-effects.harmonic=Harmonic
-effects.grace=Grace Note
-effects.grace-editor=Grace Note Editor
-effects.grace.before-beat=Before beat
-effects.grace.on-beat=On beat
-effects.grace.transition=Transition
-effects.grace.transition-none=None
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Palm Mute
-effects.let-ring=Let Ring
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Left Hand
-effects.harmonic.tapped.right-hand=Right Hand
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-bend.editor=Bend Editor
-bend.bend=Bend
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Player
-transport.start=Start
-transport.stop=Stop
-transport.pause=Pause
-transport.first=First
-transport.last=Last
-transport.previous=Previous
-transport.next=Next
-transport.metronome=Metronome
-transport.count-down=Count Down
-transport.mode=Play Mode
-transport.mode.simple=Simple Mode
-transport.mode.simple.tempo-percent=Percentage of tempo
-transport.mode.simple.loop=Play looped
-transport.mode.trainer=Training Mode
-transport.mode.trainer.increment-description=Increment by
-transport.mode.loop-range=Loop Range
-transport.mode.loop-range.from=Play from measure
-transport.mode.loop-range.from-default=From the beginning
-transport.mode.loop-range.to=Play to measure
-transport.mode.loop-range.to-default=To the end
-transport.set-loop-start=Set loop start point
-transport.set-loop-end=Set loop end point
-
-
-instruments.dialog-title=Instruments
-instruments.volume=Gain
-instrument=Instrument
-instrument.percussion-channel=Percussion Channel
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.program=Program
-instrument.bank=Bank
-instrument.volume=Volume
-instrument.balance=Balance
-instrument.chorus=Chorus
-instrument.reverb=Reverb
-instrument.phaser=Phaser
-instrument.tremolo=Tremolo
-
-
-repeat.open=Open Repeat
-repeat.close=Close Repeat
-repeat.alternative=Alternative Repeats
-repeat.alternative.editor=Edit Alternative Repeats
-repetitions=Repetitions
-repeat.number-of-repetitions=Number of Repetitions
-
-beat=Beat
-beat.clean=Clean Beat
-beat.insert-rest=Insert Rest Beat
-beat.delete-note-or-rest=Delete Note or Rest
-beat.voice.remove-unused=Remove Unused Voice
-beat.voice-up=Stems Up
-beat.voice-down=Stems Down
-beat.voice-auto=Auto Stems
-beat.stroke=Stroke
-beat.stroke-up=Upstroke
-beat.stroke-down=Downstroke
-beat.move-left=Move One Beat Left
-beat.move-right=Move One Beat Right
-beat.move-custom=Custom Beat Move
-beat.move-custom.dialog.title=Custom Move
-beat.move-custom.dialog.direction-tip=Move Direction
-beat.move-custom.dialog.move-1.tip=Major Move
-beat.move-custom.dialog.move-2.tip=Fine Move
-beat.move-custom.dialog.direction=Direction
-beat.move-custom.dialog.direction.right=Move To Right
-beat.move-custom.dialog.direction.left=Move To Left
-beat.move-custom.dialog.count=Count
-beat.move-custom.dialog.duration=Duration
-beat.move-custom.dialog.duration.type=Dotted/Double-Dotted
-beat.move-custom.dialog.duration.type.normal=None
-beat.move-custom.dialog.duration.division-type=Division Type
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tuplet)
-
-note=Note
-note.semitone-up=Semitone Up
-note.semitone-down=Semitone Down
-note.shift-up=Shift Up
-note.shift-down=Shift Down
-note.tiednote=Tied Note
-note.deadnote=Dead Note
-
-insert.chord=Insert Chord
-chord.editor=Chord Editor
-chord=Chord
-chord.name=Name
-chord.bass=Bass
-chord.custom=Custom Chord
-chord.custom.name-empty-error=Chord name can not be empty.
-chord.custom.name-exist-error=Chord name already exists.
-chord.settings.tip=Custom Settings
-chord.settings.type=Type
-chord.settings.type.most-common=Most Common
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=Close Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Open Chords
-chord.settings.chords-to-display=Chords to Display
-chord.settings.search-frets=Search Frets
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-tuning=Tuning
-tuning.offset=Offset
-tuning.strings=Strings
-tuning.strings.transpose=Transpose afected notes.
-tuning.strings.transpose.try-keep-strings=Try keep notes at same string
-tuning.strings.transpose.apply-to-chords=Transpose Chords
-
-language=Language
-
-choose-color=Choose a color
-
-settings=Settings
-settings.config=Configure TuxGuitar
-settings.config.language=Language
-settings.config.language.choose=Choose Language
-settings.config.styles=Styles
-settings.config.styles.general=General Styles
-settings.config.styles.printer=Printer Styles
-settings.config.styles.font.default=Default Font
-settings.config.styles.font.note=Note Font
-settings.config.styles.font.lyric=Lyrics Font
-settings.config.styles.font.text=Text Font
-settings.config.styles.font.time-signature=Time Signature Font
-settings.config.styles.font.printer-default=Printer Default Font
-settings.config.styles.font.printer-note=Printer Note Font
-settings.config.styles.font.printer-time-signature=Printer Time Signature Font
-settings.config.styles.color.score-note=Score Note Color
-settings.config.styles.color.tab-note=Tab Note Color
-settings.config.styles.color.play-note=Play Note Color
-settings.config.apply-changes-question=Do you want to apply changes now?
-settings.config.sound=Sound
-settings.config.main=General
-settings.config.main.window-title=Window Title
-settings.config.main.window-title.help=The following variables will be replaced at the window title:
-settings.config.main.window-title.var.description.appname=This variable represents the Application Name: TuxGuitar
-settings.config.main.window-title.var.description.appversion=This variable represents the version of TuxGuitar.
-settings.config.main.window-title.var.description.filename=This variable represents the name of the opened file
-settings.config.main.window-title.var.description.filepath=This variable represents the path of the opened file
-settings.config.main.window-title.var.description.songname=This variable represents the name of the song
-settings.config.main.window-title.var.description.songauthor=This variable represents the author of the song
-settings.config.main.window-title.var.description.songalbum=This variable represents the album of the song
-settings.config.main.window-title.var.description.songartist=This variable represents the artist of the song
-settings.config.main.options=Options
-settings.config.main.splash-enabled=Launch splash screen on startup
-settings.config.main.table.auto-size.enabled=Enable Automatic Table resizing
-settings.config.styles.color.lines=Horizontal lines color
-settings.config.toolbars=Tool Bars
-settings.config.toolbars.tip=Customize Your ToolBars
-settings.config.toolbars.list=Available ToolBars
-settings.config.toolbars.move-up=Move Up
-settings.config.toolbars.move-down=Move Down
-settings.config.skin=Skins
-settings.config.skin.choose=Choose your skin
-settings.keybindings=Configure Key Bindings
-
-key-bindings-editor=Key Binding Editor
-key-bindings-editor-action-select=Select an Action
-key-bindings-editor-action-column=Actions
-key-bindings-editor-shortcut-column=Keys
-key-bindings-editor-push-a-key=Press a key
-key-bindings-editor-save-question=There are unsaved changes, do you want to exit without saving?
-key-bindings-editor-override=Shortcut already in use! Are you sure you want to use it?
-
-print.print=Print
-print.dialog=Print
-print.service=Service
-print.service.name=Name
-print.service.status=Status
-print.service.type=Type
-print.service.info=Info
-print.range=Range
-print.range.all-pages=All
-print.range.pages=Pages
-print.range.pages-to=To
-print.copies=Copies
-print.copies-number=Number of copies
-print.print-to-file=Print to file
-print.file-chooser=Choose
-print-header.default-song-name=Untitled
-print-header.default-song-author=Anonymous
-
-print.preview=Print Preview
-print.preview.page-of=Of
-
-marker=Marker
-marker.add=Add Marker
-marker.list=List Markers
-marker.first=Go First Marker
-marker.last=Go Last Marker
-marker.next=Go Next Marker
-marker.previous=Go Previous Marker
-
-export.tablature-enabled=Show Tablature
-export.score-enabled=Show Score
-export.chord-name-enabled=Show Chord Names
-export.chord-diagram-enabled=Show Chord Diagrams
-export.black-and-white=Black And White Mode
-export.all-tracks=Export all tracks
-
-scale=Scale
-scale.list=Scale List
-
-text.insert=Insert Text
-text.editor=Text Editor
-text.text=Text
-
-tools=Tools
-tools.scale=Scale list
-tools.browser=Browser
-tools.plugins=Plugins
-tools.shortcuts=Shortcuts
-tools.settings=Settings
-
-tools.transpose=Transpose
-tools.transpose.semitones=Transposition Semitones
-tools.transpose.apply-to-track=Transpose all measures
-tools.transpose.apply-to-measure=Transpose only this measure
-tools.transpose.apply-to-all-tracks=Apply to all tracks
-tools.transpose.try-keep-strings=Try keep notes at same string when it's possible
-tools.transpose.apply-to-chords=Transpose Chords
-
-browser.dialog=Browser
-browser.menu.file=File
-browser.open=Open
-browser.exit=Exit
-browser.menu.collection=Collection
-browser.menu.go=Go
-browser.collection.select=Select Collection
-browser.collection.open=Open
-browser.collection.remove=Remove
-browser.collection.close=Close
-browser.collection.new=New
-browser.go-root=Home
-browser.go-back=Back
-browser.refresh=Refresh
-browser.factory.fs.name=File System
-browser.collection.fs.name=Name
-browser.collection.fs.path=Folder
-browser.collection.fs.editor-title=File System Collection
-browser.collection.fs.editor-tip=Choose your collection folder
-browser.collection.fs.invalid-path=Please, select a valid folder
-
-midi.port=MIDI Port
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=Not available.
-plugin.column.name=Plugin Name
-plugin.column.enabled=Enabled
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=File Items
-edit.items=Edit Items
-property.items=Property Items
-track.items=Track Items
-duration.items=Duration Items
-beat.items=Beat Items
-composition.items=Composition Items
-repeat.items=Repeat Items
-transport.items=Player Items
-marker.items=Marker Items
-insert.items=Insert Items
-layout.items=Layout Items
-view.items=View Items
-effect.items=Effect Items
-dynamic.items=Dynamic Items
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=New File
-action.file.open=Open File
-action.file.open-url=Open URL
-action.file.save=Save
-action.file.save-as=Save As
-action.file.print=Print
-action.file.print-preview=Print Preview
-action.file.exit=Exit TuxGuitar
-action.edit.undo=Undo
-action.edit.redo=Redo
-action.edit.voice-1=Select Voice 1
-action.edit.voice-2=Select Voice 2
-action.caret.go-up=Move cursor up
-action.caret.go-down=Move cursor down
-action.caret.go-left=Move cursor left
-action.caret.go-right=Move cursor right
-action.composition.change-time-signature=Change Time Signature
-action.composition.change-tempo=Change Tempo
-action.composition.change-info=Change Song Information
-action.composition.change-clef=Change Clef
-action.composition.change-key-signature=Change Key Signature
-action.composition.change-triplet-feel=Change Triplet Feel
-action.view.layout-set-page=Show Page Layout
-action.view.layout-set-linear=Show Linear Layout
-action.view.layout-set-multitrack=Show Multitrack Mode
-action.view.layout-set-score-enabled=Show Score
-action.view.layout-set-tablature-enabled=Show Tablature
-action.view.layout-set-compact=Show Compact Mode
-action.view.layout-set-chord-diagram-enabled=Enable Chord Diagram
-action.view.layout-set-chord-name-enabled=Enable Chord Name
-action.view.show-toolbars=Show Toolbars
-action.view.show-fretboard=Show Fretboard
-action.view.show-piano=Show Piano
-action.view.show-matrix=Show Matrix
-action.view.show-instruments=Show Instruments
-action.view.show-transport=Show Player
-action.track.add=Add Track
-action.track.remove=Remove Track
-action.track.clone=Clone Track
-action.track.go-first=Go to first track
-action.track.go-last=Go to last track
-action.track.go-next=Go to next track
-action.track.go-previous=Go to previous track
-action.track.lyrics=Edit track lyrics
-action.track.properties=Change track properties
-action.track.move-down=Move track down
-action.track.move-up=Move track up
-action.track.change-solo=Set track solo
-action.track.change-mute=Set track mute
-action.measure.add=Add measure
-action.measure.remove=Remove measure
-action.measure.copy=Copy measure
-action.measure.paste=Paste measure
-action.measure.clean=Clean measure
-action.measure.go-first=Go to first measure
-action.measure.go-last=Go to last measure
-action.measure.go-next=Go to next measure
-action.measure.go-previous=Go to previous measure
-action.beat.general.remove-unused-voice=Remove Unused Voice
-action.beat.general.voice-up=Set Stems Up
-action.beat.general.voice-down=Set Stems Down
-action.beat.general.voice-auto=Set Auto Stems
-action.beat.general.set-stroke-up=Set Upstroke
-action.beat.general.set-stroke-down=Set Downstroke
-action.beat.general.move-left=Move One Beat Left
-action.beat.general.move-right=Move One Beat Right
-action.beat.general.move-custom=Custom Beat Move
-action.beat.general.insert-rest=Insert rest beat
-action.beat.general.delete-note-or-rest=Delete note or rest
-action.note.general.set-fret-number-0=Set fret number 0
-action.note.general.set-fret-number-1=Set fret number 1
-action.note.general.set-fret-number-2=Set fret number 2
-action.note.general.set-fret-number-3=Set fret number 3
-action.note.general.set-fret-number-4=Set fret number 4
-action.note.general.set-fret-number-5=Set fret number 5
-action.note.general.set-fret-number-6=Set fret number 6
-action.note.general.set-fret-number-7=Set fret number 7
-action.note.general.set-fret-number-8=Set fret number 8
-action.note.general.set-fret-number-9=Set fret number 9
-action.note.general.clean-beat=Clean beat
-action.note.general.decrement-semitone=Decrement semitone
-action.note.general.increment-semitone=Increment semitone
-action.note.general.shift-down=Shift down
-action.note.general.shift-up=Shift up
-action.note.general.tied=Add/Remove tied
-action.note.duration.set-whole=Set Whole Duration
-action.note.duration.set-half=Set Half Duration
-action.note.duration.set-quarter=Set Quarter Duration
-action.note.duration.set-eighth=Set Eighth Duration
-action.note.duration.set-sixteenth=Set Sixteenth Duration
-action.note.duration.set-thirty-second=Set Thirty Second Duration
-action.note.duration.set-sixty-fourth=Set Sixty Fourth Duration
-action.note.duration.change-dotted=Add/Remove dot
-action.note.duration.change-double-dotted=Add/Remove double dotted
-action.note.duration.change-division-type=Add/Remove triplet
-action.note.duration.decrement-duration=Decrement Duration
-action.note.duration.increment-duration=Increment Duration
-action.note.effect.change-vibrato=Add/Remove Vibrato
-action.note.effect.change-bend=Add/Remove bend
-action.note.effect.change-slide=Add/Remove Slide
-action.note.effect.change-hammer=Add/Remove hammer-on/pull-off
-action.note.effect.change-accentuated=Add/Remove accentuated
-action.note.effect.change-dead=Add/Remove dead note
-action.note.effect.change-fade-in=Add/Remove fade in
-action.note.effect.change-ghost=Add/Remove ghost
-action.note.effect.change-grace=Add/Remove grace
-action.note.effect.change-harmonic=Add/Remove harmonic
-action.note.effect.change-heavy-accentuated=Add/Remove heavy accentuated
-action.note.effect.change-palm-mute=Add/Remove palm mute
-action.note.effect.change-let-ring=Add/Remove let ring
-action.note.effect.change-popping=Add/Remove popping
-action.note.effect.change-slapping=Add/Remove slapping
-action.note.effect.change-staccato=Add/Remove staccato
-action.note.effect.change-tapping=Add/Remove tapping
-action.note.effect.change-tremolo-bar=Add/Remove tremolo bar
-action.note.effect.change-tremolo-picking=Add/Remove tremolo picking
-action.note.effect.change-trill=Add/Remove Trill
-action.insert.open-repeat=Open Repeat
-action.insert.close-repeat=Close Repeat
-action.insert.repeat-alternative=Repeat Alternative
-action.insert.chord=Insert Chord
-action.insert.text=Insert Text
-action.marker.add=Add Marker
-action.marker.go-next=Go Next Marker
-action.marker.go-previous=Go Previous Marker
-action.transport.play=Play Song
-action.transport.stop=Stop Playing
-action.transport.mode=Player Mode
-action.transport.metronome=Metrononome
-action.transport.count-down=Count Down
-action.transport.set-loop-start=Set loop start point
-action.transport.set-loop-end=Set loop end point
-action.tools.browser=Browser
-action.tools.transpose=Transpose Notes
-action.settings.configure=Settings
-action.help.doc=Help
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_bg.properties b/TuxGuitar-testing/platform-all/share/lang/messages_bg.properties
deleted file mode 100644
index e91f517d..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_bg.properties
+++ /dev/null
@@ -1,682 +0,0 @@
-ok=\u0414\u043E\u0431\u0440\u0435
-cancel=\u041E\u0442\u043A\u0430\u0437
-yes=\u0414\u0430
-no=\u041D\u0435
-add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435
-edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u043D\u0435
-remove=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435
-save=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435
-exit=\u0418\u0437\u0445\u043E\u0434
-close=\u0417\u0430\u0442\u0432\u0430\u0440\u044F\u043D\u0435
-choose=\u0418\u0437\u0431\u043E\u0440
-color=\u0426\u0432\u044F\u0442
-title=\u0417\u0430\u0433\u043B\u0430\u0432\u0438\u0435
-go=\u041D\u0430\u043F\u0440\u0435\u0434
-warning=\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435
-error=\u0413\u0440\u0435\u0448\u043A\u0430
-plugins=\u041F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0438
-options=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-defaults=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u0438
-clean=\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043D\u0435
-rename=\u041F\u0440\u0435\u0438\u043C\u0435\u043D\u0443\u0432\u0430\u043D\u0435
-fret=\u041F\u0440\u0430\u0433\u0447\u0435
-position=\u041F\u043E\u0437\u0438\u0446\u0438\u044F
-name=\u0418\u043C\u0435
-author=\u0410\u0432\u0442\u043E\u0440
-version=\u0412\u0435\u0440\u0441\u0438\u044F
-description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
-info=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F
-configure=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u0432\u0430\u043D\u0435
-url=\u0418\u043D\u0442\u0435\u0440\u043D\u0435\u0442 \u0430\u0434\u0440\u0435\u0441
-
-file=\u0424\u0430\u0439\u043B
-file.new=\u041D\u043E\u0432
-file.open=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435
-file.save=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435
-file.save-as=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435 \u043A\u0430\u0442\u043E
-file.save-changes-question=\u041F\u0435\u0441\u0435\u043D\u0442\u0430 \u0438\u043C\u0430 \u043D\u0435\u0437\u0430\u043F\u0430\u0437\u0435\u043D\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u0438.\n\u0416\u0435\u043B\u0430\u0435\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0433\u0438 \u0437\u0430\u043F\u0430\u0437\u0438\u0442\u0435?
-file.exit=\u0418\u0437\u0445\u043E\u0434
-file.export=\u0418\u0437\u043D\u0430\u0441\u044F\u043D\u0435
-file.export-midi=\u0418\u0437\u043D\u0430\u0441\u044F\u043D\u0435 \u0432 MIDI
-file.export-pdf=\u0418\u0437\u043D\u0430\u0441\u044F\u043D\u0435 \u0432 PDF
-file.print=\u041F\u0435\u0447\u0430\u0442
-file.print-preview=\u041F\u0440\u0435\u0433\u043B\u0435\u0434 \u0437\u0430 \u043F\u0435\u0447\u0430\u0442
-file.import=\u0412\u043D\u0430\u0441\u044F\u043D\u0435
-file.import-midi=\u0412\u043D\u0430\u0441\u044F\u043D\u0435 \u043E\u0442 MIDI
-file.export-ascii=\u0418\u0437\u043D\u0430\u0441\u044F\u043D\u0435 \u0432 ASCII
-file.history=\u0418\u0441\u0442\u043E\u0440\u0438\u044F
-file.open-url=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u0430\u0434\u0440\u0435\u0441
-file.open.error=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u043E\u0442\u0432\u043E\u0440\u0438: {0}
-file.save.error=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0437\u0430\u043F\u0430\u0437\u0438: {0}
-file.import.error=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u043D\u0435\u0441\u0435: {0}
-file.export.error=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043D\u0435\u0441\u0435: {0}
-file.overwrite-question=\u0422\u0430\u043A\u044A\u0432 \u0444\u0430\u0439\u043B \u0432\u0435\u0447\u0435 \u0441\u044A\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430. \u0416\u0435\u043B\u0430\u0435\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0433\u043E \u043F\u0440\u0435\u0437\u0430\u043F\u0438\u0448\u0435\u0442\u0435?
-
-edit.menu=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u043D\u0435
-edit.undo=\u041E\u0442\u043C\u044F\u043D\u0430
-edit.redo=\u041F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435
-edit.copy=\u041A\u043E\u043F\u0438\u0440\u0430\u043D\u0435
-edit.from=\u041E\u0442
-edit.to=\u0414\u043E
-edit.all-tracks=\u0412\u0441\u0438\u0447\u043A\u0438 \u043F\u0438\u0441\u0442\u0438
-edit.paste=\u041F\u043E\u0441\u0442\u0430\u0432\u044F\u043D\u0435
-edit.paste.count=Paste Count
-edit.paste.replace-mode=\u041F\u043E\u0441\u0442\u0430\u0432\u044F\u043D\u0435 \u0432 \u0442\u0435\u043A\u0443\u0449\u0438\u044F \u0442\u0430\u043A\u0442
-edit.paste.insert-mode=\u041F\u043E\u0441\u0442\u0430\u0432\u044F\u043D\u0435 \u0432 \u043D\u043E\u0432 \u0442\u0430\u043A\u0442
-edit.delete=\u0418\u0437\u0442\u0440\u0438\u0432\u0430\u043D\u0435
-edit.cut=\u0418\u0437\u0440\u044F\u0437\u0432\u0430\u043D\u0435
-edit.mouse-mode-selection=\u0420\u0435\u0436\u0438\u043C \u043D\u0430 \u0438\u0437\u0431\u0438\u0440\u0430\u043D\u0435
-edit.mouse-mode-edition=Score Edition Mode
-edit.not-natural-key=\u0420\u0435\u0436\u0438\u043C \u0434\u0438\u0435\u0437/\u0431\u0435\u043C\u043E\u043B
-edit.voice-1=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u0433\u043B\u0430\u0441 1
-edit.voice-2=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u0433\u043B\u0430\u0441 2
-
-view=\u0418\u0437\u0433\u043B\u0435\u0434
-view.layout=\u041F\u043E\u0434\u0440\u0435\u0434\u0431\u0430
-view.layout.page=\u041F\u043E\u0434\u0440\u0435\u0434\u0431\u0430 \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
-view.layout.linear=\u041B\u0438\u043D\u0435\u0439\u043D\u0430 \u043F\u043E\u0434\u0440\u0435\u0434\u0431\u0430
-view.layout.compact=\u041A\u043E\u043C\u043F\u0430\u043A\u0442\u043D\u0430
-view.layout.multitrack=\u041C\u043D\u043E\u0433\u043E\u043F\u0438\u0441\u0442\u043E\u0432\u0430
-view.layout.chord-style=\u0421\u0442\u0438\u043B \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-view.layout.chord-name=\u0418\u043C\u0435 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-view.layout.chord-diagram=\u0414\u0438\u0430\u0433\u0440\u0430\u043C\u0430 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-view.layout.score-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0430
-view.layout.tablature-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u0431\u043B\u0430\u0442\u0443\u0440\u0430
-view.show-mixer=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u043C\u0435\u0441\u0438\u0442\u0435\u043B
-view.show-fretboard=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0433\u0440\u0438\u0444
-view.show-piano=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0438\u0430\u043D\u043E
-view.show-matrix=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043C\u0430\u0442\u0440\u0438\u0446\u0430
-view.show-transport=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043B\u0435\u044A\u0440
-
-fretboard.direction=\u041F\u043E\u0441\u043E\u043A\u0430
-fretboard.right-mode=\u0414\u0435\u0441\u0435\u043D \u0440\u0435\u0436\u0438\u043C
-fretboard.left-mode=\u041B\u044F\u0432 \u0440\u0435\u0436\u0438\u043C
-fretboard.background-color=\u0424\u043E\u043D\u043E\u0432 \u0446\u0432\u044F\u0442
-fretboard.display-note-text=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u0442\u0435\u043A\u0441\u0442 \u043D\u0430 \u043D\u043E\u0442\u0430
-fretboard.display-scale-text=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u0442\u0435\u043A\u0441\u0442\u0430 \u043D\u0430 \u0433\u0430\u043C\u0430\u0442\u0430
-fretboard.font=\u0428\u0440\u0438\u0444\u0442
-fretboard.fretpoint-color=\u0426\u0432\u044F\u0442 \u043D\u0430 \u043F\u0440\u0430\u0433\u0447\u0435
-fretboard.note-color=\u0426\u0432\u044F\u0442 \u043D\u0430 \u043D\u043E\u0442\u0430
-fretboard.scale-note-color=Scale Note Color
-fretboard.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u0433\u0440\u0438\u0444
-fretboard.string-color=\u0426\u0432\u044F\u0442 \u043D\u0430 \u0441\u0442\u0440\u0443\u043D\u0430
-fretboard.settings.options=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-
-piano.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u043F\u0438\u0430\u043D\u043E
-piano.natural-key-color=Natural Key Color
-piano.not-natural-key-color=Unnatural Key Color
-piano.note-color=\u0426\u0432\u044F\u0442 \u043D\u0430 \u043D\u043E\u0442\u0430
-piano.scale-note-color=Scale Note Color
-piano.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u043F\u0438\u0430\u043D\u043E
-
-matrix.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u043C\u0430\u0442\u0440\u0438\u0446\u0430
-matrix.grids=\u0411\u0440\u043E\u0439 \u043C\u0440\u0435\u0436\u0438
-matrix.border-color=\u0426\u0432\u044F\u0442 \u043D\u0430 \u0433\u0440\u0430\u043D\u0438\u0446\u0430
-matrix.font=\u0428\u0440\u0438\u0444\u0442
-matrix.foreground-color=\u0426\u0432\u044F\u0442 \u0437\u0430 \u043F\u0440\u0435\u0434\u0435\u043D \u043F\u043B\u0430\u043D
-matrix.line-color-1=\u0426\u0432\u044F\u0442 \u0437\u0430 \u043D\u0435\u0447\u0435\u0442\u0435\u043D \u0440\u0435\u0434
-matrix.line-color-2=\u0426\u0432\u044F\u0442 \u0437\u0430 \u0447\u0435\u0442\u0435\u043D \u0440\u0435\u0434
-matrix.line-color-over=\u0426\u0432\u044F\u0442 \u043F\u0440\u0438 \u043F\u0440\u0435\u043C\u0438\u043D\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u043C\u0438\u0448\u043A\u0430\u0442\u0430 \u043E\u0442\u0433\u043E\u0440\u0435
-matrix.note-color=\u0426\u0432\u044F\u0442 \u043D\u0430 \u043D\u043E\u0442\u0430
-matrix.play-note-color=\u0426\u0432\u044F\u0442 \u0437\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435 \u043D\u0430 \u043D\u043E\u0442\u0430
-matrix.position-color=\u0426\u0432\u044F\u0442 \u0437\u0430 \u043F\u043E\u0437\u0438\u0446\u0438\u044F
-matrix.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043D\u0430 \u043C\u0430\u0442\u0440\u0438\u0446\u0430
-
-composition=\u041A\u043E\u043C\u043F\u043E\u0437\u0438\u0446\u0438\u044F
-composition.timesignature=Time Signature
-composition.timesignature.Numerator=Numerator
-composition.timesignature.denominator=Denominator
-composition.timesignature.to-the-end=\u0414\u043E \u043A\u0440\u0430\u044F
-composition.tempo=\u0422\u0435\u043C\u043F\u043E
-composition.tempo-percent=\u041F\u0440\u043E\u0446\u0435\u043D\u0442
-composition.tempo.invalid=\u041D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u043E \u0442\u0435\u043C\u043F\u043E
-composition.tempo.start-to-end=\u041F\u0440\u0438\u043B\u0430\u0433\u0430\u043D\u0435 \u043D\u0430 \u0442\u043E\u0432\u0430 \u0442\u0435\u043C\u043F\u043E \u043A\u044A\u043C \u0446\u044F\u043B\u0430\u0442\u0430 \u043F\u0435\u0441\u0435\u043D
-composition.tempo.position-to-end=\u041F\u0440\u0438\u043B\u0430\u0433\u0430\u043D\u0435 \u043D\u0430 \u0442\u043E\u0432\u0430 \u0442\u0435\u043C\u043F\u043E \u0434\u043E \u043A\u0440\u0430\u044F
-composition.tempo.position-to-next=\u041F\u0440\u0438\u043B\u0430\u0433\u0430\u043D\u0435 \u043D\u0430 \u0442\u043E\u0432\u0430 \u0442\u0435\u043C\u043F\u043E \u0434\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0449\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-composition.properties=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430
-composition.name=\u0418\u043C\u0435
-composition.artist=\u0418\u0437\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B
-composition.album=\u0410\u043B\u0431\u0443\u043C
-composition.author=\u0410\u0432\u0442\u043E\u0440
-composition.date=\u0414\u0430\u0442\u0430
-composition.copyright=\u0410\u0432\u0442\u043E\u0440\u0441\u043A\u0438 \u043F\u0440\u0430\u0432\u0430
-composition.writer=Tab Creator
-composition.transcriber=\u0422\u0440\u0430\u043D\u0441\u043A\u0440\u0438\u0431\u0438\u0440\u0430\u043D\u043E \u043E\u0442
-composition.comments=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438
-composition.tripletfeel=Triplet Feel
-composition.clef=\u041A\u043B\u044E\u0447
-composition.clef.treble=\u0412\u0438\u0441\u043E\u043A\u0438
-composition.clef.bass=\u0411\u0430\u0441
-composition.clef.tenor=\u0422\u0435\u043D\u043E\u0440
-composition.clef.alto=\u0410\u043B\u0442
-composition.clef.to-the-end=\u041F\u0440\u0438\u043B\u0430\u0433\u0430\u043D\u0435 \u043D\u0430 \u0442\u043E\u0437\u0438 \u043A\u043B\u044E\u0447 \u0434\u043E \u043A\u0440\u0430\u044F
-composition.keysignature=Key Signature
-composition.keysignature.natural=\u041D\u0430\u0442\u0443\u0440\u0430\u043B\u0435\u043D
-composition.keysignature.sharp-1=1 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-2=2 \u0434\u0438\u0435\u0437\u0430
-composition.keysignature.sharp-3=3 \u0434\u0438\u0435\u0437\u0430
-composition.keysignature.sharp-4=4 \u0434\u0438\u0435\u0437\u0430
-composition.keysignature.sharp-5=5 \u0434\u0438\u0435\u0437\u0430
-composition.keysignature.sharp-6=6 \u0434\u0438\u0435\u0437\u0430
-composition.keysignature.sharp-7=7 \u0434\u0438\u0435\u0437\u0430
-composition.keysignature.flat-1=1 \u0431\u0435\u043C\u043E\u043B
-composition.keysignature.flat-2=3 \u0431\u0435\u043C\u043E\u043B\u0430
-composition.keysignature.flat-3=3 \u0431\u0435\u043C\u043E\u043B\u0430
-composition.keysignature.flat-4=4 \u0431\u0435\u043C\u043E\u043B\u0430
-composition.keysignature.flat-5=5 \u0431\u0435\u043C\u043E\u043B\u0430
-composition.keysignature.flat-6=6 \u0431\u0435\u043C\u043E\u043B\u0430
-composition.keysignature.flat-7=7 \u0431\u0435\u043C\u043E\u043B\u0430
-composition.keysignature.to-the-end=Apply this key signature to the end
-composition.tripletfeel=Triplet Feel
-composition.tripletfeel.none=No Triplet Feel
-composition.tripletfeel.eighth=Triplet 8th
-composition.tripletfeel.sixteenth=Triplet 16th
-composition.tripletfeel.to-the-end=Apply this triplet feel to the end
-
-help=\u041F\u043E\u043C\u043E\u0449
-help.help=\u041F\u043E\u043C\u043E\u0449
-help.doc=\u0414\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u044F
-help.about=\u041E\u0442\u043D\u043E\u0441\u043D\u043E
-help.about.license=\u041B\u0438\u0446\u0435\u043D\u0437
-help.about.authors=\u0410\u0432\u0442\u043E\u0440\u0438
-help.about.description=\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435
-
-track=\u041F\u0438\u0441\u0442\u0430
-track.number=N\u00B0
-track.name=\u0418\u043C\u0435
-track.color=\u0426\u0432\u044F\u0442
-track.first=\u041F\u044A\u0440\u0432\u0430 \u043F\u0438\u0441\u0442\u0430
-track.last=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-track.previous=\u041F\u0440\u0435\u0434\u0438\u0448\u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-track.next=\u0421\u043B\u0435\u0434\u0432\u0430\u0449\u0430 \u043F\u0438\u0441\u0442\u0430
-track.add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-track.remove=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-track.clone=\u0414\u0443\u0431\u043B\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-track.move-up=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430\u0433\u043E\u0440\u0435
-track.move-down=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430\u0434\u043E\u043B\u0443
-track.instrument=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442
-track.properties=\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430
-track.properties.general=\u041E\u0431\u0449\u0438
-track.name.default-percussion-name=\u041F\u0435\u0440\u043A\u0443\u0441\u0438\u044F
-track.lyrics=\u0421\u0442\u0438\u0445\u043E\u0432\u0435
-track.solo=\u0421\u043E\u043B\u043E
-track.mute=\u0411\u0435\u0437 \u0437\u0432\u0443\u043A
-
-lyric.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u0441\u0442\u0438\u0445\u043E\u0432\u0435
-
-measure=\u0422\u0430\u043A\u0442
-measure.first=\u041F\u044A\u0440\u0432\u0438 \u0442\u0430\u043A\u0442
-measure.last=\u041F\u043E\u0441\u043B\u0435\u0434\u0435\u043D \u0442\u0430\u043A\u0442
-measure.previous=\u041F\u0440\u0435\u0434\u0438\u0448\u0435\u043D \u0442\u0430\u043A\u0442
-measure.next=\u0421\u043B\u0435\u0434\u0432\u0430\u0449 \u0442\u0430\u043A\u0442
-measure.add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-measure.add.count=Add Count
-measure.add-before-current-position=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442 \u043F\u0440\u0435\u0434\u0438 \u0442\u0435\u043A\u0443\u0449\u0430\u0442\u0430 \u043F\u043E\u0437\u0438\u0446\u0438\u044F
-measure.add-after-current-position=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442 \u0441\u043B\u0435\u0434 \u0442\u0435\u043A\u0443\u0449\u0430\u0442\u0430 \u043F\u043E\u0437\u0438\u0446\u0438\u044F
-measure.add-at-end=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442 \u0432 \u043A\u0440\u0430\u044F
-measure.remove=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-measure.copy=\u041A\u043E\u043F\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-measure.paste=\u041F\u043E\u0441\u0442\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-measure.clean=\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-
-duration=\u041F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-duration.whole=\u0426\u044F\u043B\u0430
-duration.half=\u041F\u043E\u043B\u043E\u0432\u0438\u043D\u0430
-duration.quarter=\u0427\u0435\u0442\u0432\u044A\u0440\u0442\u0438\u043D\u0430
-duration.eighth=\u041E\u0441\u043C\u0438\u043D\u0430
-duration.sixteenth=\u0428\u0435\u0441\u0442\u043D\u0430\u0439\u0441\u0435\u0442\u0438\u043D\u0430
-duration.thirtysecond=\u0422\u0440\u0438\u0434\u0435\u0441\u0435\u0442\u0438\u0432\u0442\u043E\u0440\u0438\u043D\u0430
-duration.sixtyfourth=\u0428\u0435\u0441\u0442\u0434\u0435\u0441\u0435\u0442\u0438\u0447\u0435\u0442\u0432\u044A\u0440\u0442\u0438\u043D\u0430
-duration.dotted=\u0423\u0434\u044A\u043B\u0436\u0435\u043D\u0430
-duration.doubledotted=\u0414\u0432\u043E\u0439\u043D\u043E \u0443\u0434\u044A\u043B\u0436\u0435\u043D\u0430
-duration.division-type=\u0422\u0440\u0438\u043E\u043B\u0430
-
-dynamic=\u0414\u0438\u043D\u0430\u043C\u0438\u043A\u0430
-dynamic.piano-pianissimo=\u041F\u0438\u0430\u043D\u043E-\u043F\u0438\u0430\u043D\u0438\u0441\u0438\u043C\u043E
-dynamic.pianissimo=\u041F\u0438\u0430\u043D\u0438\u0441\u0438\u043C\u043E
-dynamic.piano=\u041F\u0438\u0430\u043D\u043E
-dynamic.mezzo-piano=\u041C\u0435\u0446\u043E-\u043F\u0438\u0430\u043D\u043E
-dynamic.mezzo-forte=\u041C\u0435\u0446\u043E-\u0444\u043E\u0440\u0442\u0435
-dynamic.forte=\u0424\u043E\u0440\u0442\u0435
-dynamic.fortissimo=\u0424\u043E\u0440\u0442\u0438\u0441\u0438\u043C\u043E
-dynamic.forte-fortissimo=\u0424\u043E\u0440\u0442\u0435-\u0444\u043E\u0440\u0442\u0438\u0441\u0438\u043C\u043E
-
-effects=\u0415\u0444\u0435\u043A\u0442\u0438
-effects.vibrato=\u0412\u0438\u0431\u0440\u0430\u0442\u043E
-effects.bend=\u041F\u043E\u0440\u0442\u0430\u043C\u0435\u043D\u0442\u043E
-effects.deadnote=\u0413\u043B\u0443\u0445\u0430 \u043D\u043E\u0442\u0430
-effects.slide=\u0413\u043B\u0438\u0441\u0430\u043D\u0434\u043E
-effects.hammer=\u0424\u043E\u0440\u0448\u043B\u0430\u0433  (\u043F\u043E\u0447\u0443\u043A\u0432\u0430\u043D\u0435/\u0438\u0437\u0434\u044A\u0440\u043F\u0432\u0430\u043D\u0435)
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=\u041F\u0440\u0438\u0433\u043B\u0443\u0448\u0435\u043D\u0430 \u043D\u043E\u0442\u0430
-effects.accentuatednote=\u0410\u043A\u0446\u0435\u043D\u0442\u0438\u0440\u0430\u043D\u0430 \u043D\u043E\u0442\u0430
-effects.heavyaccentuatednote=\u0421\u0438\u043B\u043D\u043E \u0430\u043A\u0446\u0435\u043D\u0442\u0438\u0440\u0430\u043D\u0430 \u043D\u043E\u0442\u0430
-effects.harmonic=\u0424\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-effects.grace=\u0424\u0438\u043E\u0440\u0438\u0442\u0443\u0440\u0430 
-effects.grace-editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u0444\u0438\u043E\u0440\u0438\u0442\u0443\u0440\u0430
-effects.grace.before-beat=\u041F\u0440\u0435\u0434\u0438 \u0443\u0434\u0430\u0440
-effects.grace.on-beat=\u041F\u0440\u0438 \u0443\u0434\u0430\u0440
-effects.grace.transition=\u041F\u0440\u0435\u0445\u043E\u0434
-effects.grace.transition-none=\u0411\u0435\u0437
-effects.grace.transition-bend=\u041F\u043E\u0440\u0442\u0430\u043C\u0435\u043D\u0442\u043E
-effects.grace.transition-slide=\u0413\u043B\u0438\u0441\u0430\u043D\u0434\u043E
-effects.grace.transition-hammer=\u0424\u043E\u0440\u0448\u043B\u0430\u0433
-effects.trill=\u0422\u0440\u0438\u043B\u0435\u0440
-effects.trill-editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u0442\u0440\u0438\u043B\u0435\u0440
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=\u0417\u0430\u0433\u043B\u0443\u0448\u0430\u0432\u0430\u043D\u0435 \u0441 \u0434\u043B\u0430\u043D
-effects.staccato=\u0421\u0442\u0430\u043A\u0430\u0442\u043E
-effects.tapping=\u041F\u043E\u0442\u0443\u043F\u0432\u0430\u043D\u0435
-effects.slapping=\u041F\u043B\u044F\u0441\u043A\u0430\u043D\u0435 (\u0441\u043B\u0430\u043F\u0438\u043D\u0433)
-effects.popping=\u041F\u043E\u043F\u0438\u043D\u0433
-effects.fade-in=Fade In  
-effects.harmonic-editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u0444\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-effects.harmonic.type-of-harmonic=\u0422\u0438\u043F \u0444\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-effects.harmonic.natural=\u0415\u0441\u0442\u0435\u0441\u0442\u0432\u0435\u043D \u0444\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-effects.harmonic.artificial=\u0418\u0437\u043A\u0443\u0441\u0442\u0432\u0435\u043D \u0444\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=\u0424\u043B\u0430\u0436\u043E\u043B\u0435\u0442 \u0441 \u043F\u043E\u0442\u0443\u043F\u0432\u0430\u043D\u0435
-effects.harmonic.tapped.left-hand=\u041B\u044F\u0432\u0430 \u0440\u044A\u043A\u0430
-effects.harmonic.tapped.right-hand=\u0414\u044F\u0441\u043D\u0430 \u0440\u044A\u043A\u0430
-effects.harmonic.pinch=\u0424\u043B\u0430\u0436\u043E\u043B\u0435\u0442 \u0441 \u043F\u043E\u0434\u0440\u044A\u043F\u0432\u0430\u043D\u0435
-effects.harmonic.semi=\u041F\u043E\u043B\u0443\u0444\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-
-bend.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u043F\u043E\u0440\u0442\u0430\u043C\u0435\u043D\u0442\u043E
-bend.bend=\u041F\u043E\u0440\u0442\u0430\u043C\u0435\u043D\u0442\u043E
-bend.bend-release=\u041A\u0438\u0442\u0430\u0440\u043D\u043E \u0432\u0438\u0431\u0440\u0430\u0442\u043E
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=\u041F\u043B\u0435\u044A\u0440
-transport.start=\u0418\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435
-transport.stop=\u0421\u0442\u043E\u043F
-transport.pause=\u041F\u0430\u0443\u0437\u0430
-transport.first=\u041F\u044A\u0440\u0432\u0430
-transport.last=\u041F\u043E\u0441\u043B\u0435\u0434\u043D\u0430
-transport.previous=\u041F\u0440\u0435\u0434\u0438\u0448\u043D\u0430
-transport.next=\u0421\u043B\u0435\u0434\u0432\u0430\u0449\u0430
-transport.metronome=\u041C\u0435\u0442\u0440\u043E\u043D\u043E\u043C
-transport.mode=\u0420\u0435\u0436\u0438\u043C \u0434\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435
-transport.mode.simple=\u041F\u0440\u043E\u0441\u0442 \u0440\u0435\u0436\u0438\u043C
-transport.mode.simple.tempo-percent=\u041F\u0440\u043E\u0446\u0435\u043D\u0442 \u043E\u0442 \u0442\u0435\u043C\u043F\u043E\u0442\u043E
-transport.mode.simple.loop=\u0426\u0438\u043A\u043B\u0438\u0447\u043D\u043E \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435
-transport.mode.trainer=\u0422\u0440\u0435\u043D\u0438\u0440\u043E\u0432\u044A\u0447\u0435\u043D \u0440\u0435\u0436\u0438\u043C
-transport.mode.trainer.increment-description=\u041D\u0430\u0440\u0430\u0441\u0442\u0432\u0430\u043D\u0435 \u0441
-transport.mode.loop-range=\u041E\u0431\u0445\u0432\u0430\u0442 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435\u0442\u043E
-transport.mode.loop-range.from=\u0418\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435 \u043E\u0442 \u0442\u0430\u043A\u0442
-transport.mode.loop-range.from-default=\u041E\u0442 \u043D\u0430\u0447\u0430\u043B\u043E\u0442\u043E
-transport.mode.loop-range.to=\u0418\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435 \u0434\u043E \u0442\u0430\u043A\u0442
-transport.mode.loop-range.to-default=\u0414\u043E \u043A\u0440\u0430\u044F
-transport.set-loop-start=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430\u0447\u0430\u043B\u043E \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435\u0442\u043E
-transport.set-loop-end=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043A\u0440\u0430\u0439 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435\u0442\u043E
-
-instruments.volume=\u0423\u0441\u0438\u043B\u0432\u0430\u043D\u0435
-instrument=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.volume=\u0421\u0438\u043B\u0430 \u043D\u0430 \u0437\u0432\u0443\u043A\u0430
-instrument.balance=\u0411\u0430\u043B\u0430\u043D\u0441
-instrument.chorus=\u0425\u043E\u0440
-instrument.reverb=\u0415\u0445\u043E
-instrument.phaser=\u0424\u0430\u0437\u0435\u0440
-instrument.tremolo=\u0422\u0440\u0435\u043C\u043E\u043B\u043E
-
-
-repeat.open=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435
-repeat.close=\u0417\u0430\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435
-repeat.alternative=\u0410\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u044F
-repeat.alternative.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0430\u043B\u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u044F
-repetitions=\u041F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u044F
-repeat.number-of-repetitions=\u0411\u0440\u043E\u0439 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u044F
-
-beat=\u0423\u0434\u0430\u0440
-beat.clean=\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u0430\u0440
-beat.voice.remove-unused=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043D\u0435\u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D \u0433\u043B\u0430\u0441
-beat.voice-up=Stems Up
-beat.voice-down=Stems Down
-beat.voice-auto=Auto Stems
-beat.stroke=Stroke
-beat.stroke-up=\u0423\u0434\u0430\u0440 \u043D\u0430\u0433\u043E\u0440\u0435
-beat.stroke-down=\u0423\u0434\u0430\u0440 \u043D\u0430\u0434\u043E\u043B\u0443
-beat.move-left=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u0435\u0434\u0438\u043D \u0443\u0434\u0430\u0440 \u043D\u0430\u043B\u044F\u0432\u043E
-beat.move-right=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u0435\u0434\u0438\u043D \u0443\u0434\u0430\u0440 \u043D\u0430\u0434\u044F\u0441\u043D\u043E
-beat.move-custom=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u043E \u043F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u0430\u0440
-beat.move-custom.dialog.title=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u043E \u043F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435
-beat.move-custom.dialog.direction-tip=\u041F\u043E\u0441\u043E\u043A\u0430 \u043D\u0430 \u043F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435
-beat.move-custom.dialog.move-1.tip=Major Move
-beat.move-custom.dialog.move-2.tip=Fine Move
-beat.move-custom.dialog.direction=\u041F\u043E\u0441\u043E\u043A\u0430
-beat.move-custom.dialog.direction.right=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430\u0434\u044F\u0441\u043D\u043E
-beat.move-custom.dialog.direction.left=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430\u043B\u044F\u0432\u043E
-beat.move-custom.dialog.count=\u0411\u0440\u043E\u0439
-beat.move-custom.dialog.duration=\u041F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-beat.move-custom.dialog.duration.type=Dotted/Double-Dotted
-beat.move-custom.dialog.duration.type.normal=\u0411\u0435\u0437
-beat.move-custom.dialog.duration.division-type=Division Type
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tuplet)
-
-note=\u041D\u043E\u0442\u0430
-note.semitone-up=\u041F\u043E\u043B\u0443\u0442\u043E\u043D \u043D\u0430\u0433\u043E\u0440\u0435
-note.semitone-down=\u041F\u043E\u043B\u0443\u0442\u043E\u043D \u043D\u0430\u0434\u043E\u043B\u0443
-note.shift-up=\u041D\u0430\u0433\u043E\u0440\u0435
-note.shift-down=\u041D\u0430\u0434\u043E\u043B\u0443
-note.tiednote=Tied Note
-note.deadnote=\u0413\u043B\u0443\u0445\u0430 \u043D\u043E\u0442\u0430
-
-insert.chord=\u0412\u043C\u044A\u043A\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-chord.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-chord=\u0410\u043A\u043E\u0440\u0434
-chord.name=\u0418\u043C\u0435
-chord.bass=\u0411\u0430\u0441
-chord.custom=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u0438 \u0430\u043A\u043E\u0440\u0434
-chord.custom.name-empty-error=\u0418\u043C\u0435\u0442\u043E \u043D\u0430 \u0430\u043A\u043E\u0440\u0434\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0435 \u043F\u0440\u0430\u0437\u043D\u043E.
-chord.custom.name-exist-error=\u0412\u0435\u0447\u0435 \u0441\u044A\u0449\u0435\u0441\u0442\u0432\u0443\u0432\u0430 \u0430\u043A\u043E\u0440\u0434 \u0441 \u0442\u043E\u0432\u0430 \u0438\u043C\u0435.
-chord.settings.tip=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-chord.settings.type=\u0422\u0438\u043F
-chord.settings.type.most-common=\u041D\u0430\u0439-\u0447\u0435\u0441\u0442\u043E \u0441\u0440\u0435\u0449\u0430\u043D\u0438
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=Close Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Open Chords
-chord.settings.chords-to-display=\u0410\u043A\u043E\u0440\u0434\u0438 \u0437\u0430 \u043F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435
-chord.settings.search-frets=\u0422\u044A\u0440\u0441\u0435\u043D\u0435 \u043D\u0430 \u043F\u0440\u0430\u0433\u0447\u0435\u0442\u0430
-chord.settings.minimum-fret=\u041C\u0438\u043D
-chord.settings.maximum-fret=\u041C\u0430\u043A\u0441
-
-
-tuning=\u0424\u0438\u043D\u0438 \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-tuning.offset=\u041E\u0442\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435
-tuning.strings=\u0421\u0442\u0440\u0443\u043D\u0438
-tuning.strings.transpose=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0437\u0430\u0441\u0435\u0433\u043D\u0430\u0442\u0438\u0442\u0435 \u043D\u043E\u0442\u0438.
-tuning.strings.transpose.try-keep-strings=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043D\u043E\u0442\u0438\u0442\u0435 \u043D\u0430 \u0441\u044A\u0449\u0430\u0442\u0430 \u0441\u0442\u0440\u0443\u043D\u0430
-tuning.strings.transpose.apply-to-chords=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434\u0438
-
-language=\u0415\u0437\u0438\u043A
-
-choose-color=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0446\u0432\u044F\u0442
-
-settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-settings.config=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u0432\u0430\u043D\u0435 \u043D\u0430 TuxGuitar
-settings.config.language=\u0415\u0437\u0438\u043A
-settings.config.language.choose=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u0435\u0437\u0438\u043A
-settings.config.styles=\u0421\u0442\u0438\u043B\u043E\u0432\u0435
-settings.config.styles.general=\u041E\u0431\u0449\u0438 \u0441\u0442\u0438\u043B\u043E\u0432\u0435
-settings.config.styles.printer=\u0421\u0442\u0438\u043B\u043E\u0432\u0435 \u043D\u0430 \u043F\u0440\u0438\u043D\u0442\u0435\u0440
-settings.config.styles.font.default=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u0435\u043D \u0448\u0440\u0438\u0444\u0442
-settings.config.styles.font.note=\u0428\u0440\u0438\u0444\u0442 \u0437\u0430 \u043D\u043E\u0442\u0438\u0442\u0435
-settings.config.styles.font.lyric=\u0428\u0440\u0438\u0444\u0442 \u0437\u0430 \u0441\u0442\u0438\u0445\u043E\u0432\u0435\u0442\u0435
-settings.config.styles.font.text=\u0428\u0440\u0438\u0444\u0442 \u043D\u0430 \u0442\u0435\u043A\u0441\u0442\u0430
-settings.config.styles.font.time-signature=Time Signature Font
-settings.config.styles.font.printer-default=\u0421\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u0435\u043D \u0448\u0440\u0438\u0444\u0442 \u0437\u0430 \u043F\u0440\u0438\u043D\u0442\u0435\u0440\u0430
-settings.config.styles.font.printer-note=Printer Note Font
-settings.config.styles.font.printer-time-signature=Printer Time Signature Font
-settings.config.styles.color.score-note=Score Note Color
-settings.config.styles.color.tab-note=Tab Note Color
-settings.config.styles.color.play-note=Play Note Color
-settings.config.apply-changes-question=\u0416\u0435\u043B\u0430\u0435\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0441\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0430\u0442 \u043F\u0440\u043E\u043C\u0435\u043D\u0438\u0442\u0435?
-settings.config.sound=\u0417\u0432\u0443\u043A
-settings.config.main=\u041E\u0431\u0449\u0438
-settings.config.main.window-title=\u0417\u0430\u0433\u043B\u0430\u0432\u0438\u0435 \u043D\u0430 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446
-settings.config.main.window-title.help=\u0421\u043B\u0435\u0434\u043D\u0438\u0442\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0438 \u0449\u0435 \u0431\u044A\u0434\u0430\u0442 \u0437\u0430\u043C\u0435\u043D\u0435\u043D\u0438 \u0432 \u0437\u0430\u0433\u043B\u0430\u0432\u0438\u0435\u0442\u043E \u043D\u0430 \u043F\u0440\u043E\u0437\u043E\u0440\u0435\u0446\u0430:
-settings.config.main.window-title.var.description.appname=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0438\u043C\u0435\u0442\u043E \u043D\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435\u0442\u043E: TuxGuitar
-settings.config.main.window-title.var.description.appversion=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0432\u0435\u0440\u0441\u0438\u044F\u0442\u0430 \u043D\u0430 TuxGuitar.
-settings.config.main.window-title.var.description.filename=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0438\u043C\u0435\u0442\u043E \u043D\u0430 \u043E\u0442\u0432\u043E\u0440\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B
-settings.config.main.window-title.var.description.filepath=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u043F\u044A\u0442\u044F \u043D\u0430 \u043E\u0442\u0432\u043E\u0440\u0435\u043D\u0438\u044F \u0444\u0430\u0439\u043B
-settings.config.main.window-title.var.description.songname=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0438\u043C\u0435\u0442\u043E \u043D\u0430 \u043F\u0435\u0441\u0435\u043D\u0442\u0430
-settings.config.main.window-title.var.description.songauthor=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0430\u0432\u0442\u043E\u0440\u0430 \u043D\u0430 \u043F\u0435\u0441\u0435\u043D\u0442\u0430
-settings.config.main.window-title.var.description.songalbum=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0430\u043B\u0431\u0443\u043C\u0430 \u043D\u0430 \u043F\u0435\u0441\u0435\u043D\u0442\u0430
-settings.config.main.window-title.var.description.songartist=\u0422\u0430\u0437\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u043B\u0438\u0432\u0430 \u043F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u044F \u0438\u0437\u043F\u044A\u043B\u043D\u0438\u0442\u0435\u043B\u044F \u043D\u0430 \u043F\u0435\u0441\u0435\u043D\u0442\u0430
-settings.config.main.options=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-settings.config.main.splash-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043B\u043E\u0433\u043E \u043F\u0440\u0438 \u0441\u0442\u0430\u0440\u0442\u0438\u0440\u0430\u043D\u0435
-settings.config.main.table.auto-size.enabled=\u0412\u043A\u043B\u044E\u0447\u0432\u0430\u043D\u0435 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u043D\u043E \u043E\u0440\u0430\u0437\u043C\u0435\u0440\u044F\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u0431\u043B\u0438\u0446\u0430
-settings.config.styles.color.lines=\u0426\u0432\u044F\u0442 \u043D\u0430 \u0445\u043E\u0440\u0438\u0437\u043E\u043D\u0442\u0430\u043B\u043D\u0438 \u043B\u0438\u043D\u0438\u0438
-settings.config.toolbars=\u041B\u0435\u043D\u0442\u0438 \u0441 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438
-settings.config.toolbars.tip=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u043D\u0430 \u043B\u0435\u043D\u0442\u0438\u0442\u0435 \u0441 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438
-settings.config.toolbars.list=\u041D\u0430\u043B\u0438\u0447\u043D\u0438 \u043B\u0435\u043D\u0442\u0438 \u0441 \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438
-settings.config.toolbars.move-up=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430\u0433\u043E\u0440\u0435
-settings.config.toolbars.move-down=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430\u0434\u043E\u043B\u0443
-settings.config.skin=\u041E\u0431\u043B\u0438\u043A
-settings.config.skin.choose=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u043E\u0431\u043B\u0438\u043A
-settings.keybindings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u0432\u0430\u043D\u0435 \u043D\u0430 \u043A\u043B\u0430\u0432\u0438\u0448\u043D\u0438\u0442\u0435 \u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u0438...
-
-key-bindings-editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u043A\u043B\u0430\u0432\u0438\u0448\u043D\u0438 \u043A\u043E\u043C\u0431\u0438\u043D\u0430\u0446\u0438\u0438
-key-bindings-editor-action-select=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435
-key-bindings-editor-action-column=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044F
-key-bindings-editor-shortcut-column=\u041A\u043B\u0430\u0432\u0438\u0448\u0438
-key-bindings-editor-push-a-key=\u041D\u0430\u0442\u0438\u0441\u043D\u0435\u0442\u0435 \u043A\u043B\u0430\u0432\u0438\u0448
-key-bindings-editor-save-question=\u0418\u043C\u0430 \u043D\u0435\u0437\u0430\u043F\u0430\u0437\u0435\u043D\u0438 \u043F\u0440\u043E\u043C\u0435\u043D\u0438, \u0436\u0435\u043B\u0430\u0435\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0438\u0437\u043B\u0435\u0437\u0435\u0442\u0435 \u0431\u0435\u0437 \u0434\u0430 \u0433\u0438 \u0437\u0430\u043F\u0430\u0437\u0438\u0442\u0435?
-
-key-bindings-editor-override=\u0411\u044A\u0440\u0437\u0438\u044F\u0442 \u043A\u043B\u0430\u0432\u0438\u0448 \u0432\u0435\u0447\u0435 \u0441\u0435 \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430! \u0421\u0438\u0433\u0443\u0440\u043D\u0438 \u043B\u0438 \u0441\u0442\u0435, \u0447\u0435 \u0436\u0435\u043B\u0430\u0435\u0442\u0435 \u0434\u0430 \u0433\u043E \u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u0442\u0435?
-
-print.print=\u041F\u0435\u0447\u0430\u0442
-print.dialog=\u041F\u0435\u0447\u0430\u0442
-print.service=\u0423\u0441\u043B\u0443\u0433\u0430
-print.service.name=\u0418\u043C\u0435
-print.service.status=\u0421\u044A\u0441\u0442\u043E\u044F\u043D\u0438\u0435
-print.service.type=\u0422\u0438\u043F
-print.service.info=\u0418\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F
-print.range=\u041E\u0431\u0445\u0432\u0430\u0442
-print.range.all-pages=\u0412\u0441\u0438\u0447\u043A\u043E
-print.range.pages=\u0421\u0442\u0440\u0430\u043D\u0438\u0446\u0438
-print.range.pages-to=\u0414\u043E
-print.copies=\u041A\u043E\u043F\u0438\u044F
-print.copies-number=\u0411\u0440\u043E\u0439 \u043A\u043E\u043F\u0438\u044F
-print.print-to-file=\u041F\u0435\u0447\u0430\u0442 \u043A\u044A\u043C \u0444\u0430\u0439\u043B
-print.file-chooser=\u0418\u0437\u0431\u043E\u0440
-print-header.default-song-name=\u041D\u0435\u043E\u0437\u0430\u0433\u043B\u0430\u0432\u0435\u043D\u043E
-print-header.default-song-author=\u0410\u043D\u043E\u043D\u0438\u043C\u043D\u043E
-
-print.preview=\u041F\u0440\u0435\u0433\u043B\u0435\u0434 \u0437\u0430 \u043F\u0435\u0447\u0430\u0442
-print.preview.page-of=Of
-
-marker=\u041C\u0430\u0440\u043A\u0435\u0440
-marker.add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u043C\u0430\u0440\u043A\u0435\u0440
-marker.list=\u0421\u043F\u0438\u0441\u044A\u043A \u0441 \u043C\u0430\u0440\u043A\u0435\u0440\u0438
-marker.first=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u044A\u0440\u0432\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-marker.last=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-marker.next=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0449\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-marker.previous=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u0440\u0435\u0434\u0438\u0448\u043D\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-
-export.tablature-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u0431\u043B\u0430\u0442\u0443\u0440\u0430
-export.score-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0430
-export.chord-name-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0438\u043C\u0435\u043D\u0430 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434\u0438
-export.chord-diagram-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u0438 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434\u0438
-export.black-and-white=\u0427\u0435\u0440\u043D\u043E-\u0431\u044F\u043B \u0440\u0435\u0436\u0438\u043C
-
-scale=\u0413\u0430\u043C\u0430
-scale.list=\u0421\u043F\u0438\u0441\u044A\u043A \u0441 \u043C\u0430\u0440\u043A\u0435\u0440\u0438
-
-text.insert=\u0412\u043C\u044A\u043A\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0435\u043A\u0441\u0442
-text.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u043D\u0430 \u0442\u0435\u043A\u0441\u0442
-text.text=\u0422\u0435\u043A\u0441\u0442
-
-tools=\u0418\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0438
-tools.scale=\u0421\u043F\u0438\u0441\u044A\u043A \u0441 \u043C\u0430\u0440\u043A\u0435\u0440\u0438
-tools.browser=\u0411\u0440\u0430\u0443\u0437\u044A\u0440
-tools.plugins=\u041F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0438
-tools.shortcuts=\u041F\u0440\u0435\u043F\u0440\u0430\u0442\u043A\u0438
-tools.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-
-tools.transpose=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435
-tools.transpose.semitones=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u043B\u0443\u0442\u043E\u043D\u043E\u0432\u0435
-tools.transpose.apply-to-track=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0432\u0441\u0438\u0447\u043A\u0438 \u0442\u0430\u043A\u0442\u043E\u0432\u0435
-tools.transpose.apply-to-measure=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u0441\u0430\u043C\u043E \u043D\u0430 \u0442\u043E\u0437\u0438 \u0442\u0430\u043A\u0442
-tools.transpose.apply-to-all-tracks=\u041F\u0440\u0438\u043B\u0430\u0433\u0430\u043D\u0435 \u043A\u044A\u043C \u0432\u0441\u0438\u0447\u043A\u0438 \u043F\u0438\u0441\u0442\u0438
-tools.transpose.try-keep-strings=\u041F\u0440\u0438 \u0432\u044A\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442 \u043D\u043E\u0442\u0438\u0442\u0435 \u0434\u0430 \u0441\u0435 \u0437\u0430\u043F\u0430\u0437\u0432\u0430\u0442 \u043D\u0430 \u0441\u044A\u0449\u0430\u0442\u0430 \u0441\u0442\u0440\u0443\u043D\u0430
-tools.transpose.apply-to-chords=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434\u0438
-
-browser.dialog=\u0411\u0440\u0430\u0443\u0437\u044A\u0440
-browser.menu.file=\u0424\u0430\u0439\u043B
-browser.open=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435
-browser.exit=\u0418\u0437\u0445\u043E\u0434
-browser.menu.collection=\u041A\u043E\u043B\u0435\u043A\u0446\u0438\u044F
-browser.menu.go=\u041E\u0442\u0438\u0432\u0430\u043D\u0435
-browser.collection.select=\u0418\u0437\u0431\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043A\u043E\u043B\u0435\u043A\u0446\u0438\u044F
-browser.collection.open=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435
-browser.collection.remove=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435
-browser.collection.close=\u0417\u0430\u0442\u0432\u0430\u0440\u044F\u043D\u0435
-browser.collection.new=\u041D\u043E\u0432
-browser.go-root=\u0414\u043E\u043C\u0430\u0448\u043D\u0430 \u043F\u0430\u043F\u043A\u0430
-browser.go-back=\u041D\u0430\u0437\u0430\u0434
-browser.refresh=\u041E\u0431\u043D\u043E\u0432\u044F\u0432\u0430\u043D\u0435
-browser.factory.fs.name=\u0424\u0430\u0439\u043B\u043E\u0432\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430
-browser.collection.fs.name=\u0418\u043C\u0435
-browser.collection.fs.path=\u041F\u0430\u043F\u043A\u0430
-browser.collection.fs.editor-title=File System Collection
-browser.collection.fs.editor-tip=\u0418\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u043F\u0430\u043F\u043A\u0430 \u0441 \u0432\u0430\u0448\u0430\u0442\u0430 \u043A\u043E\u043B\u0435\u043A\u0446\u0438\u044F
-browser.collection.fs.invalid-path=\u041C\u043E\u043B\u044F \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u0432\u0430\u043B\u0438\u0434\u043D\u0430 \u043F\u0430\u043F\u043A\u0430
-
-midi.port=MIDI \u043F\u043E\u0440\u0442
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=\u041D\u0435 \u0435 \u043D\u0430\u043B\u0438\u0447\u0435\u043D.
-plugin.column.name=\u0418\u043C\u0435 \u043D\u0430 \u043F\u0440\u0438\u0441\u0442\u0430\u0432\u043A\u0430\u0442\u0430
-plugin.column.enabled=\u0412\u043A\u043B\u044E\u0447\u0435\u043D\u043E
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0444\u0430\u0439\u043B
-edit.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u043D\u0435
-property.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u043E
-track.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-duration.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-beat.items=Beat Items
-composition.items=Composition Items
-repeat.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435
-transport.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u043F\u043B\u0435\u044A\u0440
-marker.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u043C\u0430\u0440\u043A\u0435\u0440
-insert.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0432\u043C\u044A\u043A\u0432\u0430\u043D\u0435
-layout.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u043F\u043E\u0434\u0440\u0435\u0434\u0431\u0430
-view.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0438\u0437\u0433\u043B\u0435\u0434
-effect.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0435\u0444\u0435\u043A\u0442
-dynamic.items=\u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438 \u043D\u0430 \u0434\u0438\u043D\u0430\u043C\u0438\u043A\u0430
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=\u041D\u043E\u0432 \u0444\u0430\u0439\u043B
-action.file.open=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u0444\u0430\u0439\u043B
-action.file.open-url=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u0430\u0434\u0440\u0435\u0441
-action.file.save=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435
-action.file.save-as=\u0417\u0430\u043F\u0430\u0437\u0432\u0430\u043D\u0435 \u043A\u0430\u0442\u043E
-action.file.print=\u041F\u0435\u0447\u0430\u0442
-action.file.print-preview=\u041F\u0440\u0435\u0433\u043B\u0435\u0434 \u0437\u0430 \u043F\u0435\u0447\u0430\u0442
-action.file.exit=\u0418\u0437\u0445\u043E\u0434 \u043E\u0442 TuxGuitar
-action.edit.undo=\u041E\u0442\u043C\u044F\u043D\u0430
-action.edit.redo=\u041F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435
-action.edit.voice-1=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u0433\u043B\u0430\u0441 1
-action.edit.voice-2=\u0418\u0437\u0431\u043E\u0440 \u043D\u0430 \u0433\u043B\u0430\u0441 2
-action.composition.change-time-signature=Change Time Signature
-action.composition.change-tempo=\u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u0442\u0435\u043C\u043F\u043E\u0442\u043E
-action.composition.change-info=\u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u0437\u0430 \u043F\u0435\u0441\u0435\u043D\u0442\u0430
-action.composition.change-clef=\u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u043D\u0430 \u043A\u043B\u044E\u0447
-action.composition.change-key-signature=Change Key Signature
-action.composition.change-triplet-feel=Change Triplet Feel
-action.view.layout-set-page=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043F\u043E\u0434\u0440\u0435\u0434\u0431\u0430 \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0430
-action.view.layout-set-linear=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043B\u0438\u043D\u0435\u0439\u043D\u0430 \u043F\u043E\u0434\u0440\u0435\u0434\u0431\u0430
-action.view.layout-set-multitrack=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043C\u043D\u043E\u0433\u043E\u043F\u0438\u0441\u0442\u043E\u0432 \u0440\u0435\u0436\u0438\u043C
-action.view.layout-set-score-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0430
-action.view.layout-set-tablature-enabled=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u0431\u043B\u0430\u0442\u0443\u0440\u0430
-action.view.layout-set-compact=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043A\u043E\u043C\u043F\u0430\u043A\u0442\u0435\u043D \u0440\u0435\u0436\u0438\u043C
-action.view.layout-set-chord-diagram-enabled=\u0412\u043A\u043B\u044E\u0447\u0432\u0430\u043D\u0435 \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u0430 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-action.view.layout-set-chord-name-enabled=\u0412\u043A\u043B\u044E\u0447\u0432\u0430\u043D\u0435 \u0438\u043C\u0435 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-action.view.show-fretboard=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0433\u0440\u0438\u0444
-action.view.show-piano=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0438\u0430\u043D\u043E
-action.view.show-matrix=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043C\u0430\u0442\u0440\u0438\u0446\u0430
-action.view.show-mixer=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u043C\u0435\u0441\u0438\u0442\u0435\u043B
-action.view.show-transport=\u041F\u043E\u043A\u0430\u0437\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043B\u0435\u044A\u0440
-action.track.add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.remove=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.clone=\u041A\u043B\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.go-first=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u044A\u0440\u0432\u0430\u0442\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.go-last=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0430\u0442\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.go-next=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0449\u0430\u0442\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.go-previous=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u0440\u0435\u0434\u0438\u0448\u043D\u0430\u0442\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.lyrics=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u0430\u043D\u0435 \u0441\u0442\u0438\u0445\u043E\u0432\u0435\u0442\u0435 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.properties=\u041F\u0440\u043E\u043C\u044F\u043D\u0430 \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430\u0442\u0430 \u043D\u0430 \u043F\u0438\u0441\u0442\u0430
-action.track.move-down=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043F\u0438\u0441\u0442\u0430\u0442\u0430 \u043D\u0430\u0434\u043E\u043B\u0443
-action.track.move-up=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043F\u0438\u0441\u0442\u0430\u0442\u0430 \u043D\u0430\u0433\u043E\u0440\u0435
-action.measure.add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-action.measure.remove=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-action.measure.copy=\u041A\u043E\u043F\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-action.measure.paste=\u041F\u043E\u0441\u0442\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-action.measure.clean=\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0430\u043A\u0442
-action.measure.go-first=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u044A\u0440\u0432\u0438\u044F \u0442\u0430\u043A\u0442
-action.measure.go-last=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u043E\u0441\u043B\u0435\u0434\u043D\u0438\u044F \u0442\u0430\u043A\u0442
-action.measure.go-next=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0449\u0438\u044F \u0442\u0430\u043A\u0442
-action.measure.go-previous=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u0440\u0435\u0434\u0438\u0448\u0435\u043D \u0442\u0430\u043A\u0442
-action.beat.general.remove-unused-voice=\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043D\u0435\u0438\u0437\u043F\u043E\u043B\u0437\u0432\u0430\u043D \u0433\u043B\u0430\u0441
-action.beat.general.voice-up=Set Stems Up
-action.beat.general.voice-down=Set Stems Down
-action.beat.general.voice-auto=Set Auto Stems
-action.beat.general.set-stroke-up=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u0430\u0440 \u043D\u0430\u0433\u043E\u0440\u0435
-action.beat.general.set-stroke-down=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u0430\u0440 \u043D\u0430\u0434\u043E\u043B\u0443
-action.beat.general.move-left=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u0435\u0434\u0438\u043D \u0443\u0434\u0430\u0440 \u043D\u0430\u043B\u044F\u0432\u043E
-action.beat.general.move-right=\u041F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0435\u0434\u0438\u043D \u0443\u0434\u0430\u0440 \u043D\u0430\u0434\u044F\u0441\u043D\u043E
-action.beat.general.move-custom=\u041F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043B\u0441\u043A\u043E \u043F\u0440\u0435\u043C\u0435\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u0430\u0440
-action.note.general.clean-beat=\u0418\u0437\u0447\u0438\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u0430\u0440
-action.note.general.decrement-semitone=\u041D\u0430\u043C\u0430\u043B\u044F\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u043B\u0443\u0442\u043E\u043D
-action.note.general.increment-semitone=\u041D\u0430\u0440\u0430\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u043B\u0443\u0442\u043E\u043D
-action.note.general.shift-down=\u041D\u0430\u0434\u043E\u043B\u0443
-action.note.general.shift-up=\u041D\u0430\u0433\u043E\u0440\u0435
-action.note.general.tied=Add/Remove tied
-action.note.duration.set-whole=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u0446\u044F\u043B\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.set-half=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u043B\u043E\u0432\u0438\u043D\u043A\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.set-quarter=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u0447\u0435\u0442\u0432\u044A\u0440\u0442\u0438\u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.set-eighth=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u043E\u0441\u043C\u0438\u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.set-sixteenth=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u0448\u0435\u0441\u0442\u043D\u0430\u0439\u0441\u0435\u0442\u0438\u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.set-thirty-second=\u0417\u0430\u0434\u0430\u0432\u0430 \u043D\u0430 \u0442\u0440\u0438\u0434\u0435\u0441\u0435\u0442\u0432\u0442\u043E\u0440\u0438\u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.set-sixty-fourth=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430 \u0448\u0435\u0441\u0442\u0435\u0434\u0435\u0441\u0442\u0432\u0442\u043E\u0440\u0438\u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442
-action.note.duration.change-dotted=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0443\u0434\u044A\u043B\u0436\u0435\u043D\u0430 \u043D\u043E\u0442\u0430
-action.note.duration.change-double-dotted=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0434\u0432\u043E\u0439\u043D\u043E \u0443\u0434\u044A\u043B\u0436\u0435\u043D\u0430 \u043D\u043E\u0442\u0430
-action.note.duration.change-division-type=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0440\u0438\u043E\u043B\u0430
-action.note.duration.decrement-duration=\u041D\u0430\u043C\u0430\u043B\u044F\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442\u0442\u0430
-action.note.duration.increment-duration=\u041D\u0430\u0440\u0430\u0441\u0442\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u043E\u0434\u044A\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u043E\u0441\u0442\u0442\u0430
-action.note.effect.change-vibrato=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0432\u0438\u0431\u0440\u0430\u0442\u043E
-action.note.effect.change-bend=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u0440\u0442\u0430\u043C\u0435\u043D\u0442\u043E
-action.note.effect.change-slide=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0433\u043B\u0438\u0441\u0430\u043D\u0434\u043E
-action.note.effect.change-hammer=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0444\u043E\u0440\u0448\u043B\u0430\u0433
-action.note.effect.change-accentuated=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u043A\u0446\u0435\u043D\u0442\u0438\u0440\u0430\u043D\u0435
-action.note.effect.change-dead=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0433\u043B\u0443\u0445\u0430 \u043D\u043E\u0442\u0430
-action.note.effect.change-fade-in=Add/Remove fade in
-action.note.effect.change-ghost=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u0440\u0438\u0433\u043B\u0443\u0448\u0435\u043D\u0430 \u043D\u043E\u0442\u0430
-action.note.effect.change-grace=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0444\u0438\u043E\u0440\u0438\u0442\u0443\u0440\u0430
-action.note.effect.change-harmonic=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u041F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0444\u043B\u0430\u0436\u043E\u043B\u0435\u0442
-action.note.effect.change-heavy-accentuated=Add/Remove heavy accentuated
-action.note.effect.change-palm-mute=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0437\u0430\u0433\u043B\u0443\u0448\u0430\u0432\u0430\u043D\u0435 \u0441 \u0434\u043B\u0430\u043D
-action.note.effect.change-popping=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u043F\u0438\u043D\u0433
-action.note.effect.change-slapping=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043B\u044F\u0441\u043A\u0430\u043D\u0435
-action.note.effect.change-staccato=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0441\u0442\u0430\u043A\u0430\u0442\u043E
-action.note.effect.change-tapping=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u043F\u043E\u0442\u0443\u043F\u0432\u0430\u043D\u0435
-action.note.effect.change-tremolo-bar=Add/Remove tremolo bar
-action.note.effect.change-tremolo-picking=Add/Remove tremolo picking
-action.note.effect.change-trill=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435/\u043F\u0440\u0435\u043C\u0430\u0445\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0440\u0438\u043B\u0435\u0440
-action.insert.open-repeat=\u041E\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u043F\u043E\u0432\u043E\u0440\u0435\u043D\u0438\u0435
-action.insert.close-repeat=\u0417\u0430\u0442\u0432\u0430\u0440\u044F\u043D\u0435 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435
-action.insert.repeat-alternative=Repeat Alternative
-action.insert.chord=\u0412\u043C\u044A\u043A\u0432\u0430\u043D\u0435 \u043D\u0430 \u0430\u043A\u043E\u0440\u0434
-action.insert.text=\u0412\u043C\u044A\u043A\u0432\u0430\u043D\u0435 \u043D\u0430 \u0442\u0435\u043A\u0441\u0442
-action.marker.add=\u0414\u043E\u0431\u0430\u0432\u044F\u043D\u0435 \u043D\u0430 \u043C\u0430\u0440\u043A\u0435\u0440
-action.marker.go-next=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u0441\u043B\u0435\u0434\u0432\u0430\u0449\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-action.marker.go-previous=\u041E\u0442\u0438\u0432\u0430\u043D\u0435 \u0434\u043E \u043F\u0440\u0435\u0434\u0438\u0448\u043D\u0438\u044F \u043C\u0430\u0440\u043A\u0435\u0440
-action.transport.play=\u0418\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435 \u043D\u0430 \u043F\u0435\u0441\u0435\u043D\u0442\u0430
-action.transport.stop=\u0421\u043F\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u0438\u0437\u043F\u044A\u043B\u043D\u0435\u043D\u0438\u0435\u0442\u043E
-action.transport.mode=\u0420\u0435\u0436\u0438\u043C \u043D\u0430 \u043F\u043B\u0435\u044A\u0440\u0430
-action.transport.metronome=\u041C\u0435\u0442\u0440\u043E\u043D\u043E\u043C
-action.transport.set-loop-start=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043D\u0430\u0447\u0430\u043B\u043E \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435\u0442\u043E
-action.transport.set-loop-end=\u0417\u0430\u0434\u0430\u0432\u0430\u043D\u0435 \u043A\u0440\u0430\u0439 \u043D\u0430 \u043F\u043E\u0432\u0442\u043E\u0440\u0435\u043D\u0438\u0435\u0442\u043E
-action.tools.browser=\u0411\u0440\u0430\u0443\u0437\u044A\u0440
-action.tools.transpose=\u0422\u0440\u0430\u043D\u0441\u043F\u043E\u043D\u0438\u0440\u0430\u043D\u0435 \u043D\u0430 \u043D\u043E\u0442\u0438
-action.settings.configure=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
-action.help.doc=\u041F\u043E\u043C\u043E\u0449
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_ca.properties b/TuxGuitar-testing/platform-all/share/lang/messages_ca.properties
deleted file mode 100644
index 3e1a7a0b..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_ca.properties
+++ /dev/null
@@ -1,687 +0,0 @@
-ok=Acceptar
-cancel=Cancel\u00B7lar
-yes=Si
-no=No
-add=Afegeix
-remove=Esborra
-save=Desa
-exit=Surt
-close=Tanca
-color=Color
-title=T\u00EDtol
-edit=Edita
-go=V\u00E9s
-error=Error
-warning=Av\u00EDs
-plugins=Connectors
-choose=Escull
-plugins=Connectors
-options=Opcions
-defaults=Predeterminats
-clean=Neteja
-rename=Reanomena
-fret=Celleta
-position=Posici\u00F3
-info=Informaci\u00F3
-name=Nom
-author=Autor
-version=Versi\u00F3
-description=Descripci\u00F3
-configure=Configura
-
-tuxguitar.title=TuxGuitar
-
-file=Fitxer
-file.new=Nou
-file.open=Obre
-file.open-url=Obre URL
-file.open.error=No s'ha pogut obrir l'arxiu: {0}
-file.save=Desa
-file.save-as=Desa com a
-file.save.error=No s'ha pogut dexar l'arxiu: {0}
-file.save-changes-question=L'arxiu t\u00E9 canvis sense desar.\nVoleu desar els canvis?
-file.exit=Sortir
-file.export=Exportar
-file.export-midi=Exporta com a Midi
-file.export-pdf=Exporta com a PDF
-file.print=Imprimeix
-file.print-preview=Previsualitzeu la impressi\u00F3
-file.import=Importa
-file.import.error=No s'ha pogut importar: {0}
-file.import-midi=Importa Midi
-file.export-ascii=Exporta com a ASCII
-file.export.error=No s'ha pogut exportar: {0}
-file.history=Hist\u00F2ric
-file.overwrite-question=L'arxiu ja existeix, desitgeu sobreescriure'l?
-
-edit.menu=Edici\u00F3
-edit.undo=Desf\u00E9s
-edit.redo=Ref\u00E9s
-edit.copy=Copia
-edit.from=Des de
-edit.to=Fins a
-edit.all-tracks=Totes les pistes
-edit.paste=Enganxa
-edit.paste.count=Enganxa comptador
-edit.paste.replace-mode=Enganxa al comp\u00E1s actual
-edit.paste.insert-mode=Enganxa a un nou comp\u00E1s
-edit.delete=Esborra
-edit.cut=Retalla
-edit.mouse-mode-selection=Canvia el punter a mode de selecci\u00F3
-edit.mouse-mode-edition=Canvia el punter a mode d'edici\u00F3
-edit.not-natural-key=Sostingut/Bemoll
-edit.voice-1=Tria veu 1
-edit.voice-2=Tria veu 2
-
-view=Veure
-view.layout=Veure
-view.layout.page=Mode P\u00E0gina
-view.layout.linear=Mode Liniar 
-view.layout.multitrack=Multipista
-view.layout.compact=Mode compacte
-view.layout.score-enabled=Mostra la partitura
-view.layout.tablature-enabled=Mostra la tabulatura
-view.layout.chord-style=Estil d'acords
-view.layout.chord-name=Mostra el nom
-view.layout.chord-diagram=Mostra el diagrama
-view.show-transport=Mostra el reproductor
-view.show-mixer=Mostra el mesclador
-view.show-piano=Mostra el piano
-view.show-matrix=Mostra l'editor de matrius
-view.show-fretboard=Mostra el m\u00E0stil
-
-fretboard.direction=Direcci\u00F3
-fretboard.background-color=Color de fons
-fretboard.font=Font
-fretboard.fretpoint-color=Color dels marcadors de posici\u00F3
-fretboard.note-color=Color de les notes
-fretboard.scale-note-color=Color de les notes d'escala
-fretboard.string-color=Color de cordes
-fretboard.settings=Prefer\u00E8ncies
-fretboard.settings.options=Opcions
-fretboard.display-note-text=Mostra les notes en mode text
-fretboard.display-scale-text=Mostrar les notes d'escala en mode text
-fretboard.right-mode=Cap a la dreta
-fretboard.left-mode=Cap a l'esquerra
-
-piano.editor=Piano
-piano.natural-key-color=Color de les tecles blanques
-piano.not-natural-key-color=Color de les tecles negres
-piano.note-color=Color de les notes
-piano.scale-note-color=Color de les notes d'escala
-piano.settings=Prefer\u00E8ncies
-
-matrix.editor=Editor de matrius
-matrix.grids=Graelles
-matrix.font=Font
-matrix.border-color=Color del contorn
-matrix.foreground-color=Color de la font i l\u00EDnies divis\u00F2ries
-matrix.line-color-1=Color de la l\u00EDnia #1
-matrix.line-color-2=Color de la l\u00EDnia #2
-matrix.line-color-over=Color de la l\u00EDnia seleccionada
-matrix.note-color=Color de les notes
-matrix.play-note-color=Color de les notes reproduint
-matrix.position-color=Color de posici\u00F3
-matrix.settings=Prefer\u00E8ncies
-
-composition=Composici\u00F3
-composition.timesignature=Signe de comp\u00E0s
-composition.timesignature.Numerator=Numerador
-composition.timesignature.denominator=Denominador
-composition.timesignature.to-the-end=Fins a la fi
-composition.tempo=Tempo
-composition.tempo-percent=Percentatge
-composition.tempo.start-to-end=Aplica a tots els compassos
-composition.tempo.position-to-end=Aplica fins a la fi
-composition.tempo.position-to-next=Aplica fins la propera marca de temps
-composition.tempo.invalid=Temps no v\u00E0lid
-composition.properties=Propietats
-composition.name=Nom
-composition.artist=Artista
-composition.album=\00C0lbum
-composition.author=Autor
-composition.date=Data
-composition.copyright=Copyright
-composition.writer=Creador de la tabulatura
-composition.transcriber=Transcrit per en/na
-composition.comments=Comentaris
-composition.clef=Clau
-composition.clef.treble=Agut
-composition.clef.bass=Baix
-composition.clef.tenor=Tenor
-composition.clef.alto=Alt
-composition.clef.to-the-end=Aplica aquesta clau fins a la fi
-composition.keysignature=Armadura
-composition.keysignature.natural=Natural
-composition.keysignature.sharp-1=1 Diesi
-composition.keysignature.sharp-2=2 Diesis
-composition.keysignature.sharp-3=3 Diesis
-composition.keysignature.sharp-4=4 Diesis
-composition.keysignature.sharp-5=5 Diesis
-composition.keysignature.sharp-6=6 Diesis
-composition.keysignature.sharp-7=7 Diesis
-composition.keysignature.flat-1=1 Bemoll
-composition.keysignature.flat-2=2 Bemolls
-composition.keysignature.flat-3=3 Bemolls
-composition.keysignature.flat-4=4 Bemolls
-composition.keysignature.flat-5=5 Bemolls
-composition.keysignature.flat-6=6 Bemolls
-composition.keysignature.flat-7=7 Bemolls
-composition.keysignature.to-the-end=Aplica aquesta armadura fins a la fi
-composition.tripletfeel=Aspecte de tresets
-composition.tripletfeel.none=Aspecte normal
-composition.tripletfeel.eighth=Aspecte de tresets en corxeres
-composition.tripletfeel.sixteenth=Aspecte de tresets en semicorxeres
-composition.tripletfeel.to-the-end=Aplica fins a la fi
-
-help=Ajuda
-help.help=Ajuda
-help.doc=Documentaci\u00F3
-help.about=Quan a
-help.about.license=Llic\u00E8ncia
-help.about.authors=Autors
-help.about.description=Descripci\u00F3
-
-mixer=Mesclador
-instruments.volume=Guany
-
-instrument=Instrument
-instrument.volume=Volum
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=Balan\u00E7
-instrument.free=Lliure
-instrument.link=Enlla\u00E7
-
-track=Pista
-track.number=Nombre
-track.name=Nom
-track.color=Color
-track.first=Primera
-track.last=Darrera
-track.previous=Anterior
-track.next=Seg\u00FCent
-track.add=Afegeix pista
-track.remove=Esborra pista
-track.instrument=Instrument
-track.properties=Propietats
-track.properties.general=General
-track.clone=Clona pista
-track.move-up=Mou amunt
-track.move-down=Mou avall
-track.name.default-percussion-name=Percussi\u00F3
-track.lyrics=Edita les lletres
-track.solo=Solo
-track.mute=Silenci
-
-lyric.editor=Editor de lletres
-
-measure=Comp\u00E0s
-measure.first=Primer
-measure.last=Darrer
-measure.previous=Anterior
-measure.next=Seg\u00FCent
-measure.add=Afegeix comp\u00E0s
-measure.add.count=Afegeix comptador
-measure.remove=Esborra comp\u00E0s
-measure.copy=Copia comp\u00E0s
-measure.paste=Enganxa comp\u00E0s
-measure.clean=Neteja comp\u00E0s
-measure.add-before-current-position=Afegeix comp\u00E0s abans de la posici\u00F3 actual
-measure.add-after-current-position=Afegeix comp\u00E0s despr\u00E9s de la posici\u00F3 actual
-measure.add-at-end=Afegeix comp\u00E0s a la fi
-
-beat=Beat
-beat.clean=Neteja beat
-beat.voice.remove-unused=Esborra veu no usada
-beat.voice-up=Stems amunt
-beat.voice-down=Stems avall
-beat.voice-auto=Auto Stems
-beat.stroke-up=Upstroke
-beat.stroke-down=Downstroke
-beat.move-left=Mou un bit a l'esquerra
-beat.move-right=Mou un bit a la dreta
-beat.move-custom=Personalitza el moviment del beat
-beat.move-custom.dialog.title=Moviment personalitzat
-beat.move-custom.dialog.direction-tip=Mou direcci\u00F3
-beat.move-custom.dialog.move-1.tip=Moviment primari
-beat.move-custom.dialog.move-2.tip=Moviment secundari
-beat.move-custom.dialog.direction=Direcci\u00F3
-beat.move-custom.dialog.direction.right=Mou a la dreta
-beat.move-custom.dialog.direction.left=Mou a l'esquerra
-beat.move-custom.dialog.count=Compta
-beat.move-custom.dialog.duration=Durada
-beat.move-custom.dialog.duration.type=Punt/Doble punt
-beat.move-custom.dialog.duration.type.normal=Cap
-beat.move-custom.dialog.duration.division-type=Tipus de divisi\u00F3
-beat.move-custom.dialog.duration.division-type.normal=Normal (grup excedent)
-
-note=Nota
-note.tiednote=Lliga nota
-note.deadnote=Dead Note
-note.semitone-up=Apuja un semit\u00F2
-note.semitone-down=Abaixa un semit\u00F2
-note.shift-up=Apuja una corda
-note.shift-down=Abaixa una corda
-
-duration=Durada
-duration.whole=Rodona
-duration.half=Blanca
-duration.quarter=Negra
-duration.eighth=Corxera
-duration.sixteenth=Semicorxera
-duration.thirtysecond=Fusa
-duration.sixtyfourth=Semifusa
-duration.dotted=Punt
-duration.doubledotted=Doble punt
-duration.division-type=Treset
-
-effects=Efectes
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Nota morta
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Editor de Tremolo Bar
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Nota fantasma
-effects.accentuatednote=Nota accentuada
-effects.heavyaccentuatednote=Nota molt accentuada
-effects.harmonic=Harm\u00F2nic
-effects.grace=Appoggiatura
-effects.grace-editor=Editor d'appoggiatures
-effects.grace.before-beat=abans del Beat
-effects.grace.on-beat=Al Beat
-effects.grace.transition=Transici\u00F3
-effects.grace.transition-none=Cap
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Editor de Trill
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Editor de Tremolo Picking
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Editor d'harm\u00F2nics
-effects.harmonic.type-of-harmonic=Tipus d'harm\u00F2nic
-effects.harmonic.natural=Harm\u00F2nic
-effects.harmonic.artificial=Harm\u00F2nic artifical
-effects.harmonic.artificial.key-offset=Key offset
-effects.harmonic.tapped=Tapped harm\u00F2nic
-effects.harmonic.tapped.left-hand=M\u00E0 esquerra
-effects.harmonic.tapped.right-hand=M\u00E0 dreta
-effects.harmonic.pinch=Pinch harm\u00F2nic
-effects.harmonic.semi=Semi-harm\u00F2nic
-
-bend.editor=Editor de Bend
-bend.bend=Bend
-bend.bend-release=bend/release
-bend.bend-release-bend=bend/release/bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-dynamic=Dynamic
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano
-dynamic.mezzo-forte=Mezzo Forte
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo
-dynamic.forte-fortissimo=Forte Fortissimo
-
-insert.chord=Insereix acord
-
-chord.editor=Editor d'acords
-chord=Acord
-chord.name=Nom
-chord.custom=Acord personalitzat
-chord.custom.name-empty-error=El nom de l'acord \u00E9s obligatori
-chord.custom.name-exist-error=Ja existeix un acord amb aquest nom
-chord.bass=Baix
-chord.settings.tip=Prefer\u00E8ncies
-chord.settings.type=Tipus
-chord.settings.type.most-common=M\u00E9s com\u00FA
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=Close Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Acords oberts
-chord.settings.chords-to-display=Acords a mostrar
-chord.settings.search-frets=Trasts
-chord.settings.minimum-fret=M\u00EDnim
-chord.settings.maximum-fret=M\u00E0xim
-
-transport=Reproductor
-transport.start=Reprodueix
-transport.pause=Pausa
-transport.stop=Atura
-transport.first=Primer comp\u00EDs
-transport.last=Darrer comp\u00EDs
-transport.previous=Comp\u00EDs anterior
-transport.next=Seg\u00FCent comp\u00EDs
-transport.metronome=Metr\u00F2nom
-transport.mode=Mode de reproducci\u00F3
-transport.mode.simple=Mode normal
-transport.mode.simple.tempo-percent=Percentatge de temps
-transport.mode.simple.loop=Repeteix infinitament
-transport.mode.trainer=Mode d'entrenament
-transport.mode.trainer.increment-description=Incrementa percentatge
-transport.mode.loop-range=Repeteix rang
-transport.mode.loop-range.from=Reprodueix des del comp\u00E0s
-transport.mode.loop-range.from-default=Des del principi
-transport.mode.loop-range.to=Reprodueix el comp\u00E0s
-transport.mode.loop-range.to-default=Fins a la fi
-transport.set-loop-start=Defineix el punt d'inici de la repetici\u00F3
-transport.set-loop-end=Defineix el punt final de la repetici\u00F3
-
-repetitions=Repeticions
-repeat.open=Obre repetici\u00F3
-repeat.close=Tanca repetici\u00F3
-repeat.number-of-repetitions=Nombre de repeticions
-repeat.alternative=Repetici\u00F3 alternativa
-repeat.alternative.editor=Edita repetici\u00F3 alternativa
-
-
-tuning=Afinaci\u00F3
-tuning.strings=Cordes
-tuning.offset=Offset
-tuning.strings.transpose=Transpose les notes afectades
-tuning.strings.transpose.try-keep-strings=Mira de mantindre les notes a la mateixa corda
-tuning.strings.transpose.apply-to-chords=Transposar acords
-
-language=Llengua
-
-choose-color=Seleccioneu un color
-
-settings=Opcions
-settings.config=Configura TuxGuitar
-settings.config.main=General
-settings.config.main.window-title=T\u00EDtol de la finestra
-settings.config.main.window-title.help=Les seg\u00FCents variables seran reempla\u00E7ades al t\u00EDtol:
-settings.config.main.window-title.var.description.appname=Mostra el nom de l'aplicaci\u00F3: TuxGuitar.
-settings.config.main.window-title.var.description.appversion=Mostra la versi\u00F3 actual de tuxguitar.
-settings.config.main.window-title.var.description.filename=Mostra el nom de l'arxiu que sou editant.
-settings.config.main.window-title.var.description.filepath=Mostra la ruta de l'arxiu que sou editant.
-settings.config.main.window-title.var.description.songname=Mostra el nom de la can\u00E7\u00F3 actual.
-settings.config.main.window-title.var.description.songauthor=Mostra l'autor de la can\u00E7\u00F3 actual.
-settings.config.main.window-title.var.description.songalbum=Mostra l'\u00E0lbum de la can\u00E7\u00F3 actual.
-settings.config.main.window-title.var.description.songartist=Mostra l'artista de la can\u00E7\u00F3 actual.
-settings.config.main.options=Opcions
-settings.config.main.splash-enabled=Mostra l'splash a l'inici.
-settings.config.main.table.auto-size.enabled=Ajusta autom\u00E0ticament la mida de la previsualizaci\u00F3 de pistes
-settings.config.view=Vista
-settings.config.view.mode=Mode de vista
-settings.config.view.size=Ajust de la finestra
-settings.config.view.size.maximized=Maximizada
-settings.config.view.size.width=Amplada
-settings.config.view.size.height=Al\u00E7ada
-settings.config.language=Llengua
-settings.config.language.choose=Seleccioneu la vostra llengua
-settings.config.styles=Estils
-settings.config.styles.general=Estils generals
-settings.config.styles.font.default=Font per defecte
-settings.config.styles.font.note=Font de les notes
-settings.config.styles.font.time-signature=Font de signe de comp\u00E0s
-settings.config.styles.font.lyric=Font de les lletres
-settings.config.styles.font.text=Font dels texts
-settings.config.styles.color.score-note=Color de les notes de la partitura
-settings.config.styles.color.tab-note=Color de les notes de la tabulatura
-settings.config.styles.color.play-note=Color de les notes en reproducci\u00F3
-settings.config.styles.color.lines=Color de les l\u00EDnies divis\u00F2ries
-settings.config.styles.printer=Estils d'impressi\u00F3
-settings.config.styles.font.printer-default=Font per defecte
-settings.config.styles.font.printer-note=Font de les notes
-settings.config.styles.font.printer-time-signature=Font del signe de comp\u00E0s
-settings.config.apply-changes-question=Voleu aplicar ara els canvis?
-settings.config.sound=So
-settings.config.skin=Tema d'icones
-settings.config.skin.choose=Seleccioneu el vostre tema d'icones
-settings.config.toolbars=Barra d'eines
-settings.config.toolbars.tip=Personalitzeu la vostra barra d'eines
-settings.config.toolbars.list=Eines disponibles
-settings.config.toolbars.move-up=Mou amunt
-settings.config.toolbars.move-down=Mou avall
-
-settings.keybindings=Configureu tecles
-key-bindings-editor=Editor de tecles
-key-bindings-editor-action-select=Seleccioneu una acci\u00F3
-key-bindings-editor-action-column=Accions
-key-bindings-editor-shortcut-column=Tecles
-key-bindings-editor-push-a-key=Premeu una tecla
-key-bindings-editor-save-question=S'han trobat canvis sense desar; tot i aix\u00F2 voleu sortir?
-key-bindings-editor-override=Ja hi ha una acci\u00F3 per a aquestes tecles, voleu sobreescriure-la?
-
-print.print=Imprimir
-print.dialog=Imprimeix
-print.service=Servei
-print.service.name=Nom
-print.service.status=Estat
-print.service.type=Tipus
-print.service.info=Informaci\u00F3
-print.range=Rang
-print.range.all-pages=Totes les p\u00E0gines
-print.range.pages=P\u00E0gines
-print.range.pages-to=Cap a
-print.copies=C\u00F2pies
-print.copies-number=Nombre de c\u00F2pies
-print.print-to-file=Imprimeix cap a arxiu
-print.file-chooser=Examina
-print-header.default-song-name=Sense t\u00EDtol
-print-header.default-song-author=An\u00F2nim
-print.preview=Previsualitzeu la impressi\u00F3
-print.preview.page-of=De
-
-marker=Marca
-marker.add=Afegeix marca
-marker.list=Mostra marques
-marker.first=Primera
-marker.last=Darrera
-marker.next=Seg\u00FCent
-marker.previous=Anterior
-
-export.tablature-enabled=Mostra la tabulatura
-export.score-enabled=Mostra la partitura
-export.chord-name-enabled=Mostra els noms dels acords
-export.chord-diagram-enabled=Mostra els diagrames d'acords
-export.black-and-white=Mode blanc i negre
-
-scale=Escala
-scale.list=Llista d'escales
-
-text.insert=Insereix text
-text.editor=Editor de text
-text.text=Text
-
-tools=Eines
-tools.scale=Llista d'escales
-tools.browser=Explorador de can\u00E7ons
-tools.plugins=Configura Plugins
-tools.shortcuts=Dreceres del teclat
-tools.settings=Prefer\u00E8ncies
-tools.transpose=Transposar
-tools.transpose.semitones=Transposar semitons
-tools.transpose.apply-to-track=Transposar tots els compasos
-tools.transpose.apply-to-measure=Transposar nom\u00E9s aquest comp\u00E0s
-tools.transpose.apply-to-all-tracks=Aplicar-ho a totes les pistes
-tools.transpose.try-keep-strings=Mira de deixar les notes a la mateixa corda quan sigui possible
-tools.transpose.apply-to-chords=Transposa acords
-
-browser.dialog=Explorador de can\u00E7ons
-browser.menu.file=Arxiu
-browser.open=Obre
-browser.exit=Surt
-browser.menu.collection=Col\u00B7lecci\u00F3
-browser.menu.go=V\u00E9s
-browser.collection.select=Selecciona col\u00B7lecci\u00F3
-browser.collection.open=Obre col\u00B7lecci\u00F3
-browser.collection.remove=Esborra col\u00B7lecci\u00F3
-browser.collection.close=Tanca col\u00B7lecci\u00F3
-browser.collection.new=Afegeix col\u00B7lecci\u00F3
-browser.go-root=Inici
-browser.go-back=Torna
-browser.refresh=Actualitza
-browser.factory.fs.name=Sistema d'arxius local
-browser.collection.fs.name=Nom
-browser.collection.fs.path=Ubicaci\u00F3
-browser.collection.fs.editor-title=Col\u00B7lecci\u00F3 d'arxius locals
-browser.collection.fs.editor-tip=Escolliu una carpeta
-browser.collection.fs.invalid-path=La carpeta escollida no \u00E9s v\u00E0lida.
-
-midi.port=Port MIDI
-midi.sequencer=Seq\u00FCenciador MIDI
-
-plugin.unknown-value=No disponible
-plugin.column.name=Nom del Plugin
-plugin.column.enabled=Actiu
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Eines d'arxiu
-edit.items=Eines d'edici\u00F3
-property.items=Propietats de la can\u00E7\u00F3
-track.items=Eines de pistes
-duration.items=Durades
-beat.items=Eines de Beat
-composition.items=Eines de composici\u00F3
-repeat.items=Accions de repetici\u00F3
-transport.items=Accions de reproducci\u00F3
-marker.items=Accions de marques
-insert.items=Accions d'inserci\u00F3
-layout.items=Vista de modes
-view.items=Vista de components
-effect.items=Efectes
-dynamic.items=Din\u00E0mics
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nou arxiu
-action.file.open=Obre arxiu
-action.file.open-url=Obre URL
-
-action.file.save=Desa
-action.file.save-as=Desa com a
-action.file.print=Imprimeix
-action.file.print-preview=Previsualitzeu la impressi\u00F3
-action.file.exit=Tanca l'aplicaci\u00F3
-action.edit.undo=Desf\u00E9s
-action.edit.redo=Ref\u00E9s
-action.edit.voice-1=Tria veu 1
-action.edit.voice-2=Tria veu 2
-action.composition.change-time-signature=Canvia el signe de comp\u00E0s
-action.composition.change-tempo=Canvia temps
-action.composition.change-info=Canvia la informaci\u00F3 de la can\u00E7\u00F3
-action.composition.change-clef=Canvia la clau
-action.composition.change-key-signature=Canvia l'armadura
-action.composition.change-triplet-feel=Aspecte de tresets
-action.view.layout-set-page=Veure mode de p\u00E0gina
-action.view.layout-set-linear=Veure mode liniar
-action.view.layout-set-multitrack=Veure mode multipista
-action.view.layout-set-compact=Veure mode compacte
-action.view.layout-set-score-enabled=Mostra la partitura
-action.view.layout-set-tablature-enabled=Mostra la tabulatura
-action.view.layout-set-chord-diagram-enabled=Mostra el diagrama d'acords
-action.view.layout-set-chord-name-enabled=Mostra el nom dels acords
-action.view.show-fretboard=Mostra el m\u00E0stil
-action.view.show-piano=Mostra el piano
-action.view.show-matrix=Mostra l'editor de matrius
-action.view.show-mixer=Mostra el mesclador de sons
-action.view.show-transport=Mostra el reproductor
-action.track.add=Insereix pista
-action.track.remove=Esborra la pista
-action.track.clone=Clona la pista
-action.track.go-first=V\u00E9s a la primera pista
-action.track.go-last=V\u00E9s a la darrera pista
-action.track.go-next=V\u00E9s a la pista seg\u00FCent
-action.track.go-previous=V\u00E9s a l'anterior pista
-action.track.move-down=Mou avall
-action.track.move-up=Mou amunt
-action.track.lyrics=Edita les lletres
-action.track.properties=Edita les propietats de la pista
-action.measure.add=Afegeix comp\u00E0s
-action.measure.remove=Esborra el comp\u00E0s
-action.measure.copy=Copia el comp\u00E0s
-action.measure.paste=Enganxa el comp\u00E0s
-action.measure.clean=Neteja el comp\u00E0s
-action.measure.go-first=V\u00E9s al primer comp\u00E0s
-action.measure.go-last=V\u00E9s al darrer comp\u00E0s
-action.measure.go-next=V\u00E9s al comp\u00E0s seg\u00FCent
-action.measure.go-previous=V\u00E9s al comp\u00E0s anterior
-action.beat.general.remove-unused-voice=Esborra veu no usada
-action.beat.general.voice-up=Assigna stems amunt
-action.beat.general.voice-down=Assigna stems avall
-action.beat.general.voice-auto=Assigna stems autom\u00E0tics
-action.beat.general.set-stroke-up=Assigna Upstroke
-action.beat.general.set-stroke-down=Assigna Downstroke
-action.beat.general.move-left=Mou un bit a l'esquerra
-action.beat.general.move-right=Mou un bit a la dreta
-action.beat.general.move-custom=Personalitza el moviment del beat
-action.note.general.clean-beat=Neteja Beat
-action.note.general.decrement-semitone=Abaixa un semit\u00F2
-action.note.general.increment-semitone=Apuja un semit\u00F2
-action.note.general.shift-down=Abaixa una corda
-action.note.general.shift-up=Apuja una corda
-action.note.general.tied=Afegir/Treu un lligat
-action.note.duration.change-dotted=Afegeix/Treu un punt
-action.note.duration.change-double-dotted=Afegeix/Treu un doble punt
-action.note.duration.change-division-type=Afegeix/Treu un treset
-action.note.duration.set-whole=Assigna durada de rodona
-action.note.duration.set-half=Assigna durada de blanca
-action.note.duration.set-quarter=Assigna durada de negra
-action.note.duration.set-eighth=Assigna durada de corxera
-action.note.duration.set-sixteenth=Assigna durada de semicorxera
-action.note.duration.set-thirty-second=Assigna durada de fusa
-action.note.duration.set-sixty-fourth=Assigna durada de semifusa
-action.note.duration.decrement-duration=Disminueix durada
-action.note.duration.increment-duration=Augmenta durada
-action.note.effect.change-vibrato=Afegeix/Treu Vibrato
-action.note.effect.change-bend=Afegeix/Treu Bend
-action.note.effect.change-slide=Afegeix/Treu Slide
-action.note.effect.change-hammer=Afegeix/Treu Hammer
-action.note.effect.change-accentuated=Afegeix/Treu accent
-action.note.effect.change-dead=Afegeix/Treu nota morta
-action.note.effect.change-fade-in=Afegeix/Treu fade in
-action.note.effect.change-ghost=Afegeix/Treu nota fantasma
-action.note.effect.change-grace=Afegeix/Treu appoggiatura
-action.note.effect.change-harmonic=Afegeix/Treu harm\u00F2nic
-action.note.effect.change-heavy-accentuated=Afegeix/Treu nota molt accentuada
-action.note.effect.change-palm-mute=Afegeix/Treu Palm Mute
-action.note.effect.change-popping=Afegeix/Treu Popping
-action.note.effect.change-slapping=Afegeix/Treu Slapping
-action.note.effect.change-staccato=Afegeix/Treu Staccato
-action.note.effect.change-tapping=Afegeix/Treu Tapping
-action.note.effect.change-tremolo-bar=Afegeix/Treu Tremolo Bar
-action.note.effect.change-tremolo-picking=Afegeix/Treu Tremolo Picking
-action.note.effect.change-trill=Afegeix/Treu Trill
-action.insert.open-repeat=Obre repetici\u00F3
-action.insert.close-repeat=Tanca repetici\u00F3
-action.insert.chord=Insereix acord
-action.insert.text=Insereix text
-action.insert.repeat-alternative=Insereix repetici\u00F3 alternativa
-action.marker.add=Afegeix marca
-action.marker.go-next=V\u00E9s a la seg\u00FCent marca
-action.marker.go-previous=V\u00E9s a la marca anterior
-action.transport.play=Reprodueix tema
-action.transport.stop=Atura la reproducci\u00F3
-action.transport.metronome=Metr\u00F2nom
-action.transport.mode=Mode de reproducci\u00F3
-action.transport.set-loop-start=Defineix el punt d'inici de la repetici\u00F3
-action.transport.set-loop-end=Defineix el punt final de la repetici\u00F3
-action.tools.browser=Explorador de can\u00E7ons
-action.tools.transpose=Transposa notes
-action.settings.configure=Edita les prefer\u00E8ncies
-action.help.doc=Ajuda
-
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_cs.properties b/TuxGuitar-testing/platform-all/share/lang/messages_cs.properties
deleted file mode 100644
index b260e832..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_cs.properties
+++ /dev/null
@@ -1,484 +0,0 @@
-es=\u0160pan\u011blsky
-en=Anglicky
-fr=Francouzsky
-pl=Polsky
-de=N\u011bmecky
-pt=Portugalsky
-cz=\u010cesky
-
-ok=Ok
-cancel=Zru\u0161it
-yes=Ano
-no=Ne
-add=P\u0159idat
-edit=Editovat
-remove=Odebrat
-save=Ulo\u017eit
-exit=Odej\u00edt
-choose=Vybrat
-color=Barva
-title=N\u00e1zev
-go=Jdi
-warning=Varov\u00e1n\u00ed
-error=Chyba
-plugins=Pluginy
-options=Volby
-defaults=P\u016fvodn\u00ed
-clean=Smazat
-rename=P\u0159ejmenovat
-fret=Pra\u017eec
-position=Poloha
-
-tuxguitar.title=Tux-Guitar
-
-file=Soubor
-file.new=Nov\u00fd
-file.open=Otev\u0159\u00edt
-file.save=Ulo\u017eit
-file.save-as=Ulo\u017eit jako...
-file.exit=Konec
-file.export=Exportovat
-file.export-midi=Exportovat MIDI
-file.export-pdf=Exportovat PDF
-file.print=Tisk
-file.print-preview=N\u00e1hled tisku
-file.import=Importovat
-file.import-midi=Importovat MIDI
-file.export-ascii=Exportovat ASCII
-file.history=Historie
-file.overwrite-question=Tento soubor ji\u017e existuje, opravdu ho chcete p\u0159epsat??
-
-edit.menu=Editovat
-edit.undo=Zp\u011bt
-edit.redo=Vp\u0159ed
-edit.copy=Kop\u00edrovat
-edit.from=Od
-edit.to=Do
-edit.all-tracks=V\u0161echny stopy
-edit.paste=Vlo\u017eit
-edit.paste.replace-mode=Vlo\u017eit do tohoto taktu
-edit.paste.insert-mode=Vlo\u017eit do n\u00e1sleduj\u00edc\u00edho taktu
-edit.delete=Odstranit
-edit.cut=Vyjmout
-edit.mouse-mode-selection=M\u00f3d v\u00fdb\u011bru
-edit.mouse-mode-edition=M\u00f3d vkl\u00e1d\u00e1n\u00ed not
-edit.not-natural-key=M\u00f3d posuvek
-
-view=Pohled
-
-view.layout=Rozvr\u017een\u00ed
-view.layout.page=Rozvr\u017een\u00ed strany
-view.layout.linear=Line\u00e1rn\u00ed rozvr\u017een\u00ed
-view.layout.multitrack=V\u00edcestop\u00e9 rozvr\u017een\u00ed
-
-view.show-mixer=Zobrazit mix\u00e9r
-view.show-fretboard=Zobrazit hmatn\u00edk
-view.show-piano=Zobrazit klaviaturu
-fretboard.right-mode=Prav\u00fd m\u00f3d
-fretboard.left-mode=Lev\u00fd m\u00f3d
-
-composition=Skladba
-composition.timesignature=Hodnota taktu ...
-composition.timesignature.Numerator=\u010citatel
-composition.timesignature.denominator=Jmenovatel
-composition.timesignature.to-the-end=A\u017e na konec
-composition.tempo=Tempo ...
-composition.tempo-percent=Procent
-composition.properties=Mo\u017enosti ...
-composition.name=N\u00e1zev
-composition.artist=Interpret
-composition.album=Album
-composition.author=Autor
-composition.tempo.invalid=Neplatn\u00e9 tempo
-composition.tripletfeel=Triolov\u00e9 c\u00edt\u011bn\u00ed ...
-
-help=N\u00e1pov\u011bda
-help.help=N\u00e1pov\u011bda
-help.about=O aplikaci..
-
-instruments.volume=Hlasitost (gain)
-instrument.volume=Hlasitost
-instrument.channel=Kan\u00e1l
-instrument.effect-channel=EC
-instrument.balance=Vyv\u00e1\u017een\u00ed
-instrument.free=Voln\u00fd
-instrument.link=Propojit
-
-track=Stopa
-track.number=N
-track.name=Jm\u00e9no
-track.color=Barva
-track.first=Prvn\u00ed stopa
-track.last=Posledn\u00ed stopa
-track.previous=P\u0159edchoz\u00ed stopa
-track.next=N\u00e1sleduj\u00edc\u00ed stopa
-track.add=P\u0159idat stopu
-track.remove=Odebrat stopu
-track.instrument=N\u00e1stroj
-track.tunning=Lad\u011bn\u00ed
-track.instrument.empty=Zvukov\u00e1 banka nebyla nalezena ve Va\u0161em MIDI syst\u00e9mu. Zkuste znovu zkompilovat aplikaci Tuxguitar za pomoci Va\u0161\u00ed verze javy. 
-track.properties=Vlastnosti
-track.properties.general=Obecn\u00e9
-track.name.default-percussion-name=Perkuse
-track.lyrics=Text p\u00edsn\u011b
-track.solo=S\u00f3lo
-track.mute=Ztlumit
-
-tunning.offset=Offset
-lyric.editor=Editor textu p\u00edsn\u011b
-
-measure=Takt
-measure.first=Jdi na prvn\u00ed takt
-measure.last=Jdi na posledn\u00ed takt
-measure.previous=Jdi na p\u0159edchoz\u00ed takt
-measure.next=Jdi na n\u00e1slednuj\u00edc\u00ed takt
-measure.add=P\u0159idat takt
-measure.add-before-current-position=P\u0159idat takt p\u0159ed sou\u010dasnou pozici
-measure.add-after-current-position=P\u0159idat takt za sou\u010dasnou pozici
-measure.add-at-end=P\u0159idat takt na konec
-measure.remove=Odebrat takt
-measure.copy=Kop\u00edrovat takt
-measure.paste=Vlo\u017eit takt
-measure.clean=Vymazat obsah taktu
-
-duration=D\u00e9lka
-duration.whole=Cel\u00e1
-duration.half=P\u016flov\u00e1
-duration.quarter=\u010ctvr\u0165ov\u00e1
-duration.eighth=Osminov\u00e1
-duration.sixteenth=\u0160estn\u00e1ctinov\u00e1
-duration.thirtysecond=Dvaat\u0159icetinov\u00e1
-duration.sixtyfourth=\u010cty\u0159ia\u0161edes\u00e1tinov\u00e1
-duration.dotted=Nota s te\u010dkou
-duration.doubledotted=Nota se dv\u011bma te\u010dkami
-duration.division-type=n-ola
-
-dynamic=Dynamika
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Efekty
-effects.vibrato=Vibr\u00e1to
-effects.bend=Vyta\u017een\u00ed (bend)
-effects.deadnote=Zatlumen\u00e1 nota (dead note)
-effects.slide=Skluz (slide)
-effects.hammer=P\u0159\u00edraz/Odtrh
-effects.tremolo-bar=Tremolo...
-effects.tremolo-bar-editor=Tremolo Editor
-effects.tremolo-bar.dip=Pono\u0159it
-effects.tremolo-bar.dive=Potopit
-effects.tremolo-bar.release-up=Vytahnout
-effects.tremolo-bar.release-down=Zatahnout
-effects.tremolo-bar.inverted-dip=Vyno\u0159it
-effects.tremolo-bar.return=Vr\u00e1tit
-effects.ghostnote=N\u00e1znak noty
-effects.accentuatednote=Akcent
-effects.heavyaccentuatednote=Siln\u00fd akcent
-effects.harmonic=Fla\u017eolet
-effects.grace=P\u0159\u00edraz
-effects.grace-editor=Editor P\u0159\u00edrazu
-effects.grace.before-beat=P\u0159ed dobou
-effects.grace.on-beat=Na dobu
-effects.grace.transition=P\u0159echod
-effects.grace.transition-none=\u017d\u00e1dn\u00fd
-effects.grace.transition-bend=Vyta\u017een\u00ed
-effects.grace.transition-slide=Skluz
-effects.grace.transition-hammer=P\u0159\u00edklep
-effects.trill=Trylek
-effects.trill-editor=Editor Trylk\u016f
-effects.tremolo-picking=Soustavn\u00e9 tremolo
-effects.tremolo-picking-editor=Editor Soustavn\u00e9ho tremola
-effects.palm-mute=Tlumen\u00ed dlan\u00ed
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slap
-effects.popping=Trhnut\u00ed  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Editor Fla\u017eolet\u016f
-effects.harmonic.type-of-harmonic=Typ fla\u017eoletu
-effects.harmonic.natural=P\u0159irozen\u00fd fla\u017eolet
-effects.harmonic.artificial=Um\u011bl\u00fd fla\u017eolet
-effects.harmonic.artificial.key-offset=Rozd\u00edl v lad\u011bn\u00ed
-effects.harmonic.tapped=Fla\u017eolet tappingem
-effects.harmonic.tapped.left-hand=Levou rukou
-effects.harmonic.tapped.right-hand=Pravou rukou
-effects.harmonic.pinch=Pinch fla\u017eolet
-effects.harmonic.semi=Semi-fla\u017eolet
-
-bend.editor=Editor Vyta\u017een\u00ed
-bend.bend=Vyt\u00e1hnout
-bend.bend-release=Vyt\u00e1hnout/Pustit
-bend.bend-release-bend=Vyt\u00e1hnout/Pustit/Vyt\u00e1hnout
-bend.prebend=Dop\u0159edu Vyt\u00e1hnout
-bend.prebend-release=Dop\u0159edu vyt\u00e1hnout/Pustit
-
-transport=P\u0159ehr\u00e1va\u010d
-transport.start=Start
-transport.stop=Stop
-
-repeat.open=Za\u010d\u00e1tek repetice
-repeat.close=Konec repetice
-repetitions=Repetice
-repeat.number-of-repetitions=Po\u010det opakov\u00e1n\u00ed
-
-beat=Nota
-beat.clean=\u010cist\u00e1 doba
-
-note.semitone-up=O p\u016flt\u00f3n n\u00ed\u017e
-note.semitone-down=O p\u016flt\u00f3n v\u00fd\u0161
-note.shift-up=O strunu n\u00ed\u017e
-note.shift-down=O strunu v\u00fd\u0161
-note.tiednote=Ligatura
-note.deadnote=Zatlumen\u00e1 nota
-
-insert.chord=Vlo\u017eit akord
-chord.editor=Editor Akord\u016f
-chord=Akord
-chord.name=Jm\u00e9no akordu
-chord.custom.name-empty-error=Akord mus\u00ed m\u00edt jm\u00e9no!
-chord.custom.name-exist-error=Jm\u00e9no akordu ji\u017e existuje!
-
-instrument=N\u00e1stroj
-instrument.instrument=N\u00e1stroj
-instrument.percussion-track=Bic\u00ed/Perkuse
-
-tunning=Lad\u011bn\u00ed
-tunning.strings=Struny
-
-language=Jazyk
-
-choose-color=Zvolte barvu
-
-
-settings=Nastraven\u00ed
-settings.config=Nastavit TuxGuitar
-settings.config.view=Pohled
-settings.config.view.mode=M\u00f3d rozvr\u017een\u00ed
-settings.config.view.size=Velikost okna
-settings.config.view.size.maximized=Maximalizovan\u00e9
-settings.config.view.size.width=\u0160\u00ed\u0159ka
-settings.config.view.size.height=V\u00fd\u0161ka
-settings.config.language=Jazyk
-settings.config.language.choose=Zvolte V\u00e1\u0161 jazyk
-settings.config.styles=Styly
-settings.config.styles.font.default=V\u00fdchoz\u00ed font
-settings.config.styles.font.note=Notov\u00fd font
-settings.config.styles.font.time-signature=Font \u010dasov\u00e1n\u00ed taktu
-settings.config.styles.font.printer-default=Tisk\u00e1rna - v\u00fdchoz\u00ed font
-settings.config.styles.font.printer-note=Tisk\u00e1rna - notov\u00fd font
-settings.config.styles.font.printer-time-signature=Tisk\u00e1rna - font \u010dasov\u00e1n\u00ed taktu
-settings.config.styles.color.score-note=Barva not
-settings.config.styles.color.tab-note=Barva znak\u016f tabulatury
-settings.config.styles.color.play-note=Barva pr\u00e1v\u011b hran\u00e9 noty
-settings.config.apply-changes-question=P\u0159ejete si ulo\u017eit zm\u011bny?
-settings.config.sound=Zvuk
-settings.config.sound.soundbank=Zvukov\u00e1 banka
-settings.config.sound.default-soundbank=Pou\u017e\u00edt v\u00fdchoz\u00ed zvukovou banku
-settings.config.sound.custom-soundbank=Pou\u017e\u00edt vlastn\u00ed zvukovou banku
-settings.config.sound.soundbank-restart-message=Je t\u0159eba restartovat TuxGuitar aby se projevila zm\u011bna zvukov\u00e9 banky
-settings.config.main=Obecn\u00e9
-settings.config.main.window-title=Titulek okna
-settings.config.main.window-title.help=Tyto n\u00e1sleduj\u00edc\u00ed prom\u011bnn\u00e9 budou zobrazeny na titulku okna:
-settings.config.main.window-title.var.description.appname=Tato prom\u011bnn\u00e1 ozna\u010duje jm\u00e9no aplikace: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Tato prom\u011bnn\u00e1 ozna\u010duje aktu\u00e1ln\u00ed verzi aplikace TuxGuitar.
-settings.config.main.window-title.var.description.filename=Tato prom\u011bnn\u00e1 ozna\u010duje jm\u00e9no otev\u0159en\u00e9ho souboru 
-settings.config.main.window-title.var.description.filepath=Tato prom\u011bnn\u00e1 zna\u010d\u00ed cestu k pr\u00e1v\u011b otev\u0159en\u00e9mu souboru
-settings.config.main.window-title.var.description.songname=Tato prom\u011bnn\u00e1 ozna\u010duje jm\u00e9no skladby
-settings.config.main.window-title.var.description.songauthor=Tato prom\u011bnn\u00e1 ozna\u010duje autora skladby
-settings.config.main.window-title.var.description.songalbum=Tato prom\u011bnn\u00e1 ozna\u010duje album 
-settings.config.main.window-title.var.description.songartist=Tato prom\u011bnn\u00e1 ozna\u010duje interpreta skladby
-settings.config.main.options=Volby
-settings.config.main.splash-enabled=Uk\u00e1zat \u00favodn\u00ed obrazovku p\u0159i startu TuxGuitar
-settings.config.styles.color.lines=Barva notov\u00fdch \u010dar
-settings.config.toolbars=N\u00e1strojov\u00e9 li\u0161ty
-
-soundbank.error=Chyba zvukov\u00e9 banky!
-soundbank.error.unavailable=Chyba, zvukov\u00e1 banka nen\u00ed dostupn\u00e1!
-soundbank.error.custom=Selhalo otev\u0159en\u00ed vlastn\u00ed zvukov\u00e9 banky!
-
-settings.keybindings=Konfigurovat kl\u00e1vesov\u00e9 zkratky
-key-bindings-editor=Editor Kl\u00e1vesov\u00fdch zkratek
-key-bindings-editor-action-select=Zvolte akci
-key-bindings-editor-action-column=Akce
-key-bindings-editor-shortcut-column=Kl\u00e1vesy
-key-bindings-editor-push-a-key=Zm\u00e1\u010dkn\u011bte kl\u00e1vesu
-key-bindings-editor-save-question=N\u011bkter\u00e9 zm\u011bny nejsou ulo\u017eeny, opravdu chcete odej\u00edt bez ulo\u017een\u00ed zm\u011bn?
-key-bindings-editor-override=Zkratka ji\u017e pou\u017eita! Jste si jist(a), \u017ee ji chcete pou\u017e\u00edt ?
-
-
-
-print.print=Tisk
-print.dialog=Tisk
-print.service=Slu\u017eba
-print.service.name=Jm\u00e9no
-print.service.status=Status
-print.service.type=Typ
-print.service.info=Informace
-print.range=Rozsah
-print.range.all-pages=V\u0161echny
-print.range.pages=Str\u00e1nky
-print.range.pages-to=Do
-print.copies=Kopie
-print.copies-number=Po\u010det kopi\u00ed
-print.print-to-file=Tisk do souboru
-print.file-chooser=Zvolit
-print-header.default-song-name=Bez n\u00e1zvu
-print-header.default-song-author=Anonym
-print.preview=N\u00e1hled tisku
-
-
-
-
-view.layout.score-enabled=Uk\u00e1zat notaci
-view.show-transport=Uk\u00e1zat Transport
-
-composition.clef=Kl\u00ed\u010d ...
-composition.clef.treble=Houslov\u00fd
-composition.clef.bass=Basov\u00fd
-composition.clef.tenor=Tenorov\u00fd
-composition.clef.alto=Altov\u00fd
-composition.clef.to-the-end=Pou\u017e\u00edt tento kl\u00ed\u010d a\u017e do konce
-
-composition.keysignature=P\u0159edznamen\u00e1n\u00ed ...
-composition.keysignature.natural=Bez p\u0159edznamen\u00e1n\u00ed
-composition.keysignature.sharp-1=1 k\u0159\u00edzek
-composition.keysignature.sharp-2=2 k\u0159\u00ed\u017eky
-composition.keysignature.sharp-3=3 k\u0159\u00ed\u017eky
-composition.keysignature.sharp-4=4 k\u0159\u00ed\u017eky
-composition.keysignature.sharp-5=5 k\u0159\u00ed\u017ek\u016f
-composition.keysignature.sharp-6=6 k\u0159\u00ed\u017ek\u016f
-composition.keysignature.sharp-7=7 k\u0159\u00ed\u017ek\u016f
-composition.keysignature.flat-1=1 b\u00e9\u010dko
-composition.keysignature.flat-2=2 b\u00e9\u010dka
-composition.keysignature.flat-3=3 b\u00e9\u010dka
-composition.keysignature.flat-4=4 b\u00e9\u010dka
-composition.keysignature.flat-5=5 b\u00e9\u010dka
-composition.keysignature.flat-6=6 b\u00e9\u010dek
-composition.keysignature.flat-7=7 b\u00e9\u010dek
-composition.keysignature.to-the-end=Pou\u017e\u00edt toto p\u0159edznamen\u00e1n\u00ed a\u017e do konce
-
-composition.tripletfeel=Triolov\u00e9 c\u00edt\u011bn\u00ed ...
-composition.tripletfeel.none=\u017d\u00e1dn\u00e9 triolov\u00e9 c\u00edt\u011bn\u00ed
-composition.tripletfeel.eighth=Osminov\u00e9 trioly
-composition.tripletfeel.sixteenth=\u0160estn\u00e1ctinov\u00e9 trioly
-composition.tripletfeel.to-the-end=Pou\u017e\u00edt toto triolov\u00e9 c\u00edt\u011bn\u00ed a\u017e do konce
-
-track.clone=Klonovat stopu
-track.move-up=Posunout nahoru
-track.move-down=Posunout dol\u016f
-
-marker=Z\u00e1lo\u017eky
-marker.add=P\u0159idat z\u00e1lo\u017eku
-marker.list=Seznam z\u00e1lo\u017eek
-marker.first=Jdi na prvn\u00ed z\u00e1lo\u017eku
-marker.last=Jdi na posledn\u00ed z\u00e1lo\u017eku
-marker.next=Jdi na n\u00e1sleduj\u00edc\u00ed z\u00e1lo\u017eku
-marker.previous=Jdi na p\u0159edchoz\u00ed z\u00e1lo\u017eku
-
-export.tablature-enabled=Zobrazit tabulaturu
-export.score-enabled=Zobrazit notaci
-
-scale=Stupnice
-scale.list=Seznam stupnic
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Polo\u017eky Soubory
-edit.items=Polo\u017eky Editace
-property.items=Polo\u017eky Vlastnosti
-track.items=Polo\u017eky Stopa
-duration.items=Polo\u017eky D\u00e9lka
-beat.items=Polo\u017eky Noty
-composition.items=Polo\u017eky Skladba
-repeat.items=Polo\u017eky Opakovat
-transport.items=Polo\u017eky P\u0159ehr\u00e1va\u010d
-marker.items=Polo\u017eky Z\u00e1lo\u017eek
-insert.items=Polo\u017eky Vkl\u00e1d\u00e1n\u00ed
-layout.items=Polo\u017eky Rozlo\u017een\u00ed
-view.items=Polo\u017eky Vzhled
-effect.items=Polo\u017eky Efekt\u016f
-dynamic.items=Polo\u017eky Dynamika
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nov\u00fd soubor
-action.file.open=Otev\u0159\u00edt soubor
-action.file.save=Ulo\u017eit
-action.file.save-as=Ulo\u017eit jako...
-action.file.print=Tisk
-action.file.print-preview=N\u00e1hled tisku
-action.edit.undo=Zp\u011bt
-action.edit.redo=Vp\u0159ed
-action.composition.change-time-signature=Zm\u011bnit \u010dasov\u00e1n\u00ed skladby
-action.composition.change-tempo=Zm\u011bnit tempo
-action.composition.change-info=Zm\u011bnit informace o skladb\u011b
-action.composition.change-clef=Zm\u011bnit kl\u00ed\u010d
-action.composition.change-key-signature=Zm\u011bnit p\u0159edznamen\u00e1n\u00ed
-action.view.layout-set-page=Zobrazit rozvr\u017een\u00ed str\u00e1nky
-action.view.layout-set-linear=Zobrazit line\u00e1rn\u00ed rozvr\u017een\u00ed
-action.view.layout-set-multitrack=Zobrazit v\u00edcestop\u00e9 rozvr\u017een\u00ed
-action.view.layout-set-score-enabled=Zobrazit notaci
-action.view.show-fretboard=Zobrazit hmatn\u00edk
-action.view.show-piano=Zobrazit klaviaturu
-action.view.show-mixer=Zobrazit mix\u00e9r
-action.view.show-transport=Zobrazit transport
-action.track.add=P\u0159idat stopu
-action.track.remove=Odebrat stopu
-action.track.clone=Klonovat stopu
-action.track.go-first=J\u00edt na prvn\u00ed stopu
-action.track.go-last=J\u00edt na posledn\u00ed stopu
-action.track.go-next=J\u00edt na n\u00e1sleduj\u00edc\u00ed stopu
-action.track.go-previous=J\u00edt na p\u0159edchoz\u00ed stopu
-action.track.lyrics=Editovat text p\u00edsn\u011b
-action.track.properties=Zm\u011bnit vlastnosti stopy
-action.measure.add=P\u0159idat takt
-action.measure.remove=Odebrat takt
-action.measure.copy=Kop\u00edrovat takt
-action.measure.paste=Vlo\u017eit takt
-action.measure.clean=Vy\u010distit takt
-action.measure.go-first=J\u00edt na prvn\u00ed takt
-action.measure.go-last=J\u00edt na posledn\u00ed takt
-action.measure.go-next=J\u00edt na n\u00e1slednuj\u00edc\u00ed takt
-action.measure.go-previous=J\u00edt na p\u0159edchoz\u00ed takt
-action.note.general.clean-beat=\u010cist\u00e1 doba
-action.note.general.decrement-semitone=O p\u016flt\u00f3n dol\u016f
-action.note.general.increment-semitone=O p\u016flt\u00f3n nahoru
-action.note.general.shift-down=Posunout dol\u016f
-action.note.general.shift-up=Posunout nahoru
-action.note.general.tied=P\u0159idat/Odebrat v\u00e1zanou notu
-action.note.duration.change-dotted=P\u0159idat/Odebrat te\u010dku
-action.note.duration.change-double-dotted=P\u0159idat/Odebrat dvoj\u00ed te\u010dku
-action.note.duration.change-division-type=P\u0159idat/Odebrat n-olu
-action.note.effect.change-vibrato=P\u0159idat/Odebrat Vibrato
-action.note.effect.change-bend=P\u0159idat/Odebrat vyta\u017een\u00ed
-action.note.effect.change-slide=P\u0159idat/Odebrat skluz
-action.note.effect.change-hammer=P\u0159idat/Odebrat p\u0159\u00edraz/odtrh
-action.note.effect.change-accentuated=P\u0159idat/Odebrat akcent
-action.note.effect.change-dead=P\u0159idat/Odebrat zatlumenou notu
-action.note.effect.change-fade-in=P\u0159idat/Odebrat fade in
-action.note.effect.change-ghost=P\u0159idat/Odebrat n\u00e1znak
-action.note.effect.change-grace=P\u0159idat/Odebrat p\u0159\u00edraz
-action.note.effect.change-harmonic=P\u0159idat/Odebrat fla\u017eolet
-action.note.effect.change-heavy-accentuated=P\u0159idat/Odebrat siln\u00fd akcent
-action.note.effect.change-palm-mute=P\u0159idat/Odebrat tlumen\u00ed z\u00e1p\u011bst\u00edm
-action.note.effect.change-popping=P\u0159idat/Odebrat trhnut\u00ed 
-action.note.effect.change-slapping=P\u0159idat/Odebrat slap
-action.note.effect.change-staccato=P\u0159idat/Odebrat staccato
-action.note.effect.change-tapping=P\u0159idat/Odebrat tapping
-action.note.effect.change-tremolo-bar=P\u0159idat/Odebrat tremolo
-action.note.effect.change-tremolo-picking=P\u0159idat/Odebrat soustavn\u00e9 tremolo
-action.note.effect.change-trill=P\u0159idat/Odebrat trylek
-action.insert.open-repeat=Za\u010d\u00e1tek repetice
-action.insert.close-repeat=Konec repetice
-action.insert.chord=Vlo\u017eit akord
-action.transport.play=P\u0159ehr\u00e1t skladbu
-action.transport.stop=Stop p\u0159ehr\u00e1v\u00e1n\u00ed
-
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_de.properties b/TuxGuitar-testing/platform-all/share/lang/messages_de.properties
deleted file mode 100644
index 4cc2e958..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_de.properties
+++ /dev/null
@@ -1,685 +0,0 @@
-ok=Ok
-cancel=Abbrechen
-yes=Ja
-no=Nein
-add=Hinzuf\u00FCgen
-edit=Editieren
-remove=Entfernen
-save=Speicher
-exit=Beenden
-close=Schlie\u00DFen
-choose=Ausw\u00E4hlen
-color=Farbe
-title=Titel
-go=Start
-warning=Warnung
-error=Fehler
-plugins=Plugins
-options=Optionen
-defaults=Standardwerte
-clean=L\u00F6schen
-rename=Umbenennen
-fret=Bund
-position=Position
-name=Name
-author=Autor
-version=Version
-description=Beschreibung
-info=Info
-configure=Konfigurieren
-url=URL
-
-file=Datei
-file.new=Neu
-file.open=\u00d6ffnen
-file.save=Speichern
-file.save-as=Speichern unter
-file.save-changes-question=Das Lied wurde seit dem letzten Speichern ver\u00E4ndert.\nWollen Sie die \u00c4nderungen vor dem Beenden speichern?
-file.exit=Beenden
-file.export=Exportieren
-file.export-midi=Als MIDI exportieren
-file.export-pdf=Als PDF exportieren
-file.print=Drucken
-file.print-preview=Druckvorschau
-file.import=Importieren
-file.import-midi=MIDI importieren
-file.export-ascii=Als ASCII exportieren
-file.history=Zuletzt ge\u00F6ffnete Dateien
-file.open-url=URL \u00F6ffnen
-file.open.error=Kann folgende Datei nicht \u00F6ffnen: {0}
-file.save.error=Kann folgende Datei nicht speichern: {0}
-file.import.error=Kann folgende Datei nicht importieren: {0}
-file.export.error=Kann folgende Datei nicht exportieren: {0}
-file.overwrite-question=Diese Datei existiert bereits. Soll sie \u00FCberschrieben werden?
-
-edit.menu=Editieren
-edit.undo=R\u00FCckg\u00E4ngig
-edit.redo=Wiederherstellen
-edit.copy=Kopieren
-edit.from=von
-edit.to=bis
-edit.all-tracks=Alle Spuren
-edit.paste=Einf\u00FCgen
-edit.paste.count=Anzahl
-edit.paste.replace-mode=Einf\u00FCgen im aktuellen Takt
-edit.paste.insert-mode=Einf\u00FCgen in neuen Takt
-edit.delete=L\u00F6schen
-edit.cut=Ausschneiden
-edit.mouse-mode-selection=Selektionsmodus
-edit.mouse-mode-edition=Partitureditor Modus
-edit.not-natural-key=Erh\u00F6ht/Vermindert Modus
-edit.voice-1=Stimme 1 ausw\u00E4hlen
-edit.voice-2=Stimme 2 ausw\u00E4hlen
-
-view=Ansicht
-view.layout=Layout
-view.layout.page=Seitenlayout
-view.layout.linear=Lineares Layout
-view.layout.compact=Kompakte Anzeige
-view.layout.multitrack=Mehrspuransicht
-view.layout.chord-style=Akkordanzeige
-view.layout.chord-name=Akkordname
-view.layout.chord-diagram=Akkorddiagramm
-view.layout.score-enabled=Partitur anzeigen
-view.layout.tablature-enabled=Tabulatur anzeigen
-view.show-mixer=Mixer anzeigen
-view.show-fretboard=Griffbrett anzeigen
-view.show-piano=Klaviatur anzeigen
-view.show-matrix=Matrix Editor anzeigen
-view.show-transport=Transportfenster anzeigen
-
-fretboard.direction=Direction
-fretboard.right-mode=Rechtsh\u00E4nder
-fretboard.left-mode=Linksh\u00E4nder
-fretboard.background-color=Hintergrundfarbe
-fretboard.display-note-text=Notenwerte anzeigen
-fretboard.display-scale-text=Skalenwerte anzeigen
-fretboard.font=Schriftart
-fretboard.fretpoint-color=Bundfarbe
-fretboard.note-color=Notenfarbe
-fretboard.scale-note-color=Skalenfarbe
-fretboard.settings=Griffbretteinstellungen
-fretboard.string-color=Saitenfarbe
-fretboard.settings.options=Optionen
-
-piano.editor=Klaviatur
-piano.natural-key-color=Ganztonfarbe
-piano.not-natural-key-color=Halbtonfarbe
-piano.note-color=Notenfarbe
-piano.scale-note-color=Skalenfarbe
-piano.settings=Klaviatureinstellungen
-
-matrix.editor=Matrix Editor
-matrix.grids=Taktunterteilung
-matrix.border-color=Rahmenfarbe
-matrix.font=Schriftart
-matrix.foreground-color=Vordergrundfarbe
-matrix.line-color-1=Farbe der ungeraden Reihen
-matrix.line-color-2=Farbe der geraden Reihen
-matrix.line-color-over=Farbe der Reihe unter der Maus
-matrix.note-color=Notenfarbe
-matrix.play-note-color=Fabe der abgespielten Note
-matrix.position-color=Positionsfarbe
-matrix.settings=Matrix Einstellungen
-
-composition=Komposition
-composition.timesignature=Taktart
-composition.timesignature.Numerator=Z\u00E4hler
-composition.timesignature.denominator=Nenner
-composition.timesignature.to-the-end=Diese Taktart bis zum Liedende benutzen
-composition.tempo=Tempo
-composition.tempo-percent=Prozent
-composition.tempo.invalid=Unzul\u00E4ssiges Tempo
-composition.tempo.start-to-end=Dieses Tempo im ganzen Lied benutzen
-composition.tempo.position-to-end=Dieses Tempo bis zum Liedende benutzen
-composition.tempo.position-to-next=Dieses Tempo bis zum n\u00E4chsten Tempomarker benutzen
-composition.properties=Eigenschaften
-composition.name=Name
-composition.artist=K\u00FCnstler
-composition.album=Album
-composition.author=Autor
-composition.date=Datum
-composition.copyright=Copyright
-composition.writer=Tab Ersteller
-composition.transcriber=Transkribiert von
-composition.comments=Kommentare
-composition.tripletfeel=Triolenfeeling
-composition.clef=Notenschl\u00FCssel
-composition.clef.treble=Sopran
-composition.clef.bass=Bass
-composition.clef.tenor=Tenor
-composition.clef.alto=Alt
-composition.clef.to-the-end=Diesen Notenschl\u00FCssel bis zum Liedende verwenden
-composition.keysignature=Tonartenschl\u00FCssel
-composition.keysignature.natural=Nat\u00FCrlich
-composition.keysignature.sharp-1=1 Erh\u00F6hungszeichen
-composition.keysignature.sharp-2=2 Erh\u00F6hungszeichen
-composition.keysignature.sharp-3=3 Erh\u00F6hungszeichen
-composition.keysignature.sharp-4=4 Erh\u00F6hungszeichen
-composition.keysignature.sharp-5=5 Erh\u00F6hungszeichen
-composition.keysignature.sharp-6=6 Erh\u00F6hungszeichen
-composition.keysignature.sharp-7=7 Erh\u00F6hungszeichen
-composition.keysignature.flat-1=1 Verminderungszeichen
-composition.keysignature.flat-2=2 Verminderungszeichen
-composition.keysignature.flat-3=3 Verminderungszeichen
-composition.keysignature.flat-4=4 Verminderungszeichen
-composition.keysignature.flat-5=5 Verminderungszeichen
-composition.keysignature.flat-6=6 Verminderungszeichen
-composition.keysignature.flat-7=7 Verminderungszeichen
-composition.keysignature.to-the-end=Diesen Tonartenschl\u00FCssel bis zum Liedende verwenden
-composition.tripletfeel=Triolenfeeling
-composition.tripletfeel.none=Kein Triolenfeeling
-composition.tripletfeel.eighth=8el Triolenfeeling
-composition.tripletfeel.sixteenth=16tel Triolenfeeling
-composition.tripletfeel.to-the-end=Dieses Triolenfeeling bis zum Liedende verwenden
-
-help=Hilfe
-help.help=Hilfe
-help.doc=Dokumentation
-help.about=\u00dcber Tuxguitar
-help.about.license=Lizenz
-help.about.authors=Autoren
-help.about.description=Beschreibung
-
-track=Spur
-track.number=Nr.
-track.name=Name
-track.color=Farbe
-track.first=Erste Spur
-track.last=Letzte Spur
-track.previous=Vorherige Spur
-track.next=N\u00E4chste Spur
-track.add=Spur hinzuf\u00FCgen
-track.remove=Spur entfernen
-track.clone=Spur duplizieren
-track.move-up=Aufw\u00E4rts bewegen
-track.move-down=Abw\u00E4rts bewegen
-track.instrument=Instrument 
-track.properties=Eigenschaften
-track.properties.general=Allgemeines
-track.name.default-percussion-name=Schlagzeugspur
-track.lyrics=Liedtext
-track.solo=Solo
-track.mute=Mute
-
-lyric.editor=Liedtext-Editor
-
-measure=Takt
-measure.first=Erster Takt
-measure.last=Letzter Takt
-measure.previous=Vorheriger Takt
-measure.next=N\u00E4chster Takt
-measure.add=Takt hinzuf\u00FCgen
-measure.add.count=Anzahl
-measure.add-before-current-position=Takt(e) vor aktueller Position hinzuf\u00FCgen
-measure.add-after-current-position=Takt(e) nach aktueller Position hinzuf\u00FCgen
-measure.add-at-end=Takt(e) am Ende hinzuf\u00FCgen
-measure.remove=Takt l\u00F6schen
-measure.copy=Takt kopieren
-measure.paste=Takt einf\u00FCgen
-measure.clean=Takt leeren
-
-duration=Notenl\u00E4nge
-duration.whole=Ganz
-duration.half=Halb
-duration.quarter=Viertel
-duration.eighth=Achtel
-duration.sixteenth=Sechzehntel
-duration.thirtysecond=32tel
-duration.sixtyfourth=64tel
-duration.dotted=Punktiert
-duration.doubledotted=Doppelt punktiert
-duration.division-type=Triolisch
-
-dynamic=Dynamik
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Effekte
-effects.vibrato=Vibrato
-effects.bend=Bending
-effects.deadnote=Dead Note
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Akzentuierte Note
-effects.heavyaccentuatednote=Stark akzentuierte Note
-effects.harmonic=Harmonic
-effects.grace=Vorschlagsnote
-effects.grace-editor=Vorschlageditor
-effects.grace.before-beat=Vor dem Schlag
-effects.grace.on-beat=Auf dem Schlag
-effects.grace.transition=\u00dcbergang
-effects.grace.transition-none=Keiner
-effects.grace.transition-bend=Bending
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Abged\u00E4mpft
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Nat\u00FCrlichhe Harmonie
-effects.harmonic.artificial=K\u00FCnstliche Harmonie
-effects.harmonic.artificial.key-offset=Schl\u00FCsselversatz
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Linke Hand
-effects.harmonic.tapped.right-hand=Rechte Hand
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-bend.editor=Bending Editor
-bend.bend=Bending
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Wiedergabe
-transport.start=Start
-transport.stop=Stop
-transport.pause=Pause
-transport.first=Erster Takt
-transport.last=Letzter Takt
-transport.previous=Vorheriger Takt
-transport.next=N\u00E4chster Takt
-transport.metronome=Metronom
-transport.mode=Abspielmodus
-transport.mode.simple=Normaler Modus
-transport.mode.simple.tempo-percent=Prozent des Tempos
-transport.mode.simple.loop=In Schleife abspielen
-transport.mode.trainer=\u00dcbungsmodus
-transport.mode.trainer.increment-description=Erh\u00F6hen um
-transport.mode.loop-range=Schleife
-transport.mode.loop-range.from=Abspielen ab Takt
-transport.mode.loop-range.from-default=Vom Anfang
-transport.mode.loop-range.to=Abspielen bis Takt
-transport.mode.loop-range.to-default=Bis zum Liedende
-transport.set-loop-start=Anfang der Schleife setzen
-transport.set-loop-end=Ende der Schleife setzen
-
-instruments.volume=Gain
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.volume=Volume
-instrument.balance=Balance
-instrument.chorus=Chorus
-instrument.reverb=Reverb
-instrument.phaser=Phaser
-instrument.tremolo=Tremolo
-instrument.free=Free
-instrument.link=Link
-
-
-repeat.open=Wiederholung \u00F6ffnen
-repeat.close=Wiederholung schlie\u00dfen
-repeat.alternative=Alternative Endungen
-repeat.alternative.editor=Alternative Endungen editieren
-repetitions=Wiederholungen
-repeat.number-of-repetitions=Anzahl Wiederholungen
-
-beat=Note
-beat.clean=Schlag leeren
-beat.voice.remove-unused=Ungenutzte Stimme entfernen
-beat.voice-up=Notenh\u00E4lse nach oben ausrichten
-beat.voice-down=Notenh\u00E4lse nach unten ausrichten
-beat.voice-auto=Notenh\u00E4lse automatisch ausrichten
-beat.stroke=Stroke
-beat.stroke-up=Aufschlag
-beat.stroke-down=Abschlag
-beat.move-left=Um einen Schlag nach links verschieben
-beat.move-right=Um einen Schlag nach rechts verschieben
-beat.move-custom=Benutzerdefiniert verschieben
-beat.move-custom.dialog.title=Note verschieben
-beat.move-custom.dialog.direction-tip=Richtung
-beat.move-custom.dialog.move-1.tip=Hauptverschiebung
-beat.move-custom.dialog.move-2.tip=Feinverschiebung
-beat.move-custom.dialog.direction=Richtung
-beat.move-custom.dialog.direction.right=Nach rechts verschieben
-beat.move-custom.dialog.direction.left=Nach links verschieben
-beat.move-custom.dialog.count=Anzahl
-beat.move-custom.dialog.duration=Notenwert
-beat.move-custom.dialog.duration.type=Punktiert/Doppelt punktiert
-beat.move-custom.dialog.duration.type.normal=Nicht punktiert
-beat.move-custom.dialog.duration.division-type=Aufteilung
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tuplet)
-
-note=Note
-note.semitone-up=Halbton erh\u00F6hen
-note.semitone-down=Halbton vermindern
-note.shift-up=Saite nach oben
-note.shift-down=Saite nach unten
-note.tiednote=Gebundene Note
-note.deadnote=Dead Note
-
-insert.chord=Akkord einf\u00FCgen
-chord.editor=Akkordeditor
-chord=Akkord
-chord.name=Name
-chord.bass=Bass
-chord.custom=Benutzerdefinierter Akkord
-chord.custom.name-empty-error=Der Akkordname darf nicht leer sein.
-chord.custom.name-exist-error=Der Akkordname existiert bereits.
-chord.settings.tip=Benutzerdefinierte Einstellungen
-chord.settings.type=Typ
-chord.settings.type.most-common=Am h\u00E4ufigsten vorkommende
-chord.settings.type.inversions=Umkehrungen
-chord.settings.type.close-voiced=Geschlossenes Voicing
-chord.settings.type.open-voiced=Offenes Voicing
-chord.settings.open-chords=Offene Akkorde
-chord.settings.chords-to-display=Anzuzeigende Akkorde
-chord.settings.search-frets=Bundsuche
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=Schlagzeugspur
-
-tuning=Stimmung
-tuning.offset=Offset
-tuning.strings=Saiten
-tuning.strings.transpose=Betroffene Noten transponieren.
-tuning.strings.transpose.try-keep-strings=Versuche Noten auf der gleichen Saite zu lassen
-tuning.strings.transpose.apply-to-chords=Akkorde transponieren
-
-language=Sprache
-
-choose-color=Farbe w\u00E4hlen
-
-settings=Einstellungen
-settings.config=TuxGuitar konfigurieren
-settings.config.language=Sprache
-settings.config.language.choose=Bitte eine Sprache ausw\u00E4hlen:
-settings.config.styles=Styles
-settings.config.styles.general=General Styles
-settings.config.styles.printer=Printer Styles
-settings.config.styles.font.default=Standardschriftart
-settings.config.styles.font.note=Notenschriftart
-settings.config.styles.font.lyric=Schriftart des Liedtextes
-settings.config.styles.font.text=Textschriftart
-settings.config.styles.font.time-signature=Schriftart der Taktart
-settings.config.styles.font.printer-default=Drucker Standardschriftart
-settings.config.styles.font.printer-note=Drucker Notenschriftart
-settings.config.styles.font.printer-time-signature=Drucker Schriftart der Taktart
-settings.config.styles.color.score-note=Partiturfarbe
-settings.config.styles.color.tab-note=Tabulaturfarbe
-settings.config.styles.color.play-note=Farbe der aktuellen Note
-settings.config.apply-changes-question=Sollen die \u00C4nderungen jetzt angewendet werden?
-settings.config.sound=Sound
-settings.config.main=Allgemein
-settings.config.main.window-title=Fenstertitel
-settings.config.main.window-title.help=Die folgenden Variablen werden im Fenstertitel ersetzt:
-settings.config.main.window-title.var.description.appname=Diese Variable repr\u00E4sentiert den Programmnamen: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Diese Variable repr\u00E4sentiert die Versionsnummer
-settings.config.main.window-title.var.description.filename=Diese Variable repr\u00E4sentiert den Namen der ge\u00F6ffneten Datei
-settings.config.main.window-title.var.description.filepath=Diese Variable repr\u00E4sentiert den Pfad zur ge\u00F6ffneten Datei
-settings.config.main.window-title.var.description.songname=Diese Variable repr\u00E4sentiert den Liednamen
-settings.config.main.window-title.var.description.songauthor=Diese Variable repr\u00E4sentiert den Autor des Liedes
-settings.config.main.window-title.var.description.songalbum=Diese Variable repr\u00E4sentiert das Album des Liedes
-settings.config.main.window-title.var.description.songartist=Diese Variable repr\u00E4sentiert den Interpreten des Liedes
-settings.config.main.options=Optionen
-settings.config.main.splash-enabled=Er\u00F6ffnungsbildschirm beim Start anzeigen
-settings.config.main.table.auto-size.enabled=Enable Automatic Table resizing
-settings.config.styles.color.lines=Horizontallinienfarbe
-settings.config.toolbars=Werkzeugleisten
-settings.config.toolbars.tip=Ihre Werkzeugleisten anpassen
-settings.config.toolbars.list=Verf\u00FCgbare Werkzeugleisten
-settings.config.toolbars.move-up=Nach oben verschieben
-settings.config.toolbars.move-down=Nach unten verschieben
-settings.config.skin=Themen
-settings.config.skin.choose=W\u00E4hlen Sie Ihr Thema
-settings.keybindings=Tastenkombinationen konfigurieren
-
-key-bindings-editor=Tastaturbelegung
-key-bindings-editor-action-select=Aktion ausw\u00E4hlen:
-key-bindings-editor-action-column=Aktionen
-key-bindings-editor-shortcut-column=Tasten
-key-bindings-editor-push-a-key=Taste dr\u00FCcken
-key-bindings-editor-save-question=Es gibt ungesicherte \u00C4nderungen, sollen diese verworfen werden?
-key-bindings-editor-override=Diese Tastenkombination ist bereits belegt. Trotzdem benutzen?
-
-print.print=Drucken
-print.dialog=Drucken
-print.service=Service
-print.service.name=Name
-print.service.status=Status
-print.service.type=Typ
-print.service.info=Info
-print.range=Bereich
-print.range.all-pages=Alle
-print.range.pages=Seiten
-print.range.pages-to=Bis
-print.copies=Ausdrucke
-print.copies-number=Anzahl der Ausdrucke
-print.print-to-file=In Datei drucken
-print.file-chooser=Ausw\u00E4hlen
-print-header.default-song-name=Unbenannt
-print-header.default-song-author=Anonym
-
-print.preview=Druckvorschau
-print.preview.page-of=von
-
-marker=Markierung
-marker.add=Markierung hinzuf\u00FCgen
-marker.list=Markierungen auflisten
-marker.first=Gehe zur ersten Markierung
-marker.last=Gehe zur letzten Markierung
-marker.next=Gehe zur n\u00E4chsten Markierung
-marker.previous=Gehe zur vorherigen Markierung
-
-export.tablature-enabled=Tabulatur anzeigen
-export.score-enabled=Partitur anzeigen
-export.chord-name-enabled=Akkordnamen anzeigen
-export.chord-diagram-enabled=Akkorddiagramme anzeigen
-export.black-and-white=Schwarzwei\u00dfmodus
-
-scale=Skalen
-scale.list=Skalenliste
-
-text.insert=Text einf\u00FCgen
-text.editor=Texteditor
-text.text=Text
-
-tools=Tools
-tools.scale=Skalenliste
-tools.browser=Dateisammlungs-Browser
-tools.plugins=Plugins
-tools.shortcuts=Tastenkombinationen
-tools.settings=Einstellungen
-
-tools.transpose=Transponieren
-tools.transpose.semitones=Transponieren um Halbt\u00F6ne
-tools.transpose.apply-to-track=Alle Takte transponieren
-tools.transpose.apply-to-measure=Nur diesen Takt transponieren
-tools.transpose.apply-to-all-tracks=Alle Spuren transponieren
-tools.transpose.try-keep-strings=Versuche Noten auf der gleichen Saite zu lassen (wenn m\u00F6glich)
-tools.transpose.apply-to-chords=Akkorde transponieren
-
-browser.dialog=Dateisammlungs-Browser
-browser.menu.file=Datei
-browser.open=\u00d6ffnen
-browser.exit=Beenden
-browser.menu.collection=Sammlung
-browser.menu.go=Gehe nach
-browser.collection.select=Sammlung ausw\u00E4hlen
-browser.collection.open=\u00d6ffnen
-browser.collection.remove=Entfernen
-browser.collection.close=Schlie\u00dfen
-browser.collection.new=Neu
-browser.go-root=Home
-browser.go-back=Zur\u00FCck
-browser.refresh=Aktualisieren
-browser.factory.fs.name=Dateisystem
-browser.collection.fs.name=Name
-browser.collection.fs.path=Ordner
-browser.collection.fs.editor-title=Sammlung im Dateisystem
-browser.collection.fs.editor-tip=W\u00E4hlen Sie den Ordner Ihrer Dateisammlung
-browser.collection.fs.invalid-path=Bitte w\u00E4hlen Sie einen g\u00FCltigen Ordner aus
-
-midi.port=MIDI Port
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=Nicht verf\u00FCgbar.
-plugin.column.name=Plugin Name
-plugin.column.enabled=Aktiviert
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Dateiwerkzeuge
-edit.items=\u00C4nderungswerkzeuge
-property.items=Eigenschaftswerkzeuge
-track.items=Spurwerkzeuge
-duration.items=L\u00E4ngenwerkzeuge
-beat.items=Notenwerkzeuge
-composition.items=Kompositionswerkzeuge
-repeat.items=Wiederholungswerkzeuge
-transport.items=Kontrollwerkzeuge
-marker.items=Markierungswerkzeuge
-insert.items=Einf\u00FCgungswerkzeuge
-layout.items=Layoutwerkzeuge
-view.items=Anzeigewerkzeuge
-effect.items=Effektwerkzeuge
-dynamic.items=Dynamikwerkzeuge
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Neue Datei
-action.file.open=Datei \u00F6ffnen
-action.file.open-url=URL \u00F6ffnen
-action.file.save=Speichern
-action.file.save-as=Speichern unter
-action.file.print=Drucken
-action.file.print-preview=Druckvorschau
-action.file.exit=TuxGuitar beenden
-action.edit.undo=R\u00FCckg\u00E4ngig
-action.edit.redo=Wiederherstellen
-action.edit.voice-1=Stimme 1 ausw\u00E4hlen
-action.edit.voice-2=Stimme 2 ausw\u00E4hlen
-action.composition.change-time-signature=Taktart \u00E4ndern
-action.composition.change-tempo=Tempo \u00E4ndern
-action.composition.change-info=Liedinformationen \u00E4ndern
-action.composition.change-clef=Notenschl\u00FCssel \u00E4ndern
-action.composition.change-key-signature=Change Key Signature
-action.composition.change-triplet-feel=Triolenfeeling \u00E4ndern
-action.view.layout-set-page=Zeige Seitenlayout
-action.view.layout-set-linear=Zeige lineares Layout
-action.view.layout-set-multitrack=Zeige Mehrspuransicht
-action.view.layout-set-score-enabled=Zeige Partitur
-action.view.layout-set-tablature-enabled=Zeige Tabulatur
-action.view.layout-set-compact=Zeige den kompakten Modus
-action.view.layout-set-chord-diagram-enabled=Akkorddiagramm aktivieren
-action.view.layout-set-chord-name-enabled=Akkordname aktivieren
-action.view.show-fretboard=Griffbret anzeigen
-action.view.show-piano=Klaviatur anzeigen
-action.view.show-matrix=Matrix Editor anzeigen
-action.view.show-mixer=Mixer anzeigen
-action.view.show-transport=Transportfenster anzeigen
-action.track.add=Spur hinzuf\u00FCgen
-action.track.remove=Spur entfernen
-action.track.clone=Spur duplizieren
-action.track.go-first=Zur ersten Spur gehen
-action.track.go-last=Zur letzten Spur gehen
-action.track.go-next=Zur n\u00E4chsten Spur gehen
-action.track.go-previous=Zur vorherigen Spur gehen
-action.track.lyrics=Liedtext der Spur editieren
-action.track.properties=Spureigenschaften \u00E4ndern
-action.track.move-down=Spur nach unten verschieben
-action.track.move-up=Spur nach oben verschieben
-action.measure.add=Takt hinzuf\u00FCgen
-action.measure.remove=Takt entfernen
-action.measure.copy=Takt kopieren
-action.measure.paste=Takt einf\u00FCgen
-action.measure.clean=Takt leeren
-action.measure.go-first=Zum ersten Takt springen
-action.measure.go-last=Zum letzten Takt springen
-action.measure.go-next=Zum n\u00E4chsten Takt springen
-action.measure.go-previous=Zum vorherigen Takt springen
-action.beat.general.remove-unused-voice=Ungenutzte Stimme entfernen
-action.beat.general.voice-up=Notenh\u00E4lse nach oben ausrichten
-action.beat.general.voice-down=Notenh\u00E4lse nach unten ausrichten
-action.beat.general.voice-auto=Notenh\u00E4lse automatisch ausrichten
-action.beat.general.set-stroke-up=Set Upstroke
-action.beat.general.set-stroke-down=Set Downstroke
-action.beat.general.move-left=Um einen Schlag nach links verschieben
-action.beat.general.move-right=Um einen Schlag nach links verschieben
-action.beat.general.move-custom=Benutzerdefiniert verschieben
-action.note.general.clean-beat=Schlag leeren
-action.note.general.decrement-semitone=Um Halbton vermindern
-action.note.general.increment-semitone=Um Halbton erh\u00F6hen
-action.note.general.shift-down=Um eine Saiten nach unten verschieben
-action.note.general.shift-up=Um eine Saiten nach oben verschieben
-action.note.general.tied=Gebundene Note
-action.note.duration.set-whole=Ganze Note
-action.note.duration.set-half=Halbe Note
-action.note.duration.set-quarter=Viertelnote
-action.note.duration.set-eighth=Achtelnote
-action.note.duration.set-sixteenth=Sechzehntelnote
-action.note.duration.set-thirty-second=32tel Note
-action.note.duration.set-sixty-fourth=64tel Note
-action.note.duration.change-dotted=Punktiert
-action.note.duration.change-double-dotted=Doppelt punktiert
-action.note.duration.change-division-type=Triole
-action.note.duration.decrement-duration=Dauer veringern
-action.note.duration.increment-duration=Dauer erh\u00F6hen
-action.note.effect.change-vibrato=Vibrato
-action.note.effect.change-bend=Bending
-action.note.effect.change-slide=Slide
-action.note.effect.change-hammer=Hammer-on/pull-off
-action.note.effect.change-accentuated=Akzentuiert
-action.note.effect.change-dead=Dead note
-action.note.effect.change-fade-in=Fade in
-action.note.effect.change-ghost=Ghost Note
-action.note.effect.change-grace=Vorschlagsnote
-action.note.effect.change-harmonic=Harmonic
-action.note.effect.change-heavy-accentuated=Stark akzentuiert
-action.note.effect.change-palm-mute=Abged\u00E4mpft
-action.note.effect.change-popping=Popping
-action.note.effect.change-slapping=Slapping
-action.note.effect.change-staccato=Staccato
-action.note.effect.change-tapping=Tapping
-action.note.effect.change-tremolo-bar=Tremolo bar
-action.note.effect.change-tremolo-picking=Tremolo picking
-action.note.effect.change-trill=Add/Remove Trill
-action.insert.open-repeat=Wiederholung \u00F6ffnen
-action.insert.close-repeat=Wiederholung schlie\u00dfen
-action.insert.repeat-alternative=Alternative Endungen
-action.insert.chord=Akkord einf\u00FCgen
-action.insert.text=Text einf\u00FCgen
-action.marker.add=Markierung einf\u00FCgen
-action.marker.go-next=Zur n\u00E4chsten Markierung gehen
-action.marker.go-previous=Zur vorherigen Markierung gehen
-action.transport.play=Wiedergabe starten
-action.transport.stop=Wiedergabe stoppen
-action.transport.mode=Abspielmodus
-action.transport.metronome=Metrononom
-action.transport.set-loop-start=Anfang der Schleifen aktivieren
-action.transport.set-loop-end=Ende der Schleifen aktivieren
-action.tools.browser=Dateisammlungs-Browser
-action.tools.transpose=Noten transponieren
-action.settings.configure=Einstellungen
-action.help.doc=Hilfe
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_el.properties b/TuxGuitar-testing/platform-all/share/lang/messages_el.properties
deleted file mode 100644
index 31f2c5eb..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_el.properties
+++ /dev/null
@@ -1,685 +0,0 @@
-ok=\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9
-cancel=\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7
-yes=\u039d\u03b1\u03b9
-no=\u038c\u03c7\u03b9
-add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7
-edit=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1
-remove=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7
-save=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
-exit=\u0388\u03be\u03bf\u03b4\u03bf\u03c2
-close=\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf
-choose=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae
-color=\u03a7\u03c1\u03ce\u03bc\u03b1
-title=\u03a4\u03af\u03c4\u03bb\u03bf\u03c2
-go=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5
-warning=\u03a0\u03c1\u03bf\u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7
-error=\u03a3\u03c6\u03ac\u03bb\u03bc\u03b1
-plugins=Plugins
-options=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2
-defaults=\u03a0\u03c1\u03bf\u03ba\u03b1\u03b8\u03bf\u03c1\u03b9\u03c3\u03bc\u03ad\u03bd\u03b1
-clean=\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2
-rename=\u039c\u03b5\u03c4\u03bf\u03bd\u03bf\u03bc\u03b1\u03c3\u03af\u03b1
-fret=Fret
-position=\u0398\u03ad\u03c3\u03b7
-name=\u038c\u03bd\u03bf\u03bc\u03b1
-author=\u03a3\u03c5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ad\u03b1\u03c2
-version=\u0388\u03ba\u03b4\u03bf\u03c3\u03b7
-description=\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae
-info=\u03a0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2
-configure=\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b5
-url=URL
-
-file=\u0391\u03c1\u03c7\u03b5\u03af\u03bf
-file.new=\u039d\u03ad\u03bf
-file.open=\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1
-file.save=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
-file.save-as=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03a9\u03c2
-file.save-changes-question=\u03a4\u03bf \u03c4\u03c1\u03b1\u03b3\u03bf\u03cd\u03b4\u03b9 \u03c0\u03b5\u03c1\u03b9\u03ad\u03c7\u03b5\u03b9 \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2.\n\u0395\u03c0\u03b9\u03b8\u03c5\u03bc\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03cd\u03c3\u03b5\u03c4\u03b5 \u03c4\u03b9\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2;
-file.exit=\u0388\u03be\u03bf\u03b4\u03bf\u03c2
-file.export=\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae
-file.export-midi=\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae MIDI
-file.export-pdf=\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae PDF
-file.print=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7
-file.print-preview=\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7 \u03b5\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7\u03c2
-file.import=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae
-file.import-midi=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae MIDI
-file.export-ascii=\u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae ASCII
-file.history=\u0399\u03c3\u03c4\u03bf\u03c1\u03b9\u03ba\u03cc
-file.open-url=\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 URL
-file.open.error=\u0391\u03b4\u03cd\u03bd\u03b1\u03c4\u03bf \u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1: {0}
-file.save.error=\u0391\u03b4\u03cd\u03bd\u03b1\u03c4\u03b7 \u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7: {0}
-file.import.error=\u0391\u03b4\u03cd\u03bd\u03b1\u03c4\u03b7 \u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae: {0}
-file.export.error=\u0391\u03b4\u03cd\u03bd\u03b1\u03c4\u03b7 \u0395\u03be\u03b1\u03b3\u03c9\u03b3\u03ae: {0}
-file.overwrite-question=\u0391\u03c5\u03c4\u03cc\u03c2 \u03bf \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf\u03c2 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03ae\u03b4\u03b7. \u0395\u03c0\u03b9\u03b8\u03c5\u03bc\u03b5\u03af\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03bf\u03bd \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03ae\u03c3\u03b5\u03c4\u03b5;
-
-edit.menu=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1
-edit.undo=\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7
-edit.redo=\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7 \u03b5\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b1\u03c2
-edit.copy=\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae
-edit.from=\u0391\u03c0\u03cc
-edit.to=\u0388\u03c9\u03c2
-edit.all-tracks=\u038c\u03bb\u03b1 \u03c4\u03b1 \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9\u03b1
-edit.paste=\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2
-edit.paste.count=\u039c\u03b5\u03c4\u03c1\u03b7\u03c4\u03ae\u03c2 \u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03bf\u03cd
-edit.paste.replace-mode=\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2 \u03b1\u03c5\u03c4\u03bf\u03cd \u03c4\u03bf\u03c5 \u039c\u03ad\u03c4\u03c1\u03bf\u03c5\u03c5
-edit.paste.insert-mode=\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03c3\u03b5 \u03bd\u03ad\u03bf \u039c\u03ad\u03c4\u03c1\u03bf
-edit.delete=\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7 \u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae
-edit.cut=\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7 \u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae
-edit.mouse-mode-selection=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae\u03c2
-edit.mouse-mode-edition=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1\u03c2 \u03a0\u03b1\u03c1\u03c4\u03b9\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-edit.not-natural-key=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u0394\u03af\u03b5\u03c3\u03b7\u03c2/\u038e\u03c6\u03b5\u03c3\u03b7\u03c2
-edit.voice-1=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a6\u03c9\u03bd\u03ae\u03c2 1
-edit.voice-2=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a6\u03c9\u03bd\u03ae\u03c2 2
-
-view=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae
-view.layout=\u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7
-view.layout.page=\u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7 \u03a3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2
-view.layout.linear=\u0393\u03c1\u03b1\u03bc\u03bc\u03b9\u03ba\u03ae \u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7
-view.layout.compact=\u03a3\u03c5\u03bc\u03c0\u03b1\u03b3\u03ae\u03c2
-view.layout.multitrack=\u03a0\u03bf\u03bb\u03c5\u03ba\u03ac\u03bd\u03b1\u03bb\u03b7
-view.layout.chord-style=\u03a3\u03c4\u03c5\u03bb \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-view.layout.chord-name=\u039f\u03bd\u03bf\u03bc\u03b1\u03c3\u03af\u03b1 \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-view.layout.chord-diagram=\u0394\u03b9\u03ac\u03b3\u03c1\u03b1\u03bc\u03bc\u03b1 \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-view.layout.score-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03b1\u03c1\u03c4\u03b9\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-view.layout.tablature-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a4\u03b1\u03bc\u03c0\u03bb\u03b1\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-view.show-mixer=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u039c\u03af\u03ba\u03c4\u03b7
-view.show-fretboard=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a4\u03b1\u03c3\u03c4\u03b9\u03ad\u03c1\u03b1\u03c2
-view.show-piano=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03b9\u03ac\u03bd\u03bf\u03c5
-view.show-matrix=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03af\u03bd\u03b1\u03ba\u03b1
-view.show-transport=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ad\u03b1
-
-fretboard.direction=\u039a\u03b1\u03c4\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7
-fretboard.right-mode=\u03a7\u03c1\u03ae\u03c3\u03b7 \u03b1\u03c0\u03cc \u03b4\u03b5\u03be\u03b9\u03ac
-fretboard.left-mode=\u03a7\u03c1\u03ae\u03c3\u03b7 \u03b1\u03c0\u03cc \u03b1\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac
-fretboard.background-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03a6\u03cc\u03bd\u03c4\u03bf\u03c5
-fretboard.display-note-text=Display Note \u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf
-fretboard.display-scale-text=Display Scale \u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf
-fretboard.font=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC
-fretboard.fretpoint-color=Fret \u03a7\u03c1\u03ce\u03bc\u03b1
-fretboard.note-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039d\u03cc\u03c4\u03b1\u03c2
-fretboard.scale-note-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039a\u03bb\u03af\u03bc\u03b1\u03ba\u03b1\u03c2 \u039d\u03cc\u03c4\u03b1\u03c2
-fretboard.settings=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a4\u03b1\u03c3\u03c4\u03b9\u03ad\u03c1\u03b1\u03c2
-fretboard.string-color=String \u03a7\u03c1\u03ce\u03bc\u03b1
-fretboard.settings.options=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2
-
-piano.editor=\u03a3\u03c5\u03bd\u03c4\u03ac\u03ba\u03c4\u03b7\u03c2 \u03a0\u03b9\u03ac\u03bd\u03bf\u03c5
-piano.natural-key-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03a6\u03c5\u03c3\u03b9\u03ba\u03bf\u03cd \u039a\u03bb\u03b5\u03b9\u03b4\u03b9\u03bf\u03cd
-piano.not-natural-key-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03a6\u03b1\u03bd\u03c4\u03b1\u03c3\u03c4\u03b9\u03ba\u03bf\u03cd \u039a\u03bb\u03b5\u03b9\u03b4\u03b9\u03bf\u03cd
-piano.note-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039d\u03cc\u03c4\u03b1\u03c2
-piano.scale-note-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039a\u03bb\u03af\u03bc\u03b1\u03ba\u03b1\u03c2 \u039d\u03cc\u03c4\u03b1\u03c2
-piano.settings=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a0\u03b9\u03ac\u03bd\u03bf\u03c5
-
-matrix.editor=\u03a0\u03af\u03bd\u03b1\u03ba\u03b1\u03c2 \u03a3\u03cd\u03bd\u03c4\u03b1\u03be\u03b7\u03c2
-matrix.grids=\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03a0\u03bb\u03b5\u03b3\u03bc\u03ac\u03c4\u03c9\u03bd
-matrix.border-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03a0\u03bb\u03b1\u03b9\u03c3\u03af\u03bf\u03c5
-matrix.font=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC
-matrix.foreground-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03a0\u03c1\u03bf\u03c3\u03ba\u03b7\u03bd\u03af\u03bf\u03c5
-matrix.line-color-1=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039c\u03bf\u03bd\u03ae\u03c2 \u0393\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2
-matrix.line-color-2=\u03a7\u03c1\u03ce\u03bc\u03b1 \u0396\u03c5\u03b3\u03ae\u03c2 \u0393\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2
-matrix.line-color-over=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03a0\u03bf\u03bd\u03c4\u03b9\u03ba\u03bf\u03cd \u03c0\u03ac\u03bd\u03c9 \u03b1\u03c0\u03cc \u03b3\u03c1\u03b1\u03bc\u03bc\u03ae
-matrix.note-color=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039d\u03cc\u03c4\u03b1\u03c2
-matrix.play-note-color=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03a7\u03c1\u03c9\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7\u03c2 \u039d\u03cc\u03c4\u03b1\u03c2
-matrix.position-color=\u0398\u03ad\u03c3\u03b7 \u03a7\u03c1\u03ce\u03bc\u03b1
-matrix.settings=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2 \u03a0\u03af\u03bd\u03b1\u03ba\u03b1
-
-composition=\u03a3\u03cd\u03bd\u03b8\u03b5\u03c3\u03b7
-composition.timesignature=\u03a1\u03c5\u03b8\u03bc\u03cc\u03c2
-composition.timesignature.Numerator=\u0391\u03c1\u03b9\u03b8\u03bc\u03b7\u03c4\u03ae\u03c2
-composition.timesignature.denominator=\u03a0\u03b1\u03c1\u03bf\u03bd\u03bf\u03bc\u03b1\u03c3\u03c4\u03ae\u03c2
-composition.timesignature.to-the-end=\u03a3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-composition.tempo=\u03a4\u03ad\u03bc\u03c0\u03bf
-composition.tempo-percent=\u03a4\u03ad\u03bc\u03c0\u03bf
-composition.tempo.invalid=\u0386\u03ba\u03c5\u03c1\u03bf \u03a4\u03ad\u03bc\u03c0\u03bf
-composition.tempo.start-to-end=\u0395\u03c6\u03ac\u03c1\u03bc\u03bf\u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c4\u03ad\u03bc\u03c0\u03bf \u03c3\u03b5 \u03bf\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03bf \u03c4\u03bf \u03c4\u03c1\u03b1\u03b3\u03bf\u03cd\u03b4\u03b9
-composition.tempo.position-to-end=\u0395\u03c6\u03ac\u03c1\u03bc\u03bf\u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c4\u03ad\u03bc\u03c0\u03bf \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-composition.tempo.position-to-next=\u0395\u03c6\u03ac\u03c1\u03bc\u03bf\u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03c4\u03ad\u03bc\u03c0\u03bf \u03c3\u03c4\u03bf \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u03c3\u03b7\u03bc\u03ac\u03b4\u03b9 \u03c4\u03ad\u03bc\u03c0\u03bf
-composition.properties=\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2
-composition.name=\u038c\u03bd\u03bf\u03bc\u03b1
-composition.artist=\u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7\u03c2
-composition.album=\u0386\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc
-composition.author=\u03a3\u03c5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ad\u03b1\u03c2
-composition.date=\u0397\u03bc\u03b5\u03c1\u03bf\u03bc\u03b7\u03bd\u03af\u03b1
-composition.copyright=Copyright
-composition.writer=\u0394\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03cc\u03c2 \u03a4\u03b1\u03bc\u03c0\u03bb\u03b1\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-composition.transcriber=\u039c\u03b5\u03c4\u03b1\u03b3\u03c1\u03ac\u03c6\u03b7\u03ba\u03b5 \u03b1\u03c0\u03cc
-composition.comments=\u03a3\u03c7\u03cc\u03bb\u03b9\u03b1
-composition.tripletfeel=Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5
-composition.clef=\u039a\u03bb\u03b5\u03b9\u03b4\u03af
-composition.clef.treble=\u03a3\u03bf\u03c0\u03c1\u03ac\u03bd\u03bf\u03c2 (Treble)
-composition.clef.bass=\u039c\u03c0\u03ac\u03c3\u03bf (Bass)
-composition.clef.tenor=\u03a4\u03b5\u03bd\u03cc\u03c1\u03bf\u03c2 (Tenor)
-composition.clef.alto=\u039a\u03bf\u03bd\u03c4\u03c1\u03ac\u03bb\u03c4\u03bf (Alto)
-composition.clef.to-the-end=\u0395\u03c6\u03ac\u03c1\u03bc\u03bf\u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03ba\u03bb\u03b5\u03b9\u03b4\u03af \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-composition.keysignature=\u039a\u03bb\u03af\u03bc\u03b1\u03ba\u03b1
-composition.keysignature.natural=\u03a6\u03c5\u03c3\u03b9\u03ba\u03ae
-composition.keysignature.sharp-1=1 \u0394\u03af\u03b5\u03c3\u03b7
-composition.keysignature.sharp-2=2 \u0394\u03b9\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.sharp-3=3 \u0394\u03b9\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.sharp-4=4 \u0394\u03b9\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.sharp-5=5 \u0394\u03b9\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.sharp-6=6 \u0394\u03b9\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.sharp-7=7 \u0394\u03b9\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.flat-1=1 \u038e\u03c6\u03b5\u03c3\u03b7
-composition.keysignature.flat-2=2 \u03a5\u03c6\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.flat-3=3 \u03a5\u03c6\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.flat-4=4 \u03a5\u03c6\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.flat-5=5 \u03a5\u03c6\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.flat-6=6 \u03a5\u03c6\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.flat-7=7 \u03a5\u03c6\u03ad\u03c3\u03b5\u03b9\u03c2
-composition.keysignature.to-the-end=\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03b1\u03c5\u03c4\u03ae\u03c2 \u03c4\u03b7\u03c2 \u03ba\u03bb\u03af\u03bc\u03b1\u03ba\u03b1\u03c2 \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-composition.tripletfeel=Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5
-composition.tripletfeel.none=\u03a7\u03c9\u03c1\u03af\u03c2 Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5
-composition.tripletfeel.eighth=Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5 8\u03bf\u03c5
-composition.tripletfeel.sixteenth=Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5 16\u03bf\u03c5
-composition.tripletfeel.to-the-end=\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03b1\u03c5\u03c4\u03bf\u03cd \u03c4\u03bf\u03c5 Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5 \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-
-help=\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1
-help.help=\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1
-help.doc=\u03a4\u03b5\u03ba\u03bc\u03b7\u03c1\u03af\u03c9\u03c3\u03b7 (Documentation)
-help.about=\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac \u03bc\u03b5 \u03c4\u03bf TuxGuitar
-help.about.license=\u0386\u03b4\u03b5\u03b9\u03b1
-help.about.authors=\u03a3\u03c5\u03b3\u03b3\u03c1\u03b1\u03c6\u03b5\u03af\u03c2
-help.about.description=\u03a0\u03b5\u03c1\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae
-
-track=\u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-track.number=N°
-track.name=\u038c\u03bd\u03bf\u03bc\u03b1
-track.color=\u03a7\u03c1\u03ce\u03bc\u03b1
-track.first=\u03a0\u03c1\u03ce\u03c4\u03bf \u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-track.last=\u03a4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf \u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-track.previous=\u03a0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-track.next=\u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-track.add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u039a\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-track.remove=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u039a\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-track.clone=\u039a\u03bb\u03c9\u03bd\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u039a\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-track.move-up=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03c0\u03ac\u03bd\u03c9
-track.move-down=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03ba\u03ac\u03c4\u03c9
-track.instrument=\u038c\u03c1\u03b3\u03b1\u03bd\u03bf 
-track.properties=\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2
-track.properties.general=\u0393\u03b5\u03bd\u03b9\u03ba\u03ac
-track.name.default-percussion-name=\u039a\u03c1\u03bf\u03c5\u03c3\u03c4\u03ac
-track.lyrics=\u03a3\u03c4\u03af\u03c7\u03bf\u03b9
-track.solo=Solo
-track.mute=Mute
-
-lyric.editor=\u03a3\u03c4\u03b9\u03c7\u03bf\u03b3\u03c1\u03ac\u03c6\u03bf\u03c2 
-
-measure=\u039c\u03ad\u03c4\u03c1\u03bf
-measure.first=\u03a0\u03c1\u03ce\u03c4\u03bf \u039c\u03ad\u03c4\u03c1\u03bf
-measure.last=\u03a4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf \u039c\u03ad\u03c4\u03c1\u03bf
-measure.previous=\u03a0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u039c\u03ad\u03c4\u03c1\u03bf
-measure.next=\u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u039c\u03ad\u03c4\u03c1\u03bf
-measure.add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u039c\u03ad\u03c4\u03c1\u03bf\u03c5
-measure.add.count=\u03a0\u03c1\u03bf\u03c3\u03b8\u03ae\u03ba\u03b7 \u039c\u03b5\u03c4\u03c1\u03b7\u03c4\u03ae
-measure.add-before-current-position=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5 \u03c0\u03c1\u03b9\u03bd \u03b1\u03c0\u03cc \u03b1\u03c5\u03c4\u03ae \u03c4\u03b7 \u03b8\u03ad\u03c3\u03b7
-measure.add-after-current-position=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5 \u03bc\u03b5\u03c4\u03ac \u03b1\u03c0\u03cc \u03b1\u03c5\u03c4\u03ae \u03c4\u03b7 \u03b8\u03ad\u03c3\u03b7
-measure.add-at-end=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5 \u03c3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-measure.remove=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u039c\u03ad\u03c4\u03c1\u03bf\u03c5
-measure.copy=\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u039c\u03ad\u03c4\u03c1\u03bf\u03c5
-measure.paste=\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u039c\u03ad\u03c4\u03c1\u03bf\u03c5
-measure.clean=\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u039c\u03ad\u03c4\u03c1\u03bf\u03c5
-
-duration=\u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1
-duration.whole=\u039f\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03bf
-duration.half=\u039c\u03b9\u03c3\u03cc
-duration.quarter=\u03a4\u03ad\u03c4\u03b1\u03c1\u03c4\u03bf
-duration.eighth=\u038c\u03b3\u03b4\u03bf\u03bf
-duration.sixteenth=\u0394\u03ad\u03ba\u03b1\u03c4\u03bf \u03ad\u03ba\u03c4\u03bf
-duration.thirtysecond=\u03a4\u03c1\u03b9\u03b1\u03ba\u03bf\u03c3\u03c4\u03cc \u03b4\u03b5\u03cd\u03c4\u03b5\u03c1\u03bf
-duration.sixtyfourth=\u0395\u03be\u03b7\u03ba\u03bf\u03c3\u03c4\u03cc \u03c4\u03ad\u03c4\u03b1\u03c1\u03c4\u03bf
-duration.dotted=\u03a0\u03b1\u03c1\u03b5\u03c3\u03c4\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf
-duration.doubledotted=\u0394\u03b9\u03c0\u03bb\u03cc \u03a0\u03b1\u03c1\u03b5\u03c3\u03c4\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf
-duration.division-type=Feeling \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5
-
-dynamic=\u0394\u03c5\u03bd\u03b1\u03bc\u03b9\u03ba\u03ad\u03c2
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=\u0395\u03c6\u03ad
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Dead Note
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Accentuated Note
-effects.heavyaccentuatednote=Heavy Accentuated Note
-effects.harmonic=Harmonic
-effects.grace=Grace Note
-effects.grace-editor=Grace Note Editor
-effects.grace.before-beat=Before beat
-effects.grace.on-beat=On beat
-effects.grace.transition=Transition
-effects.grace.transition-none=None
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Left Hand
-effects.harmonic.tapped.right-hand=Right Hand
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-bend.editor=Bend Editor
-bend.bend=Bend
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ad\u03b1\u03c2
-transport.start=\u0388\u03bd\u03b1\u03c1\u03be\u03b7
-transport.stop=\u039b\u03ae\u03be\u03b7
-transport.pause=\u03a0\u03b1\u03cd\u03c3\u03b7
-transport.first=\u03a0\u03c1\u03ce\u03c4\u03bf
-transport.last=\u03a4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf
-transport.previous=\u03a0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf
-transport.next=\u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf
-transport.metronome=\u039c\u03b5\u03c4\u03c1\u03bf\u03bd\u03cc\u03bc\u03bf\u03c2
-transport.mode=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2
-transport.mode.simple=\u0391\u03c0\u03bb\u03ae \u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1
-transport.mode.simple.tempo-percent=\u0395\u03c0\u03af \u03c4\u03bf\u03b9\u03c2 \u03b5\u03ba\u03b1\u03c4\u03cc \u03c4\u03bf\u03c5 \u03c4\u03ad\u03bc\u03c0\u03bf
-transport.mode.simple.loop=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03bc\u03b5 \u03b5\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7
-transport.mode.trainer=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u03a0\u03c1\u03bf\u03c0\u03cc\u03bd\u03b7\u03c3\u03b7\u03c2
-transport.mode.trainer.increment-description=\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03ba\u03b1\u03c4\u03ac
-transport.mode.loop-range=\u0395\u03cd\u03c1\u03bf\u03c2 \u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-transport.mode.loop-range.from=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03b1\u03c0\u03cc \u03c4\u03bf \u03bc\u03ad\u03c4\u03c1\u03bf
-transport.mode.loop-range.from-default=\u0391\u03c0\u03cc \u03c4\u03b7\u03bd \u03b1\u03c1\u03c7\u03ae
-transport.mode.loop-range.to=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03c4\u03bf\u03c5 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-transport.mode.loop-range.to-default=\u03a3\u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2
-transport.set-loop-start=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03bd \u03b1\u03c1\u03c7\u03ae \u03c4\u03b7\u03c2 \u03b5\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-transport.set-loop-end=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2 \u03c4\u03b7\u03c2 \u03b5\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-
-instruments.volume=Gain
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.volume=\u0388\u03bd\u03c4\u03b1\u03c3\u03b7
-instrument.balance=Balance
-instrument.chorus=Chorus
-instrument.reverb=Reverb
-instrument.phaser=Phaser
-instrument.tremolo=Tremolo
-instrument.free=Free
-instrument.link=Link
-
-
-repeat.open=\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-repeat.close=\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf \u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-repeat.alternative=\u0395\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03b9\u03c2 \u03bc\u03b5 \u03b5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2
-repeat.alternative.editor=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u0395\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03c9\u03bd \u03bc\u03b5 \u03b5\u03bd\u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2
-repetitions=\u0395\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03b9\u03c2
-repeat.number-of-repetitions=\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u0395\u03c0\u03b1\u03bd\u03b1\u03bb\u03ae\u03c8\u03b5\u03c9\u03bd
-
-beat=Beat
-beat.clean=\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 Beat
-beat.voice.remove-unused=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u039c\u03b7 \u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03bf\u03cd\u03bc\u03b5\u03bd\u03b7\u03c2 \u03a6\u03c9\u03bd\u03ae\u03c2
-beat.voice-up=Stems Up
-beat.voice-down=Stems Down
-beat.voice-auto=Auto Stems
-beat.stroke=Stroke
-beat.stroke-up=Upstroke
-beat.stroke-down=Downstroke
-beat.move-left=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b5 \u0388\u03bd\u03b1 Beat \u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac
-beat.move-right=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b5 \u0388\u03bd\u03b1 Beat \u0394\u03b5\u03be\u03b9\u03ac
-beat.move-custom=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5 Beat
-beat.move-custom.dialog.title=\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03b7 \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2
-beat.move-custom.dialog.direction-tip=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b7 \u039a\u03b1\u03c4\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7
-beat.move-custom.dialog.move-1.tip=\u039c\u03b5\u03af\u03b6\u03bf\u03bd \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2
-beat.move-custom.dialog.move-2.tip=\u039a\u03bf\u03bc\u03c8\u03ae \u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2
-beat.move-custom.dialog.direction=\u039a\u03b1\u03c4\u03b5\u03cd\u03b8\u03c5\u03bd\u03c3\u03b7
-beat.move-custom.dialog.direction.right=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u0394\u03b5\u03be\u03b9\u03ac
-beat.move-custom.dialog.direction.left=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac
-beat.move-custom.dialog.count=\u039c\u03b5\u03c4\u03c1\u03b7\u03c4\u03ae\u03c2
-beat.move-custom.dialog.duration=\u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1
-beat.move-custom.dialog.duration.type=\u03a0\u03b1\u03c1\u03b5\u03c3\u03c4\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf/\u0394\u03b9\u03c0\u03bb\u03cc-\u03a0\u03b1\u03c1\u03b5\u03c3\u03c4\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf
-beat.move-custom.dialog.duration.type.normal=\u039a\u03b1\u03b8\u03cc\u03bb\u03bf\u03c5
-beat.move-custom.dialog.duration.division-type=\u03a4\u03cd\u03c0\u03bf\u03c2 \u0394\u03b9\u03b1\u03af\u03c1\u03b5\u03c3\u03b7\u03c2
-beat.move-custom.dialog.duration.division-type.normal=\u039a\u03b1\u03bd\u03bf\u03bd\u03b9\u03ba\u03cc (Tuplet)
-
-note=\u039d\u03cc\u03c4\u03b1
-note.semitone-up=\u0397\u03bc\u03b9\u03c4\u03cc\u03bd\u03b9\u03bf \u03c0\u03ac\u03bd\u03c9
-note.semitone-down=\u0397\u03bc\u03b9\u03c4\u03cc\u03bd\u03b9\u03bf \u03ba\u03ac\u03c4\u03c9
-note.shift-up=\u039f\u03bb\u03af\u03c3\u03b8\u03b7\u03c3\u03b7 \u03c0\u03ac\u03bd\u03c9
-note.shift-down=\u039f\u03bb\u03af\u03c3\u03b8\u03b7\u03c3\u03b7 \u03ba\u03ac\u03c4\u03c9
-note.tiednote=\u03a3\u03cd\u03b6\u03b5\u03c5\u03be\u03b7
-note.deadnote=Dead Note
-
-insert.chord=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-chord.editor=\u03a3\u03c5\u03bd\u03b8\u03ad\u03c4\u03b7\u03c2 \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03b9\u03ce\u03bd
-chord=\u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1
-chord.name=\u038c\u03bd\u03bf\u03bc\u03b1
-chord.bass=\u039c\u03c0\u03ac\u03c3\u03bf
-chord.custom=\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03b7 \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1
-chord.custom.name-empty-error=\u03a4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2 \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03ba\u03b5\u03bd\u03cc.
-chord.custom.name-exist-error=\u0391\u03c5\u03c4\u03cc \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9 \u03ae\u03b4\u03b7.
-chord.settings.tip=\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03b5\u03c2 \u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2
-chord.settings.type=\u03a4\u03cd\u03c0\u03bf\u03c2
-chord.settings.type.most-common=\u03a0\u03b9\u03bf \u03c3\u03c5\u03c7\u03bd\u03ac
-chord.settings.type.inversions=\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03c1\u03bf\u03c6\u03ad\u03c2
-chord.settings.type.close-voiced=\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf Voiced
-chord.settings.type.open-voiced=\u0386\u03bd\u03bf\u03b9\u03be\u03b5 Voiced
-chord.settings.open-chords=\u0386\u03bd\u03bf\u03b9\u03be\u03b5 Chords
-chord.settings.chords-to-display=\u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b5\u03c2 \u03c0\u03c1\u03bf\u03c2 \u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae
-chord.settings.search-frets=\u0391\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7 Frets
-chord.settings.minimum-fret=\u0395\u03bb\u03ac\u03c7\u03b9\u03c3\u03c4\u03bf
-chord.settings.maximum-fret=\u039c\u03ad\u03b3\u03b9\u03c3\u03c4\u03bf
-
-instrument=\u038c\u03c1\u03b3\u03b1\u03bd\u03bf
-instrument.instrument=\u038c\u03c1\u03b3\u03b1\u03bd\u03bf
-instrument.percussion-track=\u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9 \u039a\u03c1\u03bf\u03c5\u03c3\u03c4\u03ce\u03bd
-
-tuning=\u039a\u03bf\u03cd\u03c1\u03b4\u03b9\u03c3\u03bc\u03b1
-tuning.offset=\u0391\u03bd\u03c4\u03b9\u03c3\u03c4\u03ac\u03b8\u03bc\u03b9\u03c3\u03bc\u03b1
-tuning.strings=\u03a7\u03bf\u03c1\u03b4\u03ad\u03c2
-tuning.strings.transpose=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u03b5\u03c0\u03b7\u03c1\u03b5\u03b1\u03c3\u03bc\u03ad\u03bd\u03c9\u03bd \u03bd\u03cc\u03c4\u03c9\u03bd.
-tuning.strings.transpose.try-keep-strings=\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b5\u03b9\u03b1 \u03b4\u03b9\u03b1\u03c4\u03ae\u03c1\u03b7\u03c3\u03b7\u03c2 \u03c4\u03c9\u03bd \u03bd\u03cc\u03c4\u03c9\u03bd \u03c3\u03c4\u03b7\u03bd \u03af\u03b4\u03b9\u03b1 \u03c7\u03bf\u03c1\u03b4\u03ae
-tuning.strings.transpose.apply-to-chords=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03b9\u03ce\u03bd
-
-language=Language
-
-choose-color=\u0395\u03c0\u03ad\u03bb\u03b5\u03be\u03b5 \u03ad\u03bd\u03b1 \u03c7\u03c1\u03ce\u03bc\u03b1
-
-settings=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2
-settings.config=\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b5 TuxGuitar
-settings.config.language=\u0393\u03bb\u03ce\u03c3\u03c3\u03b1
-settings.config.language.choose=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u0393\u03bb\u03ce\u03c3\u03c3\u03b1\u03c2
-settings.config.styles=\u03a3\u03c4\u03c5\u03bb
-settings.config.styles.general=\u0393\u03b5\u03bd\u03b9\u03ba\u03ac \u03a3\u03c4\u03c5\u03bb
-settings.config.styles.printer=\u03a3\u03c4\u03c5\u03bb \u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7\u03c2
-settings.config.styles.font.default=\u03A0\u03C1\u03BF\u03BA\u03B1\u03B8\u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03B7 \u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC
-settings.config.styles.font.note=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u039D\u03CC\u03C4\u03B1\u03C2
-settings.config.styles.font.lyric=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u03A3\u03C4\u03AF\u03C7\u03C9\u03BD
-settings.config.styles.font.text=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u039A\u03B5\u03B9\u03BC\u03AD\u03BD\u03BF\u03C5
-settings.config.styles.font.time-signature=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u03A1\u03C5\u03B8\u03BC\u03BF\u03CD
-settings.config.styles.font.printer-default=\u03A0\u03C1\u03BF\u03BA\u03B1\u03B8\u03BF\u03C1\u03B9\u03C3\u03BC\u03AD\u03BD\u03B7 \u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u0395\u03BA\u03C4\u03CD\u03C0\u03C9\u03C3\u03B7\u03C2
-settings.config.styles.font.printer-note=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u0395\u03BA\u03C4\u03CD\u03C0\u03C9\u03C3\u03B7\u03C2 \u039D\u03CC\u03C4\u03B1\u03C2
-settings.config.styles.font.printer-time-signature=\u0393\u03C1\u03B1\u03BC\u03BC\u03B1\u03C4\u03BF\u03C3\u03B5\u03B9\u03C1\u03AC \u0395\u03BA\u03C4\u03CD\u03C0\u03C9\u03C3\u03B7\u03C2 \u03A1\u03C5\u03B8\u03BC\u03BF\u03CD
-settings.config.styles.color.score-note=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039d\u03cc\u03c4\u03b1\u03c2 \u03a0\u03b1\u03c1\u03c4\u03b9\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-settings.config.styles.color.tab-note=\u03a7\u03c1\u03ce\u03bc\u03b1 \u039d\u03cc\u03c4\u03b1\u03c2 \u03a4\u03b1\u03bc\u03c0\u03bb\u03b1\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-settings.config.styles.color.play-note=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03a7\u03c1\u03c9\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03ad\u03bd\u03b7\u03c2 \u039d\u03cc\u03c4\u03b1\u03c2
-settings.config.apply-changes-question=\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03c4\u03c9\u03bd \u03b1\u03bb\u03bb\u03b1\u03b3\u03ce\u03bd \u03c4\u03ce\u03c1\u03b1;
-settings.config.sound=\u0389\u03c7\u03bf\u03c2
-settings.config.main=\u0393\u03b5\u03bd\u03b9\u03ba\u03ac
-settings.config.main.window-title=\u03a4\u03af\u03c4\u03bb\u03bf\u03c2 \u03a0\u03b1\u03c1\u03b1\u03b8\u03cd\u03c1\u03bf\u03c5
-settings.config.main.window-title.help=\u039f\u03b9 \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03b5\u03c2 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ad\u03c2 \u03b8\u03b1 \u03b1\u03bd\u03c4\u03b9\u03ba\u03b1\u03c4\u03b1\u03c3\u03c4\u03b1\u03b8\u03bf\u03cd\u03bd \u03c3\u03c4\u03bf \u03c4\u03af\u03c4\u03bb\u03bf \u03c4\u03bf\u03c5 \u03c0\u03b1\u03c1\u03b1\u03b8\u03cd\u03c1\u03bf\u03c5:
-settings.config.main.window-title.var.description.appname=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c4\u03b7\u03c2 \u03b5\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2: TuxGuitar
-settings.config.main.window-title.var.description.appversion=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03b7\u03bd \u03ad\u03ba\u03b4\u03bf\u03c3\u03b7 \u03c4\u03bf\u03c5 TuxGuitar.
-settings.config.main.window-title.var.description.filename=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c4\u03bf\u03c5 \u03b1\u03bd\u03bf\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5
-settings.config.main.window-title.var.description.filepath=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03b7 \u03b8\u03ad\u03c3\u03b7 \u03c4\u03bf\u03c5 \u03b1\u03bd\u03bf\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf\u03c5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5
-settings.config.main.window-title.var.description.songname=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd
-settings.config.main.window-title.var.description.songauthor=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03bf \u03c3\u03c5\u03b3\u03b3\u03c1\u03b1\u03c6\u03ad\u03b1 \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd
-settings.config.main.window-title.var.description.songalbum=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03bf \u03ac\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd
-settings.config.main.window-title.var.description.songartist=\u0391\u03c5\u03c4\u03ae \u03b7 \u03bc\u03b5\u03c4\u03b1\u03b2\u03bb\u03b7\u03c4\u03ae \u03b1\u03bd\u03c4\u03b9\u03c0\u03c1\u03bf\u03c3\u03c9\u03c0\u03b5\u03cd\u03b5\u03b9 \u03c4\u03bf \u03ba\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b7 \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd
-settings.config.main.options=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ad\u03c2
-settings.config.main.splash-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03b9\u03ba\u03ae\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03c3\u03c4\u03b7\u03bd \u03b5\u03ba\u03ba\u03af\u03bd\u03b7\u03c3\u03b7
-settings.config.main.table.auto-size.enabled=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b7\u03c2 \u03c0\u03c1\u03bf\u03c3\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2 \u03bc\u03b5\u03b3\u03ad\u03b8\u03bf\u03c5\u03c2 \u03c0\u03af\u03bd\u03b1\u03ba\u03b1
-settings.config.styles.color.lines=\u03a7\u03c1\u03ce\u03bc\u03b1 \u03bf\u03c1\u03b9\u03b6\u03bf\u03bd\u03c4\u03af\u03c9\u03bd \u03b3\u03c1\u03b1\u03bc\u03bc\u03ce\u03bd
-settings.config.toolbars=\u0393\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2 \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd
-settings.config.toolbars.tip=\u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b5 \u03c4\u03b9\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2 \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd \u03c3\u03bf\u03c5
-settings.config.toolbars.list=\u0394\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03b5\u03c2 \u03b3\u03c1\u03b1\u03bc\u03bc\u03ad\u03c2 \u03b5\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03c9\u03bd
-settings.config.toolbars.move-up=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03c0\u03ac\u03bd\u03c9
-settings.config.toolbars.move-down=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03ba\u03ac\u03c4\u03c9
-settings.config.skin=Skins
-settings.config.skin.choose=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c4\u03bf\u03c5 skin \u03c3\u03bf\u03c5
-settings.keybindings=\u03a1\u03cd\u03b8\u03bc\u03b9\u03c3\u03b5 \u03c0\u03b1\u03c4\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd \u03ba\u03bf\u03c5\u03bc\u03c0\u03b9\u03ce\u03bd
-
-key-bindings-editor=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03ae\u03c2 \u03b4\u03ad\u03c3\u03bc\u03b5\u03c5\u03c3\u03b7\u03c2 \u03ba\u03bb\u03b5\u03b9\u03b4\u03b9\u03ce\u03bd
-key-bindings-editor-action-select=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03bc\u03b9\u03b1\u03c2 \u03b5\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b1\u03c2
-key-bindings-editor-action-column=\u0395\u03bd\u03ad\u03c1\u03b3\u03b5\u03b9\u03b5\u03c2
-key-bindings-editor-shortcut-column=\u03a0\u03bb\u03ae\u03ba\u03c4\u03c1\u03b1
-key-bindings-editor-push-a-key=\u03a0\u03ac\u03c4\u03b1 \u03ad\u03bd\u03b1 \u03ba\u03bf\u03c5\u03bc\u03c0\u03af
-key-bindings-editor-save-question=\u03a5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03bc\u03b7 \u03b1\u03c0\u03bf\u03b8\u03b7\u03ba\u03b5\u03c5\u03bc\u03ad\u03bd\u03b5\u03c2 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ad\u03c2, \u03b5\u03c0\u03b9\u03b8\u03c5\u03bc\u03b5\u03af\u03c4\u03b5 \u03ad\u03be\u03bf\u03b4\u03bf \u03c7\u03c9\u03c1\u03af\u03c2 \u03b1\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7;
-key-bindings-editor-override=\u0397 \u03c3\u03c5\u03bd\u03c4\u03cc\u03bc\u03b5\u03c5\u03c3\u03b7 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c4\u03b1\u03b9 \u03ae\u03b4\u03b7! \u0395\u03af\u03c3\u03c4\u03b5 \u03c3\u03af\u03b3\u03bf\u03c5\u03c1\u03bf\u03b9 \u03c0\u03c9\u03c2 \u03b8\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03c4\u03b7 \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03b5\u03af\u03c3\u03b5\u03c4\u03b5;
-
-print.print=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7
-print.dialog=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7
-print.service=\u03a5\u03c0\u03b7\u03c1\u03b5\u03c3\u03af\u03b1
-print.service.name=\u038c\u03bd\u03bf\u03bc\u03b1
-print.service.status=\u039a\u03b1\u03c4\u03ac\u03c3\u03c4\u03b1\u03c3\u03b7
-print.service.type=\u03a4\u03cd\u03c0\u03bf\u03c2
-print.service.info=\u03a0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03af\u03b5\u03c2
-print.range=\u0395\u03cd\u03c1\u03bf\u03c2
-print.range.all-pages=\u038c\u03bb\u03bf
-print.range.pages=\u03a3\u03b5\u03bb\u03af\u03b4\u03b5\u03c2
-print.range.pages-to=\u03a9\u03c2
-print.copies=\u0391\u03bd\u03c4\u03af\u03b3\u03c1\u03b1\u03c6\u03b1
-print.copies-number=\u0391\u03c1\u03b9\u03b8\u03bc\u03cc\u03c2 \u03b1\u03bd\u03c4\u03b9\u03b3\u03c1\u03ac\u03c6\u03c9\u03bd
-print.print-to-file=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf
-print.file-chooser=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae
-print-header.default-song-name=\u03a7\u03c9\u03c1\u03af\u03c2 \u03c4\u03af\u03c4\u03bb\u03bf
-print-header.default-song-author=\u0391\u03bd\u03ce\u03bd\u03c5\u03bc\u03bf
-
-print.preview=\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7 \u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7
-print.preview.page-of=\u03c4\u03bf\u03c5
-
-marker=\u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-marker.add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03a3\u03b7\u03bc\u03b1\u03b4\u03b9\u03bf\u03cd
-marker.list=\u039b\u03af\u03c3\u03c4\u03b1 \u03a3\u03b7\u03bc\u03b1\u03b4\u03b9\u03ce\u03bd
-marker.first=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03a0\u03c1\u03ce\u03c4\u03bf \u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-marker.last=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03a4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf \u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-marker.next=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-marker.previous=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03a0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-
-export.tablature-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a4\u03b1\u03bc\u03c0\u03bb\u03b1\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-export.score-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03b1\u03c1\u03c4\u03b9\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-export.chord-name-enabled=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03c9\u03bd \u03bf\u03bd\u03bf\u03bc\u03ac\u03c4\u03c9\u03bd \u03c4\u03c9\u03bd \u03c3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03b9\u03ce\u03bd
-export.chord-diagram-enabled=\u0395\u03bc\u03c6\u03ac\u03bd\u03b9\u03c3\u03b7 \u03c4\u03c9\u03bd \u03b4\u03b9\u03b1\u03b3\u03c1\u03b1\u03bc\u03bc\u03ac\u03c4\u03c9\u03bd \u03c4\u03c9\u03bd \u03c3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03b9\u03ce\u03bd
-export.black-and-white=\u0391\u03c3\u03c0\u03c1\u03cc\u03bc\u03b1\u03c5\u03c1\u03b7 \u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1
-
-scale=\u039a\u03bb\u03af\u03bc\u03b1\u03ba\u03b1
-scale.list=\u039b\u03af\u03c3\u03c4\u03b1 \u039a\u03bb\u03af\u03bc\u03b1\u03ba\u03b1\u03c2
-
-text.insert=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5
-text.editor=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03c4\u03ae\u03c2 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5
-text.text=\u039a\u03b5\u03af\u03bc\u03b5\u03bd\u03bf
-
-tools=\u0395\u03c1\u03b3\u03b1\u03bb\u03b5\u03af\u03b1
-tools.scale=\u039b\u03af\u03c3\u03c4\u03b1 \u039a\u03bb\u03af\u03bc\u03b1\u03ba\u03b1\u03c2
-tools.browser=\u03a0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2
-tools.plugins=Plugins
-tools.shortcuts=\u03a3\u03c5\u03bd\u03c4\u03bf\u03bc\u03b5\u03cd\u03c3\u03b5\u03b9\u03c2
-tools.settings=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2
-
-tools.transpose=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac
-tools.transpose.semitones=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u0397\u03bc\u03b9\u03c4\u03bf\u03bd\u03af\u03c9\u03bd
-tools.transpose.apply-to-track=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u03cc\u03bb\u03c9\u03bd \u03c4\u03c9\u03bd \u03bc\u03ad\u03c4\u03c1\u03c9\u03bd
-tools.transpose.apply-to-measure=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u03bc\u03cc\u03bd\u03bf \u03b1\u03c5\u03c4\u03bf\u03cd \u03c4\u03bf\u03c5 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-tools.transpose.apply-to-all-tracks=\u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae \u03c3\u03b5 \u03cc\u03bb\u03b1 \u03c4\u03b1 \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9\u03b1
-tools.transpose.try-keep-strings=\u0394\u03b9\u03b1\u03c4\u03ae\u03c1\u03b7\u03c3\u03b7 \u03c4\u03c9\u03bd \u03bd\u03cc\u03c4\u03c9\u03bd \u03c3\u03c4\u03b7\u03bd \u03af\u03b4\u03b9\u03b1 \u03c7\u03bf\u03c1\u03b4\u03ae \u03cc\u03c0\u03bf\u03c5 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03cc
-tools.transpose.apply-to-chords=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03b9\u03ce\u03bd
-
-browser.dialog=\u03a0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2
-browser.menu.file=\u0391\u03c1\u03c7\u03b5\u03af\u03bf
-browser.open=\u0386\u03bd\u03bf\u03b9\u03be\u03b5
-browser.exit=\u0388\u03be\u03bf\u03b4\u03bf\u03c2
-browser.menu.collection=\u03a3\u03c5\u03bb\u03bb\u03bf\u03b3\u03ae
-browser.menu.go=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5
-browser.collection.select=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a3\u03c5\u03bb\u03bb\u03bf\u03b3\u03ae\u03c2
-browser.collection.open=\u0386\u03bd\u03bf\u03b9\u03be\u03b5
-browser.collection.remove=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7
-browser.collection.close=\u039a\u03bb\u03b5\u03af\u03c3\u03b9\u03bc\u03bf
-browser.collection.new=\u039d\u03ad\u03bf
-browser.go-root=\u0391\u03c1\u03c7\u03b9\u03ba\u03ae
-browser.go-back=\u03a0\u03af\u03c3\u03c9
-browser.refresh=\u0391\u03bd\u03b1\u03bd\u03ad\u03c9\u03c3\u03b7
-browser.factory.fs.name=\u0391\u03c1\u03c7\u03b5\u03af\u03bf \u03a3\u03c5\u03c3\u03c4\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2
-browser.collection.fs.name=\u038c\u03bd\u03bf\u03bc\u03b1
-browser.collection.fs.path=\u03a6\u03ac\u03ba\u03b5\u03bb\u03bf\u03c2
-browser.collection.fs.editor-title=\u0391\u03c1\u03c7\u03b5\u03af\u03bf \u03a3\u03c5\u03bb\u03bb\u03bf\u03b3\u03ae\u03c2 \u03a3\u03c5\u03c3\u03c4\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2
-browser.collection.fs.editor-tip=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c4\u03bf \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf \u03c4\u03b7\u03c2 \u03c3\u03c5\u03bb\u03bb\u03bf\u03b3\u03ae\u03c2 \u03c3\u03b1\u03c2
-browser.collection.fs.invalid-path=\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03ce, \u03b4\u03b9\u03b1\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1\u03bd \u03ad\u03b3\u03ba\u03c5\u03c1\u03bf \u03c6\u03ac\u03ba\u03b5\u03bb\u03bf
-
-midi.port=\u0398\u03cd\u03c1\u03b1 MIDI
-midi.sequencer=\u0394\u03b9\u03b1\u03b4\u03bf\u03c7\u03ad\u03b1\u03c2 MIDI
-
-plugin.unknown-value=\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03bf.
-plugin.column.name=Plugin \u038c\u03bd\u03bf\u03bc\u03b1
-plugin.column.enabled=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=\u0391\u03c1\u03c7\u03b5\u03af\u03bf \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1
-edit.items=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-property.items=\u0399\u03b4\u03b9\u03cc\u03c4\u03b7\u03c4\u03b5\u03c2 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-track.items=\u039a\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-duration.items=\u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-beat.items=Beat \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-composition.items=\u03a3\u03cd\u03bd\u03b8\u03b5\u03c3\u03b7 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-repeat.items=\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-transport.items=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ad\u03b1\u03c2 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-marker.items=\u03a3\u03b7\u03bc\u03ac\u03b4\u03b5\u03bc\u03b1 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-insert.items=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-layout.items=\u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-view.items=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-effect.items=\u0395\u03c6\u03ad \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03b9\u03bc\u03ad\u03bd\u03c9\u03bd
-dynamic.items=\u0394\u03c5\u03bd\u03b1\u03bc\u03b9\u03ba\u03ad\u03c2 \u0391\u03bd\u03c4\u03b9\u03ba\u03b5\u03af\u03bc\u03b5\u03bd\u03b1
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=\u039d\u03ad\u03bf \u0391\u03c1\u03c7\u03b5\u03af\u03bf
-action.file.open=\u0386\u03bd\u03bf\u03b9\u03be\u03b5 \u0391\u03c1\u03c7\u03b5\u03af\u03bf
-action.file.open-url=\u0386\u03bd\u03bf\u03b9\u03be\u03b5 URL
-action.file.save=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7
-action.file.save-as=\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03a9\u03c2
-action.file.print=\u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7
-action.file.print-preview=\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7 \u0395\u03ba\u03c4\u03cd\u03c0\u03c9\u03c3\u03b7\u03c2
-action.file.exit=\u0388\u03be\u03bf\u03b4\u03bf\u03c2 TuxGuitar
-action.edit.undo=\u0391\u03bd\u03b1\u03af\u03c1\u03b5\u03c3\u03b7
-action.edit.redo=\u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7
-action.edit.voice-1=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a6\u03c9\u03bd\u03ae\u03c2 1
-action.edit.voice-2=\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03a6\u03c9\u03bd\u03ae\u03c2 2
-action.composition.change-time-signature=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03a1\u03c5\u03b8\u03bc\u03bf\u03cd
-action.composition.change-tempo=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03a4\u03ad\u03bc\u03c0\u03bf
-action.composition.change-info=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03a0\u03bb\u03b7\u03c1\u03bf\u03c6\u03bf\u03c1\u03b9\u03ce\u03bd \u03a4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd
-action.composition.change-clef=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u039a\u03bb\u03b5\u03b9\u03b4\u03b9\u03bf\u03cd
-action.composition.change-key-signature=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03a1\u03c5\u03b8\u03bc\u03bf\u03cd
-action.composition.change-triplet-feel=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c3\u03c4\u03bf feeling \u03c4\u03bf\u03c5 \u03a4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5
-action.view.layout-set-page=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2 \u03a3\u03b5\u03bb\u03af\u03b4\u03b1\u03c2
-action.view.layout-set-linear=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u0393\u03c1\u03b1\u03bc\u03bc\u03b9\u03ba\u03ae\u03c2 \u0394\u03b9\u03ac\u03c4\u03b1\u03be\u03b7\u03c2
-action.view.layout-set-multitrack=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03bf\u03bb\u03c5\u03ba\u03ac\u03bd\u03b1\u03bb\u03b7\u03c2 \u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1\u03c2
-action.view.layout-set-score-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03b1\u03c1\u03c4\u03b9\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-action.view.layout-set-tablature-enabled=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a4\u03b1\u03bc\u03c0\u03bb\u03b1\u03c4\u03bf\u03cd\u03c1\u03b1\u03c2
-action.view.layout-set-compact=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a3\u03c5\u03bc\u03c0\u03b1\u03b3\u03bf\u03cd\u03c2 \u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1\u03c2
-action.view.layout-set-chord-diagram-enabled=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u0394\u03b9\u03b1\u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03bf\u03c2 \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-action.view.layout-set-chord-name-enabled=\u0395\u03bd\u03b5\u03c1\u03b3\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u039f\u03bd\u03cc\u03bc\u03b1\u03c4\u03bf\u03c2 \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-action.view.show-fretboard=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a4\u03b1\u03c3\u03c4\u03b9\u03ad\u03c1\u03b1\u03c2
-action.view.show-piano=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03b9\u03ac\u03bd\u03bf\u03c5
-action.view.show-matrix=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u03a0\u03af\u03bd\u03b1\u03ba\u03b1
-action.view.show-mixer=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u039c\u03af\u03ba\u03c4\u03b7
-action.view.show-transport=\u03a0\u03c1\u03bf\u03b2\u03bf\u03bb\u03ae \u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ad\u03b1
-action.track.add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u039a\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-action.track.remove=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u039a\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-action.track.clone=\u039a\u03bb\u03c9\u03bd\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u039a\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-action.track.go-first=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03c0\u03c1\u03ce\u03c4\u03bf \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-action.track.go-last=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-action.track.go-next=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-action.track.go-previous=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9
-action.track.lyrics=\u0395\u03c0\u03b5\u03be\u03b5\u03c1\u03b3\u03b1\u03c3\u03af\u03b1 \u03ba\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd \u03c3\u03c4\u03bf\u03af\u03c7\u03c9\u03bd
-action.track.properties=\u0391\u03bb\u03bb\u03b1\u03b3\u03ae \u03c1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03c9\u03bd \u03ba\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd
-action.track.move-down=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03ba\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03ba\u03ac\u03c4\u03c9
-action.track.move-up=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03ba\u03bf\u03bc\u03bc\u03b1\u03c4\u03b9\u03bf\u03cd \u03c0\u03c1\u03bf\u03c2 \u03c4\u03b1 \u03c0\u03ac\u03bd\u03c9
-action.measure.add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-action.measure.remove=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-action.measure.copy=\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-action.measure.paste=\u03a0\u03c1\u03bf\u03bf\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-action.measure.clean=\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 \u03bc\u03ad\u03c4\u03c1\u03bf\u03c5
-action.measure.go-first=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c0\u03c1\u03ce\u03c4\u03bf \u03bc\u03ad\u03c4\u03c1\u03bf
-action.measure.go-last=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03c4\u03b5\u03bb\u03b5\u03c5\u03c4\u03b1\u03af\u03bf \u03bc\u03ad\u03c4\u03c1\u03bf
-action.measure.go-next=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03b1\u03c0\u03cc \u03c3\u03c4\u03bf \u03b5\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u03bc\u03ad\u03c4\u03c1\u03bf
-action.measure.go-previous=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03b1\u03c0\u03cc \u03c3\u03c4\u03bf \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03bc\u03ad\u03c4\u03c1\u03bf
-action.beat.general.remove-unused-voice=\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u039c\u03b7 \u03a7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03bf\u03cd\u03bc\u03b5\u03bd\u03b7\u03c2 \u03a6\u03c9\u03bd\u03ae\u03c2
-action.beat.general.voice-up=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b1 \u03ac\u03bd\u03c9 \u03c3\u03c4\u03b5\u03bb\u03ad\u03c7\u03b7
-action.beat.general.voice-down=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b1 \u03ba\u03ac\u03c4\u03c9 \u03c3\u03c4\u03b5\u03bb\u03ad\u03c7\u03b7
-action.beat.general.voice-auto=\u038c\u03c1\u03b9\u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc\u03bc\u03b1\u03c4\u03b1 \u03c4\u03b1 \u03c3\u03c4\u03b5\u03bb\u03ad\u03c7\u03b7
-action.beat.general.set-stroke-up=Set Upstroke
-action.beat.general.set-stroke-down=Set Downstroke
-action.beat.general.move-left=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b5 \u0388\u03bd\u03b1 Beat \u0391\u03c1\u03b9\u03c3\u03c4\u03b5\u03c1\u03ac
-action.beat.general.move-right=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b5 \u0388\u03bd\u03b1 Beat \u0394\u03b5\u03be\u03b9\u03ac
-action.beat.general.move-custom=\u039c\u03b5\u03c4\u03b1\u03ba\u03af\u03bd\u03b7\u03c3\u03b7 \u03a0\u03c1\u03bf\u03c3\u03c9\u03c0\u03bf\u03c0\u03bf\u03b9\u03b7\u03bc\u03ad\u03bd\u03bf\u03c5 Beat
-action.note.general.clean-beat=\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2 beat
-action.note.general.decrement-semitone=\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u0397\u03bc\u03b9\u03c4\u03bf\u03bd\u03af\u03bf\u03c5
-action.note.general.increment-semitone=\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u0397\u03bc\u03b9\u03c4\u03bf\u03bd\u03af\u03bf\u03c5
-action.note.general.shift-down=\u039a\u03ac\u03c4\u03c9 \u03bf\u03bb\u03af\u03c3\u03b8\u03b7\u03c3\u03b7
-action.note.general.shift-up=\u03a0\u03ac\u03bd\u03c9 \u03bf\u03bb\u03af\u03c3\u03b8\u03b7\u03c3\u03b7
-action.note.general.tied=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03a3\u03cd\u03b6\u03b5\u03c5\u03be\u03b7\u03c2
-action.note.duration.set-whole=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u03bf\u03bb\u03cc\u03ba\u03bb\u03b7\u03c1\u03bf\u03c5
-action.note.duration.set-half=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u03bc\u03b9\u03c3\u03bf\u03cd
-action.note.duration.set-quarter=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03bf\u03c5
-action.note.duration.set-eighth=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u039f\u03b3\u03b4\u03cc\u03bf\u03c5
-action.note.duration.set-sixteenth=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u0394\u03b5\u03ba\u03ac\u03c4\u03bf\u03c5-\u0388\u03ba\u03c4\u03bf\u03c5
-action.note.duration.set-thirty-second=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u03a4\u03c1\u03b9\u03b1\u03ba\u03bf\u03c3\u03c4\u03bf\u03cd-\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03bf\u03c5
-action.note.duration.set-sixty-fourth=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03c2 \u0394\u03b9\u03ac\u03c1\u03ba\u03b5\u03b9\u03b1 \u03c4\u03bf\u03c5 \u0395\u03be\u03b7\u03ba\u03bf\u03c3\u03c4\u03bf\u03cd-\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03bf\u03c5
-action.note.duration.change-dotted=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c0\u03b1\u03c1\u03b5\u03c3\u03c4\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf
-action.note.duration.change-double-dotted=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03b4\u03b9\u03c0\u03bb\u03cc \u03b4\u03b9\u03c0\u03bb\u03bf\u03cd \u03c0\u03b1\u03c1\u03b5\u03c3\u03c4\u03b9\u03b3\u03bc\u03ad\u03bd\u03bf\u03c5
-action.note.duration.change-division-type=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 \u03c4\u03c1\u03af\u03b7\u03c7\u03bf\u03c5
-action.note.duration.decrement-duration=\u039c\u03b5\u03af\u03c9\u03c3\u03b7 \u03c4\u03b7\u03c2 \u0394\u03b9\u03b1\u03c1\u03ba\u03b5\u03af\u03b1\u03c2
-action.note.duration.increment-duration=\u0391\u03cd\u03be\u03b7\u03c3\u03b7 \u03c4\u03b7\u03c2 \u0394\u03b9\u03b1\u03c1\u03ba\u03b5\u03af\u03b1\u03c2
-action.note.effect.change-vibrato=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 Vibrato
-action.note.effect.change-bend=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 bend
-action.note.effect.change-slide=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 Slide
-action.note.effect.change-hammer=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 hammer-on/pull-off
-action.note.effect.change-accentuated=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 accentuated
-action.note.effect.change-dead=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 dead note
-action.note.effect.change-fade-in=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 fade in
-action.note.effect.change-ghost=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 ghost
-action.note.effect.change-grace=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 grace
-action.note.effect.change-harmonic=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 harmonic
-action.note.effect.change-heavy-accentuated=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 heavy accentuated
-action.note.effect.change-palm-mute=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 palm mute
-action.note.effect.change-popping=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 popping
-action.note.effect.change-slapping=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 slapping
-action.note.effect.change-staccato=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 staccato
-action.note.effect.change-tapping=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 tapping
-action.note.effect.change-tremolo-bar=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 tremolo bar
-action.note.effect.change-tremolo-picking=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 tremolo picking
-action.note.effect.change-trill=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7/\u0391\u03c6\u03b1\u03af\u03c1\u03b5\u03c3\u03b7 Trill
-action.insert.open-repeat=\u0386\u03bd\u03bf\u03b9\u03be\u03b5 \u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7
-action.insert.close-repeat=\u039a\u03bb\u03b5\u03af\u03c3\u03b5 \u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7
-action.insert.repeat-alternative=\u0395\u03bd\u03b1\u03bb\u03bb\u03b1\u03ba\u03c4\u03b9\u03ba\u03ae \u0395\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7
-action.insert.chord=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03a3\u03c5\u03b3\u03c7\u03bf\u03c1\u03b4\u03af\u03b1\u03c2
-action.insert.text=\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5
-action.marker.add=\u03a0\u03c1\u03cc\u03c3\u03b8\u03b5\u03c3\u03b7 \u03a3\u03b7\u03bc\u03b1\u03b4\u03b9\u03bf\u03cd
-action.marker.go-next=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u0395\u03c0\u03cc\u03bc\u03b5\u03bd\u03bf \u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-action.marker.go-previous=\u03a0\u03ae\u03b3\u03b1\u03b9\u03bd\u03b5 \u03c3\u03c4\u03bf \u03a0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf \u03a3\u03b7\u03bc\u03ac\u03b4\u03b9
-action.transport.play=\u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae \u03a4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd
-action.transport.stop=\u039b\u03ae\u03be\u03b7 \u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ae\u03c2
-action.transport.mode=\u039b\u03b5\u03b9\u03c4\u03bf\u03c5\u03c1\u03b3\u03af\u03b1 \u0391\u03bd\u03b1\u03c0\u03b1\u03c1\u03b1\u03b3\u03c9\u03b3\u03ad\u03b1
-action.transport.metronome=\u039c\u03b5\u03c4\u03c1\u03bf\u03bd\u03cc\u03bc\u03bf\u03c2
-action.transport.set-loop-start=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03b7\u03bd \u03b1\u03c1\u03c7\u03ae \u03c4\u03b7\u03c2 \u03b5\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-action.transport.set-loop-end=\u038c\u03c1\u03b9\u03c3\u03b5 \u03c4\u03bf \u03c4\u03ad\u03bb\u03bf\u03c2 \u03c4\u03b7\u03c2 \u03b5\u03c0\u03b1\u03bd\u03ac\u03bb\u03b7\u03c8\u03b7\u03c2
-action.tools.browser=\u03a0\u03b5\u03c1\u03b9\u03b7\u03b3\u03b7\u03c4\u03ae\u03c2
-action.tools.transpose=\u039c\u03b5\u03c4\u03b1\u03c6\u03bf\u03c1\u03ac \u039d\u03cc\u03c4\u03c9\u03bd
-action.settings.configure=\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03b5\u03b9\u03c2
-action.help.doc=\u0392\u03bf\u03ae\u03b8\u03b5\u03b9\u03b1
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_en.properties b/TuxGuitar-testing/platform-all/share/lang/messages_en.properties
deleted file mode 100644
index 6bfa01d0..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_en.properties
+++ /dev/null
@@ -1,686 +0,0 @@
-ok=Ok
-cancel=Cancel
-yes=Yes
-no=No
-add=Add
-edit=Edit
-remove=Remove
-save=Save
-exit=Exit
-close=Close
-choose=Choose
-color=Color
-title=Title
-go=Go
-warning=Warning
-error=Error
-plugins=Plugins
-options=Options
-defaults=Defaults
-clean=Clean
-rename=Rename
-fret=Fret
-position=Position
-name=Name
-author=Author
-version=Version
-description=Description
-info=Info
-configure=Configure
-url=URL
-
-file=File
-file.new=New
-file.open=Open
-file.save=Save
-file.save-as=Save As
-file.save-changes-question=The song has unsaved changes.\nDo you want to save the changes?
-file.exit=Exit
-file.export=Export
-file.export-midi=Export MIDI
-file.export-pdf=Export PDF
-file.print=Print
-file.print-preview=Print Preview
-file.import=Import
-file.import-midi=Import MIDI
-file.export-ascii=Export ASCII
-file.history=History
-file.open-url=Open URL
-file.open.error=Cannot Open: {0}
-file.save.error=Cannot Save: {0}
-file.import.error=Cannot Import: {0}
-file.export.error=Cannot Export: {0}
-file.overwrite-question=This file already exists. Do you want to overwrite it?
-
-edit.menu=Edit
-edit.undo=Undo
-edit.redo=Redo
-edit.copy=Copy
-edit.from=From
-edit.to=To
-edit.all-tracks=All Tracks
-edit.paste=Paste
-edit.paste.count=Paste Count
-edit.paste.replace-mode=Paste at the Current Measure
-edit.paste.insert-mode=Paste in new Measure
-edit.delete=Delete
-edit.cut=Cut
-edit.mouse-mode-selection=Selection Mode
-edit.mouse-mode-edition=Score Edition Mode
-edit.not-natural-key=Sharp/Flat mode
-edit.voice-1=Select Voice 1
-edit.voice-2=Select Voice 2
-
-view=View
-view.layout=Layout
-view.layout.page=Page Layout
-view.layout.linear=Linear layout
-view.layout.compact=Compact
-view.layout.multitrack=Multitrack
-view.layout.chord-style=Chord Style
-view.layout.chord-name=Chord Name
-view.layout.chord-diagram=Chord Diagram
-view.layout.score-enabled=Show Score
-view.layout.tablature-enabled=Show Tablature
-view.show-mixer=Show Mixer
-view.show-fretboard=Show Fretboard
-view.show-piano=Show Piano
-view.show-matrix=Show Matrix
-view.show-transport=Show Player
-
-fretboard.direction=Direction
-fretboard.right-mode=Right mode
-fretboard.left-mode=Left mode
-fretboard.background-color=Background Color
-fretboard.display-note-text=Display Note Text
-fretboard.display-scale-text=Display Scale Text
-fretboard.font=Font
-fretboard.fretpoint-color=Fret Color
-fretboard.note-color=Note Color
-fretboard.scale-note-color=Scale Note Color
-fretboard.settings=Fretboard Settings
-fretboard.string-color=String Color
-fretboard.settings.options=Options
-
-piano.editor=Piano Editor
-piano.natural-key-color=Natural Key Color
-piano.not-natural-key-color=Unnatural Key Color
-piano.note-color=Note Color
-piano.scale-note-color=Scale Note Color
-piano.settings=Piano Settings
-
-matrix.editor=Matrix Editor
-matrix.grids=Number of Grids
-matrix.border-color=Border Color
-matrix.font=Font
-matrix.foreground-color=Foreground Color
-matrix.line-color-1=Odd Row Color
-matrix.line-color-2=Even Row Color
-matrix.line-color-over=Mouse Over Row Color
-matrix.note-color=Note Color
-matrix.play-note-color=Play Note Color
-matrix.position-color=Position Color
-matrix.settings=Matrix Settings
-
-composition=Composition
-composition.timesignature=Time Signature
-composition.timesignature.Numerator=Numerator
-composition.timesignature.denominator=Denominator
-composition.timesignature.to-the-end=To the end
-composition.tempo=Tempo
-composition.tempo-percent=Percent
-composition.tempo.invalid=Invalid Tempo
-composition.tempo.start-to-end=Apply this tempo in the whole song
-composition.tempo.position-to-end=Apply this tempo to the end
-composition.tempo.position-to-next=Apply this tempo to the next tempo marker
-composition.properties=Properties
-composition.name=Name
-composition.artist=Artist
-composition.album=Album
-composition.author=Author
-composition.date=Date
-composition.copyright=Copyright
-composition.writer=Tab Creator
-composition.transcriber=Transcribed By
-composition.comments=Comments
-composition.tripletfeel=Triplet Feel
-composition.clef=Clef
-composition.clef.treble=Treble
-composition.clef.bass=Bass
-composition.clef.tenor=Tenor
-composition.clef.alto=Alto
-composition.clef.to-the-end=Apply this clef to the end
-composition.keysignature=Key Signature
-composition.keysignature.natural=Natural
-composition.keysignature.sharp-1=1 Sharp
-composition.keysignature.sharp-2=2 Sharps
-composition.keysignature.sharp-3=3 Sharps
-composition.keysignature.sharp-4=4 Sharps
-composition.keysignature.sharp-5=5 Sharps
-composition.keysignature.sharp-6=6 Sharps
-composition.keysignature.sharp-7=7 Sharps
-composition.keysignature.flat-1=1 Flat
-composition.keysignature.flat-2=2 Flats
-composition.keysignature.flat-3=3 Flats
-composition.keysignature.flat-4=4 Flats
-composition.keysignature.flat-5=5 Flats
-composition.keysignature.flat-6=6 Flats
-composition.keysignature.flat-7=7 Flats
-composition.keysignature.to-the-end=Apply this key signature to the end
-composition.tripletfeel=Triplet Feel
-composition.tripletfeel.none=No Triplet Feel
-composition.tripletfeel.eighth=Triplet 8th
-composition.tripletfeel.sixteenth=Triplet 16th
-composition.tripletfeel.to-the-end=Apply this triplet feel to the end
-
-help=Help
-help.help=Help
-help.doc=Documentation
-help.about=About
-help.about.license=License
-help.about.authors=Authors
-help.about.description=Description
-
-track=Track
-track.number=N°
-track.name=Name
-track.color=Color
-track.first=First Track
-track.last=Last Track
-track.previous=Previous Track
-track.next=Next Track
-track.add=Add Track
-track.remove=Remove Track
-track.clone=Clone Track
-track.move-up=Move Up
-track.move-down=Move Down
-track.instrument=Instrument 
-track.properties=Properties
-track.properties.general=General
-track.name.default-percussion-name=Percussion
-track.lyrics=Lyrics
-track.solo=Solo
-track.mute=Mute
-
-lyric.editor=Lyric Editor
-
-measure=Measure
-measure.first=First Measure
-measure.last=Last Measure
-measure.previous=Previous Measure
-measure.next=Next Measure
-measure.add=Add Measure
-measure.add.count=Add Count
-measure.add-before-current-position=Add measure before the current position
-measure.add-after-current-position=Add measure after the current position
-measure.add-at-end=Add measure at the end
-measure.remove=Remove Measure
-measure.copy=Copy Measure
-measure.paste=Paste Measure
-measure.clean=Clean Measure
-
-duration=Duration
-duration.whole=Whole
-duration.half=Half
-duration.quarter=Quarter
-duration.eighth=Eighth
-duration.sixteenth=Sixteenth
-duration.thirtysecond=Thirty-Second
-duration.sixtyfourth=Sixty-Fourth
-duration.dotted=Dotted
-duration.doubledotted=Double Dotted
-duration.division-type=Triplet
-
-dynamic=Dynamic
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Effects
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Dead Note
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Accentuated Note
-effects.heavyaccentuatednote=Heavy Accentuated Note
-effects.harmonic=Harmonic
-effects.grace=Grace Note
-effects.grace-editor=Grace Note Editor
-effects.grace.before-beat=Before beat
-effects.grace.on-beat=On beat
-effects.grace.transition=Transition
-effects.grace.transition-none=None
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Left Hand
-effects.harmonic.tapped.right-hand=Right Hand
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-bend.editor=Bend Editor
-bend.bend=Bend
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Player
-transport.start=Start
-transport.stop=Stop
-transport.pause=Pause
-transport.first=First
-transport.last=Last
-transport.previous=Previous
-transport.next=Next
-transport.metronome=Metronome
-transport.mode=Play Mode
-transport.mode.simple=Simple Mode
-transport.mode.simple.tempo-percent=Percentage of tempo
-transport.mode.simple.loop=Play looped
-transport.mode.trainer=Training Mode
-transport.mode.trainer.increment-description=Increment by
-transport.mode.loop-range=Loop Range
-transport.mode.loop-range.from=Play from measure
-transport.mode.loop-range.from-default=From the beginning
-transport.mode.loop-range.to=Play to measure
-transport.mode.loop-range.to-default=To the end
-transport.set-loop-start=Set loop start point
-transport.set-loop-end=Set loop end point
-
-instruments.volume=Gain
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.volume=Volume
-instrument.balance=Balance
-instrument.chorus=Chorus
-instrument.reverb=Reverb
-instrument.phaser=Phaser
-instrument.tremolo=Tremolo
-instrument.free=Free
-instrument.link=Link
-
-
-repeat.open=Open Repeat
-repeat.close=Close Repeat
-repeat.alternative=Alternative Repeats
-repeat.alternative.editor=Edit Alternative Repeats
-repetitions=Repetitions
-repeat.number-of-repetitions=Number of Repetitions
-
-beat=Beat
-beat.clean=Clean Beat
-beat.voice.remove-unused=Remove Unused Voice
-beat.voice-up=Stems Up
-beat.voice-down=Stems Down
-beat.voice-auto=Auto Stems
-beat.stroke=Stroke
-beat.stroke-up=Upstroke
-beat.stroke-down=Downstroke
-beat.move-left=Move One Beat Left
-beat.move-right=Move One Beat Right
-beat.move-custom=Custom Beat Move
-beat.move-custom.dialog.title=Custom Move
-beat.move-custom.dialog.direction-tip=Move Direction
-beat.move-custom.dialog.move-1.tip=Major Move
-beat.move-custom.dialog.move-2.tip=Fine Move
-beat.move-custom.dialog.direction=Direction
-beat.move-custom.dialog.direction.right=Move To Right
-beat.move-custom.dialog.direction.left=Move To Left
-beat.move-custom.dialog.count=Count
-beat.move-custom.dialog.duration=Duration
-beat.move-custom.dialog.duration.type=Dotted/Double-Dotted
-beat.move-custom.dialog.duration.type.normal=None
-beat.move-custom.dialog.duration.division-type=Division Type
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tuplet)
-
-note=Note
-note.semitone-up=Semitone Up
-note.semitone-down=Semitone Down
-note.shift-up=Shift Up
-note.shift-down=Shift Down
-note.tiednote=Tied Note
-note.deadnote=Dead Note
-
-insert.chord=Insert Chord
-chord.editor=Chord Editor
-chord=Chord
-chord.name=Name
-chord.bass=Bass
-chord.custom=Custom Chord
-chord.custom.name-empty-error=Chord name can not be empty.
-chord.custom.name-exist-error=Chord name already exists.
-chord.settings.tip=Custom Settings
-chord.settings.type=Type
-chord.settings.type.most-common=Most Common
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=Close Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Open Chords
-chord.settings.chords-to-display=Chords to Display
-chord.settings.search-frets=Search Frets
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=Percussion Track
-
-tuning=Tuning
-tuning.offset=Offset
-tuning.strings=Strings
-tuning.strings.transpose=Transpose afected notes.
-tuning.strings.transpose.try-keep-strings=Try keep notes at same string
-tuning.strings.transpose.apply-to-chords=Transpose Chords
-
-language=Language
-
-choose-color=Choose a color
-
-settings=Settings
-settings.config=Configure TuxGuitar
-settings.config.language=Language
-settings.config.language.choose=Choose Language
-settings.config.styles=Styles
-settings.config.styles.general=General Styles
-settings.config.styles.printer=Printer Styles
-settings.config.styles.font.default=Default Font
-settings.config.styles.font.note=Note Font
-settings.config.styles.font.lyric=Lyrics Font
-settings.config.styles.font.text=Text Font
-settings.config.styles.font.time-signature=Time Signature Font
-settings.config.styles.font.printer-default=Printer Default Font
-settings.config.styles.font.printer-note=Printer Note Font
-settings.config.styles.font.printer-time-signature=Printer Time Signature Font
-settings.config.styles.color.score-note=Score Note Color
-settings.config.styles.color.tab-note=Tab Note Color
-settings.config.styles.color.play-note=Play Note Color
-settings.config.apply-changes-question=Do you want to apply changes now?
-settings.config.sound=Sound
-settings.config.main=General
-settings.config.main.window-title=Window Title
-settings.config.main.window-title.help=The following variables will be replaced at the window title:
-settings.config.main.window-title.var.description.appname=This variable represents the Application Name: TuxGuitar
-settings.config.main.window-title.var.description.appversion=This variable represents the version of TuxGuitar.
-settings.config.main.window-title.var.description.filename=This variable represents the name of the opened file
-settings.config.main.window-title.var.description.filepath=This variable represents the path of the opened file
-settings.config.main.window-title.var.description.songname=This variable represents the name of the song
-settings.config.main.window-title.var.description.songauthor=This variable represents the author of the song
-settings.config.main.window-title.var.description.songalbum=This variable represents the album of the song
-settings.config.main.window-title.var.description.songartist=This variable represents the artist of the song
-settings.config.main.options=Options
-settings.config.main.splash-enabled=Launch splash screen on startup
-settings.config.main.table.auto-size.enabled=Enable Automatic Table resizing
-settings.config.styles.color.lines=Horizontal lines color
-settings.config.toolbars=Tool Bars
-settings.config.toolbars.tip=Customize Your ToolBars
-settings.config.toolbars.list=Available ToolBars
-settings.config.toolbars.move-up=Move Up
-settings.config.toolbars.move-down=Move Down
-settings.config.skin=Skins
-settings.config.skin.choose=Choose your skin
-settings.keybindings=Configure Key Bindings
-
-key-bindings-editor=Key Binding Editor
-key-bindings-editor-action-select=Select an Action
-key-bindings-editor-action-column=Actions
-key-bindings-editor-shortcut-column=Keys
-key-bindings-editor-push-a-key=Press a key
-key-bindings-editor-save-question=There are unsaved changes, do you want to exit without saving?
-
-key-bindings-editor-override=Shortcut already in use! Are you sure you want to use it?
-
-print.print=Print
-print.dialog=Print
-print.service=Service
-print.service.name=Name
-print.service.status=Status
-print.service.type=Type
-print.service.info=Info
-print.range=Range
-print.range.all-pages=All
-print.range.pages=Pages
-print.range.pages-to=To
-print.copies=Copies
-print.copies-number=Number of copies
-print.print-to-file=Print to file
-print.file-chooser=Choose
-print-header.default-song-name=Untitled
-print-header.default-song-author=Anonymous
-
-print.preview=Print Preview
-print.preview.page-of=Of
-
-marker=Marker
-marker.add=Add Marker
-marker.list=List Markers
-marker.first=Go First Marker
-marker.last=Go Last Marker
-marker.next=Go Next Marker
-marker.previous=Go Previous Marker
-
-export.tablature-enabled=Show Tablature
-export.score-enabled=Show Score
-export.chord-name-enabled=Show Chord Names
-export.chord-diagram-enabled=Show Chord Diagrams
-export.black-and-white=Black And White Mode
-
-scale=Scale
-scale.list=Scale List
-
-text.insert=Insert Text
-text.editor=Text Editor
-text.text=Text
-
-tools=Tools
-tools.scale=Scale list
-tools.browser=Browser
-tools.plugins=Plugins
-tools.shortcuts=Shortcuts
-tools.settings=Settings
-
-tools.transpose=Transpose
-tools.transpose.semitones=Transposition Semitones
-tools.transpose.apply-to-track=Transpose all measures
-tools.transpose.apply-to-measure=Transpose only this measure
-tools.transpose.apply-to-all-tracks=Apply to all tracks
-tools.transpose.try-keep-strings=Try keep notes at same string when it's possible
-tools.transpose.apply-to-chords=Transpose Chords
-
-browser.dialog=Browser
-browser.menu.file=File
-browser.open=Open
-browser.exit=Exit
-browser.menu.collection=Collection
-browser.menu.go=Go
-browser.collection.select=Select Collection
-browser.collection.open=Open
-browser.collection.remove=Remove
-browser.collection.close=Close
-browser.collection.new=New
-browser.go-root=Home
-browser.go-back=Back
-browser.refresh=Refresh
-browser.factory.fs.name=File System
-browser.collection.fs.name=Name
-browser.collection.fs.path=Folder
-browser.collection.fs.editor-title=File System Collection
-browser.collection.fs.editor-tip=Choose your collection folder
-browser.collection.fs.invalid-path=Please, select a valid folder
-
-midi.port=MIDI Port
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=Not available.
-plugin.column.name=Plugin Name
-plugin.column.enabled=Enabled
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=File Items
-edit.items=Edit Items
-property.items=Property Items
-track.items=Track Items
-duration.items=Duration Items
-beat.items=Beat Items
-composition.items=Composition Items
-repeat.items=Repeat Items
-transport.items=Player Items
-marker.items=Marker Items
-insert.items=Insert Items
-layout.items=Layout Items
-view.items=View Items
-effect.items=Effect Items
-dynamic.items=Dynamic Items
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=New File
-action.file.open=Open File
-action.file.open-url=Open URL
-action.file.save=Save
-action.file.save-as=Save As
-action.file.print=Print
-action.file.print-preview=Print Preview
-action.file.exit=Exit TuxGuitar
-action.edit.undo=Undo
-action.edit.redo=Redo
-action.edit.voice-1=Select Voice 1
-action.edit.voice-2=Select Voice 2
-action.composition.change-time-signature=Change Time Signature
-action.composition.change-tempo=Change Tempo
-action.composition.change-info=Change Song Information
-action.composition.change-clef=Change Clef
-action.composition.change-key-signature=Change Key Signature
-action.composition.change-triplet-feel=Change Triplet Feel
-action.view.layout-set-page=Show Page Layout
-action.view.layout-set-linear=Show Linear Layout
-action.view.layout-set-multitrack=Show Multitrack Mode
-action.view.layout-set-score-enabled=Show Score
-action.view.layout-set-tablature-enabled=Show Tablature
-action.view.layout-set-compact=Show Compact Mode
-action.view.layout-set-chord-diagram-enabled=Enable Chord Diagram
-action.view.layout-set-chord-name-enabled=Enable Chord Name
-action.view.show-fretboard=Show Fretboard
-action.view.show-piano=Show Piano
-action.view.show-matrix=Show Matrix
-action.view.show-mixer=Show Mixer
-action.view.show-transport=Show Player
-action.track.add=Add Track
-action.track.remove=Remove Track
-action.track.clone=Clone Track
-action.track.go-first=Go to first track
-action.track.go-last=Go to last track
-action.track.go-next=Go to next track
-action.track.go-previous=Go to previous track
-action.track.lyrics=Edit track lyrics
-action.track.properties=Change track properties
-action.track.move-down=Move track down
-action.track.move-up=Move track up
-action.measure.add=Add measure
-action.measure.remove=Remove measure
-action.measure.copy=Copy measure
-action.measure.paste=Paste measure
-action.measure.clean=Clean measure
-action.measure.go-first=Go to first measure
-action.measure.go-last=Go to last measure
-action.measure.go-next=Go to next measure
-action.measure.go-previous=Go to previous measure
-action.beat.general.remove-unused-voice=Remove Unused Voice
-action.beat.general.voice-up=Set Stems Up
-action.beat.general.voice-down=Set Stems Down
-action.beat.general.voice-auto=Set Auto Stems
-action.beat.general.set-stroke-up=Set Upstroke
-action.beat.general.set-stroke-down=Set Downstroke
-action.beat.general.move-left=Move One Beat Left
-action.beat.general.move-right=Move One Beat Right
-action.beat.general.move-custom=Custom Beat Move
-action.note.general.clean-beat=Clean beat
-action.note.general.decrement-semitone=Decrement semitone
-action.note.general.increment-semitone=Increment semitone
-action.note.general.shift-down=Shift down
-action.note.general.shift-up=Shift up
-action.note.general.tied=Add/Remove tied
-action.note.duration.set-whole=Set Whole Duration
-action.note.duration.set-half=Set Half Duration
-action.note.duration.set-quarter=Set Quarter Duration
-action.note.duration.set-eighth=Set Eighth Duration
-action.note.duration.set-sixteenth=Set Sixteenth Duration
-action.note.duration.set-thirty-second=Set Thirty Second Duration
-action.note.duration.set-sixty-fourth=Set Sixty Fourth Duration
-action.note.duration.change-dotted=Add/Remove dot
-action.note.duration.change-double-dotted=Add/Remove double dotted
-action.note.duration.change-division-type=Add/Remove triplet
-action.note.duration.decrement-duration=Decrement Duration
-action.note.duration.increment-duration=Increment Duration
-action.note.effect.change-vibrato=Add/Remove Vibrato
-action.note.effect.change-bend=Add/Remove bend
-action.note.effect.change-slide=Add/Remove Slide
-action.note.effect.change-hammer=Add/Remove hammer-on/pull-off
-action.note.effect.change-accentuated=Add/Remove accentuated
-action.note.effect.change-dead=Add/Remove dead note
-action.note.effect.change-fade-in=Add/Remove fade in
-action.note.effect.change-ghost=Add/Remove ghost
-action.note.effect.change-grace=Add/Remove grace
-action.note.effect.change-harmonic=Add/Remove harmonic
-action.note.effect.change-heavy-accentuated=Add/Remove heavy accentuated
-action.note.effect.change-palm-mute=Add/Remove palm mute
-action.note.effect.change-popping=Add/Remove popping
-action.note.effect.change-slapping=Add/Remove slapping
-action.note.effect.change-staccato=Add/Remove staccato
-action.note.effect.change-tapping=Add/Remove tapping
-action.note.effect.change-tremolo-bar=Add/Remove tremolo bar
-action.note.effect.change-tremolo-picking=Add/Remove tremolo picking
-action.note.effect.change-trill=Add/Remove Trill
-action.insert.open-repeat=Open Repeat
-action.insert.close-repeat=Close Repeat
-action.insert.repeat-alternative=Repeat Alternative
-action.insert.chord=Insert Chord
-action.insert.text=Insert Text
-action.marker.add=Add Marker
-action.marker.go-next=Go Next Marker
-action.marker.go-previous=Go Previous Marker
-action.transport.play=Play Song
-action.transport.stop=Stop Playing
-action.transport.mode=Player Mode
-action.transport.metronome=Metrononome
-action.transport.set-loop-start=Set loop start point
-action.transport.set-loop-end=Set loop end point
-action.tools.browser=Browser
-action.tools.transpose=Transpose Notes
-action.settings.configure=Settings
-action.help.doc=Help
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_es.properties b/TuxGuitar-testing/platform-all/share/lang/messages_es.properties
deleted file mode 100644
index 89b7be45..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_es.properties
+++ /dev/null
@@ -1,680 +0,0 @@
-ok=Aceptar
-cancel=Cancelar
-yes=Si
-no=No
-add=Agregar
-remove=Borrar
-save=Guardar
-exit=Salir
-close=Cerrar
-color=Color
-title=T\u00EDtulo
-edit=Editar
-go=Ir
-error=Error
-warning=Aviso
-plugins=Plugins
-choose=Seleccionar
-plugins=Plugins
-options=Opciones
-defaults=Predeterminados
-clean=Limpiar
-rename=Renombrar
-fret=Cejilla
-position=Posici\u00F3n
-info=Informaci\u00F3n
-name=Nombre
-author=Autor
-version=Versi\u00F3n
-description=Descripci\u00F3n
-configure=Configurar
-
-tuxguitar.title=TuxGuitar
-
-file=Archivo
-file.new=Nuevo
-file.open=Abrir
-file.open-url=Abrir URL
-file.open.error=No se pudo abrir el archivo: {0}
-file.save=Guardar
-file.save-as=Guardar Como
-file.save.error=No se pudo guardar el archivo: {0}
-file.save-changes-question=El archivo tiene cambios sin guardar.\nDesea guardar los cambios?
-file.exit=Salir
-file.export=Exportar
-file.export-midi=Exportar Midi
-file.export-pdf=Exportar PDF
-file.print=Imprimir
-file.print-preview=Vista Preliminar
-file.import=Importar
-file.import.error=No se pudo importar: {0}
-file.export-ascii=Exportar ASCII
-file.export.error=No se pudo exportar: {0}
-file.history=Historial
-file.overwrite-question=El archivo ya existe, desea reemplazarlo?
-
-edit.menu=Edici\u00F3n
-edit.undo=Deshacer
-edit.redo=Rehacer
-edit.copy=Copiar
-edit.from=Desde
-edit.to=Hasta
-edit.all-tracks=Todas las pistas
-edit.paste=Pegar
-edit.paste.count=Cantidad de pegados
-edit.paste.replace-mode=Pegar en el comp\u00E1s actual
-edit.paste.insert-mode=Pegar en nuevo comp\u00E1s
-edit.delete=Borrar
-edit.cut=Cortar
-edit.mouse-mode-selection=Cambiar puntero a modo de selecci\u00F3n
-edit.mouse-mode-edition=Cambiar puntero a modo de edici\u00F3n
-edit.not-natural-key=Sostenido/Bemol
-edit.voice-1=Seleccionar Primer Voz
-edit.voice-2=Seleccionar Segunda Voz
-
-view=Ver
-view.layout=Ver
-view.layout.page=Modo P\u00E1gina
-view.layout.linear=Modo Linear 
-view.layout.multitrack=Multipista
-view.layout.compact=Modo Compacto
-view.layout.score-enabled=Mostrar Partitura
-view.layout.tablature-enabled=Mostrar Tablatura
-view.layout.chord-style=Estilo de Acordes
-view.layout.chord-name=Mostrar Nombre
-view.layout.chord-diagram=Mostrar Diagrama
-view.show-transport=Mostrar Reproductor
-view.show-mixer=Mostrar Mezclador
-view.show-piano=Mostrar Piano
-view.show-matrix=Mostrar Editor de Matrices
-view.show-fretboard=Mostrar M\u00E1stil
-
-fretboard.direction=Direcci\u00F3n
-fretboard.background-color=Color de fondo
-fretboard.font=Fuente
-fretboard.fretpoint-color=Color de marcadores de posici\u00F3n
-fretboard.note-color=Color de notas
-fretboard.scale-note-color=Color de notas de escala
-fretboard.string-color=Color de cuerdas
-fretboard.settings=Preferencias
-fretboard.settings.options=Opciones
-fretboard.display-note-text=Mostrar notas en modo de texto
-fretboard.display-scale-text=Mostrar notas de escala en modo de texto
-fretboard.right-mode=Hacia la derecha
-fretboard.left-mode=Hacia la izquierda
-
-piano.editor=Piano
-piano.natural-key-color=Color de teclas naturales
-piano.not-natural-key-color=Color de teclas Sostenido/Bemol
-piano.note-color=Color de notas
-piano.scale-note-color=Color de notas de escala
-piano.settings=Preferencias
-
-matrix.editor=Editor de Matrices
-matrix.grids=Grillas
-matrix.font=Fuente
-matrix.border-color=Color de bordes
-matrix.foreground-color=Color de fuente y lineas divisorias
-matrix.line-color-1=Color de linea #1
-matrix.line-color-2=Color de linea #2
-matrix.line-color-over=Color de linea seleccionada
-matrix.note-color=Color de notas
-matrix.play-note-color=Color de notas reproduciendo
-matrix.position-color=Color de pulso
-matrix.settings=Preferencias
-
-composition=Composici\u00F3n
-composition.timesignature=Time Signature
-composition.timesignature.Numerator=Numerador
-composition.timesignature.denominator=Denominador
-composition.timesignature.to-the-end=Hasta el final
-composition.tempo=Tiempo
-composition.tempo-percent=Porcentaje
-composition.tempo.start-to-end=Aplicar a todos los compases
-composition.tempo.position-to-end=Aplicar hasta el final
-composition.tempo.position-to-next=Aplicar hasta la pr\u00F3xima marca de tiempo
-composition.tempo.invalid=Tempo inv\u00E1lido
-composition.properties=Propiedades
-composition.name=Nombre
-composition.artist=Artista
-composition.album=Album
-composition.author=Autor
-composition.date=Fecha
-composition.copyright=Derechos de autor
-composition.writer=Creador
-composition.transcriber=Transcrito por
-composition.comments=Comentarios
-composition.clef=Clave
-composition.clef.treble=Treble
-composition.clef.bass=Bass
-composition.clef.tenor=Tenor
-composition.clef.alto=Alto
-composition.clef.to-the-end=Aplicar esta clave hasta el final
-composition.keysignature=Armadura
-composition.keysignature.natural=Natural
-composition.keysignature.sharp-1=1 Sostenido
-composition.keysignature.sharp-2=2 Sostenidos
-composition.keysignature.sharp-3=3 Sostenidos
-composition.keysignature.sharp-4=4 Sostenidos
-composition.keysignature.sharp-5=5 Sostenidos
-composition.keysignature.sharp-6=6 Sostenidos
-composition.keysignature.sharp-7=7 Sostenidos
-composition.keysignature.flat-1=1 Bemol
-composition.keysignature.flat-2=2 Bemoles
-composition.keysignature.flat-3=3 Bemoles
-composition.keysignature.flat-4=4 Bemoles
-composition.keysignature.flat-5=5 Bemoles
-composition.keysignature.flat-6=6 Bemoles
-composition.keysignature.flat-7=7 Bemoles
-composition.keysignature.to-the-end=Aplicar esta armadura hasta el final
-composition.tripletfeel=Aspecto de Tresillos
-composition.tripletfeel.none=Aspecto normal
-composition.tripletfeel.eighth=Aspecto de tresillos en corcheas
-composition.tripletfeel.sixteenth=Aspecto de tresillos en semi-corcheas
-composition.tripletfeel.to-the-end=Aplicar hasta el final
-
-help=Ayuda
-help.help=Ayuda
-help.doc=Documentaci\u00F3n
-help.about=Acerca de
-help.about.license=Licencia
-help.about.authors=Autores
-help.about.description=Descripci\u00F3n
-
-instruments.volume=Ganancia
-instrument.volume=Volumen
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=Balance
-instrument.free=Libre
-instrument.link=Ligado
-
-track=Pista
-track.number=N°
-track.name=Nombre
-track.color=Color
-track.first=Primera
-track.last=Ultima
-track.previous=Anterior
-track.next=Siguiente
-track.add=Agregar pista
-track.remove=Borrar pista
-track.instrument=Instrumento
-track.properties=Propiedades
-track.properties.general=General
-track.clone=Clonar Pista
-track.move-up=Mover Arriba
-track.move-down=Mover Abajo
-track.name.default-percussion-name=Percusi\u00F3n
-track.lyrics=Editar letras
-track.solo=Solo
-track.mute=Silencio
-
-lyric.editor=Editor de letras
-
-measure=Comp\u00E1s
-measure.first=Primero
-measure.last=\u00DAltimo
-measure.previous=Anterior
-measure.next=Siguiente
-measure.add=Agregar comp\u00E1s
-measure.add.count=Cantidad de compases
-measure.remove=Borrar comp\u00E1s
-measure.copy=Copiar comp\u00E1s
-measure.paste=Pegar comp\u00E1s
-measure.clean=Limpiar comp\u00E1s
-measure.add-before-current-position=Agregar comp\u00E1s antes de la posici\u00F3n actual
-measure.add-after-current-position=Agregar comp\u00E1s despues de la posici\u00F3n actual
-measure.add-at-end=Agregar comp\u00E1s al final
-
-beat=Pulso
-beat.clean=Limpiar Pulso
-beat.voice.remove-unused=Eliminar la voz no utilizada
-beat.voice-up=Notas hacia arriba
-beat.voice-down=Notas hacia abajo
-beat.voice-auto=Direcci\u00F3n de notas automatica
-beat.stroke=Rasgueo
-beat.stroke-up=Rasgueo ascendente
-beat.stroke-down=Rasgueo decendente
-beat.move-left=Mover un pulso hacia la izquierda
-beat.move-right=Mover un pulso hacia la derecha
-beat.move-custom=Movimiento de pulso personalizado
-beat.move-custom.dialog.title=Movimiento de pulso personalizado
-beat.move-custom.dialog.direction-tip=Direcci\u00F3n del movimiento
-beat.move-custom.dialog.move-1.tip=Movimiento primario
-beat.move-custom.dialog.move-2.tip=Movimiento secundario
-beat.move-custom.dialog.direction=Direcci\u00F3n
-beat.move-custom.dialog.direction.right=Mover hacia la derecha
-beat.move-custom.dialog.direction.left=Mover hacia la izquierda
-beat.move-custom.dialog.count=Cantidad
-beat.move-custom.dialog.duration=Duraci\u00F3n
-beat.move-custom.dialog.duration.type=Puntillo/Doble-Puntillo
-beat.move-custom.dialog.duration.type.normal=Normal
-beat.move-custom.dialog.duration.division-type=Tipo de divisiones
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tupleto)
-
-note.tiednote=Ligar Nota
-note.semitone-up=Subir un semitono
-note.semitone-down=Bajar un semitono
-note.shift-up=Subir una cuerda
-note.shift-down=Bajar una cuerda
-
-duration=Duraci\u00F3n
-duration.whole=Redonda
-duration.half=Blanca
-duration.quarter=Negra
-duration.eighth=Corchea
-duration.sixteenth=Semi-Corchea
-duration.thirtysecond=Fusa
-duration.sixtyfourth=Semi-Fusa
-duration.dotted=Puntillo
-duration.doubledotted=Doble Puntillo
-duration.division-type=Tresillo
-
-effects=Efectos
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Nota Muerta
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Accentuated Note
-effects.heavyaccentuatednote=Heavy Accentuated Note
-effects.harmonic=Harmonic
-effects.grace=Grace Note
-effects.grace-editor=Grace Note Editor
-effects.grace.before-beat=Before beat
-effects.grace.on-beat=On beat
-effects.grace.transition=Transition
-effects.grace.transition-none=None
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Left hand
-effects.harmonic.tapped.right-hand=Right hand
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-
-bend.editor=Editor de Bend
-bend.bend=Bend
-bend.bend-release=bend/release
-bend.bend-release-bend=bend/release/bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-dynamic=Dynamic
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-insert.chord=Insertar Acorde
-
-chord.editor=Editor de Acordes
-chord=Acorde
-chord.name=Nombre
-chord.custom=Acorde Personalizado
-chord.custom.name-empty-error=El nombre del acorde es obligatorio.
-chord.custom.name-exist-error=Ya existe un acorde con este nombre.
-chord.bass=Bajo
-chord.settings.tip=Preferencias
-chord.settings.type=Tipo
-chord.settings.type.most-common=Most Common
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=Close Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Open Chords
-chord.settings.chords-to-display=Acordes a mostrar
-chord.settings.search-frets=Trastes
-chord.settings.minimum-fret=M\u00EDnimo
-chord.settings.maximum-fret=M\u00E1ximo
-
-transport=Reproductor
-transport.start=Reproducir
-transport.pause=Pausar
-transport.stop=Parar
-transport.first=Primer Compas
-transport.last=\u00DAltimo Compas
-transport.previous=Compas Anterior
-transport.next=Siguiente Compas
-transport.mode=Modo de Reproducci\u00F3n
-transport.mode.simple=Modo Normal
-transport.mode.simple.tempo-percent=Porcentaje de tiempo
-transport.mode.simple.loop=Repetir infinitamente
-transport.mode.trainer=Modo de Entrenamiento
-transport.mode.trainer.increment-description=Incrementar porcentaje
-transport.mode.loop-range=Rango de Repeticiones
-transport.mode.loop-range.from=Reproducir desde el comp\u00E1s
-transport.mode.loop-range.from-default=Desde el principio
-transport.mode.loop-range.to=Reproducir hasta el comp\u00E1s
-transport.mode.loop-range.to-default=Hasta el final
-transport.set-loop-start=Marcar inicio de repetici\u00F3n
-transport.set-loop-end=Marcar final de repetici\u00F3n
-
-repetitions=Repeticiones
-repeat.open=Abrir Repetici\u00F3n
-repeat.close=Cerrar Repetici\u00F3n
-repeat.number-of-repetitions=N\u00FAmero de repeticiones
-repeat.alternative=Repetici\u00F3n Alternativa
-repeat.alternative.editor=Editar Repetici\u00F3n Alternativa
-
-instrument=Instrumento
-instrument.instrument=Instrumento
-instrument.percussion-track=Pista de percusi\u00F3n
-
-tuning=Afinaci\u00F3n
-tuning.offset=Offset
-tuning.strings=Cuerdas
-tuning.strings.transpose=Transponer notas afectadas
-tuning.strings.transpose.try-keep-strings=Mantener notas en la misma cuerda si es posible
-tuning.strings.transpose.apply-to-chords=Transponer acordes
-
-language=Idioma
-
-choose-color=Seleccione un color
-
-settings=Opciones
-settings.config=Configurar TuxGuitar
-settings.config.main=General
-settings.config.main.window-title=T\u00EDtulo de la ventana
-settings.config.main.window-title.help=Las siguientes variables seran reemplazadas en el t\u00EDtulo:
-settings.config.main.window-title.var.description.appname=Representa el nombre de la aplicaci\u00F3n: TuxGuitar.
-settings.config.main.window-title.var.description.appversion=Representa la versi\u00F3n actual de tuxguitar.
-settings.config.main.window-title.var.description.filename=Representa el nombre del archivo que se esta editando.
-settings.config.main.window-title.var.description.filepath=Representa la ruta del archivo que se esta editando.
-settings.config.main.window-title.var.description.songname=Representa el nombre de la canci\u00F3n actual.
-settings.config.main.window-title.var.description.songauthor=Representa el autor de la canci\u00F3n actual.
-settings.config.main.window-title.var.description.songalbum=Representa el album de la canci\u00F3n actual.
-settings.config.main.window-title.var.description.songartist=Representa el artista de la canci\u00F3n actual.
-settings.config.main.options=Opciones
-settings.config.main.splash-enabled=Mostrar el splash al inicio.
-settings.config.main.table.auto-size.enabled=Ajustar autom\u00E1ticamente el tama\u00F1o de la previsualizaci\u00F3n de pistas
-settings.config.view=Vista
-settings.config.view.mode=Modo de vista
-settings.config.view.size=Ajustes de la ventana
-settings.config.view.size.maximized=Maximizada
-settings.config.view.size.width=Ancho
-settings.config.view.size.height=Alto
-settings.config.language=Idioma
-settings.config.language.choose=Seleccione su idioma
-settings.config.styles=Estilos
-settings.config.styles.general=Estilos Generales
-settings.config.styles.font.default=Fuente por Defecto
-settings.config.styles.font.note=Fuente de Notas
-settings.config.styles.font.time-signature=Fuente de Time Signature
-settings.config.styles.font.lyric=Fuente de Letras
-settings.config.styles.font.text=Fuente de Textos
-settings.config.styles.color.score-note=Color de Notas de Partitura
-settings.config.styles.color.tab-note=Color de Notas de Tablatura
-settings.config.styles.color.play-note=Color de Notas en Reproduccion
-settings.config.styles.color.lines=Color de Lineas Divisorias
-settings.config.styles.printer=Estilos de Impresion
-settings.config.styles.font.printer-default=Fuente por Defecto
-settings.config.styles.font.printer-note=Fuente de Notas
-settings.config.styles.font.printer-time-signature=Fuente de Time Signature
-settings.config.apply-changes-question=Desea aplicar los cambios ahora?
-settings.config.sound=Sonido
-settings.config.skin=Tema de Iconos
-settings.config.skin.choose=Seleccione su Tema de Iconos
-settings.config.toolbars=Barra de Herramientas
-settings.config.toolbars.tip=Personalice su Barra de Herramientas
-settings.config.toolbars.list=Herramientas Disponibles
-settings.config.toolbars.move-up=Mover Arriba
-settings.config.toolbars.move-down=Mover Abajo
-
-settings.keybindings=Configurar Teclas
-key-bindings-editor=Editor de Teclas
-key-bindings-editor-action-select=Seleccione Una Acci\u00F3n
-key-bindings-editor-action-column=Acciones
-key-bindings-editor-shortcut-column=Teclas
-key-bindings-editor-push-a-key=Presione una Tecla
-key-bindings-editor-save-question=Se encontraron cambios sin guardar, desea salir de todos modos?
-key-bindings-editor-override=Ya existe una acci\u00F3n para estas teclas, desea sobreescibirla?
-
-
-print.print=Imprimir
-print.dialog=Imprimir
-print.service=Servicio
-print.service.name=Nombre
-print.service.status=Estado
-print.service.type=Tipo
-print.service.info=Informaci\u00F3n
-print.range=Rango
-print.range.all-pages=Todas las p\u00E1ginas
-print.range.pages=P\u00E1ginas
-print.range.pages-to=A
-print.copies=Copias
-print.copies-number=Numero de copias
-print.print-to-file=Imprimir a archivo
-print.file-chooser=Examinar
-print-header.default-song-name=Sin T\u00EDtulo
-print-header.default-song-author=An\u00F3nimo
-print.preview=Vista Preliminar
-
-marker=Marca
-marker.add=Agregar Marca
-marker.list=Mostrar Marcas
-marker.first=Primera
-marker.last=Ultima
-marker.next=Siguiente
-marker.previous=Anterior
-
-export.tablature-enabled=Mostrar tablatura
-export.score-enabled=Mostrar partitura
-export.black-and-white=Modo Blanco y Negro
-
-scale=Escala
-scale.list=Lista de escalas
-
-text.insert=Insertar Texto
-text.editor=Editor de Texto
-text.text=Texto
-
-tools=Herramientas
-tools.scale=Lista de Escalas
-tools.browser=Explorador de Canciones
-tools.plugins=Configurar Plugins
-tools.shortcuts=Atajos del Teclado
-tools.settings=Preferencias
-tools.transpose=Transponer
-tools.transpose.semitones=Transponer semitonos
-tools.transpose.apply-to-track=Transponer todos los compases
-tools.transpose.apply-to-measure=Transponer solo este compas
-tools.transpose.apply-to-all-tracks=Aplicar a todas las pistas
-tools.transpose.try-keep-strings=Mantener notas en la misma cuerda si es posible
-tools.transpose.apply-to-chords=Transponer acordes
-
-browser.dialog=Explorador de Canciones
-browser.menu.file=Archivo
-browser.open=Abrir
-browser.exit=Salir
-browser.menu.collection=Colecci\u00F3n
-browser.menu.go=Ir
-browser.collection.select=Seleccionar Colecci\u00F3n
-browser.collection.open=Arbir Colecci\u00F3n
-browser.collection.remove=Eliminar Colecci\u00F3n
-browser.collection.close=Cerrar Colecci\u00F3n
-browser.collection.new=A\u00F1adir Colecci\u00F3n
-browser.go-root=Inicio
-browser.go-back=Volver
-browser.refresh=Actualizar
-browser.factory.fs.name=Sistema de Archivos Local
-browser.collection.fs.name=Nombre
-browser.collection.fs.path=Ubicaci\u00F3n
-browser.collection.fs.editor-title=Colecci\u00F3n de Archivos Locales
-browser.collection.fs.editor-tip=Seleccione una Carpeta 
-browser.collection.fs.invalid-path=La carpeta seleccionada es inv\u00E1lida
-
-midi.port=Puerto MIDI
-midi.sequencer=Secuenciador MIDI
-
-plugin.unknown-value=No Disponible
-plugin.column.name=Nombre del Plugin
-plugin.column.enabled=Activo
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Herramientas de archivo
-edit.items=Herramientas de edici\u00F3n
-property.items=Propiedades de canci\u00F3n
-track.items=Herramientas de pistas
-duration.items=Duraciones
-beat.items=Herramientas de pulso
-composition.items=Herramientas de composici\u00F3n
-transport.items=Acciones de reproducci\u00F3n
-marker.items=Acciones de marcas
-layout.items=vista de modos
-view.items=vista de componentes
-effect.items=Effectos
-dynamic.items=Dynamics
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nuevo archivo
-action.file.open=Abrir archivo
-action.file.open-url=Abrir URL
-
-action.file.save=Guardar
-action.file.save-as=Guardar como
-action.file.print=Imprimir
-action.file.print-preview=Vista Preliminar
-action.file.exit=Cerrar Aplicaci\u00F3n
-action.edit.undo=Deshacer
-action.edit.redo=Rehacer
-action.edit.voice-1=Seleccionar Primer Voz
-action.edit.voice-2=Seleccionar Segunda Voz
-action.composition.change-time-signature=Cambiar time-signature
-action.composition.change-tempo=Cambiar tiempo
-action.composition.change-info=Cambiar informaci\u00F3n de la canci\u00F3n
-action.composition.change-clef=Cambiar clave
-action.composition.change-key-signature=Cambiar armadura
-action.composition.change-triplet-feel=Aspecto de tresillos
-action.view.layout-set-page=Ver modo p\u00E1gina
-action.view.layout-set-linear=Ver modo linear
-action.view.layout-set-multitrack=Ver modo multipista
-action.view.layout-set-compact=Ver Modo compacto
-action.view.layout-set-score-enabled=Mostrar partitura
-action.view.layout-set-tablature-enabled=Mostrar tablatura
-action.view.layout-set-chord-diagram-enabled=Mostrar diagrama de acordes
-action.view.layout-set-chord-name-enabled=Mostrar nombre de acordes
-action.view.show-fretboard=Mostrar m\u00E1stil
-action.view.show-piano=Mostrar piano
-action.view.show-matrix=Mostrar Editor de Matrices
-action.view.show-mixer=Mostrar mezclador de sonidos
-action.view.show-transport=Mostrar Reproductor
-action.track.add=Insertar Pista
-action.track.remove=Borrar pista
-action.track.clone=Clonar Pista
-action.track.go-first=Ir a la primer pista
-action.track.go-last=Ir a la \u00FAltima pista
-action.track.go-next=Ir a la siguiente pista
-action.track.go-previous=Ir a la pista anterior
-action.track.move-down=Mover Abajo
-action.track.move-up=Mover Arriba
-action.track.lyrics=Editar letras
-action.track.properties=Editar propiedades de la pista
-action.measure.add=Agregar Comp\u00E1s
-action.measure.remove=Borrar comp\u00E1s
-action.measure.copy=Copiar comp\u00E1s
-action.measure.paste=Pegar comp\u00E1s
-action.measure.clean=Limpiar comp\u00E1s
-action.measure.go-first=Ir al primer comp\u00E1s
-action.measure.go-last=Ir al \u00FAltimo comp\u00E1s
-action.measure.go-next=Ir al siguiente comp\u00E1s
-action.measure.go-previous=Ir al comp\u00E1s anterior
-action.beat.general.remove-unused-voice=Eliminar la voz no utilizada
-action.beat.general.voice-up=Notas hacia arriba
-action.beat.general.voice-down=Notas hacia abajo
-action.beat.general.voice-auto=Direcci\u00F3n de notas automatica
-action.beat.general.set-stroke-up=Rasgueo ascendente
-action.beat.general.set-stroke-down=Rasgueo decendente
-action.beat.general.move-left=Mover un pulso hacia la izquierda
-action.beat.general.move-right=Mover un pulso hacia la derecha
-action.beat.general.move-custom=Movimiento de pulso personalizado
-action.note.general.clean-beat=Limpiar pulso
-action.note.general.decrement-semitone=Bajar un semitono
-action.note.general.increment-semitone=Subir un semitono
-action.note.general.shift-down=Bajar una cuerda
-action.note.general.shift-up=Subir una cuerda
-action.note.general.tied=Agregar/Quitar ligadura
-action.note.duration.change-dotted=Agregar/Quitar puntillo
-action.note.duration.change-double-dotted=Agregar/Quitar doble puntillo
-action.note.duration.change-division-type=Agregar/Quitar tresillo
-action.note.duration.set-whole=Asignar duraci\u00F3n de redonda
-action.note.duration.set-half=Asignar duraci\u00F3n de blanca
-action.note.duration.set-quarter=Asignar duraci\u00F3n de negra
-action.note.duration.set-eighth=Asignar duraci\u00F3n de corchea
-action.note.duration.set-sixteenth=Asignar duraci\u00F3n de semi-Corchea
-action.note.duration.set-thirty-second=Asignar duraci\u00F3n de fusa
-action.note.duration.set-sixty-fourth=Asignar duraci\u00F3n de semi-fusa
-action.note.duration.decrement-duration=Disminuir duraci\u00F3n
-action.note.duration.increment-duration=Aumentar duraci\u00F3n
-action.note.effect.change-vibrato=Agregar/Quitar vibrato
-action.note.effect.change-bend=Agregar/Quitar bend
-action.note.effect.change-slide=Agregar/Quitar slide
-action.note.effect.change-hammer=Agregar/Quitar martillo
-action.note.effect.change-accentuated=Agregar/Quitar accentuated
-action.note.effect.change-dead=Agregar/Quitar dead note
-action.note.effect.change-fade-in=Agregar/Quitar fade in
-action.note.effect.change-ghost=Agregar/Quitar ghost
-action.note.effect.change-grace=Agregar/Quitar grace
-action.note.effect.change-harmonic=Agregar/Quitar harmonic
-action.note.effect.change-heavy-accentuated=Agregar/Quitar heavy accentuated
-action.note.effect.change-palm-mute=Agregar/Quitar palm mute
-action.note.effect.change-popping=Agregar/Quitar popping
-action.note.effect.change-slapping=Agregar/Quitar slapping
-action.note.effect.change-staccato=Agregar/Quitar staccato
-action.note.effect.change-tapping=Agregar/Quitar tapping
-action.note.effect.change-tremolo-bar=Agregar/Quitar tremolo bar
-action.note.effect.change-tremolo-picking=Agregar/Quitar tremolo picking
-action.note.effect.change-trill=Agregar/Quitar trill
-action.insert.open-repeat=Abrir repetici\u00F3n
-action.insert.close-repeat=Cerrar repetici\u00F3n
-action.insert.chord=Insertar acorde
-action.insert.text=Insertar texto
-action.insert.repeat-alternative=Insertar repetici\u00F3n alternativa
-action.marker.add=Agregar marca
-action.marker.go-next=Ir a la siguiente marca
-action.marker.go-previous=Ir a la marca anterior
-action.transport.play=Reproducir tema
-action.transport.stop=Parar reproducci\u00F3n
-action.transport.metronome=Activar/Desactivar metr\u00F3nonomo
-action.transport.mode=Modo de reproducci\u00F3n
-action.transport.set-loop-start=Marcar inicio de repetici\u00F3n
-action.transport.set-loop-end=Marcar final de repetici\u00F3n
-action.tools.browser=Explorador de canciones
-action.tools.transpose=Transponer notas
-action.settings.configure=Editar preferencias
-action.help.doc=Ayuda
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_eu.properties b/TuxGuitar-testing/platform-all/share/lang/messages_eu.properties
deleted file mode 100644
index 65d3f82d..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_eu.properties
+++ /dev/null
@@ -1,1101 +0,0 @@
-transport.mode.loop-range=Errepikatu Range
-transport.mode.loop-range.from=Play from measure
-transport.mode.loop-range.from-default=Hasieratik
-transport.mode.loop-range.to=Play to measure
-transport.mode.loop-range.to-default=Bukaeraino
-edit.voice-1=1.go Ahotsa hautatu
-edit.voice-2=2. Ahotsa hautatu
-
-tools.transpose=Transpose
-tools.transpose.semitones=Transposition Semitones
-tools.transpose.apply-to-track=Transpose all measures
-tools.transpose.apply-to-measure=Transpose only this measure
-tools.transpose.apply-to-all-tracks=Apply to all tracks
-tools.transpose.try-keep-strings=Try keep notes at same string when it's possible
-tools.transpose.apply-to-chords=Transpose Chords
-
-action.tools.transpose=Transpose Notes
-
-tuning.strings.transpose=Transpose afected notes.
-tuning.strings.transpose.try-keep-strings=Try keep notes at same string
-tuning.strings.transpose.apply-to-chords=Transpose Chords
-
-composition.date=Data
-composition.copyright="Copyright"-a
-composition.writer=Tab Autorea
-composition.transcriber=Transkribatu duenak
-composition.comments=Iruzkinak
-
-beat.move-left=Move One Beat Left
-beat.move-right=Move One Beat Right
-beat.move-custom=Custom Beat Move
-beat.move-custom.dialog.title=Custom Move
-beat.move-custom.dialog.direction-tip=Move Norabidea
-beat.move-custom.dialog.move-1.tip=Primary Move
-beat.move-custom.dialog.move-2.tip=Secondary Move
-beat.move-custom.dialog.direction=Norabidea
-beat.move-custom.dialog.direction.right=Move To Right
-beat.move-custom.dialog.direction.left=Move To Left
-beat.move-custom.dialog.count=Zenbaketa
-beat.move-custom.dialog.duration=Duration
-beat.move-custom.dialog.duration.type=Dotted/Double-Dotted
-beat.move-custom.dialog.duration.type.normal=Ezer
-beat.move-custom.dialog.duration.division-type=Division Type
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tuplet)
-
-action.beat.general.move-left=Move One Beat Left
-action.beat.general.move-right=Move One Beat Right
-action.beat.general.move-custom=Custom Beat Move
-
-measure.add.count=Add Count
-edit.paste.count=Paste Count
-
-export.black-and-white=Beltz-Txuri moduan
-
-fretboard.direction=Norabidea
-
-transport.set-loop-start=Set loop start point
-transport.set-loop-end=Set loop end point
-
-action.transport.set-loop-start=Set loop start point
-action.transport.set-loop-end=Set loop end point
-
-
-ok=Baieztatu
-
-cancel=Ezeztatu
-
-yes=Bai
-
-no=Ez
-
-add=Gehitu
-
-remove=Ezabatu
-
-save=Gorde
-
-exit=Irten
-
-close=Itxi
-
-color=Kolorea
-
-title=Izenburua
-edit=Edizio
-
-go=Joan
-
-error=Akatxa
-
-warning=Oharra
-
-plugins=Plugin-ak
-
-choose=Autatu
-
-plugins=Plugins
-
-options=Opzioak
-
-defaults=Predeterminatutak
-
-clean=Clean
-
-rename=Birnombratu
-
-fret=Cejilla
-
-position=Posizioa
-
-info=Informazioa
-
-name=Izena
-
-author=Autorea
-
-version=Bertsioa
-
-description=Deskribapena
-
-configure=Konfigurazioa
-
-
-tuxguitar.title=TuxGuitar
-
-
-file=Fitxategia
-
-file.new=Berria
-
-file.open=Ireki
-
-file.open-url=Ireki URL-a
-
-file.open.error=Fitxategia ezin da ireki: {0}
-
-file.save=Gorde
-
-file.save-as=Gorde beste izenarekin
-
-file.save.error=Fitxategia gortetzea ez da posible: {0}
-
-file.save-changes-question=Fitxategia aldaketak ditu, Gorde nahi al dituzu?
-
-file.exit=Irten
-
-file.export=Exportatu
-
-file.export-midi=Exportatu Midi
-
-file.export-pdf=Exportatu PDF
-
-file.print=imprimatu
-
-file.print-preview=Itxura Preliminarra
-file.import=Importatu
-
-file.import.error=Ez da posible izan: {0}
-
-file.export-ascii=Exportatu ASCII formatu-ra
-
-file.export.error=Ez da posible izan: {0}
-
-file.history=Historiala
-
-file.overwrite-question=Badago Fitxategi bat izen honekin, Ordezkatu nahi duzu?
-
-
-edit.menu=Edizio
-
-edit.undo=Desegin
-
-edit.redo=Berriro egin
-
-edit.copy=Kopiatu
-
-edit.from=-tik
-edit.to=-raino
-
-edit.all-tracks=Pista guztiak
-
-edit.paste=itsatsi
-
-edit.paste.replace-mode=itsatsi Kompas honetan
-
-edit.paste.insert-mode=itsatsi kompas berri batean
-edit.delete=Ezabatu
-
-edit.cut=Moztu
-edit.mouse-mode-selection=Aldatu punteroa hautatzeko modura
-
-edit.mouse-mode-edition=Aldatu punteroa edizio modura
-
-edit.not-natural-key=Diesi/Bemola
-
-
-view=Ikusi
-
-view.layout=Ikusi
-
-view.layout.page=Horri Moduan
-
-view.layout.linear=Modo Linealean 
-
-view.layout.multitrack=Multipista moduan
-
-view.layout.compact=Modu kompaktoan
-
-view.layout.score-enabled=Erakutsi Partitura
-
-view.layout.tablature-enabled=Erakutsi Tablatura
-
-view.layout.chord-style=Akordeen Estiloa
-
-view.layout.chord-name=Izena erakutsi
-
-view.layout.chord-diagram=Erakutsi Diagrama
-
-view.show-transport=Erakutsi Reproduktorea
-
-view.show-mixer=Erakutsi mixer-a
-
-view.show-piano=Erakutsi Pianoa
-
-view.show-matrix=Mostrar Editor de Matrices
-
-view.show-fretboard=Mastila erakutsi
-
-
-fretboard.background-color=Color de fondo
-
-fretboard.font=Fuente
-
-fretboard.fretpoint-color=Posizio markaren kolorea
-
-fretboard.note-color=Noten kolorea
-
-fretboard.scale-note-color=Eskalako Noten Koloreak
-
-fretboard.string-color=Harien Koloreak
-
-fretboard.settings=Preferencias
-
-fretboard.settings.options=Opzioak
-
-fretboard.display-note-text=Erakutsi notak textu moduan
-fretboard.display-scale-text=Erakutsi eskalen notak textu moduan
-
-fretboard.right-mode=Eskubira
-
-fretboard.left-mode=Ezkerrera
-
-
-piano.editor=Pianoa
-
-piano.natural-key-color=Color de teclas naturales
-
-piano.not-natural-key-color=Color de teclas Sostenido/Bemol
-
-piano.note-color=Color de notas
-
-piano.scale-note-color=Color de notas de escala
-
-piano.settings=Preferencias
-
-
-matrix.editor=Editor de Matrices
-
-matrix.grids=Grillas
-
-matrix.font=Fuente
-
-matrix.border-color=Color de bordes
-
-matrix.foreground-color=Color de fuente y lineas divisorias
-
-matrix.line-color-1=Color de linea #1
-
-matrix.line-color-2=Color de linea #2
-
-matrix.line-color-over=Color de linea seleccionada
-
-matrix.note-color=Color de notas
-
-matrix.play-note-color=Color de notas reproduciendo
-
-matrix.position-color=Color de pulso
-
-matrix.settings=Preferencias
-
-
-composition=Komposizioa
-
-composition.timesignature=Time Signature
-composition.timesignature.Numerator=Numerador
-composition.timesignature.denominator=Denominador
-composition.timesignature.to-the-end=Bukaera Arte
-composition.tempo=Tiempo
-composition.tempo-percent=Porzentaia
-composition.tempo.start-to-end=aplikatu kompas guztiei
-composition.tempo.position-to-end=aplikatu bukatu arte
-composition.tempo.position-to-next=aplikatu hurrengo dembora-markaraino
-
-composition.tempo.invalid=Tempo inv\u00E1lido
-composition.properties=Propietateak
-
-composition.name=Izena
-
-composition.artist=Artista
-
-composition.album=Albuma
-
-composition.author=Autorea
-
-composition.clef=Klavea
-
-composition.clef.treble=Treble
-
-composition.clef.bass=Bass
-
-composition.clef.tenor=Tenor
-
-composition.clef.alto=Alto
-
-composition.clef.to-the-end=aplikatu klave hau bukatu arte
-composition.keysignature=Armadura
-composition.keysignature.natural=Natural
-
-composition.keysignature.sharp-1=1 Sostenido
-composition.keysignature.sharp-2=2 Sostenido
-composition.keysignature.sharp-3=3 Sostenido
-composition.keysignature.sharp-4=4 Sostenido
-composition.keysignature.sharp-5=5 sostenido
-composition.keysignature.sharp-6=6 Sostenido
-composition.keysignature.sharp-7=7 Sostenido
-composition.keysignature.flat-1=1 Bemol
-
-composition.keysignature.flat-2=2 Bemol
-
-composition.keysignature.flat-3=3 Bemol
-
-composition.keysignature.flat-4=4 Bemol
-composition.keysignature.flat-5=5 Bemol
-
-composition.keysignature.flat-6=6 Bemol
-
-composition.keysignature.flat-7=7 Bemol
-composition.keysignature.to-the-end=aplikatu armadura hau bukatu arte
-composition.tripletfeel=Aspecto de Tresillos
-composition.tripletfeel.none=Aspecto normal
-composition.tripletfeel.eighth=Aspecto de tresillos en corcheas
-composition.tripletfeel.sixteenth=Aspecto de tresillos en semi-corcheas
-composition.tripletfeel.to-the-end=aplikatu bukaera arte
-
-
-help=Laguntza
-
-help.help=Laguntza
-
-help.doc=Dokumentazioa
-
-help.about=Honi Buruz
-
-help.about.license=Lizentziari buruz
-
-help.about.authors=Autoreak 
-
-
-help.about.description=Deskribapena
-
-
-instruments.volume=Ganancia
-
-instrument.volume=Bolumena
-
-instrument.channel=CH
-
-instrument.effect-channel=EC
-
-instrument.balance=Balance
-instrument.free=Libre
-instrument.link=Ligado
-
-
-track=Pista
-
-track.number=N°
-
-track.name=Izena
-
-track.color=Kolorea
-
-track.first=Lehengoa
-
-track.last=Azkena
-
-track.previous=Aurrekoa
-
-track.next=Hurrengoa
-
-track.add=Jarri pista
-
-track.remove=Kendu pista
-
-track.instrument=Instrumentua
-
-track.properties=Propietateak
-
-track.properties.general=General
-
-track.clone=Klonatu Pista
-
-track.move-up=Goruntz
-
-track.move-down=Beheruntz
-
-track.name.default-percussion-name=Perkusioa
-
-track.solo=Solo
-
-track.mute=Isildu
-
-track.lyrics=Letren Edizioa
-
-
-lyric.editor=Letren editorea
-
-
-measure=Kompasa
-
-measure.first=Lehenengoa
-
-measure.last=Azkena
-
-measure.previous=Aurrekoa
-measure.next=Hurrengoa
-
-measure.add=Jarri Kompas bat
-measure.remove=Kendu kompasa
-
-measure.copy=Kopiatu Kompasa
-
-measure.paste=itsatsi Kompasa
-measure.clean=Ezabatu Kompasa
-measure.add-before-current-position=Jarri kompasa/k Posizio hau baino lehen
-
-measure.add-after-current-position=Jarri kompasa/k Posizio hau eta gero
-measure.add-at-end=Jarri kompasa azkenean
-
-
-beat=Neurria
-
-beat.clean=Ezabatu neurria
-
-
-note.tiednote=Ligar Nota
-
-note.semitone-up=Subir un semitono
-
-note.semitone-down=Bajar un semitono
-
-note.shift-up=Hari bat goruntz
-note.shift-down=Hari bat beheruntz
-
-duration=Durazioa
-
-duration.whole=Biribila
-
-duration.half=Zuria
-duration.quarter=Beltza
-
-duration.eighth=Kortxea
-
-duration.sixteenth=Semi-Kortxea
-
-duration.thirtysecond=Fusa
-
-duration.sixtyfourth=Semi-Fusa
-
-duration.dotted=Puntiloa
-
-duration.doubledotted=Puntilo Doblea
-duration.tupleto=Tresiloa
-
-
-effects=Efektoak
-
-effects.vibrato=Bibrato
-
-effects.bend=Bend
-
-effects.deadnote=Nota muerta
-effects.slide=Slide
-
-effects.hammer=Hammer-on/Pull-off
-
-effects.tremolo-bar=Tremolo Bar
-
-effects.tremolo-bar-editor=Tremolo Bar Editor
-
-effects.tremolo-bar.dip=Dip
-
-effects.tremolo-bar.dive=Dive
-
-effects.tremolo-bar.release-up=Release Up
-
-effects.tremolo-bar.release-down=Release Down
-
-effects.tremolo-bar.inverted-dip=Inverted Dip
-
-effects.tremolo-bar.return=Return
-
-effects.ghostnote=Ghost Note
-
-effects.accentuatednote=Accentuated Note
-effects.heavyaccentuatednote=Heavy Accentuated Note
-effects.harmonic=armonikoa
-effects.grace=Grace Note
-
-effects.grace-editor=Grace Note Editor
-
-effects.grace.before-beat=Before beat
-
-effects.grace.on-beat=On beat
-
-effects.grace.transition=Transizioa
-
-effects.grace.transition-none=Ezer
-
-effects.grace.transition-bend=Bend
-
-effects.grace.transition-slide=Slide
-
-effects.grace.transition-hammer=Hammer
-
-effects.trill=Trill
-
-effects.trill-editor=Trill Editor
-
-effects.tremolo-picking=Tremolo Picking
-
-effects.tremolo-picking-editor=Tremolo Picking Editor
-
-effects.palm-mute=Palm Mute
-
-effects.staccato=Staccato
-
-effects.tapping=Tapping
-
-effects.slapping=Slapping
-
-effects.popping=Popping
-effects.fade-in=Fade In
-effects.harmonic-editor=Harmonic Editor
-
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key offset
-effects.harmonic.tapped=Tapped Harmonic
-
-effects.harmonic.tapped.left-hand=Left hand
-effects.harmonic.tapped.right-hand=Right hand
-effects.harmonic.pinch=Pinch Harmonic
-
-effects.harmonic.semi=Semi Harmonic
-
-
-
-bend.editor=Bend Editorea
-
-bend.bend=Bend
-
-bend.bend-release=bend/release
-
-bend.bend-release-bend=bend/release/bend
-
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-
-dynamic=Dinamika
-
-dynamic.piano-pianissimo=Piano Pianissimo
-
-dynamic.pianissimo=Pianissimo
-
-dynamic.piano=Piano
-
-dynamic.mezzo-piano=Mezzo Piano
-
-dynamic.mezzo-forte=Mezzo Forte
-
-dynamic.forte=Forte
-
-dynamic.fortissimo=Fortissimo
-dynamic.forte-fortissimo=Forte Fortissimo
-
-
-insert.chord=Jarri Akorde Bat
-
-chord.editor=Akorde Editorea
-
-chord=Akordea
-
-chord.name=Izena
-
-chord.custom=Acorde Personalizado
-
-chord.custom.name-empty-error=Izena Beharrezkoa da.
-
-chord.custom.name-exist-error=Badago akorde bat izen honekin.
-chord.bass=Baxua
-
-chord.settings.tip=Preferencias
-
-chord.settings.type=Tipoa
-
-chord.settings.type.most-common=Most Common
-chord.settings.type.inversions=Inbersioak
-
-chord.settings.type.close-voiced=Close Voiced
-
-chord.settings.type.open-voiced=Open Voiced
-
-chord.settings.open-chords=Open Chords
-
-chord.settings.chords-to-display=Erakusteko prest dauden Akordeak
-
-chord.settings.search-frets=Trasteak
-chord.settings.minimum-fret=Gutxienik
-chord.settings.maximum-fret=Gehienik
-
-transport=Reproduktorea
-
-transport.start=Reproducir
-
-transport.pause=Pausa egin
-
-transport.stop=Gelditu
-
-transport.first=Lehenengo neurria
-
-transport.last=Azken neurria
-
-transport.previous=Aurreko neurria
-
-transport.next=Hurrengo neurria
-transport.mode=Erreproduzio modua
-transport.mode.simple=Modu Normalean
-
-transport.mode.simple.tempo-percent=Denbora Porzentaia
-transport.mode.simple.loop=Errepikatu infinitoki
-transport.mode.trainer=Modo de Entrenamiento
-transport.mode.trainer.increment-description=Areagotu porzentaia 
-
-repetitions=Errepikapenak
-
-repeat.open=Ireki errepikapena
-
-repeat.close=Itxi errepikapena
-
-repeat.number-of-repetitions=Zenbat errepikapen
-repeat.alternative=Errepikapen Alternatiboa
-repeat.alternative.editor=Editar Repetici\u00F3n Alternativa
-
-instrument=Instrumentua
-instrument.instrument=Instrumentoa
-instrument.percussion-track=Perkusio pista
-
-
-tuning=Doinua
-tuning.strings=Hariak
-
-tuning.offset=Offset
-
-
-language=Hizkuntza
-
-
-choose-color=Kolore bat autatu
-
-
-settings=Opzioak
-
-settings.config=Configurar TuxGuitar
-
-settings.config.main=Generalak
-
-settings.config.main.window-title=Izenburua
-
-settings.config.main.window-title.help=Hurrengo Bariableak Izenburua aldazen dute :
-
-settings.config.main.window-title.var.description.appname=Representa el nombre de la aplicaci\u00F3n: TuxGuitar.
-
-settings.config.main.window-title.var.description.appversion=Representa la versi\u00F3n actual de tuxguitar.
-
-settings.config.main.window-title.var.description.filename=Representa el nombre del Fitxategia que se esta editando.
-
-settings.config.main.window-title.var.description.filepath=Representa la ruta del Fitxategia que se esta editando.
-
-settings.config.main.window-title.var.description.songname=Orain irekita dagoen abestiaren izena ordezkatzen du.
-
-settings.config.main.window-title.var.description.songauthor=Orain irekita dagoen abestiaren autorea ordezkatzen du.
-
-settings.config.main.window-title.var.description.songalbum=Orain irekita dagoen abestiaren albuma ordezkatzen du.
-
-settings.config.main.window-title.var.description.songartist=Representa el artista de la canci\u00F3n actual.
-
-settings.config.main.options=Opzioak
-
-settings.config.main.splash-enabled=Mostrar el splash al inicio.
-
-settings.config.main.table.auto-size.enabled=Ajustar autom\u00E1ticamente el tama\u00F1o de la previsualizaci\u00F3n de pistas
-
-settings.config.view=Vista
-
-settings.config.view.mode=Modo de vista
-
-settings.config.view.size=Ajustes de la ventana
-
-settings.config.view.size.maximized=Maximizada
-
-settings.config.view.size.width=Ancho
-
-settings.config.view.size.height=Alto
-
-settings.config.language=Hizkuntza
-
-settings.config.language.choose=Autatu Hizkuntza
-settings.config.styles=Estiloak
-
-settings.config.styles.general=Estilo Generalak
-settings.config.styles.font.default=Fuente por Defecto
-
-settings.config.styles.font.note=Fuente de Notas
-
-settings.config.styles.font.time-signature=Fuente de Time Signature
-
-settings.config.styles.font.lyric=Fuente de Letras
-
-settings.config.styles.font.text=Fuente de Textos
-
-settings.config.styles.color.score-note=Color de Notas de Partitura
-
-settings.config.styles.color.tab-note=Color de Notas de Tablatura
-
-settings.config.styles.color.play-note=Color de Notas en Reproduccion
-
-settings.config.styles.color.lines=Color de Lineas Divisorias
-
-settings.config.styles.printer=Estilos de Impresion
-
-settings.config.styles.font.printer-default=Fuente por Defecto
-
-settings.config.styles.font.printer-note=Fuente de Notas
-
-settings.config.styles.font.printer-time-signature=Fuente de Time Signature
-
-settings.config.apply-changes-question=Aldaketak orain aplikatu nahi al dituzu?
-
-settings.config.sound=Doinua
-
-settings.config.skin=Tema de Iconos
-
-settings.config.skin.choose=Seleccione su Tema de Iconos
-
-settings.config.toolbars=Tresna Barra
-
-settings.config.toolbars.tip=Personalice su Barra de Herramientas
-
-settings.config.toolbars.list=Herramientas Disponibles
-
-settings.config.toolbars.move-up=Mugi gora
-settings.config.toolbars.move-down=Mugi Behera
-
-
-settings.keybindings=Configurar Teclas
-
-key-bindings-editor=Editor de Teclas
-
-key-bindings-editor-action-select=Seleccione Una Acci\u00F3n
-
-key-bindings-editor-action-column=ekintzak
-
-key-bindings-editor-shortcut-column=Teclak
-key-bindings-editor-push-a-key=Sakatu tekla bat
-key-bindings-editor-save-question=Aldaketak aurkitu dira, irten nahi al duzu?
-
-key-bindings-editor-override=Badago ekintz bat tekla hauekin, aldatu nahi al duzu berri honekin?
-
-
-
-print.print=imprimatu
-print.dialog=imprimatu
-
-print.service=Servitzua
-
-print.service.name=Izena
-
-print.service.status=Egoera
-
-print.service.type=Tipoa
-
-print.service.info=Informazioa
-
-print.range=Rango
-
-print.range.all-pages=Horri guztiak
-
-print.range.pages=Horriak
-
-print.range.pages-to=A
-
-print.copies=Kopiak
-
-print.copies-number=Zenbat Kopiak
-
-print.print-to-file=imprimatu fitxategi batera
-
-print.file-chooser=Examinar
-
-print-header.default-song-name=Izenburu gabea
-
-print-header.default-song-author=Anonimoa
-
-print.preview=Vista Preliminar
-
-marker=Marka
-
-marker.add=Marka jarri
-
-marker.list=Erakutsi Markak
-
-marker.first=Lehengoa
-
-marker.last=Azkena
-
-marker.next=Hurrengoa
-
-marker.previous=Aurrekoa
-
-export.tablature-enabled=tablatura erakutsi
-export.score-enabled=partitura erakutsi
-
-scale=Eskalak
-scale.list=Eskalen lista
-
-
-text.insert=Textua idatzi
-
-text.editor=Textu editorea
-
-text.text=Textua
-
-
-tools=Tresnak
-
-tools.scale=Eskala Lista
-tools.browser=Abesti exploratzailea
-
-tools.plugins=Plugin-ak Konfiguratu
-tools.shortcuts=Atajos del Teclado
-
-tools.settings=Preferencias
-
-
-browser.dialog=Abestio Exploratzailea
-
-browser.menu.file=Fitxategia
-
-browser.open=Ireki
-
-browser.exit=Irten
-
-browser.menu.collection=Kolekzioa
-browser.menu.go=Joan
-browser.collection.select=Hautatu Kolekzioa
-
-browser.collection.open=Ireki Kolekzioa
-
-browser.collection.remove=Ezabatu Kolekzioa
-browser.collection.close=Itxi Kolekzioa
-
-browser.collection.new=Kolekzio berria
-browser.go-root=Hasiera
-
-browser.go-back=Itzuli
-
-browser.refresh=Actualizar
-
-browser.factory.fs.name=Fitxategi Sistema Lokala
-
-browser.collection.fs.name=Izena
-browser.collection.fs.path=Ubikazioa
-
-browser.collection.fs.editor-title=Colecci\u00F3n de Fitxategi Localak
-
-browser.collection.fs.editor-tip=Seleccione una Carpeta 
-browser.collection.fs.invalid-path=La carpeta seleccionada es inv\u00E1lida
-
-
-midi.port=Puerto MIDI
-
-midi.sequencer=Secuenciador MIDI
-
-
-plugin.unknown-value=Ez dago hautagai
-plugin.column.name=Plugin-aren Izena
-
-plugin.column.enabled=Martxan
-
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-
-file.items=Fitxategiatarako tresnak
-
-edit.items=Ediziorako tresnak
-
-property.items=abestiaren propietateak
-track.items=Pisteetarako tresnak
-
-duration.items=Duraciones
-
-beat.items=pultsu tresnak
-
-composition.items=Komposiziorako tresnak
-
-transport.items=Acciones de reproducci\u00F3n
-
-marker.items=Acciones de marcas
-
-layout.items=vista de modos
-
-view.items=vista de componentes
-
-effect.items=Efektoak
-
-dynamic.items=Dinamikak
-
-
-#########################
-###Key Binding Actions###
-#########################
-
-action.file.new=Fitxategi berria
-
-action.file.open=Ireki Fitxategia
-
-action.file.open-url=Ireki URL
-
-action.file.save=Gorde
-
-action.file.save-as=Gorde beste izenarekin
-action.file.print=imprimatu
-
-action.file.print-preview=Vista Preliminar
-
-action.file.exit=Itxi
-
-action.edit.undo=Desegin
-
-action.edit.redo=Beregin
-
-action.composition.change-time-signature=Cambiar time-signature
-
-action.composition.change-tempo=Aldatu Dembora
-
-action.composition.change-info=Abestiaren informazioa aldatu
-action.composition.change-clef=Klabea aldatu
-action.composition.change-key-signature=Cambiar armadura
-
-action.composition.change-triplet-feel=Aspecto de tresillos
-
-action.view.layout-set-page=Ikusi horri moduan
-
-action.view.layout-set-linear=Ikusi modu linealean
-
-action.view.layout-set-multitrack=Ikusi multipista moduan
-action.view.layout-set-compact=Ikusi modu kompaktoan
-
-action.view.layout-set-score-enabled=Erakutsi partitura
-
-action.view.layout-set-tablature-enabled=Erakutsi tablatura
-
-action.view.layout-set-chord-diagram-enabled=Erakutsi akordeen diagramak
-
-action.view.layout-set-chord-name-enabled=Erakutsi akordeen izenak
-action.view.show-fretboard=Erakutsi masta
-
-action.view.show-piano=Erakutsi pianoa
-action.view.show-matrix=Mostrar Editor de Matrices
-
-action.view.show-mixer=Mostrar mezclador de sonidos
-
-action.view.show-transport=Mostrar Reproductor
-
-action.track.add=Jarri Pista Berri bat
-action.track.remove=Ezabatu pista
-
-action.track.clone=Klonatu Pista
-
-action.track.go-first=Lehenengo pistaraino
-action.track.go-last=Azken pistaraino
-
-action.track.go-next=Hurrengo pistara
-
-action.track.go-previous=Aurreko pistaraino
-action.track.move-down=Mover Abajo
-
-action.track.move-up=Mover Arriba
-
-action.track.lyrics=Editar letras
-
-action.track.properties=Editatu Pistaren Propietateak
-action.measure.add=Jarri kompas berri bat
-
-action.measure.remove=Ezabatu kompasa
-
-action.measure.copy=Kopiatu kompasa
-
-action.measure.paste=itsatsi Kompasa
-
-action.measure.clean=Limpiar comp\u00E1s
-
-action.measure.go-first=Lehengo kompasaraino
-
-action.measure.go-last=Azken kompasaraino
-
-action.measure.go-next=Hurrengo kompasaraino
-
-action.measure.go-previous=Aurreko kompasera
-
-action.note.general.clean-beat=Limpiar pulso
-action.note.general.decrement-semitone=Semitono bat beheruntz
-action.note.general.increment-semitone=Semitono bat goruntz
-action.note.general.shift-down=Bajar una cuerda
-action.note.general.shift-up=Subir una cuerda
-action.note.general.tied=Jarri/Kendu ligadura
-action.note.duration.change-dotted=Jarri/Kendu puntillo
-action.note.duration.change-double-dotted=Jarri/Kendu doble puntillo
-action.note.duration.change-tupleto=Jarri/Kendu tresillo
-action.note.duration.set-whole=Biribilaren neurria jarri
-
-action.note.duration.set-half=Zuriaren neurria jarri
-
-action.note.duration.set-quarter=Beltzaren neurria jarri
-
-action.note.duration.set-eighth=Asignar duraci\u00F3n de corchea
-action.note.duration.set-sixteenth=Asignar duraci\u00F3n de semi-corchea
-
-action.note.duration.set-thirty-second=Asignar duraci\u00F3n de fusa
-
-action.note.duration.set-sixty-fourth=Asignar duraci\u00F3n de semi-fusa
-
-action.note.duration.decrement-duration=Disminuir duraci\u00F3n
-action.note.duration.increment-duration=Aumentar duraci\u00F3n
-action.note.effect.change-vibrato=Jarri/Kendu vibrato
-action.note.effect.change-bend=Jarri/Kendu bend
-action.note.effect.change-slide=Jarri/Kendu slide
-action.note.effect.change-hammer=Jarri/Kendu martillo
-action.note.effect.change-accentuated=Jarri/Kendu accentuated
-action.note.effect.change-dead=Jarri/Kendu dead note
-action.note.effect.change-fade-in=Jarri/Kendu fade in
-action.note.effect.change-ghost=Jarri/Kendu ghost
-action.note.effect.change-grace=Jarri/Kendu grace
-action.note.effect.change-harmonic=Jarri/Kendu harmonic
-action.note.effect.change-heavy-accentuated=Jarri/Kendu heavy accentuated
-
-action.note.effect.change-palm-mute=Jarri/Kendu palm mute
-action.note.effect.change-popping=Jarri/Kendu popping
-action.note.effect.change-slapping=Jarri/Kendu slapping
-action.note.effect.change-staccato=Jarri/Kendu staccato
-action.note.effect.change-tapping=Jarri/Kendu tapping
-action.note.effect.change-tremolo-bar=Jarri/Kendu tremolo bar
-action.note.effect.change-tremolo-picking=Jarri/Kendu tremolo picking
-action.note.effect.change-trill=Jarri/Kendu trill
-action.insert.open-repeat=Abrir repetici\u00F3n
-
-action.insert.close-repeat=Cerrar repetici\u00F3n
-action.insert.chord=Insertar acorde
-
-action.insert.text=Insertar texto
-
-action.insert.repeat-alternative=Insertar repetici\u00F3n alternativa
-action.marker.add=Kendu marka
-
-action.marker.go-next=Hurrengo markara
-
-action.marker.go-previous=Aurreko marka
-action.transport.play=Reproducir tema
-action.transport.stop=Gelditu
-action.transport.metronome=Activar/Desactivar metr\u00F3nonomo
-action.transport.mode=Modo de reproducci\u00F3n
-action.tools.browser=Abestien exploratzailea
-action.settings.configure=Editar preferencias
-
-action.help.doc=Laguntza
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_fi.properties b/TuxGuitar-testing/platform-all/share/lang/messages_fi.properties
deleted file mode 100644
index 0f1cbdfe..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_fi.properties
+++ /dev/null
@@ -1,688 +0,0 @@
-ok=Ok 
-cancel=Peruuta 
-yes=Kyll\u00e4 
-no=Ei 
-add=Lis\u00e4\u00e4 
-edit=Muokkaa
-remove=Poista 
-save=Tallenna 
-exit=Lopeta
-close=Sulje 
-choose=Valitse 
-color=V\u00e4ri
-title=Otsikko
-go=Siirry
-warning=Varoitus
-error=Virhe
-plugins=Liit\u00e4nn\u00e4iset 
-options=Valinnat 
-defaults=Oletusarvot
-clean=Tyhjenn\u00e4
-rename=Nime\u00e4 uudelleen
-fret=Otelauta
-position=Sijainti
-name=Nimi 
-author=Tekij\u00e4
-version=Versio
-description=Kuvaus
-info=Info
-configure=M\u00e4\u00e4rit\u00e4 
-url=URL 
-		
-file=Tiedosto 
-file.new=Uusi 
-file.open=Avaa
-file.save=Tallenna 
-file.save-as=Tallenna nimell\u00e4
-file.save-changes-question=Kappaleessa on tallentamattomia muutoksia. \nHaluatko tallentaa muutokset? 
-file.exit=Lopeta
-file.export=Vie
-file.export-midi=Vie MIDI-tiedostona
-file.export-pdf=Vie PDF-dokumenttina
-file.print=Tulosta
-file.print-preview=Tulostuksen esikatselu
-file.import=Tuo
-file.import-midi=Tuo MIDI-tiedosto
-file.export-ascii=Vie ASCII-tekstin\u00e4
-file.history=Viimeksi avatut tiedostot
-file.open-url=Avaa URL 
-file.open.error=Ei voi avata: (0) 
-file.save.error=Ei voi tallentaa: (0) 
-file.import.error=Ei voi tuoda: (0) 
-file.export.error=Ei voi vied\u00e4: (0) 
-file.overwrite-question=T\u00e4m\u00e4 tiedosto on jo olemassa. Haluatko korvata sen? 
-		
-edit.menu=Muokkaa
-edit.undo=Kumoa
-edit.redo=Tee uudelleen
-edit.copy=Kopioi
-edit.from=Mist\u00e4 
-edit.to=Mihin
-edit.all-tracks=Kaikki raidat
-edit.paste=Liit\u00e4 
-edit.paste.count=Liit\u00e4 useita kertoja
-edit.paste.replace-mode=Liit\u00e4 nykyiseen tahtiin
-edit.paste.insert-mode=Liit\u00e4 uutena tahtina
-edit.delete=Poista
-edit.cut=Leikkaa
-edit.mouse-mode-selection=Valintatila
-edit.mouse-mode-edition=Nuottien muokkaus -tila
-edit.not-natural-key=Ylennys/alennus-tila
-edit.voice-1=Valitse \u00e4\u00e4ni 1 
-edit.voice-2=Valitse \u00e4\u00e4ni 2 
-		
-view=N\u00e4yt\u00e4 
-view.layout=Asettelu
-view.layout.page=Sivun ulkoasu
-view.layout.linear=Lineaarinen ulkoasu 
-view.layout.compact=Tiivis ulkoasu
-view.layout.multitrack=Moniraitainen
-view.layout.chord-style=N\u00e4yt\u00e4 soinnusta
-view.layout.chord-name=Soinnun nimi
-view.layout.chord-diagram=Sointukuva
-view.layout.score-enabled=N\u00e4yt\u00e4 nuottiviivasto
-view.layout.tablature-enabled=N\u00e4yt\u00e4 tabulatuuri
-view.show-mixer=N\u00e4yt\u00e4 mikseri
-view.show-fretboard=N\u00e4yt\u00e4 otelauta
-view.show-piano=N\u00e4yt\u00e4 piano
-view.show-matrix=N\u00e4yt\u00e4 matriisi
-view.show-transport=N\u00e4yt\u00e4 soitin
-		
-fretboard.direction=Suunta
-fretboard.right-mode=Oikeak\u00e4tinen
-fretboard.left-mode=Vasenk\u00e4tinen
-fretboard.background-color=Taustav\u00e4ri
-fretboard.display-note-text=N\u00e4yt\u00e4 nuotin nimi
-fretboard.display-scale-text=N\u00e4yt\u00e4 s\u00e4velasteikko
-fretboard.font=Kirjaisinlaji
-fretboard.fretpoint-color=Otelaudan v\u00e4ri
-fretboard.note-color=Nuotin v\u00e4ri
-fretboard.scale-note-color=Soitettavan/valitun nuotin v\u00e4ri
-fretboard.settings=Otelaudan asetukset
-fretboard.string-color=Nauhan v\u00e4ri
-fretboard.settings.options=Valinnat 
-		
-piano.editor=Pianoeditori
-piano.natural-key-color=Valkoisen koskettimen v\u00e4ri
-piano.not-natural-key-color=Mustan koskettimen v\u00e4ri
-piano.note-color=Nuotin v\u00e4ri
-piano.scale-note-color=S\u00e4velasteikon v\u00e4ri
-piano.settings=Pianon asetukset
-		
-matrix.editor=Matriisieditori
-matrix.grids=Pystyviivojen lukum\u00e4\u00e4r\u00e4
-matrix.border-color=Reunan v\u00e4ri
-matrix.font=Kirjasinlaji
-matrix.foreground-color=Edustan v\u00e4ri
-matrix.line-color-1=Parittoman rivin v\u00e4ri
-matrix.line-color-2=Parillisen rivin v\u00e4ri
-matrix.line-color-over=Osoittimen alla olevan rivin v\u00e4ri
-matrix.note-color=Nuotin v\u00e4ri
-matrix.play-note-color=Nuotin v\u00e4ri soitettaessa 
-matrix.position-color=Paikan v\u00e4ri
-matrix.settings=Matriisin asetukset
-		
-composition=Nuottiviivasto
-composition.timesignature=Tahtilaji
-composition.timesignature.Numerator=Osoittaja 
-composition.timesignature.denominator=Nimitt\u00e4j\u00e4 
-composition.timesignature.to-the-end=Loppuun 
-composition.tempo=Tempo 
-composition.tempo-percent=Prosentti
-composition.tempo.invalid=Virheellinen Tempo 
-composition.tempo.start-to-end=Aseta t\u00e4m\u00e4 tempo koko kappaleelle
-composition.tempo.position-to-end=Aseta tempo kappaleen loppuun
-composition.tempo.position-to-next=Aseta tempo seuraavan merkin kohdalle
-composition.properties=Ominaisuudet 
-composition.name=Nimi 
-composition.artist=Esitt\u00e4j\u00e4
-composition.album=Albumi
-composition.author=Tekij\u00e4
-composition.date=P\u00e4iv\u00e4m\u00e4\u00e4r\u00e4 
-composition.copyright=Tekij\u00e4noikeus
-composition.writer=Tabulatuurin luoja
-composition.transcriber=Tekstityksen tekij\u00e4 
-composition.comments=Kommentit 
-composition.tripletfeel=Trioli
-composition.clef=Nuottiavain 
-composition.clef.treble=G-avain
-composition.clef.bass=F-avain
-composition.clef.tenor=Tenori
-composition.clef.alto=Altto
-composition.clef.to-the-end=Aseta t\u00e4m\u00e4 nuottiavain kappaleen loppuun 
-composition.keysignature=S\u00e4vellaji
-composition.keysignature.natural=Palautus
-composition.keysignature.sharp-1=1 ylennys
-composition.keysignature.sharp-2=2 ylennyst\u00e4
-composition.keysignature.sharp-3=3 ylennyst\u00e4
-composition.keysignature.sharp-4=4 ylennyst\u00e4
-composition.keysignature.sharp-5=5 ylennyst\u00e4
-composition.keysignature.sharp-6=6 ylennyst\u00e4
-composition.keysignature.sharp-7=7 ylennyst\u00e4
-composition.keysignature.flat-1=1 alennus
-composition.keysignature.flat-2=2 alennusta
-composition.keysignature.flat-3=3 alennusta
-composition.keysignature.flat-4=4 alennusta
-composition.keysignature.flat-5=5 alennusta
-composition.keysignature.flat-6=6 alennusta
-composition.keysignature.flat-7=7 alennusta
-composition.keysignature.to-the-end=Aseta s\u00e4vellajimerkint\u00e4 kappaleen loppuun
-composition.tripletfeel=Trioli 
-composition.tripletfeel.none=Ei triolia
-composition.tripletfeel.eighth=8-tupletti
-composition.tripletfeel.sixteenth=16-tupletti
-composition.tripletfeel.to-the-end=Aseta trioli kappaleen loppuun
-		
-help=Ohjeet
-help.help=Ohjeet
-help.doc=Dokumentaatio
-help.about=Tietoja ohjelmasta
-help.about.license=Lisenssiehdot 
-help.about.authors=Tekij\u00e4t 
-help.about.description=Kuvaus
-		
-track=Raita 
-track.number=Nro
-track.name=Nimi 
-track.color=V\u00e4ri
-track.first=Ensimm\u00e4inen raita
-track.last=Viimeinen raita
-track.previous=Edellinen raita
-track.next=Seuraava raita
-track.add=Lis\u00e4\u00e4 raita
-track.remove=Poista raita
-track.clone=Kopioi raita
-track.move-up=Siirr\u00e4 yl\u00f6s 
-track.move-down=Siirr\u00e4 alas 
-track.instrument=Instrumentti
-track.properties=Ominaisuudet 
-track.properties.general=Yleiset 
-track.name.default-percussion-name=Ly\u00f6m\u00e4soittimet
-track.lyrics=Sanoitus
-track.solo=Soolo
-track.mute=Hiljenn\u00e4
-
-lyric.editor=Sanoituksen muokkaus
-		
-measure=Tahti
-measure.first=Ensimm\u00e4inen tahti
-measure.last=Viimeinen tahti
-measure.previous=Edellinen tahti
-measure.next=Seuraava tahti
-measure.add=Lis\u00e4\u00e4 tahti
-measure.add.count=Lis\u00e4yksen m\u00e4\u00e4r\u00e4
-measure.add-before-current-position=Lis\u00e4\u00e4 tahti ennen nykyist\u00e4 sijaintia
-measure.add-after-current-position=Lis\u00e4\u00e4 tahti nykyisen sijainnin j\u00e4lkeen
-measure.add-at-end=Lis\u00e4\u00e4 tahti kappaleen loppuun
-measure.remove=Poista tahti
-measure.copy=Kopioi tahti
-measure.paste=Liit\u00e4 tahti
-measure.clean=Tyhjenn\u00e4 tahti
-		
-duration=Kesto
-duration.whole=Kokonuotti
-duration.half=Puolinuotti
-duration.quarter=Nelj\u00e4sosanuotti
-duration.eighth=Kahdeksasosanuotti
-duration.sixteenth=Kuudestoistaosanuotti
-duration.thirtysecond=Kolmaskymmeneskahdesosanuotti
-duration.sixtyfourth=Kuudeskymmenesnelj\u00e4sosanuotti
-duration.dotted=Pisteellinen
-duration.doubledotted=Tuplapisteellinen
-duration.division-type=Trioli
-		
-dynamic=Dynamiikka
-dynamic.piano-pianissimo=Piano Pianissimo 
-dynamic.pianissimo=Pianissimo 
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano
-dynamic.mezzo-forte=Mezzo Forte
-dynamic.forte=Forte 
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo 
-		
-effects=Efektit
-effects.vibrato=Vibraatto
-effects.bend=Venytys (Bend)
-effects.deadnote=Kuollut nuotti (Dead Note)
-effects.slide=Liuku (Slide)
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Paluu
-effects.ghostnote=Haamunuotti (Ghost Note)
-effects.accentuatednote=Aksentti
-effects.heavyaccentuatednote=Voimakas aksentti
-effects.harmonic=Harmooninen
-effects.grace=Etuhele
-effects.grace-editor=Etuheleen muokkaus
-effects.grace.before-beat=Ennen iskua
-effects.grace.on-beat=Iskun kohdalla
-effects.grace.transition=Siirtym\u00e4
-effects.grace.transition-none=Ei mit\u00e4\u00e4n
-effects.grace.transition-bend=Venytys (Bend)
-effects.grace.transition-slide=Liuku (Slide)
-effects.grace.transition-hammer=Hammer
-effects.trill=Trilli
-effects.trill-editor=Trillin muokkaus
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Vasen k\u00e4si
-effects.harmonic.tapped.right-hand=Oikea k\u00e4si
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-		
-bend.editor=Taivutuksen (Bend) muokkaus
-bend.bend=Taivutus (Bend)
-bend.bend-release=Taivutus/Vapautus
-bend.bend-release-bend=Taivutus/Vapautus/Taivutus
-bend.prebend=Esitaivutus (PreBend)
-bend.prebend-release=Esitaivutus/Vapautus
-		
-transport=Soitin
-transport.start=Aloita soitto
-transport.stop=Lopeta soitto
-transport.pause=Keskeyt\u00e4
-transport.first=Ensimm\u00e4inen 
-transport.last=Viimeinen 
-transport.previous=Edellinen 
-transport.next=Seuraava 
-transport.metronome=Metronomi
-transport.mode=Valitse soittotila
-transport.mode.simple=Normaalitila
-transport.mode.simple.tempo-percent=Prosenttia temposta
-transport.mode.simple.loop=Jatkuva soitto 
-transport.mode.trainer=Harjoittelutila
-transport.mode.trainer.increment-description=Temmon kasvatus
-transport.mode.loop-range=Toistov\u00e4li
-transport.mode.loop-range.from=Soita tahdista
-transport.mode.loop-range.from-default=Alusta 
-transport.mode.loop-range.to=Soita tahtiin
-transport.mode.loop-range.to-default=Loppuun 
-transport.set-loop-start=Aseta toiston alkukohta
-transport.set-loop-end=Aseta toiston loppukohta
-		
-instruments.volume=Vahvistus
-instrument.channel=CH 
-instrument.effect-channel=EC
-instrument.volume=\u00c4\u00e4nenvoimakkuus
-instrument.balance=Tasapaino
-instrument.chorus=Chorus
-instrument.reverb=Reverb
-instrument.phaser=Phaser
-instrument.tremolo=Tremolo
-instrument.free=Free
-instrument.link=Link
-		
-		
-repeat.open=Kertauksen aloitusmerkki
-repeat.close=Kertauksen lopetusmerkki
-repeat.alternative=Kertauksen vaihtoeht. maalit
-repeat.alternative.editor=Muokkaa vaihtoehtoisia maaleja
-repetitions=Kertausmerkit
-repeat.number-of-repetitions=Kertausten m\u00e4\u00e4r\u00e4
-		
-beat=Isku
-beat.clean=Tyhjenn\u00e4 isku
-beat.voice.remove-unused=Remove Unused Voice
-beat.voice-up=Nuottien varret yl\u00f6s
-beat.voice-down=Nuottien varret alas
-beat.voice-auto=Nuottien varret autom.
-beat.stroke=Stroke
-beat.stroke-up=Upstroke
-beat.stroke-down=Downstroke
-beat.move-left=Siirr\u00e4 yksi isku vasemmalle
-beat.move-right=Siirr\u00e4 yksi isku oikealle
-beat.move-custom=Siirr\u00e4...
-beat.move-custom.dialog.title=Siirr\u00e4
-beat.move-custom.dialog.direction-tip=Move Direction
-beat.move-custom.dialog.move-1.tip=Major Move
-beat.move-custom.dialog.move-2.tip=Fine Move
-beat.move-custom.dialog.direction=Suunta
-beat.move-custom.dialog.direction.right=Siirr\u00e4 oikealle
-beat.move-custom.dialog.direction.left=Siirr\u00e4 vasemmalle
-beat.move-custom.dialog.count=Lukum\u00e4\u00e4r\u00e4
-beat.move-custom.dialog.duration=Kesto
-beat.move-custom.dialog.duration.type=Pisteellinen/tuplapisteellinen
-beat.move-custom.dialog.duration.type.normal=Ei mit\u00e4\u00e4n
-beat.move-custom.dialog.duration.division-type=Jakosuhde
-beat.move-custom.dialog.duration.division-type.normal=Normaali (Tuplet) 
-		
-note=Nuotti
-note.semitone-up=Puolis\u00e4velaskel yl\u00f6s
-note.semitone-down=Puolis\u00e4velaskel alas
-note.shift-up=Siirr\u00e4 yl\u00f6s 
-note.shift-down=Siirr\u00e4 alas 
-note.tiednote=Sidottu nuotti
-note.deadnote=Dead Note
-		
-insert.chord=Lis\u00e4\u00e4 sointu
-chord.editor=Sointueditori
-chord=Suintu
-chord.name=Nimi 
-chord.bass=Basso
-chord.custom=Muokautettu sointu
-chord.custom.name-empty-error=Sointu ei voi olla nimet\u00f6n.
-chord.custom.name-exist-error=Soinnun nimi on jo olemassa. 
-chord.settings.tip=Mukautetut asetukset 
-chord.settings.type=Tyyppi 
-chord.settings.type.most-common=Yleisimm\u00e4t
-chord.settings.type.inversions=Inversions 
-chord.settings.type.close-voiced=Suljettu \u00e4\u00e4ni
-chord.settings.type.open-voiced=Vapaa \u00e4\u00e4ni 
-chord.settings.open-chords=Avaa soinnut
-chord.settings.chords-to-display=N\u00e4yt\u00e4 sointuja (kpl)
-chord.settings.search-frets=Search Frets
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-		
-instrument=Instrumentti
-instrument.instrument=Instrumentti
-instrument.percussion-track=Ly\u00f6m\u00e4soittimien raita
-		
-tuning=Viritys
-tuning.offset=Vastapainona 
-tuning.strings=Kielet
-tuning.strings.transpose=Transponoi nuotit
-tuning.strings.transpose.try-keep-strings=Yrit\u00e4 pit\u00e4\u00e4 nuotit samalla kielell\u00e4
-tuning.strings.transpose.apply-to-chords=Transponoi soinnut
-		
-language=Kieli 
-		
-choose-color=Valitse v\u00e4ri 
-		
-settings=Asetukset
-settings.config=M\u00e4\u00e4rit\u00e4 TuxGuitar 
-settings.config.language=Kieli 
-settings.config.language.choose=Valitse kieli 
-settings.config.styles=Tyylit
-settings.config.styles.general=Yleiset tyylit
-settings.config.styles.printer=Tulostustyylit
-settings.config.styles.font.default=Oletuskirjaisinlaji
-settings.config.styles.font.note=Nuotin fontti
-settings.config.styles.font.lyric=Sanoituksen kirjaisinlaji
-settings.config.styles.font.text=Tekstin kirjaisinlaji
-settings.config.styles.font.time-signature=Tahtilajin kirjaisinlaji
-settings.config.styles.font.printer-default=Tulostuksen oletuskirjaisinlaji
-settings.config.styles.font.printer-note=Tulostuksen nuottien kirjaisinlaji
-settings.config.styles.font.printer-time-signature=Tulostuksen tahtilajin kirjaisinlaji
-settings.config.styles.color.score-note=Nuotin v\u00e4li nuottiviivastolla
-settings.config.styles.color.tab-note=Nuotin v\u00e4ri tabulatuurissa
-settings.config.styles.color.play-note=Soitettavan nuotin v\u00e4ri
-settings.config.apply-changes-question=Haluatko toteuttaa muutokset nyt? 
-settings.config.sound=\u00c4\u00e4ni
-settings.config.main=Yleiset 
-settings.config.main.window-title=Ikkunan otsikko 
-settings.config.main.window-title.help=The following variables will be replaced at the window title:
-settings.config.main.window-title.var.description.appname=This variable represents the Application Name: TuxGuitar
-settings.config.main.window-title.var.description.appversion=This variable represents the version of TuxGuitar.
-settings.config.main.window-title.var.description.filename=This variable represents the name of the opened file
-settings.config.main.window-title.var.description.filepath=This variable represents the path of the opened file
-settings.config.main.window-title.var.description.songname=This variable represents the name of the song
-settings.config.main.window-title.var.description.songauthor=This variable represents the author of the song
-settings.config.main.window-title.var.description.songalbum=This variable represents the album of the song
-settings.config.main.window-title.var.description.songartist=This variable represents the artist of the song
-settings.config.main.options=Valinnat 
-settings.config.main.splash-enabled=N\u00e4yt\u00e4 aloitusruutu k\u00e4ynnistett\u00e4ess\u00e4 
-settings.config.main.table.auto-size.enabled=Salli automaattinen taulukon koon muutos
-settings.config.styles.color.lines=Vaakaviivojen v\u00e4ri
-settings.config.toolbars=Ty\u00f6kalurivit
-settings.config.toolbars.tip=Mukauta ty\u00f6kalurivej\u00e4
-settings.config.toolbars.list=K\u00e4ytett\u00e4viss\u00e4 olevat ty\u00f6kalurivit 
-settings.config.toolbars.move-up=Siirr\u00e4 yl\u00f6s 
-settings.config.toolbars.move-down=Siirr\u00e4 alas 
-settings.config.skin=Teemat
-settings.config.skin.choose=Valitse teema
-settings.keybindings=M\u00e4\u00e4rit\u00e4 n\u00e4pp\u00e4imist\u00f6oikotiet
-		
-key-bindings-editor=N\u00e4pp\u00e4imist\u00f6oikoteiden muokkaus
-key-bindings-editor-action-select=Valitse toiminto
-key-bindings-editor-action-column=Toiminnot
-key-bindings-editor-shortcut-column=N\u00e4pp\u00e4imet
-key-bindings-editor-push-a-key=Paina n\u00e4pp\u00e4int\u00e4 
-key-bindings-editor-save-question=Muutokset ovat tallentamatta. Haluatko lopettaa ilman tallennusta? 
-
- 
-key-bindings-editor-override=N\u00e4pp\u00e4imist\u00f6oikotie on jo k\u00e4yt\u00f6ss\u00e4. Oletko varma, ett\u00e4 haluat k\u00e4ytt\u00e4\u00e4 sit\u00e4?
-		
-print.print=Tulosta
-print.dialog=Tulosta
-print.service=Palvelu
-print.service.name=Nimi 
-print.service.status=Tila 
-print.service.type=Tyyppi 
-print.service.info=Tiedot
-print.range=Tulostusalue
-print.range.all-pages=Kaikki 
-print.range.pages=Sivut
-print.range.pages-to=Sivuun
-print.copies=Kopiota
-print.copies-number=Kopiom\u00e4\u00e4r\u00e4 
-print.print-to-file=Tulosta tiedostoon 
-print.file-chooser=Valitse 
-print-header.default-song-name=Nimet\u00f6n
-print-header.default-song-author=Nimett\u00f6m\u00e4n 
-		
-print.preview=Tulostuksen esikatselu
-print.preview.page-of=Of
-		
-marker=Merkki
-marker.add=Lis\u00e4\u00e4 merkki
-marker.list=Listaa merkit
-marker.first=Siirry ensimm\u00e4iseen merkkiin
-marker.last=Siirry viimeiseen merkkiin
-marker.next=Siirry seuraavaan merkkiin
-marker.previous=Siirry edelliseen merkkiin
-		
-export.tablature-enabled=N\u00e4yt\u00e4 tabulatuuri
-export.score-enabled=N\u00e4yt\u00e4 nuottiviivasto
-export.chord-name-enabled=N\u00e4yt\u00e4 sointujen nimet
-export.chord-diagram-enabled=N\u00e4yt\u00e4 sointujen kuvat
-export.black-and-white=Mustavalkoinen tila
-		
-scale=S\u00e4velasteikko
-scale.list=S\u00e4velasteikkojen luettelo
-		
-text.insert=Lis\u00e4\u00e4 teksti\u00e4
-text.editor=Tekstieditori
-text.text=Teksti
-		
-tools=Ty\u00f6kalut 
-tools.scale=S\u00e4velasteikkojen luettelo
-tools.browser=Selain
-tools.plugins=Liit\u00e4nn\u00e4iset 
-tools.shortcuts=Pikalinkit
-tools.settings=Asetukset
-		
-tools.transpose=Transponoi
-tools.transpose.semitones=Puolis\u00e4velaskelten m\u00e4\u00e4r\u00e4
-tools.transpose.apply-to-track=Transponoi kaikki tahdit
-tools.transpose.apply-to-measure=Transponoi vain t\u00e4m\u00e4 tahti
-tools.transpose.apply-to-all-tracks=Transponoi kaikki raidat
-tools.transpose.try-keep-strings=Yrit\u00e4 pit\u00e4\u00e4 nuotit samalla kielell\u00e4 jos se on mahdollista.
-tools.transpose.apply-to-chords=Transponoi soinnut
-		
-browser.dialog=Selain
-browser.menu.file=Tiedosto
-browser.open=Avaa
-browser.exit=Lopeta
-browser.menu.collection=Kokoelma
-browser.menu.go=Siirry
-browser.collection.select=Valitse kokoelma
-browser.collection.open=Avaa
-browser.collection.remove=Poista
-browser.collection.close=Sulje
-browser.collection.new=Uusi 
-browser.go-root=Koti 
-browser.go-back=Takaisin 
-browser.refresh=P\u00e4ivit\u00e4
-browser.factory.fs.name=Tiedostoj\u00e4rjestelm\u00e4st\u00e4
-browser.collection.fs.name=Nimi 
-browser.collection.fs.path=Kansio 
-browser.collection.fs.editor-title=Kokoelma tiedostoj\u00e4rjestelm\u00e4st\u00e4
-browser.collection.fs.editor-tip=Valitse kokoelman kansio
-browser.collection.fs.invalid-path=Ole hyv\u00e4 ja valitse kelvollinen kansio 
-		
-midi.port=MIDI-portti 
-midi.sequencer=MIDI-sekvensseri 
-		
-plugin.unknown-value=Ei ole saatavilla
-plugin.column.name=Liit\u00e4nn\u00e4isen nimi
-plugin.column.enabled=Aktiivinen
-		
-		
-#########################		
-###  Tool Bar Items   ###		
-#########################		
-file.items=Tiedosto
-edit.items=Muokkaus
-property.items=Asetukset
-track.items=Raidat
-duration.items=Kesto
-beat.items=Isku
-composition.items=Nuotinnos
-repeat.items=Kertausmerkit
-transport.items=Toisto
-marker.items=Merkit
-insert.items=Lis\u00e4ys
-layout.items=Asettelu
-view.items=N\u00e4kym\u00e4
-effect.items=Efektit
-dynamic.items=Dynamiikka
-		
-#########################		
-###Key Binding Actions###		
-#########################		
-action.file.new=Uusi tiedosto
-action.file.open=Avaa tiedosto 
-action.file.open-url=Avaa URL 
-action.file.save=Tallenna 
-action.file.save-as=Tallenna nimell\u00e4
-action.file.print=Tulosta
-action.file.print-preview=Tulostuksen esikatselu
-action.file.exit=Lopeta TuxGuitar
-action.edit.undo=Kumoa
-action.edit.redo=Tee uudelleen
-action.edit.voice-1=Valitse \u00c4\u00e4ni 1 
-action.edit.voice-2=Valitse \u00c4\u00e4ni 2
-action.composition.change-time-signature=Muuta tahtilajia
-action.composition.change-tempo=Muuta tempoa 
-action.composition.change-info=Muuta kappaleen informaatioa
-action.composition.change-clef=Muuta nuottiavainta
-action.composition.change-key-signature=Muuta s\u00e4vellajia
-action.composition.change-triplet-feel=Muuta triolia
-action.view.layout-set-page=N\u00e4yt\u00e4 sivuasetteluna
-action.view.layout-set-linear=N\u00e4yt\u00e4 jatkuvana asetteluna
-action.view.layout-set-multitrack=N\u00e4yt\u00e4 monta raitaa
-action.view.layout-set-score-enabled=N\u00e4yt\u00e4 nuottiviivasto
-action.view.layout-set-tablature-enabled=N\u00e4yt\u00e4 tabulatuuri
-action.view.layout-set-compact=N\u00e4yt\u00e4 tiiviiss\u00e4 muodossa
-action.view.layout-set-chord-diagram-enabled=N\u00e4yt\u00e4 sointukuvat
-action.view.layout-set-chord-name-enabled=N\u00e4yt\u00e4 sointujen nimet
-action.view.show-fretboard=N\u00e4yt\u00e4 otelauta
-action.view.show-piano=N\u00e4yt\u00e4 Piano 
-action.view.show-matrix=N\u00e4yt\u00e4 matriisi
-action.view.show-mixer=N\u00e4yt\u00e4 mikseri
-action.view.show-transport=N\u00e4yt\u00e4 soitin
-action.track.add=Lis\u00e4\u00e4 raita
-action.track.remove=Poista raita
-action.track.clone=Kopioi raita
-action.track.go-first=Siirry ensimm\u00e4iseen raitaan
-action.track.go-last=Siirry viimeiseen raitaan
-action.track.go-next=Siirry seuraavaan raitaan
-action.track.go-previous=Siirry edelliseen raitaan
-action.track.lyrics=Muokkaa raidan sanoitusta
-action.track.properties=Muokkaa raidan asetuksia
-action.track.move-down=Siirr\u00e4 raitaa alas
-action.track.move-up=Siirr\u00e4 raitaa yl\u00f6s
-action.measure.add=Lis\u00e4\u00e4 tahti
-action.measure.remove=Poista tahti
-action.measure.copy=Kopioi tahti
-action.measure.paste=Liit\u00e4 tahti
-action.measure.clean=Tyhjenn\u00e4 tahti
-action.measure.go-first=Siirry ensimm\u00e4iseen tahtiin
-action.measure.go-last=Siirry viimeiseen tahtiin
-action.measure.go-next=Siirry seuraavaan tahtiin
-action.measure.go-previous=Siirry edelliseen tahtiin
-action.beat.general.remove-unused-voice=Poista k\u00e4ytt\u00e4m\u00e4tt\u00f6m\u00e4t \u00e4\u00e4net
-action.beat.general.voice-up=Siirr\u00e4 varret yl\u00f6s
-action.beat.general.voice-down=Siirr\u00e4 varret alas
-action.beat.general.voice-auto=Aseta varret automaattisesti
-action.beat.general.set-stroke-up=Aseta palkki yl\u00f6s
-action.beat.general.set-stroke-down=Aseta palkki alas
-action.beat.general.move-left=Siirr\u00e4 yksi isku vasemmalle
-action.beat.general.move-right=Siirr\u00e4 yksi isku oikealle
-action.beat.general.move-custom=Siirr\u00e4 iskua
-action.note.general.clean-beat=Puhdas isku
-action.note.general.decrement-semitone=Siirr\u00e4 puolis\u00e4velaskel alas
-action.note.general.increment-semitone=Siirr\u00e4 puolis\u00e4velaskel yl\u00f6s
-action.note.general.shift-down=Siirr\u00e4 alas
-action.note.general.shift-up=Siirr\u00e4 yl\u00f6s
-action.note.general.tied=Lis\u00e4\u00e4 / poista sidottu 
-action.note.duration.set-whole=Aseta kokonuotiksi
-action.note.duration.set-half=Aseta puolinuotiksi
-action.note.duration.set-quarter=Aseta nelj\u00e4sosanuotiksi
-action.note.duration.set-eighth=Aseta kahdeksasosanuotiksi
-action.note.duration.set-sixteenth=Aseta kuudestoistaosanuotiksi
-action.note.duration.set-thirty-second=Aseta kolmaskymmeneskahdesosanuotiksi
-action.note.duration.set-sixty-fourth=Aseta kuudeskymmenesnelj\u00e4sosanuotiksi
-action.note.duration.change-dotted=Lis\u00e4\u00e4 / poista piste 
-action.note.duration.change-double-dotted=Lis\u00e4\u00e4 / poista kaksinkertainen piste
-action.note.duration.change-division-type=Lis\u00e4\u00e4 / poista trioli
-action.note.duration.decrement-duration=V\u00e4henn\u00e4 nuotin kestoa
-action.note.duration.increment-duration=Kasvata nuotin kestoa
-action.note.effect.change-vibrato=Lis\u00e4\u00e4 / poista vibraatto
-action.note.effect.change-bend=Lis\u00e4\u00e4 / poista taivutus (Bend)
-action.note.effect.change-slide=Lis\u00e4\u00e4 / Poista liuku (Slide)
-action.note.effect.change-hammer=Lis\u00e4\u00e4 / poista hammer-on/pull-off 
-action.note.effect.change-accentuated=Lis\u00e4\u00e4 / poista aksentti
-action.note.effect.change-dead=Lis\u00e4\u00e4 / poista kuollut nuotti
-action.note.effect.change-fade-in=Lis\u00e4\u00e4 / poista voimistus
-action.note.effect.change-ghost=Lis\u00e4\u00e4 / poista haamunuotti
-action.note.effect.change-grace=Lis\u00e4\u00e4 / poista etuhele
-action.note.effect.change-harmonic=Lis\u00e4\u00e4 / poista harmoninen 
-action.note.effect.change-heavy-accentuated=Lis\u00e4\u00e4 / poista voimakas aksentti 
-action.note.effect.change-palm-mute=Add/Remove palm mute
-action.note.effect.change-popping=Add/Remove popping
-action.note.effect.change-slapping=Add/Remove slapping
-action.note.effect.change-staccato=Add/Remove staccato
-action.note.effect.change-tapping=Add/Remove tapping
-action.note.effect.change-tremolo-bar=Add/Remove tremolo bar
-action.note.effect.change-tremolo-picking=Add/Remove tremolo picking
-action.note.effect.change-trill=Lis\u00e4\u00e4 / poista Trilli
-action.insert.open-repeat=Kertauksen aloitus
-action.insert.close-repeat=Kertauksen lopetus
-action.insert.repeat-alternative=Kertauksen 2-maali
-action.insert.chord=Lis\u00e4\u00e4 sointu
-action.insert.text=Lis\u00e4\u00e4 teksti\u00e4
-action.marker.add=Lis\u00e4\u00e4 merkki
-action.marker.go-next=Siirry seuraavaan merkkiin
-action.marker.go-previous=Siirry edelliseen merkkin
-action.transport.play=Soita kappale
-action.transport.stop=Lopeta soittaminen
-action.transport.mode=Soittotila 
-action.transport.metronome=Metronomi
-action.transport.set-loop-start=Aseta toiston alkukohta
-action.transport.set-loop-end=Aseta toiston loppukohta
-action.tools.browser=Selain
-action.tools.transpose=Transponoi nuotit
-action.settings.configure=Asetukset
-action.help.doc=Ohjeet
-
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_fr.properties b/TuxGuitar-testing/platform-all/share/lang/messages_fr.properties
deleted file mode 100644
index ecce2f76..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_fr.properties
+++ /dev/null
@@ -1,638 +0,0 @@
-es=Espagnol
-en=Anglais
-fr=Français
-pl=Polonais
-de=Allemand
-pt=Portuguais
-
-ok=Ok
-cancel=Annuler
-yes=Oui
-no=Non
-add=Ajouter
-remove=Supprimer
-save=Enregistrer
-exit=Quitter
-color=Couleur
-title=Titre
-edit=Editer
-go=Aller
-error=erreur
-warning=Attention
-plugins=Gréffons
-choose=Choisir
-options=Options
-defaults=Défauts
-clean=Vider
-rename=Renommer
-fret=Frette
-position=Position
-
-tuxguitar.title=Tux-Guitar
-
-file=Fichier
-file.new=Nouveau
-file.open=Ouvrir
-file.save=Enregistrer
-file.save-as=Enregistrer sous...
-file.exit=Quitter
-file.export=Exporter
-file.export-midi=Exporter en Midi
-file.export-pdf=Exporter en PDF
-file.print=Imprimer
-file.print-preview=Aperçu avant impression
-file.import=Importer
-file.import-midi=Importer Midi
-file.export-ascii=Exporter ASCII
-file.history=Historique
-file.overwrite-question=Le fichier existe, voulez-vous le remplacer ?
-
-edit.undo=Annuler
-edit.redo=Refaire
-edit.copy=Copier
-edit.from=Depuis
-edit.to=A
-edit.all-tracks=Toutes les Pistes
-edit.paste=Coller
-edit.paste.replace-mode=Coller sur la mesure courante
-edit.paste.insert-mode=Coller dans un nouvelle mesure
-edit.delete=Effacer
-edit.cut=Couper 
-edit.menu=Editer
-edit.mouse-mode-selection=Mode sélection
-edit.mouse-mode-edition=Mode édition de partition
-edit.not-natural-key=Mode Sharp/Flat
-
-view=Affichage
-
-view.layout=Affichage
-view.layout.page=Page
-view.layout.linear=Linéaire
-view.layout.multitrack=Multipiste
-view.layout.score-enabled=Afficher la partition
-
-view.show-transport=Afficher le lecteur
-view.show-mixer=Montrer la table de mixage
-view.show-piano=Afficher Piano
-view.show-fretboard=Montrer le manche
-fretboard.right-mode=Mode droitier
-fretboard.left-mode=Mode gaucher
-
-composition=Composition
-composition.timesignature=Signature rythmique
-composition.timesignature.Numerator=Numérateur
-composition.timesignature.denominator=Dénominateur
-composition.timesignature.to-the-end=Renvois fin
-composition.tempo=Tempo
-composition.tempo-percent=Pourcent
-composition.properties=Propriétés
-composition.name=Nom
-composition.artist=Interprète
-composition.album=Album
-composition.author=Auteur
-composition.tempo.invalid=Tempo invalide
-composition.clef=Clef
-composition.clef.treble=Aigus
-composition.clef.bass=Grave
-composition.clef.tenor=Ténor
-composition.clef.alto=Alto
-composition.clef.to-the-end=Appliquer cette armure jusqu'à la fin
-composition.keysignature=Armure
-composition.keysignature.natural=Vierge
-composition.keysignature.sharp-1=1 Dièse
-composition.keysignature.sharp-2=2 Dièses
-composition.keysignature.sharp-3=3 Dièses
-composition.keysignature.sharp-4=4 Dièses
-composition.keysignature.sharp-5=5 Dièses
-composition.keysignature.sharp-6=6 Dièses
-composition.keysignature.sharp-7=7 Dièses
-composition.keysignature.flat-1=1 Bémol
-composition.keysignature.flat-2=2 Bémols
-composition.keysignature.flat-3=3 Bémols
-composition.keysignature.flat-4=4 Bémols
-composition.keysignature.flat-5=5 Bémols
-composition.keysignature.flat-6=6 Bémols
-composition.keysignature.flat-7=7 Bémols
-composition.keysignature.to-the-end=Appliquer cette armure jusqu'à la fin
-composition.tripletfeel=Syncope picking
-composition.tripletfeel.none=Pas de syncope picking
-composition.tripletfeel.eighth=Syncope picking 8th
-composition.tripletfeel.sixteenth=Syncope picking 16th
-composition.tripletfeel.to-the-end=Appliquer la syncope picking jusqu'à la fin
-
-help=Aide
-help.help=Aide
-help.about=A propos
-
-instruments.volume=Gain
-instrument.volume=Volume
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=Balance
-instrument.free=Free
-instrument.link=Link
-
-track=Piste
-track.number=N°
-track.name=Nom
-track.color=Couleur
-track.first=Première piste
-track.last=Dernière piste
-track.previous=Piste précédente
-track.next=Piste suivante
-track.add=Ajouter une piste
-track.remove=Supprimer une piste
-track.instrument=Instrument
-track.instrument.empty=Aucune banque de sons n'a été trouvé sur votre système,\nessayez de recompiler Tuxguitar avec votre propre version Java.
-track.properties=Propriétés
-track.properties.general=Général
-track.clone=Dupliquer la piste
-track.move-up=Monter
-track.move-down=Descendre
-track.name.default-percussion-name=Percussion
-track.lyrics=Paroles
-track.solo=Solo
-track.mute=Muet
-
-lyric.editor=Editeur de paroles
-
-measure=Mesure
-measure.first=Première mesure
-measure.last=Dernière mesure
-measure.previous=Mesure précédente
-measure.next=Mesure suivante
-measure.add=Ajouter la mesure
-measure.add-before-current-position=Ajouter une mesure avant la position courante
-measure.add-after-current-position=Ajouter une mesure apres la position courante
-measure.add-at-end=Ajouter une mesure a la fin
-measure.remove=Supprimer la mesure
-measure.copy=Copier la mesure
-measure.paste=Coller la mesure
-measure.clean=Vider la mesure
-
-beat=Note
-beat.clean=Note naturelle
-
-note.semitone-up=Ajouter un dièse
-note.semitone-down=Ajouter un bémol
-note.shift-up=Shift Up
-note.shift-down=Shift Down
-chord=Corde
-chord.name=Nom de la corde
-chord.custom.name-empty-error=La corde doit avoir un nom
-chord.custom.name-exist-error=Ce nom de corde est déjà utilisé
-dynamic=Dynamic
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano
-dynamic.mezzo-forte=Mezzo Forte
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo
-dynamic.forte-fortissimo=Forte Fortissimo
-duration=Durée
-duration.whole=Ronde
-duration.half=Blanche
-duration.quarter=Noire
-duration.eighth=Croche
-duration.sixteenth=Double croche
-duration.thirtysecond=Triple croche
-duration.sixtyfourth=Quadruple croche
-duration.dotted=Pointée
-duration.doubledotted=Double pointée
-duration.division-type=N-tolet
-effects=Effets
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.deadnote=Dead Note
-effects.tremolo-bar=Ajouter un vibrato
-effects.tremolo-bar-editor=Editer le vibrato
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Note éttouffée
-effects.accentuatednote=Note accentuée
-effects.heavyaccentuatednote=Note fortement accentuée
-effects.harmonic=Note harmonique
-effects.grace=Grace Note
-effects.grace-editor=Editeur Grace Note
-effects.grace.before-beat=Avant le temps
-effects.grace.on-beat=Sur le temps
-effects.grace.transition=Transition
-effects.grace.transition-none=Aucun
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trille
-effects.trill-editor=Editeur de trille
-effects.tremolo-picking=tremolo
-effects.tremolo-picking-editor=Editeur de tremolo
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slap
-effects.popping=Popping
-effects.fade-in=Fade In
-effects.harmonic-editor=Editeur d'harmonique
-effects.harmonic.type-of-harmonic=Type d'harmonique
-effects.harmonic.natural=Harmonique naturelle
-effects.harmonic.artificial=Harmonique artificielle
-effects.harmonic.artificial.key-offset=Key offset
-effects.harmonic.tapped=Harmonique frappée
-effects.harmonic.tapped.left-hand=Main gauche
-effects.harmonic.tapped.right-hand=Main Droite
-effects.harmonic.pinch=Pinch Harmonique
-effects.harmonic.semi=Semi Harmonique
-
-bend.editor=Editeur Bend
-bend.bend=Bend
-bend.bend-release=bend/release
-bend.bend-release-bend=bend/release/bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Lecteur
-transport.start=Jouer
-transport.stop=Stop
-
-repeat.open=Ouvrir répétitions
-repeat.close=Fermer répétitions
-repetitions=Répétitions
-repeat.number-of-repetitions=Nombre de répétitions
-
-note.tiednote=Note liée
-insert.chord=Insérer une note
-chord.editor=Editeur d'accord
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=Piste de percussion
-
-tuning=Accordage
-tuning.strings=Cordes
-tuning.offset=Offset
-
-language=Langage
-
-choose-color=Choisir une couleur
-
-settings=Réglages
-settings.config=Configurer TuxGuitar
-settings.config.main=Général
-settings.config.main.window-title=Titre de fenêtre
-settings.config.main.window-title.help=The following vars will be replaced at the window title:
-settings.config.main.window-title.help=Les variables suivantes seront remplacées dans le titre de la fenêtre:
-settings.config.main.window-title.var.description.appname=Variable représentant le nom de l'application : Tuxguitar.
-settings.config.main.window-title.var.description.appversion=Variable représentant la version de TuxGuitar.
-settings.config.main.window-title.var.description.filename=Variable représentant le nom du fichier ouvert.
-settings.config.main.window-title.var.description.filepath=Variable représentant le chemin du fichier ouvert.
-settings.config.main.window-title.var.description.songname=Variable représentant le nom de la chanson.
-settings.config.main.window-title.var.description.songauthor=Variable représentant l'auteur de la chanson.
-settings.config.main.window-title.var.description.songalbum=Variable représentant l'album de la chanson.
-settings.config.main.window-title.var.description.songartist=Variable représentant l'interprète de la chanson.
-settings.config.main.options=Options
-settings.config.main.splash-enabled=Afficher l'écran de démarrage
-settings.config.view=Affichage
-settings.config.view.mode=Mode d?affichage
-settings.config.view.size=Taille de fenêtre
-settings.config.view.size.maximized=Maximisé
-settings.config.view.size.width=Largeur
-settings.config.view.size.height=Hauteur
-settings.config.language=Langage
-settings.config.language.choose=Choisir une langue
-settings.config.styles=Styles
-settings.config.styles.font.default=Police par défaut
-settings.config.styles.font.note=Police des notes
-settings.config.styles.font.time-signature=Time Signature Font
-settings.config.styles.font.printer-default=Impression couleur par défaut
-settings.config.styles.font.printer-note=Impression couleur de note
-settings.config.styles.font.printer-time-signature= Impression Time Signature Font
-settings.config.styles.color.score-note=Partition couleur de note
-settings.config.styles.color.tab-note=Tablature couleur de note
-settings.config.styles.color.play-note=Lecture couleur de note
-settings.config.styles.color.lines=Couleur de lignes horizontales
-settings.config.toolbars=Barre d'outils
-settings.config.apply-changes-question=Appliquer les changements maintenant ?
-settings.config.sound=Son
-settings.config.sound.soundbank=Banque sonore
-settings.config.sound.default-soundbank=Utiliser la banque sonore par défaut
-settings.config.sound.custom-soundbank= Utiliser la banque sonore alternative
-settings.config.sound.soundbank-restart-message=Vous devez redémarrer Tuxguitar pour que le changement de banque sonore prenne effet
-soundbank.error=Erreur de banque sonore
-soundbank.error.unavailable=Erreur, banque sonore non disponible.
-soundbank.error.custom=Ne peut ouvrir la banque sonore alternative.
-
-settings.keybindings=Configurer les raccourcis
-key-bindings-editor=Editeur de raccourcis
-key-bindings-editor-action-select=Sélectionner une action
-key-bindings-editor-action-column=Actions
-key-bindings-editor-shortcut-column=Raccourcis
-key-bindings-editor-push-a-key=Presser une touche
-key-bindings-editor-save-question=Des modifications ont été effectué, quitter\nsans enregistrer ?
-
-key-bindings-editor-override=Raccourci déjà utilisé ! Etes vous sûr d?utiliser\ncelui ci ?
-
-
-
-
-print.print=Imprimer
-print.dialog=Imprimer
-print.service=Service
-print.service.name=Nom
-print.service.status=Status
-print.service.type=Type
-print.service.info=Info
-print.range=Range
-print.range.all-pages=Toutes
-print.range.pages=Pages
-print.range.pages-to=A
-print.copies=Copies
-print.copies-number=Nombre de copies
-print.print-to-file=Imprimer dans un fichier
-print.file-chooser=Choisir
-print-header.default-song-name=Untitled
-print-header.default-song-author=Anonyme
-print.preview=Aperçu avant impression
-
-
-marker=Marqueur
-marker.add=Ajouter marqueur
-marker.list=Liste des marqueurs
-marker.first=Aller au premier marqueur
-marker.last= Aller au dernier marqueur
-marker.next= Aller au marqueur suivant
-marker.previous= Aller au marqueur précédent
-
-export.tablature-enabled=Afficher la tablature
-export.score-enabled=Afficher la partition
-
-scale=Gamme
-scale.list=List de Gammes
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=File Items
-edit.items=Edit Items
-property.items=Property Items
-track.items=Track Items
-duration.items=Duration Items
-beat.items=Note Items
-composition.items=Composition Items
-repeat.items=Repeat Items
-transport.items=Player Items
-marker.items=Marker Items
-insert.items=Insérer Items
-layout.items=Layout Items
-view.items=View Items
-effect.items=Effect Items
-dynamic.items=Dynamic Items
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nouveau fichier
-action.file.open=Ouvrir un fichier
-action.file.save=Enregistrer
-action.file.save-as=Enregistrer sous...
-action.file.print=Imprimer
-action.file.print-preview=Aperçu avant impression
-action.edit.undo=Annuler
-action.edit.redo=Refaire
-action.composition.change-time-signature=Changer la signature rythmique
-action.composition.change-tempo=Changer le tempo
-action.composition.change-info=Changer les informations de la chanson
-action.composition.change-clef=Changer la Clef
-action.composition.change-key-signature=Changer la signature
-action.view.layout-set-page=Monter la mise en page
-action.view.layout-set-linear=Affichage linéaire
-action.view.layout-set-multitrack=Afficher le mode multipiste
-action.view.layout-set-score-enabled=Afficher la partition
-action.view.show-fretboard=Montrer le manche
-action.view.show-mixer=Montrer la table de mixage
-action.view.show-transport=Afficher le lecteur
-action.view.show-piano=Afficher le clavier
-action.track.add=Ajouter une piste
-action.track.remove=Supprimer la piste
-action.track.clone=Dupliquer la piste
-action.track.go-first=Aller à la première piste
-action.track.go-last=Aller à la dernière piste
-action.track.go-next=Aller à la piste suivante
-action.track.go-previous=Aller à la piste précédente
-action.track.properties=Changer les propriétés de la piste
-action.track.lyrics=Editer les paroles
-action.measure.add=Ajouter une mesure
-action.measure.remove=Supprimer la mesure
-action.measure.copy=Copier le mesure
-action.measure.paste=Coller la mesure
-action.measure.clean=Vider la mesure
-action.measure.go-first=Aller à la première mesure
-action.measure.go-last=Aller à la dernière mesure
-action.measure.go-next=Aller à la mesure suivante
-action.measure.go-previous=Aller à la mesure précédente
-action.note.general.clean-beat=Vider le temps
-action.note.general.decrement-semitone=Baisser d'un demi ton
-action.note.general.increment-semitone=Augmenter d'un demi ton
-action.note.general.shift-down=Shift down
-action.note.general.shift-up=Shift up
-action.note.general.tied=Ajouter/Enlever tied
-action.note.duration.change-dotted=Ajouter/Supprimer pointée
-action.note.duration.change-double-dotted=Ajouter/Supprimer double pointée
-action.note.duration.change-division-type=Ajouter/Supprimer N-tolet
-action.note.effect.change-vibrato=Ajouter/Supprimer Vibrato
-action.note.effect.change-bend=Ajouter/Supprimer bend
-action.note.effect.change-slide=Ajouter/Supprimer Slide
-action.note.effect.change-hammer=Ajouter/Supprimer hammer-on/pull-off
-action.note.effect.change-accentuated=Ajouter/Enlever
-action.note.effect.change-dead=Ajouter/Enlever note morte
-action.note.effect.change-fade-in=Ajouter/Enlever fade in
-action.note.effect.change-ghost=Ajouter/Enlever note fantôme
-action.note.effect.change-grace=Ajouter/Enlever grace
-action.note.effect.change-harmonic=Ajouter/Enlever l'harmonique
-action.note.effect.change-heavy-accentuated=Ajouter/Enlever l'accent (fort)
-action.note.effect.change-palm-mute=Ajouter/Enlever palm mute
-action.note.effect.change-popping=Ajouter/Enlever popping
-action.note.effect.change-slapping=Ajouter/Enlever slap
-action.note.effect.change-staccato=Ajouter/Enlever staccato
-action.note.effect.change-tapping=Ajouter/Enlever tapping
-action.note.effect.change-tremolo-bar=Ajouter/Enlever vibrato
-action.note.effect.change-tremolo-picking=Ajouter/Enlever trémolo
-action.note.effect.change-trill=Ajouter/Enlever trille
-
-
-
-action.insert.open-repeat=Ouvrir répétition
-action.insert.close-repeat=Fermer répétition
-action.insert.chord=Insérer accord
-action.transport.play=Jouer la chanson
-action.transport.stop=Arrêter de jouer
-
-info=Info
-name=Nom
-author=Auteur
-version=Version
-description=Descripton
-configure=Configurer
-file.open-url=Ouvrir URL
-
-file.open.error=Erreur d'Ouverture : {0}
-file.save.error=Erreur de Sauvegarde : {0}
-file.import.error=Erreur d'Importation : {0}
-file.export.error=Erreur d'Exportation : {0}
-file.save-changes-question=La musique à des changements non sauvés\nVoulez vous sauver les changements ?
-
-midi.port=Port Midi 
-midi.sequencer=Séquencer Midi
-
-browser.dialog=Navigateur
-browser.menu.file=Fichier
-browser.open=Ouvrir
-browser.exit=Quiter
-browser.menu.collection=Collection
-browser.menu.go=go
-browser.collection.select=Selectionner la Collection
-browser.collection.open=Ouvrir
-browser.collection.remove=Enlever
-browser.collection.close=Fermer
-browser.collection.new=Nouvelle
-browser.go-root=Repertoire Personnel
-browser.go-back=Arriere
-browser.refresh=Rafraichir
-browser.collection.fs.editor-title=Systeme de fichier, Titre de Collection
-browser.collection.fs.editor-tip=Choisir le repertoire de collection
-
-browser.collection.fs.invalid-path=Erreur, choisir un repertoire valide
-
-plugin.unknown-value=Non disponible
-plugin.column.name=Nom du greffon
-plugin.column.enabled=Activé
-
-view.layout.compact=Compact
-view.layout.chord-style=Style Accord
-view.layout.chord-name=Nom de l'Accord
-view.layout.chord-diagram=Diagramme de l'Accord
-view.layout.tablature-enabled=Afficher la Tablature
-
-view.show-matrix=Afficher la Matrice
-
-matrix.editor=Editeur de la Matrice
-matrix.grids=Numbre de grille
-matrix.border-color=Couleur Bordure
-matrix.font=Fonte
-matrix.foreground-color=Couleur avant plan
-matrix.line-color-1=Couleur Ligne 1
-matrix.line-color-2=Couleur Ligne 2
-matrix.line-color-over=Couleur dessus
-matrix.note-color=Couleur Note
-matrix.play-note-color=Couleur Note jouée
-matrix.position-color=Couleur Position
-matrix.settings=Paramètres Matrice
-
-help.doc=Documentation
-
-transport.first=Premier
-transport.last=Dernier
-transport.previous=Précédent
-transport.next=Suivant
-transport.pause=Pause
-transport.mode=Mode Lecture
-transport.mode.simple=Mode Lecture Simple
-transport.mode.simple.tempo-percent=Pourcentage Tempo
-transport.mode.simple.loop=Lecture Boucle
-transport.mode.trainer=Mode Apprentissage
-transport.mode.trainer.increment-description=Incrément
-
-repeat.alternative=Alternative répétition
-repeat.alternative.editor=Editer les Répétitions alternatives
-
-tools=Outils
-tools.scale=Liste gammes
-tools.browser=Navigateur
-tools.plugins=Gréffons
-tools.shortcuts=Raccourcis
-tools.settings=Paramètres
-
-text.insert=Insérer Texte
-
-settings.config.main.table.auto-size.enabled=Activer le redimentionnement automatique de la table
-settings.config.styles.general=Style General
-settings.config.styles.printer=Style Impression
-settings.config.styles.font.lyric=Fonte Paroles
-settings.config.styles.font.text=Fonte Texte
-settings.config.skin=Masques
-settings.config.skin.choose=Choisir votre masque
-settings.config.toolbars.tip=Personnaliser les barres d'outils
-settings.config.toolbars.list=Barres d'outils Disponibles
-settings.config.toolbars.move-up=Déplacer en haut
-settings.config.toolbars.move-down=Déplacer en bas
-
-action.file.open-url=Ouvir l'URL
-action.file.exit=Quitter TuxGuitar
-action.insert.text=Insérer le Texte
-action.insert.repeat-alternative=Rejouer l'Alternative
-action.composition.change-triplet-feel=Change Triplet Feel
-action.note.duration.set-whole=Whole Duration
-action.note.duration.set-half=Set Half Duration
-action.note.duration.set-quarter=Set Quarter Duration
-action.note.duration.set-eighth=Set Eighth Duration
-action.note.duration.set-sixteenth=Set Sixteenth Duration
-action.note.duration.set-thirty-second=Set Thirty Second Duration
-action.note.duration.set-sixty-fourth=Set Sixty Fourth Duration
-action.note.duration.decrement-duration=Decrementr la Duree
-action.note.duration.increment-duration=Incremente la Duree
-action.track.move-down=Déplacer en bas
-action.track.move-up=Déplacer en haut
-action.tools.browser=Browser
-action.transport.metronome=Métrononome
-action.transport.mode=Mode
-action.view.show-matrix=Afficher la Matrice
-action.view.layout-set-chord-diagram-enabled=Activer le diagramme d'accord
-action.view.layout-set-chord-name-enabled=Activer le nom de l'accord
-action.view.layout-set-compact=Afficher en mode compact
-action.view.layout-set-tablature-enabled=Afficher la Tablature
-action.marker.add=Ajouter un marker
-action.marker.go-next=Aller au prochain marqueur
-action.marker.go-previous=Aller au précédent marqueur
-action.settings.configure=Paramétres
-action.help.doc=Aide
-
-chord.bass=Basse
-chord.custom=Accord Personnel
-chord.settings.tip=Paramétre Personnel
-chord.settings.type=Type
-chord.settings.type.most-common=Les plus communs
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=Fermer la Voie
-chord.settings.type.open-voiced=Ouvrir la Voie
-chord.settings.open-chords=Accords Ouverts
-chord.settings.chords-to-display=Accords à Afficher
-chord.settings.search-frets=Rechercher les Frettes
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-fretboard.background-color=Couleur Arriere plan
-fretboard.display-note-text=Afficher le texte de la note
-fretboard.display-scale-text=Afficher le texte de la gamme
-fretboard.font=Fonte
-fretboard.fretpoint-color=Couleur des frettes
-fretboard.note-color=Couleur de la Note
-fretboard.scale-note-color=Couleur de la Gamme
-fretboard.settings=Paramétres de la Fretboard
-fretboard.string-color=Couleur des cordes
-fretboard.settings.options=Options
-
-piano.editor=Editeur Piano
-piano.natural-key-color=Couleur touche naturele
-piano.not-natural-key-color=Couleur touche non naturele
-piano.note-color=Couleur Note
-piano.scale-note-color=Couleur de la note de gamme
-piano.settings=Parametre Piano
-
-mixer=Mixer
-
-#eof "$Id: messages_fr.properties,v 1.14 2008/03/31 18:40:38 rzr Exp $"
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_hu.properties b/TuxGuitar-testing/platform-all/share/lang/messages_hu.properties
deleted file mode 100644
index 17bb4a7b..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_hu.properties
+++ /dev/null
@@ -1,482 +0,0 @@
-es=Spanyol
-en=Angol
-fr=Francia
-pl=Lengyel
-de=Német
-pt=Portugál
-hu=Magyar
-
-ok=Ok
-cancel=Mégsem
-yes=Igen
-no=Nem
-add=Hozzáad
-edit=Szerkeszt
-remove=Eltávolít
-save=Mentés
-exit=Kilépés
-choose=Válassz
-color=Szín
-title=Címke
-go=Ugrás
-warning=Figyelmeztetés
-error=Hiba
-plugins=Bõvítmények
-options=Beállítások
-defaults=Alapértelmezés
-clean=Eltávolít
-rename=Átnevez
-fret=Bund
-position=Pozíció
-
-tuxguitar.title=Tux-Guitar
-
-file=Fájl
-file.new=Új
-file.open=Megnyitás...
-file.save=Mentés
-file.save-as=Mentés másként...
-file.exit=Kilépés
-file.export=Exportálás
-file.export-midi=Midi-be
-file.export-pdf=PDF-be
-file.print=Nyomtatás
-file.print-preview=Nyomtatási kép
-file.import=Importálás
-file.import-midi=Midi-bõl
-file.export-ascii=ASCII-be
-file.history=Elõzmények
-file.overwrite-question=A fájl már létezik, felülírod ???
-
-edit.menu=Szerkesztés
-edit.undo=Visszavonás
-edit.redo=Újra
-edit.copy=Másolás
-edit.from=Kezdete
-edit.to=Vége
-edit.all-tracks=Minden Sáv
-edit.paste=Beillesztés
-edit.paste.replace-mode=Beillesztés ebbe az ütembe
-edit.paste.insert-mode=Új ütem beszúrása a mostani elé
-edit.delete=Törlés
-edit.cut=Kivágás
-edit.mouse-mode-selection=Kijelölõ mód
-edit.mouse-mode-edition=Kottaszerkesztõ mód
-edit.not-natural-key=Módosító-szerkesztõ mód
-
-view=Nézet
-
-view.layout=Elrendezés
-view.layout.page=Lapszerûen
-view.layout.linear=Egy sorban
-view.layout.multitrack=Többsávos
-
-view.show-mixer=Keverõpult látszik
-view.show-fretboard=Gitárnyak látszik
-view.show-piano=Billentyûzet látszik
-fretboard.right-mode=Jobbkezes
-fretboard.left-mode=Balkezes
-
-composition=Kompozíció
-composition.timesignature=Ütemmutató
-composition.timesignature.Numerator=Számláló
-composition.timesignature.denominator=Nevezõ
-composition.timesignature.to-the-end=A darab végéig
-composition.tempo=Tempó
-composition.tempo-percent=Százalék
-composition.properties=Tulajdonságok
-composition.name=Cím
-composition.artist=Elõadó
-composition.album=Album
-composition.author=Szerzõ
-composition.tempo.invalid=Hibás tempó
-composition.tripletfeel=Triolás alapritmus
-
-help=Segítség
-help.help=Segítség
-help.about=Névjegy
-
-instruments.volume=Erõsítés
-instrument.volume=Hangerõ
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=Balansz
-instrument.free=Szabad
-instrument.link=Közös
-
-track=Sáv
-track.number=N°
-track.name=Név
-track.color=Szín
-track.first=Elsõ sáv
-track.last=Utolsó sáv
-track.previous=Elõzõ sáv
-track.next=Következõ sáv
-track.add=Új sáv
-track.remove=Sáv eltávolítása
-track.instrument=Hangszer
-track.tunning=Hangolás
-track.instrument.empty=Nem található midi hangszerkészlet. Próbáld hozzáfordítani a TuxGuitar-t a java verziódhoz.
-track.properties=Tulajdonságok
-track.properties.general=Általános
-track.name.default-percussion-name=Ritmuskészlet
-track.lyrics=Dalszöveg
-track.solo=Szóló
-track.mute=Némít
-
-tunning.offset=Kápó
-lyric.editor=Dalszöveg szerkesztõ
-
-measure=Ütem
-measure.first=Elsõ ütem
-measure.last=Utolsó ütem
-measure.previous=Elõzõ ütem
-measure.next=Következõ ütem
-measure.add=Új ütem
-measure.add-before-current-position=Ütem beszúrása a mostani elé
-measure.add-after-current-position=Ütem beszúrása a mostani után
-measure.add-at-end=Új ütem hozzáadása a darab végéhez
-measure.remove=Ütem eltávolítása
-measure.copy=Ütem másolása
-measure.paste=Ütem beillesztése
-measure.clean=Csendes ütem
-
-duration=Hanghossz
-duration.whole=Egész
-duration.half=Fél
-duration.quarter=Negyed
-duration.eighth=Nyolcad
-duration.sixteenth=Tizenhatod
-duration.thirtysecond=Harmincketted
-duration.sixtyfourth=Hatvannegyed
-duration.dotted=Nyújtott
-duration.doubledotted=Duplán nyújtott
-duration.division-type=Osztott ritmus
-
-dynamic=Dinamika
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Effektusok
-effects.vibrato=Vibrátó
-effects.bend=Hajlítás
-effects.deadnote=Tompított hang
-effects.slide=Csúsztatás
-effects.hammer=Kalapács/felengedés
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Hangsúly
-effects.heavyaccentuatednote=Erõsebb hangsúly
-effects.harmonic=Harmonic
-effects.grace=Díszítõhang
-effects.grace-editor=Díszítõhang-szerkesztõ
-effects.grace.before-beat=Ütés elõtt
-effects.grace.on-beat=Ütésre
-effects.grace.transition=Átmenet
-effects.grace.transition-none=Nincs
-effects.grace.transition-bend=Hajlítás
-effects.grace.transition-slide=Csúsztatás
-effects.grace.transition-hammer=Kalapács
-effects.trill=Trilla
-effects.trill-editor=Trilla-szerkesztõ
-effects.tremolo-picking=Tremoló pengetés
-effects.tremolo-picking-editor=Tremoló pengetés szerkesztõ
-effects.palm-mute=Fojtás tenyérrel
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Beúsztatás
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Bal kéz
-effects.harmonic.tapped.right-hand=Jobb kéz
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-bend.editor=Hajlítás Szerkesztõ
-bend.bend=Hajlítás
-bend.bend-release=Hajlítás/vissza
-bend.bend-release-bend=Hajlítás/vissza/hajlítás
-bend.prebend=Elõkészített
-bend.prebend-release=Elõkészített/vissza
-
-transport=Lejátszó
-transport.start=Lejátszás/szünet
-transport.stop=Leállítás
-
-repeat.open=Ismétlés kezdete
-repeat.close=Ismétlés vége
-repetitions=Ismétlések
-repeat.number-of-repetitions=Ismétlések száma
-
-beat=Hangjegy
-beat.clean=Hang/akkord törlése
-
-note.semitone-up=Félhanggal feljebb
-note.semitone-down=Félhanggal lejjebb
-note.shift-up=Magasabb húron
-note.shift-down=Mélyebb húron
-note.tiednote=Átkötött hang
-note.deadnote=Tompított hang
-
-insert.chord=Akkord beszúrása
-chord.editor=Akkordszerkesztõ
-chord=Akkord
-chord.name=Akkord neve
-chord.custom.name-empty-error=Nevezd el az akkordot.
-chord.custom.name-exist-error=Már létezik ilyen nevû akkord.
-
-instrument=Hangszer
-instrument.instrument=Hangszer
-instrument.percussion-track=Ritmuskészlet
-
-tunning=Hangolás
-tunning.strings=Húrok
-
-language=Nyelv
-
-choose-color=Válassz színt
-
-
-settings=Beállítások
-settings.config=TuxGuitar testreszabása
-settings.config.view=Nézet
-settings.config.view.mode=Elrendezés módja
-settings.config.view.size=Ablakméret
-settings.config.view.size.maximized=Teljes méretû
-settings.config.view.size.width=Szélesség
-settings.config.view.size.height=Magasság
-settings.config.language=Nyelv
-settings.config.language.choose=Válassz nyelvet
-settings.config.styles=Kinézet
-settings.config.styles.font.default=Alap betûtípus
-settings.config.styles.font.note=Hangjegy betûtípusa
-settings.config.styles.font.time-signature=Ütemmutató betûtípusa
-settings.config.styles.font.printer-default=Nyomtatási alap betûtípus
-settings.config.styles.font.printer-note=Nyomtatási hangjegy betûtípusa
-settings.config.styles.font.printer-time-signature=Nyomtatási ütemmutató betûtípusa
-settings.config.styles.color.score-note=Hangjegy színe
-settings.config.styles.color.tab-note=Tabulatúra színe
-settings.config.styles.color.play-note=Lejátszott hang színe
-settings.config.apply-changes-question=Alkalmazod a beállításokat?
-settings.config.sound=Hang
-settings.config.sound.soundbank=Hangszerkészlet
-settings.config.sound.default-soundbank=Alap hangszerkészlet
-settings.config.sound.custom-soundbank=Egyéni hangszerkészlet
-settings.config.sound.soundbank-restart-message=A változások érvénybe lépéséhez újra kell indítanod a TuxGuitar-t!
-settings.config.main=Általános
-settings.config.main.window-title=Ablak címsora
-settings.config.main.window-title.help=Az alábbi változók használhatóak az ablak címsorában:
-settings.config.main.window-title.var.description.appname=A program neve, tehát: TuxGuitar
-settings.config.main.window-title.var.description.appversion=A program verziója
-settings.config.main.window-title.var.description.filename=A megnyitott fájl neve
-settings.config.main.window-title.var.description.filepath=A megnyitott fájl elérési útvonala
-settings.config.main.window-title.var.description.songname=A darab címe
-settings.config.main.window-title.var.description.songauthor=A darab szerzõje
-settings.config.main.window-title.var.description.songalbum=Az album címe
-settings.config.main.window-title.var.description.songartist=A darab elõadója
-settings.config.main.options=Beállítások
-settings.config.main.splash-enabled=Indítókép megjelenítése
-settings.config.styles.color.lines=Vízszintes vonalak színe
-settings.config.toolbars=Eszköztárak
-
-soundbank.error=Hangszerkészlet Hiba
-soundbank.error.unavailable=Nincs hangszerkészlet Hiba.
-soundbank.error.custom=Nem sikerült megnyitni az egyéni hangszerkészlet fájlt.
-
-settings.keybindings=Gyorsbillentyûk beállítása
-key-bindings-editor=Gyorsbillentyû szerkesztõ
-key-bindings-editor-action-select=< Válassz mûveletet >
-key-bindings-editor-action-column=Mûveletek
-key-bindings-editor-shortcut-column=Billentyûk
-key-bindings-editor-push-a-key=Nyomj egy billentyût
-key-bindings-editor-save-question=Vannak még nem mentett változtatások. Biztosan kilépsz mentés nélkül?
-key-bindings-editor-override=A kombináció már foglalt! Biztos ezt szeretnéd használni ?
-
-
-
-print.print=Nyomtatás
-print.dialog=Nyomtatás
-print.service=Szolgáltatás
-print.service.name=Eszköznév
-print.service.status=Állapot
-print.service.type=Típus
-print.service.info=Információ
-print.range=Tartomány
-print.range.all-pages=Minden oldal
-print.range.pages=Oldalak
-print.range.pages-to= - 
-print.copies=Másolatok
-print.copies-number=Példányszám
-print.print-to-file=Fájlba nyomtatás
-print.file-chooser=Tallózás
-print-header.default-song-name=Nincs cím
-print-header.default-song-author=Anonymous
-print.preview=Nyomtatási kép
-
-
-
-
-view.layout.score-enabled=Kotta látszik
-view.show-transport=Lejátszó látszik
-
-composition.clef=Kulcs
-composition.clef.treble=Violin
-composition.clef.bass=Basszus
-composition.clef.tenor=Tenor
-composition.clef.alto=Alt
-composition.clef.to-the-end=Maradjon ez a darab végéig
-
-composition.keysignature=Elõjegyzés
-composition.keysignature.natural=Nincs
-composition.keysignature.sharp-1=1 kereszt
-composition.keysignature.sharp-2=2 kereszt
-composition.keysignature.sharp-3=3 kereszt
-composition.keysignature.sharp-4=4 kereszt
-composition.keysignature.sharp-5=5 kereszt
-composition.keysignature.sharp-6=6 kereszt
-composition.keysignature.sharp-7=7 kereszt
-composition.keysignature.flat-1=1 bé
-composition.keysignature.flat-2=2 bé
-composition.keysignature.flat-3=3 bé
-composition.keysignature.flat-4=4 bé
-composition.keysignature.flat-5=5 bé
-composition.keysignature.flat-6=6 bé
-composition.keysignature.flat-7=7 bé
-composition.keysignature.to-the-end=Maradjon ez a darab végéig
-composition.tripletfeel=Triolás alapritmus
-composition.tripletfeel.none=Nincs triolás alapritmus
-composition.tripletfeel.eighth=Triolás 8-adok
-composition.tripletfeel.sixteenth=Triolás 16-odok
-composition.tripletfeel.to-the-end=Maradjon ez a darab végéig
-
-track.clone=Sáv klónozása
-track.move-up=Mozgatás fel
-track.move-down=Mozgatás le
-
-marker=Jelzõ
-marker.add=Új jelzõ
-marker.list=Jelzõlista
-marker.first=Elsõ jelzõhöz
-marker.last=Utolsó jelzõhöz
-marker.next=Következõ jelzõhöz
-marker.previous=Elõzõ jelzõhöz
-
-export.tablature-enabled=Tabulatúra látszik
-export.score-enabled=Kotta látszik
-
-scale=Skála
-scale.list=Skálák listája
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Fájl eszköztár
-edit.items=Szerkesztés eszköztár
-property.items=Tulajdonságok eszköztár
-track.items=Sávok eszköztár
-duration.items=Hanghossz eszköztár
-beat.items=Hangjegy eszköztár
-composition.items=Kompozíció eszköztár
-repeat.items=Ismétlések eszköztár
-player.items=Lejátszó eszköztár
-marker.items=Jelzõk eszköztár
-insert.items=Beszúrás eszköztár
-layout.items=Elrendezés eszköztár
-view.items=Nézet eszköztár
-effect.items=Effektusok eszköztár
-dynamic.items=Dinamika eszköztár
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Új fájl
-action.file.open=Fájl megnyitása
-action.file.save=Mentés
-action.file.save-as=Mentés másként
-action.file.print=Nyomtatás
-action.file.print-preview=Nyomtatási kép
-action.edit.undo=Visszavonás
-action.edit.redo=Újra
-action.composition.change-time-signature=Ütemmutató változtatása
-action.composition.change-tempo=Tempó változtatása
-action.composition.change-info=Dal tulajdonságainak szerkesztése
-action.composition.change-clef=Kulcs változtatása
-action.composition.change-key-signature=Elõjegyzés változtatása
-action.view.layout-set-page=Lapszerû elrendezés
-action.view.layout-set-linear=Egysoros elrendezés
-action.view.layout-set-multitrack=Többsávos mód
-action.view.layout-set-score-enabled=Kotta megjelenítése
-action.view.show-fretboard=Gitárnyak megjelenítése
-action.view.show-piano=Billentyûzet megjelenítése
-action.view.show-mixer=Keverõpult megjelenítése
-action.view.show-transport=Lejátszó megjelenítése
-action.track.add=Új sáv
-action.track.remove=Sáv eltávolítása
-action.track.clone=Sáv klónozása
-action.track.go-first=Elsõ sáv
-action.track.go-last=Utolsó sáv
-action.track.go-next=Következõ sáv
-action.track.go-previous=Elõzõ sáv
-action.track.lyrics=Sáv dalszövegének szerkesztése
-action.track.properties=Sáv tulajdonságainak szerkesztése
-action.measure.add=Új ütem
-action.measure.remove=Ütem eltávolítása
-action.measure.copy=Ütem másolása
-action.measure.paste=Ütem beillesztése
-action.measure.clean=Csendes ütem
-action.measure.go-first=Ugrás az elsõ ütemre
-action.measure.go-last=Ugrás az utolsó ütemre
-action.measure.go-next=Ugrás a következõ ütemre
-action.measure.go-previous=Ugrás az elõzõ ütemre
-action.note.general.clean-beat=Hang/akkord törlése
-action.note.general.decrement-semitone=Félhanggal lejjebb
-action.note.general.increment-semitone=Félhanggal feljebb
-action.note.general.shift-down=Mélyebb húron
-action.note.general.shift-up=Magasabb húron
-action.note.general.tied=Átkötött hang
-action.note.duration.change-dotted=Nyújtott hang
-action.note.duration.change-double-dotted=Duplán nyújtott hang
-action.note.duration.change-division-type=Osztott ritmus
-action.note.effect.change-vibrato=Vibrátó
-action.note.effect.change-bend=Hajlítás
-action.note.effect.change-slide=Csúsztatás
-action.note.effect.change-hammer=Kalapács/felengedés
-action.note.effect.change-accentuated=Hangsúly
-action.note.effect.change-dead=Tompított hang
-action.note.effect.change-fade-in=Beúsztatás
-action.note.effect.change-ghost=Add/Remove ghost
-action.note.effect.change-grace=Díszítõhang
-action.note.effect.change-harmonic=Add/Remove harmonic
-action.note.effect.change-heavy-accentuated=Add/Remove heavy accentuated
-action.note.effect.change-palm-mute=Fojtás tenyérrel
-action.note.effect.change-popping=Add/Remove popping
-action.note.effect.change-slapping=Add/Remove slapping
-action.note.effect.change-staccato=Staccato
-action.note.effect.change-tapping=Add/Remove tapping
-action.note.effect.change-tremolo-bar=Add/Remove tremolo bar
-action.note.effect.change-tremolo-picking=Tremoló pengetés
-action.note.effect.change-trill=Trilla
-action.insert.open-repeat=Ismétlés kezdete
-action.insert.close-repeat=Ismétlés vége
-action.insert.chord=Akkord beszúrása
-action.transport.play=Lejátszás/szünet
-action.transport.stop=Leállítás
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_it.properties b/TuxGuitar-testing/platform-all/share/lang/messages_it.properties
deleted file mode 100644
index 607efbb7..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_it.properties
+++ /dev/null
@@ -1,646 +0,0 @@
-ok=Ok
-cancel=Annulla
-yes=S\u00ec
-no=No
-add=Aggiungi
-edit=Modifica
-remove=Rimuovi
-save=Salva
-exit=Esci
-choose=Scegli
-color=Colore
-title=Titolo
-go=Vai
-warning=Attenzione
-error=Errore
-plugins=Plugin
-options=Opzioni
-defaults=Predefinito
-clean=Elimina
-rename=Rinomina
-fret=Tasto
-position=Posizione
-close=Chiudi
-author=Autore
-version=Versione
-description=Descrizione
-name=Nome
-configure=Configura
-info=Informazioni
-
-tuxguitar.title=Tux-Guitar
-
-file=File
-file.new=Nuovo
-file.open=Apri
-file.open-url=Apri URL
-file.open.error=Impossibile Aprire: {0}
-file.save=Salva
-file.save-changes-question=La canzone \u00e8 stata modificata.\nVuoi salvare le modifiche?
-file.save-as=Salva come
-file.save.error=Impossibile Salvare: {0}
-file.exit=Esci
-file.export=Esporta
-file.export-midi=Esporta Midi
-file.export-pdf=Esporta PDF
-file.export.error=Impossibile Esportare: {0}
-file.print=Stampa
-file.print-preview=Anteprima di Stampa
-file.import=Importa
-file.import-midi=Importa Midi
-file.import.error=Impossibile Importare: {0}
-file.export-ascii=Esporta ASCII
-file.history=Cronologia
-file.overwrite-question=Questo file esiste gi\u00e0, vuoi sovrascriverlo??
-
-edit.menu=Modifica
-edit.undo=Annulla
-edit.redo=Ripeti
-edit.copy=Copia
-edit.from=Da
-edit.to=A
-edit.all-tracks=Tutte le tracce
-edit.paste=Incolla
-edit.paste.replace-mode=Incolla nella Misura corrente
-edit.paste.insert-mode=Incolla in una nuova Misura
-edit.delete=Elimina
-edit.cut=Taglia
-edit.mouse-mode-selection=Modalit\u00e0 Selezione
-edit.mouse-mode-edition=Modalit\u00e0 Modifica Pentagramma
-edit.not-natural-key=Modalit\u00e0 Diesis/Bemolle
-
-view=Vista
-
-view.layout=Struttura
-view.layout.page=Struttura a Pagina
-view.layout.linear=Struttura Lineare
-view.layout.multitrack=Multitraccia
-view.layout.compact=Compatto
-view.layout.chord-style=Stile Accordo
-view.layout.chord-name=Nome Accordo
-view.layout.chord-diagram=Schema Accordo
-view.layout.score-enabled=Mostra Valore
-view.layout.tablature-enabled=Mostra Tablatura
-
-view.show-mixer=Mostra Mixer
-view.show-fretboard=Mostra Tastiera Chitarra
-view.show-piano=Mostra Piano
-
-fretboard.right-mode=Modo destro
-fretboard.left-mode=Modo sinistro
-fretboard.background-color=Colore Sfondo
-fretboard.display-note-text=Mostra Nome Nota
-fretboard.display-scale-text=Mostra Nome Scala
-fretboard.font=Carattere
-fretboard.fretpoint-color=Colore Manico
-fretboard.note-color=Colore Nota
-fretboard.scale-note-color=Colore Nota Scala
-fretboard.settings=Impostazioni Manico
-fretboard.string-color=Colore Stringa
-fretboard.settings.options=Opzioni
-
-piano.editor=Editor Piano
-piano.natural-key-color=Colore Scala Naturale
-piano.not-natural-key-color=Colore Scala Non-Naturale
-piano.note-color=Colore Nota
-piano.scale-note-color=Colore Nota Scala
-piano.settings=Impostazioni Piano
-
-composition=Composizione
-composition.timesignature=Tempo
-composition.timesignature.Numerator=Numeratore
-composition.timesignature.denominator=Denominatore
-composition.timesignature.to-the-end=Fino alla Fine
-composition.tempo=Velocit\u00e0 Tempo
-composition.tempo-percent=Percentuale
-composition.tempo.start-to-end=Applica questo tempo all'intera canzone
-composition.tempo.position-to-end=Applica questo tempo alla fine
-composition.tempo.position-to-next=Applica questo tempo fino al prossimo indicatore
-composition.properties=Propriet\u00e0
-composition.name=Nome
-composition.artist=Artista
-composition.album=Album
-composition.author=Autore
-composition.tempo.invalid=Tempo non valido
-composition.tripletfeel=Suona come terzina
-
-help=Aiuto
-help.help=Aiuto
-help.about=Informazioni
-help.about.license=Licenza
-help.about.authors=Autori
-help.about.description=Descrizione
-
-instruments.volume=Gain
-instrument.volume=Volume
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=Bilanciamento
-instrument.free=Libero
-instrument.link=Link
-
-track=Traccia
-track.number=N\u00b0
-track.name=Nome
-track.color=Colore
-track.first=Prima traccia
-track.last=Ultima traccia
-track.previous=Traccia Precedente 
-track.next=Traccia Successiva
-track.add=Aggiungi traccia
-track.remove=Rimuovi traccia
-track.instrument=Strumento
-track.instrument.empty=Non \u00e8 stato trovato alcun database di suoni nel tuo sistema midi, prova a ricompilare Tuxguitar nella tua versioe Java. 
-track.properties=Propriet\u00e0
-track.properties.general=Generale
-track.name.default-percussion-name=Percussioni
-track.lyrics=Testo
-track.solo=Solo
-track.mute=Mute
-
-lyric.editor=Modifica Testo
-
-measure=Misura
-measure.first=Prima misura
-measure.last=Ultima misura
-measure.previous=Misura precedente
-measure.next=Misura successiva
-measure.add=Aggiungi misura
-measure.add-before-current-position=Aggiungi misura prima della posizione corrente
-measure.add-after-current-position=Aggiungi misura dopo la posizione corrente
-measure.add-at-end=Aggiungi misura alla fine
-measure.remove=Rimuovi misura
-measure.copy=Copia misura
-measure.paste=Incolla Misura
-measure.clean=Elimina misura
-
-duration=Durata
-duration.whole=Semibreve
-duration.half=Minima
-duration.quarter=Semiminima
-duration.eighth=Croma
-duration.sixteenth=Semicroma
-duration.thirtysecond=Biscroma
-duration.sixtyfourth=Semibiscroma
-duration.dotted=Punto
-duration.doubledotted=Doppio Punto
-duration.division-type=Tupleto
-
-dynamic=Dinamica
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Effetti
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Nota stoppata
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Whammy Bar     
-effects.tremolo-bar-editor=Modifica Whammy Bar
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Nota Fantasma
-effects.accentuatednote=Nota accentuata
-effects.heavyaccentuatednote=Nota fortemente accentuata
-effects.harmonic=Armonico
-effects.grace=Appoggiatura
-effects.grace-editor=Modifica Appoggiatura
-effects.grace.before-beat=Prima della battuta
-effects.grace.on-beat=Durante la battuta
-effects.grace.transition=Appoggiatura
-effects.grace.transition-none=Nessuna
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Modifica Trill
-effects.tremolo-picking=Leva Tremolo
-effects.tremolo-picking-editor=Modifica Leva Tremolo
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Modifica Armonico
-effects.harmonic.type-of-harmonic=Tipo di Armonico
-effects.harmonic.natural=Armonico Naturale
-effects.harmonic.artificial=Armonico artificiale
-effects.harmonic.artificial.key-offset=Bilanciamento
-effects.harmonic.tapped=Armonico con Tapping
-effects.harmonic.tapped.left-hand=Mano Sinistra
-effects.harmonic.tapped.right-hand=Mano Destra
-effects.harmonic.pinch=Armonico Pizzicato
-effects.harmonic.semi=Semi Armonico
-
-bend.editor=Modifica Bend
-bend.bend=Bend
-bend.bend-release=bend/release
-bend.bend-release-bend=bend/release/bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Suona
-transport.start=Inizia
-transport.stop=Ferma
-
-repeat.open=Ripeti Apri
-repeat.close=Ripeti Chiudi
-repetitions=Ripetizioni
-repeat.number-of-repetitions=Numero di ripetizioni
-
-beat=Nota
-beat.clean=Elimina Battuta
-
-note=Note
-note.semitone-up=Semitono su
-note.semitone-down=Semitono Gi\u00f9
-note.shift-up=Sposta su
-note.shift-down=Sposta gi\u00f9
-note.tiednote=Nota Legata
-note.deadnote=Nota Stoppata
-
-insert.chord=Inserisci accordo
-chord.editor=Modifica accordo
-chord=Accordo
-chord.name=Nome Accordo
-chord.custom.name-empty-error=L'accordo non pu\u00f2 essere vuoto.
-chord.custom.name-exist-error=Il nome dell'accordo esiste gi\ufffd.
-chord.bass=Basso
-chord.custom=Accordo Personalizzato
-chord.settings.tip=Impostazioni Personalizzate
-chord.settings.type=Tipo
-chord.settings.type.most-common=Pi\u00f9 Comuni
-chord.settings.type.inversions=Inversioni
-chord.settings.type.close-voiced=Close Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Apri Accordi
-chord.settings.chords-to-display=Accordi da Mostrare
-chord.settings.search-frets=Cerca Tasti
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-instrument=Strumento
-instrument.instrument=Strumento
-instrument.percussion-track=Traccia Percussioni
-
-tuning=Accordatura
-tuning.strings=Corde
-tuning.offset=Bilanciamento
-
-language=Lingua
-
-choose-color=Scegli un colore
-
-
-settings=Impostazioni
-settings.config=Configura TuxGuitar
-settings.config.view=Vista
-settings.config.view.mode=Modalit\u00e0
-settings.config.view.size=Dimensione finestra
-settings.config.view.size.maximized=Massimizzata
-settings.config.view.size.width=Larghezza
-settings.config.view.size.height=Altezza
-settings.config.language=Lingua
-settings.config.language.choose=Scegli la tua lingua
-settings.config.styles=Stile
-settings.config.styles.font.default=Font predefinito
-settings.config.styles.font.note=Font della Nota
-settings.config.styles.font.time-signature=Font del Tempo
-settings.config.styles.font.printer-default=Font Predefinito per la Stampante
-settings.config.styles.font.printer-note=Font della Nota per la Stampante
-settings.config.styles.font.printer-time-signature=Font del Tempo per la Stampante
-settings.config.styles.color.score-note=Colore del valore della Nota
-settings.config.styles.color.tab-note=Colore della Nota sulla Tablatura
-settings.config.styles.color.play-note=Colore della Nota Suonata
-settings.config.apply-changes-question=Vuoi applicare i cambiamenti ora?
-settings.config.sound=Suono
-settings.config.sound.soundbank=Database dei suoni
-settings.config.sound.default-soundbank=Usa Database dei suoni predefinto
-settings.config.sound.custom-soundbank=Usa Database dei suoni personalizzato
-settings.config.sound.soundbank-restart-message=Devi riavviare TuxGuitar per applicare le modifiche al database dei suoni
-settings.config.main=Generale
-settings.config.main.window-title=Titolo Finestra
-settings.config.main.window-title.help=Le seguenti variabili saranno ricollocate nel titolo della finestra:
-settings.config.main.window-title.var.description.appname=Questa variabile rappresenta il Nome dell'Applicazione: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Questa variabile rappresenta la versione di TuxGuitar
-settings.config.main.window-title.var.description.filename=Questa variabile rappresenta il nome del file aperto
-settings.config.main.window-title.var.description.filepath=Questa variabile rappresenta il percorso del file aperto
-settings.config.main.window-title.var.description.songname=Questa variabile rappresenta il nome della canzone
-settings.config.main.window-title.var.description.songauthor=Questa variabile rappresenta l'autore della canzone
-settings.config.main.window-title.var.description.songalbum=Questa variabile rappresenta l'album della canzone
-settings.config.main.window-title.var.description.songartist=Questa variabile rappresenta il cantante della canzone
-settings.config.main.options=Opzioni
-settings.config.main.splash-enabled=Lancia lo splash screen all'avvio  Launch splash screen on startup
-settings.config.styles.color.lines=Colore linee orizzontali
-settings.config.toolbars=Barre degli Strumenti
-
-soundbank.error=Errore Database dei Suoni
-soundbank.error.unavailable=Errore:Database dei Suoni non disponibile.
-soundbank.error.custom=Errore nell'apertura del database dei suoni personalizzati.
-
-settings.keybindings=Configura Tasti di scelta rapida
-key-bindings-editor=Modifica Tasti di scelta rapida
-key-bindings-editor-action-select=Scegli un'Azione
-key-bindings-editor-action-column=Azioni
-key-bindings-editor-shortcut-column=Tasti
-key-bindings-editor-push-a-key=Premi un Tasto
-key-bindings-editor-save-question=Ci sono modifiche non salvate, vuoi uscire senza salvare?
-
-key-bindings-editor-override=Scelta rapida gi\u00e0 in uso! Sicuro di volerla usare?
-
-
-
-print.print=Stampa
-print.dialog=Stampa
-print.service=Servizio
-print.service.name=Nome
-print.service.status=Stato
-print.service.type=Tipo
-print.service.info=Informazioni
-print.range=Misura
-print.range.all-pages=Tutta
-print.range.pages=Pagine
-print.range.pages-to=A
-print.copies=Copie
-print.copies-number=Numero di copie
-print.print-to-file=Stampa al file
-print.file-chooser=Scegli
-print-header.default-song-name=Senza Titolo
-print-header.default-song-author=Anonimo
-print.preview=Anteprima Stampa
-print.preview.page-of=Di
-
-
-
-
-view.layout.score-enabled=Mostra Pentagramma
-view.show-transport=Mostra Trasporto
-
-composition.clef=Chiave
-composition.clef.treble=Chiave di Sol
-composition.clef.bass=Chiave di Basso
-composition.clef.tenor=Chiave di Tenore
-composition.clef.alto=Chiave di Contralto
-composition.clef.to-the-end=Applica questa Chiave fino alla fine
-
-composition.keysignature=Tonalit\u00e0
-composition.keysignature.natural=Naturale
-composition.keysignature.sharp-1=1 Diesis
-composition.keysignature.sharp-2=2 Diesis
-composition.keysignature.sharp-3=3 Diesis
-composition.keysignature.sharp-4=4 Diesis
-composition.keysignature.sharp-5=5 Diesis
-composition.keysignature.sharp-6=6 Diesis
-composition.keysignature.sharp-7=7 Diesis
-composition.keysignature.flat-1=1 Bemolle
-composition.keysignature.flat-2=2 Bemolli
-composition.keysignature.flat-3=3 Bemolli
-composition.keysignature.flat-4=4 Bemolli
-composition.keysignature.flat-5=5 Bemolli
-composition.keysignature.flat-6=6 Bemolli
-composition.keysignature.flat-7=7 Bemolli
-composition.keysignature.to-the-end=Applica questa tonalit\u00e0 fino alla fine
-composition.tripletfeel=Suona come Terzina
-composition.tripletfeel.none=Non suonare come Terzina
-composition.tripletfeel.eighth=Terzina 8th
-composition.tripletfeel.sixteenth=Terzina 16th
-composition.tripletfeel.to-the-end=Applica "Suona come Terzina" fino alla fine 
-
-track.clone=Duplica Traccia
-track.move-up=Muovi su
-track.move-down=Muovi gi\u00f9
-
-marker=Indicatore
-marker.add=Aggiungi Indicatore
-marker.list=Elenco degli Indicatori
-marker.first=Vai al Primo Indicatore
-marker.last=Vai all'Ultimo Indicatore
-marker.next=Vai al Prossimo Indicatore
-marker.previous=Vai al Precedente Indicatore
-
-export.tablature-enabled=Mostra Tablatura
-export.score-enabled=Mostra Pentagramma
-
-scale=Scala
-scale.list=Elenco delle Scale
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=File
-edit.items=Modifica
-property.items=value
-track.items=Traccia
-duration.items=Durata
-beat.items=Note
-composition.items=Composizione
-repeat.items=Ripeti
-transport.items=Suona
-marker.items=Indicatore
-insert.items=Inserisci
-layout.items=Struttura
-view.items=Vista
-effect.items=Effetti
-dynamic.items=Dinamica
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nuovo File
-action.file.open=Apri File
-action.file.save=Salva
-action.file.save-as=Salva come
-action.file.print=Stampa
-action.file.print-preview=Anteprima di stampa
-action.edit.undo=Annulla
-action.edit.redo=Ripeti
-action.composition.change-time-signature=Modifica Tempo
-action.composition.change-tempo=Modifica velocit\u00e0 Tempo
-action.composition.change-info=Cambia informazioni sulla canzone
-action.composition.change-clef=Change Chiave
-action.composition.change-key-signature=Cambia Tonalit\u00e0
-action.view.layout-set-page=Mostra Struttura a Pagina
-action.view.layout-set-linear=Mostra Struttura Lineare
-action.view.layout-set-multitrack=Mostra Modalit\u00e0 Multitraccia
-action.view.layout-set-score-enabled=Mostra Pentagramma
-action.view.show-fretboard=Mostra Tastiera Chitarra
-action.view.show-piano=Mostra Piano
-action.view.show-mixer=Mostra Mixer
-action.view.show-transport=Mostra Trasporto
-action.track.add=Aggiungi Traccia
-action.track.remove=Rimuovi Traccia
-action.track.clone=Duplica Traccia
-action.track.go-first=Vai alla prima Traccia
-action.track.go-last=Vai all'ultima Traccia
-action.track.go-next=Vai alla prossima Traccia
-action.track.go-previous=Vai alla Traccia precedente
-action.track.lyrics=Modifica Testo Traccia
-action.track.properties=Cambia Propriet\u00e0 Traccia
-action.measure.add=Aggiungi Misura
-action.measure.remove=Rimuovi Misura
-action.measure.copy=Copia Misura
-action.measure.paste=Incolla Misura
-action.measure.clean=Pulisci Misura
-action.measure.go-first=Vai alla Prima Misura
-action.measure.go-last=Vai all'Ultima Misura
-action.measure.go-next=Vai alla Prossima Misura
-action.measure.go-previous=Vai alla Misura Precedente
-action.note.general.clean-beat=Elimina Battuta
-action.note.general.decrement-semitone=Abbassa di un semitono
-action.note.general.increment-semitone=Aumenta di un semitono
-action.note.general.shift-down=Sposta in gi\u00f9
-action.note.general.shift-up=Sposta in su
-action.note.general.tied=Aggiungi/Rimuovi nota legata
-action.note.duration.change-dotted=Aggiungi/Rimuovi punto
-action.note.duration.change-double-dotted=Aggiungi/Rimuovi doppio punto
-action.note.duration.change-division-type=Aggiungi/Rimuovi Tupleto 
-action.note.effect.change-vibrato=Aggiungi/Rimuovi vibrato
-action.note.effect.change-bend=Aggiungi/Rimuovi bend
-action.note.effect.change-slide=Aggiungi/Rimuovi slide
-action.note.effect.change-hammer=Aggiungi/Rimuovi hammer-on/pull-off
-action.note.effect.change-accentuated=Aggiungi/Rimuovi nota accentuata
-action.note.effect.change-dead=Aggiungi/Rimuovi nota stoppata
-action.note.effect.change-fade-in=Aggiungi/Rimuovi fade in
-action.note.effect.change-ghost=Aggiungi/Rimuovi nota fantasma
-action.note.effect.change-grace=Aggiungi/Rimuovi appoggiatura
-action.note.effect.change-harmonic=Aggiungi/Rimuovi armonico
-action.note.effect.change-heavy-accentuated=Aggiungi/Rimuovi nota fortemente accentuata
-action.note.effect.change-palm-mute=Aggiungi/Rimuovi palm mute
-action.note.effect.change-popping=Aggiungi/Rimuovi popping
-action.note.effect.change-slapping=Aggiungi/Rimuovi slapping
-action.note.effect.change-staccato=Aggiungi/Rimuovi staccato
-action.note.effect.change-tapping=Aggiungi/Rimuovi tapping
-action.note.effect.change-tremolo-bar=Aggiungi/Rimuovi Whammy bar
-action.note.effect.change-tremolo-picking=Aggiungi/Rimuovi Leva tremolo
-action.note.effect.change-trill=Aggiungi/Rimuovi Trill
-action.insert.open-repeat=Apri ripetizione
-action.insert.close-repeat=Chiudi ripetizione
-action.insert.chord=Inserisci accordo
-action.transport.play=Suona la canzone
-action.transport.stop=Ferma il suono
-
-view.show-matrix=Mostra Matrice
-
-matrix.editor=Editor Matrice
-matrix.grids=Numero di Colonne
-matrix.border-color=Colore Bordo
-matrix.font=Carattere
-matrix.foreground-color=Colore Primo piano
-matrix.line-color-1=Colore Linea 1
-matrix.line-color-2=Colore Linea 2
-matrix.line-color-over=Colore Sovrapposto
-matrix.note-color=Colore Nota
-matrix.play-note-color=Colore Nota Attiva
-matrix.position-color=Colore Posizione
-matrix.settings=Impostazioni Matrice
-
-help.doc=Documentazione
-
-transport.first=Primo
-transport.last=Ultimo
-transport.previous=Precedente
-transport.next=Prossimo
-transport.pause=Pausa
-transport.metronome=Metronomo
-transport.mode=Modalit\u00e0 Player
-transport.mode.simple=Modalit\u00e0 Player Singolo
-transport.mode.simple.tempo-percent=Tempo Percentuale
-transport.mode.simple.loop=Suona Ciclo Singolo
-transport.mode.trainer=Modalit\u00e0 Allenamento
-transport.mode.trainer.increment-description=Incrementa di 
-
-repeat.alternative=Ripeti Alternative
-repeat.alternative.editor=Modifica Ripeti Alternative
-
-tools=Strumenti
-tools.scale=Lista Scale
-tools.browser=Browser
-tools.plugins=Plugin
-tools.shortcuts=Scorciatoie
-tools.settings=Impostazioni
-
-browser.dialog=Browser
-browser.menu.file=File
-browser.open=Apri
-browser.exit=Esci
-browser.menu.collection=Collezione
-browser.menu.go=Vai
-browser.collection.select=Seleziona Collezione
-browser.collection.open=Apri
-browser.collection.remove=Rimuovi
-browser.collection.close=Chiudi
-browser.collection.new=Nuovo
-browser.go-root=Home
-browser.go-back=Indietro
-browser.refresh=Pulisci
-browser.factory.fs.name=File System
-browser.collection.fs.path=Cartella
-browser.collection.fs.name=Nome
-browser.collection.fs.editor-title=Collezione File System 
-browser.collection.fs.editor-tip=Scegli la cartella della collezione
-browser.collection.fs.invalid-path=Per favore, seleziona una cartella valida
-
-midi.port=Porta MIDI
-midi.sequencer=Sequencer MIDI
-
-text.editor=Editor di testo
-text.insert=Inserisci Testo
-text.text=Testo
-
-plugin.column.name=Nome Plugin
-plugin.column.enabled=Abilitato
-plugin.unknown-value=Non disponibile.
-
-settings.config.main.table.auto-size.enabled=Abilita ridimensionamento Automatico Tabella
-settings.config.styles.general=Stile Generale
-settings.config.styles.printer=Stile Stampante
-settings.config.styles.font.lyric=Caratteri Testi
-settings.config.styles.font.text=Carattere di Testo
-settings.config.skin=Temi
-settings.config.skin.choose=Scegli il tuo Tema
-settings.config.toolbars.tip=Personalizza la Barra degli Strumenti
-settings.config.toolbars.list=Barre degli Strumenti Disponibili
-settings.config.toolbars.move-up=Muovi Su
-settings.config.toolbars.move-down=Muovi Gi\u00f9
-
-action.file.open-url=Apri URL
-action.file.exit=Esci da TuxGuitar
-action.insert.text=Inserisci Testo
-action.insert.repeat-alternative=Ripeti Alternativa
-action.composition.change-triplet-feel=Modifica Terzina
-action.note.duration.set-whole=Imposta Durata Semibreve
-action.note.duration.set-half=Imposta Durata Minima
-action.note.duration.set-quarter=Imposta Durata Semiminima
-action.note.duration.set-eighth=Imposta Durata Croma
-action.note.duration.set-sixteenth=Imposta Durata SemiCroma
-action.note.duration.set-thirty-second=Imposta Durata Biscroma
-action.note.duration.set-sixty-fourth=Imposta Durata Semibiscroma
-action.note.duration.decrement-duration=Decrementa Durata
-action.note.duration.increment-duration=Incrementa Durata
-action.track.move-down=Sposta gi\u00f9
-action.track.move-up=Sposta su
-action.tools.browser=Browser
-action.transport.metronome=Metrononomo
-action.transport.mode=Modalit\u00e0
-action.view.show-matrix=Mostra Matrice
-action.view.layout-set-chord-diagram-enabled=Abilita Diagramma Accordo
-action.view.layout-set-chord-name-enabled=Abilita Nome Accordo
-action.view.layout-set-compact=Mostra Modalit\u00e0 Compatta
-action.view.layout-set-tablature-enabled=Mostra Tablatura
-action.marker.add=Aggiungi Indicatore
-action.marker.go-next=Vai al Prossimo Indicatore
-action.marker.go-previous=Vai al Precedente Indicatore
-action.settings.configure=Impostazioni
-action.help.doc=Aiuto
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_ja.properties b/TuxGuitar-testing/platform-all/share/lang/messages_ja.properties
deleted file mode 100644
index a5a048b0..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_ja.properties
+++ /dev/null
@@ -1,682 +0,0 @@
-ok=Ok
-cancel=\u30ad\u30e3\u30f3\u30bb\u30eb
-yes=\u306f\u3044
-no=\u3044\u3044\u3048
-add=\u8ffd\u52a0
-edit=\u7de8\u96c6
-remove=\u524a\u9664
-save=\u4fdd\u5b58
-exit=\u7d42\u4e86
-close=\u9589\u3058\u308b
-choose=\u9078\u629e
-color=\u8272
-title=\u30bf\u30a4\u30c8\u30eb
-go=\u79fb\u52d5
-warning=\u8b66\u544a
-error=\u30a8\u30e9\u30fc
-plugins=\u30d7\u30e9\u30b0\u30a4\u30f3
-options=\u30aa\u30d7\u30b7\u30e7\u30f3
-defaults=\u30c7\u30d5\u30a9\u30eb\u30c8
-clean=\u9664\u53bb
-rename=\u540d\u79f0\u5909\u66f4
-fret=\u30d5\u30ec\u30c3\u30c8
-position=\u30dd\u30b8\u30b7\u30e7\u30f3
-name=\u540d\u524d
-author=\u8457\u4f5c\u8005
-version=\u30d0\u30fc\u30b8\u30e7\u30f3
-description=\u8a73\u7d30
-info=\u60c5\u5831
-configure=\u8a2d\u5b9a
-url=URL
-
-file=\u30d5\u30a1\u30a4\u30eb
-file.new=\u65b0\u898f
-file.open=\u958b\u304f
-file.save=\u4fdd\u5b58
-file.save-as=\u5225\u540d\u4fdd\u5b58
-file.save-changes-question=\u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4\u3055\u308c\u3066\u3044\u307e\u3059.\n\u5909\u66f4\u3092\u4fdd\u5b58\u3057\u307e\u3059\u304b?
-file.exit=\u7d42\u4e86
-file.export=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8
-file.export-midi=MIDI
-file.export-pdf=PDF
-file.print=\u5370\u5237
-file.print-preview=\u5370\u5237\u30d7\u30ec\u30d3\u30e5
-file.import=\u30a4\u30f3\u30dd\u30fc\u30c8
-file.import-midi=MIDI
-file.export-ascii=ASCII
-file.history=\u5c65\u6b74
-file.open-url=URL\u3092\u958b\u304f
-file.open.error=\u958b\u3051\u307e\u305b\u3093: {0}
-file.save.error=\u4fdd\u5b58\u3067\u304d\u307e\u305b\u3093: {0}
-file.import.error=\u30a4\u30f3\u30dd\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093: {0}
-file.export.error=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093: {0}
-file.overwrite-question=\u540c\u540d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u5b58\u5728\u3057\u307e\u3059.\n\u4e0a\u66f8\u304d\u3057\u307e\u3059\u304b?
-
-edit.menu=\u7de8\u96c6
-edit.undo=\u5143\u306b\u623b\u3059
-edit.redo=\u3084\u308a\u76f4\u3059
-edit.copy=\u30b3\u30d4\u30fc
-edit.from=\u958b\u59cb
-edit.to=\u7d42\u4e86
-edit.all-tracks=\u3059\u3079\u3066\u306e\u30c8\u30e9\u30c3\u30af
-edit.paste=\u8cbc\u308a\u4ed8\u3051
-edit.paste.count=\u8cbc\u308a\u4ed8\u3051\u308b\u7dcf\u6570
-edit.paste.replace-mode=\u73fe\u5728\u306e\u5c0f\u7bc0\u304b\u3089\u8cbc\u308a\u4ed8\u308b
-edit.paste.insert-mode=\u65b0\u3057\u3044\u5c0f\u7bc0\u304b\u3089\u8cbc\u308a\u4ed8\u308b
-edit.delete=\u524a\u9664
-edit.cut=\u30ab\u30c3\u30c8
-edit.mouse-mode-selection=\u9078\u629e\u30fb\u30e2\u30fc\u30c9
-edit.mouse-mode-edition=\u30b9\u30b3\u30a2\u7de8\u96c6\u30fb\u30e2\u30fc\u30c9
-edit.not-natural-key=\u30b7\u30e3\u30fc\u30d7/\u30d5\u30e9\u30c3\u30c8\u30fb\u30e2\u30fc\u30c9
-edit.voice-1=\u97f3\u58f0\u9078\u629e 1
-edit.voice-2=\u97f3\u58f0\u9078\u629e 2
-
-view=\u8868\u793a
-view.layout=\u8868\u793a
-view.layout.page=\u7e26\u30da\u30fc\u30b8
-view.layout.linear=\u6a2a\u30b9\u30af\u30ed\u30fc\u30eb
-view.layout.compact=\u30b3\u30f3\u30d1\u30af\u30c8
-view.layout.multitrack=\u30de\u30eb\u30c1\u30c8\u30e9\u30c3\u30af
-view.layout.chord-style=\u30b3\u30fc\u30c9\u30b9\u30bf\u30a4\u30eb
-view.layout.chord-name=\u30b3\u30fc\u30c9\u540d\u3092\u8868\u793a
-view.layout.chord-diagram=\u30b3\u30fc\u30c9\u30c0\u30a4\u30a2\u30b0\u30e9\u30e0\u3092\u8868\u793a
-view.layout.score-enabled=\u4e94\u7dda\u8868\u8a18
-view.layout.tablature-enabled=TAB\u8b5c
-view.show-mixer=\u30df\u30ad\u30b5
-view.show-fretboard=\u30d5\u30ec\u30c3\u30c8\u30dc\u30fc\u30c9
-view.show-piano=\u30d4\u30a2\u30ce
-view.show-matrix=\u30de\u30c8\u30ea\u30c3\u30af\u30b9
-view.show-transport=\u30d7\u30ec\u30fc\u30e4
-
-fretboard.direction=\u65b9\u5411
-fretboard.right-mode=\u30e9\u30a4\u30c8
-fretboard.left-mode=\u30ec\u30d5\u30c8
-fretboard.background-color=\u80cc\u666f
-fretboard.display-note-text=\u97f3\u540d\u3092\u8868\u793a\u3059\u308b
-fretboard.display-scale-text=\u30b9\u30b1\u30fc\u30eb\u3092\u8868\u793a\u3059\u308b
-fretboard.font=\u30d5\u30a9\u30f3\u30c8
-fretboard.fretpoint-color=\u30dd\u30b8\u30b7\u30e7\u30f3\u30fb\u30de\u30fc\u30af
-fretboard.note-color=\u97f3\u540d
-fretboard.scale-note-color=\u30b9\u30b1\u30fc\u30eb
-fretboard.settings=\u30d5\u30ec\u30c3\u30c8\u30dc\u30fc\u30c9\u8a2d\u5b9a
-fretboard.string-color=\u5f26
-fretboard.settings.options=\u30aa\u30d7\u30b7\u30e7\u30f3
-
-piano.editor=\u30d4\u30a2\u30ce\u30fb\u30a8\u30c7\u30a3\u30bf
-piano.natural-key-color=\u767d\u9375
-piano.not-natural-key-color=\u9ed2\u9375
-piano.note-color=\u6f14\u594f\u4e2d\u306e\u9375\u76e4
-piano.scale-note-color=\u30b9\u30b1\u30fc\u30eb
-piano.settings=\u30d4\u30a2\u30ce\u8a2d\u5b9a
-
-matrix.editor=\u30de\u30c8\u30ea\u30c3\u30af\u30b9\u30fb\u30a8\u30c7\u30a3\u30bf
-matrix.grids=\u30b0\u30ea\u30c3\u30c8\u306e\u6570
-matrix.border-color=\u5883\u754c\u7dda
-matrix.font=\u30d5\u30a9\u30f3\u30c8
-matrix.foreground-color=\u8868\u9762
-matrix.line-color-1=\u5947\u6570\u5217
-matrix.line-color-2=\u5076\u6570\u5217
-matrix.line-color-over=\u30de\u30a6\u30b9\u30aa\u30fc\u30d0
-matrix.note-color=\u97f3\u7b26
-matrix.play-note-color=\u6f14\u594f\u4e2d\u306e\u30b0\u30ea\u30c3\u30c9
-matrix.position-color=\u30dd\u30b8\u30b7\u30e7\u30f3
-matrix.settings=\u30de\u30c8\u30ea\u30c3\u30af\u30b9\u8a2d\u5b9a
-
-composition=\u62cd\u5b50
-composition.timesignature=\u62cd\u5b50\u8a18\u53f7
-composition.timesignature.Numerator=\u5206\u5b50
-composition.timesignature.denominator=\u5206\u6bcd
-composition.timesignature.to-the-end=\u6700\u5f8c\u307e\u3067\u9069\u7528\u3059\u308b
-composition.tempo=\u30c6\u30f3\u30dd
-composition.tempo-percent=\u30d1\u30fc\u30bb\u30f3\u30c8
-composition.tempo.invalid=\u7121\u52b9\u306a\u30c6\u30f3\u30dd\u3067\u3059
-composition.tempo.start-to-end=\u5168\u4f53\u306b\u9069\u7528\u3059\u308b
-composition.tempo.position-to-end=\u73fe\u5c0f\u7bc0\u304b\u3089\u6700\u5f8c\u307e\u3067\u9069\u7528\u3059\u308b
-composition.tempo.position-to-next=\u6b21\u306e\u30c6\u30f3\u30dd\u30c1\u30a7\u30f3\u30b8\u307e\u3067\u9069\u7528\u3059\u308b
-composition.properties=\u30b9\u30b3\u30a2\u60c5\u5831\u306e\u7de8\u96c6
-composition.name=\u66f2\u540d
-composition.artist=\u30a2\u30fc\u30c6\u30a3\u30b9\u30c8
-composition.album=\u30a2\u30eb\u30d0\u30e0
-composition.author=\u8457\u4f5c\u8005
-composition.date=\u4f5c\u6210\u65e5
-composition.copyright=\u8457\u4f5c\u6a29
-composition.writer=TAB\u8b5c
-composition.transcriber=\u7de8\u66f2
-composition.comments=\u30b3\u30e1\u30f3\u30c8
-composition.tripletfeel=\u9023\u7b26
-composition.clef=\u97f3\u90e8\u8a18\u53f7
-composition.clef.treble=\u30c8\u97f3\u8a18\u53f7 - G - \u30c8\u30ec\u30d6\u30eb
-composition.clef.bass=\u30d8\u97f3\u8a18\u53f7 - F - \u30d0\u30b9
-composition.clef.tenor=\u30cf\u97f3\u8a18\u53f7 - C - \u30c6\u30ce\u30fc\u30eb
-composition.clef.alto=\u30cf\u97f3\u8a18\u53f7 - C -  \u30a2\u30eb\u30c8
-composition.clef.to-the-end=\u6700\u5f8c\u307e\u3067\u9069\u7528\u3059\u308b
-composition.keysignature=\u8abf\u5b50\u8a18\u53f7
-composition.keysignature.natural=\u266e
-composition.keysignature.sharp-1=\u266f
-composition.keysignature.sharp-2=\u266f\u266f
-composition.keysignature.sharp-3=\u266f\u266f\u266f
-composition.keysignature.sharp-4=\u266f\u266f\u266f\u266f
-composition.keysignature.sharp-5=\u266f\u266f\u266f\u266f\u266f
-composition.keysignature.sharp-6=\u266f\u266f\u266f\u266f\u266f\u266f
-composition.keysignature.sharp-7=\u266f\u266f\u266f\u266f\u266f\u266f\u266f
-composition.keysignature.flat-1=\u266d
-composition.keysignature.flat-2=\u266d\u266d
-composition.keysignature.flat-3=\u266d\u266d\u266d
-composition.keysignature.flat-4=\u266d\u266d\u266d\u266d
-composition.keysignature.flat-5=\u266d\u266d\u266d\u266d\u266d
-composition.keysignature.flat-6=\u266d\u266d\u266d\u266d\u266d\u266d
-composition.keysignature.flat-7=\u266d\u266d\u266d\u266d\u266d\u266d\u266d
-composition.keysignature.to-the-end=\u6700\u5f8c\u307e\u3067\u9069\u7528\u3059\u308b
-composition.tripletfeel=\u30b9\u30a6\u30a3\u30f3\u30b0\u30fb\u30d5\u30a3\u30fc\u30eb
-composition.tripletfeel.none=\u7121\u52b9\u306b\u3059\u308b
-composition.tripletfeel.eighth=8\u9023\u7b26
-composition.tripletfeel.sixteenth=16\u9023\u7b26
-composition.tripletfeel.to-the-end=\u6700\u5f8c\u307e\u3067\u9069\u7528\u3059\u308b
-
-help=\u30d8\u30eb\u30d7
-help.help=\u30d8\u30eb\u30d7
-help.doc=\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
-help.about=TuxGuitar \u306b\u3064\u3044\u3066
-help.about.license=\u30e9\u30a4\u30bb\u30f3\u30b9
-help.about.authors=\u8457\u4f5c\u8005
-help.about.description=\u8a73\u7d30
-
-track=\u30c8\u30e9\u30c3\u30af
-track.number=No
-track.name=\u30c8\u30e9\u30c3\u30af\u540d
-track.color=\u8272
-track.first=\u5148\u982d\u30c8\u30e9\u30c3\u30af
-track.last=\u6700\u7d42\u30c8\u30e9\u30c3\u30af
-track.previous=\u524d\u30c8\u30e9\u30c3\u30af
-track.next=\u6b21\u30c8\u30e9\u30c3\u30af
-track.add=\u30c8\u30e9\u30c3\u30af\u8ffd\u52a0
-track.remove=\u30c8\u30e9\u30c3\u30af\u524a\u9664
-track.clone=\u30c8\u30e9\u30c3\u30af\u8907\u88fd
-track.move-up=\u30c8\u30e9\u30c3\u30af\u3092\u4e0a\u306b\u79fb\u52d5\u3055\u305b\u308b
-track.move-down=\u30c8\u30e9\u30c3\u30af\u3092\u4e0b\u306b\u79fb\u52d5\u3055\u305b\u308b
-track.instrument=\u697d\u5668
-track.properties=\u30c8\u30e9\u30c3\u30af\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
-track.properties.general=\u4e00\u822c
-track.name.default-percussion-name=Drums
-track.lyrics=\u6b4c\u8a5e\u30a8\u30c7\u30a3\u30bf\u3092\u958b\u304f
-track.solo=\u30bd\u30ed
-track.mute=\u30df\u30e5\u30fc\u30c8
-
-lyric.editor=\u6b4c\u8a5e\u30a8\u30c7\u30a3\u30bf
-
-measure=\u5c0f\u7bc0
-measure.first=\u5148\u982d\u306e\u5c0f\u7bc0\u3078
-measure.last=\u6700\u5f8c\u306e\u5c0f\u7bc0\u3078
-measure.previous=\u524d\u306e\u5c0f\u7bc0\u3078
-measure.next=\u6b21\u306e\u5c0f\u7bc0\u3078
-measure.add=\u8ffd\u52a0 (\u7a7a\u5c0f\u7bc0)
-measure.add.count=\u8ffd\u52a0\u3059\u308b\u7dcf\u6570
-measure.add-before-current-position=\u9078\u629e\u7b87\u6240\u306e\u524d\u306b\u8ffd\u52a0
-measure.add-after-current-position=\u9078\u629e\u7b87\u6240\u306e\u5f8c\u306b\u8ffd\u52a0
-measure.add-at-end=\u6700\u5f8c\u306b\u8ffd\u52a0
-measure.remove=\u524a\u9664 (\u7bc4\u56f2\u6307\u5b9a)
-measure.copy=\u30b3\u30d4\u30fc (\u7bc4\u56f2\u6307\u5b9a)
-measure.paste=\u8cbc\u308a\u4ed8\u3051
-measure.clean=\u30af\u30ea\u30a2 (\u9078\u629e\u5c0f\u7bc0)
-
-duration=\u97f3\u4fa1
-duration.whole=\u5168\u97f3\u7b26
-duration.half=2\u5206\u97f3\u7b26
-duration.quarter=4\u5206\u97f3\u7b26
-duration.eighth=8\u5206\u97f3\u7b26
-duration.sixteenth=16\u5206\u97f3\u7b26
-duration.thirtysecond=32\u5206\u97f3\u7b26
-duration.sixtyfourth=64\u5206\u97f3\u7b26
-duration.dotted=\u4ed8\u70b9
-duration.doubledotted=\u8907\u4ed8\u70b9
-duration.division-type=\u9023\u7b26
-
-dynamic=\u5f37\u5f31\u8a18\u53f7
-dynamic.piano-pianissimo=ppp - \u30d4\u30a2\u30ce\u30fb\u30d4\u30a2\u30cb\u30c3\u30b7\u30e2
-dynamic.pianissimo=pp - \u30d4\u30a2\u30cb\u30c3\u30b7\u30e2
-dynamic.piano=p - \u30d4\u30a2\u30ce
-dynamic.mezzo-piano=mp - \u30e1\u30c3\u30be\u30fb\u30d4\u30a2\u30ce
-dynamic.mezzo-forte=mf - \u30e1\u30c3\u30be\u30fb\u30d5\u30a9\u30eb\u30c6
-dynamic.forte=f - \u30d5\u30a9\u30eb\u30c6
-dynamic.fortissimo=ff - \u30d5\u30a9\u30eb\u30c6\u30a3\u30c3\u30b7\u30e2 
-dynamic.forte-fortissimo=fff - \u30d5\u30a9\u30eb\u30c6\u30fb\u30d5\u30a9\u30eb\u30c6\u30a3\u30c3\u30b7\u30e2
-
-effects=\u30a8\u30d5\u30a7\u30af\u30c8/\u30c6\u30af\u30cb\u30c3\u30af  
-effects.vibrato=\uff5e - \u30f4\u30a3\u30d6\u30e9\u30fc\u30c8
-effects.bend=C - \u30c1\u30e7\u30fc\u30ad\u30f3\u30b0
-effects.deadnote=x - \u30c7\u30c3\u30c9\u30ce\u30fc\u30c8/\u30d6\u30e9\u30c3\u30b7\u30f3\u30b0
-effects.slide=S - \u30b9\u30e9\u30a4\u30c9
-effects.hammer=H / P - \u30cf\u30f3\u30de\u30ea\u30f3\u30b0\u30fb\u30aa\u30f3/\u30d7\u30ea\u30f3\u30b0\u30fb\u30aa\u30d5
-effects.tremolo-bar=Arm. - \u30c8\u30ec\u30e2\u30ed\u30a2\u30fc\u30e0
-effects.tremolo-bar-editor=\u30c8\u30ec\u30e2\u30ed\u30a2\u30fc\u30e0\u30fb\u30a8\u30c7\u30a3\u30bf
-effects.tremolo-bar.dip=\uff3c\uff0f
-effects.tremolo-bar.dive=\uff3c
-effects.tremolo-bar.release-up=\uff3f\uff0f
-effects.tremolo-bar.release-down=\uffe3\uff3c
-effects.tremolo-bar.inverted-dip=\uff0f\uff3c
-effects.tremolo-bar.return=\uff0f
-effects.ghostnote=( ) - \u30b4\u30fc\u30b9\u30c8\u30ce\u30fc\u30c8
-effects.accentuatednote=^ - \u30a2\u30af\u30bb\u30f3\u30c8
-effects.heavyaccentuatednote=^^ - \u91cd\u30a2\u30af\u30bb\u30f3\u30c8
-effects.harmonic=Harm. - \u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-effects.grace=\u2669 - \u88c5\u98fe\u97f3\u7b26
-effects.grace-editor=\u88c5\u98fe\u97f3\u7b26\u30fb\u30a8\u30c7\u30a3\u30bf
-effects.grace.before-beat=\u62cd\u306e\u524d
-effects.grace.on-beat=\u62cd\u306e\u4f4d\u7f6e
-effects.grace.transition=\u63a5\u7d9a\u52b9\u679c
-effects.grace.transition-none=\u306a\u3057
-effects.grace.transition-bend=C - \u30c1\u30e7\u30fc\u30ad\u30f3\u30b0
-effects.grace.transition-slide=S - \u30b9\u30e9\u30a4\u30c9
-effects.grace.transition-hammer=H - \u30cf\u30f3\u30de\u30ea\u30f3\u30b0\u30fb\u30aa\u30f3
-effects.trill=tr. - \u30c8\u30ea\u30eb
-effects.trill-editor=\u30c8\u30ea\u30eb\u30fb\u30a8\u30c7\u30a3\u30bf
-effects.tremolo-picking=Picking Tr. - \u30d4\u30c3\u30ad\u30f3\u30b0\u30fb\u30c8\u30ea\u30eb
-effects.tremolo-picking-editor=\u30d4\u30c3\u30ad\u30f3\u30b0\u30fb\u30c8\u30ea\u30eb\u30fb\u30a8\u30c7\u30a3\u30bf
-effects.palm-mute=M - \u30d6\u30ea\u30c3\u30b8\u30fb\u30df\u30e5\u30fc\u30c8
-effects.staccato= \uff0e - \u30b9\u30bf\u30c3\u30ab\u30fc\u30c8
-effects.tapping=Tapping - \u30bf\u30c3\u30d4\u30f3\u30b0
-effects.slapping=\u30b9\u30e9\u30c3\u30d4\u30f3\u30b0/\u30c1\u30e7\u30c3\u30d1
-effects.popping=\u30dd\u30c3\u30d4\u30f3\u30b0
-effects.fade-in=\uff1c - \u30d5\u30a7\u30fc\u30c9\u30a4\u30f3
-effects.harmonic-editor=\u30cf\u30fc\u30e2\u30cb\u30af\u30b9\u30fb\u30a8\u30c7\u30a3\u30bf
-effects.harmonic.type-of-harmonic=\u7a2e\u985e
-effects.harmonic.natural=Harm. - \u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-effects.harmonic.artificial=A.h - \u4eba\u53e3\u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-effects.harmonic.artificial.key-offset=\u30ab\u30dd
-effects.harmonic.tapped=Both Hand Tapping Harm. - \u30bf\u30c3\u30d4\u30f3\u30b0\u30fb\u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-effects.harmonic.tapped.left-hand=Left Hand Tapping - \u30ec\u30d5\u30c8\u30cf\u30f3\u30c9
-effects.harmonic.tapped.right-hand=Right Hand Tapping - \u30e9\u30a4\u30c8\u30cf\u30f3\u30c9
-effects.harmonic.pinch=P.h - \u30d4\u30c3\u30ad\u30f3\u30b0\u30fb\u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-effects.harmonic.semi=S.h - \u30bb\u30df\u30fb\u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-
-bend.editor=\u30c1\u30e7\u30fc\u30ad\u30f3\u30b0\u30fb\u30a8\u30c7\u30a3\u30bf
-bend.bend=\uff3f\u2191
-bend.bend-release=\uff3f\u2191\uffe3\u2193
-bend.bend-release-bend=\uff3f\u2191\uffe3\u2193\uff3f\u2191
-bend.prebend=\uffe3\uffe3
-bend.prebend-release=\uffe3\u2193
-
-transport=\u30d7\u30ec\u30fc\u30e4
-transport.start=\u518d\u751f
-transport.stop=\u505c\u6b62
-transport.pause=\u4e00\u6642\u505c\u6b62
-transport.first=\u66f2\u306e\u5148\u982d
-transport.last=\u66f2\u306e\u6700\u5f8c
-transport.previous=\u524d\u306e\u5c0f\u7bc0
-transport.next=\u6b21\u306e\u5c0f\u7bc0
-transport.metronome=\u30e1\u30c8\u30ed\u30ce\u30fc\u30e0 ON/OFF
-transport.mode=\u518d\u751f\u8a2d\u5b9a
-transport.mode.simple=\u30b7\u30f3\u30d7\u30eb\u30fb\u30e2\u30fc\u30c9
-transport.mode.simple.tempo-percent=\u30c6\u30f3\u30dd [%]
-transport.mode.simple.loop=\u30ea\u30d4\u30fc\u30c8
-transport.mode.trainer=\u30c8\u30ec\u30a4\u30cb\u30f3\u30b0\u30fb\u30e2\u30fc\u30c9
-transport.mode.trainer.increment-description=\u30ea\u30d4\u30fc\u30c8\u6bce\u306e\u901f\u5ea6\u5897\u52a0 [%]
-transport.mode.loop-range=\u30eb\u30fc\u30d7\u8abf\u6574
-transport.mode.loop-range.from=\u518d\u751f\u3092\u958b\u59cb\u3059\u308b\u5c0f\u7bc0
-transport.mode.loop-range.from-default=\u6700\u521d\u304b\u3089
-transport.mode.loop-range.to=\u518d\u751f\u3092\u7d42\u4e86\u3059\u308b\u5c0f\u7bc0
-transport.mode.loop-range.to-default=\u6700\u5f8c\u307e\u3067
-transport.set-loop-start=\u30eb\u30fc\u30d7\u306e\u958b\u59cb\u30dd\u30a4\u30f3\u30c8\u306b\u8a2d\u5b9a
-transport.set-loop-end=\u30eb\u30fc\u30d7\u306e\u7d42\u4e86\u30dd\u30a4\u30f3\u30c8\u306b\u8a2d\u5b9a
-
-instruments.volume=\u30b2\u30a4\u30f3
-instrument.volume=\u30dc\u30ea\u30e5\u30fc\u30e0
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=\u30d0\u30e9\u30f3\u30b9
-instrument.free=\u672a\u4f7f\u7528
-instrument.link=\u4f7f\u7528\u4e2d
-
-
-repeat.open=\u30ea\u30d4\u30fc\u30c8\u958b\u59cb
-repeat.close=\u30ea\u30d4\u30fc\u30c8\u7d42\u4e86
-repeat.alternative=\u30ab\u30c3\u30b3
-repeat.alternative.editor=\u30ab\u30c3\u30b3\u306e\u7de8\u96c6
-repetitions=\u30ea\u30d4\u30fc\u30c8
-repeat.number-of-repetitions=\u30ea\u30d4\u30fc\u30c8\u6570
-
-beat=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8
-beat.clean=1\u62cd\u9664\u53bb
-beat.voice.remove-unused=\u672a\u4f7f\u7528\u97f3\u58f0\u306e\u9664\u53bb
-beat.voice-up=\u7b26\u5c3e\u306e\u5411\u304d\u3092\u4e0a\u306b\u3059\u308b
-beat.voice-down=\u7b26\u5c3e\u306e\u5411\u304d\u3092\u4e0b\u306b\u3059\u308b
-beat.voice-auto=\u7b26\u5c3e\u306e\u5411\u304d\u306e\u81ea\u52d5\u8abf\u6574
-beat.stroke-up=\u2193\u30a2\u30c3\u30d7\u30b9\u30c8\u30ed\u30fc\u30af
-beat.stroke-down=\u2191\u30c0\u30a6\u30f3\u30b9\u30c8\u30ed\u30fc\u30af
-beat.move-left=1\u62cd\u5de6\u3078\u79fb\u52d5\u3059\u308b
-beat.move-right=1\u62cd\u53f3\u3078\u79fb\u52d5\u3059\u308b
-beat.move-custom=\u62cd\u79fb\u52d5\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
-beat.move-custom.dialog.title=\u79fb\u52d5\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
-beat.move-custom.dialog.direction-tip=\u79fb\u52d5\u306e\u65b9\u5411
-beat.move-custom.dialog.move-1.tip=\u7b2c\u4e00\u79fb\u52d5
-beat.move-custom.dialog.move-2.tip=\u7b2c\u4e8c\u79fb\u52d5
-beat.move-custom.dialog.direction=\u65b9\u5411
-beat.move-custom.dialog.direction.right=\u53f3\u3078\u79fb\u52d5
-beat.move-custom.dialog.direction.left=\u5de6\u3078\u79fb\u52d5
-beat.move-custom.dialog.count=\u8ffd\u52a0\u3059\u308b\u7dcf\u6570
-beat.move-custom.dialog.duration=\u97f3\u4fa1
-beat.move-custom.dialog.duration.type=\u4ed8\u70b9/\u8907\u4ed8\u70b9
-beat.move-custom.dialog.duration.type.normal=\u306a\u3057
-beat.move-custom.dialog.duration.division-type=\u9023\u7b26
-beat.move-custom.dialog.duration.division-type.normal=\u6a19\u6e96 (\u9023\u7b26)
-
-note=\u97f3\u7b26
-note.semitone-up=\u534a\u97f3\u4e0a\u3052\u308b
-note.semitone-down=\u534a\u97f3\u4e0b\u3052\u308b
-note.shift-up=\u4e0a\u5f26\u306b\u30b7\u30d5\u30c8
-note.shift-down=\u4e0b\u5f26\u306b\u30b7\u30d5\u30c8
-note.tiednote=\u30bf\u30a4
-note.deadnote=x - \u30c7\u30c3\u30c9\u30ce\u30fc\u30c8/\u30d6\u30e9\u30c3\u30b7\u30f3\u30b0
-
-insert.chord=\u30b3\u30fc\u30c9\u633f\u5165
-chord.editor=\u30b3\u30fc\u30c9\u30fb\u30a8\u30c7\u30a3\u30bf
-chord=\u30b3\u30fc\u30c9
-chord.name=\u30b3\u30fc\u30c9\u540d
-chord.bass=\u30d9\u30fc\u30b9\u97f3
-chord.custom=\u30ab\u30b9\u30bf\u30e0\u30fb\u30b3\u30fc\u30c9
-chord.custom.name-empty-error=\u30b3\u30fc\u30c9\u540d\u304c\u672a\u5165\u529b\u3067\u3059.
-chord.custom.name-exist-error=\u30b3\u30fc\u30c9\u540d\u304c\u91cd\u8907\u3057\u3066\u3044\u307e\u3059.
-chord.settings.tip=\u30ab\u30b9\u30bf\u30e0\u8a2d\u5b9a
-chord.settings.type=\u30bf\u30a4\u30d7
-chord.settings.type.most-common=\u30e2\u30b9\u30c8\u30fb\u30b3\u30e2\u30f3/\u5171\u901a\u5f8b
-chord.settings.type.inversions=\u30a4\u30f3\u30f4\u30a1\u30fc\u30b8\u30e7\u30f3/\u8ee2\u56de\u5f62
-chord.settings.type.close-voiced=\u30af\u30ed\u30fc\u30ba\u30fb\u30f4\u30a9\u30a4\u30b7\u30f3\u30b0/\u5bc6\u96c6\u548c\u58f0\u914d\u7f6e
-chord.settings.type.open-voiced=\u30aa\u30fc\u30d7\u30f3\u30fb\u30f4\u30a9\u30a4\u30b7\u30f3\u30b0/\u958b\u653e\u548c\u58f0\u914d\u7f6e
-chord.settings.open-chords=\u30aa\u30fc\u30d7\u30f3\u30fb\u30b3\u30fc\u30c9/\u958b\u653e\u5f26\u3092\u542b\u3081\u308b
-chord.settings.chords-to-display=\u8868\u793a\u3059\u308b\u30b3\u30fc\u30c9\u6570
-chord.settings.search-frets=\u691c\u7d22\u3059\u308b\u30d5\u30ec\u30c3\u30c8\u306e\u7bc4\u56f2
-chord.settings.minimum-fret=\u6700\u5c0f
-chord.settings.maximum-fret=\u6700\u5927
-
-instrument=\u6f14\u594f\u697d\u5668
-instrument.instrument=\u697d\u5668
-instrument.percussion-track=\u30c9\u30e9\u30e0 / \u30d1\u30fc\u30ab\u30c3\u30b7\u30e7\u30f3
-
-tuning=\u30c1\u30e5\u30fc\u30cb\u30f3\u30b0
-tuning.strings=\u5f26\u306e\u6570
-tuning.offset=\u30ab\u30dd
-tuning.strings.transpose=\u97f3\u7b26\u3092\u79fb\u8abf\u3059\u308b
-tuning.strings.transpose.try-keep-strings=\u97f3\u7b26\u306f\u540c\u3058\u5f26\u3092\u7dad\u6301\u3059\u308b
-tuning.strings.transpose.apply-to-chords=\u30b3\u30fc\u30c9\u3092\u79fb\u8abf\u3059\u308b
-
-language=\u8a00\u8a9e/Language
-
-choose-color=\u8272\u306e\u9078\u629e
-
-settings=\u8a2d\u5b9a
-settings.config=TuxGuitar \u74b0\u5883\u8a2d\u5b9a
-settings.config.language=\u8a00\u8a9e/Language
-settings.config.language.choose=\u8a00\u8a9e\u306e\u9078\u629e/Choose Language
-settings.config.styles=\u30b9\u30bf\u30a4\u30eb
-settings.config.styles.general=\u4e00\u822c
-settings.config.styles.printer=\u5370\u5237
-settings.config.styles.font.default=\u30c7\u30d5\u30a9\u30eb\u30c8
-settings.config.styles.font.note=\u97f3\u7b26
-settings.config.styles.font.lyric=\u6b4c\u8a5e
-settings.config.styles.font.text=\u30c6\u30ad\u30b9\u30c8
-settings.config.styles.font.time-signature=\u62cd\u5b50\u8a18\u53f7
-settings.config.styles.font.printer-default=\u5370\u5237\u30c7\u30d5\u30a9\u30eb\u30c8
-settings.config.styles.font.printer-note=\u5370\u5237\u7528\u306e\u97f3\u7b26
-settings.config.styles.font.printer-time-signature=\u5370\u5237\u7528\u306e\u62cd\u5b50\u8a18\u53f7
-settings.config.styles.color.score-note=\u4e94\u7dda\u8b5c\u306e\u6f14\u594f\u8a18\u53f7
-settings.config.styles.color.tab-note=TAB\u8b5c\u306e\u6f14\u594f\u8a18\u53f7
-settings.config.styles.color.play-note=\u518d\u751f\u4e2d\u306e\u97f3\u7b26
-settings.config.apply-changes-question=\u8a2d\u5b9a\u5909\u66f4\u3092\u9069\u7528\u3057\u307e\u3059\u304b?\n Do you want to apply changes now?
-settings.config.sound=\u30b5\u30a6\u30f3\u30c9
-settings.config.main=\u4e00\u822c
-settings.config.main.window-title=\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30bf\u30a4\u30c8\u30eb
-settings.config.main.window-title.help=\u30a6\u30a3\u30f3\u30c9\u30a6\u30fb\u30bf\u30a4\u30c8\u30eb\u3092\u4ee5\u4e0b\u306e\u5909\u6570\u306b\u66f8\u304d\u63db\u3048\u307e\u3059.
-settings.config.main.window-title.var.description.appname=\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u540d\u3092\u8868\u793a\u3057\u307e\u3059 (TuxGuitar)
-settings.config.main.window-title.var.description.appversion=\u30d0\u30fc\u30b8\u30e7\u30f3\u3092\u8868\u793a\u3057\u307e\u3059 (TuxGuitar)
-settings.config.main.window-title.var.description.filename=\u30d5\u30a1\u30a4\u30eb\u540d\u3092\u8868\u793a\u3057\u307e\u3059
-settings.config.main.window-title.var.description.filepath=\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u3092\u8868\u793a\u3057\u307e\u3059
-settings.config.main.window-title.var.description.songname=\u30d5\u30a1\u30a4\u30eb\u306e\u66f2\u540d\u3092\u8868\u793a\u3057\u307e\u3059
-settings.config.main.window-title.var.description.songauthor=\u30d5\u30a1\u30a4\u30eb\u306e\u8457\u4f5c\u8005\u3092\u8868\u793a\u3057\u307e\u3059
-settings.config.main.window-title.var.description.songalbum=\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30eb\u30d0\u30e0\u540d\u3092\u8868\u793a\u3057\u307e\u3059
-settings.config.main.window-title.var.description.songartist=\u30d5\u30a1\u30a4\u30eb\u306e\u30a2\u30fc\u30c6\u30a3\u30b9\u30c8\u540d\u3092\u8868\u793a\u3057\u307e\u3059
-settings.config.main.options=\u30aa\u30d7\u30b7\u30e7\u30f3
-settings.config.main.splash-enabled=\u8d77\u52d5\u6642\u306b\u30b9\u30d7\u30e9\u30c3\u30b7\u30e5\u753b\u9762\u3092\u8868\u793a\u3059\u308b
-settings.config.main.table.auto-size.enabled=\u81ea\u52d5\u3067\u30c6\u30fc\u30d6\u30eb\u3092\u30ea\u30b5\u30a4\u30ba\u3059\u308b
-settings.config.styles.color.lines=\u4e94\u7dda
-settings.config.toolbars=\u30c4\u30fc\u30eb\u30d0\u30fc
-settings.config.toolbars.tip=\u30c4\u30fc\u30eb\u30d0\u30fc\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
-settings.config.toolbars.list=\u30c4\u30fc\u30eb\u30d0\u30fc\u3092\u8868\u793a\u3059\u308b
-settings.config.toolbars.move-up=\u4e0a\u3078\u79fb\u52d5
-settings.config.toolbars.move-down=\u4e0b\u3078\u79fb\u52d5
-settings.config.skin=\u30b9\u30ad\u30f3
-settings.config.skin.choose=\u30b9\u30ad\u30f3\u306e\u9078\u629e
-settings.keybindings=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u30ad\u30fc\u8a2d\u5b9a
-
-key-bindings-editor=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u30ad\u30fc\u30fb\u30a8\u30c7\u30a3\u30bf
-key-bindings-editor-action-select=\u52d5\u4f5c\u306e\u9078\u629e
-key-bindings-editor-action-column=\u52d5\u4f5c
-key-bindings-editor-shortcut-column=\u30ad\u30fc
-key-bindings-editor-push-a-key=\u30ad\u30fc\u3092\u62bc\u3057\u3066\u304f\u3060\u3055\u3044
-key-bindings-editor-save-question=\u5909\u66f4\u304c\u4fdd\u5b58\u3055\u308c\u3066\u3044\u307e\u305b\u3093, \u4fdd\u5b58\u3057\u306a\u3044\u3067\u7d42\u4e86\u3057\u307e\u3059\u304b?
-
-key-bindings-editor-override=\u5165\u529b\u3055\u308c\u305f\u30ad\u30fc\u306f\u3059\u3067\u306b\u5272\u308a\u5f53\u3066\u3089\u308c\u3066\u3044\u307e\u3059! \u672c\u5f53\u306b\u4f7f\u3063\u3066\u3082\u3088\u308d\u3057\u3044\u3067\u3059\u304b?
-
-print.print=\u5370\u5237
-print.dialog=\u5370\u5237
-print.service=\u30b5\u30fc\u30d3\u30b9
-print.service.name=\u540d\u79f0
-print.service.status=\u30b9\u30c6\u30fc\u30bf\u30b9
-print.service.type=\u30bf\u30a4\u30d7
-print.service.info=\u60c5\u5831
-print.range=\u7bc4\u56f2
-print.range.all-pages=\u3059\u3079\u3066
-print.range.pages=\u30da\u30fc\u30b8
-print.range.pages-to=\u307e\u3067
-print.copies=\u30b3\u30d4\u30fc
-print.copies-number=\u30b3\u30d4\u30fc\u90e8\u6570
-print.print-to-file=\u30d5\u30a1\u30a4\u30eb\u306b\u5370\u5237
-print.file-chooser=\u9078\u629e
-print-header.default-song-name= 
-print-header.default-song-author= 
-
-print.preview=\u5370\u5237\u30d7\u30ec\u30d3\u30e5
-print.preview.page-of=/
-
-marker=\u30de\u30fc\u30ab
-marker.add=\u30de\u30fc\u30ab\u8ffd\u52a0
-marker.list=\u30de\u30fc\u30ab\u4e00\u89a7
-marker.first=\u5148\u982d\u306e\u30de\u30fc\u30ab\u3078
-marker.last=\u6700\u5f8c\u306e\u30de\u30fc\u30ab\u3078
-marker.next=\u6b21\u306e\u30de\u30fc\u30ab\u3078
-marker.previous=\u524d\u306e\u30de\u30fc\u30ab\u3078
-
-export.tablature-enabled=TAB\u8b5c\u3092\u8868\u793a
-export.score-enabled=\u4e94\u7dda\u8b5c\u3092\u8868\u793a
-export.chord-name-enabled=\u30b3\u30fc\u30c9\u540d\u3092\u8868\u793a
-export.chord-diagram-enabled=\u30b3\u30fc\u30c9\u30fb\u30c0\u30a4\u30a2\u30b0\u30e9\u30e0\u3092\u8868\u793a
-export.black-and-white=\u767d\u9ed2\u30e2\u30fc\u30c9
-
-scale=\u30b9\u30b1\u30fc\u30eb\u8868
-scale.list=\u30b9\u30b1\u30fc\u30eb\u8868
-
-text.insert=\u30c6\u30ad\u30b9\u30c8\u633f\u5165
-text.editor=\u30c6\u30ad\u30b9\u30c8\u30fb\u30a8\u30c7\u30a3\u30bf
-text.text=\u30c6\u30ad\u30b9\u30c8
-
-tools=\u30c4\u30fc\u30eb
-tools.scale=\u30b9\u30b1\u30fc\u30eb\u8868
-tools.browser=\u30d6\u30e9\u30a6\u30b6
-tools.batch=\u30d0\u30c3\u30c1\u51e6\u7406/\u4e00\u62ec\u30d5\u30a1\u30a4\u30eb\u5909\u63db
-tools.plugins=\u30d7\u30e9\u30b0\u30a4\u30f3
-tools.shortcuts=\u30b7\u30e7\u30fc\u30c8\u30ab\u30c3\u30c8\u30ad\u30fc
-tools.settings=\u74b0\u5883\u8a2d\u5b9a/Settings
-tools.transpose=\u79fb\u8abf
-tools.transpose.semitones=\u534a\u97f3\u79fb\u8abf
-tools.transpose.apply-to-track=\u5168\u5c0f\u7bc0\u3092\u79fb\u8abf\u3059\u308b
-tools.transpose.apply-to-measure=\u73fe\u5c0f\u7bc0\u306e\u307f\u79fb\u8abf\u3059\u308b
-tools.transpose.apply-to-all-tracks=\u5168\u30c8\u30e9\u30c3\u30af\u306b\u9069\u5fdc\u3059\u308b
-tools.transpose.try-keep-strings=\u97f3\u7b26\u306f\u540c\u3058\u5f26\u3092\u53ef\u80fd\u306a\u9650\u308a\u7dad\u6301\u3059\u308b
-tools.transpose.apply-to-chords=\u30b3\u30fc\u30c9\u3092\u79fb\u8abf\u3059\u308b
-
-browser.dialog=\u30d6\u30e9\u30a6\u30b6
-browser.menu.file=\u30d5\u30a1\u30a4\u30eb
-browser.open=\u958b\u304f
-browser.exit=\u7d42\u4e86
-browser.menu.collection=\u30b3\u30ec\u30af\u30b7\u30e7\u30f3
-browser.menu.go=Go
-browser.collection.select=\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u306e\u9078\u629e
-browser.collection.open=\u958b\u304f
-browser.collection.remove=\u524a\u9664
-browser.collection.close=\u9589\u3058\u308b
-browser.collection.new=\u65b0\u898f
-browser.go-root=\u30db\u30fc\u30e0
-browser.go-back=\u623b\u308b
-browser.refresh=\u66f4\u65b0
-browser.factory.fs.name=\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0
-browser.collection.fs.name=\u540d\u524d
-browser.collection.fs.path=\u30d5\u30a9\u30eb\u30c0
-browser.collection.fs.editor-title=\u30d5\u30a1\u30a4\u30eb\u30fb\u30b7\u30b9\u30c6\u30e0\u30fb\u30b3\u30ec\u30af\u30b7\u30e7\u30f3
-browser.collection.fs.editor-tip=\u30b3\u30ec\u30af\u30b7\u30e7\u30f3\u30fb\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e
-browser.collection.fs.invalid-path=\u6709\u52b9\u306a\u30d5\u30a9\u30eb\u30c0\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044
-
-midi.port=MIDI\u30dd\u30fc\u30c8
-midi.sequencer=MIDI\u30b7\u30fc\u30b1\u30f3\u30b5
-
-plugin.unknown-value=\u7121\u52b9.
-plugin.column.name=\u30d7\u30e9\u30b0\u30a4\u30f3\u540d
-plugin.column.enabled=\u6709\u52b9
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=\u30d5\u30a1\u30a4\u30eb
-edit.items=\u7de8\u96c6
-property.items=\u30b9\u30b3\u30a2\u60c5\u5831\u306e\u7de8\u96c6
-track.items=\u30c8\u30e9\u30c3\u30af
-duration.items=\u97f3\u7b26
-beat.items=\u30bf\u30a4/\u30b3\u30fc\u30c9\u633f\u5165
-composition.items=\u30c6\u30f3\u30dd\u30fb\u62cd\u5b50\u8a18\u53f7
-repeat.items=\u30ea\u30d4\u30fc\u30c8\u8a18\u53f7
-transport.items=\u30d7\u30ec\u30fc\u30e4
-marker.items=\u30de\u30fc\u30ab
-insert.items=\u8ffd\u52a0
-layout.items=\u30ec\u30a4\u30a2\u30a6\u30c8
-view.items=\u30d5\u30ec\u30c3\u30c8\u30dc\u30fc\u30c9/\u30d4\u30a2\u30ce/\u30df\u30ad\u30b5
-effect.items=\u30a8\u30d5\u30a7\u30af\u30c8/\u30c6\u30af\u30cb\u30c3\u30af
-dynamic.items=\u5f37\u5f31\u8a18\u53f7
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=\u30d5\u30a1\u30a4\u30eb: \u65b0\u898f
-action.file.open=\u30d5\u30a1\u30a4\u30eb: \u958b\u304f
-action.file.open-url=\u30d5\u30a1\u30a4\u30eb: URL\u3092\u958b\u304f
-action.file.save=\u30d5\u30a1\u30a4\u30eb: \u4fdd\u5b58
-action.file.save-as=\u30d5\u30a1\u30a4\u30eb: \u5225\u540d\u4fdd\u5b58
-action.file.print=\u30d5\u30a1\u30a4\u30eb: \u5370\u5237
-action.file.print-preview=\u30d5\u30a1\u30a4\u30eb: \u5370\u5237\u30d7\u30ec\u30d3\u30e5
-action.file.exit=\u30d5\u30a1\u30a4\u30eb: \u7d42\u4e86
-action.edit.undo=\u7de8\u96c6: \u5143\u306b\u623b\u3059
-action.edit.redo=\u7de8\u96c6: \u3084\u308a\u76f4\u3059
-action.edit.voice-1=\u7de8\u96c6: \u97f3\u58f0\u9078\u629e 1
-action.edit.voice-2=\u7de8\u96c6: \u97f3\u58f0\u9078\u629e 2
-action.composition.change-time-signature=\u62cd\u5b50: \u62cd\u5b50\u8a18\u53f7
-action.composition.change-tempo=\u62cd\u5b50: \u30c6\u30f3\u30dd
-action.composition.change-info=\u62cd\u5b50: \u30b9\u30b3\u30a2\u60c5\u5831\u306e\u7de8\u96c6
-action.composition.change-clef=\u62cd\u5b50: \u97f3\u90e8\u8a18\u53f7
-action.composition.change-key-signature=\u62cd\u5b50: \u8abf\u5b50\u8a18\u53f7
-action.composition.change-triplet-feel=\u62cd\u5b50: \u30b9\u30a6\u30a3\u30f3\u30b0\u30fb\u30d5\u30a3\u30fc\u30eb
-action.view.layout-set-page=\u8868\u793a: \u7e26\u30da\u30fc\u30b8
-action.view.layout-set-linear=\u8868\u793a: \u6a2a\u30b9\u30af\u30ed\u30fc\u30eb
-action.view.layout-set-multitrack=\u8868\u793a: \u30de\u30eb\u30c1\u30c8\u30e9\u30c3\u30af\u30fb\u30e2\u30fc\u30c9
-action.view.layout-set-score-enabled=\u8868\u793a: \u4e94\u7dda\u8868\u8a18
-action.view.layout-set-tablature-enabled=\u8868\u793a: TAB\u8b5c
-action.view.layout-set-compact=\u8868\u793a: \u30b3\u30f3\u30d1\u30af\u30c8
-action.view.layout-set-chord-diagram-enabled=\u8868\u793a: \u30b3\u30fc\u30c9\u30c0\u30a4\u30a2\u30b0\u30e9\u30e0
-action.view.layout-set-chord-name-enabled=\u8868\u793a: \u30b3\u30fc\u30c9\u540d
-action.view.show-fretboard=\u8868\u793a: \u30d5\u30ec\u30c3\u30c8\u30dc\u30fc\u30c9
-action.view.show-piano=\u8868\u793a: \u30d4\u30a2\u30ce
-action.view.show-matrix=\u8868\u793a: \u30de\u30c8\u30ea\u30c3\u30af\u30b9
-action.view.show-mixer=\u8868\u793a: \u30df\u30ad\u30b5
-action.view.show-transport=\u8868\u793a: \u30d7\u30ec\u30fc\u30e4
-action.track.add=\u30c8\u30e9\u30c3\u30af: \u8ffd\u52a0
-action.track.remove=\u30c8\u30e9\u30c3\u30af: \u524a\u9664
-action.track.clone=\u30c8\u30e9\u30c3\u30af: \u8907\u88fd
-action.track.go-first=\u30c8\u30e9\u30c3\u30af: \u5148\u982d\u3078
-action.track.go-last=\u30c8\u30e9\u30c3\u30af: \u6700\u7d42\u3078
-action.track.go-next=\u30c8\u30e9\u30c3\u30af: \u6b21\u3078
-action.track.go-previous=\u30c8\u30e9\u30c3\u30af: \u524d\u3078
-action.track.lyrics=\u30c8\u30e9\u30c3\u30af: \u6b4c\u8a5e\u30a8\u30c7\u30a3\u30bf\u3092\u958b\u304f
-action.track.properties=\u30c8\u30e9\u30c3\u30af: \u30c8\u30e9\u30c3\u30af\u306e\u30d7\u30ed\u30d1\u30c6\u30a3
-action.track.move-down=\u30c8\u30e9\u30c3\u30af: \u4e0b\u3078\u79fb\u52d5\u3055\u305b\u308b
-action.track.move-up=\u30c8\u30e9\u30c3\u30af: \u4e0a\u3078\u79fb\u52d5\u3055\u305b\u308b
-action.measure.add=\u5c0f\u7bc0: \u8ffd\u52a0 (\u7a7a\u5c0f\u7bc0)
-action.measure.remove=\u5c0f\u7bc0: \u524a\u9664 (\u9078\u629e\u7bc4\u56f2)
-action.measure.copy=\u5c0f\u7bc0: \u30b3\u30d4\u30fc (\u9078\u629e\u7bc4\u56f2)
-action.measure.paste=\u5c0f\u7bc0: \u8cbc\u308a\u4ed8\u3051
-action.measure.clean=\u5c0f\u7bc0: \u9664\u53bb
-action.measure.go-first=\u5c0f\u7bc0: \u5148\u982d\u3078
-action.measure.go-last=\u5c0f\u7bc0: \u6700\u5f8c\u3078
-action.measure.go-next=\u5c0f\u7bc0: \u6b21\u3078
-action.measure.go-previous=\u5c0f\u7bc0: \u524d\u3078
-action.beat.general.remove-unused-voice=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u672a\u4f7f\u7528\u97f3\u58f0\u306e\u9664\u53bb
-action.beat.general.voice-up=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u7b26\u5c3e\u306e\u5411\u304d\u3092\u4e0a\u306b\u3059\u308b
-action.beat.general.voice-down=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u7b26\u5c3e\u306e\u5411\u304d\u3092\u4e0b\u306b\u3059\u308b
-action.beat.general.voice-auto=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u7b26\u5c3e\u306e\u5411\u304d\u306e\u81ea\u52d5\u8abf\u6574
-action.beat.general.set-stroke-up=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u2193\u30a2\u30c3\u30d7\u30b9\u30c8\u30ed\u30fc\u30af
-action.beat.general.set-stroke-down=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u2191\u30c0\u30a6\u30f3\u30b9\u30c8\u30ed\u30fc\u30af
-action.beat.general.move-left=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: 1\u62cd\u5de6\u3078\u79fb\u52d5\u3059\u308b
-action.beat.general.move-right=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: 1\u62cd\u53f3\u3078\u79fb\u52d5\u3059\u308b
-action.beat.general.move-custom=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u62cd\u79fb\u52d5\u306e\u30ab\u30b9\u30bf\u30de\u30a4\u30ba
-action.note.general.clean-beat=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: 1\u62cd\u9664\u53bb
-action.note.general.decrement-semitone=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u534a\u97f3\u4e0b\u3052\u308b
-action.note.general.increment-semitone=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u534a\u97f3\u4e0a\u3052\u308b
-action.note.general.shift-down=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u4e0b\u5f26\u306b\u30b7\u30d5\u30c8
-action.note.general.shift-up=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u4e0a\u5f26\u306b\u30b7\u30d5\u30c8
-action.note.general.tied=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u2040 - \u30bf\u30a4
-action.note.duration.set-whole=\u97f3\u7b26: \u5168\u97f3\u7b26
-action.note.duration.set-half=\u97f3\u7b26: 2\u5206\u97f3\u7b26
-action.note.duration.set-quarter=\u97f3\u7b26: 4\u5206\u97f3\u7b26
-action.note.duration.set-eighth=\u97f3\u7b26: 8\u5206\u97f3\u7b26
-action.note.duration.set-sixteenth=\u97f3\u7b26: 16\u5206\u97f3\u7b26
-action.note.duration.set-thirty-second=\u97f3\u7b26: 32\u5206\u97f3\u7b26
-action.note.duration.set-sixty-fourth=\u97f3\u7b26: 64\u5206\u97f3\u7b26
-action.note.duration.change-dotted=\u97f3\u7b26: \u4ed8\u70b9
-action.note.duration.change-double-dotted=\u97f3\u7b26: \u8907\u4ed8\u70b9
-action.note.duration.change-division-type=\u97f3\u7b26: \u9023\u7b26
-action.note.duration.decrement-duration=\u97f3\u7b26: \u97f3\u4fa1\u3092\u4e0b\u3052\u308b
-action.note.duration.increment-duration=\u97f3\u7b26: \u97f3\u4fa1\u3092\u4e0a\u3052\u308b
-action.note.effect.change-vibrato=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \uff5e - \u30f4\u30a3\u30d6\u30e9\u30fc\u30c8
-action.note.effect.change-bend=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: C - \u30c1\u30e7\u30fc\u30ad\u30f3\u30b0
-action.note.effect.change-slide=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: S - \u30b9\u30e9\u30a4\u30c9
-action.note.effect.change-hammer=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: H/P - \u30cf\u30f3\u30de\u30ea\u30f3\u30b0\u30fb\u30aa\u30f3/\u30d7\u30ea\u30f3\u30b0\u30fb\u30aa\u30d5
-action.note.effect.change-accentuated=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: ^ - \u30a2\u30af\u30bb\u30f3\u30c8
-action.note.effect.change-dead=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: x - \u30c7\u30c3\u30c9\u30ce\u30fc\u30c8/\u30d6\u30e9\u30c3\u30b7\u30f3\u30b0
-action.note.effect.change-fade-in=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \uff1c - \u30d5\u30a7\u30fc\u30c9\u30a4\u30f3
-action.note.effect.change-ghost=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: ( ) - \u30b4\u30fc\u30b9\u30c8\u30ce\u30fc\u30c8
-action.note.effect.change-grace=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u2669 - \u88c5\u98fe\u8a18\u53f7
-action.note.effect.change-harmonic=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: Harm. - \u30cf\u30fc\u30e2\u30cb\u30af\u30b9
-action.note.effect.change-heavy-accentuated=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: ^^ - \u91cd\u30a2\u30af\u30bb\u30f3\u30c8
-action.note.effect.change-palm-mute=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: M - \u30d6\u30ea\u30c3\u30b8\u30fb\u30df\u30e5\u30fc\u30c8
-action.note.effect.change-popping=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u30dd\u30c3\u30d4\u30f3\u30b0
-action.note.effect.change-slapping=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \u30b9\u30e9\u30c3\u30d4\u30f3\u30b0/\u30c1\u30e7\u30c3\u30d1
-action.note.effect.change-staccato=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: \uff0e - \u30b9\u30bf\u30c3\u30ab\u30fc\u30c8
-action.note.effect.change-tapping=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: Tapping - \u30bf\u30c3\u30d4\u30f3\u30b0
-action.note.effect.change-tremolo-bar=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: tr. - \u30c8\u30ea\u30eb
-action.note.effect.change-tremolo-picking=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: Picking Tr. - \u30d4\u30c3\u30ad\u30f3\u30b0\u30fb\u30c8\u30ea\u30eb
-action.note.effect.change-trill=\u97f3\u7b26/\u30a8\u30d5\u30a7\u30af\u30c8: tr. - \u30c8\u30ea\u30eb
-action.insert.open-repeat=\u62cd\u5b50: \u30ea\u30d4\u30fc\u30c8\u958b\u59cb
-action.insert.close-repeat=\u62cd\u5b50: \u30ea\u30d4\u30fc\u30c8\u7d42\u4e86
-action.insert.repeat-alternative=\u62cd\u5b50: \u30ab\u30c3\u30b3(\u30ea\u30d4\u30fc\u30c8)
-action.insert.chord=\u97f3\u7b26: \u30b3\u30fc\u30c9\u633f\u5165
-action.insert.text=\u97f3\u7b26: \u30c6\u30ad\u30b9\u30c8\u633f\u5165
-action.marker.add=\u30de\u30fc\u30ab: \u8ffd\u52a0
-action.marker.go-next=\u30de\u30fc\u30ab: \u6b21\u3078
-action.marker.go-previous=\u30de\u30fc\u30ab: \u524d\u3078
-action.transport.play=\u30d7\u30ec\u30fc\u30e4: \u518d\u751f
-action.transport.stop=\u30d7\u30ec\u30fc\u30e4: \u505c\u6b62
-action.transport.mode=\u30d7\u30ec\u30fc\u30e4: \u518d\u751f\u8a2d\u5b9a
-action.transport.metronome=\u30d7\u30ec\u30fc\u30e4: \u30e1\u30c8\u30ed\u30ce\u30fc\u30e0 ON/OFF
-action.transport.set-loop-start=\u30d7\u30ec\u30fc\u30e4: \u30eb\u30fc\u30d7\u306e\u958b\u59cb\u30dd\u30a4\u30f3\u30c8\u306b\u8a2d\u5b9a
-action.transport.set-loop-end=\u30d7\u30ec\u30fc\u30e4: \u30eb\u30fc\u30d7\u306e\u7d42\u4e86\u30dd\u30a4\u30f3\u30c8\u306b\u8a2d\u5b9a
-action.tools.batch=\u30c4\u30fc\u30eb: \u30d0\u30c3\u30c1\u51e6\u7406/\u4e00\u62ec\u30d5\u30a1\u30a4\u30eb\u5909\u63db
-action.tools.browser=\u30c4\u30fc\u30eb: \u30d6\u30e9\u30a6\u30b6
-action.tools.transpose=\u30c4\u30fc\u30eb: \u79fb\u8abf
-action.settings.configure=\u74b0\u5883\u8a2d\u5b9a/Settings
-action.help.doc=\u30d8\u30eb\u30d7: \u30c9\u30ad\u30e5\u30e1\u30f3\u30c8
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_lt.properties b/TuxGuitar-testing/platform-all/share/lang/messages_lt.properties
deleted file mode 100644
index 3c5e8a1c..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_lt.properties
+++ /dev/null
@@ -1,687 +0,0 @@
-
-ok=Gerai
-cancel=Atsisakyti
-yes=Taip
-no=Ne
-add=Prid\u0117ti
-edit=Redaguoti
-remove=Pa\u0161alinti
-save=\u012Era\u0161yti
-exit=Baigti
-close=U\u017Everti
-choose=Pasirinkti
-color=Spalva
-title=Pavadinimas
-go=Eiti
-warning=\u012Esp\u0117jimas
-error=Klaida
-plugins=Priedai
-options=Parinktys
-defaults=Numatytai
-clean=Nuimti
-rename=Pervardyti
-fret=Skirsnis
-position=Pozicija
-name=Vardas
-author=Autorius
-version=Versija
-description=Apra\u0161ymas
-info=Informacija
-configure=Konfig\u016Bravimas
-url=URL
-
-file=Failas
-file.new=Naujas
-file.open=Atverti
-file.save=\u012Era\u0161yti
-file.save-as=\u012Era\u0161yti taip
-file.save-changes-question=K\u016Brinyje yra ne\u012Fra\u0161yt\u0173 pakeitim\u0173.\nAr dabar juos \u012Fra\u0161yti?
-file.exit=Baigti
-file.export=Eksportuoti
-file.export-midi=Eksportuoti \u012F MIDI
-file.export-pdf=Eksportuoti \u012F PDF
-file.print=Spausdinti
-file.print-preview=Spaudinio per\u017Ei\u016Bra
-file.import=Importuoti
-file.import-midi=Importuoti MIDI
-file.export-ascii=Eksportuoti \u012F ASCII
-file.history=Istorija
-file.open-url=Atverti URL
-file.open.error=Nepavyko atverti: {0}
-file.save.error=Nepavyko \u012Fra\u0161yti: {0}
-file.import.error=Nepavyko importuoti: {0}
-file.export.error=Nepavyko eksportuoti: {0}
-file.overwrite-question=Toks failas jau yra. Ar j\u012F perra\u0161yti?
-
-edit.menu=Taisymas
-edit.undo=At\u0161aukti
-edit.redo=Atstatyti
-edit.copy=Kopijuoti
-edit.from=Nuo
-edit.to=Iki
-edit.all-tracks=Visi takeliai
-edit.paste=\u012Ed\u0117ti
-edit.paste.count=\u012Ed\u0117ti kiek\u012F
-edit.paste.replace-mode=\u012Ed\u0117ti esamam takte
-edit.paste.insert-mode=Id\u0117ti naujam takte
-edit.delete=Pa\u0161alinti
-edit.cut=I\u0161kirpti
-edit.mouse-mode-selection=\u017Dym\u0117jimo pele veiksena
-edit.mouse-mode-edition=Partit\u016Bros redagavimo veiksena
-edit.not-natural-key=Diezai/bemoliai
-edit.voice-1=Parinkti bals\u0105 1
-edit.voice-2=Parinkti bals\u0105 2
-
-view=Rodymas
-view.layout=Maketas
-view.layout.page=Lape
-view.layout.linear=Linijoje
-view.layout.compact=Glaustai
-view.layout.multitrack=Daug takeli\u0173
-view.layout.chord-style=Akord\u0173 vaizdavimo b\u016Bdas
-view.layout.chord-name=Akordo pavadinimas
-view.layout.chord-diagram=Akordo diagrama
-view.layout.score-enabled=Natos
-view.layout.tablature-enabled=Tabulat\u016Bra
-view.show-mixer=Gars\u0173 mai\u0161iklis
-view.show-fretboard=Grifas
-view.show-piano=Pianino klaviat\u016Bra
-view.show-matrix=Grafin\u0117 gars\u0173 lentel\u0117
-view.show-transport=Grotuvas
-
-fretboard.direction=Kryptis
-fretboard.right-mode=De\u0161niarankiams
-fretboard.left-mode=Kairiarankiams
-fretboard.background-color=Fono spalva
-fretboard.display-note-text=Natos pavadinimas
-fretboard.display-scale-text=Rodyti partit\u016Bros pavadinim\u0105
-fretboard.font=\u0160riftas
-fretboard.fretpoint-color=Grifo spalva
-fretboard.note-color=Natos spalva
-fretboard.scale-note-color=Penklin\u0117s lapo spalva
-fretboard.settings=Grifo nuostatos
-fretboard.string-color=Styg\u0173 spalva
-fretboard.settings.options=Parinktys
-
-piano.editor=Redaguoti pianino klaviat\u016Bra
-piano.natural-key-color=\u012Eprasta klavi\u0161\u0173 spalva
-piano.not-natural-key-color=Ne\u012Fprasta klavi\u0161\u0173 spalva
-piano.note-color=Natos spalva
-piano.scale-note-color=Nat\u0173 spalva partit\u016Broje
-piano.settings=Pianino klaviat\u016Bros nuostatos
-
-matrix.editor=Grafinis gars\u0173 redaktorius
-matrix.grids=Gardeli\u0173 tankis
-matrix.border-color=R\u0117melio spalva
-matrix.font=\u0160riftas
-matrix.foreground-color=Priekio spalva
-matrix.line-color-1=Nelygini\u0173 linij\u0173 spalva
-matrix.line-color-2=Lygini\u0173 linij\u0173 spalva
-matrix.line-color-over=Linijos po \u017Eymekliu spalva
-matrix.note-color=Natos spalva
-matrix.play-note-color=Grojamos natos spalva
-matrix.position-color=Pozicijos spalva
-matrix.settings=Lentel\u0117s nuostatos
-
-composition=K\u016Brinys
-composition.timesignature=Metras
-composition.timesignature.Numerator=Skaitiklis
-composition.timesignature.denominator=Vardiklis
-composition.timesignature.to-the-end=Iki pabaigos
-composition.tempo=Tempas
-composition.tempo-percent=Tempas procentais
-composition.tempo.invalid=Neteisingas tempas
-composition.tempo.start-to-end=\u0160\u012F temp\u0105 taikyti visam k\u016Briniui
-composition.tempo.position-to-end=\u0160\u012F temp\u0105 taikyti iki pabaigos
-composition.tempo.position-to-next=\u0160\u012F temp\u0105 taikyti iki tempo pakeitimo \u017Eenklo
-composition.properties=Apie k\u016Brin\u012F
-composition.name=Pavadinimas
-composition.artist=Atlik\u0117jas
-composition.album=Albumas
-composition.author=Autorius
-composition.date=Data
-composition.copyright=Autoryst\u0117s teis\u0117s
-composition.writer=TAB'\u0173 k\u016Brimas
-composition.transcriber=Transkribuota
-composition.comments=Komentarai
-composition.tripletfeel=Triol\u0117mis
-composition.clef=Raktas
-composition.clef.treble=Smuiko
-composition.clef.bass=Boso
-composition.clef.tenor=Tenoro
-composition.clef.alto=Alto
-composition.clef.to-the-end=Taikyti \u0161\u012F rakt\u0105 iki pabaigos
-composition.keysignature=Tonacija
-composition.keysignature.natural=Be prieraktini\u0173 \u017Eenkl\u0173
-composition.keysignature.sharp-1=1 diezas
-composition.keysignature.sharp-2=2 diezai
-composition.keysignature.sharp-3=3 diezai
-composition.keysignature.sharp-4=4 diezai
-composition.keysignature.sharp-5=5 diezai
-composition.keysignature.sharp-6=6 diezai
-composition.keysignature.sharp-7=7 diezai
-composition.keysignature.flat-1=1 bemolis
-composition.keysignature.flat-2=2 bemoliai
-composition.keysignature.flat-3=3 bemoliai
-composition.keysignature.flat-4=4 bemoliai
-composition.keysignature.flat-5=5 bemoliai
-composition.keysignature.flat-6=6 bemoliai
-composition.keysignature.flat-7=7 bemoliai
-composition.keysignature.to-the-end=Taikyti \u0161\u012F rakt\u0105 iki pabaigos
-composition.tripletfeel=Triol\u0117mis
-composition.tripletfeel.none=Be trioli\u0173 \u201ETriplet Feel\u201C
-composition.tripletfeel.eighth=A\u0161tuntini\u0173 triol\u0117s
-composition.tripletfeel.sixteenth=\u0160e\u0161ioliktini\u0173 triol\u0117s
-composition.tripletfeel.to-the-end=Taikyti trioles \u201Etriplet feel\u201C iki pabaigos
-
-help=Pagalba
-help.help=Pagalba
-help.doc=\u017Dinynas
-help.about=Apie
-help.about.license=Licencijos
-help.about.authors=Autoriai
-help.about.description=Apra\u0161ymas
-
-track=Takeliai
-track.number=Nr.
-track.name=Pavadinimas
-track.color=Spalva
-track.first=Pirmas takelis
-track.last=Paskiausias takelis
-track.previous=Ankstesnis takelis
-track.next=Kitas takelis
-track.add=Prid\u0117ti takel\u012F
-track.remove=Pa\u0161alinti takel\u012F
-track.clone=Klonuoti takel\u012F
-track.move-up=Auk\u0161tyn
-track.move-down=\u017Demyn
-track.instrument=Instrumentas 
-track.properties=Takeli\u0173 nuostatos
-track.properties.general=Bendra
-track.name.default-percussion-name=Mu\u0161amieji
-track.lyrics=\u017Dod\u017Eiai
-track.solo=Solo
-track.mute=Tildymas
-
-lyric.editor=\u017Dod\u017Ei\u0173 redaktorius
-
-measure=Taktai
-measure.first=Pirmas taktas
-measure.last=Paskiausias taktas
-measure.previous=Ankstesnis taktas
-measure.next=Kitas taktas
-measure.add=Prid\u0117ti takt\u0105
-measure.add.count=Prid\u0117ti skai\u010Diavim\u0105
-measure.add-before-current-position=Prid\u0117ti takt\u0105 prie\u0161 esam\u0105 pozicij\u0105
-measure.add-after-current-position=Prid\u0117ti takt\u0105 u\u017E esamos pozicijos
-measure.add-at-end=Prid\u0117ti takt\u0105 gale
-measure.remove=Pa\u0161alinti takt\u0105
-measure.copy=Kopijuoti takt\u0105
-measure.paste=\u012Ed\u0117ti takt\u0105
-measure.clean=Nuimti takto \u017Eenkl\u0105
-
-duration=Trukm\u0117
-duration.whole=Pilna
-duration.half=Pusin\u0117
-duration.quarter=Ketvirtin\u0117
-duration.eighth=A\u0161tuntin\u0117
-duration.sixteenth=\u0160e\u0161ioliktin\u0117
-duration.thirtysecond=Trisde\u0161imt antrin\u0117
-duration.sixtyfourth=\u0160e\u0161iasde\u0161imt ketvirtin\u0117
-duration.dotted=Su ta\u0161ku
-duration.doubledotted=Su dviem ta\u0161kais
-duration.division-type=Triol\u0117
-
-dynamic=Dinamika
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano
-dynamic.mezzo-forte=Mezzo Forte
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Melizmai ir efektai
-effects.vibrato=Vibrato
-effects.bend=Tempimas
-effects.deadnote=Nuslopintoji nata
-effects.slide=Glisando
-effects.hammer=Legato (Hammer-on/Pull-off)
-effects.tremolo-bar=Rankena (tremolo bar)
-effects.tremolo-bar-editor=Tremolo rankena redagavimas
-effects.tremolo-bar.dip=Nuleisti ranken\u0105 (dip)
-effects.tremolo-bar.dive=Nuleisti ir atleisti (dive)
-effects.tremolo-bar.release-up=Atleisti auk\u0161tyn
-effects.tremolo-bar.release-down=Atleisti \u017Eemyn
-effects.tremolo-bar.inverted-dip=Atbulas nuleidimas (inverted dip) 
-effects.tremolo-bar.return=Gr\u0105\u017Einimas
-effects.ghostnote=Prislopintoji nata
-effects.accentuatednote=Akcentuotoji nata
-effects.heavyaccentuatednote=Stipriai akcentuota nata
-effects.harmonic=Fla\u017Eoletas
-effects.grace=For\u0161lagas
-effects.grace-editor=For\u0161lago redagavimas
-effects.grace.before-beat=Silpnoji ritmo dalis
-effects.grace.on-beat=Stiprioji ritmo dalis
-effects.grace.transition=Artikuliavimas
-effects.grace.transition-none=N\u0117ra
-effects.grace.transition-bend=Tempimas
-effects.grace.transition-slide=Glisando
-effects.grace.transition-hammer=Legato
-effects.trill=Trel\u0117
-effects.trill-editor=Treli\u0173 redagavimas
-effects.tremolo-picking=Skambinimas tremolo
-effects.tremolo-picking-editor=Tremolo redagavimas
-effects.palm-mute=Slopinimas delnu
-effects.staccato=Stakato
-effects.tapping=Tapping (legato de\u0161ine ranka)
-effects.slapping=Slapping (sm\u016Bgiavimas \u012F styg\u0105)
-effects.popping=Popping (stygos kabinimas nuo grifo pus\u0117s)
-effects.fade-in=Laipsni\u0161kas atsiradimas
-effects.harmonic-editor=Fla\u017Eolet\u0173 redagavimas
-effects.harmonic.type-of-harmonic=Fla\u017Eoleto tipas
-effects.harmonic.natural=Paprastasis fla\u017Eoletas
-effects.harmonic.artificial=Dirbtinis fla\u017Eoletas
-effects.harmonic.artificial.key-offset=Tonacijos poslinkis
-effects.harmonic.tapped=Fla\u017Eoletas \u201Etapped\u201C
-effects.harmonic.tapped.left-hand=Kairioji ranka
-effects.harmonic.tapped.right-hand=De\u0161inioji ranka
-effects.harmonic.pinch=Obertoninis fla\u017Eoletas (squealie)
-effects.harmonic.semi=Pusiau fla\u017Eoletas
-
-bend.editor=Stygos patempim\u0173 redagavimas
-bend.bend=Tempimas
-bend.bend-release=Tempimas/Atleidimas
-bend.bend-release-bend=Tempimas/Atleidimas/Tempimas
-bend.prebend=Patempimas prie\u0161 laikym\u0105
-bend.prebend-release=Patempimas prie\u0161 laikym\u0105/atleidimas
-
-transport=Grotuvas
-transport.start=Groti
-transport.stop=Stabdyti
-transport.pause=Pauz\u0117
-transport.first=Pirmiausias
-transport.last=Paskiausias
-transport.previous=Ankstesnis
-transport.next=Kitas
-transport.metronome=Metronomas
-transport.mode=Kaip groti
-transport.mode.simple=\u012Eprastai
-transport.mode.simple.tempo-percent=Tempo pakeitimas procentais
-transport.mode.simple.loop=Groti kartojant
-transport.mode.trainer=Mokymosi veiksena
-transport.mode.trainer.increment-description=Padidinti per
-transport.mode.loop-range=Pakartojimo r\u0117\u017Eis
-transport.mode.loop-range.from=Groti nuo takto
-transport.mode.loop-range.from-default=Groti nuo prad\u017Ei\u0173
-transport.mode.loop-range.to=Groti iki takto
-transport.mode.loop-range.to-default=Iki galo
-transport.set-loop-start=Nustatyti pakartojimo prad\u017Ei\u0105
-transport.set-loop-end=Nustatyti pakartojimo pabaig\u0105
-
-instruments.volume=Stiprinimas
-instrument.channel=Kanalas
-instrument.effect-channel=Kanalo efektas
-instrument.volume=Garsumas
-instrument.balance=Balansas
-instrument.chorus=Kvadratas (chorus)
-instrument.reverb=Reverberacija
-instrument.phaser=Fazeris
-instrument.tremolo=Tremolo
-instrument.free=Laisvas
-instrument.link=Nuoroda
-
-
-repeat.open=Kartojimo prad\u017Eia
-repeat.close=Kartojimo pabaiga
-repeat.alternative=Alternatyv\u016Bs kartojimai
-repeat.alternative.editor=Alternatyvi\u0173j\u0173 kartojim\u0173 redagavimas
-repetitions=Pakartojimai
-repeat.number-of-repetitions=Kartojim\u0173 skai\u010Dius
-
-beat=Natos
-beat.clean=Akcentavimo nu\u0117mimas
-beat.voice.remove-unused=Nenaudojamo balso pa\u0161alinimas
-beat.voice-up=Linija vir\u0161 penklin\u0117s
-beat.voice-down=Linija po penkline
-beat.voice-auto=Automatinis penklin\u0117s papildymas linijomis
-beat.stroke=Braukti
-beat.stroke-up=Braukimas auk\u0161tyn
-beat.stroke-down=Braukimas \u017Eemyn
-beat.move-left=Perkelti per takto dal\u012F kair\u0117n
-beat.move-right=Perkelti per takto dal\u012F de\u0161in\u0117n
-beat.move-custom=Pasirinktinis perk\u0117limas
-beat.move-custom.dialog.title=Pasirinktinis perk\u0117limas
-beat.move-custom.dialog.direction-tip=Perk\u0117limo kryptis
-beat.move-custom.dialog.move-1.tip=Perk\u0117limas
-beat.move-custom.dialog.move-2.tip=Perk\u0117limas tiksliau
-beat.move-custom.dialog.direction=Kryptis
-beat.move-custom.dialog.direction.right=Perk\u0117limas de\u0161in\u0117n
-beat.move-custom.dialog.direction.left=Perk\u0117limas kair\u0117n
-beat.move-custom.dialog.count=Per kiek
-beat.move-custom.dialog.duration=Trukm\u0117
-beat.move-custom.dialog.duration.type=Su ta\u0161ku/Su dviem ta\u0161kais
-beat.move-custom.dialog.duration.type.normal=Nepakeista
-beat.move-custom.dialog.duration.division-type=Dalinimo b\u016Bdas
-beat.move-custom.dialog.duration.division-type.normal=Normalus (tupletas)
-
-note=Nata
-note.semitone-up=Pustoniu auk\u0161tyn
-note.semitone-down=Pustoniu \u017Eemyn
-note.shift-up=Perstumti auk\u0161tyn
-note.shift-down=Perstumti \u017Eemyn
-note.tiednote=Ligat\u016Bra
-note.deadnote=Nuslopinta nata
-
-insert.chord=\u012Eterpti akord\u0105
-chord.editor=Akord\u0173 redaktorius
-chord=Akordas
-chord.name=Pavadinimas
-chord.bass=Bosas
-chord.custom=Susikurtas akordas
-chord.custom.name-empty-error=Koks nors akordo vardas turi b\u016Bti.
-chord.custom.name-exist-error=Toks akordo pavadinimas jau yra.
-chord.settings.tip=Parinktys
-chord.settings.type=Tipas
-chord.settings.type.most-common=Populiarieji
-chord.settings.type.inversions=Inversijos
-chord.settings.type.close-voiced=Glaustai
-chord.settings.type.open-voiced=I\u0161skleistai
-chord.settings.open-chords=Atviri akordai
-chord.settings.chords-to-display=Akordai, kuriuos rodyti
-chord.settings.search-frets=Surasti skirsn\u012F
-chord.settings.minimum-fret=Minimalus skirsnis
-chord.settings.maximum-fret=Maksimalus skirsnis
-
-instrument=Instrumentas
-instrument.instrument=Instrumentas
-instrument.percussion-track=Mu\u0161am\u0173j\u0173 takelis
-
-tuning=Derinimas
-tuning.offset=Derinimo schema
-tuning.strings=Stygos
-tuning.strings.transpose=Transponuoti veikiam\u0105sias natas
-tuning.strings.transpose.try-keep-strings=Pagal galimyb\u0119 laikyti natas toje pa\u010Dioje stygoje
-tuning.strings.transpose.apply-to-chords=Transponuoti akordus
-
-language=Kalba
-
-choose-color=Spalvos parinkimas
-
-settings=Parinktys
-settings.config=\u201ETuxGuitar\u201C konfig\u016Bravimas
-settings.config.language=Kalba
-settings.config.language.choose=Pasirinkite kalb\u0105
-settings.config.styles=Apipavidalinimo stilius 
-settings.config.styles.general=Bendras stilius
-settings.config.styles.printer=Spausdinimo stilius
-settings.config.styles.font.default=Numatytasis \u0161riftas
-settings.config.styles.font.note=Nat\u0173 \u0161riftas
-settings.config.styles.font.lyric=Dainos \u017Eod\u017Ei\u0173 \u0161riftas
-settings.config.styles.font.text=Teksto \u0161riftas
-settings.config.styles.font.time-signature=Metro \u0161riftas
-settings.config.styles.font.printer-default=Numatytasis spausdinimo \u0161riftas
-settings.config.styles.font.printer-note=Nat\u0173 \u0161riftas spausdinimui
-settings.config.styles.font.printer-time-signature=Metro \u0161riftas spausdinimui
-settings.config.styles.color.score-note=Penklin\u0117s nat\u0173 spalva
-settings.config.styles.color.tab-note=Tab\u0173 natos spalva
-settings.config.styles.color.play-note=Grojamos natos spalva
-settings.config.apply-changes-question=Ar tikrai norite priimti pakeitimus?
-settings.config.sound=Garso \u012Frenginiai
-settings.config.main=Bendra
-settings.config.main.window-title=Lango pavadinimas
-settings.config.main.window-title.help=Lango pavadinime bus rodomos \u0161i\u0173 kintam\u0173j\u0173 reik\u0161m\u0117s:
-settings.config.main.window-title.var.description.appname=\u0160io kintamojo reik\u0161m\u0117 yra programos pavadinimas: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Kintamojo reik\u0161m\u0117 parodo \u201ETuxGuitar\u201C laidos numer\u012F
-settings.config.main.window-title.var.description.filename=\u0160io kintamojo reik\u0161m\u0117 yra atverto failo vardas
-settings.config.main.window-title.var.description.filepath=\u0160io kintamojo reik\u0161m\u0117 yra kelias iki atverto failo
-settings.config.main.window-title.var.description.songname=\u0160io kintamojo reik\u0161m\u0117 yra k\u016Brinio pavadinimas
-settings.config.main.window-title.var.description.songauthor=\u0160io kintamojo reik\u0161m\u0117 yra k\u016Brinio autorius
-settings.config.main.window-title.var.description.songalbum=\u0160io kintamojo reik\u0161m\u0117 yra albumo, kuriame yra k\u016Brinys, pavadinimas
-settings.config.main.window-title.var.description.songartist=\u0160io kintamojo reik\u0161m\u0117 yra k\u016Brinio atlik\u0117jas
-settings.config.main.options=Parinktys
-settings.config.main.splash-enabled=Rodyti informacin\u012F ekran\u0105 programos starto metu
-settings.config.main.table.auto-size.enabled=Automatinio takt\u0173 dyd\u017Eio parinkimo \u012Fjungimas
-settings.config.styles.color.lines=Horizontali\u0173 linij\u0173 spalva
-settings.config.toolbars=\u012Erankin\u0117s
-settings.config.toolbars.tip=Susid\u0117lioti \u012Frankines
-settings.config.toolbars.list=Jums prieinamos \u012Frankin\u0117s
-settings.config.toolbars.move-up=Auk\u0161tyn
-settings.config.toolbars.move-down=\u017Demyn
-settings.config.skin=Apipavidalinimai
-settings.config.skin.choose=Pasirinkite apipavidalinim\u0105
-settings.keybindings=Klavi\u0161\u0173 susiejimo konfig\u016Bravimas
-
-key-bindings-editor=Klavi\u0161\u0173 susiejim\u0173 redagavimas
-key-bindings-editor-action-select=Veiksmo parinkimas
-key-bindings-editor-action-column=Veiksmai
-key-bindings-editor-shortcut-column=Klavi\u0161ai
-key-bindings-editor-push-a-key=Spauskite klavi\u0161\u0105
-key-bindings-editor-save-question=Lik\u0119 nei\u0161saugot\u0173 pakeitim\u0173. Ar tikrai j\u0173 nesaugoj\u0119 baigsite darb\u0105?
-
-key-bindings-editor-override=Spartusis klavi\u0161as jau panaudotas! Ar vis tiek j\u012F naudosite?
-
-print.print=Spausdinti
-print.dialog=Spausdinti
-print.service=Paslauga
-print.service.name=Pavadinimas
-print.service.status=Statusas
-print.service.type=Tipas
-print.service.info=Informacija
-print.range=R\u0117\u017Eiai
-print.range.all-pages=Visi
-print.range.pages=Lapai
-print.range.pages-to=Iki
-print.copies=Kopijos
-print.copies-number=Kopij\u0173 skai\u010Dius
-print.print-to-file=Spausdinti \u012F fail\u0105
-print.file-chooser=Pasir
-print-header.default-song-name=Be pavadinimo
-print-header.default-song-author=Anonimas
-
-print.preview=Spaudinio per\u017Ei\u016Bra
-print.preview.page-of=i\u0161
-
-marker=Gairel\u0117s
-marker.add=Prid\u0117ti gairel\u0119
-marker.list=Gaireli\u0173 s\u0105ra\u0161as
-marker.first=Eiti prie pirmiausios gairel\u0117s
-marker.last=Eiti prie paskiausios gairel\u0117s
-marker.next=Eiti prie kitos gairel\u0117s
-marker.previous=Eiti prie ankstesn\u0117s gairel\u0117s
-
-export.tablature-enabled=Rodyti tabulat\u016Br\u0105
-export.score-enabled=Rodyti penklin\u0119
-export.chord-name-enabled=Rodyti akordus
-export.chord-diagram-enabled=Rodyti akord\u0173 diagram\u0105
-export.black-and-white=Juodai balta
-
-scale=Tonacija
-scale.list=Tonacij\u0173 s\u0105ra\u0161as
-
-text.insert=\u012Eterpti tekst\u0105
-text.editor=Teksto redaktorius
-text.text=Tekstas
-
-tools=\u012Erankiai
-tools.scale=Tonacij\u0173 s\u0105ra\u0161as
-tools.browser=Nar\u0161ykl\u0117
-tools.plugins=Priedai
-tools.shortcuts=Spartieji klavi\u0161ai
-tools.settings=Nuostatos
-
-tools.transpose=Transponavimas
-tools.transpose.semitones=Transponavimas pustoniais
-tools.transpose.apply-to-track=Transponuoti visuose taktuose
-tools.transpose.apply-to-measure=Transponuoti tik \u0161\u012F takt\u0105
-tools.transpose.apply-to-all-tracks=Taikyti visiems takeliams
-tools.transpose.try-keep-strings=Stenkit\u0117s laikyti natas vienoje stygoje, jei tik tai \u012Fmanoma
-tools.transpose.apply-to-chords=Akord\u0173 transponavimas
-
-browser.dialog=Nar\u0161ykl\u0117
-browser.menu.file=Failas
-browser.open=Atverti
-browser.exit=Baigti
-browser.menu.collection=Kolekcija
-browser.menu.go=Eiti
-browser.collection.select=Parinkti kolekcij\u0105
-browser.collection.open=Atverti
-browser.collection.remove=Pa\u0161alinti
-browser.collection.close=U\u017Everti
-browser.collection.new=Naujas
-browser.go-root=Prad\u017Eia
-browser.go-back=Atgal
-browser.refresh=Atnaujinti
-browser.factory.fs.name=Fail\u0173 sistema
-browser.collection.fs.name=Pavadinimas
-browser.collection.fs.path=Aplankas
-browser.collection.fs.editor-title=Kolekcija fail\u0173 sistemoje
-browser.collection.fs.editor-tip=Pasirinkite numatyt\u0105j\u012F aplank\u0105 savo k\u016Briniams
-browser.collection.fs.invalid-path=Pasirinkite teising\u0105 aplank\u0105
-
-midi.port=MIDI prievadas
-midi.sequencer=MIDI sekvenceris
-
-plugin.unknown-value=Neprieinama.
-plugin.column.name=Priedo pavadinimas
-plugin.column.enabled=\u012Ejungta
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Failai
-edit.items=Redakcijos
-property.items=Savyb\u0117s
-track.items=Takeliai
-duration.items=Trukm\u0117s
-beat.items=Ritminiai sm\u016Bgiai
-composition.items=K\u016Briniai
-repeat.items=Pakartojimai
-transport.items=Elementai grotuvui
-marker.items=Gairel\u0117s
-insert.items=\u012Eterpiniai
-layout.items=Maketai
-view.items=Rodiniai
-effect.items=Melizmai
-dynamic.items=Dinamikos \u017Eenklai
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Naujas failas
-action.file.open=Atverti fail\u0105
-action.file.open-url=Atverti URL
-action.file.save=\u012Era\u0161yti
-action.file.save-as=\u012Era\u0161yti kaip
-action.file.print=Spausdinti
-action.file.print-preview=Spaudinio per\u017Ei\u016Bra
-action.file.exit=Baigti darb\u0105 su \u201ETuxGuitar\u201C
-action.edit.undo=At\u0161aukti
-action.edit.redo=Atstatyti
-action.edit.voice-1=Parinkti bals\u0105 1
-action.edit.voice-2=Parinkti bals\u0105 2
-action.composition.change-time-signature=Keisti metr\u0105
-action.composition.change-tempo=Keisti temp\u0105
-action.composition.change-info=Keisti informacij\u0105 apie k\u016Brin\u012F
-action.composition.change-clef=Keisti rakt\u0105
-action.composition.change-key-signature=Keisti tonacij\u0105
-action.composition.change-triplet-feel=Trioli\u0173 keitimas
-action.view.layout-set-page=Penklin\u0117s i\u0161d\u0117stymas lape
-action.view.layout-set-linear=Linijinis penklin\u0117s i\u0161d\u0117stymas
-action.view.layout-set-multitrack=Daugelio takeli\u0173 rodymas
-action.view.layout-set-score-enabled=Rodyti partit\u016Br\u0105
-action.view.layout-set-tablature-enabled=Rodyti tablat\u016Br\u0105
-action.view.layout-set-compact=Rodyti suspaustai
-action.view.layout-set-chord-diagram-enabled=\u012Ejungti akordo diagram\u0105
-action.view.layout-set-chord-name-enabled=\u012Ejungti akordo pavadinim\u0105
-action.view.show-fretboard=Rodyti grif\u0105
-action.view.show-piano=Rodyti pianino klaviat\u016Br\u0105
-action.view.show-matrix=Rodyti gars\u0173 lentele
-action.view.show-mixer=Rodyti gars\u0173 mai\u0161ikl\u012F
-action.view.show-transport=Rodyti grotuv\u0105
-action.track.add=Prid\u0117ti takel\u012F
-action.track.remove=Pa\u0161alinti takel\u012F
-action.track.clone=Klonuoti takel\u012F
-action.track.go-first=Eiti \u012F pirm\u0105 takel\u012F
-action.track.go-last=Eiti \u012F paskutin\u012F takel\u012F
-action.track.go-next=Eiti \u012F kit\u0105 takel\u012F
-action.track.go-previous=Eiti \u012F ankstesn\u012F takel\u012F
-action.track.lyrics=Redaguoti \u017Eod\u017Eius
-action.track.properties=Keisti takelio nuostatas
-action.track.move-down=Takel\u012F perkelti \u017Eemyn
-action.track.move-up=Takel\u012F perkelti auk\u0161tyn
-action.measure.add=Prid\u0117ti takt\u0105
-action.measure.remove=Pa\u0161alinti takt\u0105
-action.measure.copy=Kopijuoti takt\u0105
-action.measure.paste=\u012Ed\u0117ti takt\u0105
-action.measure.clean=Pa\u0161alinti takto \u017Eenkl\u0105
-action.measure.go-first=Eiti \u012F pirm\u0105 takt\u0105
-action.measure.go-last=Eiti \u012F paskutin\u012F takt\u0105
-action.measure.go-next=Eiti \u012F kit\u0105 takt\u0105
-action.measure.go-previous=Eiti \u012F ankstesn\u012F takt\u0105
-action.beat.general.remove-unused-voice=Nenaudojamo balso pa\u0161alinimas
-action.beat.general.voice-up=Penklin\u0119 papildyti auk\u0161tyn
-action.beat.general.voice-down=Penklin\u0119 papildyti \u017Eemyn
-action.beat.general.voice-auto=Automatinis penklin\u0117s papildymas linijomis
-action.beat.general.set-stroke-up=Nustatyti braukim\u0105 auk\u0161tyn
-action.beat.general.set-stroke-down=Nustatyti braukim\u0105 \u017Eemyn
-action.beat.general.move-left=Vienas ritmo sm\u016Bgis kair\u0117n
-action.beat.general.move-right=Vienas ritmo sm\u016Bgis de\u0161in\u0117n
-action.beat.general.move-custom=Susikurti ritmo pie\u0161in\u012F
-action.note.general.clean-beat=Nuimti akcentus
-action.note.general.decrement-semitone=Suma\u017Einti pustoniu
-action.note.general.increment-semitone=Padidinti pustoniu
-action.note.general.shift-down=Poslinkis \u017Eemyn
-action.note.general.shift-up=Poslinkis auk\u0161tyn
-action.note.general.tied=Prid\u0117ti/nuimti jungiam\u0105j\u012F lankel\u012F
-action.note.duration.set-whole=Pilnos natos trukm\u0117
-action.note.duration.set-half=Pusin\u0117s natos trukm\u0117
-action.note.duration.set-quarter=Ketvirtin\u0117s natos trukm\u0117
-action.note.duration.set-eighth=A\u0161tuntin\u0117s natos trukm\u0117
-action.note.duration.set-sixteenth=\u0160e\u0161ioliktin\u0117s natos trukm\u0117
-action.note.duration.set-thirty-second=Trisde\u0161imt antrin\u0117s natos trukm\u0117
-action.note.duration.set-sixty-fourth=\u0160e\u0161iasde\u0161imt ketvirtin\u0117s natos trukm\u0117
-action.note.duration.change-dotted=Prid\u0117ti/nuimti ta\u0161k\u0105
-action.note.duration.change-double-dotted=Prid\u0117ti/nuimti du ta\u0161kus
-action.note.duration.change-division-type=Prid\u0117ti/nuimti triol\u0119
-action.note.duration.decrement-duration=Sutrumpinti trukm\u0119
-action.note.duration.increment-duration=Pailginti trukm\u0119
-action.note.effect.change-vibrato=Prid\u0117ti/nuimti vibrato
-action.note.effect.change-bend=Prid\u0117ti/nuimti tempim\u0105
-action.note.effect.change-slide=Prid\u0117ti/nuimti glisando
-action.note.effect.change-hammer=Prid\u0117ti/nuimti legato
-action.note.effect.change-accentuated=Prid\u0117ti/nuimti akcent\u0105
-action.note.effect.change-dead=Prid\u0117ti/nuimti nuslopint\u0105 nat\u0105
-action.note.effect.change-fade-in=Prid\u0117ti/nuimti gars\u0117jim\u0105
-action.note.effect.change-ghost=Prid\u0117ti/nuimti prislopint\u0105j\u0105 nat\u0105
-action.note.effect.change-grace=Prid\u0117ti/nuimti for\u0161lag\u0105
-action.note.effect.change-harmonic=Prid\u0117ti/nuimti fla\u017Eolet\u0105
-action.note.effect.change-heavy-accentuated=Prid\u0117ti/nuimti ry\u0161k\u0173 akcent\u0105
-action.note.effect.change-palm-mute=Prid\u0117ti/nuimti slopinim\u0105 delnu
-action.note.effect.change-popping=Prid\u0117ti/nuimti \u201Epopping\u201C
-action.note.effect.change-slapping=Prid\u0117ti/nuimti \u201Eslapping\u201C
-action.note.effect.change-staccato=Prid\u0117ti/nuimti stakato
-action.note.effect.change-tapping=Prid\u0117ti/nuimti sm\u016Bgiavim\u0105 (tapping)
-action.note.effect.change-tremolo-bar=Prid\u0117ti/nuimti tremolo rankena
-action.note.effect.change-tremolo-picking=Prid\u0117ti/nuimti tremolo mediatoriumi
-action.note.effect.change-trill=Prid\u0117ti/nuimti trel\u0119
-action.insert.open-repeat=Pakartojimo pabaiga
-action.insert.close-repeat=Pakartojimo pabaiga
-action.insert.repeat-alternative=Volta
-action.insert.chord=\u012Eterpti akord\u0105
-action.insert.text=\u012Eterpti tekst\u0105
-action.marker.add=Prid\u0117ti gairel\u0119
-action.marker.go-next=Eiti iki kitos gairel\u0117s
-action.marker.go-previous=Eiti iki ankstesn\u0117s gairel\u0117s
-action.transport.play=Groti k\u016Brin\u012F
-action.transport.stop=Stabdyti grojim\u0105
-action.transport.mode=Grotuvo veiksena
-action.transport.metronome=Metronomas
-action.transport.set-loop-start=Nustatyti pakartojimo prad\u017Ei\u0105
-action.transport.set-loop-end=Nustatyti pakartojimo pabaig\u0105
-action.tools.browser=K\u016Brini\u0173 nar\u0161ykl\u0117
-action.tools.transpose=Nat\u0173 transponavimas
-action.settings.configure=Nuostatos
-action.help.doc=\u017Dinynas
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_nl.properties b/TuxGuitar-testing/platform-all/share/lang/messages_nl.properties
deleted file mode 100644
index f37b8ff2..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_nl.properties
+++ /dev/null
@@ -1,616 +0,0 @@
-ok=Ok
-cancel=Annuleren
-yes=Ja
-no=Nee
-add=Toevoegen
-edit=Bewerk
-remove=Verwijderen
-save=Opslaan
-exit=Afsluiten
-close=Sluiten
-choose=Selecteer
-color=Kleur
-title=Titel
-go=Ga
-warning=Waarschuwing
-error=Fout
-plugins=Plugins
-options=Opties
-defaults=Defaults
-clean=Wissen
-rename=Hernoem
-fret=Fret
-position=Positie
-name=Naam
-author=Auteur
-version=Versie
-description=Omschrijving
-info=Info
-configure=Configureer
-
-tuxguitar.title=TuxGuitar
-
-file=Bestand
-file.new=Nieuw
-file.open=Open
-file.save=Opslaan
-file.save-as=Opslaan Als
-file.save-changes-question=De track heeft niet opgeslagen wijzigingen.\nWilt u dit alsnog opslaan?
-file.exit=Afsluiten
-file.export=Exporteren
-file.export-midi=Exporteer MIDI
-file.export-pdf=Exporteer PDF
-file.print=Afdrukken
-file.print-preview=Afdruk Voorbeeld
-file.import=Importeren
-file.import-midi=Importeer MIDI
-file.export-ascii=Exporteer ASCII
-file.history=Geschiedenis
-file.open-url=Open URL
-file.open.error=Kan bestand niet openen: {0}
-file.save.error=Kan bestand niet openen: {0}
-file.import.error=Kan bestand niet Importeren: {0}
-file.export.error=Kan bestand niet Exporteren: {0}
-file.overwrite-question=Dit bestand bestaat al, wilt u dit overschrijven?
-
-edit.menu=Bewerken
-edit.undo=Ongedaan maken
-edit.redo=Opnieuw
-edit.copy=Kopieer
-edit.from=Van
-edit.to=Naar
-edit.all-tracks=Alle Tracks
-edit.paste=Plakken
-edit.paste.replace-mode=Plak in huidige maat
-edit.paste.insert-mode=Plak in nieuwe maat
-edit.delete=Verwijder
-edit.cut=Knippen
-edit.mouse-mode-selection=Selectie Modus
-edit.mouse-mode-edition=Score Bewerk Modus
-edit.not-natural-key=Sharp/Flat Modus
-
-view=Beeld
-view.layout=Layout
-view.layout.page=Pagina Layout
-view.layout.linear=Lineare Layout
-view.layout.compact=Compacte Layout
-view.layout.multitrack=Multitrack
-view.layout.chord-style=Akkoord Stijl
-view.layout.chord-name=Akkoord Naam 
-view.layout.chord-diagram=Akkoord Diagram
-view.layout.score-enabled=Laat Score zien
-view.layout.tablature-enabled=Bekijk TAB
-view.show-mixer=Bekijk Mixer
-view.show-fretboard=Bekijk Fretboard
-view.show-piano=Bekijk Piano
-view.show-matrix=Bekijk Matrix
-view.show-transport=Bekijk Speler
-
-fretboard.right-mode=Rechter modus
-fretboard.left-mode=Linker modus
-fretboard.background-color=Achtergrond Kleur
-fretboard.display-note-text=Tekst Noot Weergeven
-fretboard.display-scale-text=Tekst Scale Weergeven
-fretboard.font=Lettertype
-fretboard.fretpoint-color=Fret Kleur
-fretboard.note-color=Noot Kleur
-fretboard.scale-note-color=Noten Scale Kleur
-fretboard.settings=Fretboard Voorkeuren
-fretboard.string-color=String Kleur
-fretboard.settings.options=Opties
-
-piano.editor=Piano Editor
-piano.natural-key-color=Natuurlijke Key Kleur
-piano.not-natural-key-color=Onnatuurlijke Key Kleur
-piano.note-color=Noot Kleur
-piano.scale-note-color=Noten Scale Kleur
-piano.settings=Piano Voorkeuren
-
-matrix.editor=Matrix Editor
-matrix.grids=Aantal Grids
-matrix.border-color=Rand Kleur
-matrix.font=Lettertype
-matrix.foreground-color=Voorgrond Kleur
-matrix.line-color-1=Kleur Oneven Rij
-matrix.line-color-2=Kleur Even Rij
-matrix.line-color-over=Muis Over Rij Kleur
-matrix.note-color=Noot Kleur
-matrix.play-note-color=Afspeel Note Kleur
-matrix.position-color=Positie Kleur
-matrix.settings=Matrix Voorkeuren
-
-composition=Compositie
-composition.timesignature=Tijd Signature
-composition.timesignature.Numerator=Numerator
-composition.timesignature.denominator=Denominator
-composition.timesignature.to-the-end=Tot het eind
-composition.tempo=Tempo
-composition.tempo-percent=Percentage
-composition.tempo.invalid=Ongeldig Tempo
-composition.tempo.start-to-end=Voeg dit tempo toe op de hele track
-composition.tempo.position-to-end=Voeg dit tempo tot het eind toe
-composition.tempo.position-to-next=Voeg dit tempo toe tot de volgende tempo markering
-composition.properties=Eigenschappen
-composition.name=Naam
-composition.artist=Artiest
-composition.album=Album
-composition.author=Auteur
-composition.tripletfeel=Triplet Feel
-composition.clef=Clef
-composition.clef.treble=Treble
-composition.clef.bass=Bass
-composition.clef.tenor=Tenor
-composition.clef.alto=Alto
-composition.clef.to-the-end=Voeg deze clef toe tot het einde
-composition.keysignature=Key Signature
-composition.keysignature.natural=Natural
-composition.keysignature.sharp-1=1 Sharp
-composition.keysignature.sharp-2=2 Sharps
-composition.keysignature.sharp-3=3 Sharps
-composition.keysignature.sharp-4=4 Sharps
-composition.keysignature.sharp-5=5 Sharps
-composition.keysignature.sharp-6=6 Sharps
-composition.keysignature.sharp-7=7 Sharps
-composition.keysignature.flat-1=1 Flat
-composition.keysignature.flat-2=2 Flats
-composition.keysignature.flat-3=3 Flats
-composition.keysignature.flat-4=4 Flats
-composition.keysignature.flat-5=5 Flats
-composition.keysignature.flat-6=6 Flats
-composition.keysignature.flat-7=7 Flats
-composition.keysignature.to-the-end=Voeg deze key signature toe tot het einde
-composition.tripletfeel=Triplet Feel
-composition.tripletfeel.none=Geen Triplet Feel
-composition.tripletfeel.eighth=Triplet 8e
-composition.tripletfeel.sixteenth=Triplet 16e
-composition.tripletfeel.to-the-end=Voeg deze triplet feel toe tot het einde
-
-help=Help
-help.help=Help
-help.doc=Documentatie
-help.about=Info
-help.about.license=Licentie
-help.about.authors=Auteurs
-help.about.description=Omschrijving
-
-track=Track
-track.number=N°
-track.name=Naam
-track.color=Kleur
-track.first=Eerste Track
-track.last=Laatste Track
-track.previous=Vorige Track
-track.next=Volgende Track
-track.add=Voeg Track toe
-track.remove=Verwijder Track
-track.clone=Kloon Track
-track.move-up=Omhoog
-track.move-down=Omlaag
-track.instrument=Instrument 
-track.properties=Eigenschappen
-track.properties.general=Algemeen
-track.name.default-percussion-name=Slagwerk
-track.lyrics=Lyrics
-track.solo=Solo
-track.mute=Mute
-
-lyric.editor=Lyric Editor
-
-measure=Maat
-measure.first=Eerste maat
-measure.last=Laatste maat
-measure.previous=Vorige maat
-measure.next=Volgende maat
-measure.add=Voeg maat Toe
-measure.add-before-current-position=Voeg maat toe VOOR de huidige positie
-measure.add-after-current-position=Voeg maat toe NA de huidige positie
-measure.add-at-end=Voeg maat toe aan het einde
-measure.remove=Verwijder maat
-measure.copy=Kopieer maat
-measure.paste=Plak maat
-measure.clean=Wis maat
-
-duration=Duratie
-duration.whole=Helemaal
-duration.half=Half
-duration.quarter=Kwart
-duration.eighth=8e
-duration.sixteenth=16e
-duration.thirtysecond=32e
-duration.sixtyfourth=64e
-duration.dotted=Dotted
-duration.doubledotted=Dubbel Dotted
-duration.division-type=Tupleto
-
-dynamic=Dynamisch
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Effecten
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Dode Noot
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo Bar     
-effects.tremolo-bar-editor=Tremolo Bar Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Terug
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Geaccentueerde Noot
-effects.heavyaccentuatednote=Sterk Geaccentueerde Noot
-effects.harmonic=Harmonisch
-effects.grace=Grace Noot
-effects.grace-editor=Grace Noot Editor
-effects.grace.before-beat=Before beat
-effects.grace.on-beat=On beat
-effects.grace.transition=Transition
-effects.grace.transition-none=Geen
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo Picking
-effects.tremolo-picking-editor=Tremolo Picking Editor
-effects.palm-mute=Palm Mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Fade In  
-effects.harmonic-editor=Harmonic Editor
-effects.harmonic.type-of-harmonic=Type of Harmonic
-effects.harmonic.natural=Natural Harmonic
-effects.harmonic.artificial=Artificial Harmonic
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=Left Hand
-effects.harmonic.tapped.right-hand=Right Hand
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=Semi Harmonic
-
-bend.editor=Bend Editor
-bend.bend=Bend
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Speler
-transport.start=Start
-transport.stop=Stop
-transport.pause=Pauze
-transport.first=Eerste
-transport.last=Laatste
-transport.previous=Vorige
-transport.next=Volgende
-transport.metronome=Metronome
-transport.mode=Afspeel Modus
-transport.mode.simple=Simple Modus
-transport.mode.simple.tempo-percent=Percentage van tempo
-transport.mode.simple.loop=Speel looped
-transport.mode.trainer=Training Modus
-transport.mode.trainer.increment-description=Geincrementeerd door
-
-instruments.volume=Gain
-instrument.volume=Volume
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=Balance
-instrument.free=Free
-instrument.link=Link
-
-
-repeat.open=Open Repeat
-repeat.close=Sluit Repeat
-repeat.alternative=Alternatieve Repeats
-repeat.alternative.editor=Bewerk Alternatieve Repeats
-repetitions=Repetities
-repeat.number-of-repetitions=Aantal Repetities
-
-beat=Beat
-beat.clean=Wis Beat
-
-note=Noot
-note.semitone-up=Semitone Omhoog
-note.semitone-down=Semitone Omlaag
-note.shift-up=Shift Omhoog
-note.shift-down=Shift Omlaag
-note.tiednote=Gekoppelde Noot
-note.deadnote=Dode Noot
-
-insert.chord=Voeg Akkoord toe
-chord.editor=Akkoord Editor
-chord=Akkoord
-chord.name=Naam
-chord.bass=Bass
-chord.custom=Handmatig Akkoord
-chord.custom.name-empty-error=Akkoord naam mag niet leeg zijn
-chord.custom.name-exist-error=Akkoord naam bestaat al
-chord.settings.tip=Handmatige Instellingen
-chord.settings.type=Type
-chord.settings.type.most-common=Meest Voorkomende
-chord.settings.type.inversions=Inversies
-chord.settings.type.close-voiced=Sluit Voiced
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Open Akkoorden
-chord.settings.chords-to-display=Zichtbare Akkoorden
-chord.settings.search-frets=Zoek Frets
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=Percussion Track
-
-tuning=Tuning
-tuning.strings=Strings
-tuning.offset=Offset
-
-language=Taal
-
-choose-color=Kies een kleur
-
-settings=Instellingen
-settings.config=Instellingen TuxGuitar
-settings.config.language=Taal
-settings.config.language.choose=Kies Taal
-settings.config.styles=Stijlen
-settings.config.styles.general=Algemene Stijlen
-settings.config.styles.printer=Printer Stijlen
-settings.config.styles.font.default=Standaard Lettertype
-settings.config.styles.font.note=Noot Lettertype
-settings.config.styles.font.lyric=Lyrics Lettertype
-settings.config.styles.font.text=Tekst Lettertype
-settings.config.styles.font.time-signature=Tijd Signature Lettertype
-settings.config.styles.font.printer-default=Printer Standaard Lettertype
-settings.config.styles.font.printer-note=Printer Noot Lettertype
-settings.config.styles.font.printer-time-signature=Printer Tijd Signature Lettertype
-settings.config.styles.color.score-note=Score Noot Kleur
-settings.config.styles.color.tab-note=Tab Noot Kleur
-settings.config.styles.color.play-note=Afspeel Noot Kleur
-settings.config.apply-changes-question=Wilt u deze instellingen nu toepassen?
-settings.config.sound=Geluid
-settings.config.main=Algemeen
-settings.config.main.window-title=Venster Titel
-settings.config.main.window-title.help=De volgende variabelen worden in de venster titel geplaatst:
-settings.config.main.window-title.var.description.appname=Applicatie Naam: TuxGuitar
-settings.config.main.window-title.var.description.appversion=In deze variabele staat de versie van TuxGuitar
-settings.config.main.window-title.var.description.filename=In deze variabele staat de naam van de geopende file
-settings.config.main.window-title.var.description.filepath=In deze variabele staat het pad van de geopende file
-settings.config.main.window-title.var.description.songname=In deze variabele staat de naam van het Nummer
-settings.config.main.window-title.var.description.songauthor=In deze variabele staat de naam van de Auteur van het Nummer
-settings.config.main.window-title.var.description.songalbum=In deze variabele staat de naam van het Album
-settings.config.main.window-title.var.description.songartist=In deze variabele staat de naam van de Artiest
-settings.config.main.options=Opties
-settings.config.main.splash-enabled=Laat opstart animatie (splash) zien
-settings.config.main.table.auto-size.enabled=Automatisch tabellen resizen 
-settings.config.styles.color.lines=Horizontale Lijn Kleur
-settings.config.toolbars=Werkbalken
-settings.config.toolbars.tip=Werkbalk Aanpassen
-settings.config.toolbars.list=Beschikbare Werkbalken
-settings.config.toolbars.move-up=Omhoog
-settings.config.toolbars.move-down=Omlaag
-settings.config.skin=Thema
-settings.config.skin.choose=Kies een Thema
-settings.keybindings=Configureer Sneltoetsen
-
-key-bindings-editor=Sneltoest Editor
-key-bindings-editor-action-select=Selecteer een Actie
-key-bindings-editor-action-column=Acties
-key-bindings-editor-shortcut-column=Toetsen
-key-bindings-editor-push-a-key=Druk op een Toets
-key-bindings-editor-save-question=Er zijn wijzigingen aangebracht, wilt u deze Opslaan?
-
-key-bindings-editor-override=Snelkoppeling is al in gebruik! Wilt u deze wijziging toch doorvoeren?
-
-print.print=Print
-print.dialog=Print
-print.service=Service
-print.service.name=Naam
-print.service.status=Status
-print.service.type=Type
-print.service.info=Info
-print.range=Bereik
-print.range.all-pages=Alle
-print.range.pages=Paginas
-print.range.pages-to=Naar
-print.copies=Kopieen
-print.copies-number=Aantal Kopieen
-print.print-to-file=Print naar bestand
-print.file-chooser=Kies
-print-header.default-song-name=Naamloos
-print-header.default-song-author=Anoniem
-
-print.preview=Afdruk Voorbeeld
-print.preview.page-of=Of
-
-marker=Aanwijzer
-marker.add=Aanwijzer Toevoegen
-marker.list=Aanwijzer Lijst
-marker.first=Ga naar eerst Aanwijzer
-marker.last=Ga naar laatste Aanwijzer
-marker.next=Ga naar volgende Aanwijzer
-marker.previous=Ga naar vorige Aanwijzer
-
-export.tablature-enabled=Laat Tablature zien
-export.score-enabled=Laat Score zien
-
-scale=Scale
-scale.list=Scale Lijst
-
-text.insert=Tekst Invoegen
-text.editor=Tekst Editor
-text.text=Tekst
-
-tools=Extra's
-tools.scale=Scale Lijst
-tools.browser=Browser
-tools.plugins=Plugins
-tools.shortcuts=Snelkoppelingen
-tools.settings=Instellingen
-
-browser.dialog=Browser
-browser.menu.file=Bestand
-browser.open=Open
-browser.exit=Sluit
-browser.menu.collection=Collectie
-browser.menu.go=Ga
-browser.collection.select=Selecteer Collectie
-browser.collection.open=Open
-browser.collection.remove=Verwijder
-browser.collection.close=Sluit
-browser.collection.new=Nieuw
-browser.go-root=Home
-browser.go-back=Terug
-browser.refresh=Ververs
-browser.factory.fs.name=Bestandssysteem
-browser.collection.fs.name=Naam
-browser.collection.fs.path=Map
-browser.collection.fs.editor-title=Bestandssysteem Collectie
-browser.collection.fs.editor-tip=Kies een Collectie Map
-browser.collection.fs.invalid-path=Selecteer een correcte Map
-
-midi.port=MIDI Port
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=Niet beschikbaar
-plugin.column.name=Plugin Naam
-plugin.column.enabled=Ingschakeld
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Bestand Items
-edit.items=Bewerk Items
-property.items=Eigenschappen Items
-track.items=Track Items
-duration.items=Duratie Items
-beat.items=Noot Items
-composition.items=Compositie Items
-repeat.items=Herhaal Items
-transport.items=Speel Items Af
-marker.items=Aanwijzer Items
-insert.items=Voeg Items Toe
-layout.items=Layout Items
-view.items=Bekijk Items
-effect.items=Effecten Items
-dynamic.items=Dynamische Items
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nieuw Bestand
-action.file.open=Open Bestand
-action.file.open-url=Open URL
-action.file.save=Opslaan
-action.file.save-as=Opslaan Als
-action.file.print=Print
-action.file.print-preview=Afdruk Voorbeeld
-action.file.exit=Sluit TuxGuitar Af
-action.edit.undo=Ongedaan Maken
-action.edit.redo=Opnieuw
-action.composition.change-time-signature=Wijzig Tijd Signature
-action.composition.change-tempo=Wijzig Tempo
-action.composition.change-info=Wijzig Nummer Informatie
-action.composition.change-clef=Wijzig Clef
-action.composition.change-key-signature=Wijzig Key Signature
-action.composition.change-triplet-feel=Wijzig Triplet Feel
-action.view.layout-set-page=Pagina Layout
-action.view.layout-set-linear=Lineare Layout
-action.view.layout-set-multitrack=Multitrack Mode
-action.view.layout-set-score-enabled=Score
-action.view.layout-set-tablature-enabled=Tablature
-action.view.layout-set-compact=Compacte Modus
-action.view.layout-set-chord-diagram-enabled=Akkoord Diagram Aanzetten
-action.view.layout-set-chord-name-enabled=Akkoord Naam Aanzetten
-action.view.show-fretboard=Fretboard
-action.view.show-piano=Piano
-action.view.show-matrix=Matrix
-action.view.show-mixer=Mixer
-action.view.show-transport=Player
-action.track.add=Track Toevoegen
-action.track.remove=Track Verwijderen
-action.track.clone=Track Klonen
-action.track.go-first=Ga naar eerste Track
-action.track.go-last=Go naar laatste Track
-action.track.go-next=Ga naar volgende Track
-action.track.go-previous=Ga naar vorige Track
-action.track.lyrics=Bewerk Track lyrics
-action.track.properties=Wijzig Track Eigenschappen
-action.track.move-down=Omlaag
-action.track.move-up=Omhoog
-action.measure.add=Maat Toevoegen
-action.measure.remove=Maat Verwijderen
-action.measure.copy=Maat Kopieeren
-action.measure.paste=Maat Plakken
-action.measure.clean=Maat Wissen
-action.measure.go-first=Ga naar eerst maat
-action.measure.go-last=Ga naar laatste maat
-action.measure.go-next=Ga naar volgende maat
-action.measure.go-previous=Ga naar vorige maat
-action.note.general.clean-beat=Wis Beat
-action.note.general.decrement-semitone=Decrementeer Semitone
-action.note.general.increment-semitone=Incrementeer Semitone
-action.note.general.shift-down=Schuif Omloog
-action.note.general.shift-up=Schuif Omhoog
-action.note.general.tied=Toevoegen/Verwijderen Koppeling
-action.note.duration.set-whole=Stel Hele Duratie in
-action.note.duration.set-half=Stel 1/2 Duratie in
-action.note.duration.set-quarter=Stel 1/4 Duratie in
-action.note.duration.set-eighth=Stel 1/8 Duratie in
-action.note.duration.set-sixteenth=Stel 1/16 Duratie in
-action.note.duration.set-thirty-second=Zet Duratie op 30 sec
-action.note.duration.set-sixty-fourth=Zet Duratie op 64 sec
-action.note.duration.change-dotted=Toevoegen/Verwijderen Stip
-action.note.duration.change-double-dotted=Toevoegen/Verwijderen Dubbele Stip
-action.note.duration.change-division-type=Toevoegen/Verwijderen Tupleto
-action.note.duration.decrement-duration=Decrementeer Duratie
-action.note.duration.increment-duration=Incrementeer Duratie
-action.note.effect.change-vibrato=Toevoegen/Verwijderen Vibrato
-action.note.effect.change-bend=Toevoegen/Verwijderen Bend
-action.note.effect.change-slide=Toevoegen/Verwijderen Slide
-action.note.effect.change-hammer=Toevoegen/Verwijderen hammer-on/pull-off
-action.note.effect.change-accentuated=Toevoegen/Verwijderen Accent
-action.note.effect.change-dead=Toevoegen/Verwijderen Dode Noten
-action.note.effect.change-fade-in=Toevoegen/Verwijderen Fade In
-action.note.effect.change-ghost=Toevoegen/Verwijderen Ghost
-action.note.effect.change-grace=Toevoegen/Verwijderen Grace
-action.note.effect.change-harmonic=Toevoegen/Verwijderen Harmonisch
-action.note.effect.change-heavy-accentuated=Toevoegen/Verwijderen Sterk Geaccentueerd
-action.note.effect.change-palm-mute=Toevoegen/Verwijderen Palm Mute
-action.note.effect.change-popping=Toevoegen/Verwijderen Popping
-action.note.effect.change-slapping=Toevoegen/Verwijderen Slapping
-action.note.effect.change-staccato=Toevoegen/Verwijderen Staccato
-action.note.effect.change-tapping=Toevoegen/Verwijderen Tapping
-action.note.effect.change-tremolo-bar=Toevoegen/Verwijderen tremolo balk
-action.note.effect.change-tremolo-picking=Toevoegen/Verwijderen Tremolo Picking
-action.note.effect.change-trill=Toevoegen/Verwijderen Trill
-action.insert.open-repeat=Open Repeat
-action.insert.close-repeat=Sluit Repeat
-action.insert.repeat-alternative=Repeat Alternatief
-action.insert.chord=Akkoord Toevoegen
-action.insert.text=Tekst Toevoegen
-action.marker.add=Aanwijzer Toevoegen
-action.marker.go-next=Volgende Aanwijzer
-action.marker.go-previous=Vorige Aanwijzer
-action.transport.play=Speel Nummer
-action.transport.stop=Stop Spelen
-action.transport.mode=Player Modus
-action.transport.metronome=Metrononome
-action.tools.browser=Browser
-action.settings.configure=Instellingen
-action.help.doc=Help
-
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_pl.properties b/TuxGuitar-testing/platform-all/share/lang/messages_pl.properties
deleted file mode 100644
index b7a9c94b..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_pl.properties
+++ /dev/null
@@ -1,702 +0,0 @@
-es=hiszpa\u0144ski
-en=angielski
-fr=francuski
-pl=polski
-de=niemiecki
-pt=portugalski
-
-ok=Ok
-cancel=Anuluj
-yes=Tak
-no=Nie
-add=Dodaj
-remove=Usu\u0144
-save=Zapisz
-exit=Wyj\u015bcie
-color=Kolor	
-title=Tytu\u0142
-edit=Edycja
-go=Id\u017a
-error=B\u0142\u0105d
-warning=Uwaga
-plugins=Wtyczki
-choose=Wyb\u00f3r
-options=Opcje
-defaults=Domy\u015blne
-clean=Wyczy\u015b\u0107
-rename=Zmie\u0144 nazw\u0119
-fret=Pr\u00f3g
-position=Pozycja
-
-tuxguitar.title=Tux-Guitar
-
-file=Plik
-file.new=Nowy
-file.open=Otw\u00f3rz
-file.save=Zapisz
-file.save-as=Zapisz jako
-file.exit=Wyj\u015bcie
-file.export=Eksport
-file.export-midi=Eksport do midi
-file.export-pdf=Eksport do pdf
-file.export-ascii=Eksport do ASCII
-file.print=Drukuj
-file.print-preview=Podgl\u0105d wydruku
-file.import=Import
-file.import-midi=Import z Midi
-file.history=Historia
-file.overwrite-question=Plik istnieje, nadpisa\u0107 go ??
-
-edit.undo=Cofnij
-edit.redo=Przywr\u00f3\u0107
-edit.copy=Kopiuj
-edit.from=Od
-edit.to=Do
-edit.all-tracks=Wszystkie \u015bcie\u017cki
-edit.paste=Wstaw
-edit.paste.count=Ilo\u015b\u0107 wstawianych
-edit.paste.replace-mode=Wstaw w bie\u017c\u0105cym takcie
-edit.paste.insert-mode=Wstaw w nowym takcie
-edit.delete=Usu\u0144
-edit.cut=Wytnij
-edit.menu=Edycja
-edit.mouse-mode-selection=Tryb zaznaczania
-edit.mouse-mode-edition=Tryb edycji
-edit.not-natural-key=Krzy\u017cyk/Bemol
-edit.voice-1=Wybierz g\u0142os 1
-edit.voice-2=Wybierz g\u0142os 2
-
-view=Podgl\u0105d
-
-view.layout=Widok
-view.layout.page=Uk\u0142ad strony
-view.layout.linear=Uk\u0142ad liniowy
-view.layout.multitrack=Wielo\u015bcie\u017ckowy
-view.layout.score-enabled=Poka\u017c zapis nutowy
-
-view.show-transport=Poka\u017c odtwarzacz
-view.show-mixer=Poka\u017c mikser
-view.show-piano=Poka\u017c klawiatur\u0119
-view.show-fretboard=Poka\u017c podstrunnic\u0119
-fretboard.right-mode=Prawor\u0119czna
-fretboard.left-mode=Lewor\u0119czna
-
-composition=Kompozycja
-composition.timesignature=Metrum
-composition.timesignature.Numerator=Liczba warto\u015bci
-composition.timesignature.denominator=Podstawa metryczna
-composition.timesignature.to-the-end=Do ko\u0144ca
-composition.tempo=Tempo
-composition.tempo-percent=Procent
-composition.properties=W\u0142a\u015bciwo\u015bci
-
-
-composition.album=Album
-composition.author=Autor
-composition.date=Data
-composition.copyright=Prawa autorskie
-composition.writer=Tw\u00f3rca tabulatury
-composition.transcriber=Autor transkrypcji
-composition.comments=Komentarz
-composition.tempo.invalid=Niepoprawne tempo
-composition.clef=Klucz
-composition.clef.treble=Wiolinowy
-composition.clef.bass=Basowy
-composition.clef.tenor=Tenorowy
-composition.clef.alto=Altowy
-composition.clef.to-the-end=U\u017cywaj tego klucza do ko\u0144ca
-composition.keysignature=Tonacja
-composition.keysignature.natural=Bez znak\u00f3w
-composition.keysignature.sharp-1=1 Krzy\u017cyk
-composition.keysignature.sharp-2=2 Krzy\u017cyki
-composition.keysignature.sharp-3=3 Krzy\u017cyki
-composition.keysignature.sharp-4=4 Krzy\u017cyki
-composition.keysignature.sharp-5=5 Krzy\u017cyki
-composition.keysignature.sharp-6=6 Krzy\u017cyki
-composition.keysignature.sharp-7=7 Krzy\u017cyki
-composition.keysignature.flat-1=1 Bemol
-composition.keysignature.flat-2=2 Bemole
-composition.keysignature.flat-3=3 Bemole
-composition.keysignature.flat-4=4 Bemole
-composition.keysignature.flat-5=5 Bemole
-composition.keysignature.flat-6=6 Bemole
-composition.keysignature.flat-7=7 Bemole
-composition.keysignature.to-the-end=U\u017cywaj tej tonacji do ko\u0144ca
-composition.tripletfeel=Rytm triolowy
-composition.tripletfeel.none=R\u00f3wny rytm
-composition.tripletfeel.eighth=Triole \u00f3semkowe
-composition.tripletfeel.sixteenth=Triole szesnastkowe
-composition.tripletfeel.to-the-end=U\u017cywaj rytmu triolowego do ko\u0144ca
-
-help=Pomoc
-help.help=Pomoc
-help.about=O programie
-
-instruments.volume=Nat\u0119\u017cenie
-instrument.volume=G\u0142o\u015bno\u015b\u0107
-instrument.channel=Kana\u0142
-instrument.effect-channel=Efekty
-instrument.balance=Balans
-instrument.free=Wolny
-instrument.link=Link
-
-track=\u015acie\u017cka
-track.number=Nr
-track.name=Nazwa
-track.color=Kolor
-track.first=Pierwsza \u015bcie\u017cka
-track.last=Ostatnia \u015bcie\u017cka
-track.previous=Poprzednia \u015bcie\u017cka
-track.next=Nast\u0119pna \u015bcie\u017cka
-track.add=Dodaj \u015bcie\u017ck\u0119
-track.remove=Usu\u0144 \u015bcie\u017ck\u0119
-track.instrument=Instrument
-track.instrument.empty=Nie znaleziono banku brzmie\u0144 w Twoim systemie. Spr\u00f3buj przekompilowa\u0107 TuxGuitar u\u017cywaj\u0105 Twojej wersji Java-y.
-track.properties=W\u0142a\u015bciwo\u015bci
-track.properties.general=Og\u00f3lne
-track.clone=Powiel \u015bcie\u017ck\u0119
-track.move-up=Przesu\u0144 w g\u00f3r\u0119
-track.move-down=Przesu\u0144 w d\u00f3\u0142
-track.name.default-percussion-name=Perkusja
-track.lyrics=S\u0142owa
-track.solo=Solo
-track.mute=Wycisz
-
-lyric.editor=Edytor s\u0142\u00f3w
-
-measure=Takt
-measure.first=Pierwszy takt
-measure.last=Ostatni takt
-measure.previous=Poprzedni takt
-measure.next=Nast\u0119pny takt
-measure.remove=Usu\u0144 takt
-measure.copy=Kopiuj takt
-measure.paste=Wstaw takt
-measure.add=Dodaj takt
-measure.add.count=Ilo\u015b\u0107 dodanych
-measure.add-before-current-position=Dodaj takt przed bie\u017c\u0105cym
-measure.add-after-current-position=Dodaj takt za bie\u017c\u0105cym
-measure.add-at-end=Dodaj takt na ko\u0144cu
-measure.clean=Wyczy\u015b\u0107 takt
-
-beat=Nuta
-beat.clean=Wyczy\u015b\u0107 warto\u015b\u0107
-beat.voice.remove-unused=Usu\u0144 nieu\u017cywany g\u0142os
-beat.voice-up=Laski nut do g\u00f3ry
-beat.voice-down=Laski nut w d\u00f3\u0142
-beat.voice-auto=Automatyczny kierunek u\u0142o\u017cenia lasek
-beat.stroke-up=Uderzenie strun w g\u00f3r\u0119
-beat.stroke-down=Uderzenie strun w d\u00f3\u0142
-beat.move-left=Przesu\u0144 jedno uderzenie w lewo
-beat.move-right=Przesu\u0144 jedno uderzenie w prawo
-beat.move-custom=Zaawansowane przesuni\u0119cie
-beat.move-custom.dialog.title=Zaawansowane przesuni\u0119cie
-beat.move-custom.dialog.direction-tip=Kierunek przesuni\u0119cia
-beat.move-custom.dialog.move-1.tip=Pierwsze przesuni\u0119cie
-beat.move-custom.dialog.move-2.tip=Drugie przesuni\u0119cie
-beat.move-custom.dialog.direction=Kierunek
-beat.move-custom.dialog.direction.right=Przesu\u0144 w prawo
-beat.move-custom.dialog.direction.left=Przesu\u0144 w lewo
-beat.move-custom.dialog.count=Ilo\u015b\u0107
-beat.move-custom.dialog.duration=Kierunek
-beat.move-custom.dialog.duration.type=Kropka/podw\u00f3jna kropka
-beat.move-custom.dialog.duration.type.normal=Brak
-beat.move-custom.dialog.duration.division-type=Rodzaj podzia\u0142u
-beat.move-custom.dialog.duration.division-type.normal=Normalny(triolowy)
-
-note.semitone-up=P\u00f3\u0142 tonu w g\u00f3r\u0119
-note.semitone-down=P\u00f3\u0142 tonu w d\u00f3\u0142
-note.shift-up=Oktaw\u0119 w g\u00f3r\u0119
-note.shift-down=Oktaw\u0119 w d\u00f3\u0142
-chord=Akord
-chord.name=Nazwa akordu
-chord.custom.name-empty-error=Musisz zdefiniowa\u0107 jak\u0105\u015b nazw\u0119 dla akordu
-chord.custom.name-exist-error=Taka nazwa akordu ju\u017c istnieje.
-dynamic=Dynamika
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano
-dynamic.mezzo-forte=Mezzo Forte
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo
-dynamic.forte-fortissimo=Forte Fortissimo
-duration=Warto\u015b\u0107
-duration.whole=ca\u0142a nuta
-duration.half=p\u00f3\u0142nuta
-duration.quarter=\u0107wier\u0107nuta
-duration.eighth=\u00f3semka
-duration.sixteenth=szestnastka
-duration.thirtysecond=trzydziestodw\u00f3jka
-duration.sixtyfourth=sze\u015b\u0107dziesi\u0119cioczw\u00f3rka
-duration.dotted=kropka
-duration.doubledotted=Podw\u00f3jna kropka
-duration.division-type=Triola
-effects=Efekty
-effects.vibrato=Wibrato
-effects.bend=Podci\u0105ganie
-effects.deadnote=St\u0142umiona nuta
-effects.slide=Glissando (Slide)
-effects.hammer=Legato (Hammer-on/Pull-off)
-
-effects.tremolo-bar-editor=Edytor efekt\u00f3w tremola
-effects.tremolo-bar.dip=Obni\u017cenie
-effects.tremolo-bar.dive=Opuszczenie w d\u00f3\u0142
-effects.tremolo-bar.release-up=Zwolnienie z g\u00f3ry
-effects.tremolo-bar.release-down=Zwolnienie z do\u0142u
-effects.tremolo-bar.inverted-dip=Podci\u0105gni\u0119cie
-effects.tremolo-bar.return=Powr\u00f3t
-effects.ghostnote=Cicha nuta("duch")
-effects.accentuatednote=Akcent
-effects.heavyaccentuatednote=Mocny akcent
-effects.harmonic=Floa\u017colet
-effects.grace=Przednutka
-effects.grace-editor=Edytor przednutek
-effects.grace.before-beat=Przed g\u0142\u00f3wn\u0105 warto\u015bci\u0105
-effects.grace.on-beat=Na g\u0142\u00f3wnej warto\u015bci
-effects.grace.transition=Artykulacja
-effects.grace.transition-none=Naturalnie
-effects.grace.transition-bend=Podci\u0105gni\u0119cie
-effects.grace.transition-slide=Glissando
-effects.grace.transition-hammer=Legato
-effects.trill=Ozdobnik
-effects.trill-editor=Edytor ozdobnik\u00f3w
-effects.tremolo-picking=Uderzenie tremolo
-effects.tremolo-picking-editor=Edytor uderze\u0144 tremolo
-effects.palm-mute=T\u0142umienie d\u0142oni\u0105(pizzicato)
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slap("klang")
-effects.popping=Popping(Bartok pizz.)
-effects.fade-in=Zg\u0142a\u015bniane
-effects.harmonic-editor=Edytor fla\u017colet\u00f3w
-effects.harmonic.type-of-harmonic=Rodzeje fla\u017colet\u00f3w
-effects.harmonic.natural=Fla\u017colety naturalne
-effects.harmonic.artificial=Sztuczne fla\u017colety
-effects.harmonic.artificial.key-offset=Przesuni\u0119cie
-effects.harmonic.tapped=Fla\u017colety tapping
-effects.harmonic.tapped.left-hand=Lewa r\u0119ka
-effects.harmonic.tapped.right-hand=Prawa r\u0119ka
-effects.harmonic.pinch=Fla\u017colety wyciskane
-effects.harmonic.semi=P\u00f3\u0142-fla\u017colety
-
-bend.editor=Typ podci\u0105gania
-bend.bend=podci\u0105ganie
-bend.bend-release=podci\u0105ganie/powr\u00f3t
-bend.bend-release-bend=podci\u0105ganie/powr\u00f3t/podci\u0105ganie
-bend.prebend=podci\u0105ganie przed uderzeniem
-bend.prebend-release=podci\u0105ganie przed uderzeniem/powr\u00f3t
-
-transport=Odtwarzanie
-transport.start=Start
-transport.stop=Stop
-transport.mode.loop-range=Zakres powtarzania
-transport.mode.loop-range.from=Odtwarzaj od taktu
-transport.mode.loop-range.from-default=Odtwarzaj od pocz\u0105tku
-transport.mode.loop-range.to=Odtwarzaj do taktu
-transport.mode.loop-range.to-default=Do ko\u0144ca
-transport.set-loop-start=Ustaw pocz\u0105tkowe miejsce powt\u00f3rki
-transport.set-loop-end=Ustaw ko\u0144cowe miejsce powt\u00f3rki
-
-repeat.open=Pocz\u0105tek repetycji
-repeat.close=Koniec repetycji
-repetitions=Repetycje
-repeat.number-of-repetitions=Ilo\u015b\u0107 powt\u00f3rek
-
-note.tiednote=Ligatura
-note.deadnote=T\u0142umiona nuta
-insert.chord=Wstaw akord
-chord.editor=Eytor akord\u00f3w
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=\u015acie\u017cka perkusyjna
-
-tuning=Strojenie
-tuning.strings=Struny
-tuning.offset=Przesuni\u0119cie
-tuning.strings.transpose=Transpose afected notes.
-tuning.strings.transpose.try-keep-strings=Pr\u00f3buj zachowa\u0107 d\u017awi\u0119ki na tej samej strunie
-tuning.strings.transpose.apply-to-chords=Transponuj akordy
-
-language=J\u0119zyk
-
-choose-color=Wybie\u017c kolor
-
-
-settings=Ustawienia
-settings.config=Konfiguracja TuxGuitar
-settings.config.main=Og\u00f3lne
-settings.config.main.window-title=Tytu\u0142 okna
-settings.config.main.window-title.help=Poni\u017csze wyra\u017cenia b\u0119d\u0105 pokazywane w tytule okna:
-settings.config.main.window-title.var.description.appname=Ta zmienna reprezentuje nazw\u0119 programu: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Ta zmienna reprezentuje wersj\u0119 TuxGuitar
-settings.config.main.window-title.var.description.filename=Ta zmienna reprezentuje nazw\u0119 otwartego pliku
-settings.config.main.window-title.var.description.filepath=Ta zmienna reprezentuje \u015bcie\u017ck\u0119 do pliku
-settings.config.main.window-title.var.description.songname=Ta zmienna reprezentuje tytu\u0142 utworu
-settings.config.main.window-title.var.description.songauthor=Ta zmienna reprezentuje kompozytora utworu
-settings.config.main.window-title.var.description.songalbum=Ta zmienna reprezentuje album utworu
-settings.config.main.window-title.var.description.songartist=Ta zmienna reprezentuje autora opracowania
-settings.config.main.options=Opcje
-settings.config.main.splash-enabled=Poka\u017c obrazek podczas uruchamiania programu
-settings.config.view=Widok
-settings.config.view.mode=Tryb widoku
-settings.config.view.size=Wielko\u015b\u0107 okna
-settings.config.view.size.maximized=Maksymalny
-settings.config.view.size.width=Szeroko\u015b\u0107
-settings.config.view.size.height=Wysoko\u015b\u0107
-settings.config.language=J\u0119zyk
-settings.config.language.choose=Wybierz sw\u00f3j j\u0119zyk
-settings.config.styles=Style
-settings.config.styles.font.default=Domy\u015blna czcionka
-settings.config.styles.font.note=Czcionka dla nut
-settings.config.styles.font.time-signature=Czcionka dla metrum
-settings.config.styles.font.printer-default=Domy\u015blna czcionka dla wydruku
-settings.config.styles.font.printer-note=Czcionka dla nut na wydruku
-settings.config.styles.font.printer-time-signature=Czcionka dla metrum na wydruku
-settings.config.styles.color.score-note=Kolor nut na pi\u0119ciolini
-settings.config.styles.color.tab-note=Kolor cyfr w tabulaturze
-settings.config.styles.color.play-note=Kolor podczas odtwarzania
-settings.config.styles.color.lines=Kolor linii tabulatury i pieciolinii
-settings.config.toolbars=Paski narz\u0119dzi
-settings.config.apply-changes-question=Czy chcesz zatwierdzi\u0107 teraz zmiany?
-settings.config.sound=D\u017awi\u0119k
-settings.config.sound.soundbank=Bank d\u017awi\u0119k\u00f3w
-settings.config.sound.default-soundbank=U\u017cywaj domy\u015blnego banku d\u017awi\u0119k\u00f3w
-settings.config.sound.custom-soundbank=U\u017cywaj w\u0142asnego banku d\u017awi\u0119k\u00f3w
-settings.config.sound.soundbank-restart-message=Uruchom ponownie TuxGuitar aby zmiany przynios\u0142y efekt.
-soundbank.error=B\u0142\u0105d banku d\u017awi\u0119k\u00f3w
-soundbank.error.unavailable=B\u0142\u0105d banku d\u017awi\u0119k\u00f3w
-soundbank.error.custom=Nie mog\u0119 otworzy\u0107 wskazanego pliku z bankiem d\u017awi\u0119k\u00f3w.
-
-settings.keybindings=Konfiguracja skr\u00f3t\u00f3w
-key-bindings-editor=Edytor skr\u00f3t\u00f3w klawaiturowych
-key-bindings-editor-action-select=Wybierz akcj\u0119
-key-bindings-editor-action-column=Akcje
-key-bindings-editor-shortcut-column=Klawisze
-key-bindings-editor-push-a-key=Naci\u015bnij klawisz
-key-bindings-editor-save-question=Zmiany nie zosta\u0142y zachowane, checesz wyj\u015b\u0107 bez zapisywania ??
-
-key-bindings-editor-override=Ten skr\u00f3t jest ju\u017c w u\u017cyciu. Czy na pewno chcesz przypisa\u0107 do niego inn\u0105 akcj\u0119 ?
-
-
-
-print.print=Drukuj
-print.dialog=Drukuj
-print.service=Drukarka
-print.service.name=Nazwa
-print.service.status=Status
-print.service.type=Typ
-print.service.info=Informacja
-print.range=Zakres
-print.range.all-pages=Wszystkie
-print.range.pages=Strony
-print.range.pages-to=Do
-print.copies=Kopie
-print.copies-number=Liczba kopii
-print.print-to-file=Drukuj do pliku
-print.file-chooser=Wybierz
-print-header.default-song-name=Tabulaturka
-print-header.default-song-author=Anonim
-print.preview=Podgl\u0105d wydruku
-
-marker=Znacznik
-marker.add=Dodaj Znacznik
-marker.list=Poka\u017c Znaczniki
-marker.first=Id\u017a do pierwszego znacznika
-marker.last=Id\u017a do ostatniego znacznika
-marker.next=Id\u017a do nast\u0119pnego znacznika
-marker.previous=Id\u017a do poprzedniego znacznika
-
-export.tablature-enabled=Poka\u017c tabulatur\u0119
-export.score-enabled=Poka\u017c zapis nutowy
-export.black-and-white=Tryb czarno-bia\u0142y
-
-scale=Skala
-scale.list=Lista skal
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Pasek dzia\u0142a\u0144 na plikach
-edit.items=Pasek edycji
-property.items=Pasek w\u0142a\u015bciwo\u015bci
-track.items=Pasek \u015bcie\u017cek
-duration.items=Pasek warto\u015bci rytm.
-beat.items=Pasek nut
-composition.items=Pasek utworu
-repeat.items=Pasek repetycji
-transport.items=Pasek odtwarzania
-marker.items=Pasek wstawiania znacznik\u00f3w
-insert.items=Pasek znacznik\u00f3w
-layout.items=Pasek wygl\u0105du
-view.items=Pasek widoku
-effect.items=Pasek efekt\u00f3w
-dynamic.items=Pasek dynamiki
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nowy plik
-action.file.open=Otw\u00f3rz plik
-action.file.save=Zapisz
-action.file.save-as=Zapisz jako
-action.file.print=Drukuj
-action.file.print-preview=Podgl\u0105d wydruku
-action.edit.undo=Cofnij
-action.edit.redo=Pon\u00f3w
-action.edit.voice-1=Wybierz g\u0142os 1
-action.edit.voice-2=Wybierz g\u0142os 2
-action.composition.change-time-signature=Zmie\u0144 metrum
-action.composition.change-tempo=Zmie\u0144 tempo
-action.composition.change-info=Zmie\u0144 informacje o utworze
-action.composition.change-clef=Zmie\u0144 klucz
-action.composition.change-key-signature=Zmie\u0144 tonacj\u0119
-action.view.layout-set-page=Poka\u017c wygl\u0105d strony
-action.view.layout-set-linear=Poka\u017c tryb liliowy 
-action.view.layout-set-score-enabled=Poka\u017c zapis nutowy
-action.view.show-piano=Poka\u017c klawiatur\u0119
-action.view.show-fretboard=Poka\u017c podstrunnic\u0119
-action.view.show-mixer=Poka\u017c mikser
-action.view.show-transport=Poka\u017c odtwarzacz
-action.track.add=Dodaj \u015bcie\u017ck\u0119
-action.track.remove=Usu\u0144 \u015bcie\u017ck\u0119
-action.track.clone=Powiel \u015bcie\u017ck\u0119
-action.track.go-first=Przenie\u015b do pierwszej scie\u017cki
-action.track.go-last=Przejd\u017a do ostatniej \u015bcie\u017cki
-action.track.go-next=Przenie\u015b do nast\u0119pnej \u015bcie\u017cki
-action.track.go-previous=Przejd\u017a do poprzedniej \u015bcie\u017cki
-action.track.properties=Zmie\u0144 w\u0142a\u015bciwo\u015bci \u015bcie\u017cki
-action.track.lyrics=Edycja s\u0142\u00f3w dla \u015bcie\u017cki
-action.measure.add=Dodaj takt
-action.measure.remove=Usu\u0144 takt
-action.measure.copy=Kopiuj takt
-action.measure.paste=Wstaw takt
-action.measure.clean=Wyczy\u015b\u0107 takt
-action.measure.go-first=Przejd\u017a do pierwszego taku
-action.measure.go-last=Przejd\u017a do ostatniego taku
-action.measure.go-next=Przejd\u017a do nast\u0119pnego taktu
-action.measure.go-previous=Przejd\u017a do poprzedniego taktu
-action.beat.general.remove-unused-voice=Usu\u0144 nieu\u017cywany g\u0142os
-action.beat.general.voice-up=Ustaw laseczki nut do g\u00f3ry
-action.beat.general.voice-down=Ustaw laseczki nut w d\u00f3\u0142
-action.beat.general.voice-auto=Ustaw automatyczny kierunek laseczek nutowych
-action.beat.general.move-left=Przesu\u0144 jedno uderzenie w lewo
-action.beat.general.move-right=Przesu\u0144 jedno uderzenie w prawo
-action.beat.general.move-custom=Zaawansowane przesuni\u0119cie
-action.beat.general.set-stroke-up=Ustaw kierunek uderzenia w g\u00f3r\u0119
-action.beat.general.set-stroke-down=Ustaw kierunek uderzenia w d\u00f3\u0142
-action.note.general.clean-beat=Wyczy\u015b\u0107 warto\u015b\u0107
-action.note.general.decrement-semitone=P\u00f3\u0142 tonu w d\u00f3\u0142
-action.note.general.increment-semitone=P\u00f3\u0142 tonu w g\u00f3r\u0119
-action.note.general.shift-down=Oktaw\u0119 w d\u00f3\u0142
-action.note.general.shift-up=Oktaw\u0119 w g\u00f3re
-action.note.general.tied=Dodaj/Usu\u0144 ligatur\u0119
-action.note.duration.change-dotted=Dodaj/Usu\u0144 kropk\u0119
-action.note.duration.change-double-dotted=Dodaj/Usu\u0144 podw\u00f3jn\u0105 kropk\u0119
-action.note.duration.change-division-type=Dodaj/Usu\u0144 triol\u0119
-action.note.effect.change-vibrato=Dodaj/Usu\u0144 Wibrato
-action.note.effect.change-bend=Dodaj/Usu\u0144 podci\u0105gni\u0119cie struny
-action.note.effect.change-slide=Dodaj/Usu\u0144 glissando (slide)
-action.note.effect.change-hammer=Dodaj/Usu\u0144 legato (hammer-on/pull-off )
-action.note.effect.change-accentuated=Dodaj/Usu\u0144 akcenty
-action.note.effect.change-dead=Dodaj/Usu\u0144 st\u0142umion\u0105 nut\u0119
-action.note.effect.change-fade-in=Dodaj/Usu\u0144 zg\u0142a\u015bnianie
-action.note.effect.change-ghost=Dodaj/Usu\u0144 nut\u0119-duch
-action.note.effect.change-grace=Dodaj/Usu\u0144 przednutk\u0119
-action.note.effect.change-harmonic=Dodaj/Usu\u0144 fla\u017colet
-action.note.effect.change-heavy-accentuated=Dodaj/Usu\u0144 mocne akcenty
-action.note.effect.change-palm-mute=Dodaj/Usu\u0144 t\u0142umienie d\u0142oni\u0105
-action.note.effect.change-popping=Dodaj/Usu\u0144 papping
-action.note.effect.change-slapping=Dodaj/Usu\u0144 slap
-action.note.effect.change-staccato=Dodaj/Usu\u0144 staccato
-action.note.effect.change-tapping=Dodaj/Usu\u0144 tapping
-action.note.effect.change-tremolo-bar=Dodaj/Usu\u0144 tremolo
-action.note.effect.change-tremolo-picking=Dodaj/Usu\u0144 uderzenie tremolo
-action.note.effect.change-trill=Dodaj/Usu\u0144 ozdobnik
-action.insert.open-repeat=Otw\u00f3rz repetycj\u0119
-action.insert.close-repeat=Zamknij repetycj\u0119
-action.insert.chord=Wstaw akord
-action.transport.play=Odtwarzaj
-action.transport.stop=Zatrzymaj odtwarzanie
-action.transport.set-loop-start=Ustaw pocz\u0105tkowe miejsce powt\u00f3rki
-action.transport.set-loop-end=Ustaw ko\u0144cowe miejsce powt\u00f3rki
-action.tools.transpose=Transponuj d\u017awi\u0119ki
-#######################OLD MISTAKES##################
-effects.tremolo-bar=Tremolo ("wajcha")
-settings.config.language.choose=Wybierz sw\u00f3j j\u0119zyk
-composition.artist=Kompozytor
-composition.name=Tytu\u0142
-action.view.layout-set-multitrack=Poka\u017c tryb wielo\u015bcie\u017ckowy
-#########################################################
-info=Opis
-name=Nazwa
-author=Autor
-version=Wersja
-description=Opis
-configure=Ustawienia
-
-file.open-url=Otw\u00f3rz adres URL
-file.open.error=Nie da si\u0119 otworzy\u0107: {0}
-file.save.error=Nie da si\u0119 zapisa\u0107: {0}
-file.import.error=Nie da si\u0119 zaimportowa\u0107 : {0}
-file.export.error=Nie da si\u0119 wyeksportowa\u0107: {0}
-file.save-changes-question=Utw\u00f3r zosta\u0142 zmieniony\n Czy chcesz zachowa\u0107 zmiany?
-
-midi.port=Port Midi
-midi.sequencer=Sekwencer Midi
-
-browser.dialog=Przegl\u0105darka
-browser.menu.file=Plik
-browser.open=Otw\u00f3rz
-browser.exit=Wyj\u015bcie
-browser.menu.collection=Kolekcja
-browser.menu.go=Id\u017a
-browser.collection.select=Wybierz kolekcj\u0119
-browser.collection.open=Otw\u00f3rz
-browser.collection.remove=Usu\u0144
-browser.collection.close=Zamknij
-browser.collection.new=Nowy
-browser.go-root=Home
-browser.go-back=Powr\u00f3t
-browser.refresh=Od\u015bwie\u017c
-browser.collection.fs.editor-title=Kolekcja lokalna
-browser.collection.fs.editor-tip=Wybierz katalog dla swojej kolekcji
-browser.collection.fs.invalid-path=Wybierz prosz\u0119 poprawny katalog
-
-plugin.unknown-value=Niedost\u0119pny
-plugin.column.name=Nazwa wtyczki
-plugin.column.enabled=Dost\u0119pno\u015b\u0107
-
-view.layout.compact=Kompaktowy
-view.layout.chord-style=Wygl\u0105d akord\u00f3w
-view.layout.chord-name=Nazwa akordu
-view.layout.chord-diagram=Diagram akordu
-view.layout.tablature-enabled=Poka\u017c tabulatur\u0119
-
-view.show-matrix=Graficzny edytor d\u017awi\u0119k\u00f3w
-
-matrix.editor=Graficzny edytor d\u017awi\u0119k\u00f3w
-matrix.grids=Liczba linii siatki
-matrix.border-color=Kolor obramowania
-matrix.font=Czcionka
-matrix.foreground-color=Kolor g\u0142\u00f3wny
-matrix.line-color-1=Kolor 1 linii
-matrix.line-color-2=Kolor 2 linii
-matrix.line-color-over=Kolor linii pod kursorem
-matrix.note-color=Kolor nuty
-matrix.play-note-color=Kolor odtwarzanej nuty
-matrix.position-color=Kolor pozycji
-matrix.settings=Ustawienia edytora
-
-help.doc=Dokumentacja
-
-transport.first=Pierwszy
-transport.last=Ostatni
-transport.previous=Poprzedni
-transport.next=Nast\u0119pny
-transport.pause=Pauza
-transport.mode=Tryb odtwarzania
-transport.mode.simple=Tryb odtwarzania
-transport.mode.simple.tempo-percent=Tempo w procentach
-transport.mode.simple.loop=Odtwarzaj w p\u0119tli
-transport.mode.trainer=Tryb \u0107wiczenia
-transport.mode.trainer.increment-description=Zwi\u0119kszaj o
-
-repeat.alternative=Volta (alternatywne powt\u00f3rzenie)
-repeat.alternative.editor=Edytuj powt\u00f3rki
-
-tools=Narz\u0119dzia
-tools.scale=Skale/gamy
-tools.browser=Przegl\u0105darka
-tools.plugins=Wtyczki
-tools.shortcuts=Skr\u00f3ty
-tools.settings=Ustawienia
-tools.transpose=Transpozycja
-tools.transpose.semitones=Transponuj o (p\u00f3\u0142tony)
-tools.transpose.apply-to-track=Transponuj wszystkie takty
-tools.transpose.apply-to-measure=Transponuj tylko ten takt
-tools.transpose.apply-to-all-tracks=Transponuj wszystkie \u015bcie\u017cki
-tools.transpose.try-keep-strings=Je\u017celi to mo\u017cliwe, pr\u00f3buj zachowa\u0107 d\u017awi\u0119ki na tej samej strunie
-tools.transpose.apply-to-chords=Transponuj akordy
-
-text.insert=Wprowad\u017a tekst
-
-settings.config.main.table.auto-size.enabled=Automatycznie dopasuj tabulatur\u0119
-settings.config.styles.general=Wygl\u0105d og\u00f3lny
-settings.config.styles.printer=Wygl\u0105d wydruku
-settings.config.styles.font.lyric=Czcionka tekstu utworu
-settings.config.styles.font.text=Czcionka tekstu
-settings.config.skin=Sk\u00f3rki
-settings.config.skin.choose=Wybierz sk\u00f3r\u0119
-settings.config.toolbars.tip=Dopasuj pasek narz\u0119dzi
-settings.config.toolbars.list=Dost\u0119pne paski narz\u0119dzi
-settings.config.toolbars.move-up=Przesu\u0144 w g\u00f3r\u0119
-settings.config.toolbars.move-down=Przesu\u0144 w d\u00f3\u0142
-
-action.file.open-url=Otw\u00f3rz adres URL
-action.file.exit=Zako\u0144cz prac\u0119 z TuxGuitar
-action.insert.text=Wstaw tekst
-action.insert.repeat-alternative=Volta (Alternatywna repetycja)
-action.composition.change-triplet-feel=Zmie\u0144 rytm triolowy
-action.note.duration.set-whole=Ca\u0142e nuty
-action.note.duration.set-half=P\u00f3\u0142 nuty
-action.note.duration.set-quarter=\u0106wier\u0107nuty
-action.note.duration.set-eighth=\u00d3semki
-action.note.duration.set-sixteenth=Szesnastki
-action.note.duration.set-thirty-second=Trzydziestodw\u00f3jki
-action.note.duration.set-sixty-fourth=Sze\u015b\u0107dziesi\u0119cioczw\u00f3rki
-action.note.duration.decrement-duration=Zmiejsz warto\u015bci rytmiczne
-action.note.duration.increment-duration=Zwi\u0119ksz warto\u015bci rytmiczne
-action.track.move-down=Przesu\u0144 w d\u00f3\u0142
-action.track.move-up=Przesu\u0144 w g\u00f3r\u0119
-action.tools.browser=Przegl\u0105darka
-action.transport.metronome=Metronom
-action.transport.mode=Tryb
-action.view.show-matrix=Poka\u017c graficzny edytor nut
-action.view.layout-set-chord-diagram-enabled=Akord jako diagram
-action.view.layout-set-chord-name-enabled=Akord jako nazwa 
-action.view.layout-set-compact=Poka\u017c widok kompaktowy
-action.view.layout-set-tablature-enabled=Poka\u017c tabulatur\u0119
-action.marker.add=Dodaj znacznik
-action.marker.go-next=Id\u017a do nast\u0119pnego znacznika
-action.marker.go-previous=Id\u017a do poprzedniego znacznika
-action.settings.configure=Ustawienia
-action.help.doc=Pomoc
-
-chord.bass=Bas
-chord.custom=W\u0142asny akord
-chord.settings.tip=W\u0142asne ustawienia
-chord.settings.type=Typ
-chord.settings.type.most-common=Podstawowe
-chord.settings.type.inversions=W przewrotach
-chord.settings.type.close-voiced=W uk\u0142adzie skupionym
-chord.settings.type.open-voiced=W uk\u0142adzie rozleg\u0142ym
-chord.settings.open-chords=Z pustymi strunami
-chord.settings.chords-to-display=Liczba pokazywanych akord\u00f3w
-chord.settings.search-frets=Zakres prog\u00f3w
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-fretboard.direction=Kierunek
-fretboard.background-color=Kolor t\u0142a
-fretboard.display-note-text=Poka\u017c nazw\u0119 d\u017awi\u0119ku
-fretboard.display-scale-text=Poka\u017c nazwy d\u017awi\u0119k\u00f3w skali
-fretboard.font=Czcionka
-fretboard.fretpoint-color=Kolor progu
-fretboard.note-color=Kolor d\u017awi\u0119ku
-fretboard.scale-note-color=Kolor d\u017awi\u0119ku skali
-fretboard.settings=Ustawienia podstrunnicy
-fretboard.string-color=Kolor struny
-fretboard.settings.options=Opcje
-
-piano.editor=Klawiatura
-piano.natural-key-color=Kolor klawiszy "bia\u0142ych"
-piano.not-natural-key-color=Kolor klawiszy "czarnych"
-piano.note-color=Kolor d\u017awi\u0119ku
-piano.scale-note-color=Kolor d\u017awi\u0119ku skali
-piano.settings=Ustawienia klawiatury
-
-mixer=Mikser
-browser.collection.fs.name=Nazwa
-browser.collection.fs.path=\u015acie\u017ck
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_pt.properties b/TuxGuitar-testing/platform-all/share/lang/messages_pt.properties
deleted file mode 100644
index 1d048f06..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_pt.properties
+++ /dev/null
@@ -1,722 +0,0 @@
-es=Spanish
-en=English
-fr=French
-pl=Polish
-de=Deutsch
-pt=Português
-
-ok=Ok
-cancel=Cancel
-yes=Sim
-no=Não
-add=Adicionar
-edit=Editar
-remove=Remover
-save=Salvar
-exit=Sair
-choose=Escolha
-color=Cor
-title=Título
-go=Ir
-warning=Aviso
-error=erro
-plugins=Plugins
-options=Opções
-defaults=Padrões
-clean=Limpar
-rename=Renomear
-fret=Braço
-position=Posição
-
-tuxguitar.title=Tux-Guitar
-
-file=Arquivo
-file.new=Novo
-file.open=Abrir
-file.save=Salvar
-file.save-as=Salvar Como
-file.exit=Sair
-file.export=Exportar
-file.export-midi=Exportar Midi
-file.export-pdf=Exportar PDF
-file.print=Imprimir
-file.print-preview=Visualizar Impressão
-file.import=Importar
-file.import-midi=Importar Midi
-file.export-ascii=Exportar ASCII
-file.history=Histórico
-file.overwrite-question=Este arquivo já existe, você deseja salvar sobre ele??
-
-edit.undo=Desfazer
-edit.redo=Refazer
-edit.copy=Copiar
-edit.from=De
-edit.to=Até
-edit.all-tracks=Todas Pistas
-edit.paste=Colar
-edit.paste.count=Quantidade a colar
-edit.paste.replace-mode=Colar no Compasso Atual
-edit.paste.insert-mode=Colar em Novo Compasso
-edit.delete=Excluir
-edit.cut=Recortar
-edit.menu=Editar
-edit.mouse-mode-selection=Modo de Seleção
-edit.mouse-mode-edition=Modo Partitura
-edit.not-natural-key=Modo Sustenido/Bemol
-edit.voice-1=Selecionar Voz 1
-edit.voice-2=Selecionar Voz 2
-
-view=Visualizar
-
-view.layout=Layout
-view.layout.page=Layout da Página
-view.layout.linear=Layout Linear
-view.layout.multitrack=Multi-Pistas
-view.layout.score-enabled=Exibir Partitura
-
-view.show-mixer=Exibir Mixer
-view.show-fretboard=Exibir Braço da Guitarra
-view.show-piano=Exibir Piano
-view.show-transport=Exibir Player
-
-fretboard.right-mode=Modo Destro
-fretboard.left-mode=Modo Canhoto
-
-composition=Composição
-composition.timesignature=Assinatura de Tempo
-composition.timesignature.Numerator=Numerador
-composition.timesignature.denominator=Denominador
-composition.timesignature.to-the-end=Até o Fim
-composition.tempo=Tempo
-composition.tempo-percent=Porcentagem
-composition.properties=Propriedades
-composition.name=Nome
-composition.artist=Intérprete
-composition.album=Álbum
-composition.author=Autor
-composition.date=Data
-composition.copyright=Copyright
-composition.writer=Autor
-composition.transcriber=Transcrito por
-composition.comments=Comentários
-composition.tempo.invalid=Tempo Inválido
-composition.clef=Clave
-composition.clef.treble=de Sol
-composition.clef.bass=de Fá
-composition.clef.tenor=Tenor
-composition.clef.alto=Alto
-composition.clef.to-the-end=Aplicar esta Clave até o fim
-composition.keysignature=Armação da Clave
-composition.keysignature.natural=Natural
-composition.keysignature.sharp-1=1 Sustenido
-composition.keysignature.sharp-2=2 Sustenido
-composition.keysignature.sharp-3=3 Sustenido
-composition.keysignature.sharp-4=4 Sustenido
-composition.keysignature.sharp-5=5 Sustenido
-composition.keysignature.sharp-6=6 Sustenido
-composition.keysignature.sharp-7=7 Sustenido
-composition.keysignature.flat-1=1 Bemol
-composition.keysignature.flat-2=2 Bemol
-composition.keysignature.flat-3=3 Bemol
-composition.keysignature.flat-4=4 Bemol
-composition.keysignature.flat-5=5 Bemol
-composition.keysignature.flat-6=6 Bemol
-composition.keysignature.flat-7=7 Bemol
-composition.keysignature.to-the-end= Aplicar esta Armação da Clave até o fim
-composition.tripletfeel=Modo Triplet
-composition.tripletfeel.none=Sem modo Triplet
-composition.tripletfeel.eighth=Triplet em Colcheias
-composition.tripletfeel.sixteenth=Triplet em Semicolcheias
-composition.tripletfeel.to-the-end=Aplicar modo triplet até o final
-
-
-help=Ajuda
-help.help=Ajuda
-help.about=Sobre
-
-instruments.volume=Ganho
-instrument.volume=Volume
-instrument.channel=CN
-instrument.effect-channel=CE
-instrument.balance=Balanço
-instrument.free=Livre
-instrument.link=Ligado
-
-track=Pista
-track.number=N°
-track.name=Nome
-track.color=Cor
-track.first=Primeira Pista
-track.last=Última Pista
-track.previous=Pista Anterior
-track.next=Próxima Pista
-track.add=Adicionar Pista
-track.remove=Remover Pista
-track.instrument=Instrumento
-track.tunning=Afinação
-track.instrument.empty=Não encontramos um banco de sons no seu sistema midi, tente recompilar tuxguitar na sua versão do Java.
-track.properties=Propriedades
-track.properties.general=Geral
-track.clone=Duplicar Pista
-track.move-up=Mover Para Cima
-track.move-down=Mover Para Baixo
-track.name.default-percussion-name=Percussão
-track.lyrics=Letras
-track.solo=Solo
-track.mute=Mudo
-
-lyric.editor=Editor de Letras
-
-tunning.offset=Offset
-tuning.strings.transpose=Transpor notas afetadas.
-tuning.strings.transpose.try-keep-strings=Tentar manter as notas na mesma corda
-tuning.strings.transpose.apply-to-chords=Transpor acordes
-
-measure=Compasso
-measure.first=Primeiro Compasso
-measure.last=Último Compasso
-measure.previous=Compasso anterior
-measure.next=Próximo Compasso
-measure.add=Adicionar Compasso
-measure.add.count=Quantidade
-measure.clean=Limpar Compasso
-measure.remove=Remover Compasso
-measure.copy=Copiar Compasso
-measure.paste=Colar Compasso
-measure.add-before-current-position=Adicionar antes da Posição Atual
-measure.add-after-current-position=Adicionar depois da Posição Atual
-measure.add-at-end=Adicionar no Final
-
-
-beat=Nota
-beat.clean=Limpar batida
-beat.voice.remove-unused=Remover Voz não utilizada
-beat.voice-up=Bastões para cima
-beat.voice-down=Bastões para baixo
-beat.voice-auto=Bastões Automáticos
-beat.stroke-up=Toca para cima
-beat.stroke-down=Toca para baixo
-beat.move-left=Mover um tempo para Esquerda
-beat.move-right=Mover um tempo para Direita
-beat.move-custom=Mover tempo Personalizado
-beat.move-custom.dialog.title=Mover Personalizado
-beat.move-custom.dialog.direction-tip=Direção do Movimento 
-beat.move-custom.dialog.move-1.tip=Movimento Maior
-beat.move-custom.dialog.move-2.tip=Movimento Refinado
-beat.move-custom.dialog.direction=Direção
-beat.move-custom.dialog.direction.right=Mover para Direita
-beat.move-custom.dialog.direction.left=Mover para Esquerda
-beat.move-custom.dialog.count=Quantos
-beat.move-custom.dialog.duration=Duração
-beat.move-custom.dialog.duration.type=Ponto/Ponto Duplo
-beat.move-custom.dialog.duration.type.normal=Nenhum
-beat.move-custom.dialog.duration.division-type=Tipo de divisão
-beat.move-custom.dialog.duration.division-type.normal=Normal (Tuplet)
-
-note.semitone-up=Semitom Acima
-note.semitone-down=Semitom Abaixo
-note.shift-up=Deslizar acima
-note.shift-down=Deslizar abaixo
-note.tiednote=Nota Ligada
-note.deadnote=Dead Note
-chord=Acorde
-chord.name=Nome do Acorde
-chord.custom.name-empty-error=Nome do acorde não definido!
-chord.custom.name-exist-error=Já existe esse nome de arcorde.
-chord.editor=Editor de Acordes
-duration=Duração
-duration.whole=Semibreve
-duration.half=Mínima
-duration.quarter=Semínima
-duration.eighth=Colcheia
-duration.sixteenth=Semicolcheia
-duration.thirtysecond=Fusa
-duration.sixtyfourth=Semifusa
-duration.dotted=Ponto
-duration.doubledotted=Duplo Ponto
-duration.division-type=Quiáltera
-dynamic=Dinâmico
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano
-dynamic.mezzo-forte=Mezzo Forte
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo
-dynamic.forte-fortissimo=Forte Fortissimo
-insert.chord=Inserir Acorde
-
-effects=Efeitos
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Dead Note
-effects.slide=Slide
-effects.hammer=Hammer on/Pull off
-effects.tremolo-bar=Trêmolo
-effects.tremolo-bar-editor=Barra de Trêmolo
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Soltar Acima
-effects.tremolo-bar.release-down=Soltar Abaixo
-effects.tremolo-bar.inverted-dip=Dip Invertido
-effects.tremolo-bar.return=Volta da Barra de Trêmolo
-effects.ghostnote=Ghost Note
-effects.accentuatednote=Nota Acentuada
-effects.heavyaccentuatednote=Nota Muito Acentuada
-effects.harmonic=Harmonico
-effects.grace=Grace Note
-effects.grace-editor=Editor de Grace Note
-effects.grace.before-beat=Antes da batida
-effects.grace.on-beat=Durante a batida
-effects.grace.transition=Transição
-effects.grace.transition-none=Nenhum
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Editor de Trill
-effects.tremolo-picking=Trêmolo Picking
-effects.tremolo-picking-editor=Editor de Trêmolo Picking
-effects.palm-mute=Nota Abafada
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping
-effects.fade-in=Fade In
-effects.harmonic-editor=Editor de Harmônico
-effects.harmonic.type-of-harmonic=Tipo de Harmônico
-effects.harmonic.natural=Harmônico Natural
-effects.harmonic.artificial=Harmônico Artificial
-effects.harmonic.artificial.key-offset=Offset de Clave
-effects.harmonic.tapped=Tapped Harmônico
-effects.harmonic.tapped.left-hand=Mão Esquerda
-effects.harmonic.tapped.right-hand=Mão Direita
-effects.harmonic.pinch=Harmônico Pinch
-effects.harmonic.semi=Semi Harmônico
-
-bend.editor=Editor de Bend
-bend.bend=Bend
-bend.bend-release=bend/release
-bend.bend-release-bend=bend/release/bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=Tocar
-transport.start=Iniciar
-transport.stop=Parar
-transport.mode.loop-range=Tamanho do loop
-transport.mode.loop-range.from=Tocar a partir do compasso
-transport.mode.loop-range.from-default=Desde o início
-transport.mode.loop-range.to=Tocar até esse compasso
-transport.mode.loop-range.to-default=Até o fim
-transport.set-loop-start=Configurar início do loop
-transport.set-loop-end=Configurar final do loop
-
-repeat.open=Abrir repetição
-repeat.close=Fechar repetição
-repetitions=Repetições
-repeat.number-of-repetitions=Número de repetições
-
-
-
-
-
-instrument=Instrumento
-instrument.instrument=Instrumento
-instrument.percussion-track=Pista de Percussão
-
-tunning=Afinação
-tunning.strings=Cordas
-
-language=Idioma
-
-choose-color=Esculha uma cor
-
-
-settings=Configurações
-settings.config=Configure o TuxGuitar
-settings.config.main=Geral
-settings.config.main.window-title=Título da Janela
-settings.config.main.window-title.help=As seguintes variáveis serão substituidas no Título da Janela:
-settings.config.main.window-title.var.description.appname=Nome do Aplicativo: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Versão
-settings.config.main.window-title.var.description.filename=Nome do Arquivo
-settings.config.main.window-title.var.description.filepath=Caminho do Arquivo
-settings.config.main.window-title.var.description.songname=Nome da Música
-settings.config.main.window-title.var.description.songauthor=Autor da Música
-settings.config.main.window-title.var.description.songalbum=Nome do Álbum
-settings.config.main.window-title.var.description.songartist=Nome do Intérprete
-settings.config.main.options=Opções
-settings.config.main.splash-enabled=Mostrar Splash Screen do Tux Guitar ao iniciar
-settings.config.view=Visualizar
-settings.config.view.mode=Modo Layout
-settings.config.view.size=Tamanho da Janela
-settings.config.view.size.maximized=Maximizado
-settings.config.view.size.width=Largura
-settings.config.view.size.height=Altura
-settings.config.language=Idioma
-settings.config.language.choose=Escolha o seu Idioma
-settings.config.styles=Estilos
-settings.config.styles.font.default=Fonte Padrão
-settings.config.styles.font.note=Fonte das notas
-settings.config.styles.font.time-signature=Fonte da Assinatura de Tempo
-settings.config.styles.font.printer-default=Fonte Padrão para Imprimir
-settings.config.styles.font.printer-note=Fonte para Imprimir notas
-settings.config.styles.font.printer-time-signature=Fonte para imprimir a Assinatura de Tempo
-settings.config.styles.color.score-note=Cor das notas da Partitura
-settings.config.styles.color.tab-note=Cor das notas da Tablatura
-settings.config.styles.color.play-note=Cor da nota tocando
-settings.config.styles.color.lines=Cor das Linhas Horizontais
-settings.config.toolbars=Barras de Ferramentas
-settings.config.apply-changes-question=Aplicar as mudanças agora?
-settings.config.sound=Som
-settings.config.sound.soundbank=Banco de Sons
-settings.config.sound.default-soundbank=Usar Banco de Sons padrão
-settings.config.sound.custom-soundbank=Usar Banco de Sons personalizado
-settings.config.sound.soundbank-restart-message=Você precisa reiniciar o TuxGuitar para que o Banco de Sons seja aplicado.
-soundbank.error=Erro no Banco de Sons
-soundbank.error.unavailable=Banco de Sons Indisponível.
-soundbank.error.custom=Falhou ao abrir Banco de Sons personalizado.
-
-settings.keybindings=Configure as Teclas do Programa
-key-bindings-editor=Editor das Teclas do Programa
-key-bindings-editor-action-select=Selecione uma Ação
-key-bindings-editor-action-column=Ações
-key-bindings-editor-shortcut-column=Teclas
-key-bindings-editor-push-a-key=Pressione uma tecla
-key-bindings-editor-save-question=Existem mudanças não salvas, você deseja exibir sem salvar?
-
-key-bindings-editor-override=Atalho já definido! Deseja mudá-lo?
-
-
-
-
-print.print=Imprimir
-print.dialog=Imprimir
-print.service=Serviço
-print.service.name=Nome
-print.service.status=Status
-print.service.type=Tipo
-print.service.info=Informação
-print.range=Faixa
-print.range.all-pages=Todas
-print.range.pages=Páginas
-print.range.pages-to=Até
-print.copies=Cópias
-print.copies-number=Número de cópias
-print.print-to-file=Imprimir em Arquivo
-print.file-chooser=Escolha
-print-header.default-song-name=tuxguitar_file
-print-header.default-song-author=Anônimo
-print.preview=Visualizar impressão
-
-
-
-marker=Marcador
-marker.add=Adicionar Marcador
-marker.list=Listar Marcadores
-marker.first=Ir para o primeiro Marcador
-marker.last=Ir para o Último Marcador
-marker.next=Ir para o Próximo Marcador
-marker.previous=Ir para o Marcador Anterior
-
-
-
-export.tablature-enabled=Exibir Tablatura
-export.score-enabled=Mostrar Partitura
-export.black-and-white=Modo Preto e Branco
-
-scale=Escala
-scale.list=Lista de Escalas
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Itens de Arquivo
-edit.items=Itens de Editar
-property.items=Itens de Propriedades
-track.items=Itens de Pistas
-duration.items=Itens de Duração
-beat.items=Itens de Notas
-composition.items=Itens de Composição
-repeat.items=Itens de Repetição
-transport.items=Itens de Player
-marker.items=Itens de Marcadores
-insert.items=Itens de Inserir
-layout.items=Itens de Layout
-view.items=Itens de Visualizar
-effect.items=Itens de Efeitos
-dynamic.items=Itens de Dinâmico
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Novo Arquivo
-action.file.open=Abrir arquivo
-action.file.save=Salvar
-action.file.save-as=Salvar como
-action.file.print=Imprimir
-action.file.print-preview=Visualizar Impressão
-action.edit.undo=Desfazer
-action.edit.redo=Refazer
-action.edit.voice-1=Selecionar voz 1
-action.edit.voice-2=Selecionar voz 2
-action.composition.change-time-signature=Mudar a assinatura de tempo
-action.composition.change-tempo=Mudar o tempo
-action.composition.change-info=Alterar informações da música
-action.composition.change-clef=Alterar Clave
-action.composition.change-key-signature=Alterar Armação da Clave
-action.view.layout-set-page=Exibir o Layout da Página
-action.view.layout-set-linear=Exibir layout linear
-action.view.layout-set-multitrack=Exibir modo multi-pista
-action.view.layout-set-score-enabled=Exibir Partitura
-action.view.show-piano=Mostrar Piano
-action.view.show-fretboard=Exibir Braço da Guitarra
-action.view.show-mixer=Exibir mixer
-action.view.show-transport=Exibir Player
-action.track.add=Adicionar Pista
-action.track.remove=Remover Pista
-action.track.clone=Duplicar a Pista
-action.track.go-first=Ir para a primeira pista
-action.track.go-last=Ir para a última Pista
-action.track.go-next=Ir para a próxima pista
-action.track.go-previous=Ir para a Pista anterior
-action.track.lyrics=Editar Letras
-action.track.properties=Mudar as propriedades da pista
-action.measure.add=Adicionar Compasso
-action.measure.clean=Limpar Compasso
-action.measure.remove=Remover Compasso
-action.measure.copy=Copiar Compasso
-action.measure.paste=Colar compasso
-action.measure.go-first=Ir para o primeiro compasso
-action.measure.go-last=Ir para o último compasso
-action.measure.go-next=Ir para o próximo compasso
-action.measure.go-previous=Ir para o compasso anterior
-action.beat.general.remove-unused-voice=Remover voz não usada
-action.beat.general.voice-up=Configura bastões para cima
-action.beat.general.voice-down=Configura bastões para baixo
-action.beat.general.voice-auto=Configura bastões automáticos
-action.beat.general.set-stroke-up=Configura tocar para cima
-action.beat.general.set-stroke-down=Configura tocar para baixo
-action.beat.general.move-left=Mover um tempo para Esquerda
-action.beat.general.move-right=Mover um tempo para Direita
-action.beat.general.move-custom=Mover tempo Personalizado
-action.note.general.clean-beat=Schlag leeren
-action.note.general.decrement-semitone=Decrementar Semitom
-action.note.general.increment-semitone=Incrementar Semitom
-action.note.general.shift-down=Deslizar abaixo
-action.note.general.shift-up=Deslizar acima
-action.note.general.tied=Adicionar/Remover Ligado
-action.note.duration.change-dotted=Adicionar/Remover ponto
-action.note.duration.change-double-dotted=Adicionar/Remover duplo Ponto
-action.note.duration.change-division-type=Adicionar/Remover quiáltera
-action.note.effect.change-vibrato=Adicionar/Remover Vibrato
-action.note.effect.change-bend=Adicionar/Remover bend
-action.note.effect.change-slide=Adicionar/Remover Slide
-action.note.effect.change-hammer=Adicionar/Remover Hammer on/Pull off
-action.note.effect.change-accentuated=
-action.note.effect.change-dead=
-action.note.effect.change-fade-in=Fade-In
-action.note.effect.change-ghost=Adicionar/Remover Ghost Note
-action.note.effect.change-grace=Adicionar/Remover Grace Note
-action.note.effect.change-harmonic=Adicionar/Remover Harmônico
-action.note.effect.change-heavy-accentuated=Adicionar/Remover Nota Muito Acentuada
-action.note.effect.change-palm-mute=Adicionar/Remover Nota Abafada
-action.note.effect.change-popping=Adicionar/Remover Popping
-action.note.effect.change-slapping=Adicionar/Remover Slapping
-action.note.effect.change-staccato=Adicionar/Remover Staccato
-action.note.effect.change-tapping=Adicionar/Remover Tapping
-action.note.effect.change-tremolo-bar=Adicionar/Remover Barra de trêmolo
-action.note.effect.change-tremolo-picking=Adicionar/Remover Trêmolo Picking
-action.note.effect.change-trill=Adicionar/Remover Trill
-action.insert.open-repeat=Abrir repetição
-action.insert.close-repeat=Fechar repetição
-action.insert.chord=Inserir acorde
-action.transport.play=Tocar música
-action.transport.stop=Parar de tocar
-action.transport.set-loop-start=Configurar início do loop
-action.transport.set-loop-end=Configurar final do loop
-
-info=Info
-name=Nome
-author=Autor
-version=Versão
-description=Descrição
-configure=Configurar
-
-file.open-url=Abrir URL
-file.open.error=Não pôde abrir: {0}
-file.save.error=Não pôde salvar: {0}
-file.import.error=Não pôde importar: {0}
-file.export.error=Não pôde exportar: {0}
-file.save-changes-question=A música tem alterações não salvas.\nDeseja salvar as mudanças?
-
-midi.port=Midi Port
-midi.sequencer=Midi Sequencer
-
-browser.dialog=Navegador
-browser.menu.file=Arquivo
-browser.open=Abrir
-browser.exit=Sair
-browser.menu.collection=Coleção
-browser.menu.go=Ir
-browser.collection.select=Selecionar coleção
-browser.collection.open=Abrir
-browser.collection.remove=Remover
-browser.collection.close=Fechar
-browser.collection.new=Abrir
-browser.go-root=Inicial
-browser.go-back=Voltar
-browser.refresh=Atualizar
-browser.collection.fs.editor-title=Arquivos de coleção
-browser.collection.fs.editor-tip=Escolha a pasta da sua coleção
-browser.collection.fs.invalid-path=Por favor, selecione uma pasta válida
-
-plugin.unknown-value=Indisponível
-plugin.column.name=Nome do Plugin
-plugin.column.enabled=Habilitado
-
-view.layout.compact=Compacto
-view.layout.chord-style=Estilo de acorde
-view.layout.chord-name=Nome do acorde
-view.layout.chord-diagram=Diagrama de acorde
-view.layout.tablature-enabled=Mostrar tablatura
-
-view.show-matrix=Mostrar matriz
-
-matrix.editor=Editor de matriz
-matrix.grids=Número de grades
-matrix.border-color=Cor da borda
-matrix.font=Fonte
-matrix.foreground-color=Cor da fonte
-matrix.line-color-1=Cor da linha 1
-matrix.line-color-2=Cor da linha 2
-matrix.line-color-over=Cor de cima
-matrix.note-color=Cor da nota
-matrix.play-note-color=Cor da nota a tocar
-matrix.position-color=Cor da posição
-matrix.settings=Configurações da matriz
-
-help.doc=Documentação
-
-transport.first=Primeiro
-transport.last=Último
-transport.previous=Anterior
-transport.next=Próximo
-transport.pause=Pausar
-transport.mode=Modo Tocador
-transport.mode.simple=Modo Tocador Simples
-transport.mode.simple.tempo-percent=Percentual de tempo
-transport.mode.simple.loop=Tocar um Loop
-transport.mode.trainer=Modo de Treinamento
-transport.mode.trainer.increment-description=Incrementar em
-
-repeat.alternative=Repetição Alternativa
-repeat.alternative.editor=Editar Repetição Alternativa
-
-tools=Ferramentas
-tools.scale=Lista de escalas
-tools.browser=Navegador
-tools.plugins=Plugins
-tools.shortcuts=Atalhos
-tools.settings=Configurações
-tools.transpose=Transposição
-tools.transpose.semitones=Transposição Semitons
-tools.transpose.apply-to-track=Transpor todos os compassos
-tools.transpose.apply-to-measure=Transpor apenas este compasso
-tools.transpose.apply-to-all-tracks=Aplicar em todas as pistas
-tools.transpose.try-keep-strings=Tentar manter as notas na mesma corda
-tools.transpose.apply-to-chords=Transpor acordes
-
-text.insert=Inserir Texto
-
-settings.config.main.table.auto-size.enabled=Habilitar ajuste de tamanho automático
-settings.config.styles.general=Estilos Gerais
-settings.config.styles.printer=Estilos de Impressora
-settings.config.styles.font.lyric=Fonte das letras
-settings.config.styles.font.text=Fonte do texto
-settings.config.skin=Skins
-settings.config.skin.choose=Escolha uma skin
-settings.config.toolbars.tip=Personalize suas barras
-settings.config.toolbars.list=Barras disponíveis
-settings.config.toolbars.move-up=Mover para cima
-settings.config.toolbars.move-down=Mover para baixo
-
-action.file.open-url=Abrir URL
-action.file.exit=Sair do TuxGuitar
-action.insert.text=Inserir Texto
-action.insert.repeat-alternative=Repetição Alternativa
-action.composition.change-triplet-feel=Alterar Triplet Feel
-action.note.duration.set-whole=Usar duração total
-action.note.duration.set-half=Usar 1/2 da duração
-action.note.duration.set-quarter=Usar 1/4 da duração
-action.note.duration.set-eighth=Usar 1/8 da duração
-action.note.duration.set-sixteenth=Usar 1/16 da duração
-action.note.duration.set-thirty-second=Set 1/32 da duração
-action.note.duration.set-sixty-fourth=Set 1/64 da duração
-action.note.duration.decrement-duration=Decrementar duração
-action.note.duration.increment-duration=Incrementar duração
-action.track.move-down=Mover para baixo
-action.track.move-up=Mover para cima
-action.tools.browser=Navegador
-action.tools.transpose=Transpor notas
-action.transport.metronome=Metrônomo
-
-transport.metronome=Metrônomo
-action.transport.mode=Modo
-action.view.show-matrix=Mostrar Matriz
-action.view.layout-set-chord-diagram-enabled=Habilitar Diagrama de Acorde
-action.view.layout-set-chord-name-enabled=Habilitar Nome de Acorde
-action.view.layout-set-compact=Mostrar em Modo Compacto
-action.view.layout-set-tablature-enabled=Mostrar Tablatura
-action.marker.add=Adicionar Marcador
-action.marker.go-next=Ir para o próximo Marcador
-action.marker.go-previous=Ir para o Marcador anterior
-action.settings.configure=Configurações
-action.help.doc=Ajuda
-
-chord.bass=Baixo
-chord.custom=Acorde personalizado
-chord.settings.tip=Configurações personalizadas
-chord.settings.type=Tipo
-chord.settings.type.most-common=Mais comuns
-chord.settings.type.inversions=Inversões
-chord.settings.type.close-voiced=Soar fechado
-chord.settings.type.open-voiced=Soar aberto
-chord.settings.open-chords=Acordes abertos
-chord.settings.chords-to-display=Acordes para mostrar
-chord.settings.search-frets=Localizar Frets
-chord.settings.minimum-fret=Mínimo
-chord.settings.maximum-fret=Máximo
-
-fretboard.direction=Direção
-fretboard.background-color=Cor de fundo
-fretboard.display-note-text=Mostrar texto da nota
-fretboard.display-scale-text=Mostrar texto da escala
-fretboard.font=Fonte
-fretboard.fretpoint-color=Cor dos Frets
-fretboard.note-color=Cor das notas
-fretboard.scale-note-color=Cor das notas de escala
-fretboard.settings=Configurações do braço
-fretboard.string-color=Cor das cordas
-fretboard.settings.options=Opções
-
-piano.editor=Editor de piano
-piano.natural-key-color=Cor de chave natural
-piano.not-natural-key-color=Cor de chave não natural
-piano.note-color=Cor da nota
-piano.scale-note-color=Cor da nota da escala
-piano.settings=Configurações do piano
-
-mixer=Mixer
-
-
-composition.tempo.start-to-end=Aplicar este tempo na música inteira
-composition.tempo.position-to-end=Aplicar este tempo até o final da música
-composition.tempo.position-to-next=Aplicar este tempo até o próximo marcador de tempo
-
-help.about.license=Licensa
-help.about.authors=Autores
-help.about.description=Descrição
-
-browser.collection.fs.name=Nome
-browser.collection.fs.path=Pasta
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_ru.properties b/TuxGuitar-testing/platform-all/share/lang/messages_ru.properties
deleted file mode 100644
index fa0ebc19..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_ru.properties
+++ /dev/null
@@ -1,615 +0,0 @@
-ok=\u041e\u043a
-cancel=\u041e\u0442\u043c\u0435\u043d\u0430
-yes=\u0414\u0430
-no=\u041d\u0435\u0442
-add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c
-edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c
-remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
-save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
-exit=\u0412\u044b\u0445\u043e\u0434
-close=\u0417\u0430\u043a\u0440\u044b\u0442\u044c
-choose=\u0412\u044b\u0431\u043e\u0440
-color=\u0426\u0432\u0435\u0442
-title=\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a
-go=\u041f\u0435\u0440\u0435\u0439\u0442\u0438
-warning=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435
-error=\u041e\u0448\u0438\u0431\u043a\u0430
-plugins=\u0414\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f
-options=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-defaults=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
-clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c
-rename=\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c
-fret=\u041b\u0430\u0434
-position=\u041f\u043e\u0437\u0438\u0446\u0438\u044f
-name=\u0418\u043c\u044f
-author=\u0410\u0432\u0442\u043e\u0440
-version=\u0412\u0435\u0440\u0441\u0438\u044f
-description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
-info=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
-configure=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
-url=URL
-
-
-file=\u0424\u0430\u0439\u043b
-file.new=\u041d\u043e\u0432\u044b\u0439
-file.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c
-file.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
-file.save-as=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a
-file.save-changes-question=\u0412 \u043c\u0435\u043b\u043e\u0434\u0438\u0438 \u0431\u044b\u043b\u0438 \u0441\u0434\u0435\u043b\u0430\u043d\u044b \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f.\n\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f?
-file.exit=\u0412\u044b\u0445\u043e\u0434
-file.export=\u042d\u043a\u0441\u043f\u043e\u0440\u0442
-file.export-midi=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u0432 MIDI
-file.export-pdf=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u0432 PDF
-file.print=\u041f\u0435\u0447\u0430\u0442\u044c
-file.print-preview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
-file.import=\u0418\u043c\u043f\u043e\u0440\u0442
-file.import-midi=\u0418\u043c\u043f\u043e\u0440\u0442 \u0438\u0437 MIDI
-file.export-ascii=\u042d\u043a\u0441\u043f\u043e\u0440\u0442 \u0432 ASCII
-file.history=\u0418\u0441\u0442\u043e\u0440\u0438\u044f
-file.open-url=\u041e\u0442\u043a\u0440\u044b\u0442\u044c URL
-file.open.error=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0442\u043a\u0440\u044b\u0442\u044c: {0}
-file.save.error=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c: {0}
-file.import.error=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c: {0}
-file.export.error=\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u044d\u043a\u0441\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c: {0}
-
-edit.menu=\u041f\u0440\u0430\u0432\u043a\u0430
-edit.undo=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
-edit.redo=\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c
-edit.copy=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c
-edit.from=\u041e\u0442
-edit.to=\u0414\u043e
-edit.all-tracks=\u0412\u0441\u0435 \u0442\u0440\u0435\u043a\u0438
-edit.paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c
-edit.paste.replace-mode=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432 \u0442\u0435\u043a\u0443\u0449\u0438\u0439 \u0442\u0430\u043a\u0442
-edit.paste.insert-mode=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0432 \u043d\u043e\u0432\u044b\u0439 \u0442\u0430\u043a\u0442
-edit.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
-edit.cut=\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c
-edit.mouse-mode-selection=\u0420\u0435\u0436\u0438\u043c \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u044f
-edit.mouse-mode-edition=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u044b
-edit.not-natural-key=\u0414\u0438\u0435\u0437/\u0411\u0435\u043c\u043e\u043b\u044c
-
-view=\u0412\u0438\u0434
-
-view.layout=\u0424\u043e\u0440\u043c\u0430\u0442
-view.layout.page=\u0424\u043e\u0440\u043c\u0430\u0442 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
-view.layout.linear=\u041b\u0438\u043d\u0435\u0439\u043d\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442
-view.layout.compact=\u041a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u044b\u0439
-view.layout.multitrack=\u041c\u0443\u043b\u044c\u0442\u0438\u0442\u0440\u0435\u043a
-view.layout.chord-style=\u0421\u0442\u0438\u043b\u044c \u0430\u043a\u043a\u043e\u0440\u0434\u0430
-view.layout.chord-name=\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0430\u043a\u043a\u043e\u0440\u0434\u0430
-view.layout.chord-diagram=\u0414\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0430 \u0430\u043a\u043a\u043e\u0440\u0434\u043e\u0432
-view.layout.score-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0443
-view.layout.tablature-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0443
-view.show-mixer=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0438\u043a\u0448\u0435\u0440
-view.show-fretboard=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0433\u0438\u0442\u0430\u0440\u043d\u044b\u0439 \u0433\u0440\u0438\u0444
-view.show-piano=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043a\u043b\u0430\u0432\u0438\u0448\u0438
-view.show-matrix=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u0442\u0440\u0438\u0446\u0443
-view.show-transport=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c
-
-fretboard.right-mode=\u041f\u0440\u0430\u0432\u0448\u0430
-fretboard.left-mode=\u041b\u0435\u0432\u0448\u0430
-fretboard.background-color=\u0426\u0432\u0435\u0442 \u0444\u043e\u043d\u0430
-fretboard.display-note-text=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u043d\u043e\u0442\u0443
-fretboard.display-scale-text=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0433\u0430\u043c\u043c\u0443
-fretboard.font=\u0428\u0440\u0438\u0444\u0442
-fretboard.fretpoint-color=\u0426\u0432\u0435\u0442 \u043b\u0430\u0434\u0430
-fretboard.note-color=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b
-fretboard.scale-note-color=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b \u0433\u0430\u043c\u043c\u044b
-fretboard.settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0433\u0438\u0442\u0430\u0440\u043d\u043e\u0433\u043e \u0433\u0440\u0438\u0444\u0430
-fretboard.string-color=\u0426\u0432\u0435\u0442 \u0441\u0442\u0440\u0443\u043d
-fretboard.settings.options=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-
-piano.editor=\u041a\u043b\u0430\u0432\u0438\u0448\u043d\u044b\u0439 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440
-piano.natural-key-color=\u0426\u0432\u0435\u0442 \u0431\u0435\u043b\u044b\u0445 \u043a\u043b\u0430\u0432\u0438\u0448
-piano.not-natural-key-color=\u0426\u0432\u0435\u0442 \u0447\u0435\u0440\u043d\u044b\u0445 \u043a\u043b\u0430\u0432\u0438\u0448
-piano.note-color=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b
-piano.scale-note-color=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b \u0433\u0430\u043c\u043c\u044b
-piano.settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043a\u043b\u0430\u0432\u0438\u0448
-
-matrix.editor=\u041c\u0430\u0442\u0440\u0438\u0447\u043d\u044b\u0439 \u0440\u0435\u0434\u0430\u043a\u0442\u043e\u0440
-matrix.grids=\u0427\u0438\u0441\u043b\u043e \u0441\u0435\u0442\u043e\u043a
-matrix.border-color=\u0426\u0432\u0435\u0442 \u0440\u0430\u043c\u043a\u0438
-matrix.font=\u0428\u0440\u0438\u0444\u0442
-matrix.foreground-color=\u0426\u0432\u0435\u0442 \u043f\u0435\u0440\u0435\u0434\u043d\u0435\u0433\u043e \u043f\u043b\u0430\u043d\u0430
-matrix.line-color-1=\u0426\u0432\u0435\u0442 \u043d\u0435\u0447\u0451\u0442\u043d\u043e\u0439 \u0441\u0442\u0440\u043e\u043a\u0438
-matrix.line-color-2=\u0426\u0432\u0435\u0442 \u0447\u0451\u0442\u043d\u043e\u0439 \u0441\u0442\u0440\u043e\u043a\u0438
-matrix.line-color-over=\u0426\u0432\u0435\u0442 \u0441\u0442\u0440\u043e\u043a\u0438 \u043f\u043e\u0434 \u043a\u0443\u0440\u0441\u043e\u0440\u043e\u043c
-matrix.note-color=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b
-matrix.play-note-color=\u0426\u0432\u0435\u0442 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0435\u043c\u043e\u0439 \u043d\u043e\u0442\u044b
-matrix.position-color=\u0426\u0432\u0435\u0442 \u043f\u043e\u0437\u0438\u0446\u0438\u0438
-matrix.settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u043c\u0430\u0442\u0440\u0438\u0446\u044b
-
-composition=\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u044f
-composition.timesignature=\u041e\u0442\u043c\u0435\u0442\u043a\u0438 \u0432\u0440\u0435\u043c\u0435\u043d\u0438
-composition.timesignature.Numerator=\u0427\u0438\u0441\u043b\u0438\u0442\u0435\u043b\u044c
-composition.timesignature.denominator=\u0417\u043d\u0430\u043c\u0435\u043d\u0430\u0442\u0435\u043b\u044c
-composition.timesignature.to-the-end=\u0412 \u043a\u043e\u043d\u0435\u0446
-composition.tempo=\u0422\u0435\u043c\u043f
-composition.tempo-percent=\u041f\u0440\u043e\u0446\u0435\u043d\u0442
-composition.tempo.invalid=\u041d\u0435\u043f\u043e\u0434\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u0442\u0435\u043c\u043f
-composition.tempo.start-to-end=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0442\u0435\u043c\u043f \u043a\u043e \u0432\u0441\u0435\u0439 \u043c\u0435\u043b\u043e\u0434\u0438\u0438
-composition.tempo.position-to-end=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0442\u0435\u043c\u043f \u043a \u043a\u043e\u043d\u0446\u0443
-composition.tempo.position-to-next=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0442\u0435\u043c\u043f \u0434\u043e \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0439 \u043c\u0435\u0442\u043a\u0438
-composition.properties=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430
-composition.name=\u0418\u043c\u044f
-composition.artist=\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c
-composition.album=\u0410\u043b\u044c\u0431\u043e\u043c
-composition.author=\u0410\u0432\u0442\u043e\u0440
-composition.tripletfeel=\u0427\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a \u0442\u0440\u0438\u043e\u043b\u044f\u043c
-composition.clef=\u041a\u043b\u044e\u0447
-composition.clef.treble=\u0421\u043a\u0440\u0438\u043f\u0438\u0447\u043d\u044b\u0439
-composition.clef.bass=\u0411\u0430\u0441\u043e\u0432\u044b\u0439
-composition.clef.tenor=\u0422\u0435\u043d\u043e\u0440\u043d\u044b\u0439
-composition.clef.alto=\u0410\u043b\u044c\u0442\u043e\u0432\u044b\u0439
-composition.clef.to-the-end=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043a\u043b\u044e\u0447 \u043a \u043a\u043e\u043d\u0446\u0443
-composition.keysignature=\u041e\u0442\u043c\u0435\u0442\u043a\u0438 \u0437\u043d\u0430\u043a\u043e\u0432
-composition.keysignature.natural=\u041e\u0440\u0438\u0433\u0438\u043d\u0430\u043b
-composition.keysignature.sharp-1=1 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-2=2 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-3=3 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-4=4 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-5=5 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-6=6 \u0434\u0438\u0435\u0437
-composition.keysignature.sharp-7=7 \u0434\u0438\u0435\u0437
-composition.keysignature.flat-1=1 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-2=2 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-3=3 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-4=4 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-5=5 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-6=6 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-7=7 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.to-the-end=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0437\u043d\u0430\u043a \u043a \u043a\u043e\u043d\u0446\u0443
-composition.tripletfeel=\u0427\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a \u0442\u0440\u0438\u043e\u043b\u044f\u043c
-composition.tripletfeel.none=\u0411\u0435\u0437 \u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u0438 \u043a \u0442\u0440\u0438\u043e\u043b\u044f\u043c
-composition.tripletfeel.eighth=\u0422\u0440\u0438\u043e\u043b\u044c \u0432\u043e\u0441\u044c\u043c\u044b\u043c\u0438
-composition.tripletfeel.sixteenth=\u0422\u0440\u0438\u043e\u043b\u044c \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u044b\u043c\u0438
-composition.tripletfeel.to-the-end=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c \u044d\u0442\u0443 \u0442\u0440\u0438\u043e\u043b\u044c \u043a \u043a\u043e\u043d\u0446\u0443
-
-help=\u041f\u043e\u043c\u043e\u0449\u044c
-help.help=\u041f\u043e\u043c\u043e\u0449\u044c
-help.doc=\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f
-help.about=\u041e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435
-help.about.license=\u041b\u0438\u0446\u0435\u043d\u0437\u0438\u044f
-help.about.authors=\u0410\u0432\u0442\u043e\u0440\u044b
-help.about.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435
-
-track=\u0422\u0440\u0435\u043a
-track.number=\u2116
-track.name=\u0418\u043c\u044f
-track.color=\u0426\u0432\u0435\u0442
-track.first=\u041f\u0435\u0440\u0432\u044b\u0439 \u0442\u0440\u0435\u043a
-track.last=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0442\u0440\u0435\u043a
-track.previous=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 \u0442\u0440\u0435\u043a
-track.next=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439 \u0442\u0440\u0435\u043a
-track.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0440\u0435\u043a
-track.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u043a
-track.clone=\u041a\u043b\u043e\u043d\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u043a
-track.move-up=\u0412\u044b\u0448\u0435
-track.move-down=\u041d\u0438\u0436\u0435
-track.instrument=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
-track.properties=\u0421\u0432\u043e\u0439\u0441\u0442\u0432\u0430
-track.properties.general=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435
-track.name.default-percussion-name=\u041f\u0435\u0440\u043a\u0443\u0441\u0441\u0438\u044f
-track.lyrics=\u041b\u0438\u0440\u0438\u043a\u0430
-track.solo=\u0421\u043e\u043b\u043e
-track.mute=\u0417\u0430\u0433\u043b\u0443\u0448\u0438\u0442\u044c
-
-lyric.editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u043b\u0438\u0440\u0438\u043a\u0438
-
-measure=\u0422\u0430\u043a\u0442
-measure.first=\u041f\u0435\u0440\u0432\u044b\u0439 \u0442\u0430\u043a\u0442
-measure.last=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0442\u0430\u043a\u0442
-measure.previous=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 \u0442\u0430\u043a\u0442
-measure.next=\u0421\u043b\u0435\u0434\u0439\u044e\u0449\u0438\u0439 \u0442\u0430\u043a\u0442
-measure.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-measure.add-before-current-position=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442 \u043f\u0435\u0440\u0435\u0434 \u0442\u0435\u043a\u0443\u0449\u0435\u0439 \u043f\u043e\u0437\u0438\u0446\u0438\u0435\u0439
-measure.add-after-current-position=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442 \u043f\u043e\u0441\u043b\u0435 \u0442\u0435\u043a\u0443\u0449\u0435\u0439 \u043f\u043e\u0437\u0438\u0446\u0438\u0438
-measure.add-at-end=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442 \u0432 \u043a\u043e\u043d\u0435\u0446
-measure.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-measure.copy=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0430\u043a\u0442
-measure.paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-measure.clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-
-duration=\u0414\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-duration.whole=\u0426\u0435\u043b\u0430\u044f
-duration.half=\u041f\u043e\u043b\u043e\u0432\u0438\u043d\u043d\u0430\u044f
-duration.quarter=\u0427\u0435\u0442\u0432\u0435\u0440\u0442\u043d\u0430\u044f
-duration.eighth=\u0412\u043e\u0441\u044c\u043c\u0430\u044f
-duration.sixteenth=\u0428\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0430\u044f
-duration.thirtysecond=\u0422\u0440\u0438\u0434\u0446\u0430\u0442\u044c \u0432\u0442\u043e\u0440\u0430\u044f
-duration.sixtyfourth=\u0428\u0435\u0441\u0442\u044c\u0434\u0435\u0441\u044f\u0442 \u0447\u0435\u0442\u0432\u0435\u0440\u0442\u0430\u044f
-duration.dotted=\u0422\u043e\u0447\u043a\u0430
-duration.doubledotted=\u0414\u0432\u043e\u0439\u043d\u0430\u044f \u0442\u043e\u0447\u043a\u0430
-duration.division-type=\u0422\u0443\u043f\u043b\u0435\u0442\u043e
-
-dynamic=\u0414\u0438\u043d\u0430\u043c\u0438\u043a\u0430
-dynamic.piano-pianissimo=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e \u0442\u0438\u0445\u043e
-dynamic.pianissimo=\u041e\u0447\u0435\u043d\u044c \u0442\u0438\u0445\u043e
-dynamic.piano=\u0422\u0438\u0445\u043e
-dynamic.mezzo-piano=\u0421\u0434\u0435\u0440\u0436\u0430\u043d\u043d\u043e
-dynamic.mezzo-forte=\u0423\u043c\u0435\u0440\u0435\u043d\u043d\u043e
-dynamic.forte=\u0413\u0440\u043e\u043c\u043a\u043e
-dynamic.fortissimo=\u041e\u0447\u0435\u043d\u044c \u0433\u0440\u043e\u043c\u043a\u043e
-dynamic.forte-fortissimo=\u041c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u043e \u0433\u0440\u043e\u043c\u043a\u043e
-
-effects=\u042d\u0444\u0444\u0435\u043a\u0442\u044b
-effects.vibrato=\u0412\u0438\u0431\u0440\u0430\u0442\u043e
-effects.bend=\u0411\u044d\u043d\u0434
-effects.deadnote=\u041f\u0440\u0438\u0433\u043b\u0443\u0448\u0435\u043d\u043d\u0430\u044f \u043d\u043e\u0442\u0430
-effects.slide=\u0421\u043b\u0430\u0439\u0434
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=\u0422\u0440\u0435\u043c\u043e\u043b\u043e
-effects.tremolo-bar-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0432\u0438\u0431\u0440\u0430\u0442\u043e
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=\u0412\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f
-effects.ghostnote=\u041f\u043e\u0432\u0442\u043e\u0440 \u043d\u043e\u0442\u044b
-effects.accentuatednote=\u0412\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u043d\u043e\u0442\u0443
-effects.heavyaccentuatednote=\u0421\u0438\u043b\u044c\u043d\u043e \u0430\u043a\u0446\u0435\u043d\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u0430\u044f \u043d\u043e\u0442\u0430
-effects.harmonic=\u041e\u0431\u0435\u0440\u0442\u043e\u043d
-effects.grace=\u041f\u043b\u0430\u0432\u043d\u0430\u044f \u043d\u043e\u0442\u0430
-effects.grace-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u043f\u043b\u0430\u0432\u043d\u043e\u0439 \u043d\u043e\u0442\u044b
-effects.grace.before-beat=\u0414\u043e \u0443\u0434\u0430\u0440\u0430
-effects.grace.on-beat=\u0412\u043e \u0432\u0440\u0435\u043c\u044f \u0443\u0434\u0430\u0440\u0430
-effects.grace.transition=\u041c\u043e\u0434\u0443\u043b\u044f\u0446\u0438\u044f
-effects.grace.transition-none=\u041d\u0438\u0447\u0435\u0433\u043e
-effects.grace.transition-bend=\u0411\u044d\u043d\u0434
-effects.grace.transition-slide=\u0421\u043b\u0430\u0439\u0434
-effects.grace.transition-hammer=\u0425\u0430\u043c\u043c\u0435\u0440
-effects.trill=\u0422\u0440\u0435\u043b\u044c
-effects.trill-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0442\u0440\u0435\u043b\u0438
-effects.tremolo-picking=\u0412\u0438\u0431\u0440\u0430\u0442\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u043e\u0440\u043e\u043c
-effects.tremolo-picking-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0432\u0438\u0431\u0440\u0430\u0442\u043e \u043c\u0435\u0434\u0438\u0430\u0442\u043e\u0440\u043e\u043c
-effects.palm-mute=\u0413\u043b\u0443\u0448\u0435\u043d\u0438\u0435 \u043b\u0430\u0434\u043e\u043d\u044c\u044e
-effects.staccato=\u0421\u0442\u0430\u043a\u043a\u0430\u0442\u043e
-effects.tapping=\u0422\u044d\u043f\u043f\u0438\u043d\u0433
-effects.slapping=\u0421\u043b\u044d\u043f
-effects.popping=Popping
-effects.fade-in=\u041f\u043e\u0441\u0442\u0435\u043f\u0435\u043d\u043d\u043e\u0435 \u043d\u0430\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u0435 \u0437\u0432\u0443\u043a\u0430
-effects.harmonic-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0433\u0430\u0440\u043c\u043e\u043d\u0438\u043a\u0438
-effects.harmonic.type-of-harmonic=\u0422\u0438\u043f \u043e\u0431\u0435\u0440\u0442\u043e\u043d\u0430
-effects.harmonic.natural=\u041e\u0431\u0435\u0440\u0442\u043e\u043d \u043e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u0430
-effects.harmonic.artificial=\u0418\u0441\u043a\u0443\u0441\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0439 \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-effects.harmonic.artificial.key-offset=\u0421\u043c\u0435\u0449\u0435\u043d\u0438\u0435 \u0437\u043d\u0430\u043a\u0430
-effects.harmonic.tapped=Tapped Harmonic
-effects.harmonic.tapped.left-hand=\u041b\u0435\u0432\u0448\u0430
-effects.harmonic.tapped.right-hand=\u041f\u0440\u0430\u0432\u0448\u0430
-effects.harmonic.pinch=\u0417\u0430\u0436\u0438\u043c\u0430\u043d\u0438\u0435 \u043e\u0431\u0435\u0440\u0442\u043e\u043d\u0430
-effects.harmonic.semi=\u041f\u043e\u043b\u0443\u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-
-bend.editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0431\u044d\u043d\u0434\u043e\u0432
-bend.bend=\u0411\u044d\u043d\u0434
-bend.bend-release=\u0411\u044d\u043d\u0434/\u041e\u0442\u043f\u0443\u0441\u0442\u0438\u0442\u044c
-bend.bend-release-bend=\u0411\u044d\u043d\u0434/\u041e\u0442\u043f\u0443\u0441\u0442\u0438\u0442\u044c/\u0411\u044d\u043d\u0434
-bend.prebend=\u041f\u0440\u0435\u0431\u044d\u043d\u0434
-bend.prebend-release=\u041f\u0440\u0435\u0431\u044d\u043d\u0434/\u041e\u0442\u043f\u0443\u0441\u0442\u0438\u0442\u044c
-
-transport=\u041f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c
-transport.start=\u0417\u0430\u043f\u0443\u0441\u043a
-transport.stop=\u0421\u0442\u043e\u043f
-transport.pause=\u041f\u0430\u0443\u0437\u0430
-transport.first=\u041f\u0435\u0440\u0432\u044b\u0439
-transport.last=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439
-transport.previous=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439
-transport.next=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439
-transport.metronome=\u041c\u0435\u0442\u0440\u043e\u043d\u043e\u043c
-transport.mode=\u0412\u0438\u0434 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f
-transport.mode.simple=\u041f\u0440\u043e\u0441\u0442\u043e\u0439 \u0440\u0435\u0436\u0438\u043c
-transport.mode.simple.tempo-percent=\u0422\u0435\u043c\u043f \u0432 \u043f\u0440\u043e\u0446\u0435\u043d\u0442\u0430\u0445
-transport.mode.simple.loop=\u0426\u0438\u043a\u043b\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0435
-transport.mode.trainer=\u0422\u0440\u0435\u043d\u0438\u0440\u043e\u0432\u043e\u0447\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c
-transport.mode.trainer.increment-description=\u0428\u0430\u0433 \u0432
-
-instruments.volume=\u0423\u0441\u0438\u043b\u0438\u0442\u0435\u043b\u044c
-instrument.volume=\u0417\u0432\u0443\u043a
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=\u0411\u0430\u043b\u0430\u043d\u0441
-instrument.free=\u041e\u0441\u0432\u043e\u0431\u043e\u0434\u0438\u0442\u044c
-instrument.link=\u041a\u0430\u043d\u0430\u043b \u0441\u0432\u044f\u0437\u0438
-
-repeat.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043f\u043e\u0432\u0442\u043e\u0440
-repeat.close=\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u043f\u043e\u0432\u0442\u043e\u0440
-repeat.alternative=\u0412\u0430\u0440\u0438\u0430\u043d\u0442\u044b \u043f\u043e\u0432\u0442\u043e\u0440\u0430
-repeat.alternative.editor=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u044b \u043f\u043e\u0432\u0442\u043e\u0440\u0430
-repetitions=\u041f\u043e\u0432\u0442\u043e\u0440\u044b
-repeat.number-of-repetitions=\u0427\u0438\u0441\u043b\u043e \u043f\u043e\u0432\u0442\u043e\u0440\u043e\u0432
-
-beat=\u0411\u0438\u0442
-beat.clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c
-
-note=\u041d\u043e\u0442\u0430
-note.semitone-up=\u0412\u0432\u0435\u0440\u0445 \u043d\u0430 \u043f\u043e\u043b\u0443\u0442\u043e\u043d
-note.semitone-down=\u0412\u043d\u0438\u0437 \u043d\u0430 \u043f\u043e\u043b\u0443\u0442\u043e\u043d
-note.shift-up=\u0421\u0434\u0432\u0438\u043d\u0443\u0442\u044c \u043d\u0430 \u043d\u043e\u0442\u0443 \u043d\u0430\u0432\u0435\u0440\u0445
-note.shift-down=\u0421\u0434\u0432\u0438\u043d\u0443\u0442\u044c \u043d\u0430 \u043d\u043e\u0442\u0443 \u0432\u043d\u0438\u0437
-note.tiednote=\u041b\u0438\u0433\u0430
-note.deadnote=\u041f\u0440\u0438\u0433\u043b\u0443\u0448\u0435\u043d\u043d\u0430\u044f \u043d\u043e\u0442\u0430
-
-insert.chord=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0430\u043a\u043a\u043e\u0440\u0434
-chord.editor=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0430\u043a\u043a\u043e\u0440\u0434
-chord=\u0410\u043a\u043a\u043e\u0440\u0434
-chord.name=\u0418\u043c\u044f
-chord.bass=\u0411\u0430\u0441
-chord.custom=\u041e\u0431\u044b\u0447\u043d\u044b\u0439/\u0441\u0432\u043e\u0439 \u0430\u043a\u043a\u043e\u0440\u0434
-chord.custom.name-empty-error=\u0414\u0430\u043d\u043d\u044b\u0439 \u0430\u043a\u043a\u043e\u0440\u0434 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0434\u0430\u043b\u0435\u043d
-chord.custom.name-exist-error=\u0422\u0430\u043a\u043e\u0439 \u0430\u043a\u043a\u043e\u0440\u0434 \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442
-chord.settings.tip=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-chord.settings.type=\u0422\u0438\u043f
-chord.settings.type.most-common=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435
-chord.settings.type.inversions=\u041e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0430\u043a\u043a\u043e\u0440\u0434\u0430
-chord.settings.type.close-voiced=\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u0432\u043e\u043a\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u0430\u0440\u0442\u0438\u044e
-chord.settings.type.open-voiced=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0432\u043e\u043a\u0430\u043b\u044c\u043d\u0443\u044e \u043f\u0430\u0440\u0442\u0438\u044e
-chord.settings.open-chords=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0430\u043a\u043a\u043e\u0440\u0434\u044b
-chord.settings.chords-to-display=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0430\u043a\u043a\u043e\u0440\u0434\u044b
-chord.settings.search-frets=\u041d\u0430\u0439\u0442\u0438 \u043b\u0430\u0434
-chord.settings.minimum-fret=\u041c\u0438\u043d\u0438\u043c\u0443\u043c
-chord.settings.maximum-fret=\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c
-
-instrument=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
-instrument.instrument=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
-instrument.percussion-track=\u0423\u0434\u0430\u0440\u043d\u044b\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b
-
-tuning=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-tuning.strings=\u0421\u0442\u0440\u0443\u043d\u044b
-tuning.offset=\u0421\u043c\u0435\u0449\u0435\u043d\u0438\u0435
-
-language=\u042f\u0437\u044b\u043a
-replace-file-question=\u0422\u0430\u043a\u043e\u0439 \u0444\u0430\u0439\u043b \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442. \u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?
-choose-color=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0446\u0432\u0435\u0442
-
-settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-settings.config=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 TuxGuitar
-settings.config.language=\u042f\u0437\u044b\u043a
-settings.config.language.choose=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u044f\u0437\u044b\u043a
-settings.config.styles=\u0421\u0442\u0438\u043b\u044c
-settings.config.styles.general=\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0448\u0440\u0438\u0444\u0442
-settings.config.styles.printer=\u0428\u0440\u0438\u0444\u0442 \u043f\u0440\u0438 \u043f\u0435\u0447\u0430\u0442\u0438
-settings.config.styles.font.default=\u0428\u0440\u0438\u0444\u0442 \u043f\u043e-\u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e
-settings.config.styles.font.note=\u0428\u0440\u0438\u0444\u0442 \u043d\u043e\u0442\u044b
-settings.config.styles.font.lyric=\u0428\u0440\u0438\u0444\u0442 \u0432\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0439 \u043b\u0438\u043d\u0438\u0438
-settings.config.styles.font.text=\u0428\u0440\u0438\u0444\u0442 \u0442\u0435\u043a\u0441\u0442\u0430
-settings.config.styles.font.time-signature=\u0428\u0440\u0438\u0444\u0442 \u043e\u0442\u043c\u0435\u0442\u043a\u0438 \u0432\u0440\u0435\u043c\u0435\u043d\u0438
-settings.config.styles.font.printer-default=\u0428\u0440\u0438\u0444\u0442 \u043f\u043e-\u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e \u043f\u0440\u0438 \u043f\u0435\u0447\u0430\u0442\u0438
-settings.config.styles.font.printer-note=\u0428\u0440\u0438\u0444\u0442 \u043d\u043e\u0442\u044b \u043f\u0440\u0438 \u043f\u0435\u0447\u0430\u0442\u0438
-settings.config.styles.font.printer-time-signature=\u0428\u0440\u0438\u0444\u0442 \u043e\u0442\u043c\u0435\u0442\u043a\u0438 \u0432\u0440\u0435\u043c\u0435\u043d\u0438 \u043f\u0440\u0438 \u043f\u0435\u0447\u0430\u0442\u0438
-settings.config.styles.color.score-note=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u044b
-settings.config.styles.color.tab-note=\u0426\u0432\u0435\u0442 \u043d\u043e\u0442\u044b \u0442\u0430\u0431\u0430
-settings.config.styles.color.play-note=\u0426\u0432\u0435\u0442 \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0435\u043c\u043e\u0439 \u043d\u043e\u0442\u044b
-settings.config.apply-changes-question=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0441\u0435\u0439\u0447\u0430\u0441?
-settings.config.sound=\u041f\u0435\u0441\u043d\u044f
-settings.config.main=\u041e\u0441\u043d\u043e\u0432\u043d\u044b\u0435
-settings.config.main.window-title=\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u043e\u043a\u043d\u0430
-settings.config.main.window-title.help=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0437\u0430\u043c\u0435\u043d\u0435\u043d\u044b \u0432 \u0437\u0430\u0433\u043e\u043b\u043e\u0432\u043a\u0435 \u043e\u043a\u043d\u0430:
-settings.config.main.window-title.var.description.appname=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0438\u043c\u044f \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f: TuxGuitar
-settings.config.main.window-title.var.description.appversion=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0432\u0435\u0440\u0441\u0438\u044e TuxGuitar
-settings.config.main.window-title.var.description.filename=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0438\u043c\u044f \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430
-settings.config.main.window-title.var.description.filepath=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u043f\u0443\u0442\u044c \u043a \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c\u0443 \u0444\u0430\u0439\u043b\u0443
-settings.config.main.window-title.var.description.songname=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0438\u043c\u044f \u043c\u0435\u043b\u043e\u0434\u0438\u0438
-settings.config.main.window-title.var.description.songauthor=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0430\u0432\u0442\u043e\u0440\u0430 \u043c\u0435\u043b\u043e\u0434\u0438\u0438
-settings.config.main.window-title.var.description.songalbum=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0430\u043b\u044c\u0431\u043e\u043c \u043c\u0435\u043b\u043e\u0434\u0438\u0438
-settings.config.main.window-title.var.description.songartist=\u042d\u0442\u0430 \u043f\u0435\u0440\u0435\u043c\u0435\u043d\u043d\u0430\u044f \u043f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044f \u043c\u0435\u043b\u043e\u0434\u0438\u0438
-settings.config.main.options=\u041e\u043f\u0446\u0438\u0438
-settings.config.main.splash-enabled=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0437\u0430\u0441\u0442\u0430\u0432\u043a\u0443 \u043f\u0440\u0438 \u0437\u0430\u043f\u0443\u0441\u043a\u0435
-settings.config.main.table.auto-size.enabled=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0440\u0430\u0437\u043c\u0435\u0440\u0430 \u043e\u043a\u043d\u0430
-settings.config.styles.color.lines=\u0426\u0432\u0435\u0442 \u0433\u043e\u0440\u0438\u0437\u043e\u043d\u0442\u0430\u043b\u044c\u043d\u044b\u0445 \u043b\u0438\u043d\u0438\u0439
-settings.config.toolbars=\u041f\u0430\u043d\u0435\u043b\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432
-settings.config.toolbars.tip=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0412\u0430\u0448\u0438 \u043f\u0430\u043d\u0435\u043b\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432
-settings.config.toolbars.list=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 \u043f\u0430\u043d\u0435\u043b\u0438 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u043e\u0432
-settings.config.toolbars.move-up=\u0412\u044b\u0448\u0435
-settings.config.toolbars.move-down=\u041d\u0438\u0436\u0435
-settings.config.skin=\u0421\u043a\u0438\u043d\u044b
-settings.config.skin.choose=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0432\u043e\u0439 \u0441\u043a\u0438\u043d
-settings.keybindings=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f \u043a\u043b\u0430\u0432\u0438\u0448
-
-key-bindings-editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u0439 \u043a\u043b\u0430\u0432\u0438\u0448
-key-bindings-editor-action-select=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435
-key-bindings-editor-action-column=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f
-key-bindings-editor-shortcut-column=\u041a\u043b\u0430\u0432\u0438\u0448\u0438
-key-bindings-editor-push-a-key=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 \u043a\u043b\u0430\u0432\u0438\u0448\u0443
-key-bindings-editor-save-question=\u0418\u043c\u0435\u044e\u0442\u0441\u044f \u043d\u0435 \u0441\u043e\u0445\u0440\u0430\u043d\u0451\u043d\u043d\u044b\u0435 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f, \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u0439\u0442\u0438 \u0431\u0435\u0437 \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f?
-
-key-bindings-editor-override=\u042d\u0442\u0430 \u043a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u044f \u0443\u0436\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f! \u0412\u044b \u0443\u0432\u0435\u0440\u0435\u043d\u044b, \u0447\u0442\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0435\u0451 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c?
-
-print.print=\u041f\u0435\u0447\u0430\u0442\u044c
-print.dialog=\u041f\u0435\u0447\u0430\u0442\u044c
-print.service=\u0421\u043b\u0443\u0436\u0431\u0430
-print.service.name=\u0418\u043c\u044f
-print.service.status=\u0421\u0442\u0430\u0442\u0443\u0441
-print.service.type=\u0422\u0438\u043f
-print.service.info=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f
-print.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d
-print.range.all-pages=\u0412\u0441\u0451
-print.range.pages=\u0421\u0442\u0440\u0430\u043d\u0438\u0446\u044b
-print.range.pages-to=\u0414\u043e
-print.copies=\u041a\u043e\u043f\u0438\u0438
-print.copies-number=\u0427\u0438\u0441\u043b\u043e \u043a\u043e\u043f\u0438\u0439
-print.print-to-file=\u041f\u0435\u0447\u0430\u0442\u044c \u0432 \u0444\u0430\u0439\u043b
-print.file-chooser=\u0412\u044b\u0431\u043e\u0440
-print-header.default-song-name=\u0411\u0435\u0437 \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044f
-print-header.default-song-author=\u041d\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043d\u044b\u0439 \u0430\u0432\u0442\u043e\u0440
-
-print.preview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
-print.preview.page-of=\u041e\u0442
-
-marker=\u041c\u0435\u0442\u043a\u0430
-marker.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043c\u0435\u0442\u043a\u0443
-marker.list=\u0421\u043f\u0438\u0441\u043e\u043a \u043c\u0435\u0442\u043e\u043a
-marker.first=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0435\u0440\u0432\u043e\u0439 \u043c\u0435\u0442\u043a\u0435
-marker.last=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0439 \u043c\u0435\u0442\u043a\u0435
-marker.next=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0439 \u043c\u0435\u0442\u043a\u0435
-marker.previous=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0439 \u043c\u0435\u0442\u043a\u0435
-
-export.tablature-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0443
-export.score-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0443
-export.chord-name-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043d\u0430\u0437\u0432\u0430\u043d\u0438\u044f \u0430\u043a\u043a\u043e\u0440\u0434\u043e\u0432
-export.chord-diagram-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0441\u0445\u0435\u043c\u044b \u0430\u043a\u043a\u043e\u0440\u0434\u043e\u0432
-
-scale=\u0421\u0442\u0440\u043e\u0439
-scale.list=\u0421\u043f\u0438\u0441\u043e\u043a \u0441\u0442\u0440\u043e\u0435\u0432
-
-text.insert=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0435\u043a\u0441\u0442
-text.editor=\u0420\u0435\u0434\u0430\u043a\u0442\u043e\u0440 \u0442\u0435\u043a\u0441\u0442\u0430
-text.text=\u0422\u0435\u043a\u0441\u0442
-
-tools=\u0418\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u044b
-tools.scale=\u0421\u043f\u0438\u0441\u043e\u043a \u0441\u0442\u0440\u043e\u0435\u0432
-tools.browser=\u0411\u0440\u0430\u0443\u0437\u0435\u0440
-tools.plugins=\u0414\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f
-tools.shortcuts=\u041a\u043e\u043c\u0431\u0438\u043d\u0430\u0446\u0438\u0438 \u043a\u043b\u0430\u0432\u0438\u0448
-tools.settings=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-
-browser.dialog=\u0411\u0440\u0430\u0443\u0437\u0435\u0440
-browser.menu.file=\u0424\u0430\u0439\u043b
-browser.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c
-browser.exit=\u0412\u044b\u0445\u043e\u0434
-browser.menu.collection=\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044f
-browser.menu.go=\u041f\u0435\u0440\u0435\u0439\u0442\u0438
-browser.collection.select=\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044e
-browser.collection.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c
-browser.collection.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c
-browser.collection.close=\u0417\u0430\u043a\u0440\u044b\u0442\u044c
-browser.collection.new=\u041d\u043e\u0432\u044b\u0439
-browser.go-root=\u0414\u043e\u043c\u043e\u0439
-browser.go-back=\u041d\u0430\u0437\u0430\u0434
-browser.refresh=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c
-browser.factory.fs.name=\u0424\u0430\u0439\u043b\u043e\u0432\u0430\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u0430
-browser.collection.fs.name=\u0418\u043c\u044f
-browser.collection.fs.path=\u0414\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044f
-browser.collection.fs.editor-title=\u041a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u044f \u043d\u0430 \u0424\u0421
-browser.collection.fs.editor-tip=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e \u0441 \u0412\u0430\u0448\u0435\u0439 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0435\u0439
-browser.collection.fs.invalid-path=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u0432\u0435\u0440\u043d\u0443\u044e \u0434\u0438\u0440\u0435\u043a\u0442\u043e\u0440\u0438\u044e
-
-midi.port=MIDI \u043f\u043e\u0440\u0442
-midi.sequencer=MIDI \u0441\u0438\u043d\u0442\u0435\u0437\u0430\u0442\u043e\u0440
-
-plugin.unknown-value=\u041d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d
-plugin.column.name=\u0418\u043c\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f
-plugin.column.enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=\u0424\u0430\u0439\u043b
-edit.items=\u041f\u0440\u0430\u0432\u043a\u0430
-property.items=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430
-track.items=\u0422\u0440\u0435\u043a
-duration.items=\u0414\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-note.items=\u041d\u043e\u0442\u0430
-composition.items=\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u044f
-repeat.items=\u041f\u043e\u0432\u0442\u043e\u0440
-transport.items=\u041f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c
-marker.items=\u041c\u0435\u0442\u043a\u0438
-insert.items=\u0412\u0441\u0442\u0430\u0432\u043a\u0430
-layout.items=\u0424\u043e\u0440\u043c\u0430\u0442
-view.items=\u0412\u0438\u0434
-effect.items=\u042d\u0444\u0444\u0435\u043a\u0442\u044b
-dynamic.items=\u0414\u0438\u043d\u0430\u043c\u0438\u043a\u0430
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=\u041d\u043e\u0432\u044b\u0439 \u0444\u0430\u0439\u043b
-action.file.open=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u0444\u0430\u0439\u043b
-action.file.open-url=\u041e\u0442\u043a\u0440\u044b\u0442\u044c URL
-action.file.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
-action.file.save-as=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a
-action.file.print=\u041f\u0435\u0447\u0430\u0442\u044c
-action.file.print-preview=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440
-action.file.exit=\u0412\u044b\u0439\u0442\u0438 \u0438\u0437 TuxGuitar
-action.edit.undo=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c
-action.edit.redo=\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c
-action.composition.change-time-signature=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043e\u0442\u043c\u0435\u0442\u043a\u0443 \u0432\u0440\u0435\u043c\u0435\u043d\u0438
-action.composition.change-tempo=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0442\u0435\u043c\u043f
-action.composition.change-info=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u043c\u0435\u043b\u043e\u0434\u0438\u0438
-action.composition.change-clef=Change Clef
-action.composition.change-key-signature=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043e\u0442\u043c\u0435\u0442\u043a\u0443 \u0437\u043d\u0430\u043a\u0430
-action.composition.change-triplet-feel=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0447\u0443\u0432\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u043a \u0442\u0440\u0438\u043e\u043b\u044f\u043c
-action.view.layout-set-page=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0444\u043e\u0440\u043c\u0430\u0442 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
-action.view.layout-set-linear=\u041b\u0438\u043d\u0435\u0439\u043d\u044b\u0439 \u0444\u043e\u0440\u043c\u0430\u0442
-action.view.layout-set-multitrack=\u041c\u0443\u043b\u044c\u0442\u0438\u0442\u0440\u0435\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0436\u0438\u043c
-action.view.layout-set-score-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0443
-action.view.layout-set-tablature-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0443
-action.view.layout-set-compact=\u041a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c
-action.view.layout-set-chord-diagram-enabled=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0434\u0438\u0430\u0433\u0440\u0430\u043c\u043c\u0443 \u0430\u043a\u043a\u043e\u0440\u0434\u043e\u0432
-action.view.layout-set-chord-name-enabled=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u043c\u0435\u043d\u0430 \u0430\u043a\u043a\u043e\u0440\u0434\u043e\u0432
-action.view.show-fretboard=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0433\u0438\u0442\u0430\u0440\u043d\u044b\u0439 \u0433\u0440\u0438\u0444
-action.view.show-piano=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043a\u043b\u0430\u0432\u0438\u0448\u0438
-action.view.show-matrix=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0430\u0442\u0440\u0438\u0446\u0443
-action.view.show-mixer=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043c\u0438\u043a\u0448\u0435\u0440
-action.view.show-transport=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044c
-action.track.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0440\u0435\u043a
-action.track.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u043a
-action.track.clone=\u041a\u043b\u043e\u043d\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u043a
-action.track.go-first=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0435\u0440\u0432\u043e\u043c\u0443 \u0442\u0440\u0435\u043a\u0443
-action.track.go-last=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u043c\u0443 \u0442\u0440\u0435\u043a\u0443
-action.track.go-next=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u0442\u0440\u0435\u043a\u0443
-action.track.go-previous=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u043c\u0443 \u0442\u0440\u0435\u043a\u0443
-action.track.lyrics=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043b\u0438\u0440\u0438\u043a\u0443 \u0442\u0440\u0435\u043a\u0430
-action.track.properties=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0432\u043e\u0439\u0441\u0442\u0432\u0430 \u0442\u0440\u0435\u043a\u0430
-action.track.move-down=\u041d\u0438\u0436\u0435
-action.track.move-up=\u0412\u044b\u0448\u0435
-action.measure.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-action.measure.remove=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-action.measure.copy=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0442\u0430\u043a\u0442
-action.measure.paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-action.measure.clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0442\u0430\u043a\u0442
-action.measure.go-first=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0435\u0440\u0432\u044b\u0439 \u0442\u0430\u043a\u0442\u0443
-action.measure.go-last=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u043c\u0443 \u0442\u0430\u043a\u0442\u0443
-action.measure.go-next=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u0442\u0430\u043a\u0442\u0443
-action.measure.go-previous=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u043c\u0443 \u0442\u0430\u043a\u0442\u0443
-action.note.general.clean-beat=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0440\u0438\u0442\u043c
-action.note.general.decrement-semitone=\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u043f\u043e\u043b\u0443\u0442\u043e\u043d
-action.note.general.increment-semitone=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043f\u043e\u043b\u0443\u0442\u043e\u043d
-action.note.general.shift-down=\u0421\u0434\u0432\u0438\u0433 \u0432\u043d\u0438\u0437
-action.note.general.shift-up=\u0421\u0434\u0432\u0438\u0433 \u0432\u0432\u0435\u0440\u0445
-action.note.general.tied=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043b\u0438\u0433\u0443
-action.note.duration.set-whole=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0446\u0435\u043b\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.set-half=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u043e\u0432\u0438\u043d\u043d\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.set-quarter=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0447\u0435\u0442\u0432\u0435\u0440\u0442\u043d\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.set-eighth=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0432\u043e\u0441\u044c\u043c\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.set-sixteenth=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0448\u0435\u0441\u0442\u043d\u0430\u0434\u0446\u0430\u0442\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.set-thirty-second=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0442\u0440\u0438\u0434\u0446\u0430\u0442\u044c \u0432\u0442\u043e\u0440\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.set-sixty-fourth=\u0423\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0448\u0435\u0441\u0442\u044c\u0434\u0435\u0441\u044f\u0442 \u0447\u0435\u0442\u0432\u0451\u0440\u0442\u0443\u044e \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.change-dotted=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u043e\u0447\u043a\u0443
-action.note.duration.change-double-dotted=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0432\u043e\u0439\u043d\u0443\u044e \u0442\u043e\u0447\u043a\u0443
-action.note.duration.change-division-type=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0443\u043f\u043b\u0435\u0442\u043e
-action.note.duration.decrement-duration=\u0423\u043c\u0435\u043d\u044c\u0448\u0438\u0442\u044c \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.duration.increment-duration=\u0423\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u0434\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c
-action.note.effect.change-vibrato=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0438\u0431\u0440\u0430\u0442\u043e
-action.note.effect.change-bend=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0431\u044d\u043d\u0434
-action.note.effect.change-slide=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043b\u0430\u0439\u0434
-action.note.effect.change-hammer=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c hammer-on/pull-off
-action.note.effect.change-accentuated=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0430\u043a\u0446\u0435\u043d\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
-action.note.effect.change-=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0443\u0448\u0435\u043d\u043d\u0443\u044e \u043d\u043e\u0442\u0443
-action.note.effect.change-fade-in=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u0441\u0442\u0435\u043f\u0435\u043d\u043d\u043e\u0435 \u043d\u0430\u0440\u0430\u0441\u0442\u0430\u043d\u0438\u0435 \u0437\u0432\u0443\u043a\u0430
-action.note.effect.change-ghost=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043d\u043e\u0442\u0443-\u043f\u0440\u0438\u0437\u0440\u0430\u043a\u0430
-action.note.effect.change-grace=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043b\u0430\u0432\u043d\u0443\u044e \u043d\u043e\u0442\u0443
-action.note.effect.change-harmonic=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0433\u0430\u0440\u043c\u043e\u043d\u0438\u043a\u0443
-action.note.effect.change-heavy-accentuated=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0438\u043b\u044c\u043d\u043e\u0435 \u0430\u043a\u0446\u0435\u043d\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435
-action.note.effect.change-palm-mute=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0433\u043b\u0443\u0448\u0435\u043d\u0438\u0435 \u043b\u0430\u0434\u043e\u043d\u044c\u044e
-action.note.effect.change-popping=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c popping
-action.note.effect.change-slapping=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043b\u044d\u043f
-action.note.effect.change-staccato=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0430\u043a\u043a\u0430\u0442\u043e
-action.note.effect.change-tapping=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u044d\u043f\u043f\u0438\u043d\u0433
-action.note.effect.change-tremolo-bar=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u043c\u043e\u043b\u043e
-action.note.effect.change-tremolo-picking=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c tremolo picking
-action.note.effect.change-trill=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c/\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u0440\u0435\u043b\u044c
-action.insert.open-repeat=\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043f\u043e\u0432\u0442\u043e\u0440
-action.insert.close-repeat=\u0417\u0430\u043a\u0440\u044b\u0442\u044c \u043f\u043e\u0432\u0442\u043e\u0440
-action.insert.repeat-alternative=Repeat Alternative
-action.insert.chord=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0430\u043a\u043a\u043e\u0440\u0434
-action.insert.text=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0442\u0435\u043a\u0441\u0442
-action.marker.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043c\u0435\u0442\u043a\u0443
-action.marker.go-next=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0439 \u043c\u0435\u0442\u043a\u0435
-action.marker.go-previous=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u043f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0439 \u043c\u0435\u0442\u043a\u0435
-action.transport.play=\u041f\u0440\u043e\u0438\u0433\u0440\u0430\u0442\u044c \u043c\u0435\u043b\u043e\u0434\u0438\u044e
-action.transport.stop=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u043d\u0438\u0435
-action.transport.mode=\u0420\u0435\u0436\u0438\u043c \u043f\u0440\u043e\u0438\u0433\u0440\u044b\u0432\u0430\u0442\u0435\u043b\u044f
-action.transport.metronome=\u041c\u0435\u0442\u0440\u043e\u043d\u043e\u043c
-action.tools.browser=\u0411\u0440\u0430\u0443\u0437\u0435\u0440
-action.settings.configure=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438
-action.help.doc=\u041f\u043e\u043c\u043e\u0449\u044c
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_sr.properties b/TuxGuitar-testing/platform-all/share/lang/messages_sr.properties
deleted file mode 100644
index 2046a33e..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_sr.properties
+++ /dev/null
@@ -1,618 +0,0 @@
-ok=Ok
-cancel=Otka\u017ei
-yes=Da
-no=Ne
-add=Dodaj
-edit=Obrada
-remove=Ukloni
-save=Snimi
-exit=Izlaz
-choose=Biraj
-color=Boja
-title=Naslov
-go=Idi
-warning=Upozorenje
-error=gre\u0161ka
-plugins=Plugini
-options=Opcije
-defaults=Default
-clean=O\u010disti
-rename=Promeni ime
-fret=Prag
-position=Pozicija
-info=Info
-name=Naziv
-author=Autor
-version=Verzija
-description=Opis
-configure=Konfiguri\u0161i
-close=Zatvori
-
-tuxguitar.title=Tux-Guitar
-
-file=Datoteka
-file.new=Nova
-file.open=Otvori
-file.open-url=Otvori URL
-file.open.error=Ne mogu da otvorim: {0}
-file.save=Snimi
-file.save-as=Snimi kao
-file.save.error=Ne mogu da snimim: {0}
-file.save-changes-question=Izmene koje ste izvr\u0161ili nisu snimljene.\n\u017delite li da ih snimite?
-file.exit=Iza\u0111i
-file.export=Eksportuj
-file.export-midi=Midi eksport
-file.export-pdf=PDF eksport
-file.print=\u0160tampaj
-file.print-preview=Pregled pre \u0161tampe
-file.import=Import
-file.import.error=Ne mogu da importujem: {0}
-file.import-midi=Midi import
-file.export-ascii=Snimi kao tekst
-file.export.error=Ne mogu da eksportujem: {0}
-file.history=Istorija
-file.overwrite-question=Navedena datoteka ve\u0107 postoji, da li \u017eelite da je prepi\u0161ete??
-
-edit.menu=Obrada
-edit.undo=Undo
-edit.redo=Redo
-edit.copy=Kopiraj
-edit.from=Od
-edit.to=Do
-edit.all-tracks=Sve staze
-edit.paste=Zalepi
-edit.paste.replace-mode=Zalepi u teku\u0107i takt
-edit.paste.insert-mode=Zalepi u novi takt
-edit.delete=Obri\u0161i
-edit.cut=Izre\u017ei
-edit.mouse-mode-selection=Re\u017eim selekcije
-edit.mouse-mode-edition=Re\u017eim prepravljanja
-edit.not-natural-key=Re\u017eim povisilica-snizilica
-
-view=Pregled
-
-view.layout=Izgled
-view.layout.page=Pregled strane
-view.layout.linear=Pregled u liniji
-view.layout.multitrack=Vi\u0161e instrumenata
-view.layout.compact=Kompaktan prikaz
-view.layout.chord-style=Prikaz akorda
-view.layout.chord-name=Naziv akorda
-view.layout.chord-diagram=Dijagram akorda
-view.layout.tablature-enabled=Prika\u017ei tablaturu
-view.layout.score-enabled=Prika\u017ei note
-
-view.show-transport=Prika\u017ei navigator
-view.show-matrix=Prika\u017ei Matricu
-view.show-mixer=Prika\u017ei mikser
-view.show-fretboard=Prika\u017ei gitaru
-view.show-piano=Prika\u017ei klavir
-
-fretboard.right-mode=Desnoruka
-fretboard.left-mode=Levoruka
-fretboard.background-color=Boja pozadine
-fretboard.display-note-text=Tekst prikaza note
-fretboard.display-scale-text=Tekst prikaza skale
-fretboard.font=Font
-fretboard.fretpoint-color=Boja praga
-fretboard.note-color=Boja note
-fretboard.scale-note-color=Boja skale
-fretboard.settings=Pode\u0161avanje prikaza gitare
-fretboard.string-color=Boja \u017eice
-fretboard.settings.options=Opcije
-
-piano.natural-key-color=Boja belih dirki
-piano.not-natural-key-color=Boja crnih dirki
-piano.note-color=Boja note
-piano.scale-note-color=Boja skale
-piano.settings=Pode\u0161avanje klavira
-
-matrix.editor=Editor Matrice
-matrix.grids=Broj separatora
-matrix.border-color=Boja ivice
-matrix.font=Font
-matrix.foreground-color=Boja radne povr\u0161ine
-matrix.line-color-1=Boja linije 1
-matrix.line-color-2=Boja linije 2
-matrix.line-color-over=Boja teku\u0107eg instrumenta
-matrix.note-color=Boja note
-matrix.play-note-color=Boja teku\u0107e note
-matrix.position-color=Boja pozicije
-matrix.settings=Podesi izgled Matrice
-
-transport=Pesma
-transport.start=Sviraj
-transport.stop=Zaustavi
-transport.first=Prvi
-transport.last=Poslednji
-transport.previous=Prethodni
-transport.next=Slede\u0107i
-transport.pause=Pauza
-transport.mode=Re\u017eim pu\u0161tanja
-transport.mode.simple=Pusti celu pesmu
-transport.mode.simple.tempo-percent=Brzina pu\u0161tanja
-transport.mode.simple.loop=Pu\u0161taj pesmu u krug
-transport.mode.trainer=Trening brzine
-transport.mode.trainer.increment-description=Ubrzavaj svaki takt
-
-
-composition=Kompozicija
-composition.timesignature=Vrsta takta
-composition.timesignature.Numerator=Brojilac takta
-composition.timesignature.denominator=Imenilac takta
-composition.timesignature.to-the-end=Do kraja
-composition.tempo=Tempo
-composition.tempo-percent=U procentima
-composition.properties=Informacije o pesmi
-composition.name=Naziv
-composition.artist=Interpretacija
-composition.album=Album
-composition.author=Autor
-composition.tempo.invalid=Pogre\u0161an tempo
-composition.tripletfeel=Utisak tripleta
-
-help=Pomo\u0107
-help.help=Pomo\u0107
-help.about=TuxGuitar
-help.doc=Dokumentacija
-
-instruments.volume=Volume
-instrument.volume=Volume
-instrument.channel=Kanal
-instrument.effect-channel=Ef.kanal
-instrument.balance=Levo-desno
-instrument.free=slobodan
-instrument.link=povezan
-
-track=Staza
-track.number=Br.
-track.name=Naziv
-track.color=Boja
-track.first=Prva staza
-track.last=Poslednja staza
-track.previous=Prethodna staza
-track.next=Slede\u0107a staza
-track.add=Dodaj stazu
-track.remove=Ukloni stazu
-track.instrument=Instrument
-track.instrument.empty=Nije prona\u0111en MIDI soundbank, probajte da opet kompajlirate tuxguitar u va\u0161oj verziji jave.
-track.properties=Osobine
-track.properties.general=Osnovno
-track.name.default-percussion-name=Bubnjevi i perkusije
-track.lyrics=Tekst na stazi
-track.solo=Solo
-track.mute=Isklju\u010di
-
-lyric.editor=Pisanje stihova
-
-measure=Takt
-measure.first=Prvi takt
-measure.last=Poslednji takt
-measure.previous=Prethodni takt
-measure.next=Sledeci takt
-measure.add=Dodaj takt
-measure.add-before-current-position=Dodaj takt pre teku\u0107e pozicije
-measure.add-after-current-position=Dodaj takt posle teku\u0107e pozicije
-measure.add-at-end=Dodaj takt na kraj
-measure.remove=Obri\u0161i takt
-measure.copy=Kopiraj takt
-measure.paste=Zalepi takt
-measure.clean=Obri\u0161i sve iz takta
-
-duration=Trajanje
-duration.whole=Cela
-duration.half=Polovina
-duration.quarter=\u010cetvrtina
-duration.eighth=Osmina
-duration.sixteenth=\u0160esnaestina
-duration.thirtysecond=Trideset-dvojka
-duration.sixtyfourth=\u0160esdeset-\u010detvrtina
-duration.dotted=Sa ta\u010dkom
-duration.doubledotted=Sa dve ta\u010dke
-duration.division-type=Triplet
-
-dynamic=Dinamika
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=Efekti
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=Mrtva nota
-effects.slide=Slajd
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Tremolo ru\u010dka
-effects.tremolo-bar-editor=Tremolo Editor
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release up
-effects.tremolo-bar.release-down=Release down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Tiha nota
-effects.accentuatednote=Nagla\u0161ena nota
-effects.heavyaccentuatednote=Veoma nagla\u0161ena nota
-effects.harmonic=Harmonik
-effects.grace=Gratis nota
-effects.grace-editor=Editor Gratis Note
-effects.grace.before-beat=Pre udarca
-effects.grace.on-beat=Tokom udarca
-effects.grace.transition=Vrsta
-effects.grace.transition-none=Obi\u010dna
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slajd
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Trill Editor
-effects.tremolo-picking=Tremolo trzanje
-effects.tremolo-picking-editor=Editor Tremolo Trzanja
-effects.palm-mute=Palm Mute
-effects.staccato=Odse\u010dno (staccato)
-effects.tapping=Taping
-effects.slapping=Slep (bas)
-effects.popping=Pop (bas)
-effects.fade-in=Fade in
-effects.harmonic-editor=Editor Harmonika
-effects.harmonic.type-of-harmonic=Tip harmonika
-effects.harmonic.natural=Prirodni harmonik
-effects.harmonic.artificial=Ve\u0161ta\u010dki harmonik
-effects.harmonic.artificial.key-offset=Ton razlika
-effects.harmonic.tapped=Taping harmonik
-effects.harmonic.tapped.left-hand=Leva ruka
-effects.harmonic.tapped.right-hand=Desna ruka
-effects.harmonic.pinch=Pinch harmonik
-effects.harmonic.semi=Polu-harmonik
-
-bend.editor=Bend Editor
-bend.bend=Bend
-bend.bend-release=bend/release
-bend.bend-release-bend=bend/release/bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-repeat.open=Otvori ponavljanje
-repeat.close=Zatvori ponavljanje
-repetitions=Ponavljanja
-repeat.number-of-repetitions=Broj ponavljanja
-repeat.alternative=Alternativni zavr\u0161eci
-repeat.alternative.editor=Defini\u0161i alternativne zavr\u0161etke
-
-beat=Nota
-beat.clean=O\u010disti notu
-
-note.semitone-up=Poluton vi\u0161lje
-note.semitone-down=Poluton ni\u017ee
-note.shift-up=Na \u017eicu gore
-note.shift-down=Na \u017eicu dole
-note.tiednote=Ligatura
-note.deadnote=Mrtva nota
-
-insert.chord=Ubaci akord
-chord.editor=Editor akorda
-chord=Akord
-chord.name=Naziv akorda
-chord.custom.name-empty-error=Naziv akorda ne mo\u017ee biti prazan.
-chord.custom.name-exist-error=Naziv akorda vec postoji.
-chord.bass=Bas
-chord.custom=Podesi parametre
-chord.settings.tip=Custom Settings
-chord.settings.type=Tip
-chord.settings.type.most-common=Obi\u010dni
-chord.settings.type.inversions=Inverzije
-chord.settings.type.close-voiced=Blok akordi
-chord.settings.type.open-voiced="Voicing"
-chord.settings.open-chords=Otvoreni akordi
-chord.settings.chords-to-display=Filtriraj koliko akorda
-chord.settings.search-frets=Pretra\u017euj pragove
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=Staza za perkusije
-
-tuning=Stim
-tuning.strings=Broj \u017eica
-tuning.offset=Pomeraj \u0161tima (u polutonovima)
-
-language=Jezik
-
-choose-color=Izaberite boju
-
-
-settings=Pode\u0161avanja
-settings.config=TuxGuitar konfiguracija
-settings.config.view=Pregled
-settings.config.view.mode=Na\u010din pregleda
-settings.config.view.size=Veli\u010dina prozora
-settings.config.view.size.maximized=Preko celog ekrana
-settings.config.view.size.width=\u0160irina
-settings.config.view.size.height=Visina
-settings.config.language=Jezik
-settings.config.language.choose=Izaberite jezik
-settings.config.styles=Izgled
-settings.config.styles.font.default=Glavni font
-settings.config.styles.font.note=Font za note
-settings.config.styles.font.time-signature=Font za oznaku takta
-settings.config.styles.font.printer-default=Font za \u0161tampanje
-settings.config.styles.font.printer-note=Font za \u0161tampanje nota
-settings.config.styles.font.printer-time-signature=Font za \u0161tampanje oznake takta
-settings.config.styles.color.score-note=Boja nota
-settings.config.styles.color.tab-note=Boja tablatura
-settings.config.styles.color.play-note=Boja sviraju\u0107e note
-settings.config.styles.general=Stilovi prikaza
-settings.config.styles.printer=Stilovi \u0161tampanja
-settings.config.styles.font.lyric=Font za tekst pesme
-settings.config.styles.font.text=Font za tekst
-settings.config.apply-changes-question=Da li \u017eelite da primenite na\u010dinjene promene?
-settings.config.sound=Zvuk
-settings.config.sound.soundbank=Soundbank (Banka zvukova)
-settings.config.sound.default-soundbank=Koristi default Soundbank
-settings.config.sound.custom-soundbank=Navedi drugi Soundbank
-settings.config.sound.soundbank-restart-message=Morate restartovati TuxGuitar da bi se promenio Soundbank
-settings.config.main=Program
-settings.config.main.window-title=Naslov aplikacije
-settings.config.main.window-title.help=Slede\u0107e promenljive su na raspolaganju:
-settings.config.main.window-title.var.description.appname=Predstavlja naziv aplikacije: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Predstavlja trenutnu verziju TuxGuitar
-settings.config.main.window-title.var.description.filename=Predstavlja naziv otvorene datoteke
-settings.config.main.window-title.var.description.filepath=Predstavlja putanju do otvorene datoteke
-settings.config.main.window-title.var.description.songname=Predstavlja naziv teku\u0107e pesme
-settings.config.main.window-title.var.description.songauthor=Predstavlja autora teku\u0107e pesme
-settings.config.main.window-title.var.description.songalbum=Predstavlja album teku\u0107e pesme
-settings.config.main.window-title.var.description.songartist=Predstavlja interpretatora teku\u0107e pesme
-settings.config.main.table.auto-size.enabled=Uklju\u010di automatsku veli\u010dinu tabele
-settings.config.main.options=Opcije
-settings.config.main.splash-enabled=Prika\u017ei uvodni ekran prilikom pokretanja
-settings.config.styles.color.lines=Boja horizontalnih linija
-settings.config.toolbars=Toolbar
-settings.config.toolbars.tip=Preuredite Toolbar
-settings.config.toolbars.list=Dostupni Toolbar-ovi
-settings.config.toolbars.move-up=Pomeri gore
-settings.config.toolbars.move-down=Pomeri dole
-settings.config.skin=Skinovi
-settings.config.skin.choose=Izaberite skin
-
-
-soundbank.error=Soundbank gre\u0161ka
-soundbank.error.unavailable=Soundbank (banka zvukova) nije dostupna.
-soundbank.error.custom=Gre\u0161ka prilikom otvaranja navedenog soundbank-a (banke zvukova).
-
-settings.keybindings=Pre\u010dice na tastaturi
-key-bindings-editor=Editor Pre\u010dica
-key-bindings-editor-action-select=Izaberi akciju
-key-bindings-editor-action-column=Akcije
-key-bindings-editor-shortcut-column=Tastatura
-key-bindings-editor-push-a-key=Kombinacija?
-key-bindings-editor-save-question=Postoje izmene koje nisu snimljene, izlazite bez snimanja?
-
-key-bindings-editor-override=Pre\u010dica se vec koristi! Da li ste sigurni?
-
-
-
-print.print=\u0160tampanje
-print.dialog=\u0160tampanje
-print.service=Servis
-print.service.name=Naziv
-print.service.status=Status
-print.service.type=Tip
-print.service.info=Info
-print.range=Opseg
-print.range.all-pages=Sve
-print.range.pages=Strane
-print.range.pages-to=Do
-print.copies=Kopije
-print.copies-number=Broj kopija
-print.print-to-file=\u0160tampaj u datoteku
-print.file-chooser=Izaberi
-print-header.default-song-name=Nema_ime
-print-header.default-song-author=Anoniman
-print.preview=Pregled pre \u0161tampe
-
-composition.clef=Klju\u010d
-composition.clef.treble=Violinski
-composition.clef.bass=Bas
-composition.clef.tenor=Tenor
-composition.clef.alto=Alt
-composition.clef.to-the-end=Primeni klju\u010d na kraj pesme
-
-composition.keysignature=Tonalitet
-composition.keysignature.natural=Prirodni (C-dur)
-composition.keysignature.sharp-1=1 povisilica
-composition.keysignature.sharp-2=2 povisilice
-composition.keysignature.sharp-3=3 povisilice
-composition.keysignature.sharp-4=4 povisilice
-composition.keysignature.sharp-5=5 povisilica
-composition.keysignature.sharp-6=6 povisilica
-composition.keysignature.sharp-7=7 povisilica
-composition.keysignature.flat-1=1 snizilica
-composition.keysignature.flat-2=2 snizilice
-composition.keysignature.flat-3=3 snizilice
-composition.keysignature.flat-4=4 snizilice
-composition.keysignature.flat-5=5 snizilica
-composition.keysignature.flat-6=6 snizilica
-composition.keysignature.flat-7=7 snizilica
-composition.keysignature.to-the-end=Primeni skalu na poslednji takt
-composition.tripletfeel=Utisak tripleta
-composition.tripletfeel.none=Bez utiska tripleta
-composition.tripletfeel.eighth=Triplet osmina
-composition.tripletfeel.sixteenth=Triplet \u0161esnaestina
-composition.tripletfeel.to-the-end=Primeni utisak tripleta na kraj
-
-track.clone=Kloniraj stazu
-track.move-up=Pomeri gore
-track.move-down=Pomeri dole
-
-marker=Marker
-marker.add=Dodaj marker
-marker.list=Prika\u017ei markere
-marker.first=Idi na prvi marker
-marker.last=Idi na poslednji marker
-marker.next=Idi na slede\u0107i marker
-marker.previous=Idi na prethodni marker
-
-export.tablature-enabled=Uvrsti tablaturu
-export.score-enabled=Uvrsti note
-
-scale=Skale
-scale.list=Lista skala
-
-text.insert=Ubaci tekst
-
-tools=Alati
-tools.scale=Spisak skala
-tools.browser=Browser
-tools.plugins=Plugin-ovi
-tools.shortcuts=Pre\u010dice
-tools.settings=Pode\u0161avanja
-
-browser.dialog=Browser
-browser.menu.file=Fajl
-browser.open=Otvori
-browser.exit=Iza\u0111i
-browser.menu.collection=Kolekcija
-browser.menu.location=Lokacija
-browser.menu.go=Po\u010dni
-browser.collection.select=Izaberi kolekciju
-browser.collection.fs.editor-title=Kolekcija sa lokalnog diska
-browser.collection.fs.editor-tip=Izaberite folder u kom se nalazi kolekcija.
-browser.collection.fs.invalid-path=Izabrani folder ne postoji.
-browser.location.select=Izaberi lokaciju
-browser.location.open=Otvori
-browser.location.remove=Obri\u0161i
-browser.location.close=Zatvori
-browser.location.new=Nova
-browser.go-root=Po\u010detna
-browser.go-back=Nazad
-browser.refresh=Osve\u017ei
-
-midi.port=Midi Port
-midi.sequencer=Midi Sekvencer
-
-plugin.unknown-value=Nije dostupan.
-plugin.column.name=Nazi plugina
-plugin.column.enabled=Uklju\u010den
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Datoteka komande
-edit.items=Obrade komande
-property.items=Osobina komande
-track.items=Staze komande
-duration.items=Du\u017eine nota komande
-beat.items=Nota komande
-composition.items=Kompozicije komande
-repeat.items=Ponavljanja komande
-transport.items=Pesme komande
-marker.items=Markera komande
-insert.items=Ubacivanja komande
-layout.items=Pregleda komande
-view.items=Izgleda komande
-effect.items=Efekata komande
-dynamic.items=Dinamike komande
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Nova datoteka
-action.file.open=Otvori datoteku
-action.file.open-url=Otvori URL
-action.file.save=Snimi
-action.file.save-as=Snimi kao
-action.file.print=\u0160tampaj
-action.file.print-preview=Pregled pre \u0161tampe
-action.edit.undo=Undo
-action.edit.redo=Redo
-action.composition.change-time-signature=Promeni vrstu takta
-action.composition.change-tempo=Promeni tempo
-action.composition.change-info=Promeni informacije o pesmi
-action.composition.change-clef=Promeni klju\u010d
-action.composition.change-key-signature=Promeni tonalitet
-action.composition.change-triplet-feel=Promeni Utisak tripleta
-action.view.layout-set-page=Pregled strane
-action.view.layout-set-linear=Pregled u liniji
-action.view.layout-set-multitrack=Vi\u0161e instrumenata
-action.view.layout-set-score-enabled=Prika\u017ei note
-action.view.show-fretboard=Prika\u017ei gitaru
-action.view.show-piano=Prika\u017ei klavir
-action.view.show-mixer=Prika\u017ei mikser
-action.view.show-transport=Prika\u017ei navigator
-action.view.show-matrix=Prika\u017ei Matricu
-action.view.layout-set-chord-diagram-enabled=Prika\u017ei dijagram akorda
-action.view.layout-set-chord-name-enabled=Prika\u017ei naziv akorda
-action.view.layout-set-compact=Kompaktan prikaz
-action.view.layout-set-tablature-enabled=Prika\u017ei tablaturu
-action.track.add=Dodaj stazu
-action.track.remove=Obri\u0161i stazu
-action.track.clone=Kloniraj stazu
-action.track.go-first=Idi na prvu stazu
-action.track.go-last=Idi na poslednju stazu
-action.track.go-next=Idi na sledecu stazu
-action.track.go-previous=Idi na prethodnu stazu
-action.track.lyrics=Napisi tekst iznad staze
-action.track.properties=Promeni osobine staze
-action.track.move-down=Pomeri dole
-action.track.move-up=Pomeri gore
-action.measure.add=Dodaj takt
-action.measure.remove=Obri\u0161i takt
-action.measure.copy=Kopiraj takt
-action.measure.paste=Zalepi takt
-action.measure.clean=Obri\u0161i sve iz takta
-action.measure.go-first=Idi na prvi takt
-action.measure.go-last=Idi na poslednji takt
-action.measure.go-next=Idi na slede\u0107i takt
-action.measure.go-previous=Idi na prethodni takt
-action.note.general.clean-beat=Obri\u0161i notu
-action.note.general.decrement-semitone=Poluton ni\u017ee
-action.note.general.increment-semitone=Poluton vi\u0161lje
-action.note.general.shift-down=Na \u017eicu gore
-action.note.general.shift-up=Na \u017eicu dole
-action.note.general.tied=Dodaj/ukloni ligaturu
-action.note.duration.change-dotted=Dodaj/ukloni ta\u010dku
-action.note.duration.change-double-dotted=Dodaj/ukloni duplu ta\u010dku
-action.note.duration.change-division-type=Dodaj/ukloni triplet
-action.note.duration.set-whole=Trajanje note: cela nota
-action.note.duration.set-half=Trajanje note: polovina
-action.note.duration.set-quarter=Trajanje note: \u010detvrtina
-action.note.duration.set-eighth=Trajanje note: osmina
-action.note.duration.set-sixteenth=Trajanje note: \u0161esnaestina
-action.note.duration.set-thirty-second=Trajanje note: trideset-dvojka
-action.note.duration.set-sixty-fourth=Trajanje note: \u0161esdeset-\u010detvorka
-action.note.duration.decrement-duration=Prepolovi trajanje
-action.note.duration.increment-duration=Udvostru\u010di trajanje
-action.note.effect.change-vibrato=Dodaj/ukloni vibrato
-action.note.effect.change-bend=Dodaj/ukloni bend
-action.note.effect.change-slide=Dodaj/ukloni slajd
-action.note.effect.change-hammer=Dodaj/ukloni hammer-on/pull-off
-action.note.effect.change-accentuated=Dodaj/ukloni nagla\u0161avanje
-action.note.effect.change-dead=Dodaj/ukloni mrtvu notu
-action.note.effect.change-fade-in=Dodaj/ukloni fade in
-action.note.effect.change-ghost=Dodaj/ukloni tihu notu
-action.note.effect.change-grace=Dodaj/ukloni gratis notu
-action.note.effect.change-harmonic=Dodaj/ukloni harmonik
-action.note.effect.change-heavy-accentuated=Dodaj/ukloni jako nagla\u0161avanje
-action.note.effect.change-palm-mute=Dodaj/ukloni palm mute
-action.note.effect.change-popping=Dodaj/ukloni poping
-action.note.effect.change-slapping=Dodaj/ukloni sleping
-action.note.effect.change-staccato=Dodaj/ukloni odse\u010dnu notu
-action.note.effect.change-tapping=Dodaj/ukloni taping
-action.note.effect.change-tremolo-bar=Dodaj/ukloni tremolo ru\u010dku
-action.note.effect.change-tremolo-picking=Dodaj/ukloni tremolo trzanje
-action.note.effect.change-trill=Dodaj/ukloni trill
-action.insert.open-repeat=Otvori ponavljanje
-action.insert.close-repeat=Zatvori ponavljanje
-action.insert.text=Ubaci tekst
-action.insert.repeat-alternative=Alternativni zavr\u0161etak
-action.insert.chord=Ubaci akord
-action.transport.play=Sviraj pesmu
-action.transport.stop=Zaustavi pesmu
-action.transport.metronome=Metrononom
-action.transport.mode=Mod
-action.tools.browser=Browser
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_sv.properties b/TuxGuitar-testing/platform-all/share/lang/messages_sv.properties
deleted file mode 100644
index 4c46cd82..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_sv.properties
+++ /dev/null
@@ -1,692 +0,0 @@
-# Swedish translation for TuxGuitar. 
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the TuxGuitar software.
-# John Gustafsson <jamminjohn@users.sourceforge.net>, 2008-2009.
-#
-
-ok=Ok
-cancel=Avbryt
-yes=Ja
-no=Nej
-add=L\u00e4gg till
-edit=\u00c4ndra
-remove=Ta bort
-save=Spara
-exit=Avsluta
-close=St\u00e4ng
-choose=V\u00e4lj
-color=F\u00e4rg
-title=Titel
-go=G\u00e5
-warning=Varning
-error=fel
-plugins=Insticksmoduler
-options=Alternativ
-defaults=Standardv\u00e4rden
-clean=Rensa
-rename=Byt namn
-fret=Band
-position=Position
-name=Namn
-author=Upphovsman
-version=Version
-description=Beskrivning
-info=Info
-configure=Konfigurera
-url=URL
-
-file=Arkiv
-file.new=Ny
-file.open=\u00d6ppna
-file.save=Spara
-file.save-as=Spara som
-file.save-changes-question=S\u00e5ngen har osparade \u00e4ndringar.\nVill du spara \u00e4ndringarna?
-file.exit=Avsluta
-file.export=Exportera
-file.export-midi=Exportera MIDI
-file.export-pdf=Exportera PDF
-file.print=Skriv ut
-file.print-preview=F\u00f6rhandsgranska utskrift
-file.import=Importera
-file.import-midi=Importera MIDI
-file.export-ascii=Exportera ASCII
-file.history=Tidigare
-file.open-url=\u00d6ppna webbadress
-file.open.error=Kan inte \u00f6ppna: {0}
-file.save.error=Kan inte spara: {0}
-file.import.error=Kan inte importera: {0}
-file.export.error=Kan inte exportera: {0}
-file.overwrite-question=Denna fil finns redan. Vill du skriva \u00f6ver den?
-
-edit.menu=Redigera
-edit.undo=\u00c5ngra
-edit.redo=G\u00f6r om
-edit.copy=Kopiera
-edit.from=Fr\u00e5n
-edit.to=Till
-edit.all-tracks=Alla sp\u00e5r
-edit.paste=Klistra in
-edit.paste.count=Klistra in r\u00e4knande
-edit.paste.replace-mode=Klistra in vid aktuell takt
-edit.paste.insert-mode=Klistra in i ny takt
-edit.delete=Ta bort
-edit.cut=Klipp ut
-edit.mouse-mode-selection=Markeringsl\u00e4ge
-edit.mouse-mode-edition=Partiturredigeringsl\u00e4ge
-edit.not-natural-key=H\u00f6jnings/S\u00e4nkningsl\u00e4ge
-edit.voice-1=V\u00e4lj st\u00e4mma 1
-edit.voice-2=V\u00e4lj st\u00e4mma 2
-
-view=Visa
-view.layout=Layout
-view.layout.page=Sidlayout
-view.layout.linear=Linj\u00e4r layout
-view.layout.compact=Kompakt
-view.layout.multitrack=Flera sp\u00e5r
-view.layout.chord-style=Ackordutseende
-view.layout.chord-name=Ackordnamn
-view.layout.chord-diagram=Ackorddiagram
-view.layout.score-enabled=Visa partitur
-view.layout.tablature-enabled=Visa tabulatur
-view.show-mixer=Visa mixer
-view.show-fretboard=Visa greppbr\u00e4da
-view.show-piano=Visa klaviatur
-view.show-matrix=Visa matris
-view.show-transport=Visa spelare
-
-fretboard.direction=Riktning
-fretboard.right-mode=H\u00f6gerh\u00e4nt l\u00e4ge
-fretboard.left-mode=V\u00e4nsterh\u00e4nt l\u00e4ge
-fretboard.background-color=Bakgrundsf\u00e4rg
-fretboard.display-note-text=Visa nottext
-fretboard.display-scale-text=Visa skaltext
-fretboard.font=Typsnitt
-fretboard.fretpoint-color=F\u00e4rg p\u00e5 greppband
-fretboard.note-color=Notf\u00e4rg
-fretboard.scale-note-color=F\u00e4rg p\u00e5 not i skala
-fretboard.settings=Inst\u00e4llningar f\u00f6r greppbr\u00e4da
-fretboard.string-color=Str\u00e4ngf\u00e4rg
-fretboard.settings.options=Alternativ
-
-piano.editor=Redigering med klaviatur
-piano.natural-key-color=F\u00e4rg p\u00e5 "vita" tangenter
-piano.not-natural-key-color=F\u00e4rg p\u00e5 "svarta" tangenter
-piano.note-color=Notf\u00e4rg
-piano.scale-note-color=F\u00e4rg p\u00e5 not i skala
-piano.settings=Inst\u00e4llningar f\u00f6r klaviatur
-
-matrix.editor=Redigering med matris
-matrix.grids=Antal rutn\u00e4t
-matrix.border-color=Kantf\u00e4rg
-matrix.font=Typsnitt
-matrix.foreground-color=F\u00f6rgrundsf\u00e4rg
-matrix.line-color-1=Udda raders f\u00e4rg
-matrix.line-color-2=J\u00e4mna raders f\u00e4rg
-matrix.line-color-over=Radf\u00e4rg d\u00e5 muspekaren \u00e4r \u00f6ver
-matrix.note-color=Notf\u00e4rg
-matrix.play-note-color=F\u00e4rg p\u00e5 spelad not
-matrix.position-color=Positionsf\u00e4rg
-matrix.settings=Inst\u00e4llningar f\u00f6r matris
-
-composition=Komposition
-composition.timesignature=Taktartssignatur
-composition.timesignature.Numerator=Antal slag
-composition.timesignature.denominator=Pulsv\u00e4rde
-composition.timesignature.to-the-end=Till slutet
-composition.tempo=Tempo
-composition.tempo-percent=Procent
-composition.tempo.invalid=Ogiltigt tempo
-composition.tempo.start-to-end=Till\u00e4mpa detta tempo i hela s\u00e5ngen
-composition.tempo.position-to-end=Till\u00e4mpa detta tempo till slutet
-composition.tempo.position-to-next=Till\u00e4mpa detta tempo till n\u00e4sta tempomark\u00f6r
-composition.properties=Egenskaper
-composition.name=Namn
-composition.artist=Artist
-composition.album=Album
-composition.author=Upphovsman
-composition.date=Datum
-composition.copyright=Copyright
-composition.writer=Skapare av tabulatur
-composition.transcriber=Transkriberad av
-composition.comments=Kommentarer
-composition.tripletfeel=Triolk\u00e4nsla
-composition.clef=Klav
-composition.clef.treble=Diskant
-composition.clef.bass=Bas
-composition.clef.tenor=Tenor
-composition.clef.alto=Alt
-composition.clef.to-the-end=Till\u00e4mpa denna klaven till slutet
-composition.keysignature=F\u00f6rtecken
-composition.keysignature.natural=Inga
-composition.keysignature.sharp-1=1 h\u00f6jd
-composition.keysignature.sharp-2=2 h\u00f6jda
-composition.keysignature.sharp-3=3 h\u00f6jda
-composition.keysignature.sharp-4=4 h\u00f6jda
-composition.keysignature.sharp-5=5 h\u00f6jda
-composition.keysignature.sharp-6=6 h\u00f6jda
-composition.keysignature.sharp-7=7 h\u00f6jda
-composition.keysignature.flat-1=1 s\u00e4nkt
-composition.keysignature.flat-2=2 s\u00e4nkta
-composition.keysignature.flat-3=3 s\u00e4nkta
-composition.keysignature.flat-4=4 s\u00e4nkta
-composition.keysignature.flat-5=5 s\u00e4nkta
-composition.keysignature.flat-6=6 s\u00e4nkta
-composition.keysignature.flat-7=7 s\u00e4nkta
-composition.keysignature.to-the-end=Till\u00e4mpa dessa f\u00f6rtecken till slutet
-composition.tripletfeel=Triolk\u00e4nsla
-composition.tripletfeel.none=Ingen triolk\u00e4nsla
-composition.tripletfeel.eighth=8-dels trioler
-composition.tripletfeel.sixteenth=16-dels trioler
-composition.tripletfeel.to-the-end=Till\u00e4mpa denna triolk\u00e4nsla till slutet
-
-help=Hj\u00e4lp
-help.help=Hj\u00e4lp
-help.doc=Dokumentation
-help.about=Om
-help.about.license=Licens
-help.about.authors=Upphovsm\u00e4n
-help.about.description=Beskrivning
-
-track=Sp\u00e5r
-track.number=Nr
-track.name=Namn
-track.color=F\u00e4rg
-track.first=F\u00f6rsta sp\u00e5ret
-track.last=Sista sp\u00e5ret
-track.previous=F\u00f6reg\u00e5ende sp\u00e5r
-track.next=N\u00e4sta sp\u00e5r
-track.add=L\u00e4gg till sp\u00e5r
-track.remove=Ta bort sp\u00e5r
-track.clone=Klona sp\u00e5r
-track.move-up=Flytta upp
-track.move-down=Flytta ner
-track.instrument=Instrument
-track.properties=Egenskaper
-track.properties.general=Allm\u00e4nt
-track.name.default-percussion-name=Slagverk
-track.lyrics=S\u00e5ngtext
-track.solo=Solo
-track.mute=Tysta
-
-lyric.editor=Redigering av s\u00e5ngtext
-
-measure=Takt
-measure.first=F\u00f6rsta takten
-measure.last=Sista takten
-measure.previous=F\u00f6reg\u00e5ende takt
-measure.next=N\u00e4sta takt
-measure.add=L\u00e4gg till takt
-measure.add.count=L\u00e4gg till r\u00e4knande
-measure.add-before-current-position=L\u00e4gg till takt innan den aktuella positionen
-measure.add-after-current-position=L\u00e4gg till takt efter den aktuella positionen
-measure.add-at-end=L\u00e4gg till takt i slutet
-measure.remove=Ta bort takt
-measure.copy=Kopiera takt
-measure.paste=Klistra in takt
-measure.clean=Rensa takt
-
-duration=Notv\u00e4rde
-duration.whole=Hel
-duration.half=Halv
-duration.quarter=Fj\u00e4rdedel
-duration.eighth=\u00c5ttondel
-duration.sixteenth=Sextondel
-duration.thirtysecond=Trettioandradel
-duration.sixtyfourth=Sextiofj\u00e4rdedel
-duration.dotted=Punkterad
-duration.doubledotted=Dubbelpunkterad
-duration.division-type=Tuplet
-
-dynamic=Dynamik
-dynamic.piano-pianissimo=Piano pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo piano    
-dynamic.mezzo-forte=Mezzo forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte fortissimo
-
-effects=Effekter
-effects.vibrato=Vibrato
-effects.bend=Bend
-effects.deadnote=D\u00f6d not
-effects.slide=Slide
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=Svajarm
-effects.tremolo-bar-editor=Redigering av svajarm
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release up
-effects.tremolo-bar.release-down=Release down
-effects.tremolo-bar.inverted-dip=Inverted dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=Sp\u00f6knot
-effects.accentuatednote=Betonad not
-effects.heavyaccentuatednote=Starkt betonad not
-effects.harmonic=Harmonic
-effects.grace=F\u00f6ranslagsnot
-effects.grace-editor=Redigering av f\u00f6ranslagsnot
-effects.grace.before-beat=F\u00f6re slag
-effects.grace.on-beat=P\u00e5 slag
-effects.grace.transition=\u00d6verg\u00e5ng
-effects.grace.transition-none=Ingen
-effects.grace.transition-bend=Bend
-effects.grace.transition-slide=Slide
-effects.grace.transition-hammer=Hammer
-effects.trill=Trill
-effects.trill-editor=Redigering av trill
-effects.tremolo-picking=Tremolo picking
-effects.tremolo-picking-editor=Redigering av tremolo picking
-effects.palm-mute=Palm mute
-effects.staccato=Staccato
-effects.tapping=Tapping
-effects.slapping=Slapping
-effects.popping=Popping  
-effects.fade-in=Upptoning
-effects.harmonic-editor=Redigering av harmonic
-effects.harmonic.type-of-harmonic=Typ av harmonic
-effects.harmonic.natural=Natural harmonic
-effects.harmonic.artificial=Artifical harmonic
-effects.harmonic.artificial.key-offset=Ton-offset
-effects.harmonic.tapped=Tapped harmonic
-effects.harmonic.tapped.left-hand=V\u00e4nster hand
-effects.harmonic.tapped.right-hand=H\u00f6ger hand
-effects.harmonic.pinch=Pinch harmonic
-effects.harmonic.semi=Semi harmonic
-
-bend.editor=Redigering av bend
-bend.bend=Bend
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=Pre-bend
-bend.prebend-release=Pre-bend/Release
-
-transport=Spelare
-transport.start=Spela upp
-transport.stop=Stoppa
-transport.pause=Paus
-transport.first=F\u00f6rsta
-transport.last=Sista
-transport.previous=F\u00f6reg\u00e5ende
-transport.next=N\u00e4sta
-transport.metronome=Metronom
-transport.mode=Uppspelningsl\u00e4ge
-transport.mode.simple=Enkelt uppspelningsl\u00e4ge
-transport.mode.simple.tempo-percent=Tempoprocentandel
-transport.mode.simple.loop=Spela enkel slinga
-transport.mode.trainer=Tr\u00e4ningsl\u00e4ge
-transport.mode.trainer.increment-description=\u00d6ka med
-transport.mode.loop-range=Slingans omf\u00e5ng
-transport.mode.loop-range.from=Spela fr\u00e5n takt
-transport.mode.loop-range.from-default=Fr\u00e5n b\u00f6rjan
-transport.mode.loop-range.to=Spela till takt
-transport.mode.loop-range.to-default=Till slutet
-transport.set-loop-start=S\u00e4tt slingans startpunkt
-transport.set-loop-end=S\u00e4tt slingans slutpunkt
-
-instruments.volume=Volym
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.volume=Volym
-instrument.balance=Balans
-instrument.chorus=Chorus
-instrument.reverb=Reverb
-instrument.phaser=Phaser
-instrument.tremolo=Tremolo
-instrument.free=Ledig
-instrument.link=L\u00e4nk
-
-
-repeat.open=\u00d6ppna repris
-repeat.close=St\u00e4ng repris
-repeat.alternative=Alternativa repriser
-repeat.alternative.editor=Redigera alternativa repriser
-repetitions=Repriser
-repeat.number-of-repetitions=Antal repriser
-
-beat=Slag
-beat.clean=Rensa slag
-beat.voice.remove-unused=Ta bort oanv\u00e4nd st\u00e4mma
-beat.voice-up=Notskaft upp\u00e5t
-beat.voice-down=Notskaft ned\u00e5t
-beat.voice-auto=Automatiska notskaft
-beat.stroke=Anslag
-beat.stroke-up=Upp\u00e5tslag
-beat.stroke-down=Ned\u00e5tslag
-beat.move-left=Flytta ett slag \u00e5t v\u00e4nster
-beat.move-right=Flytta ett slag \u00e5t h\u00f6ger
-beat.move-custom=Anpassa flytt av slag
-beat.move-custom.dialog.title=Anpassa flytt
-beat.move-custom.dialog.direction-tip=Flyttriktning
-beat.move-custom.dialog.move-1.tip=Stor flytt
-beat.move-custom.dialog.move-2.tip=Liten flytt
-beat.move-custom.dialog.direction=Riktning
-beat.move-custom.dialog.direction.right=Flytta till h\u00f6ger
-beat.move-custom.dialog.direction.left=Flytta till v\u00e4nster
-beat.move-custom.dialog.count=R\u00e4knande
-beat.move-custom.dialog.duration=Notv\u00e4rde
-beat.move-custom.dialog.duration.type=Punkterad/Dubbelpunkterad
-beat.move-custom.dialog.duration.type.normal=Ingen
-beat.move-custom.dialog.duration.division-type=Typ av uppdelning
-beat.move-custom.dialog.duration.division-type.normal=Vanlig (Tuplet)
-
-note=Not
-note.semitone-up=Halvton upp
-note.semitone-down=Halvton ner
-note.shift-up=Skifta upp\u00e5t
-note.shift-down=Skifta ned\u00e5t
-note.tiednote=Sammanbunden not
-note.deadnote=D\u00f6d not
-
-insert.chord=Infoga ackord
-chord.editor=Redigering av ackord
-chord=Ackord
-chord.name=Namn
-chord.bass=Bas
-chord.custom=Anpassa ackord
-chord.custom.name-empty-error=Ackordnamnet kan inte vara tomt.
-chord.custom.name-exist-error=Ackordnamnet finns redan.
-chord.settings.tip=Anpassa inst\u00e4llningar
-chord.settings.type=Typ
-chord.settings.type.most-common=Vanligaste
-chord.settings.type.inversions=Omv\u00e4ndningar
-chord.settings.type.close-voiced=St\u00e4ngda ljudande
-chord.settings.type.open-voiced=\u00d6ppna ljudande
-chord.settings.open-chords=\u00d6ppna ackord
-chord.settings.chords-to-display=Antal ackord att visa
-chord.settings.search-frets=S\u00f6k band
-chord.settings.minimum-fret=Min
-chord.settings.maximum-fret=Max
-
-instrument=Instrument
-instrument.instrument=Instrument
-instrument.percussion-track=Slagverkssp\u00e5r
-
-tuning=St\u00e4mning
-tuning.offset=Offset
-tuning.strings=Str\u00e4ngar
-tuning.strings.transpose=Transponera p\u00e5verkade noter
-tuning.strings.transpose.try-keep-strings=F\u00f6rs\u00f6k beh\u00e5lla noter p\u00e5 samma str\u00e4ng
-tuning.strings.transpose.apply-to-chords=Transponera ackord
-
-language=Spr\u00e5k
-
-choose-color=V\u00e4lj en f\u00e4rg
-
-settings=Inst\u00e4llningar
-settings.config=Konfigurera TuxGuitar
-settings.config.language=Spr\u00e5k
-settings.config.language.choose=V\u00e4lj ditt spr\u00e5k
-settings.config.styles=Utseende
-settings.config.styles.general=Allm\u00e4nt utseende
-settings.config.styles.printer=Utskriftsutseende
-settings.config.styles.font.default=Standardtypsnitt
-settings.config.styles.font.note=Nottypsnitt
-settings.config.styles.font.lyric=S\u00e5ngtexttypsnitt
-settings.config.styles.font.text=Texttypsnitt
-settings.config.styles.font.time-signature=Taktarttypsnitt
-settings.config.styles.font.printer-default=Standardtypsnitt vid utskrift
-settings.config.styles.font.printer-note=Nottypsnitt vid utskrift
-settings.config.styles.font.printer-time-signature=Taktarttypsnitt vid utskrift
-settings.config.styles.color.score-note=Notf\u00e4rg i partitur
-settings.config.styles.color.tab-note=Notf\u00e4rg i tabulatur
-settings.config.styles.color.play-note=F\u00e4rg p\u00e5 spelad not
-settings.config.apply-changes-question=Vill du verkst\u00e4lla \u00e4ndringarna nu?
-settings.config.sound=Ljud
-settings.config.main=Allm\u00e4nt
-settings.config.main.window-title=F\u00f6nstertitel
-settings.config.main.window-title.help=F\u00f6ljande variabler kommer placeras i f\u00f6nstertiteln:
-settings.config.main.window-title.var.description.appname=Denna variabel representerar programnamnet: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Denna variabel representerar versionen av TuxGuitar
-settings.config.main.window-title.var.description.filename=Denna variabel representerar namnet p\u00e5 den \u00f6ppnade filen
-settings.config.main.window-title.var.description.filepath=Denna variabel representerar s\u00f6kv\u00e4gen till den \u00f6ppnade filen
-settings.config.main.window-title.var.description.songname=Denna variabel representerar s\u00e5ngens namn
-settings.config.main.window-title.var.description.songauthor=Denna variabel representerar s\u00e5ngens upphovsman
-settings.config.main.window-title.var.description.songalbum=Denna variabel representerar s\u00e5ngens album
-settings.config.main.window-title.var.description.songartist=Denna variabel representerar s\u00e5ngens artist
-settings.config.main.options=Alternativ
-settings.config.main.splash-enabled=Visa startbild vid uppstart
-settings.config.main.table.auto-size.enabled=Aktivera automatisk tabellstorlek
-settings.config.styles.color.lines=V\u00e5gr\u00e4ta linjers f\u00e4rg
-settings.config.toolbars=Verktygsrader
-settings.config.toolbars.tip=Anpassa dina verktygsrader
-settings.config.toolbars.list=Tillg\u00e4ngliga verktygsrader
-settings.config.toolbars.move-up=Flytta upp
-settings.config.toolbars.move-down=Flytta ner
-settings.config.skin=Skal
-settings.config.skin.choose=V\u00e4lj ditt skal
-settings.keybindings=Konfigurera tangenbordgenv\u00e4gar
-
-key-bindings-editor=Redigera tangentbordgensv\u00e4gar
-key-bindings-editor-action-select=Markera en \u00e5tg\u00e4rd
-key-bindings-editor-action-column=\u00c5tg\u00e4rd
-key-bindings-editor-shortcut-column=Genv\u00e4g
-key-bindings-editor-push-a-key=Tryck in en snabbtangent
-key-bindings-editor-save-question=Det finns osparade \u00e4ndringar. Vill du avsluta utan att spara?
-
-key-bindings-editor-override=Genv\u00e4gen anv\u00e4nds redan! \u00c4r du s\u00e4ker p\u00e5 att du vill anv\u00e4nda den?
-
-print.print=Skriv ut
-print.dialog=Skriv ut
-print.service=Service
-print.service.name=Namn
-print.service.status=Tillst\u00e5nd
-print.service.type=Typ
-print.service.info=Info
-print.range=Sidintervall
-print.range.all-pages=Allt
-print.range.pages=Sidor
-print.range.pages-to=Till
-print.copies=Kopior
-print.copies-number=Antal kopior
-print.print-to-file=Skriv till fil
-print.file-chooser=V\u00e4lj
-print-header.default-song-name=Utan titel
-print-header.default-song-author=Anonym
-
-print.preview=F\u00f6rhandskgranska utskrift
-print.preview.page-of=Av
-
-marker=Mark\u00f6r
-marker.add=L\u00e4gg till mark\u00f6r
-marker.list=Lista mark\u00f6rer
-marker.first=G\u00e5 till f\u00f6rsta mark\u00f6ren
-marker.last=G\u00e5 till sista mark\u00f6ren
-marker.next=G\u00e5 till n\u00e4sta mark\u00f6ren
-marker.previous=G\u00e5 till f\u00f6reg\u00e5ende mark\u00f6r
-
-export.tablature-enabled=Visa tabulatur
-export.score-enabled=Visa partitur
-export.chord-name-enabled=Visa ackordnamn
-export.chord-diagram-enabled=Visa ackorddiagram
-export.black-and-white=Svartvitt l\u00e4ge
-
-scale=Skala
-scale.list=Lista med skalor
-
-text.insert=Infoga text
-text.editor=Textredigerare
-text.text=Text
-
-tools=Verktyg
-tools.scale=Lista med skalor
-tools.browser=Bl\u00e4ddrare
-tools.plugins=Insticksmoduler
-tools.shortcuts=Genv\u00e4gar
-tools.settings=Inst\u00e4llningar
-
-tools.transpose=Transponering
-tools.transpose.semitones=Transponera halvtoner
-tools.transpose.apply-to-track=Transponera alla takter
-tools.transpose.apply-to-measure=Transponera bara denna takt
-tools.transpose.apply-to-all-tracks=Till\u00e4mpa p\u00e5 alla sp\u00e5r
-tools.transpose.try-keep-strings=F\u00f6rs\u00f6k beh\u00e5lla noter p\u00e5 samma str\u00e4ng n\u00e4r det \u00e4r m\u00f6jligt
-tools.transpose.apply-to-chords=Transponera ackord
-
-browser.dialog=Bl\u00e4ddrare
-browser.menu.file=Fil
-browser.open=\u00d6ppna
-browser.exit=Avsluta
-browser.menu.collection=Samling
-browser.menu.go=G\u00e5
-browser.collection.select=V\u00e4lj samling
-browser.collection.open=\u00d6ppna
-browser.collection.remove=Ta bort
-browser.collection.close=St\u00e4ng
-browser.collection.new=Ny
-browser.go-root=Hem
-browser.go-back=Tillbaka
-browser.refresh=Uppdatera
-browser.factory.fs.name=Filsystem
-browser.collection.fs.name=Namn
-browser.collection.fs.path=Mapp
-browser.collection.fs.editor-title=Samling i filsystemet
-browser.collection.fs.editor-tip=V\u00e4lj din samlingsmapp
-browser.collection.fs.invalid-path=V\u00e4lj en giltig mapp
-
-midi.port=MIDI-port
-midi.sequencer=MIDI-sequencer
-
-plugin.unknown-value=Inte tillg\u00e4nglig.
-plugin.column.name=Namn
-plugin.column.enabled=Aktiverad
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=Arkivobjekt
-edit.items=Redigeringsobjekt
-property.items=Egenskapsobjekt
-track.items=Sp\u00e5robjekt
-duration.items=Notv\u00e4rdesobjekt
-beat.items=Notobjekt
-composition.items=Kompositionsobjekt
-repeat.items=Repetionsobjekt
-transport.items=Transportobjekt
-marker.items=Mark\u00f6robjekt
-insert.items=Infogningsobjekt
-layout.items=Layoutobjekt
-view.items=Visningsobjekt
-effect.items=Effektobjekt
-dynamic.items=Dynamikobjekt
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=Ny fil
-action.file.open=\u00d6ppna fil
-action.file.open-url=\u00d6ppna webbadress
-action.file.save=Spara
-action.file.save-as=Spara som
-action.file.print=Skriv ut
-action.file.print-preview=F\u00f6rhandsgranska utskrift
-action.file.exit=Avsluta TuxGuitar
-action.edit.undo=\u00c5ngra
-action.edit.redo=G\u00f6r om
-action.edit.voice-1=V\u00e4lj st\u00e4mma 1
-action.edit.voice-2=V\u00e4lj st\u00e4mma 2
-action.composition.change-time-signature=\u00c4ndra taktart
-action.composition.change-tempo=\u00c4ndra tempo
-action.composition.change-info=\u00c4ndra s\u00e5nginformation
-action.composition.change-clef=\u00c4ndra klav
-action.composition.change-key-signature=\u00c4ndra f\u00f6rtecken
-action.composition.change-triplet-feel=\u00c4ndra triolk\u00e4nsla
-action.view.layout-set-page=Visa sidlayout
-action.view.layout-set-linear=Visa linj\u00e4r layout
-action.view.layout-set-multitrack=Visa flera sp\u00e5r
-action.view.layout-set-score-enabled=Visa partitur
-action.view.layout-set-tablature-enabled=Visa tabulatur
-action.view.layout-set-compact=Visa kompakt l\u00e4ge
-action.view.layout-set-chord-diagram-enabled=Aktivera ackorddiagram
-action.view.layout-set-chord-name-enabled=Aktivera ackordnamn
-action.view.show-fretboard=Visa greppbr\u00e4da
-action.view.show-piano=Visa klaviatur
-action.view.show-matrix=Visa matris
-action.view.show-mixer=Visa mixer
-action.view.show-transport=Visa spelare
-action.track.add=L\u00e4gg till sp\u00e5r
-action.track.remove=Ta bort sp\u00e5r
-action.track.clone=Klona sp\u00e5r
-action.track.go-first=G\u00e5 till f\u00f6rsta sp\u00e5ret
-action.track.go-last=G\u00e5 till sista sp\u00e5ret
-action.track.go-next=G\u00e5 till n\u00e4sta sp\u00e5r
-action.track.go-previous=G\u00e5 till f\u00f6reg\u00e5ende sp\u00e5r
-action.track.lyrics=Redigera sp\u00e5rets s\u00e5ngtext
-action.track.properties=\u00c4ndra sp\u00e5regenskaper
-action.track.move-down=Flytta ner
-action.track.move-up=Flytta upp
-action.measure.add=L\u00e4gg till takt
-action.measure.remove=Ta bort takt
-action.measure.copy=Kopiera takt
-action.measure.paste=Klistra in takt
-action.measure.clean=Rensa takt
-action.measure.go-first=G\u00e5 till f\u00f6rsta takten
-action.measure.go-last=G\u00e5 till sista takten
-action.measure.go-next=G\u00e5 till n\u00e4sta takt
-action.measure.go-previous=G\u00e5 till f\u00f6reg\u00e5ende takt
-action.beat.general.remove-unused-voice=Ta bort oanv\u00e4nd st\u00e4mma
-action.beat.general.voice-up=S\u00e4tt notskaft upp\u00e5t
-action.beat.general.voice-down=S\u00e4tt notskaft ned\u00e5t
-action.beat.general.voice-auto=S\u00e4tt notskaft automatiskt
-action.beat.general.set-stroke-up=S\u00e4tt upp\u00e5tslag
-action.beat.general.set-stroke-down=S\u00e4tt ned\u00e5tslag
-action.beat.general.move-left=Flytta ett slag \u00e5t v\u00e4nster
-action.beat.general.move-right=Flytta ett slag \u00e5t h\u00f6ger
-action.beat.general.move-custom=Anpassa flytt av slag
-action.note.general.clean-beat=Rensa slag
-action.note.general.decrement-semitone=S\u00e4nk halvton
-action.note.general.increment-semitone=H\u00f6j halvton
-action.note.general.shift-down=Skifta upp
-action.note.general.shift-up=Skifta ner
-action.note.general.tied=L\u00e4gg till/Ta bort sammanbunden
-action.note.duration.set-whole=S\u00e4tt helnot
-action.note.duration.set-half=S\u00e4tt halvnot
-action.note.duration.set-quarter=S\u00e4tt fj\u00e4rdedelsnot
-action.note.duration.set-eighth=S\u00e4tt \u00e5ttondelsnot
-action.note.duration.set-sixteenth=S\u00e4tt sextondelsnot
-action.note.duration.set-thirty-second=S\u00e4tt trettiofj\u00e4rdedelsnot
-action.note.duration.set-sixty-fourth=S\u00e4tt sextiofj\u00e4rdedelsnot
-action.note.duration.decrement-duration=Minska notv\u00e4rde
-action.note.duration.increment-duration=\u00d6ka notv\u00e4rde
-action.note.duration.change-dotted=L\u00e4gg till/Ta bort punkterad
-action.note.duration.change-double-dotted=L\u00e4gg till/Ta bort dubbelpunkterad
-action.note.duration.change-division-type=L\u00e4gg till/Ta bort tuplet
-action.note.effect.change-vibrato=L\u00e4gg till/Ta bort vibrato
-action.note.effect.change-bend=L\u00e4gg till/Ta bort bend
-action.note.effect.change-slide=L\u00e4gg till/Ta bort slide
-action.note.effect.change-hammer=L\u00e4gg till/Ta bort hammer-on/pull-off
-action.note.effect.change-accentuated=L\u00e4gg till/Ta bort betonad
-action.note.effect.change-dead=L\u00e4gg till/Ta bort d\u00f6d not
-action.note.effect.change-fade-in=L\u00e4gg till/Ta bort upptoning
-action.note.effect.change-ghost=L\u00e4gg till/Ta bort sp\u00f6knot
-action.note.effect.change-grace=L\u00e4gg till/Ta bort f\u00f6ranslagsnot
-action.note.effect.change-harmonic=L\u00e4gg till/Ta bort harmonic
-action.note.effect.change-heavy-accentuated=L\u00e4gg till/Ta bort starkt betonad
-action.note.effect.change-palm-mute=L\u00e4gg till/Ta bort palm mute
-action.note.effect.change-popping=L\u00e4gg till/Ta bort popping
-action.note.effect.change-slapping=L\u00e4gg till/Ta bort slapping
-action.note.effect.change-staccato=L\u00e4gg till/Ta bort staccato
-action.note.effect.change-tapping=L\u00e4gg till/Ta bort tapping
-action.note.effect.change-tremolo-bar=L\u00e4gg till/Ta bort svajarm
-action.note.effect.change-tremolo-picking=L\u00e4gg till/Ta bort tremolo picking
-action.note.effect.change-trill=L\u00e4gg till/Ta bort trill
-action.insert.open-repeat=\u00d6ppna repris
-action.insert.close-repeat=St\u00e4ng repris
-action.insert.repeat-alternative=Reprisalternativ
-action.insert.chord=Infoga ackord
-action.insert.text=Infoga text
-action.marker.add=L\u00e4gg till mark\u00f6r
-action.marker.go-next=G\u00e5 till n\u00e4sta mark\u00f6r
-action.marker.go-previous=G\u00e5 till f\u00f6reg\u00e5ende mark\u00f6r
-action.transport.play=Spela upp s\u00e5ng
-action.transport.stop=Stanna uppspelning
-action.transport.mode=L\u00e4ge
-action.transport.metronome=Metrononom
-action.transport.set-loop-start=S\u00e4tt slingans startpunkt
-action.transport.set-loop-end=S\u00e4tt slingans slutpunkt
-action.tools.browser=Bl\u00e4ddrare
-action.tools.transpose=Transponera noter
-action.settings.configure=Inst\u00e4llningar
-action.help.doc=Hj\u00e4lp
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_uk.properties b/TuxGuitar-testing/platform-all/share/lang/messages_uk.properties
deleted file mode 100644
index 811826b5..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_uk.properties
+++ /dev/null
@@ -1,614 +0,0 @@
-ok=\u0414\u043e\u0431\u0440\u0435
-cancel=\u0412\u0456\u0434\u043c\u0456\u043d\u0430
-yes=\u0422\u0430\u043a
-no=\u041d\u0456
-add=\u0414\u043e\u0434\u0430\u0442\u0438
-edit=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438
-remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438
-save=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
-exit=\u0412\u0438\u0439\u0442\u0438
-choose=\u0412\u0438\u0431\u0440\u0430\u0442\u0438
-color=\u041a\u043e\u043b\u0456\u0440
-title=\u041d\u0430\u0437\u0432\u0430
-go=\u0419\u0442\u0438
-warning=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u0436\u0435\u043d\u043d\u044f
-error=\u041f\u043e\u043c\u0438\u043b\u043a\u0430
-plugins=\u0412\u0442\u0443\u043b\u043a\u0438
-options=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
-defaults=\u0417\u0430\u043c\u043e\u0432\u0447\u0443\u0432\u0430\u043d\u043d\u044f
-clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438
-rename=\u041f\u0435\u0440\u0435\u0439\u043c\u0435\u043d\u0443\u0432\u0430\u0442\u0438
-fret=\u041b\u0430\u0434
-position=\u041f\u043e\u0437\u0438\u0446\u0456\u044f
-name=\u0406\u043c'\u044f
-author=\u0410\u0432\u0442\u043e\u0440
-version=\u0412\u0435\u0440\u0441\u0456\u044f
-description=\u041e\u043f\u0438\u0441
-info=\u0406\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0456\u044f
-configure=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
-
-tuxguitar.title=Tux-Guitar
-
-file=\u0424\u0430\u0439\u043b
-file.new=\u041d\u043e\u0432\u0438\u0439
-file.open=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438
-file.save=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
-file.save-as=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u044f\u043a
-file.save-changes-question=\u0417\u043c\u0456\u043d\u0438 \u0434\u043e \u043f\u0456\u0441\u043d\u0456 \u043d\u0435 \u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456.\n\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438?
-file.exit=\u0412\u0438\u0445\u0456\u0434
-file.export=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438
-file.export-midi=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438 MIDI
-file.export-pdf=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438 PDF
-file.print=\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438
-file.print-preview=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434
-file.import=\u0406\u043c\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438
-file.import-midi=\u0406\u043c\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438 MIDI
-file.export-ascii=\u0415\u043a\u0441\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438 ASCII
-file.history=\u0406\u0441\u0442\u043e\u0440\u0456\u044f
-file.open-url=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 URL
-file.open.error=\u041d\u0435\u043c\u043e\u0436\u043b\u0438\u0432\u043e \u0432\u0456\u0434\u043a\u0440\u0438\u0442\u0438: {0}
-file.save.error=\u041d\u0435\u043c\u043e\u0436\u043b\u0438\u0432\u043e \u0437\u0431\u0435\u0440\u0435\u0433\u0442\u0438: {0}
-file.import.error=\u041d\u0435\u043c\u043e\u0436\u043b\u0438\u0432\u043e \u0456\u043c\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438: {0}
-file.export.error=\u041d\u0435\u043c\u043e\u0436\u043b\u0438\u0432\u043e \u0435\u043a\u0441\u043f\u043e\u0440\u0442\u0443\u0432\u0430\u0442\u0438: {0}
-file.overwrite-question=\u0426\u0435\u0439 \u0444\u0430\u0439\u043b \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454, \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0438\u0441\u0430\u0442\u0438?
-
-edit.menu=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f
-edit.undo=\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438
-edit.redo=\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438
-edit.copy=\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438
-edit.from=\u0406\u0437
-edit.to=\u0414\u043e
-edit.all-tracks=\u0412\u0441\u0456\u0445 \u0442\u0440\u0435\u043a\u0456\u0432
-edit.paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438
-edit.paste.replace-mode=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0443 \u043f\u043e\u0442\u043e\u0447\u043d\u0438\u0439 \u0442\u0430\u043a\u0442
-edit.paste.insert-mode=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0443 \u043d\u043e\u0432\u0438\u0439 \u0442\u0430\u043a\u0442
-edit.delete=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438
-edit.cut=\u0412\u0438\u0440\u0456\u0437\u0430\u0442\u0438
-edit.mouse-mode-selection=\u0420\u0435\u0436\u0438\u043c \u0432\u0438\u0431\u043e\u0440\u0443
-edit.mouse-mode-edition=\u0420\u0435\u0436\u0438\u043c \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f
-edit.not-natural-key=\u0414\u0456\u0454\u0437/\u0411\u0435\u043c\u043e\u043b\u044c
-
-view=\u0412\u0438\u0433\u043b\u044f\u0434
-view.layout=\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f
-view.layout.page=\u042f\u043a \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0430
-view.layout.linear=\u041b\u0456\u043d\u0456\u0439\u043d\u043e
-view.layout.compact=\u041a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u043e
-view.layout.multitrack=\u0411\u0430\u0433\u0430\u0442\u043e \u0434\u043e\u0440\u0456\u0436\u043e\u043a
-view.layout.chord-style=\u0412\u0438\u0433\u043b\u044f\u0434 \u0430\u043a\u043e\u0440\u0434\u0456\u0432
-view.layout.chord-name=\u0406\u043c'\u044f
-view.layout.chord-diagram=\u0414\u0456\u0430\u0433\u0440\u0430\u043c\u0430
-view.layout.score-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0443
-view.layout.tablature-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0443
-view.show-mixer=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043c\u0456\u043a\u0448\u0435\u0440
-view.show-fretboard=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0433\u0440\u0438\u0444
-view.show-piano=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043a\u043b\u0430\u0432\u0456\u0448\u0456
-view.show-matrix=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043c\u0430\u0442\u0440\u0438\u0446\u044e
-view.show-transport=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u0447
-
-fretboard.right-mode=\u041f\u0440\u0430\u0432\u0448\u0430
-fretboard.left-mode=\u041b\u0456\u0432\u0448\u0430
-fretboard.background-color=\u041a\u043e\u043b\u0456\u0440 \u0444\u043e\u043d\u0443
-fretboard.display-note-text=\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043d\u0430\u0437\u0432\u0438 \u043d\u043e\u0442
-fretboard.display-scale-text=\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438 \u043d\u0430\u0437\u0432\u0438 \u043d\u043e\u0442 \u043b\u0430\u0434\u0456\u0432
-fretboard.font=\u0428\u0440\u0438\u0444\u0442
-fretboard.fretpoint-color=\u041a\u043e\u043b\u0456\u0440 \u043b\u0430\u0434\u0456\u0432
-fretboard.note-color=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442
-fretboard.scale-note-color=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442 \u043b\u0430\u0434\u0456\u0432
-fretboard.settings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0433\u0440\u0438\u0444\u0443
-fretboard.string-color=\u041a\u043e\u043b\u0456\u0440 \u0441\u0442\u0440\u0443\u043d
-fretboard.settings.options=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
-
-piano.editor=\u041a\u043b\u0430\u0432\u0456\u0430\u0442\u0443\u0440\u0430
-piano.natural-key-color=\u041a\u043e\u043b\u0456\u0440 \u043a\u043b\u0430\u0432\u0456\u0448 \u0442\u043e\u043d\u0456\u0432
-piano.not-natural-key-color=\u041a\u043e\u043b\u0456\u0440 \u043a\u043b\u0430\u0432\u0456\u0448 \u043d\u0430\u043f\u0456\u0432\u0442\u043e\u043d\u0456\u0432
-piano.note-color=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442
-piano.scale-note-color=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442 \u043b\u0430\u0434\u0456\u0432
-piano.settings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0430\u0442\u0443\u0440\u0438
-
-matrix.editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u043c\u0430\u0442\u0440\u0438\u0446\u0456
-matrix.grids=\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u0440\u043e\u0437\u0434\u0456\u043b\u044e\u0432\u0430\u0447\u0456\u0432
-matrix.border-color=\u041a\u043e\u043b\u0456\u0440 \u0433\u0440\u0430\u043d\u0438\u0446\u0456
-matrix.font=\u0428\u0440\u0438\u0444\u0442
-matrix.foreground-color=\u041a\u043e\u043b\u0456\u0440 \u043f\u0435\u0440\u0435\u0434\u043d\u044c\u043e\u0433\u043e \u043f\u043b\u0430\u043d\u0443
-matrix.line-color-1=\u041a\u043e\u043b\u0456\u0440 \u043f\u0430\u0440\u043d\u043e\u0433\u043e \u0440\u044f\u0434\u043a\u0430
-matrix.line-color-2=\u041a\u043e\u043b\u0456\u0440 \u043d\u0435\u043f\u0430\u0440\u043d\u043e\u0433\u043e \u0440\u044f\u0434\u043a\u0430
-matrix.line-color-over=\u041a\u043e\u043b\u0456\u0440 \u0440\u044f\u0434\u043a\u0430, \u043d\u0430 \u044f\u043a\u0438\u0439 \u043d\u0430\u0432\u0435\u0434\u0435\u043d\u0430 \u043c\u0438\u0448\u0430
-matrix.note-color=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442
-matrix.play-note-color=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442\u0438, \u0449\u043e \u043f\u0440\u043e\u0433\u0440\u0430\u0454\u0442\u044c\u0441\u044f
-matrix.position-color=\u041a\u043e\u043b\u0456\u0440 \u043f\u043e\u0437\u0438\u0446\u0456\u0457
-matrix.settings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u043c\u0430\u0442\u0440\u0438\u0446\u0456
-
-composition=\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0456\u044f
-composition.timesignature=\u0420\u043e\u0437\u043c\u0456\u0440
-composition.timesignature.Numerator=\u0427\u0438\u0441\u0435\u043b\u044c\u043d\u0438\u043a
-composition.timesignature.denominator=\u0417\u043d\u0430\u043c\u0435\u043d\u043d\u0438\u043a
-composition.timesignature.to-the-end=\u0414\u043e \u043a\u0456\u043d\u0446\u044f
-composition.tempo=\u0422\u0435\u043c\u043f
-composition.tempo-percent=\u0412\u0456\u0434\u0441\u043e\u0442\u043e\u043a
-composition.tempo.invalid=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0438\u0439 \u0442\u0435\u043c\u043f
-composition.tempo.start-to-end=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u0446\u0435\u0439 \u0442\u0435\u043c\u043f \u0434\u043e \u0432\u0441\u0456\u0454\u0457 \u043f\u0456\u0441\u043d\u0456
-composition.tempo.position-to-end=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u0446\u0435\u0439 \u0442\u0435\u043c\u043f \u0434\u043e \u043a\u0456\u043d\u0446\u044f
-composition.tempo.position-to-next=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u0446\u0435\u0439 \u0442\u0435\u043c\u043f \u0434\u043e \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u043e\u0457 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438 \u0442\u0435\u043c\u043f\u0443
-composition.properties=\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456
-composition.name=\u0406\u043c'\u044f
-composition.artist=\u0412\u0438\u043a\u043e\u043d\u0430\u0432\u0435\u0446\u044c
-composition.album=\u0410\u043b\u044c\u0431\u043e\u043c
-composition.author=\u0410\u0432\u0442\u043e\u0440
-composition.tripletfeel=\u0422\u0440\u0456\u043e\u043b\u0456
-composition.clef=\u041a\u043b\u044e\u0447
-composition.clef.treble=\u0421\u043a\u0440\u0438\u043f\u043a\u043e\u0432\u0438\u0439
-composition.clef.bass=\u0411\u0430\u0441\u043e\u0432\u0438\u0439
-composition.clef.tenor=\u0422\u0435\u043d\u043e\u0440
-composition.clef.alto=\u0410\u043b\u044c\u0442
-composition.clef.to-the-end=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u0446\u0435\u0439 \u043a\u043b\u044e\u0447 \u0434\u043e \u043a\u0456\u043d\u0446\u044f
-composition.keysignature=\u0422\u043e\u043d\u0430\u043b\u044c\u043d\u0456\u0441\u0442\u044c
-composition.keysignature.natural=\u041d\u0430\u0442\u0443\u0440\u0430\u043b\u044c\u043d\u0430
-composition.keysignature.sharp-1=1 \u0434\u0456\u0454\u0437
-composition.keysignature.sharp-2=2 \u0434\u0456\u0454\u0437\u0438
-composition.keysignature.sharp-3=3 \u0434\u0456\u0454\u0437\u0438
-composition.keysignature.sharp-4=4 \u0434\u0456\u0454\u0437\u0438
-composition.keysignature.sharp-5=5 \u0434\u0456\u0454\u0437\u0438
-composition.keysignature.sharp-6=6 \u0434\u0456\u0454\u0437\u0438
-composition.keysignature.sharp-7=7 \u0434\u0456\u0454\u0437\u0438
-composition.keysignature.flat-1=1 \u0431\u0435\u043c\u043e\u043b\u044c
-composition.keysignature.flat-2=2 \u0431\u0435\u043c\u043e\u043b\u0456
-composition.keysignature.flat-3=3 \u0431\u0435\u043c\u043e\u043b\u0456
-composition.keysignature.flat-4=4 \u0431\u0435\u043c\u043e\u043b\u0456
-composition.keysignature.flat-5=5 \u0431\u0435\u043c\u043e\u043b\u0456
-composition.keysignature.flat-6=6 \u0431\u0435\u043c\u043e\u043b\u0456
-composition.keysignature.flat-7=7 \u0431\u0435\u043c\u043e\u043b\u0456
-composition.keysignature.to-the-end=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u0446\u044e \u0442\u043e\u043d\u0430\u043b\u044c\u043d\u0456\u0441\u0442\u044c \u0434\u043e \u043a\u0456\u043d\u0446\u044f
-composition.tripletfeel=\u0422\u0440\u0456\u043e\u043b\u0456
-composition.tripletfeel.none=\u0411\u0435\u0437 \u0442\u0440\u0456\u043e\u043b\u0435\u0439
-composition.tripletfeel.eighth=\u0422\u0440\u0456\u043e\u043b\u0456 8\u043c\u0456
-composition.tripletfeel.sixteenth=\u0422\u0440\u0456\u043e\u043b\u0456 16\u0442\u0456
-composition.tripletfeel.to-the-end=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u0446\u0456 \u0442\u0440\u0456\u043e\u043b\u0456 \u0434\u043e \u043a\u0456\u043d\u0446\u044f
-
-help=\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430
-help.help=\u0414\u043e\u043f\u043e\u043c\u043e\u0433\u0430
-help.doc=\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0456\u044f
-help.about=\u041f\u0440\u043e
-help.about.license=\u041b\u0456\u0446\u0435\u043d\u0437\u0456\u044f
-help.about.authors=\u0410\u0432\u0442\u043e\u0440\u0438
-help.about.description=\u041e\u043f\u0438\u0441
-
-track=\u0414\u043e\u0440\u0456\u0436\u043a\u0430
-track.number=\u2116
-track.name=\u0406\u043c'\u044f
-track.color=\u041a\u043e\u043b\u0456\u0440
-track.first=\u041f\u0435\u0440\u0448\u0430 \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-track.last=\u041e\u0441\u0442\u0430\u043d\u043d\u044f \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-track.previous=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044f \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-track.next=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0430 \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-track.add=\u0414\u043e\u0434\u0430\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043a\u0443
-track.remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043a\u0443
-track.clone=\u0414\u0443\u0431\u043b\u044e\u0432\u0430\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043a\u0443
-track.move-up=\u041f\u0435\u0440\u0435\u0441\u0443\u043d\u0443\u0442\u0438 \u0432\u0433\u043e\u0440\u0443
-track.move-down=\u041f\u0435\u0440\u0435\u0441\u0443\u043d\u0443\u0442\u0438 \u0432\u043d\u0438\u0437
-track.instrument=\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442 
-track.properties=\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456
-track.properties.general=\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456
-track.name.default-percussion-name=\u0423\u0434\u0430\u0440\u043d\u0456
-track.lyrics=\u0422\u0435\u043a\u0441\u0442 \u043f\u0456\u0441\u043d\u0456
-track.solo=\u0421\u043e\u043b\u043e
-track.mute=\u041c\u043e\u0432\u0447\u0430\u043d\u043d\u044f
-
-lyric.editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0442\u0435\u043a\u0441\u0442\u0443
-
-measure=\u0422\u0430\u043a\u0442
-measure.first=\u041f\u0435\u0440\u0448\u0438\u0439 \u0442\u0430\u043a\u0442
-measure.last=\u041e\u0441\u0442\u0430\u043d\u043d\u0456\u0439 \u0442\u0430\u043a\u0442
-measure.previous=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u0442\u0430\u043a\u0442
-measure.next=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0439 \u0442\u0430\u043a\u0442
-measure.add=\u0414\u043e\u0434\u0430\u0442\u0438 \u0442\u0430\u043a\u0442
-measure.add-before-current-position=\u0414\u043e\u0434\u0430\u0442\u0438 \u0442\u0430\u043a\u0442 \u043f\u0435\u0440\u0435\u0434 \u043f\u043e\u0442\u043e\u0447\u043d\u043e\u044e \u043f\u043e\u0437\u0438\u0446\u0456\u0454\u044e
-measure.add-after-current-position=\u0414\u043e\u0434\u0430\u0442\u0438 \u0442\u0430\u043a\u0442 \u043f\u0456\u0441\u043b\u044f \u043f\u043e\u0442\u043e\u0447\u043d\u043e\u0457 \u043f\u043e\u0437\u0438\u0446\u0456\u0457
-measure.add-at-end=\u0414\u043e\u0434\u0430\u0442\u0438 \u0442\u0430\u043a\u0442 \u0443 \u043a\u0456\u043d\u0435\u0446\u044c
-measure.remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u043a\u0442
-measure.copy=\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0442\u0430\u043a\u0442
-measure.paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u043a\u0442
-measure.clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0442\u0430\u043a\u0442
-
-duration=\u0422\u0440\u0438\u0432\u0430\u043b\u0456\u0441\u0442\u044c
-duration.whole=\u0426\u0456\u043b\u0430
-duration.half=\u041f\u043e\u043b\u043e\u0432\u0438\u043d\u043d\u0430
-duration.quarter=\u0427\u0435\u0442\u0432\u0435\u0440\u0442\u043d\u0430
-duration.eighth=\u0412\u043e\u0441\u044c\u043c\u0430
-duration.sixteenth=\u0428\u0456\u0441\u0442\u043d\u0430\u0434\u0446\u044f\u0442\u0430
-duration.thirtysecond=\u0422\u0440\u0438\u0434\u0446\u044f\u0442\u044c \u0434\u0440\u0443\u0433\u0430
-duration.sixtyfourth=\u0428\u0456\u0441\u0442\u0434\u0435\u0441\u044f\u0442 \u0447\u0435\u0442\u0432\u0435\u0440\u0442\u0430
-duration.dotted=\u0406\u0437 \u043a\u0440\u0430\u043f\u043a\u043e\u044e
-duration.doubledotted=\u0406\u0437 \u043f\u043e\u0434\u0432\u0456\u0439\u043d\u043e\u044e \u043a\u0440\u0430\u043f\u043a\u043e\u044e
-duration.division-type=\u0422\u0440\u0438\u043f\u043b\u0435\u0442
-
-dynamic=\u0414\u0438\u043d\u0430\u043c\u0456\u0447\u043d\u0456 \u0432\u0456\u0434\u0442\u0456\u043d\u043a\u0438
-dynamic.piano-pianissimo=Piano Pianissimo
-dynamic.pianissimo=Pianissimo
-dynamic.piano=Piano
-dynamic.mezzo-piano=Mezzo Piano    
-dynamic.mezzo-forte=Mezzo Forte       
-dynamic.forte=Forte
-dynamic.fortissimo=Fortissimo 
-dynamic.forte-fortissimo=Forte Fortissimo
-
-effects=\u0415\u0444\u0435\u043a\u0442\u0438
-effects.vibrato=\u0412\u0456\u0431\u0440\u0430\u0442\u043e
-effects.bend=\u041f\u0456\u0434\u0442\u044f\u0436\u043a\u0430 (\u0411\u0435\u043d\u0434)
-effects.deadnote=\u0417\u0430\u0433\u043b\u0443\u0448\u0435\u043d\u0430 \u043d\u043e\u0442\u0430
-effects.slide=\u041a\u043e\u0432\u0437\u0430\u043d\u043d\u044f (\u0413\u043b\u0456\u0441\u0430\u043d\u0434\u043e)
-effects.hammer=Hammer-on/Pull-off
-effects.tremolo-bar=\u0412\u0430\u0436\u0456\u043b\u044c \u0442\u0440\u0435\u043c\u043e\u043b\u043e     
-effects.tremolo-bar-editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0435\u0444\u0435\u043a\u0442\u0456\u0432 \u0432\u0430\u0436\u0435\u043b\u044f
-effects.tremolo-bar.dip=Dip
-effects.tremolo-bar.dive=Dive
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=Inverted Dip
-effects.tremolo-bar.return=Return
-effects.ghostnote=\u041d\u043e\u0442\u0430-\u043f\u0440\u0438\u043c\u0430\u0440\u0430
-effects.accentuatednote=\u0410\u043a\u0446\u0435\u043d\u0442\u043e\u0432\u0430\u043d\u0430 \u043d\u043e\u0442\u0430
-effects.heavyaccentuatednote=\u0421\u0438\u043b\u044c\u043d\u043e \u0430\u043a\u0446\u0435\u043d\u0442\u043e\u0432\u0430\u043d\u0430 \u043d\u043e\u0442\u0430
-effects.harmonic=\u0424\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-effects.grace=\u0424\u043e\u0440\u0448\u043b\u0430\u0433
-effects.grace-editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0444\u043e\u0440\u0448\u043b\u0430\u0433\u0443
-effects.grace.before-beat=\u041f\u0435\u0440\u0435\u0434 \u0434\u043e\u043b\u0435\u044e
-effects.grace.on-beat=\u041d\u0430 \u0434\u043e\u043b\u0456
-effects.grace.transition=\u041f\u0435\u0440\u0435\u0445\u0456\u0434
-effects.grace.transition-none=\u041d\u0435\u043c\u0430
-effects.grace.transition-bend=\u041f\u0456\u0434\u0442\u044f\u0436\u043a\u0430
-effects.grace.transition-slide=\u041a\u043e\u0432\u0437\u0430\u043d\u043d\u044f
-effects.grace.transition-hammer=Hammer
-effects.trill=\u0422\u0440\u0435\u043b\u044c
-effects.trill-editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0442\u0440\u0435\u043b\u0456
-effects.tremolo-picking=\u0422\u0440\u0435\u043c\u043e\u043b\u043e
-effects.tremolo-picking-editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0442\u0440\u0435\u043c\u043e\u043b\u043e
-effects.palm-mute=\u041f\u0440\u0438\u0433\u043b\u0443\u0448\u0435\u043d\u043d\u044f \u0434\u043e\u043b\u043e\u043d\u0435\u044e
-effects.staccato=\u0423\u0440\u0438\u0432\u0447\u0430\u0441\u0442\u043e (\u0421\u0442\u0430\u043a\u0430\u0442\u043e)
-effects.tapping=\u0422\u0435\u043f\u0456\u043d\u0433
-effects.slapping=Slap
-effects.popping=Pop  
-effects.fade-in=\u041d\u0430\u0440\u043e\u0441\u0442\u0430\u043d\u043d\u044f \u0433\u0443\u0447\u043d\u043e\u0441\u0442\u0456
-effects.harmonic-editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442\u0456\u0432
-effects.harmonic.type-of-harmonic=\u0422\u0438\u043f \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442\u0430
-effects.harmonic.natural=\u041d\u0430\u0442\u0443\u0440\u0430\u043b\u044c\u043d\u0438\u0439 \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-effects.harmonic.artificial=\u0428\u0442\u0443\u0447\u043d\u0438\u0439 \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-effects.harmonic.artificial.key-offset=\u0417\u043c\u0456\u0449\u0435\u043d\u043d\u044f
-effects.harmonic.tapped=\u0422\u0435\u043f\u0456\u043d\u0433\u043e\u0432\u0438\u0439 \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-effects.harmonic.tapped.left-hand=\u041b\u0456\u0432\u043e\u0457 \u0440\u0443\u043a\u0438
-effects.harmonic.tapped.right-hand=\u041f\u0440\u0430\u0432\u043e\u0457 \u0440\u0443\u043a\u0438
-effects.harmonic.pinch=\u041c\u0435\u0434\u0456\u0430\u0442\u043e\u0440\u043d\u0438\u0439 \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-effects.harmonic.semi=\u041d\u0430\u043f\u0456\u0432\u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-
-bend.editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u043f\u0456\u0434\u0442\u044f\u0436\u043a\u0438
-bend.bend=Bend
-bend.bend-release=Bend/Release
-bend.bend-release-bend=Bend/Release/Bend
-bend.prebend=PreBend
-bend.prebend-release=PreBend/Release
-
-transport=\u041f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u0447
-transport.start=\u0413\u0440\u0430\u0442\u0438
-transport.stop=\u0417\u0443\u043f\u0438\u043d\u0438\u0442\u0438
-transport.pause=\u041f\u0430\u0443\u0437\u0430
-transport.first=\u041d\u0430 \u043f\u043e\u0447\u0430\u0442\u043e\u043a
-transport.last=\u0412 \u043a\u0456\u043d\u0435\u0446\u044c
-transport.previous=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439
-transport.next=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0439
-transport.metronome=\u041c\u0435\u0442\u0440\u043e\u043d\u043e\u043c
-transport.mode=\u0420\u0435\u0436\u0438\u043c \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u043d\u043d\u044f
-transport.mode.simple=\u041f\u0440\u043e\u0441\u0442\u0438\u0439
-transport.mode.simple.tempo-percent=\u0412\u0456\u0434\u0441\u043e\u0442\u043e\u043a \u0442\u0435\u043c\u043f\u0443
-transport.mode.simple.loop=\u0417\u0430\u0446\u0438\u043a\u043b\u0438\u0442\u0438
-transport.mode.trainer=\u0422\u0440\u0435\u043d\u0443\u0432\u0430\u043d\u043d\u044f
-transport.mode.trainer.increment-description=\u0417\u0431\u0456\u043b\u044c\u0448\u0443\u0432\u0430\u0442\u0438 \u043d\u0430
-
-instruments.volume=\u041f\u0456\u0434\u0441\u0438\u043b\u0435\u043d\u043d\u044f
-instrument.volume=\u0413\u0443\u0447\u043d\u0456\u0441\u0442\u044c
-instrument.channel=CH
-instrument.effect-channel=EC
-instrument.balance=\u0411\u0430\u043b\u0430\u043d\u0441
-instrument.free=\u0412\u0456\u043b\u044c\u043d\u0438\u0439
-instrument.link=\u041f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f
-
-
-repeat.open=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u0440\u0435\u043f\u0440\u0438\u0437\u0443
-repeat.close=\u0417\u0430\u043a\u0440\u0438\u0442\u0438 \u0440\u0435\u043f\u0440\u0438\u0437\u0443
-repeat.alternative=\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0456 \u043a\u0456\u043d\u0446\u0456\u0432\u043a\u0438
-repeat.alternative.editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0430\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0456 \u043a\u0456\u043d\u0446\u0456\u0432\u043a\u0438
-repetitions=\u041f\u043e\u0432\u0442\u043e\u0440\u0438
-repeat.number-of-repetitions=\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u043f\u043e\u0432\u0442\u043e\u0440\u0456\u0432
-
-beat=\u0414\u043e\u043b\u044f
-beat.clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0434\u043e\u043b\u044e
-
-note=\u041d\u043e\u0442\u0430
-note.semitone-up=\u041f\u0456\u0432\u0442\u043e\u043d\u043e\u043c \u0432\u0438\u0449\u0435
-note.semitone-down=\u041f\u0456\u0432\u0442\u043e\u043d\u043e\u043c \u043d\u0438\u0436\u0447\u0435
-note.shift-up=\u0421\u0442\u0440\u0443\u043d\u043e\u044e \u0432\u0438\u0449\u0435
-note.sfift-down=\u0421\u0442\u0440\u0443\u043d\u043e\u044e \u043d\u0438\u0436\u0447\u0435
-note.tiednote=\u0417\u0432'\u044f\u0437\u0430\u0442\u0438 \u043d\u043e\u0442\u0438
-note.deadnote=\u0417\u0430\u0433\u043b\u0443\u0448\u0435\u043d\u0430 \u043d\u043e\u0442\u0430
-
-insert.chord=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0430\u043a\u043e\u0440\u0434
-chord.editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0430\u043a\u043e\u0440\u0434\u0430
-chord=\u0410\u043a\u043e\u0440\u0434
-chord.name=\u0406\u043c'\u044f
-chord.bass=\u0411\u0430\u0441
-chord.custom=\u0417\u0430\u0434\u0430\u0442\u0438 \u0432\u0440\u0443\u0447\u043d\u0443
-chord.custom.name-empty-error=\u0410\u043a\u043e\u0440\u0434 \u043f\u043e\u0432\u0438\u043d\u0435\u043d \u043c\u0430\u0442\u0438 \u0456\u043c'\u044f.
-chord.custom.name-exist-error=\u0422\u0430\u043a\u0435 \u0456\u043c'\u044f \u0432\u0436\u0435 \u0456\u0441\u043d\u0443\u0454.
-chord.settings.tip=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
-chord.settings.type=\u0422\u0438\u043f
-chord.settings.type.most-common=\u041d\u0430\u0439\u0431\u0456\u043b\u044c\u0448 \u0432\u0436\u0438\u0432\u0430\u043d\u0456
-chord.settings.type.inversions=\u041e\u0431\u0435\u0440\u043d\u0435\u043d\u043d\u044f
-chord.settings.type.close-voiced=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0456
-chord.settings.type.open-voiced=\u0417\u0430\u043a\u0440\u0438\u0442\u0456
-chord.settings.open-chords=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0456 \u0430\u043a\u043e\u0440\u0434\u0438
-chord.settings.chords-to-display=\u041f\u043e\u043a\u0430\u0437\u0443\u0432\u0430\u0442\u0438
-chord.settings.search-frets=\u0428\u0443\u043a\u0430\u0442\u0438 \u043b\u0430\u0434\u0438
-chord.settings.minimum-fret=\u0417
-chord.settings.maximum-fret=\u041f\u043e
-
-instrument=\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
-instrument.instrument=\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442
-instrument.percussion-track=\u0414\u043e\u0440\u0456\u0436\u043a\u0430 \u0443\u0434\u0430\u0440\u043d\u0438\u0445
-
-tuning=\u0421\u0442\u0440\u0456\u0439
-tuning.strings=\u0421\u0442\u0440\u0443\u043d\u0438
-tuning.offset=\u0417\u043c\u0456\u0449\u0435\u043d\u043d\u044f
-
-language=\u041c\u043e\u0432\u0430
-
-choose-color=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 \u043a\u043e\u043b\u0456\u0440
-
-settings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
-settings.config=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 TuxGuitar
-settings.config.language=\u041c\u043e\u0432\u0430
-settings.config.language.choose=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 \u043c\u043e\u0432\u0443
-settings.config.styles=\u0421\u0442\u0438\u043b\u0456
-settings.config.styles.general=\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456 \u0441\u0442\u0438\u043b\u0456
-settings.config.styles.printer=\u0414\u043b\u044f \u0434\u0440\u0443\u043a\u0443
-settings.config.styles.font.default=\u0428\u0440\u0438\u0444\u0442 \u0437\u0430 \u0437\u0430\u043c\u043e\u0432\u0447\u0443\u0432\u0430\u043d\u043d\u044f\u043c
-settings.config.styles.font.note=\u0428\u0440\u0438\u0444\u0442 \u043d\u043e\u0442
-settings.config.styles.font.lyric=\u0428\u0440\u0438\u0444\u0442 \u0442\u0435\u043a\u0441\u0442\u0456\u0432 \u043f\u0456\u0441\u0435\u043d\u044c
-settings.config.styles.font.text=\u0428\u0440\u0438\u0444\u0442 \u0442\u0435\u043a\u0441\u0442\u0443
-settings.config.styles.font.time-signature=\u0428\u0440\u0438\u0444\u0442 \u043f\u043e\u0437\u043d\u0430\u0447\u043e\u043a \u0447\u0430\u0441\u0443
-settings.config.styles.font.printer-default=\u0428\u0440\u0438\u0444\u0442 \u0437\u0430 \u0437\u0430\u043c\u043e\u0432\u0447\u0443\u0432\u0430\u043d\u043d\u044f\u043c \u0434\u043b\u044f \u0434\u0440\u0443\u043a\u0443
-settings.config.styles.font.printer-note=\u0428\u0440\u0438\u0444\u0442 \u043d\u043e\u0442 \u0434\u043b\u044f \u0434\u0440\u0443\u043a\u0443
-settings.config.styles.font.printer-time-signature=\u0428\u0440\u0438\u0444\u0442 \u043f\u043e\u0437\u043d\u0430\u0447\u043e\u043a \u0447\u0430\u0441\u0443 \u0434\u043b\u044f \u0434\u0440\u0443\u043a\u0443
-settings.config.styles.color.score-note=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442 \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0438
-settings.config.styles.color.tab-note=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442 \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0438
-settings.config.styles.color.play-note=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442\u0438, \u0449\u043e \u043f\u0440\u043e\u0433\u0440\u0430\u0454\u0442\u044c\u0441\u044f
-settings.config.apply-changes-question=\u0417\u0430\u0441\u0442\u043e\u0441\u0443\u0432\u0430\u0442\u0438 \u043d\u043e\u0432\u0456 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f \u0437\u0430\u0440\u0430\u0437?
-settings.config.sound=\u0417\u0432\u0443\u043a
-settings.config.main=\u0417\u0430\u0433\u0430\u043b\u044c\u043d\u0456
-settings.config.main.window-title=\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a \u0432\u0456\u043a\u043d\u0430
-settings.config.main.window-title.help=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0456 \u0437\u043c\u0456\u043d\u043d\u0456 \u0431\u0443\u0434\u0443\u0442\u044c \u043f\u043e\u043a\u0430\u0437\u0430\u043d\u0456 \u044f\u043a:
-settings.config.main.window-title.var.description.appname=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0456\u043c'\u044f \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u0438: TuxGuitar
-settings.config.main.window-title.var.description.appversion=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0432\u0435\u0440\u0441\u0456\u044e TuxGuitar
-settings.config.main.window-title.var.description.filename=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0456\u043c'\u044f \u0432\u0456\u0434\u043a\u0440\u0438\u0442\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430
-settings.config.main.window-title.var.description.filepath=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0448\u043b\u044f\u0445 \u0434\u043e \u0432\u0456\u0434\u043a\u0440\u0438\u0442\u043e\u0433\u043e \u0444\u0430\u0439\u043b\u0430
-settings.config.main.window-title.var.description.songname=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0456\u043c'\u044f \u043f\u0456\u0441\u043d\u0456
-settings.config.main.window-title.var.description.songauthor=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0430\u0432\u0442\u043e\u0440\u0430 \u043f\u0456\u0441\u043d\u0456
-settings.config.main.window-title.var.description.songalbum=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0430\u043b\u044c\u0431\u043e\u043c, \u0456\u0437 \u044f\u043a\u043e\u0433\u043e \u043f\u0456\u0441\u043d\u044f
-settings.config.main.window-title.var.description.songartist=\u0426\u044f \u0437\u043c\u0456\u043d\u043d\u0430 \u0432\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0454 \u0432\u0438\u043a\u043e\u043d\u0430\u0432\u0446\u044f \u043f\u0456\u0441\u043d\u0456
-settings.config.main.options=\u041e\u043f\u0446\u0456\u0457
-settings.config.main.splash-enabled=\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u0438 \u0437\u0430\u0441\u0442\u0430\u0432\u043a\u0443 \u043f\u0440\u0438 \u0437\u0430\u043f\u0443\u0441\u043a\u0443
-settings.config.main.table.auto-size.enabled=\u0414\u043e\u0437\u0432\u043e\u043b\u0438\u0442\u0438 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u0443 \u0437\u043c\u0456\u043d\u0443 \u0440\u043e\u0437\u043c\u0456\u0440\u0456\u0432 \u0442\u0430\u0431\u043b\u0438\u0446\u0456
-settings.config.styles.color.lines=\u041a\u043e\u043b\u0456\u0440 \u043d\u043e\u0442\u043d\u043e\u0433\u043e \u0441\u0442\u0430\u043d\u0443
-settings.config.toolbars=\u041f\u0430\u043d\u0435\u043b\u0456
-settings.config.toolbars.tip=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u0432\u0430\u0448\u0456 \u043f\u0430\u043d\u0435\u043b\u0456
-settings.config.toolbars.list=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u0456 \u043f\u0430\u043d\u0435\u043b\u0456
-settings.config.toolbars.move-up=\u041f\u0456\u0434\u043d\u044f\u0442\u0438
-settings.config.toolbars.move-down=\u041e\u043f\u0443\u0441\u0442\u0438\u0442\u0438
-settings.config.skin=\u0416\u0443\u043f\u0430\u043d\u0438
-settings.config.skin.choose=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0432\u0430\u0448 \u0436\u0443\u043f\u0430\u043d
-settings.keybindings=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u0441\u043a\u043e\u0440\u043e\u0447\u0435\u043d\u043d\u044f
-
-key-bindings-editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0441\u043a\u043e\u0440\u043e\u0447\u0435\u043d\u043d\u044f
-key-bindings-editor-action-select=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0434\u0456\u044e
-key-bindings-editor-action-column=\u0414\u0456\u0457
-key-bindings-editor-shortcut-column=\u041a\u043b\u0430\u0432\u0456\u0448\u0456
-key-bindings-editor-push-a-key=\u041d\u0430\u0442\u0438\u0441\u043d\u0456\u0442\u044c \u043a\u043b\u0430\u0432\u0456\u0448\u0443
-key-bindings-editor-save-question=\u0417\u043c\u0456\u043d\u0438 \u043d\u0435\u0437\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u0456, \u0432\u0438\u0439\u0442\u0438 \u043d\u0435 \u0437\u0431\u0435\u0440\u0456\u0433\u0430\u044e\u0447\u0438?
-
-key-bindings-editor-override=\u0421\u043a\u043e\u0440\u043e\u0447\u0435\u043d\u043d\u044f \u0432\u0436\u0435 \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0454\u0442\u044c\u0441\u044f! \u0412\u0438 \u0441\u043f\u0440\u0430\u0432\u0434\u0456 \u0445\u043e\u0447\u0435\u0442\u0435 \u0439\u043e\u0433\u043e \u0432\u0438\u043a\u043e\u0440\u0438\u0441\u0442\u043e\u0432\u0443\u0432\u0430\u0442\u0438?
-
-print.print=\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438
-print.dialog=\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438
-print.service=\u0421\u0435\u0440\u0432\u0456\u0441
-print.service.name=\u0406\u043c'\u044f
-print.service.status=\u0421\u0442\u0430\u0442\u0443\u0441
-print.service.type=\u0422\u0438\u043f
-print.service.info=\u0406\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0456\u044f
-print.range=\u0414\u0456\u0430\u043f\u0430\u0437\u043e\u043d
-print.range.all-pages=\u0412\u0441\u0435
-print.range.pages=\u0421\u0442\u043e\u0440\u0456\u043d\u043a\u0438
-print.range.pages-to=\u0414\u043e
-print.copies=\u041a\u043e\u043f\u0456\u0457
-print.copies-number=\u041a\u0456\u043b\u044c\u043a\u0456\u0441\u0442\u044c \u043a\u043e\u043f\u0456\u0439
-print.print-to-file=\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438 \u0443 \u0444\u0430\u0439\u043b
-print.file-chooser=\u0412\u0438\u0431\u0440\u0430\u0442\u0438
-print-header.default-song-name=\u041d\u0435\u043d\u0430\u0437\u0432\u0430\u043d\u0430
-print-header.default-song-author=\u041d\u0435\u0432\u0456\u0434\u043e\u043c\u0438\u0439
-
-print.preview=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434
-print.preview.page-of=
-
-marker=\u041f\u043e\u0437\u043d\u0430\u0447\u043a\u0438
-marker.add=\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0443
-marker.list=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438
-marker.first=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043e \u043f\u0435\u0440\u0448\u043e\u0457 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438
-marker.last=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043e \u043e\u0441\u0442\u0430\u043d\u043d\u044c\u043e\u0457 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438
-marker.next=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043e \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u043e\u0457 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438
-marker.previous=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043e \u043f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044c\u043e\u0457 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438
-
-export.tablature-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0443
-export.score-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0443
-
-scale=\u041b\u0430\u0434
-scale.list=\u0421\u043f\u0438\u0441\u043e\u043a \u043b\u0430\u0434\u0456\u0432
-
-text.insert=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0435\u043a\u0441\u0442
-text.editor=\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0442\u0435\u043a\u0441\u0442\u0443
-text.text=\u0422\u0435\u043a\u0441\u0442
-
-tools=\u0406\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0438
-tools.scale=\u0421\u043f\u0438\u0441\u043e\u043a \u043b\u0430\u0434\u0456\u0432
-tools.browser=\u041f\u0435\u0440\u0435\u0433\u043b\u044f\u0434\u0430\u0447
-tools.plugins=\u0412\u0442\u0443\u043b\u043a\u0438
-tools.shortcuts=\u0421\u043a\u043e\u0440\u043e\u0447\u0435\u043d\u043d\u044f
-tools.settings=\u041d\u0430\u043b\u0430\u0448\u0443\u0432\u0430\u043d\u043d\u044f
-
-browser.dialog=\u041f\u0435\u0440\u0435\u0433\u043b\u044f\u0434\u0430\u0447
-browser.menu.file=\u0424\u0430\u0439\u043b
-browser.open=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438
-browser.exit=\u0412\u0438\u0445\u0456\u0434
-browser.menu.collection=\u0417\u0431\u0456\u0440\u043a\u0430
-browser.menu.go=\u041f\u0435\u0440\u0435\u0439\u0442\u0438
-browser.collection.select=\u0412\u0438\u0431\u0440\u0430\u0442\u0438 \u0437\u0431\u0456\u0440\u043a\u0443
-browser.collection.open=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438
-browser.collection.remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438
-browser.collection.close=\u0417\u0430\u043a\u0440\u0438\u0442\u0438
-browser.collection.new=\u041d\u043e\u0432\u0430
-browser.go-root=\u0414\u043e\u0434\u043e\u043c\u0443
-browser.go-back=\u041f\u043e\u0432\u0435\u0440\u043d\u0443\u0442\u0438\u0441\u044c
-browser.refresh=\u041e\u043d\u043e\u0432\u0438\u0442\u0438
-browser.factory.fs.name=\u0424\u0430\u0439\u043b\u043e\u0432\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u0430
-browser.collection.fs.name=\u0406\u043c'\u044f
-browser.collection.fs.path=\u0422\u0435\u043a\u0430
-browser.collection.fs.editor-title=\u0417\u0431\u0456\u0440\u043a\u0430 \u0456\u0437 \u0444\u0430\u0439\u043b\u043e\u0432\u043e\u0457 \u0441\u0438\u0441\u0442\u0435\u043c\u0438
-browser.collection.fs.editor-tip=\u0412\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u0442\u0435\u043a\u0443 \u0432\u0430\u0448\u043e\u0457 \u0437\u0431\u0456\u0440\u043a\u0438
-browser.collection.fs.invalid-path=\u0411\u0443\u0434\u044c \u043b\u0430\u0441\u043a\u0430, \u0432\u0438\u0431\u0435\u0440\u0456\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0443 \u0442\u0435\u043a\u0443
-
-midi.port=MIDI \u043f\u043e\u0440\u0442
-midi.sequencer=MIDI \u0441\u0435\u043a\u0432\u0435\u043d\u0441\u0435\u0440
-
-plugin.unknown-value=\u041d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0438\u0439
-plugin.column.name=\u0406\u043c'\u044f \u0432\u0442\u0443\u043b\u043a\u0430
-plugin.column.enabled=\u0412\u0432\u0456\u043c\u043a\u043d\u0435\u043d\u0438\u0439
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=\u0424\u0430\u0439\u043b\u043e\u0432\u0456 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438
-edit.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f
-property.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0432\u043b\u0430\u0441\u043d\u043e\u0441\u0442\u0456
-track.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043e\u043a
-duration.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0442\u0440\u0438\u0432\u0430\u043b\u043e\u0441\u0442\u0456
-beat.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043d\u043e\u0442
-composition.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0456\u0457
-repeat.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u0443
-transport.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u0447\u0430 
-marker.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043f\u043e\u0437\u043d\u0430\u0447\u043e\u043a
-insert.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0432\u0441\u0442\u0430\u0432\u043a\u0438
-layout.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0440\u043e\u0437\u0442\u0430\u0448\u0443\u0432\u0430\u043d\u043d\u044f
-view.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434\u0443
-effect.items=\u0415\u043b\u0435\u043c\u0435\u043d\u0442\u0438 \u0435\u0444\u0435\u043a\u0442\u0456\u0432
-dynamic.items=\u0414\u0438\u043d\u0430\u043c\u0456\u0447\u043d\u0456 \u0435\u043b\u0435\u043c\u0435\u043d\u0442\u0438
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=\u041d\u043e\u0432\u0438\u0439 \u0444\u0430\u0439\u043b
-action.file.open=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u0444\u0430\u0439\u043b
-action.file.open-url=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 URL
-action.file.save=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438
-action.file.save-as=\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u044f\u043a
-action.file.print=\u0414\u0440\u0443\u043a\u0443\u0432\u0430\u0442\u0438
-action.file.print-preview=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u043f\u0435\u0440\u0435\u0433\u043b\u044f\u0434
-action.file.exit=\u0412\u0438\u0439\u0442\u0438 \u0456\u0437 TuxGuitar
-action.edit.undo=\u0412\u0456\u0434\u043c\u0456\u043d\u0438\u0442\u0438
-action.edit.redo=\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u0438
-action.composition.change-time-signature=\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0438 \u0447\u0430\u0441\u0443
-action.composition.change-tempo=\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0442\u0435\u043c\u043f
-action.composition.change-info=\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0456\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0456\u044e \u043f\u0440\u043e \u043f\u0456\u0441\u043d\u044e
-action.composition.change-clef=\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u043a\u043b\u044e\u0447
-action.composition.change-key-signature=\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0443 \u043a\u043b\u044e\u0447\u0430
-action.composition.change-triplet-feel=\u0417\u043c\u0456\u043d\u0438\u0442\u0438 \u0442\u0440\u0456\u043e\u043b\u0456
-action.view.layout-set-page=\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u044f\u043a \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0443
-action.view.layout-set-linear=\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u043b\u0456\u043d\u0456\u0439\u043d\u043e
-action.view.layout-set-multitrack=\u0412\u0456\u0434\u043e\u0431\u0440\u0430\u0437\u0438\u0442\u0438 \u0431\u0430\u0433\u0430\u0442\u043e \u0434\u043e\u0440\u0456\u0436\u043e\u043a
-action.view.layout-set-score-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043f\u0430\u0440\u0442\u0438\u0442\u0443\u0440\u0443
-action.view.layout-set-tablature-enabled=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0442\u0430\u0431\u0443\u043b\u0430\u0442\u0443\u0440\u0443
-action.view.layout-set-compact=\u041a\u043e\u043c\u043f\u0430\u043a\u0442\u043d\u043e
-action.view.layout-set-chord-diagram-enabled=\u0412\u0432\u0456\u043c\u043a\u043d\u0443\u0442\u0438 \u0434\u0456\u0430\u0433\u0440\u0430\u043c\u0438 \u0430\u043a\u043e\u0440\u0434\u0456\u0432
-action.view.layout-set-chord-name-enabled=\u0412\u0432\u0456\u043c\u043a\u043d\u0443\u0442\u0438 \u0456\u043c\u0435\u043d\u0430 \u0430\u043a\u043e\u0440\u0434\u0456\u0432
-action.view.show-fretboard=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u0433\u0440\u0438\u0444
-action.view.show-piano=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043a\u043b\u0430\u0432\u0456\u0430\u0442\u0443\u0440\u0443
-action.view.show-matrix=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043c\u0430\u0442\u0440\u0438\u0446\u044e
-action.view.show-mixer=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043c\u0456\u043a\u0448\u0435\u0440
-action.view.show-transport=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u0438 \u043f\u043e\u0433\u0440\u0430\u0432\u0430\u0447
-action.track.add=\u0414\u043e\u0434\u0430\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043a\u0443
-action.track.remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043a\u0443
-action.track.clone=\u0414\u0443\u0431\u043b\u044e\u0432\u0430\u0442\u0438 \u0434\u043e\u0440\u0456\u0436\u043a\u0443
-action.track.go-first=\u041f\u0435\u0440\u0448\u0430 \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-action.track.go-last=\u041e\u0441\u0442\u0430\u043d\u043d\u044f \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-action.track.go-next=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0430 \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-action.track.go-previous=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044f \u0434\u043e\u0440\u0456\u0436\u043a\u0430
-action.track.lyrics=\u0422\u0435\u043a\u0441\u0442 \u043f\u0456\u0441\u043d\u0456
-action.track.properties=\u0412\u043b\u0430\u0441\u0442\u0438\u0432\u043e\u0441\u0442\u0456 \u0434\u043e\u0440\u0456\u0436\u043a\u0438
-action.track.move-down=\u041f\u0435\u0440\u0435\u0441\u0443\u043d\u0443\u0442\u0438 \u0432\u0433\u043e\u0440\u0443
-action.track.move-up=\u041f\u0435\u0440\u0435\u0441\u0443\u043d\u0443\u0442\u0438 \u0432\u043d\u0438\u0437
-action.measure.add=\u0414\u043e\u0434\u0430\u0442\u0438 \u0442\u0430\u043a\u0442
-action.measure.remove=\u0412\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0430\u043a\u0442
-action.measure.copy=\u041a\u043e\u043f\u0456\u044e\u0432\u0430\u0442\u0438 \u0442\u0430\u043a\u0442
-action.measure.paste=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0430\u043a\u0442
-action.measure.clean=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0442\u0430\u043a\u0442
-action.measure.go-first=\u041f\u0435\u0440\u0448\u0438\u0439 \u0442\u0430\u043a\u0442
-action.measure.go-last=\u041e\u0441\u0442\u0430\u043d\u043d\u0456\u0439 \u0442\u0430\u043a\u0442
-action.measure.go-next=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0438\u0439 \u0442\u0430\u043a\u0442
-action.measure.go-previous=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u0456\u0439 \u0442\u0430\u043a\u0442
-action.note.general.clean-beat=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u0438 \u0434\u043e\u043b\u044e
-action.note.general.decrement-semitone=\u041f\u0456\u0432\u0442\u043e\u043d\u043e\u043c \u0432\u0438\u0449\u0435
-action.note.general.increment-semitone=\u041f\u0456\u0432\u0442\u043e\u043d\u043e\u043c \u043d\u0438\u0436\u0447\u0435
-action.note.general.shift-down=\u0421\u0442\u0440\u0443\u043d\u043e\u044e \u0432\u0438\u0449\u0435
-action.note.general.shift-up=\u0421\u0442\u0440\u0443\u043d\u043e\u044e \u043d\u0438\u0436\u0447\u0435
-action.note.general.tied=\u0417\u0432'\u044f\u0437\u0430\u043d\u0456/\u041d\u0435\u0437\u0432'\u044f\u0437\u0430\u043d\u0456 \u043d\u043e\u0442\u0438
-action.note.duration.set-whole=\u0426\u0456\u043b\u0430
-action.note.duration.set-half=\u041f\u043e\u043b\u043e\u0432\u0438\u043d\u043d\u0430
-action.note.duration.set-quarter=\u0427\u0435\u0442\u0432\u0435\u0440\u0442\u043d\u0430
-action.note.duration.set-eighth=\u0412\u043e\u0441\u044c\u043c\u0430
-action.note.duration.set-sixteenth=\u0428\u0456\u0441\u0442\u043d\u0430\u0434\u0446\u044f\u0442\u0430
-action.note.duration.set-thirty-second=\u0422\u0440\u0438\u0434\u0446\u044f\u0442\u044c \u0434\u0440\u0443\u0433\u0430
-action.note.duration.set-sixty-fourth=\u0428\u0456\u0441\u0442\u0434\u0435\u0441\u044f\u0442 \u0447\u0435\u0442\u0432\u0435\u0440\u0442\u0430
-action.note.duration.change-dotted=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043a\u0440\u0430\u043f\u043a\u0443
-action.note.duration.change-double-dotted=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u043e\u0434\u0432\u0456\u0439\u043d\u0443 \u043a\u0440\u0430\u043f\u043a\u0443
-action.note.duration.change-division-type=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0440\u0438\u043f\u043b\u0435\u0442
-action.note.duration.decrement-duration=\u0417\u043c\u0435\u043d\u0448\u0438\u0442\u0438 \u0442\u0440\u0438\u0432\u0430\u043b\u0456\u0441\u0442\u044c
-action.note.duration.increment-duration=\u0417\u0431\u0456\u043b\u044c\u0448\u0438\u0442\u0438 \u0442\u0440\u0438\u0432\u0430\u043b\u0456\u0441\u0442\u044c
-action.note.effect.change-vibrato=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0432\u0456\u0431\u0440\u0430\u0442\u043e
-action.note.effect.change-bend=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u0434\u0456\u0442\u044f\u0436\u043a\u0443
-action.note.effect.change-slide=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043a\u043e\u0432\u0437\u0430\u043d\u043d\u044f
-action.note.effect.change-hammer=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 hammer-on/pull-off
-action.note.effect.change-accentuated=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0430\u043a\u0446\u0435\u043d\u0442
-action.note.effect.change-dead=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0437\u0430\u0433\u043b\u0443\u0448\u0435\u043d\u0443 \u043d\u043e\u0442\u0443
-action.note.effect.change-fade-in=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 fade in
-action.note.effect.change-ghost=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u0440\u0438\u043c\u0430\u0440\u0443
-action.note.effect.change-grace=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0444\u043e\u0440\u0448\u043b\u0430\u0433
-action.note.effect.change-harmonic=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0444\u043b\u0430\u0436\u043e\u043b\u0435\u0442
-action.note.effect.change-heavy-accentuated=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0441\u0438\u043b\u044c\u043d\u0438\u0439 \u0430\u043a\u0446\u0435\u043d\u0442
-action.note.effect.change-palm-mute=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u043f\u0440\u0438\u0433\u043b\u0443\u0448\u0435\u043d\u043d\u044f \u0434\u043e\u043b\u043e\u043d\u0435\u044e
-action.note.effect.change-popping=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 popping
-action.note.effect.change-slapping=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 slapping
-action.note.effect.change-staccato=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0443\u0440\u0438\u0432\u0447\u0430\u0441\u0442\u0456\u0441\u0442\u044c
-action.note.effect.change-tapping=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0435\u043f\u043f\u0456\u043d\u0433
-action.note.effect.change-tremolo-bar=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0432\u0430\u0436\u0456\u043b\u044c \u0442\u0440\u0435\u043c\u043e\u043b\u043e
-action.note.effect.change-tremolo-picking=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0442\u0440\u0435\u043c\u043e\u043b\u043e
-action.note.effect.change-trill=\u0414\u043e\u0434\u0430\u0442\u0438/\u0432\u0438\u0434\u0430\u043b\u0438\u0442\u0438 \u0422\u0440\u0435\u043b\u044c
-action.insert.open-repeat=\u0412\u0456\u0434\u043a\u0440\u0438\u0442\u0438 \u0440\u0435\u043f\u0440\u0438\u0437\u0443
-action.insert.close-repeat=\u0417\u0430\u043a\u0440\u0438\u0442\u0438 \u0440\u0435\u043f\u0440\u0438\u0437\u0443
-action.insert.repeat-alternative=\u0410\u043b\u044c\u0442\u0435\u0440\u043d\u0430\u0442\u0438\u0432\u043d\u0430 \u043a\u0456\u043d\u0446\u0456\u0432\u043a\u0430
-action.insert.chord=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0430\u043a\u043e\u0440\u0434
-action.insert.text=\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u0442\u0435\u043a\u0441\u0442
-action.marker.add=\u0414\u043e\u0434\u0430\u0442\u0438 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0443
-action.marker.go-next=\u041d\u0430\u0441\u0442\u0443\u043f\u043d\u0430 \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0430
-action.marker.go-previous=\u041f\u043e\u043f\u0435\u0440\u0435\u0434\u043d\u044f \u043f\u043e\u0437\u043d\u0430\u0447\u043a\u0430
-action.transport.play=\u0413\u0440\u0430\u0442\u0438 \u043f\u0456\u0441\u043d\u044e
-action.transport.stop=\u0417\u0443\u043f\u0438\u043d\u0438\u0442\u0438 \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u043d\u043d\u044f
-action.transport.mode=\u0420\u0435\u0436\u0438\u043c \u043f\u0440\u043e\u0433\u0440\u0430\u0432\u0430\u0447\u0430
-action.transport.metronome=\u041c\u0435\u0442\u0440\u043e\u043d\u043e\u043c
-action.tools.browser=\u041f\u0435\u0440\u0433\u043b\u044f\u0434\u0430\u0447
-action.settings.configure=\u041d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u043d\u043d\u044f
-action.help.doc=\u0414\u043e\u043f\u043e\u043c\u043e\u0433
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_vi.properties b/TuxGuitar-testing/platform-all/share/lang/messages_vi.properties
deleted file mode 100644
index cadfffe7..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_vi.properties
+++ /dev/null
@@ -1,617 +0,0 @@
-ok=Ok
-cancel=Th\u00F4i
-yes=C\u00F3
-no=Kh\u00F4ng
-add=Th\u00EAm
-edit=S\u1EEDa
-remove=Xo\u00E1
-save=L\u01B0u
-exit=Tho\u00E1t
-close=\u0110\u00F3ng
-choose=Ch\u1ECDn
-color=M\u00E0u s\u1EAFc
-title=Ti\u00EAu \u0111\u1EC1
-go=Chuy\u1EC3n \u0111\u1EBFn
-warning=C\u1EA3nh b\u00E1o
-error=L\u1ED7i
-plugins=Tr\u00ECnh b\u1ED5 sung
-options=Tu\u1EF3 ch\u1ECDn
-defaults=M\u1EB7c \u0111\u1ECBnh
-clean=D\u1ECDn
-rename=\u0110\u1ED5i t\u00EAn
-fret=Ph\u00EDm \u0111\u00E0n
-position=V\u1ECB tr\u00ED
-name=T\u00EAn
-author=T\u00E1c gi\u1EA3
-version=Phi\u00EAn b\u1EA3n
-description=M\u00F4 t\u1EA3
-info=Th\u00F4ng tin
-configure=C\u1EA5u h\u00ECnh
-
-tuxguitar.title=Tux-Guitar
-
-file=T\u1EADp tin
-file.new=M\u1EDBi
-file.open=M\u1EDF
-file.save=L\u01B0u
-file.save-as=L\u01B0u d\u1EA1ng
-file.save-changes-question=C\u00F3 nhi\u1EC1u thay \u0111\u1ED5i ch\u01B0a l\u01B0u, b\u1EA1n c\u00F3 mu\u1ED1n tho\u00E1t m\u00E0 kh\u00F4ng l\u01B0u ch\u00FAng l\u1EA1i kh\u00F4ng?
-file.exit=Tho\u00E1t
-file.export=Xu\u1EA5t
-file.export-midi=Xu\u1EA5t MIDI
-file.export-pdf=Xu\u1EA5t PDF
-file.print=In
-file.print-preview=Xem th\u1EED
-file.import=Nh\u1EADp
-file.import-midi=Nh\u1EADp Midi
-file.export-ascii=Xu\u1EA5t ASCII
-file.history=\u0110\u00E3 l\u00E0m
-file.open-url=M\u1EDF URL
-file.open.error=Kh\u00F4ng m\u1EDF \u0111\u01B0\u1EE3c: {0}
-file.save.error=Kh\u00F4ng l\u01B0u \u0111\u01B0\u1EE3c: {0}
-file.import.error=Kh\u00F4ng nh\u1EADp \u0111\u01B0\u1EE3c: {0}
-file.export.error=Kh\u00F4ng xu\u1EA5t \u0111\u01B0\u1EE3c: {0}
-file.overwrite-question=T\u1EADp tin n\u00E0y c\u00F3 r\u1ED3i, B\u1EA1n c\u00F3 mu\u1ED1n ghi \u0111\u00E8 l\u00EAn n\u00F3 kh\u00F4ng??
-
-edit.menu=S\u1EEDa
-edit.undo=Hu\u1EF7 b\u01B0\u1EDBc
-edit.redo=L\u00E0m l\u1EA1i
-edit.copy=Ch\u00E9p
-edit.from=T\u1EEB
-edit.to=\u0110\u1EBFn
-edit.all-tracks=M\u1ECDi d\u1EA3i
-edit.paste=D\u00E1n
-edit.paste.replace-mode=D\u00E1n v\u00E0o \u00F4 nh\u1ECBp hi\u1EC7n t\u1EA1i
-edit.paste.insert-mode=D\u00E1n v\u00E0o \u00F4 nh\u1ECBp m\u1EDBi
-edit.delete=Xo\u00E1
-edit.cut=C\u1EAFt
-edit.mouse-mode-selection=Ch\u1EBF \u0111\u1ED9 ch\u1ECDn
-edit.mouse-mode-edition=Ch\u1EBF \u0111\u1ED9 so\u1EA1n th\u1EA3o
-edit.not-natural-key=Ch\u1EBF \u0111\u1ED9 th\u0103ng/gi\u00E1ng
-
-view=Xem
-view.layout=B\u1ED1 tr\u00ED
-view.layout.page=B\u1ED1 tr\u00ED trang
-view.layout.linear=B\u1ED1 tr\u00ED cu\u1ED9n ngang
-view.layout.compact=Thu g\u1ECDn
-view.layout.multitrack=Nhi\u1EC1u d\u1EA3i
-view.layout.chord-style=Ki\u1EC3u h\u1EE3p \u00E2m
-view.layout.chord-name=T\u00EAn h\u1EE3p \u00E2m
-view.layout.chord-diagram=S\u01A1 \u0111\u1ED3 h\u1EE3p \u00E2m
-view.layout.score-enabled=Hi\u1EC7n n\u1ED1t nh\u1EA1c
-view.layout.tablature-enabled=Hi\u1EC7n tab
-view.show-mixer=Hi\u1EC7n b\u1ED9 tr\u1ED9n \u00E2m
-view.show-fretboard=Hi\u1EC7n c\u1EA7n \u0111\u00E0n
-view.show-piano=Hi\u1EC7n piano
-view.show-matrix=Hi\u1EC7n ma tr\u1EADn
-view.show-transport=Hi\u1EC7n b\u1ED9 ph\u00E1t
-
-fretboard.right-mode=Tay ph\u1EA3i
-fretboard.left-mode=Tay tr\u00E1i
-fretboard.background-color=M\u00E0u n\u1EC1n
-fretboard.display-note-text=Hi\u1EC7n t\u00EAn n\u1ED1t
-fretboard.display-scale-text=Hi\u1EC7n t\u00EAn n\u1ED1t tr\u00EAn \u00E2m giai
-fretboard.font=Ph\u00F4ng ch\u1EEF
-fretboard.fretpoint-color=M\u00E0u ph\u00EDm \u0111\u00E0n
-fretboard.note-color=M\u00E0u n\u1ED1t
-fretboard.scale-note-color=M\u00E0u n\u1ED1t thu\u1ED9c \u00E2m giai
-fretboard.settings=Thi\u1EBFt l\u1EADp c\u1EA7n \u0111\u00E0n
-fretboard.string-color=M\u00E0u d\u00E2y
-fretboard.settings.options=Tu\u1EF3 ch\u1ECDn
-
-piano.editor=Ch\u1EC9nh s\u1EEDa piano
-piano.natural-key-color=Natural Key Color
-piano.not-natural-key-color=Unnatural Key Color
-piano.note-color=M\u00E0u n\u1ED1t
-piano.scale-note-color=M\u00E0u n\u1ED1t thu\u1ED9c \u00E2m giai
-piano.settings=Thi\u1EBFt l\u1EADp cho piano
-
-matrix.editor=Ch\u1EC9nh s\u1EEDa ma tr\u1EADn
-matrix.grids=S\u1ED1 \u00F4 \u0111\u1ECBnh v\u1ECB
-matrix.border-color=M\u00E0u vi\u1EC1n
-matrix.font=Ph\u00F4ng ch\u1EEF
-matrix.foreground-color=M\u00E0u tr\u01B0\u1EDBc
-matrix.line-color-1=M\u00E0u h\u00E0ng l\u1EBB
-matrix.line-color-2=M\u00E0u h\u00E0ng ch\u1EB5n
-matrix.line-color-over=M\u00E0u h\u00E0ng d\u01B0\u1EDBi chu\u1ED9t
-matrix.note-color=M\u00E0u n\u1ED1t
-matrix.play-note-color=M\u00E0u n\u1ED1t \u0111ang ph\u00E1t
-matrix.position-color=Position Color
-matrix.settings=Thi\u1EBFt l\u1EADp ma tr\u1EADn
-
-composition=S\u00E1ng t\u00E1c
-composition.timesignature=S\u1ED1 nh\u1ECBp
-composition.timesignature.Numerator=Ch\u1EC9 s\u1ED1 tr\u00EAn
-composition.timesignature.denominator=Ch\u1EC9 s\u1ED1 d\u01B0\u1EDBi
-composition.timesignature.to-the-end=\u0110\u1EBFn h\u1EBFt
-composition.tempo=Nh\u1ECBp \u0111\u1ED9
-composition.tempo-percent=Ph\u1EA7n tr\u0103m
-composition.tempo.invalid=Nh\u1ECBp \u0111\u1ED9 kh\u00F4ng h\u1EE3p l\u1EC7
-composition.tempo.start-to-end=D\u00F9ng nh\u1ECBp \u0111\u1ED9 n\u00E0y \u0111\u1EBFn h\u1EBFt
-composition.tempo.position-to-end=D\u00F9ng nh\u1ECBp \u0111\u1ED9 n\u00E0y t\u1EDBi h\u1EBFt
-composition.tempo.position-to-next=D\u00F9ng nh\u1ECBp \u0111\u1ED9 n\u00E0y \u0111\u1EBFn \u0111\u00E1nh d\u1EA5u nh\u1ECBp \u0111\u1ED9 k\u1EBF ti\u1EBFp
-composition.properties=Thu\u1ED9c t\u00EDnh
-composition.name=T\u00EAn
-composition.artist=Ngh\u1EC7 s\u0129
-composition.album=\u0110\u0129a
-composition.author=T\u00E1c gi\u1EA3
-composition.tripletfeel=Nh\u1ECBp li\u00EAn ba
-composition.clef=Kho\u00E1
-composition.clef.treble=\u00C2m b\u1ED5ng
-composition.clef.bass=Bass
-composition.clef.tenor=Tenor
-composition.clef.alto=Alto
-composition.clef.to-the-end=D\u00F9ng kho\u00E1 n\u00E0y t\u1EDBi h\u1EBFt
-composition.keysignature=K\u00FD hi\u1EC7u kho\u00E1
-composition.keysignature.natural=T\u1EF1 nhi\u00EAn
-composition.keysignature.sharp-1=1 d\u1EA5u th\u0103ng
-composition.keysignature.sharp-2=2 d\u1EA5u th\u0103ng
-composition.keysignature.sharp-3=3 d\u1EA5u th\u0103ng
-composition.keysignature.sharp-4=4 d\u1EA5u th\u0103ng
-composition.keysignature.sharp-5=5 d\u1EA5u th\u0103ng
-composition.keysignature.sharp-6=6 d\u1EA5u th\u0103ng
-composition.keysignature.sharp-7=7 d\u1EA5u th\u0103ng
-composition.keysignature.flat-1=1 d\u1EA5u gi\u00E1ng
-composition.keysignature.flat-2=2 d\u1EA5u gi\u00E1ng
-composition.keysignature.flat-3=3 d\u1EA5u gi\u00E1ng
-composition.keysignature.flat-4=4 d\u1EA5u gi\u00E1ng
-composition.keysignature.flat-5=5 d\u1EA5u gi\u00E1ng
-composition.keysignature.flat-6=6 d\u1EA5u gi\u00E1ng
-composition.keysignature.flat-7=7 d\u1EA5u gi\u00E1ng
-composition.keysignature.to-the-end=D\u00F9ng k\u00FD hi\u1EC7u kho\u00E1 n\u00E0y t\u1EDBi h\u1EBFt
-composition.tripletfeel=Nh\u1ECBp li\u00EAn ba
-composition.tripletfeel.none=Kh\u00F4ng c\u00F3
-composition.tripletfeel.eighth=Li\u00EAn ba \u0111\u01A1n
-composition.tripletfeel.sixteenth=Li\u00EAn ba k\u00E9p
-composition.tripletfeel.to-the-end=D\u00F9ng ki\u1EC3u nh\u1ECBp n\u00E0y t\u1EDBi h\u1EBFt
-
-help=Tr\u1EE3 gi\u00FAp
-help.help=Tr\u1EE3 gi\u00FAp
-help.doc=T\u00E0i li\u1EC7u
-help.about=Gi\u1EDBi thi\u1EC7u
-help.about.license=Gi\u1EA5y ph\u00E9p
-help.about.authors=T\u00E1c gi\u1EA3
-help.about.description=M\u00F4 t\u1EA3
-
-track=D\u1EA3i
-track.number=S\u1ED1
-track.name=T\u00EAn
-track.color=M\u00E0u s\u1EAFc
-track.first=D\u1EA3i \u0111\u1EA7u
-track.last=D\u1EA3i cu\u1ED1i
-track.previous=D\u1EA3i tr\u01B0\u1EDBc
-track.next=D\u1EA3i k\u1EBF
-track.add=Th\u00EAm d\u1EA3i
-track.remove=Xo\u00E1 d\u1EA3i
-track.clone=Nh\u00E2n \u0111\u00F4i d\u1EA3i
-track.move-up=\u0110\u01B0a l\u00EAn
-track.move-down=\u0110\u01B0a xu\u1ED1ng
-track.instrument=Nh\u1EA1c c\u1EE5
-track.properties=Thu\u1ED9c t\u00EDnh
-track.properties.general=Chung
-track.name.default-percussion-name=B\u1ED9 g\u00F5
-track.lyrics=L\u1EDDi
-track.solo=\u0110\u1ED9c t\u1EA5u
-track.mute=C\u00E2m
-
-lyric.editor=So\u1EA1n l\u1EDDi
-
-measure=\u00D4 nh\u1ECBp
-measure.first=\u00D4 nh\u1ECBp \u0111\u1EA7u ti\u00EAn
-measure.last=\u00D4 nh\u1ECBp cu\u1ED1i c\u00F9ng
-measure.previous=\u00D4 nh\u1ECBp tr\u01B0\u1EDBc
-measure.next=\u00D4 nh\u1ECBp k\u1EBF
-measure.add=Th\u00EAm \u00F4 nh\u1ECBp
-measure.add-before-current-position=Th\u00EAm \u00F4 nh\u1ECBp v\u00E0o tr\u01B0\u1EDBc v\u1ECB tr\u00ED hi\u1EC7n t\u1EA1i
-measure.add-after-current-position=Th\u00EAm \u00F4 nh\u1ECBp v\u00E0o sau v\u1ECB tr\u00ED hi\u1EC7n t\u1EA1i
-measure.add-at-end=Th\u00EAm \u00F4 nh\u1ECBp v\u00E0o cu\u1ED1i
-measure.remove=B\u1ECF \u00F4 nh\u1ECBp
-measure.copy=Ch\u00E9p \u00F4 nh\u1ECBp
-measure.paste=D\u00E1n \u00F4 nh\u1ECBp
-measure.clean=Xo\u00E1 \u00F4 nh\u1ECBp
-
-duration=Tr\u01B0\u1EDDng \u0111\u1ED9
-duration.whole=N\u1ED1t tr\u00F2n
-duration.half=N\u1ED1t tr\u1EAFng
-duration.quarter=N\u1ED1t \u0111en
-duration.eighth=M\u00F3c \u0111\u01A1n
-duration.sixteenth=M\u00F3c k\u00E9p
-duration.thirtysecond=M\u00F3c ba
-duration.sixtyfourth=M\u00F3c b\u1ED1n
-duration.dotted=Ch\u1EA5m
-duration.doubledotted=Hai ch\u1EA5m
-duration.division-type=Ch\u00F9m ba
-
-dynamic=C\u01B0\u1EDDng \u0111\u1ED9
-dynamic.piano-pianissimo=C\u1EF1c nh\u1EB9 (ppp)
-dynamic.pianissimo=R\u1EA5t nh\u1EB9 (pp)
-dynamic.piano=Nh\u1EB9 (p)
-dynamic.mezzo-piano=Nh\u1EB9 v\u1EEBa (mp)
-dynamic.mezzo-forte=M\u1EA1nh v\u1EEBa (mf)
-dynamic.forte=M\u1EA1nh (f)
-dynamic.fortissimo=R\u1EA5t m\u1EA1nh (ff)
-dynamic.forte-fortissimo=C\u1EF1c m\u1EA1nh (fff)
-
-effects=Hi\u1EC7u \u1EE9ng
-effects.vibrato=Rung d\u00E2y
-effects.bend=Nh\u00EDu d\u00E2y
-effects.deadnote=N\u1ED1t c\u00E2m
-effects.slide=L\u01B0\u1EDBt
-effects.hammer=G\u00F5/nh\u1EA5c ng\u00F3n
-effects.tremolo-bar=D\u00F9ng c\u1EA7n nh\u00FAn
-effects.tremolo-bar-editor=C\u00E1ch d\u00F9ng c\u1EA7n nh\u00FAn
-effects.tremolo-bar.dip=Xu\u1ED1ng-L\u00EAn
-effects.tremolo-bar.dive=Ch\u1EC9 xu\u1ED1ng
-effects.tremolo-bar.release-up=Release Up
-effects.tremolo-bar.release-down=Release Down
-effects.tremolo-bar.inverted-dip=L\u00EAn-Xu\u1ED1ng
-effects.tremolo-bar.return=Return
-effects.ghostnote=N\u1ED1t \u0111\u00E1nh nh\u1EB9
-effects.accentuatednote=N\u1ED1t \u0111\u00E1nh r\u00F5
-effects.heavyaccentuatednote=N\u1ED1t \u0111\u00E1nh r\u1EA5t r\u00F5
-effects.harmonic=\u00C2m b\u1ED3i
-effects.grace=N\u1ED1t chuy\u1EC3n
-effects.grace-editor=So\u1EA1n n\u1ED1t chuy\u1EC3n
-effects.grace.before-beat=Before beat
-effects.grace.on-beat=On beat
-effects.grace.transition=Chuy\u1EC3n tay
-effects.grace.transition-none=Kh\u00F4ng
-effects.grace.transition-bend=Nh\u00EDu d\u00E2y
-effects.grace.transition-slide=L\u01B0\u1EDBt d\u00E2y
-effects.grace.transition-hammer=G\u00F5
-effects.trill=L\u00E1y r\u1EC1n
-effects.trill-editor=So\u1EA1n l\u00E1y r\u1EC1n
-effects.tremolo-picking=V\u00EA 1 n\u1ED1t
-effects.tremolo-picking-editor=C\u00E1ch v\u00EA 1 n\u1ED1t
-effects.palm-mute=Ch\u1EB7t tay
-effects.staccato=N\u1ED1t ng\u1EAFt \u00E2m
-effects.tapping=Ch\u1EA5m ng\u00F3n
-effects.slapping=V\u1ED7 d\u00E2y
-effects.popping=M\u00F3c d\u00E2y
-effects.fade-in=To d\u1EA7n
-effects.harmonic-editor=S\u1EEDa \u00E2m b\u1ED3i
-effects.harmonic.type-of-harmonic=Ki\u1EC3u \u00E2m b\u1ED3i
-effects.harmonic.natural=\u00C2m b\u1ED3i t\u1EF1 nhi\u00EAn
-effects.harmonic.artificial=\u00C2m b\u1ED3i nh\u00E2n t\u1EA1o
-effects.harmonic.artificial.key-offset=Key Offset
-effects.harmonic.tapped=\u00C2m b\u1ED3i do ch\u1EA5m ng\u00F3n
-effects.harmonic.tapped.left-hand=Tay tr\u00E1i
-effects.harmonic.tapped.right-hand=Tay ph\u1EA3i
-effects.harmonic.pinch=Pinch Harmonic
-effects.harmonic.semi=\u00C2m b\u1ED3i n\u1EEDa
-
-bend.editor=S\u1EEDa nh\u00EDu d\u00E2y
-bend.bend=Nh\u00EDu d\u00E2y
-bend.bend-release=Nh\u00EDu/Nh\u1EA3
-bend.bend-release-bend=Nh\u00EDu/Nh\u1EA3/Nh\u00EDu
-bend.prebend=Nh\u00EDu tr\u01B0\u1EDBc
-bend.prebend-release=Nh\u00EDu tr\u01B0\u1EDBc/nh\u1EA3
-
-transport=B\u1ED9 ph\u00E1t
-transport.start=B\u1EAFt \u0111\u1EA7u
-transport.stop=D\u1EEBng
-transport.pause=T\u1EA1m d\u1EEBng
-transport.first=\u0110\u1EA7u
-transport.last=Cu\u1ED1i
-transport.previous=Tr\u01B0\u1EDBc
-transport.next=K\u1EBF
-transport.metronome=D\u1EADm nh\u1ECBp
-transport.mode=Ch\u1EBF \u0111\u1ED9 ph\u00E1t
-transport.mode.simple=Ch\u1EBF \u0111\u1ED9 \u0111\u01A1n gi\u1EA3n
-transport.mode.simple.tempo-percent=Ph\u1EA7n tr\u0103m nh\u1ECBp \u0111\u1ED9
-transport.mode.simple.loop=Ph\u00E1t l\u1EB7p l\u1EA1i
-transport.mode.trainer=T\u1EADp theo
-transport.mode.trainer.increment-description=T\u0103ng l\u00EAn
-
-instruments.volume=Khu\u1EBFch \u0111\u1EA1i
-instrument.volume=\u00C2m l\u01B0\u1EE3ng
-instrument.channel=K\u00EAnh
-instrument.effect-channel=Hi\u1EC7u\u1EE8ng
-instrument.balance=C\u00E2n b\u1EB1ng
-instrument.free=Free
-instrument.link=Li\u00EAn k\u1EBFt
-
-
-repeat.open=M\u1EDF d\u1EA5u l\u1EB7p
-repeat.close=\u0110\u00F3ng d\u1EA5u l\u1EB7p
-repeat.alternative=L\u1EB7p kh\u00E1c \u0111i
-repeat.alternative.editor=S\u1EEDa d\u1EA5u l\u1EB7p kh\u00E1c
-repetitions=Kho\u00E1 l\u1EB7p
-repeat.number-of-repetitions=S\u1ED1 l\u1EA7n l\u1EB7p
-
-beat=Ph\u00E1ch
-beat.clean=Xo\u00E1 nh\u1ECBp
-
-note=N\u1ED1t
-note.semitone-up=L\u00EAn n\u1EEDa cung
-note.semitone-down=Xu\u1ED1ng n\u1EEDa cung
-note.shift-up=D\u1ECBch l\u00EAn
-note.shift-down=D\u1ECBch xu\u1ED1ng
-note.tiednote=N\u1ED1t luy\u1EBFn
-note.deadnote=N\u1ED1t c\u00E2m
-
-insert.chord=Ch\u00E8n h\u1EE3p \u00E2m
-chord.editor=So\u1EA1n h\u1EE3p \u00E2m
-chord=H\u1EE3p \u00E2m
-chord.name=T\u00EAn
-chord.bass=Bass
-chord.custom=H\u1EE3p \u00E2m t\u1EF1 \u0111\u1EB7t
-chord.custom.name-empty-error=Kh\u00F4ng \u0111\u01B0\u1EE3c \u0111\u1EC3 tr\u1ED1ng t\u00EAn h\u1EE3p \u00E2m.
-chord.custom.name-exist-error=T\u00EAn n\u00E0y \u0111\u00E3 \u0111\u01B0\u1EE3c d\u00F9ng r\u1ED3i.
-chord.settings.tip=Thi\u1EBFt l\u1EADp t\u1EF1 ch\u1ECDn
-chord.settings.type=Ki\u1EC3u
-chord.settings.type.most-common=Chung nh\u1EA5t
-chord.settings.type.inversions=Inversions
-chord.settings.type.close-voiced=H\u1EE3p \u00E2m c\u00F3 3 n\u1ED1t c\u00F9ng tr\u00EAn 1 b\u00E1t \u0111\u1ED9
-chord.settings.type.open-voiced=Open Voiced
-chord.settings.open-chords=Open Chords
-chord.settings.chords-to-display=H\u1EE3p \u00E2m s\u1EBD \u0111\u01B0\u1EE3c bi\u1EC3u di\u1EC5n
-chord.settings.search-frets=Search Frets
-chord.settings.minimum-fret=Nh\u1ECF nh\u1EA5t
-chord.settings.maximum-fret=L\u1EDBn nh\u1EA5t
-
-instrument=Nh\u1EA1c c\u1EE5
-instrument.instrument=Nh\u1EA1c c\u1EE5
-instrument.percussion-track=D\u1EA3i cho b\u1ED9 g\u00F5
-
-tuning=L\u00EAn d\u00E2y
-tuning.strings=D\u00E2y
-tuning.offset=Offset
-
-language=Ng\u00F4n ng\u1EEF
-
-choose-color=Ch\u1ECDn m\u00E0u
-
-settings=Thi\u1EBFt l\u1EADp
-settings.config=C\u1EA5u h\u00ECnh TuxGuitar
-settings.config.language=Ng\u00F4n ng\u1EEF
-settings.config.language.choose=Ch\u1ECDn ng\u00F4n ng\u1EEF
-settings.config.styles=Ki\u1EC3u d\u00E1ng
-settings.config.styles.general=Ki\u1EC3u d\u00E1ng chung
-settings.config.styles.printer=Ki\u1EC3u d\u00E1ng in ra
-settings.config.styles.font.default=Ph\u00F4ng m\u1EB7c \u0111\u1ECBnh
-settings.config.styles.font.note=Ph\u00F4ng n\u1ED1t nh\u1EA1c
-settings.config.styles.font.lyric=Ph\u00F4ng cho ph\u1EA7n l\u1EDDi
-settings.config.styles.font.text=Ph\u00F4ng v\u0103n b\u1EA3n
-settings.config.styles.font.time-signature=Ph\u00F4ng cho s\u1ED1 nh\u1ECBp
-settings.config.styles.font.printer-default=Ph\u00F4ng m\u1EB7c \u0111\u1ECBnh d\u00F9ng \u0111\u1EC3 in
-settings.config.styles.font.printer-note=Ph\u00F4ng d\u00F9ng \u0111\u1EC3 in n\u1ED1t
-settings.config.styles.font.printer-time-signature=Ph\u00F4ng d\u00F9ng \u0111\u1EC3 in s\u1ED1 nh\u1ECBp
-settings.config.styles.color.score-note=M\u00E0u n\u1ED1t tr\u00EAn b\u1EA3n nh\u1EA1c
-settings.config.styles.color.tab-note=M\u00E0u n\u1ED1t tr\u00EAn Tab
-settings.config.styles.color.play-note=M\u00E0u n\u1ED1t \u0111ang ph\u00E1t
-settings.config.apply-changes-question=B\u1EA1n c\u00F3 d\u00F9ng c\u00E1c thay \u0111\u1ED5i lu\u00F4n kh\u00F4ng?
-settings.config.sound=\u00C2m thanh
-settings.config.main=Chung
-settings.config.main.window-title=Ti\u00EAu \u0111\u1EC1 c\u1EEDa s\u1ED5
-settings.config.main.window-title.help=C\u00E1c bi\u1EBFn sau t\u01B0\u01A1ng \u0111\u01B0\u01A1ng v\u1EDBi n\u1ED9i dung hi\u1EC3n th\u1ECB tr\u00EAn thanh ti\u00EAu \u0111\u1EC1:
-settings.config.main.window-title.var.description.appname=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi t\u00EAn \u1EE9ng d\u1EE5ng: TuxGuitar
-settings.config.main.window-title.var.description.appversion=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi phi\u00EAn b\u1EA3n TuxGuitar
-settings.config.main.window-title.var.description.filename=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi t\u00EAn t\u1EADp tin \u0111ang m\u1EDF
-settings.config.main.window-title.var.description.filepath=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi \u0111\u01B0\u1EDDng d\u1EABn c\u1EE7a t\u1EADp tin \u0111ang m\u1EDF
-settings.config.main.window-title.var.description.songname=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi t\u00EAn b\u00E0i h\u00E1t
-settings.config.main.window-title.var.description.songauthor=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi t\u00E1c gi\u1EA3 b\u00E0i h\u00E1t
-settings.config.main.window-title.var.description.songalbum=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi \u0111\u0129a nh\u1EA1c c\u00F3 b\u00E0i h\u00E1t
-settings.config.main.window-title.var.description.songartist=Bi\u1EBFn n\u00E0y \u1EE9ng v\u1EDBi ngh\u1EC7 s\u0129 tr\u00ECnh b\u00E0y b\u00E0i h\u00E1t
-settings.config.main.options=Tu\u1EF3 ch\u1ECDn
-settings.config.main.splash-enabled=Hi\u1EC3n th\u1ECB m\u00E0n h\u00ECnh ch\u00E0o khi kh\u1EDFi \u0111\u1ED9ng
-settings.config.main.table.auto-size.enabled=Cho ph\u00E9p t\u1EF1 \u0111\u1ED9ng \u0111\u1ECBnh l\u1EA1i k\u00EDch c\u1EE1 b\u1EA3ng
-settings.config.styles.color.lines=M\u00E0u c\u00E1c \u0111\u01B0\u1EDDng k\u1EBB ngang
-settings.config.toolbars=C\u00E1c thanh c\u00F4ng c\u1EE5
-settings.config.toolbars.tip=\u0110\u1EB7t thanh c\u00F4ng c\u1EE5
-settings.config.toolbars.list=C\u00E1c thanh c\u00F4ng c\u1EE5 c\u00F3 s\u1EB5n
-settings.config.toolbars.move-up=\u0110\u01B0a l\u00EAn
-settings.config.toolbars.move-down=\u0110\u01B0a xu\u1ED1ng
-settings.config.skin=Giao di\u1EC7n
-settings.config.skin.choose=Ch\u1ECDn s\u1EAFc th\u00E1i giao di\u1EC7n
-settings.keybindings=C\u1EA5u h\u00ECnh ph\u00EDm t\u1EAFt
-
-key-bindings-editor=So\u1EA1n ph\u00EDm t\u1EAFt
-key-bindings-editor-action-select=Ch\u1ECDn h\u00E0nh \u0111\u1ED9ng
-key-bindings-editor-action-column=H\u00E0nh \u0111\u1ED9ng
-key-bindings-editor-shortcut-column=Ph\u00EDm t\u1EAFt
-key-bindings-editor-push-a-key=Nh\u1EA5n m\u1ED9t ph\u00EDm
-key-bindings-editor-save-question=C\u00F3 nhi\u1EC1u thay \u0111\u1ED5i ch\u01B0a l\u01B0u, b\u1EA1n c\u00F3 mu\u1ED1n tho\u00E1t m\u00E0 kh\u00F4ng l\u01B0u ch\u00FAng l\u1EA1i kh\u00F4ng?
-
-key-bindings-editor-override=\u0110\u00E3 g\u00E1n ph\u00EDm t\u1EAFt n\u00E0y cho h\u00E0nh \u0111\u1ED9ng kh\u00E1c! B\u1EA1n c\u00F3 s\u1EEDa l\u1EA1i kh\u00F4ng?
-
-print.print=In
-print.dialog=In
-print.service=D\u1ECBch v\u1EE5
-print.service.name=T\u00EAn
-print.service.status=Tr\u1EA1ng th\u00E1i
-print.service.type=Ki\u1EC3u
-print.service.info=Th\u00F4ng tin
-print.range=Ph\u1EA1m vi
-print.range.all-pages=T\u1EA5t c\u1EA3
-print.range.pages=Trang
-print.range.pages-to=\u0110\u1EBFn
-print.copies=B\u1EA3n sao
-print.copies-number=S\u1ED1 b\u1EA3n sao
-print.print-to-file=In ra t\u1EADp tin
-print.file-chooser=Ch\u1ECDn
-print-header.default-song-name=V\u00F4 \u0111\u1EC1
-print-header.default-song-author=V\u00F4 danh
-
-print.preview=Xem th\u1EED
-print.preview.page-of=Of
-
-marker=\u0110\u00E1nh d\u1EA5u
-marker.add=Th\u00EAm \u0111\u00E1nh d\u1EA5u
-marker.list=Li\u1EC7t k\u00EA c\u00E1c d\u1EA5u
-marker.first=T\u1EDBi d\u1EA5u \u0111\u1EA7u ti\u00EAn
-marker.last=T\u1EDBi d\u1EA5u cu\u1ED1i c\u00F9ng
-marker.next=T\u1EDBi \u0111\u00E1nh d\u1EA5u k\u1EBF ti\u1EBFp
-marker.previous=T\u1EDBi \u0111\u00E1nh d\u1EA5u tr\u01B0\u1EDBc
-
-export.tablature-enabled=Hi\u1EC7n tab
-export.score-enabled=Hi\u1EC7n b\u1EA3n nh\u1EA1c
-export.chord-name-enabled=Hi\u1EC7n t\u00EAn h\u1EE3p \u00E2m
-export.chord-diagram-enabled=Hi\u1EC7n s\u01A1 \u0111\u1ED3 h\u1EE3p \u00E2m
-
-scale=\u00C2m giai
-scale.list=Li\u1EC7t k\u00EA \u00E2m giai
-
-text.insert=Ch\u00E8n v\u0103n b\u1EA3n
-text.editor=So\u1EA1n th\u1EA3o v\u0103n b\u1EA3n
-text.text=V\u0103n b\u1EA3n
-
-tools=C\u00F4ng c\u1EE5
-tools.scale=Danh s\u00E1ch \u00E2m giai
-tools.browser=B\u1ED9 duy\u1EC7t
-tools.plugins=Tr\u00ECnh b\u1ED5 sung
-tools.shortcuts=C\u00E1c ph\u00EDm t\u1EAFt
-tools.settings=Thi\u1EBFt l\u1EADp
-
-browser.dialog=B\u1ED9 duy\u1EC7t
-browser.menu.file=T\u1EADp tin
-browser.open=M\u1EDF
-browser.exit=Tho\u00E1t
-browser.menu.collection=Tuy\u1EC3n t\u1EADp
-browser.menu.go=Chuy\u1EC3n \u0111\u1EBFn
-browser.collection.select=Ch\u1ECDn th\u01B0 vi\u1EC7n
-browser.collection.open=M\u1EDF
-browser.collection.remove=Xo\u00E1
-browser.collection.close=\u0110\u00F3ng
-browser.collection.new=M\u1EDBi
-browser.go-root=Nh\u00E0
-browser.go-back=L\u00F9i
-browser.refresh=C\u1EADp nh\u1EADt
-browser.factory.fs.name=H\u1EC7 t\u1EADp tin
-browser.collection.fs.name=T\u00EAn
-browser.collection.fs.path=Th\u01B0 m\u1EE5c
-browser.collection.fs.editor-title=L\u1EA5y t\u1EEB h\u1EC7 t\u1EADp tin
-browser.collection.fs.editor-tip=Ch\u1ECDn th\u01B0 m\u1EE5c ch\u1EE9a th\u01B0 vi\u1EC7n b\u1EA3n nh\u1EA1c
-browser.collection.fs.invalid-path=Xin h\u00E3y ch\u1ECDn m\u1ED9t th\u01B0 m\u1EE5c h\u1EE3p l\u1EC7
-
-midi.port=C\u1ED5ng MIDI
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=Kh\u00F4ng c\u00F3.
-plugin.column.name=T\u00EAn tr\u00ECnh b\u1ED5 sung
-plugin.column.enabled=B\u1EADt
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=T\u1EADp tin
-edit.items=S\u1EEDa
-property.items=Thu\u1ED9c t\u00EDnh
-track.items=D\u1EA3i
-duration.items=Tr\u01B0\u1EDDng \u0111\u1ED9
-beat.items=Beat Items
-composition.items=So\u1EA1n nh\u1EA1c
-repeat.items=\u0110\u00E1nh d\u1EA5u l\u1EB7p
-transport.items=Ph\u00E1t l\u1EA1i
-marker.items=\u0110\u00E1nh d\u1EA5u
-insert.items=Ch\u00E8n
-layout.items=B\u1ED1 tr\u00ED
-view.items=Xem
-effect.items=Hi\u1EC7u \u1EE9ng
-dynamic.items=C\u01B0\u1EDDng \u0111\u1ED9
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=T\u1EADp tin m\u1EDBi
-action.file.open=M\u1EDF t\u1EADp tin
-action.file.open-url=M\u1EDF URL
-action.file.save=L\u01B0u
-action.file.save-as=L\u01B0u d\u1EA1ng
-action.file.print=In
-action.file.print-preview=Xem th\u1EED
-action.file.exit=Tho\u00E1t kh\u1ECFi Tux-Guitar
-action.edit.undo=Hu\u1EF7 b\u01B0\u1EDBc
-action.edit.redo=L\u00E0m l\u1EA1i
-action.composition.change-time-signature=\u0110\u1ED5i s\u1ED1 nh\u1ECBp
-action.composition.change-tempo=\u0110\u1ED5i nh\u1ECBp \u0111\u1ED9
-action.composition.change-info=\u0110\u1ED5i th\u00F4ng tin b\u00E0i h\u00E1t
-action.composition.change-clef=\u0110\u1ED5i kho\u00E1
-action.composition.change-key-signature=\u0110\u1ED5i k\u00FD hi\u1EC7u kho\u00E1
-action.composition.change-triplet-feel=\u0110\u1ED5i nh\u1ECBp li\u00EAn ba
-action.view.layout-set-page=B\u1ED1 tr\u00ED trang
-action.view.layout-set-linear=B\u1ED1 tr\u00ED th\u1EB3ng
-action.view.layout-set-multitrack=Hi\u1EC7n nhi\u1EC1u d\u1EA3i
-action.view.layout-set-score-enabled=Hi\u1EC7n n\u1ED1t nh\u1EA1c
-action.view.layout-set-tablature-enabled=Hi\u1EC7n tab
-action.view.layout-set-compact=Ch\u1EBF \u0111\u1ED9 thu g\u1ECDn
-action.view.layout-set-chord-diagram-enabled=B\u1EADt s\u01A1 \u0111\u1ED3 h\u1EE3p \u00E2m
-action.view.layout-set-chord-name-enabled=T\u00EAn h\u1EE3p \u00E2m
-action.view.show-fretboard=Hi\u1EC7n c\u1EA7n \u0111\u00E0n
-action.view.show-piano=Hi\u1EC7n piano
-action.view.show-matrix=Hi\u1EC7n ma tr\u1EADn
-action.view.show-mixer=Hi\u1EC7n b\u1ED9 tr\u1ED9n \u00E2m
-action.view.show-transport=Hi\u1EC7n B\u1ED9 ph\u00E1t
-action.track.add=Th\u00EAm d\u1EA3i
-action.track.remove=Xo\u00E1 d\u1EA3i
-action.track.clone=Sao nguy\u00EAn d\u1EA3i
-action.track.go-first=T\u1EDBi d\u1EA3i \u0111\u1EA7u ti\u00EAn
-action.track.go-last=T\u1EDBi d\u1EA3i cu\u1ED1i c\u00F9ng
-action.track.go-next=T\u1EDBi d\u1EA3i k\u1EBF ti\u1EBFp
-action.track.go-previous=T\u1EDBi d\u1EA3i tr\u01B0\u1EDBc
-action.track.lyrics=So\u1EA1n l\u1EDDi
-action.track.properties=\u0110\u1ED5i thu\u1ED9c t\u00EDnh d\u1EA3i
-action.track.move-down=\u0110\u01B0a d\u1EA3i xu\u1ED1ng
-action.track.move-up=\u0110\u01B0a d\u1EA3i l\u00EAn
-action.measure.add=Th\u00EAm \u00F4 nh\u1ECBp
-action.measure.remove=B\u1ECF \u00F4 nh\u1ECBp
-action.measure.copy=Ch\u00E9p \u00F4 nh\u1ECBp
-action.measure.paste=D\u00E1n \u00F4 nh\u1ECBp
-action.measure.clean=Xo\u00E1 \u00F4 nh\u1ECBp
-action.measure.go-first=T\u1EDBi \u00F4 nh\u1ECBp \u0111\u1EA7u ti\u00EAn
-action.measure.go-last=T\u1EDBi \u00F4 nh\u1ECBp cu\u1ED1i c\u00F9ng
-action.measure.go-next=T\u1EDBi \u00F4 nh\u1ECBp k\u1EBF
-action.measure.go-previous=T\u1EDBi \u00F4 nh\u1ECBp tr\u01B0\u1EDBc
-action.note.general.clean-beat=Xo\u00E1 ph\u00E1ch
-action.note.general.decrement-semitone=Gi\u1EA3m n\u1EEDa cung
-action.note.general.increment-semitone=T\u0103ng n\u1EEDa cung
-action.note.general.shift-down=D\u1ECBch xu\u1ED1ng
-action.note.general.shift-up=D\u1ECBch l\u00EAn
-action.note.general.tied=Th\u00EAm/Xo\u00E1 n\u1ED1t luy\u1EBFn
-action.note.duration.set-whole=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 n\u1ED1t tr\u00F2n
-action.note.duration.set-half=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 n\u1ED1t tr\u1EAFng
-action.note.duration.set-quarter=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 n\u1ED1t \u0111en
-action.note.duration.set-eighth=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 m\u00F3c \u0111\u01A1n
-action.note.duration.set-sixteenth=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 m\u00F3c k\u00E9p
-action.note.duration.set-thirty-second=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 m\u00F3c ba
-action.note.duration.set-sixty-fourth=\u0110\u1EB7t tr\u01B0\u1EDDng \u0111\u1ED9 l\u00E0 m\u00F3c b\u1ED1n
-action.note.duration.change-dotted=Th\u00EAm/Xo\u00E1 ch\u1EA5m
-action.note.duration.change-double-dotted=Th\u00EAm/Xo\u00E1 ch\u1EA5m \u0111\u00F4i
-action.note.duration.change-division-type=Th\u00EAm/Xo\u00E1 ch\u00F9m ba
-action.note.duration.decrement-duration=Gi\u1EA3m tr\u01B0\u1EDDng \u0111\u1ED9
-action.note.duration.increment-duration=T\u0103ng tr\u01B0\u1EDDng \u0111\u1ED9
-action.note.effect.change-vibrato=Th\u00EAm/Xo\u00E1 rung d\u00E2y
-action.note.effect.change-bend=Th\u00EAm/Xo\u00E1 nh\u00EDu d\u00E2y
-action.note.effect.change-slide=Th\u00EAm/Xo\u00E1 l\u01B0\u1EDBt d\u00E2y
-action.note.effect.change-hammer=Th\u00EAm/Xo\u00E1 g\u00F5/nh\u1EA5c ng\u00F3n
-action.note.effect.change-accentuated=Add/Remove accentuated
-action.note.effect.change-dead=Th\u00EAm/Xo\u00E1 n\u1ED1t c\u00E2m
-action.note.effect.change-fade-in=Th\u00EAm/Xo\u00E1 \u0111\u00E1nh to d\u1EA7n
-action.note.effect.change-ghost=Add/Remove ghost
-action.note.effect.change-grace=Th\u00EAm/Xo\u00E1 n\u1ED1t chuy\u1EC3n
-action.note.effect.change-harmonic=Add/Remove harmonic
-action.note.effect.change-heavy-accentuated=Add/Remove heavy accentuated
-action.note.effect.change-palm-mute=Add/Remove palm mute
-action.note.effect.change-popping=Th\u00EAm/Xo\u00E1 m\u00F3c d\u00E2y
-action.note.effect.change-slapping=Th\u00EAm/Xo\u00E1 v\u1ED7 d\u00E2y
-action.note.effect.change-staccato=Th\u00EAm/Xo\u00E1 n\u1ED1t ng\u1EAFt \u00E2m
-action.note.effect.change-tapping=Th\u00EAm/Xo\u00E1 ch\u1EA5m ng\u00F3n
-action.note.effect.change-tremolo-bar=D\u00F9ng/Kh\u00F4ng d\u00F9ng c\u1EA7n nh\u00FAn
-action.note.effect.change-tremolo-picking=Th\u00EAm/Xo\u00E1 v\u00EA 1 n\u1ED1t
-action.note.effect.change-trill=Th\u00EAm/Xo\u00E1 l\u00E1y r\u1EC1n
-action.insert.open-repeat=M\u1EDF d\u1EA5u l\u1EB7p
-action.insert.close-repeat=\u0110\u00F3ng d\u1EA5u l\u1EB7p
-action.insert.repeat-alternative=L\u1EB7p kh\u00E1c \u0111i
-action.insert.chord=Ch\u00E8n h\u1EE3p \u00E2m
-action.insert.text=Ch\u00E8n v\u0103n b\u1EA3n
-action.marker.add=Th\u00EAm d\u1EA5u
-action.marker.go-next=T\u1EDBi \u0111\u00E1nh d\u1EA5u k\u1EBF
-action.marker.go-previous=T\u1EDBi \u0111\u00E1nh d\u1EA5u tr\u01B0\u1EDBc
-action.transport.play=Ph\u00E1t
-action.transport.stop=Ng\u1EEBng ph\u00E1t
-action.transport.mode=Ch\u1EBF \u0111\u1ED9 ph\u00E1t
-action.transport.metronome=\u0110\u00E1nh nh\u1ECBp
-action.tools.browser=B\u1ED9 duy\u1EC7t
-action.settings.configure=Thi\u1EBFt l\u1EADp
-action.help.doc=Tr\u1EE3 gi\u00FAp
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_zh_GB.properties b/TuxGuitar-testing/platform-all/share/lang/messages_zh_GB.properties
deleted file mode 100644
index a4847cb0..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_zh_GB.properties
+++ /dev/null
@@ -1,1237 +0,0 @@
-###############################################################
-###                  Defaul language codes                  ###
-###############################################################
-zh=\u7B80\u4F53\u4E2D\u6587
-###############################################################
-
-action.composition.change-clef=\u66F4\u6539\u8C31\u53F7
-
-action.composition.change-info=\u4FEE\u6539\u6B4C\u8C31\u4FE1\u606F
-
-action.composition.change-key-signature=\u66F4\u6539\u8C03\u53F7
-
-action.composition.change-tempo=\u66F4\u6539\u8282\u62CD
-
-action.composition.change-time-signature=\u53D8\u6362\u62CD\u5B50
-
-action.composition.change-triplet-feel=\u6539\u53D8\u4E09\u8FDE\u97F3
-
-action.edit.redo=\u91CD\u505A
-
-action.edit.undo=\u53D6\u6D88
-
-action.file.exit=\u9000\u51FATuxGuitar
-
-# ########################
-# ##Key Binding Actions###
-# ########################
-action.file.new=\u65B0\u5EFA
-
-action.file.open=\u6253\u5F00
-
-action.file.open-url=\u6253\u5F00URL
-
-action.file.print=\u6253\u5370
-
-action.file.print-preview=\u6253\u5370\u9884\u89C8
-
-action.file.save=\u4FDD\u5B58
-
-action.file.save-as=\u53E6\u5B58\u4E3A
-
-action.help.doc=\u5E2E\u52A9
-
-action.insert.chord=\u63D2\u5165\u548C\u5F26
-
-action.insert.close-repeat=\u5173\u95ED\u91CD\u590D
-
-action.insert.open-repeat=\u6253\u5F00\u91CD\u590D
-
-action.insert.repeat-alternative=\u91CD\u590D\u9009\u62E9
-
-action.insert.text=\u63D2\u5165\u6587\u672C
-
-action.marker.add=\u52A0\u5165\u6807\u8BB0
-
-action.marker.go-next=\u4E0B\u4E00\u6807\u8BB0
-
-action.marker.go-previous=\u4E0A\u4E00\u6807\u8BB0
-
-action.measure.add=\u6DFB\u52A0\u5C0F\u8282
-
-action.measure.clean=\u6E05\u9664\u5C0F\u8282
-
-action.measure.copy=\u590D\u5236\u5C0F\u8282
-
-action.measure.go-first=\u7B2C\u4E00\u5C0F\u8282
-
-action.measure.go-last=\u6700\u540E\u4E00\u5C0F\u8282
-
-action.measure.go-next=\u4E0B\u4E00\u5C0F\u8282
-
-action.measure.go-previous=\u524D\u4E00\u5C0F\u8282
-
-action.measure.paste=\u7C98\u8D34\u5C0F\u8282
-
-action.measure.remove=\u5220\u9664\u5C0F\u8282
-
-action.note.duration.change-dotted=\u6DFB\u52A0/\u5220\u9664\u9644\u70B9
-
-action.note.duration.change-double-dotted=\u6DFB\u52A0/\u5220\u9664\u53CC\u9644\u70B9
-
-action.note.duration.change-division-type=\u6DFB\u52A0/\u5220\u9664 tupleto
-
-action.note.duration.decrement-duration=\u51CF\u5C11\u65F6\u503C
-
-action.note.duration.increment-duration=\u589E\u52A0\u65F6\u503C
-
-action.note.duration.set-eighth=\u8BBE\u7F6E\u516B\u5206\u97F3\u65F6\u503C
-
-action.note.duration.set-half=\u8BBE\u7F6E\u4E8C\u5206\u97F3\u65F6\u503C
-
-action.note.duration.set-quarter=\u8BBE\u7F6E\u56DB\u5206\u97F3\u65F6\u503C
-
-action.note.duration.set-sixteenth=\u8BBE\u7F6E16\u5206\u97F3\u65F6\u503C
-
-action.note.duration.set-sixty-fourth=\u8BBE\u7F6E64\u5206\u97F3\u65F6\u503C
-
-action.note.duration.set-thirty-second=\u8BBE\u7F6E32\u5206\u97F3\u65F6\u503C
-
-action.note.duration.set-whole=\u8BBE\u7F6E\u5168\u97F3\u65F6\u503C
-
-action.note.effect.change-accentuated=\u6DFB\u52A0/\u79FB\u9664\u91CD\u97F3
-
-action.note.effect.change-bend=\u6DFB\u52A0/\u79FB\u9664\u63A8\u5F26
-
-action.note.effect.change-dead=\u6DFB\u52A0/\u79FB\u9664\u5236\u97F3
-
-action.note.effect.change-fade-in=\u6DFB\u52A0/\u79FB\u9664\u6DE1\u5165
-
-action.note.effect.change-ghost=\u6DFB\u52A0/\u79FB\u9664\u5E7D\u7075\u97F3
-
-action.note.effect.change-grace=\u6DFB\u52A0/\u79FB\u9664\u88C5\u9970\u97F3
-
-action.note.effect.change-hammer=\u6DFB\u52A0/\u79FB\u9664\u5782\u5F26/\u94A9\u5F26
-
-action.note.effect.change-harmonic=\u6DFB\u52A0/\u79FB\u9664\u6CDB\u97F3
-
-action.note.effect.change-heavy-accentuated=\u6DFB\u52A0/\u79FB\u9664\u5F3A\u91CD\u97F3
-
-action.note.effect.change-palm-mute=\u6DFB\u52A0/\u79FB\u9664\u624B\u638C\u5236\u97F3
-
-action.note.effect.change-popping=\u6DFB\u52A0/\u79FB\u9664\u52FE\u5F26
-
-action.note.effect.change-slapping=\u6DFB\u52A0/\u79FB\u9664\u51FB\u5F26
-
-action.note.effect.change-slide=\u6DFB\u52A0/\u79FB\u9664\u6ED1\u5F26
-
-action.note.effect.change-staccato=\u6DFB\u52A0/\u79FB\u9664\u65AD\u97F3
-
-action.note.effect.change-tapping=\u589E\u52A0/\u5220\u9664\u70B9\u5F26
-
-action.note.effect.change-tremolo-bar=\u589E\u52A0/\u5220\u9664\u6447\u6746
-
-action.note.effect.change-tremolo-picking=\u589E\u52A0/\u5220\u9664\u6447\u6746\u62E8\u5F26
-
-action.note.effect.change-trill=\u589E\u52A0/\u5220\u9664\u98A4\u97F3
-
-action.note.effect.change-vibrato=\u589E\u52A0/\u5220\u9664\u632F\u52A8
-
-action.note.general.clean-beat=\u6E05\u9664\u8282\u62CD
-
-action.note.general.decrement-semitone=\u51CF\u5C11\u534A\u97F3
-
-action.note.general.increment-semitone=\u589E\u52A0\u534A\u97F3
-
-action.note.general.shift-down=\u4E0B\u79FB
-
-action.note.general.shift-up=\u4E0A\u79FB
-
-action.note.general.tied=\u589E\u52A0/\u5220\u9664\u8FDE\u97F3
-
-action.settings.configure=\u8BBE\u7F6E
-
-action.tools.browser=\u6D4F\u89C8
-
-action.track.add=\u589E\u52A0
-
-action.track.clone=\u514B\u9686\u58F0\u90E8
-
-action.track.go-first=\u7B2C\u4E00\u58F0\u90E8
-
-action.track.go-last=\u6700\u540E\u58F0\u90E8
-
-action.track.go-next=\u4E0B\u4E00\u58F0\u90E8
-
-action.track.go-previous=\u524D\u4E00\u58F0\u90E8
-
-action.track.lyrics=\u7F16\u8F91\u6B4C\u8BCD
-
-action.track.move-down=\u58F0\u90E8\u4E0B\u79FB
-
-action.track.move-up=\u58F0\u90E8\u4E0A\u79FB
-
-action.track.properties=\u66F4\u6539\u58F0\u90E8\u5C5E\u6027
-
-action.track.remove=\u5220\u9664\u58F0\u90E8
-
-action.transport.metronome=\u8282\u62CD\u5668
-
-action.transport.mode=\u64AD\u653E\u6A21\u5F0F
-
-action.transport.play=\u64AD\u653E
-
-action.transport.stop=\u505C\u6B62
-
-action.view.layout-set-chord-diagram-enabled=\u7F16\u8F91\u548C\u5F26\u56FE
-
-action.view.layout-set-chord-name-enabled=\u7F16\u8F91\u548C\u5F26\u540D
-
-action.view.layout-set-compact=\u7D27\u7F29\u6A21\u5F0F
-
-action.view.layout-set-linear=\u6A2A\u5411\u663E\u793A
-
-action.view.layout-set-multitrack=\u591A\u8F68
-
-action.view.layout-set-page=\u4E50\u8C31\u81EA\u52A8\u6362\u884C
-
-action.view.layout-set-score-enabled=\u663E\u793A\u4E94\u7EBF\u8C31
-
-action.view.layout-set-tablature-enabled=\u663E\u793A\u516D\u7EBF\u8C31
-
-action.view.show-fretboard=\u5409\u5B83\u6307\u677F
-
-action.view.show-matrix=\u97F3\u7B26\u77E9\u9635
-
-action.view.show-mixer=\u58F0\u90E8\u63A7\u5236
-
-action.view.show-piano=\u7434\u952E
-
-action.view.show-transport=\u64AD\u653E\u63A7\u5236
-
-add=\u6DFB\u52A0
-
-author=\u4F5C\u8005
-
-beat=\u97F3\u7B26
-
-beat.clean=\u6E05\u9664
-
-beat.items=\u97F3\u7B26
-
-bend.bend=\u63A8\u5F26
-
-bend.bend-release=\u63A8/\u653E
-
-bend.bend-release-bend=\u63A8/\u653E/\u63A8
-
-bend.editor=\u63A8\u5F26\u7F16\u8F91\u5668
-
-bend.prebend=\u9884\u63A8
-
-bend.prebend-release=\u9884\u63A8/\u653E
-
-browser.collection.close=\u5173\u95ED
-
-browser.collection.fs.editor-tip=\u9009\u62E9\u6587\u4EF6\u5939
-
-browser.collection.fs.editor-title=\u6587\u4EF6\u7CFB\u7EDF
-
-browser.collection.fs.invalid-path=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6587\u4EF6\u5939
-
-browser.collection.fs.name=\u540D\u5B57
-
-browser.collection.fs.path=\u6587\u4EF6\u8DEF\u5F84
-
-browser.collection.new=\u65B0\u5EFA
-
-browser.collection.open=\u6253\u5F00
-
-browser.collection.remove=\u5220\u9664
-
-browser.collection.select=\u9009\u62E9\u5E38\u7528\u8DEF\u5F84
-
-browser.dialog=\u6D4F\u89C8
-
-browser.exit=\u9000\u51FA
-
-browser.factory.fs.name=\u6587\u4EF6\u7CFB\u7EDF
-
-browser.go-back=\u540E\u9000
-
-browser.go-root=\u6839\u76EE\u5F55
-
-browser.menu.collection=\u5E38\u7528\u76EE\u5F55
-
-browser.menu.file=\u6587\u4EF6
-
-browser.menu.go=Go
-
-browser.open=\u6253\u5F00
-
-browser.refresh=\u5237\u65B0
-
-cancel=\u53D6\u6D88
-
-choose=\u9009\u62E9
-
-choose-color=\u9009\u62E9\u989C\u8272
-
-chord=\u548C\u5F26
-
-chord.bass=\u8D1D\u53F8
-
-chord.custom=\u81EA\u5B9A\u548C\u5F26
-
-chord.custom.name-empty-error=\u548C\u5F26\u540D\u4E0D\u80FD\u4E3A\u7A7A
-
-chord.custom.name-exist-error=\u548C\u5F26\u660E\u5DF2\u5B58\u5728
-
-chord.editor=\u548C\u5F26\u7F16\u8F91\u5668
-
-chord.name=\u548C\u5F26\u540D\u79F0
-
-chord.settings.chords-to-display=\u548C\u5F26\u663E\u793A
-
-chord.settings.maximum-fret=\u6700\u5927
-
-chord.settings.minimum-fret=\u6700\u5C0F
-
-chord.settings.open-chords=\u6253\u5F00\u548C\u5F26
-
-chord.settings.search-frets=\u67E5\u627E\u54C1
-
-chord.settings.tip=\u81EA\u5B9A\u4E49\u8BBE\u7F6E
-
-chord.settings.type=\u7C7B\u578B
-
-chord.settings.type.close-voiced=Close Voiced
-
-chord.settings.type.inversions=\u56DE\u8F6C
-
-chord.settings.type.most-common=Most Common
-
-chord.settings.type.open-voiced=Open Voiced
-
-clean=\u6E05\u9664
-
-close=\u5173\u95ED
-
-color=\u989C\u8272
-
-composition=\u4E50\u66F2
-
-composition.album=\u4E13\u8F91
-
-composition.artist=\u827A\u672F\u5BB6
-
-composition.author=\u4F5C\u8005
-
-composition.clef=\u8C31\u53F7
-
-composition.clef.alto=\u4E2D\u97F3
-
-composition.clef.bass=\u4F4E\u97F3
-
-composition.clef.tenor=\u6B21\u4E2D\u97F3
-
-composition.clef.to-the-end=\u5E94\u7528\u5F53\u524D\u8C31\u53F7\u5230\u7ED3\u5C3E
-
-composition.clef.treble=\u9AD8\u97F3
-
-composition.items=\u66F2\u76EE
-
-composition.keysignature=\u8C03\u53F7
-
-composition.keysignature.flat-1=\u964D1
-
-composition.keysignature.flat-2=\u964D2
-
-composition.keysignature.flat-3=\u964D3
-
-composition.keysignature.flat-4=\u964D4
-
-composition.keysignature.flat-5=\u964D5
-
-composition.keysignature.flat-6=\u964D6
-
-composition.keysignature.flat-7=\u964D7
-
-composition.keysignature.natural=\u8FD8\u539F
-
-composition.keysignature.sharp-1=\u53471
-
-composition.keysignature.sharp-2=\u53472
-
-composition.keysignature.sharp-3=\u53473
-
-composition.keysignature.sharp-4=\u53474
-
-composition.keysignature.sharp-5=\u53475
-
-composition.keysignature.sharp-6=\u53476
-
-composition.keysignature.sharp-7=\u53477
-
-composition.keysignature.to-the-end=\u5E94\u7528\u5F53\u524D\u8C31\u53F7\u5230\u7ED3\u5C3E
-
-composition.name=\u540D\u5B57
-
-composition.properties=\u5C5E\u6027
-
-composition.tempo=\u8282\u594F
-
-composition.tempo-percent=\u767E\u5206\u6BD4
-
-composition.tempo.invalid=\u9519\u8BEF\u8282\u594F
-
-composition.tempo.position-to-end=\u5E94\u7528\u5F53\u524D\u8282\u594F\u5230\u7ED3\u5C3E
-
-composition.tempo.position-to-next=\u5E94\u7528\u5F53\u524D\u8282\u594F\u5230\u6807\u8BB0
-
-composition.tempo.start-to-end=\u5E94\u7528\u5F53\u524D\u8282\u594F\u5230\u6574\u9996\u4E50\u66F2
-
-composition.timesignature=\u62CD\u5B50
-
-composition.timesignature.Numerator=\u5206\u5B50
-
-composition.timesignature.denominator=\u5206\u6BCD
-
-composition.timesignature.to-the-end=\u5230\u7ED3\u5C3E
-
-composition.tripletfeel=\u8FDE\u97F3
-
-composition.tripletfeel.eighth=\u516B\u5206\u8FDE\u97F3
-
-composition.tripletfeel.none=\u53D6\u6D88\u8FDE\u97F3
-
-composition.tripletfeel.sixteenth=16\u5206\u8FDE\u97F3
-
-composition.tripletfeel.to-the-end=\u5E94\u7528\u8FDE\u97F3\u5230\u7ED3\u5C3E
-
-configure=\u8BBE\u7F6E
-
-defaults=\u9ED8\u8BA4
-
-description=\u63CF\u8FF0
-
-duration=\u97F3\u957F
-
-duration.dotted=\u9644\u70B9
-
-duration.doubledotted=\u53CC\u9644\u70B9
-
-duration.eighth=8\u5206\u97F3\u7B26
-
-duration.half=\u4E8C\u5206\u97F3\u7B26
-
-duration.items=\u97F3\u957F
-
-duration.quarter=\u56DB\u5206\u97F3\u7B26
-
-duration.sixteenth=16\u5206\u97F3\u7B26
-
-duration.sixtyfourth=64\u5206\u97F3\u7B26
-
-duration.thirtysecond=30\u5206\u97F3\u7B26
-
-duration.division-type=\u4E09\u8FDE\u97F3
-
-duration.whole=\u5168\u97F3\u7B26
-
-dynamic=\u529B\u5EA6
-
-dynamic.forte=\u5F3A
-
-dynamic.forte-fortissimo=\u6700\u5F3A
-
-dynamic.fortissimo=\u6781\u5F3A
-
-dynamic.items=\u529B\u5EA6
-
-dynamic.mezzo-forte=\u4E2D\u5F3A
-
-dynamic.mezzo-piano=\u4E2D\u5F31
-
-dynamic.pianissimo=\u6781\u5F31
-
-dynamic.piano=\u5F31
-
-dynamic.piano-pianissimo=\u6700\u5F31
-
-edit=\u7F16\u8F91
-
-edit.all-tracks=\u6240\u6709\u58F0\u90E8
-
-edit.copy=\u62F7\u8D1D
-
-edit.cut=\u526A\u5207
-
-edit.delete=\u5220\u9664
-
-edit.from=\u4ECE
-
-edit.items=\u7F16\u8F91
-
-edit.menu=\u7F16\u8F91
-
-edit.mouse-mode-edition=\u4E50\u8C31\u7F16\u8F91\u6A21\u5F0F
-
-edit.mouse-mode-selection=\u9009\u62E9\u6A21\u5F0F
-
-edit.not-natural-key=\u5347\u8C03/\u964D\u8C03\u6A21\u5F0F
-
-edit.paste=\u7C98\u8D34
-
-edit.paste.insert-mode=\u7C98\u8D34\u5230\u4E0B\u4E00\u62CD
-
-edit.paste.replace-mode=\u7C98\u8D34\u5230\u5F53\u524D\u62CD
-
-edit.redo=\u91CD\u505A
-
-edit.to=\u5230
-
-edit.undo=\u64A4\u9500
-
-effect.items=\u6548\u679C
-
-effects=\u6548\u679C
-
-effects.accentuatednote=\u91CD\u97F3
-
-effects.bend=\u63A8\u5F26
-
-effects.deadnote=\u95F7\u97F3
-
-effects.fade-in=\u6DE1\u5165
-
-effects.ghostnote=\u5E7D\u7075\u97F3
-
-effects.grace=\u88C5\u9970\u97F3
-
-effects.grace-editor=\u88C5\u9970\u97F3\u7F16\u8F91\u5668
-
-effects.grace.before-beat=\u62CD\u524D\u88C5\u9970\u97F3
-
-effects.grace.on-beat=\u62CD\u4E0A\u88C5\u9970\u97F3
-
-effects.grace.transition=\u8FC7\u5EA6\u88C5\u9970\u97F3
-
-effects.grace.transition-bend=\u63A8\u5F26
-
-effects.grace.transition-hammer=\u6376\u5F26
-
-effects.grace.transition-none=\u65E0\u88C5\u9970\u97F3
-
-effects.grace.transition-slide=\u6ED1\u5F26
-
-effects.hammer=\u6376\u5F26/\u94A9\u5F26
-
-effects.harmonic=\u6CDB\u97F3
-
-effects.harmonic-editor=\u6CDB\u97F3\u7F16\u8F91\u5668
-
-effects.harmonic.artificial=\u4EBA\u5DE5\u6CDB\u97F3
-
-effects.harmonic.artificial.key-offset=\u504F\u79FB
-
-effects.harmonic.natural=\u81EA\u7136\u6CDB\u97F3
-
-effects.harmonic.pinch=\u5C16\u53EB(\u62E8\u7247)\u6CDB\u97F3
-
-effects.harmonic.semi=\u534A\u6CDB\u97F3
-
-effects.harmonic.tapped=\u62CD\u5F26\u6CDB\u97F3
-
-effects.harmonic.tapped.left-hand=\u5DE6\u624B\u70B9\u5F26
-
-effects.harmonic.tapped.right-hand=\u53F3\u624B\u70B9\u5F26
-
-effects.harmonic.type-of-harmonic=\u6CDB\u97F3\u7C7B\u578B
-
-effects.heavyaccentuatednote=\u5F3A\u91CD\u97F3
-
-effects.palm-mute=\u624B\u638C\u95F7\u97F3
-
-effects.popping=\u53F3\u624B\u94A9\u5F26
-
-effects.slapping=\u53F3\u624B\u94A9\u5F26
-
-effects.slide=\u6ED1\u5F26
-
-effects.staccato=\u65AD\u97F3
-
-effects.tapping=\u70B9\u5F26
-
-effects.tremolo-bar=\u6447\u6746
-
-effects.tremolo-bar-editor=\u6447\u6746\u7F16\u8F91\u5668
-
-effects.tremolo-bar.dip=\u4E0B\u538B
-
-effects.tremolo-bar.dive=\u538B\u5230\u5E95
-
-effects.tremolo-bar.inverted-dip=\u63D0\u8D77
-
-effects.tremolo-bar.release-down=\u4E0B\u538B\u91CA\u653E
-
-effects.tremolo-bar.release-up=\u62AC\u8D77\u91CA\u653E
-
-effects.tremolo-bar.return=\u6447\u6746\u5F52\u4F4D
-
-effects.tremolo-picking=\u6447\u6746\u98A4\u97F3\u5F39\u594F
-
-effects.tremolo-picking-editor=\u6447\u6746\u98A4\u97F3\u7F16\u8F91\u5668
-
-effects.trill=\u98A4\u97F3
-
-effects.trill-editor=\u98A4\u97F3\u7F16\u8F91\u5668
-
-effects.vibrato=\u632F\u52A8
-
-error=\u9519\u8BEF
-
-exit=\u9000\u51FA
-
-export.chord-diagram-enabled=\u663E\u793A\u548C\u5F26\u56FE
-
-export.chord-name-enabled=\u663E\u793A\u548C\u5F26\u540D
-
-export.score-enabled=\u663E\u793A\u4E94\u7EBF\u8C31
-
-export.tablature-enabled=\u663E\u793A\u516D\u7EBF\u8C31
-
-file=\u6587\u4EF6
-
-file.exit=\u9000\u51FA
-
-file.export=\u5BFC\u51FA
-
-file.export-ascii=\u5BFC\u51FAASCII
-
-file.export-midi=\u5BFC\u51FAMIDI
-
-file.export-pdf=\u5BFC\u51FAPDF
-
-file.export.error=\u4E0D\u80FD\u5BFC\u51FA\: {0}
-
-file.history=\u6700\u8FD1\u6587\u4EF6
-
-file.import=\u5BFC\u5165
-
-file.import-midi=\u5BFC\u5165MIDI
-
-file.import.error=\u4E0D\u80FD\u5BFC\u5165\: {0}
-
-# ########################
-# ##  Tool Bar Items   ###
-# ########################
-file.items=File Items
-
-file.new=\u65B0\u5EFA
-
-file.open=\u6253\u5F00
-
-file.open-url=\u6253\u5F00URL
-
-file.open.error=\u4E0D\u80FD\u6253\u5F00\: {0}
-
-file.overwrite-question=\u6587\u4EF6\u5DF2\u5B58\u5728.\u662F\u5426\u8986\u76D6\u73B0\u6709\u6587\u4EF6?
-
-file.print=\u6253\u5370
-
-file.print-preview=\u6253\u5370\u9884\u89C8
-
-file.save=\u4FDD\u5B58
-
-file.save-as=\u53E6\u5B58\u4E3A
-
-file.save-changes-question=\u66F2\u8C31\u8FD8\u672A\u4FDD\u5B58.\n\u5E0C\u671B\u4FDD\u5B58\u6240\u505A\u4FEE\u6539\u5417?
-
-file.save.error=\u4E0D\u80FD\u4FDD\u5B58\: {0}
-
-fret=\u54C1
-
-fretboard.background-color=\u6307\u677F\u989C\u8272
-
-fretboard.display-note-text=\u663E\u793A\u6CE8\u91CA\u6587\u672C
-
-fretboard.display-scale-text=\u663E\u793A\u97F3\u9636\u6587\u5B57
-
-fretboard.font=\u5B57\u4F53
-
-fretboard.fretpoint-color=\u54C1\u989C\u8272
-
-fretboard.left-mode=\u5DE6\u624B
-
-fretboard.note-color=\u97F3\u7B26\u989C\u8272
-
-fretboard.right-mode=\u53F3\u624B
-
-fretboard.scale-note-color=\u97F3\u9636\u97F3\u7B26\u989C\u8272
-
-fretboard.settings=\u6307\u677F\u8BBE\u7F6E
-
-fretboard.settings.options=\u9009\u9879
-
-fretboard.string-color=\u7434\u5F26\u989C\u8272
-
-go=Go
-
-help=\u5E2E\u52A9
-
-help.about=\u5173\u4E8E
-
-help.about.authors=\u4F5C\u8005
-
-help.about.description=\u63CF\u8FF0
-
-help.about.license=\u8BB8\u53EF\u8BC1
-
-help.doc=\u6587\u6863
-
-help.help=\u5E2E\u52A9
-
-info=\u4FE1\u606F
-
-insert.chord=\u63D2\u5165\u548C\u5F26
-
-insert.items=\u63D2\u5165
-
-instrument=\u4E50\u5668
-
-instrument.instrument=\u4E50\u5668
-
-instrument.percussion-track=\u6253\u51FB\u4E50\u58F0\u90E8
-
-key-bindings-editor=\u5FEB\u6377\u952E\u7F16\u8F91\u5668
-
-key-bindings-editor-action-column=\u52A8\u4F5C
-
-key-bindings-editor-action-select=\u9009\u62E9\u52A8\u4F5C
-
-key-bindings-editor-override=\u5FEB\u6377\u952E\u51B2\u7A81\!\u786E\u5B9A\u4F7F\u7528?
-
-key-bindings-editor-push-a-key=\u8BF7\u6309\u952E
-
-key-bindings-editor-save-question=\u4FEE\u6539\u8FD8\u672A\u4FDD\u5B58,\u73B0\u5728\u4FDD\u5B58\u4E48?
-
-key-bindings-editor-shortcut-column=\u6309\u952E
-
-language=\u8BED\u8A00
-
-layout.items=\u5E03\u5C40
-
-lyric.editor=\u6B4C\u8BCD\u7F16\u8F91\u5668
-
-marker=\u7F16\u8F91
-
-marker.add=\u52A0\u5165\u6807\u8BB0
-
-marker.first=\u5230\u7B2C\u4E00\u4E2A\u6807\u8BB0
-
-marker.items=\u6807\u8BB0
-
-marker.last=\u5230\u6700\u540E\u4E00\u4E2A\u6807\u8BB0
-
-marker.list=\u6807\u8BB0\u5217\u8868
-
-marker.next=\u5230\u4E0B\u4E00\u4E2A\u6807\u8BB0
-
-marker.previous=\u5230\u524D\u4E00\u4E2A\u6807\u8BB0
-
-matrix.border-color=\u8FB9\u6846\u989C\u8272
-
-matrix.editor=\u7F16\u8F91\u5668
-
-matrix.font=\u5B57\u4F53
-
-matrix.foreground-color=\u524D\u666F\u8272
-
-matrix.grids=\u683C\u5B50\u6570
-
-matrix.line-color-1=\u5076\u6570\u884C\u989C\u8272
-
-matrix.line-color-2=\u5947\u6570\u884C\u989C\u8272
-
-matrix.line-color-over=\u9F20\u6807\u4E0B\u9762\u884C\u989C\u8272
-
-matrix.note-color=\u97F3\u7B26\u989C\u8272
-
-matrix.play-note-color=\u5F53\u524D\u97F3\u7B26\u989C\u8272
-
-matrix.position-color=\u5F53\u524D\u4F4D\u7F6E\u989C\u8272
-
-matrix.settings=\u8BBE\u7F6E
-
-measure=\u5C0F\u8282
-
-measure.add=\u65B0\u589E\u5C0F\u8282
-
-measure.add-after-current-position=\u5F53\u524D\u5C0F\u8282\u540E\u65B0\u589E
-
-measure.add-at-end=\u58F0\u90E8\u672B\u5C3E\u6DFB\u52A0
-
-measure.add-before-current-position=\u5F53\u524D\u5C0F\u8282\u524D\u65B0\u589E
-
-measure.clean=\u6E05\u9664\u5C0F\u8282
-
-measure.copy=\u62F7\u8D1D\u5C0F\u8282
-
-measure.first=\u7B2C\u4E00\u5C0F\u8282
-
-measure.last=\u6700\u540E\u4E00\u5C0F\u8282
-
-measure.next=\u4E0B\u4E00\u5C0F\u8282
-
-measure.paste=\u7C98\u8D34\u4E00\u5C0F\u8282
-
-measure.previous=\u524D\u9762\u5C0F\u8282
-
-measure.remove=\u5220\u9664\u5C0F\u8282
-
-midi.port=MIDI \u7AEF\u53E3
-
-midi.sequencer=MIDI \u97F3\u5E8F\u5668
-
-mixer=\u6DF7\u97F3\u5668
-
-instrument.balance=\u5E73\u8861
-
-instrument.channel=CH
-
-instrument.effect-channel=EC
-
-instrument.free=\u7A7A\u95F2
-
-instrument.link=\u8FDE\u63A5
-
-instrument.volume=\u97F3\u91CF
-
-instruments.volume=\u4E3B\u97F3\u91CF
-
-name=\u540D\u5B57
-
-no=\u5426
-
-note=\u97F3\u7B26
-
-note.deadnote=\u95F7\u97F3
-
-note.semitone-down=\u964D\u534A\u97F3
-
-note.semitone-up=\u5347\u534A\u97F3
-
-note.shift-down=\u4E0B\u79FB
-
-note.shift-up=\u4E0A\u79FB
-
-note.tiednote=\u8FDE\u97F3
-
-ok=\u786E\u5B9A
-
-options=\u9009\u9879
-
-piano.editor=\u94A2\u7434\u7F16\u8F91\u5668
-
-piano.natural-key-color=\u767D\u952E\u989C\u8272
-
-piano.not-natural-key-color=\u9ED1\u952E\u989C\u8272
-
-piano.note-color=\u97F3\u7B26\u989C\u8272
-
-piano.scale-note-color=\u97F3\u9636\u7B26\u53F7\u989C\u8272
-
-piano.settings=\u94A2\u7434\u8BBE\u7F6E
-
-plugin.column.enabled=\u5141\u8BB8
-
-plugin.column.name=\u63D2\u4EF6\u540D\u79F0
-
-plugin.unknown-value=\u4E0D\u53EF\u7528
-
-plugins=\u63D2\u4EF6
-
-position=\u4F4D\u7F6E
-
-print-header.default-song-author=\u533F\u540D
-
-print-header.default-song-name=\u672A\u547D\u540D
-
-print.copies=\u6253\u5370
-
-print.copies-number=\u6253\u5370\u4EFD\u6570
-
-print.dialog=\u6253\u5370
-
-print.file-chooser=\u9009\u62E9
-
-print.preview=\u6253\u5370\u9884\u89C8
-
-print.preview.page-of=\u5171
-
-print.print=\u6253\u5370
-
-print.print-to-file=\u6253\u5370\u5230\u6587\u4EF6
-
-print.range=\u8303\u56F4
-
-print.range.all-pages=\u5168\u90E8
-
-print.range.pages=\u9875\u9762
-
-print.range.pages-to=\u5230
-
-print.service=\u670D\u52A1
-
-print.service.info=\u4FE1\u606F
-
-print.service.name=\u540D\u79F0
-
-print.service.status=\u72B6\u6001
-
-print.service.type=\u7C7B\u578B
-
-property.items=\u5C5E\u6027
-
-remove=\u5220\u9664
-
-rename=\u6539\u540D
-
-repeat.alternative=\u53EF\u53D8\u53CD\u590D\u6807\u8BB0
-
-repeat.alternative.editor=\u7F16\u8F91\u53EF\u53D8\u53CD\u590D
-
-repeat.close=\u53CD\u590D\u7ED3\u675F
-
-repeat.items=\u53CD\u590D
-
-repeat.number-of-repetitions=\u53CD\u590D\u6B21\u6570
-
-repeat.open=\u53CD\u590D\u5F00\u59CB
-
-repetitions=\u53CD\u590D
-
-save=\u4FDD\u5B58
-
-scale=\u97F3\u9636
-
-scale.list=\u97F3\u9636\u5217\u8868
-
-settings=\u8BBE\u7F6E
-
-settings.config=\u8BBE\u7F6ETuxGuitar
-
-settings.config.apply-changes-question=\u73B0\u5728\u5E94\u7528\u8BBE\u7F6E?
-
-settings.config.language=\u8BED\u8A00
-
-settings.config.language.choose=\u9009\u62E9\u8BED\u8A00\u5305
-
-settings.config.main=\u5E38\u7528\u4FE1\u606F
-
-settings.config.main.options=\u9009\u9879
-
-settings.config.main.splash-enabled=\u663E\u793A\u6B22\u8FCE\u754C\u9762
-
-settings.config.main.table.auto-size.enabled=\u5141\u8BB8\u81EA\u52A8\u62C9\u4F38
-
-settings.config.main.window-title=\u7A97\u53E3\u6807\u9898
-
-settings.config.main.window-title.help=\u4E0B\u9762\u7684\u4FE1\u606F\u4F1A\u663E\u793A\u5728\u7A97\u53E3\u6807\u9898\:
-
-settings.config.main.window-title.var.description.appname=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u672C\u7A0B\u5E8F\u540D\u5B57\:TuxGuitar
-
-settings.config.main.window-title.var.description.appversion=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u672C\u7A0B\u5E8F\u7248\u672C\u53F7
-
-settings.config.main.window-title.var.description.filename=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u5F53\u524D\u4E50\u8C31\u6587\u4EF6\u540D
-
-settings.config.main.window-title.var.description.filepath=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u5F53\u524D\u4E50\u8C31\u8DEF\u5F84
-
-settings.config.main.window-title.var.description.songalbum=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u5F53\u524D\u4E50\u8C31\u6B4C\u66F2\u540D
-
-settings.config.main.window-title.var.description.songartist=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u5F53\u524D\u4E50\u8C31\u827A\u672F\u5BB6
-
-settings.config.main.window-title.var.description.songauthor=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u5F53\u524D\u4E50\u8C31\u4F5C\u8005
-
-settings.config.main.window-title.var.description.songname=\u8FD9\u4E2A\u53D8\u91CF\u8868\u793A\u5F53\u524D\u4E50\u66F2\u540D\u5B57
-
-settings.config.skin=\u76AE\u80A4
-
-settings.config.skin.choose=\u9009\u62E9\u76AE\u80A4
-
-settings.config.sound=\u58F0\u97F3
-
-settings.config.styles=\u98CE\u683C
-
-settings.config.styles.color.lines=\u6C34\u5E73\u7EBF\u989C\u8272
-
-settings.config.styles.color.play-note=\u64AD\u653E\u4E2D\u7684\u97F3\u7B26\u989C\u8272
-
-settings.config.styles.color.score-note=\u4E94\u7EBF\u8C31\u97F3\u7B26\u989C\u8272
-
-settings.config.styles.color.tab-note=\u516D\u7EBF\u8C31\u97F3\u7B26\u989C\u8272
-
-settings.config.styles.font.default=\u9ED8\u8BA4\u5B57\u4F53
-
-settings.config.styles.font.lyric=\u6B4C\u8BCD\u5B57\u4F53
-
-settings.config.styles.font.note=\u97F3\u7B26\u5B57\u4F53
-
-settings.config.styles.font.printer-default=\u6253\u5370\u9ED8\u8BA4\u5B57\u4F53
-
-settings.config.styles.font.printer-note=\u6253\u5370\u97F3\u7B26\u5B57\u4F53
-
-settings.config.styles.font.printer-time-signature=\u6253\u5370\u62CD\u5B50\u5B57\u4F53
-
-settings.config.styles.font.text=\u6587\u672C\u5B57\u4F53
-
-settings.config.styles.font.time-signature=\u62CD\u5B50\u5B57\u4F53
-
-settings.config.styles.general=\u9ED8\u8BA4\u6837\u5F0F
-
-settings.config.styles.printer=\u6253\u5370\u6837\u5F0F
-
-settings.config.toolbars=\u5DE5\u5177\u680F
-
-settings.config.toolbars.list=\u53EF\u7528\u5DE5\u5177\u680F\u5217\u8868
-
-settings.config.toolbars.move-down=\u4E0B\u79FB
-
-settings.config.toolbars.move-up=\u4E0A\u79FB
-
-settings.config.toolbars.tip=\u81EA\u5B9A\u4E49\u5DE5\u5177\u680F
-
-settings.keybindings=\u5FEB\u6377\u952E\u8BBE\u7F6E
-
-text.editor=\u6587\u672C\u7F16\u8F91\u5668
-
-text.insert=\u63D2\u5165\u6587\u672C
-
-text.text=\u6587\u672C
-
-title=\u6807\u9898
-
-tools=\u5DE5\u5177
-
-tools.browser=\u6D4F\u89C8\u5E38\u7528\u6587\u4EF6\u5939
-
-tools.plugins=\u63D2\u4EF6
-
-tools.scale=\u97F3\u9636\u5217\u8868
-
-tools.settings=\u8BBE\u7F6E
-
-tools.shortcuts=\u5FEB\u6377\u952E
-
-track=\u591A\u8F68
-
-track.add=\u6DFB\u52A0\u58F0\u90E8
-
-track.clone=\u58F0\u90E8\u62F7\u8D1D
-
-track.color=\u989C\u8272
-
-track.first=\u7B2C\u4E00\u58F0\u90E8
-
-track.instrument=\u5668\u4E50 
-
-track.items=\u58F0\u90E8
-
-track.last=\u6700\u672B\u58F0\u90E8
-
-track.lyrics=\u6B4C\u8BCD
-
-track.move-down=\u4E0B\u79FB
-
-track.move-up=\u4E0A\u79FB
-
-track.name=\u540D\u79F0
-
-track.name.default-percussion-name=\u6253\u51FB\u4E50\u5668
-
-track.next=\u4E0B\u4E00\u58F0\u90E8
-
-track.number=\u58F0\u90E8\u7F16\u53F7
-
-track.previous=\u524D\u4E00\u58F0\u90E8
-
-track.properties=\u5C5E\u6027
-
-track.properties.general=\u5E38\u7528
-
-track.remove=\u5220\u9664\u58F0\u90E8
-
-track.mute=\u65E0\u58F0
-
-track.solo=\u72EC\u594F
-
-transport=\u64AD\u653E\u5668
-
-transport.first=\u7B2C\u4E00\u5C0F\u8282
-
-transport.items=\u64AD\u653E\u5668
-
-transport.last=\u6700\u540E\u5C0F\u8282
-
-transport.metronome=\u8282\u62CD\u5668
-
-transport.mode=\u6F14\u594F\u6A21\u5F0F
-
-transport.mode.simple=\u7B80\u5355\u91CD\u590D
-
-transport.mode.simple.loop=\u91CD\u590D\u64AD\u653E
-
-transport.mode.simple.tempo-percent=\u901F\u5EA6\u53D8\u5316
-
-transport.mode.trainer=\u7EC3\u4E60\u6A21\u5F0F
-
-transport.mode.trainer.increment-description=\u6BCF\u6B21\u589E\u52A0
-
-transport.next=\u4E0B\u4E00\u5C0F\u8282
-
-transport.pause=\u6682\u505C
-
-transport.previous=\u524D\u4E00\u5C0F\u8282
-
-transport.start=\u64AD\u653E
-
-transport.stop=\u505C\u6B62
-
-tuning=\u5B9A\u8C03
-
-tuning.offset=\u53D8\u8C03\u5939
-
-tuning.strings=\u5F26\u6570
-
-url=URL
-
-version=\u7248\u672C
-
-view=\u67E5\u770B
-
-view.items=\u67E5\u770B
-
-view.layout=\u5E03\u5C40
-
-view.layout.chord-diagram=\u548C\u5F26\u56FE
-
-view.layout.chord-name=\u548C\u5F26\u540D
-
-view.layout.chord-style=\u548C\u5F26\u6837\u5F0F
-
-view.layout.compact=\u7D27\u7F29\u6A21\u5F0F
-
-view.layout.linear=\u6A2A\u5411\u6EDA\u52A8
-
-view.layout.multitrack=\u591A\u8F68
-
-view.layout.page=\u9875\u5E03\u5C40
-
-view.layout.score-enabled=\u663E\u793A\u4E94\u7EBF\u8C31
-
-view.layout.tablature-enabled=\u663E\u793A\u516D\u7EBF\u8C31
-
-view.show-fretboard=\u663E\u793A\u6307\u677F
-
-view.show-matrix=\u663E\u793A\u97F3\u7B26\u77E9\u9635
-
-view.show-mixer=\u663E\u793A\u6DF7\u97F3\u5668
-
-view.show-piano=\u663E\u793A\u7434\u952E
-
-view.show-transport=\u663E\u793A\u65F6\u95F4\u8F74
-
-warning=\u8B66\u544A
-
-yes=\u662F
-
-###############################
-### Changes from 1.0 to 1.1 ###
-###############################
-edit.voice-1=\u9009\u62E9\u4EA4\u9519\u62CD\u5B501
-edit.voice-2=\u9009\u62E9\u4EA4\u9519\u62CD\u5B502
-
-beat.voice.remove-unused=\u5220\u9664\u672A\u7528\u4EA4\u9519\u62CD\u5B50
-beat.voice-up=\u5347\u9AD8
-beat.voice-down=\u964D\u4F4E
-beat.voice-auto=\u81EA\u52A8
-
-beat.stroke-up=\u4E0A\u63A8\u5F26
-beat.stroke-down=\u4E0B\u63A8\u5F26
-
-## Shortcut Names
-action.edit.voice-1=\u9009\u62E9\u4EA4\u9519\u62CD\u5B501
-action.edit.voice-2=\u9009\u62E9\u4EA4\u9519\u62CD\u5B502
-
-action.beat.general.remove-unused-voice=\u5220\u9664\u672A\u7528\u4EA4\u9519\u62CD\u5B50
-action.beat.general.voice-up=\u8BBE\u7F6E\u5347\u9AD8
-action.beat.general.voice-down=\u8BBE\u7F6E\u964D\u4F4E
-action.beat.general.voice-auto=\u81EA\u52A8
-
-action.beat.general.set-stroke-up=\u8BBE\u7F6E\u4E0A\u63A8\u5F26
-action.beat.general.set-stroke-down=\u8BBE\u7F6E\u4E0B\u63A8\u5F26
-
-###############################
-### Changes from 1.1 to 1.2 ###
-###############################
-transport.mode.loop-range=\u5FAA\u73AF\u533A\u95F4
-transport.mode.loop-range.from=\u4ECE\u5F53\u524D\u5C0F\u8282\u5F00\u59CB\u64AD\u653E
-transport.mode.loop-range.from-default=\u4ECE\u5934\u64AD\u653E
-transport.mode.loop-range.to=\u64AD\u653E\u5230\u5F53\u524D\u5C0F\u8282
-transport.mode.loop-range.to-default=\u4E00\u76F4\u5230\u7ED3\u675F
-
-
-tools.transpose=\u53D8\u8C03
-tools.transpose.semitones=\u8F6C\u6362\u534A\u97F3
-tools.transpose.apply-to-track=\u8F6C\u6362\u6240\u6709\u5C0F\u8282
-tools.transpose.apply-to-measure=\u53EA\u8F6C\u6362\u5F53\u524D\u5C0F\u8282
-tools.transpose.apply-to-all-tracks=\u5E94\u7528\u6240\u6709\u97F3\u8F68
-tools.transpose.try-keep-strings=\u5C3D\u91CF\u4FDD\u6301\u6240\u6709\u97F3\u7B26\u5728\u540C\u4E00\u5F26\u4E0A
-tools.transpose.apply-to-chords=\u8F6C\u6362\u548C\u5F26
-
-action.tools.transpose=\u97F3\u7B26\u53D8\u8C03
-
-tuning.strings.transpose=\u8F6C\u6362\u53D7\u5F71\u54CD\u97F3\u7B26
-tuning.strings.transpose.try-keep-strings=\u4FDD\u6301\u6240\u6709\u97F3\u7B26\u5728\u540C\u4E00\u5F26\u4E0A
-tuning.strings.transpose.apply-to-chords=\u8F6C\u6362\u548C\u5F26
-
-composition.date=\u65E5\u671F
-composition.copyright=\u7248\u6743\u4FE1\u606F
-composition.writer=\u66F2\u8C31\u4F5C\u8005
-composition.transcriber=\u6539\u7F16
-composition.comments=\u6CE8\u91CA
-
-beat.move-left=\u5DE6\u79FB\u4E00\u62CD
-beat.move-right=\u53F3\u79FB\u4E00\u62CD
-beat.move-custom=\u81EA\u5B9A\u4E49\u62CD\u5B50\u79FB\u52A8
-beat.move-custom.dialog.title=\u81EA\u5B9A\u4E49
-beat.move-custom.dialog.direction-tip=\u79FB\u52A8\u65B9\u5411
-beat.move-custom.dialog.move-1.tip=\u79FB\u52A8\u65B9\u5F0F\u4E00
-beat.move-custom.dialog.move-2.tip=\u79FB\u52A8\u65B9\u5F0F\u4E8C
-beat.move-custom.dialog.direction=\u65B9\u5411
-beat.move-custom.dialog.direction.right=\u53F3\u79FB
-beat.move-custom.dialog.direction.left=\u5DE6\u79FB
-beat.move-custom.dialog.count=\u6570\u91CF
-beat.move-custom.dialog.duration=\u65F6\u503C
-beat.move-custom.dialog.duration.type=\u7B26\u70B9/\u53CC\u7B26\u70B9
-beat.move-custom.dialog.duration.type.normal=\u65E0
-beat.move-custom.dialog.duration.division-type=\u5207\u5206\u65B9\u5F0F
-beat.move-custom.dialog.duration.division-type.normal=\u666E\u901A(\u4E09\u8FDE\u97F3)
-
-action.beat.general.move-left=\u5DE6\u79FB\u4E00\u62CD
-action.beat.general.move-right=\u53F3\u79FB\u4E00\u62CD
-action.beat.general.move-custom=\u81EA\u5B9A\u4E49\u62CD\u5B50\u79FB\u52A8
-
-measure.add.count=\u6DFB\u52A0\u5C0F\u8282\u6570
-edit.paste.count=\u7C98\u8D34\u5C0F\u8282\u6570
-
-export.black-and-white=\u5355\u8272\u6A21\u5F0F
-
-fretboard.direction=\u65B9\u5411
-
-transport.set-loop-start=\u8BBE\u7F6E\u5FAA\u73AF\u8D77\u59CB\u70B9
-transport.set-loop-end=\u8BBE\u7F6E\u5FAA\u73AF\u7ED3\u675F\u70B9
-
-action.transport.set-loop-start=\u8BBE\u7F6E\u5FAA\u73AF\u8D77\u59CB\u70B9
-action.transport.set-loop-end=\u8BBE\u7F6E\u5FAA\u73AF\u7ED3\u675F\u70B9
diff --git a/TuxGuitar-testing/platform-all/share/lang/messages_zh_TW.properties b/TuxGuitar-testing/platform-all/share/lang/messages_zh_TW.properties
deleted file mode 100644
index 75514efb..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/messages_zh_TW.properties
+++ /dev/null
@@ -1,719 +0,0 @@
-ok=\u78ba\u5b9a
-cancel=\u53d6\u6d88
-yes=\u662f
-no=\u5426
-add=\u65b0\u589e
-edit=\u7de8\u8f2f
-remove=\u79fb\u9664
-save=\u5132\u5b58
-exit=\u96e2\u958b
-close=\u95dc\u9589
-choose=\u9078\u64c7
-color=\u984f\u8272
-title=\u6a19\u984c
-go=\u524d\u5f80
-warning=\u8b66\u544a
-error=\u932f\u8aa4
-plugins=\u5916\u639b
-options=\u9078\u9805
-defaults=\u9810\u8a2d
-clean=\u6e05\u9664
-rename=\u91cd\u65b0\u547d\u540d
-fret=\u7434\u683c
-position=\u4f4d\u7f6e
-name=\u59d3\u540d
-author=\u4f5c\u8005
-version=\u7248\u672c
-description=\u8aaa\u660e
-info=\u8cc7\u8a0a
-configure=\u7d44\u614b
-url=\u8d85\u9023\u7d50(URL)
-metronome=\u7bc0\u62cd\u5668
-
-tuxguitar.title=Tux-Guitar\u4f01\u9d5d\u5f48\u5409\u4ed6
-
-file=\u6a94\u6848
-file.new=\u958b\u65b0\u6a94\u6848
-file.open=\u958b\u555f\u820a\u6a94
-file.save=\u5132\u5b58\u6a94\u6848
-file.save-as=\u53e6\u5b58\u65b0\u6a94
-file.save-changes-question=\u9019\u9996\u66f2\u5b50\u6709\u5c1a\u672a\u5132\u5b58\u7684\u4fee\u6539.\n\u4f60\u8981\u5132\u5b58\u9019\u4e9b\u6539\u8b8a\u55ce?
-file.exit=\u96e2\u958b
-file.export=\u8f38\u51fa
-file.export-midi=\u8f38\u51fa\u6210MIDI
-file.export-pdf=\u8f38\u51fa\u6210 PDF
-file.print=\u5217\u5370
-file.print-preview=\u9810\u89bd\u5217\u5370
-file.import=\u8f38\u5165
-file.import-midi=\u8f38\u5165MIDI
-file.export-ascii=\u8f38\u51fa\u6210ASCII
-file.history=\u6b77\u53f2\u7d00\u9304
-file.open-url=\u958b\u555f\u8d85\u9023\u7d50 URL
-file.open.error=\u7121\u6cd5 \u958b\u555f: {0}
-file.save.error=\u7121\u6cd5 \u5132\u5b58: {0}
-file.import.error=\u7121\u6cd5 \u8f38\u5165: {0}
-file.export.error=\u7121\u6cd5 \u8f38\u51fa: {0}
-
-file.overwrite-question=\u6a94\u6848\u5df2\u5b58\u5728\uff0c\u662f\u5426\u8986\u5beb\uff1f
-
-edit.menu=\u7de8\u8f2f
-edit.undo=\u4e0a\u4e00\u6b65
-edit.redo=\u4e0b\u4e00\u6b65
-edit.copy=\u8907\u88fd
-edit.from=\u5f9e
-edit.to=\u5230
-edit.all-tracks=\u5168\u90e8\u97f3\u8ecc
-edit.paste=\u8cbc\u4e0a
-edit.paste.count=\u8cbc\u4e0a\u7684\u6578\u76ee
-edit.paste.replace-mode=\u8cbc\u5728\u9019\u500b\u5c0f\u7bc0
-edit.paste.insert-mode=\u8cbc\u5230\u65b0\u7684\u5c0f\u7bc0
-edit.delete=\u522a\u9664
-edit.cut=\u526a\u4e0b
-edit.mouse-mode-selection=\u9078\u64c7\u6a21\u5f0f
-edit.mouse-mode-edition=\u4e94\u7dda\u8b5c\u7de8\u8f2f\u6a21\u5f0f
-edit.not-natural-key=\u5347/\u964d\u6a21\u5f0f
-edit.voice-1=\u9078\u64c7 \u8072\u9053 1
-edit.voice-2=\u9078\u64c7 \u8072\u9053 2
-
-view=\u6aa2\u8996
-
-view.layout=\u7248\u9762
-view.layout.page=\u7e31\u5411\u5ef6\u4f38
-view.layout.linear=\u6a6b\u5411\u5ef6\u4f38
-view.layout.compact=\u7cbe\u7c21\u7248
-view.layout.multitrack=\u591a\u8ecc
-view.layout.chord-style=\u548c\u5f26\u98a8\u683c
-view.layout.chord-name=\u548c\u5f26\u540d\u7a31
-view.layout.chord-diagram=\u548c\u5f26\u5716\u8868
-view.layout.score-enabled=\u986f\u793a\u7e3d\u8b5c
-view.layout.tablature-enabled=\u986f\u793a\u5409\u4ed6\u8b5c
-view.show-mixer=\u986f\u793a\u6df7\u97f3\u5668
-view.show-fretboard=\u986f\u793a\u6307\u677f
-view.show-piano=\u986f\u793a\u7434\u9375
-view.show-matrix=\u986f\u793a\u77e9\u9663\u6a21\u5f0f
-view.show-transport=\u986f\u793a\u64ad\u653e\u6a21\u5f0f
-fretboard.direction=\u65b9\u5f0f
-fretboard.right-mode=\u53f3\u624b\u7434
-fretboard.left-mode=\u5de6\u624b\u7434
-fretboard.background-color=\u80cc\u666f\u984f\u8272
-fretboard.display-note-text=\u986f\u793a\u97f3\u7b26\u7684\u6587\u5b57
-fretboard.display-scale-text=\u986f\u793a\u97f3\u968e\u7684\u6587\u5b57
-fretboard.font=\u5b57\u578b
-fretboard.fretpoint-color=\u7434\u683c\u984f\u8272
-fretboard.note-color=\u97f3\u7b26\u984f\u8272
-fretboard.scale-note-color=\u97f3\u968e\u7684\u97f3\u7b26\u984f\u8272
-fretboard.settings=\u7434\u683c\u8a2d\u5b9a
-fretboard.string-color=\u7434\u7d43\u7684\u984f\u8272
-fretboard.settings.options=\u9078\u9805
-piano.editor=\u92fc\u7434\u7de8\u7ddd\u5668
-piano.natural-key-color=\u81ea\u7136\u7434\u9375\u984f\u8272(\u9ed1/\u767d\u9375)
-piano.not-natural-key-color=\u4e0d\u81ea\u7136\u7434\u9375\u984f\u8272
-piano.note-color=\u97f3\u7b26\u984f\u8272
-piano.scale-note-color=\u97f3\u968e\u97f3\u7b26\u984f\u8272
-piano.settings=\u92fc\u7434\u8a2d\u5b9a
-
-matrix.editor=\u77e9\u9663\u6a21\u5f0f\u7de8\u8f2f\u5668
-matrix.grids=\u683c\u5b50\u7684\u6578\u76ee
-matrix.border-color=\u908a\u7dda\u984f\u8272
-matrix.font=\u5b57\u578b
-matrix.foreground-color=\u524d\u666f\u984f\u8272
-matrix.line-color-1=\u5947\u6578\u5217\u984f\u8272
-matrix.line-color-2=\u5076\u6578\u5217\u984f\u8272
-matrix.line-color-over=\u6ed1\u9f20\u6ed1\u904e\u5217\u7684\u984f\u8272
-matrix.note-color=\u97f3\u7b26\u984f\u8272
-matrix.play-note-color=\u5f48\u594f\u97f3\u7b26\u7684\u984f\u8272
-matrix.position-color=\u4f4d\u7f6e\u7684\u984f\u8272
-matrix.settings=\u77e9\u9663\u6a21\u5f0f\u7684\u8a2d\u5b9a
-
-composition=\u66f2\u76ee
-composition.timesignature=\u62cd\u5b50\u8a18\u865f
-composition.timesignature.Numerator=\u5206\u5b50
-composition.timesignature.denominator=\u5206\u6bcd
-composition.timesignature.to-the-end=\u5230\u7d50\u5c3e
-composition.tempo=\u7bc0\u594f
-composition.tempo-percent=\u7bc0\u594f(\u767e\u5206\u6bd4)
-composition.tempo.invalid=\u4e0d\u5408\u7406\u7684\u7bc0\u594f
-composition.tempo.start-to-end=\u5c07\u9019\u500b\u901f\u5ea6\u7528\u65bc\u6574\u9996\u6b4c
-composition.tempo.position-to-end=\u5c07\u9019\u500b\u901f\u5ea6\u7528\u5230\u7d50\u675f
-composition.tempo.position-to-next=\u5c07\u9019\u500b\u901f\u5ea6\u7528\u5728\u4e0b\u4e00\u500b\u901f\u5ea6\u6bb5\u843d(tempo marker)
-composition.properties=\u8cc7\u8a0a
-composition.name=\u540d\u7a31
-composition.artist=\u6f14\u594f\u8005
-composition.album=\u5c08\u8f2f
-composition.author=\u4f5c\u8005
-composition.date=\u65e5\u671f
-composition.copyright=\u7248\u6b0a
-composition.writer=\u5409\u4ed6\u8b5c\u4f5c\u8005
-composition.transcriber=\u6539\u7de8
-composition.comments=\u8a3b\u89e3
-composition.clef=(\u9ad8/\u4f4e)\u97f3\u8b5c\u865f
-composition.clef.treble=\u9ad8\u97f3\u90e8
-composition.clef.bass=\u4f4e\u97f3\u90e8
-composition.clef.tenor=\u6b21\u4e2d\u97f3\u90e8(\u7537\u9ad8\u97f3\u90e8)
-composition.clef.alto=\u4e2d\u97f3\u90e8
-composition.clef.to-the-end=\u5c07\u9019\u500b(\u9ad8/\u4f4e)\u97f3\u8b5c\u865f\u7528\u5230\u7d50\u675f
-composition.clef=\u8b5c\u865f
-composition.clef.treble=\u9ad8\u97f3\u8b5c\u8a18\u865f
-composition.clef.bass=\u4f4e\u97f3\u8b5c\u8a18\u865f
-composition.clef.tenor=\u6b21\u4e2d\u97f3\u8b5c\u8a18\u865f
-composition.clef.alto=\u4e2d\u97f3\u8b5c\u8a18\u865f
-composition.clef.to-the-end=\u5957\u7528\u9019\u500b\u8b5c\u865f\u5230\u7d50\u5c3e
-
-composition.keysignature=\u8abf\u865f
-composition.keysignature.natural=\u9084\u539f
-composition.keysignature.sharp-1=\u53471
-composition.keysignature.sharp-2=\u53472
-composition.keysignature.sharp-3=\u53473
-composition.keysignature.sharp-4=\u53474
-composition.keysignature.sharp-5=\u53475
-composition.keysignature.sharp-6=\u53476
-composition.keysignature.sharp-7=\u53477
-composition.keysignature.flat-1=\u964d1
-composition.keysignature.flat-2=\u964d2
-composition.keysignature.flat-3=\u964d3
-composition.keysignature.flat-4=\u964d4
-composition.keysignature.flat-5=\u964d5
-composition.keysignature.flat-6=\u964d6
-composition.keysignature.flat-7=\u964d7
-composition.keysignature.to-the-end=\u5957\u7528\u9019\u500b\u8abf\u865f\u5230\u7d50\u5c3e
-composition.tripletfeel=\u4e09\u9023\u97f3\u7684\u611f\u53d7
-composition.tripletfeel.none=\u975e\u4e09\u9023\u97f3\u7684\u611f\u53d7
-composition.tripletfeel.eighth=\u4e09\u9023\u97f3 8\u5206\u97f3\u7b26
-composition.tripletfeel.sixteenth=\u4e09\u9023\u97f3 16\u5206\u97f3\u7b26
-composition.tripletfeel.to-the-end=\u5957\u7528\u9019\u500btriplet feel\u5230\u7d50\u5c3e
-
-help=\u5e6b\u52a9
-help.help=\u5e6b\u52a9
-help.doc=\u6587\u4ef6
-help.about=\u95dc\u65bc
-help.about.license=\u7248\u6b0a
-help.about.authors=\u4f5c\u8005
-help.about.description=\u8aaa\u660e
-
-track=\u97f3\u8ecc
-track.number=\u7de8\u865f
-track.name=\u540d\u7a31
-track.color=\u984f\u8272
-track.first=\u7b2c\u4e00\u8ecc
-track.last=\u6700\u672b\u8ecc
-track.previous=\u524d\u4e00\u8ecc
-track.next=\u4e0b\u4e00\u8ecc
-track.add=\u65b0\u589e\u97f3\u8ecc
-track.remove=\u79fb\u9664\u97f3\u8ecc
-track.clone=\u8907\u88fd\u97f3\u8ecc
-track.move-up=\u4e0a\u79fb
-track.move-down=\u4e0b\u79fb
-track.instrument=\u6a02\u5668
-track.tunning=\u8abf\u5f26\u6cd5
-track.instrument.empty=\u5728\u4f60\u7684Midi\u7cfb\u7d71\u88e1\u627e\u4e0d\u5230\u97f3\u6e90\uff0c\u8acb\u5617\u8a66\u91cd\u65b0\u7de8\u8b6fTuxGuitar
-track.properties=\u5c6c\u6027
-track.properties.general=\u4e00\u822c
-track.name.default-percussion-name=\u6253\u64ca\u6a02\u5668
-track.lyrics=\u6b4c\u8a5e
-track.solo=\u7368\u594f
-track.mute=\u975c\u97f3
-
-lyric.editor=\u6b4c\u8a5e\u7de8\u8f2f\u5668
-
-measure=\u5c0f\u7bc0
-measure.first=\u7b2c\u4e00\u5c0f\u7bc0
-measure.last=\u6700\u5f8c\u5c0f\u7bc0
-measure.previous=\u4e0a\u500b\u5c0f\u7bc0
-measure.next=\u4e0b\u500b\u5c0f\u7bc0
-measure.add=\u65b0\u589e\u5c0f\u7bc0
-measure.add.count=\u52a0\u6578\u500b\u5c0f\u7bc0
-measure.add-before-current-position=\u5728\u7576\u524d\u4f4d\u7f6e\u4e4b\u524d\u65b0\u589e\u5c0f\u7bc0
-measure.add-after-current-position=\u5728\u7576\u524d\u4f4d\u7f6e\u4e4b\u5f8c\u65b0\u589e\u5c0f\u7bc0
-measure.add-at-end=\u5728\u7d50\u5c3e\u65b0\u589e\u5c0f\u7bc0
-measure.remove=\u79fb\u9664\u5c0f\u7bc0
-measure.copy=\u8907\u88fd\u5c0f\u7bc0
-measure.paste=\u8cbc\u4e0a\u5c0f\u7bc0
-measure.clean=\u6e05\u9664\u5c0f\u7bc0
-
-duration=\u97f3\u9577
-duration.whole=\u5168\u97f3\u7b26
-duration.half=\u4e8c\u5206\u97f3\u7b26
-duration.quarter=\u56db\u5206\u97f3\u7b26
-duration.eighth=\u516b\u5206\u97f3\u7b26
-duration.sixteenth=\u5341\u516d\u5206\u97f3\u7b26
-duration.thirtysecond=\u4e09\u5341\u4e8c\u5206\u97f3\u7b26
-duration.sixtyfourth=\u516d\u5341\u56db\u5206\u97f3\u7b26
-duration.dotted=\u9644\u9ede
-duration.doubledotted=\u96d9\u9644\u9ede
-duration.division-type=\u4e09\u9023\u97f3
-
-dynamic=\u529b\u5ea6
-dynamic.piano-pianissimo=\u6700\u5f31
-dynamic.pianissimo=\u751a\u5f31
-dynamic.piano=\u5f31
-dynamic.mezzo-piano=\u4e2d\u5f31
-dynamic.mezzo-forte=\u4e2d\u5f37   
-dynamic.forte=\u5f37
-dynamic.fortissimo=\u751a\u5f37
-dynamic.forte-fortissimo=\u6700\u5f37
-
-effects=\u6548\u679c
-effects.vibrato=\u9707\u97f3
-effects.bend=\u63a8\u5f26
-effects.deadnote=\u60b6\u97f3
-effects.slide=\u6ed1\u5f26
-effects.hammer=\u69cc\u5f26/\u52fe\u5f26
-effects.tremolo-bar=\u6416\u687f\u986b\u97f3\u63a7\u5236\u689d
-effects.tremolo-bar-editor=\u6416\u687f\u986b\u97f3\u7de8\u8f2f\u5668
-effects.tremolo-bar.dip=\u4e0b\u6c89\u6416\u687f 
-effects.tremolo-bar.dive=\u8fc5\u901f\u79fb\u52d5\u6416\u687f
-effects.tremolo-bar.release-up=\u653e\u6389\u6416\u687f(Release Up)
-effects.tremolo-bar.release-down=\u653e\u6389\u6416\u687f(Release Down)
-effects.tremolo-bar.inverted-dip=\u6416\u687f\u6416\u4f86\u6416\u53bb(Inverted Dip)
-effects.tremolo-bar.return=\u9084\u539f\u6416\u687f
-effects.ghostnote=\u5e7d\u9748\u97f3
-effects.accentuatednote=\u91cd\u97f3
-effects.heavyaccentuatednote=\u5f37\u91cd\u97f3
-effects.harmonic=\u6cdb\u97f3
-effects.grace=\u88dd\u98fe\u97f3
-effects.grace-editor=\u88dd\u98fe\u97f3\u7de8\u8f2f\u5668
-effects.grace.before-beat=\u62cd\u524d\u88dd\u98fe\u97f3
-effects.grace.on-beat=\u62cd\u9ede\u88dd\u98fe\u97f3
-effects.grace.transition=\u904e\u6e21\u88dd\u98fe\u97f3
-effects.grace.transition-none=\u7121
-effects.grace.transition-bend=\u63a8\u5f26
-effects.grace.transition-slide=\u6ed1\u97f3
-effects.grace.transition-hammer=\u69cc\u97f3
-effects.trill=\u986b\u97f3
-effects.trill-editor=\u986b\u97f3\u7de8\u8f2f\u5668
-effects.tremolo-picking=\u6416\u687f\u986b\u97f3\u64a5\u594f
-effects.tremolo-picking-editor=\u6416\u687f\u986b\u97f3\u64a5\u594f\u7de8\u8f2f\u5668
-effects.palm-mute=\u624b\u638c\u60b6\u97f3
-effects.staccato=\u65b7\u97f3
-effects.tapping=\u9ede\u5f26
-effects.slapping=\u53f3\u624b\u64ca\u5f26
-effects.popping=\u53f3\u624b\u52fe\u5f26
-effects.fade-in=\u6de1\u5165
-effects.harmonic-editor=\u6cdb\u97f3\u7de8\u8f2f\u5668
-effects.harmonic.type-of-harmonic=\u6cdb\u97f3\u985e\u578b
-effects.harmonic.natural=\u81ea\u7136\u6cdb\u97f3
-effects.harmonic.artificial=\u4eba\u5de5\u6cdb\u97f3
-effects.harmonic.artificial.key-offset=\u97f3\u968e\u5c0d\u4f4d\u504f\u79fb\u91cf(Key offset)
-effects.harmonic.tapped=\u62cd\u5f26\u6cdb\u97f3
-effects.harmonic.tapped.left-hand=\u5de6\u624b\u9ede\u5f26
-effects.harmonic.tapped.right-hand=\u53f3\u624b\u9ede\u5f26
-effects.harmonic.pinch=\u624b\u6307\u6cdb\u97f3
-effects.harmonic.semi=\u534a\u6cdb\u97f3
-
-bend.editor=\u63a8\u5f26\u7de8\u8f2f\u5668
-bend.bend=\u63a8\u5f26
-bend.bend-release=\u63a8/\u653e
-bend.bend-release-bend=\u63a8/\u653e/\u63a8
-bend.prebend=\u5148\u63a8
-bend.prebend-release=\u5148\u63a8/\u518d\u653e
-
-transport=\u64ad\u653e\u5668
-transport.start=\u958b\u59cb
-transport.stop=\u505c\u6b62
-transport.pause=\u66ab\u505c
-transport.first=\u6700\u524d\u9762
-transport.last=\u6700\u5f8c\u9762
-transport.previous=\u5f80\u524d
-transport.next=\u5f80\u5f8c
-transport.metronome=\u7bc0\u62cd\u5668
-transport.mode=\u653e\u97f3\u6a21\u5f0f
-transport.mode.simple=\u7c21\u55ae\u6a21\u5f0f
-transport.mode.simple.tempo-percent=\u6578\u5ea6\u7684\u767e\u5206\u6bd4
-transport.mode.simple.loop=\u5faa\u74b0\u64ad\u653e
-transport.mode.trainer=\u7df4\u7fd2\u6a21\u5f0f
-transport.mode.trainer.increment-description=\u6f38\u5feb
-transport.mode.loop-range=\u53cd\u8986\u7684\u6bb5\u843d
-transport.mode.loop-range.from=\u5f9e\u67d0\u5c0f\u7bc0\u64ad\u653e
-transport.mode.loop-range.from-default=\u5f9e\u982d
-transport.mode.loop-range.to=\u64ad\u653e\u5230\u5c0f\u7bc0
-transport.mode.loop-range.to-default=\u64ad\u5230\u7d50\u675f
-transport.set-loop-start=\u8a2d\u5b9a\u53cd\u8986\u64ad\u653e\u7684\u8d77\u9ede
-transport.set-loop-end=\u8a2d\u5b9a\u53cd\u8986\u64ad\u653e\u7684\u7d42\u9ede
-
-
-instruments.volume=\u589e\u76ca
-instrument.channel=\u983b\u9053
-instrument.effect-channel=\u6548\u679c\u983b\u9053
-instrument.volume=\u97f3\u91cf
-instrument.balance=\u5e73\u8861
-instrument.chorus=\u4e00\u8d77\u767c\u8072
-instrument.reverb=\u6df7\u97ff\u6548\u679c
-instrument.phaser=\u79fb\u76f8\u5668 
-instrument.tremolo=\u986b\u97f3/\u9707\u97f3
-instrument.free=\u91cb\u653e
-instrument.link=\u9023\u7d50
-
-
-repeat.open=\u958b\u59cb\u53cd\u8986\u5340\u6bb5
-repeat.close=\u7d50\u675f\u53cd\u8986\u5340\u6bb5
-repeat.alternative=\u4efb\u610f\u7684\u53cd\u8986
-repeat.alternative.editor=\u7de8\u8f2f\u4efb\u610f\u7684\u53cd\u8986
-repetitions=\u53cd\u8907
-repeat.number-of-repetitions=\u53cd\u8907\u6b21\u6578
-
-beat=\u97f3\u7b26
-beat.clean=\u6e05\u9664\u62cd\u9ede
-beat.voice.remove-unused=\u79fb\u9664\u6c92\u7528\u5230\u7684\u8072\u9053
-beat.voice-up=\u4e0a\u9ede(Stems Up)
-beat.voice-down=\u4e0b\u9ede(Stems Down)
-beat.voice-auto=\u81ea\u52d5\u9ede(Auto Stems)
-beat.stroke=\u7528\u529b\u6572(Stroke)
-beat.stroke-up=\u4e0a\u64ca(Upstroke)
-beat.stroke-down=\u4e0b\u64ca(Downstroke)
-beat.move-left=\u628a\u9f13\u9ede\u5411\u5de6\u79fb(Move One Beat Left)
-beat.move-right=\u628a\u9f13\u9ede\u5411\u53f3\u79fb(Move One Beat Right)
-beat.move-custom=\u81ea\u5b9a\u9f13\u9ede\u7684\u79fb\u52d5(Custom Beat Move)
-beat.move-custom.dialog.title=\u81ea\u5b9a\u79fb\u52d5(Custom Move)
-beat.move-custom.dialog.direction-tip=\u79fb\u52d5\u65b9\u5411(Move Direction)
-beat.move-custom.dialog.move-1.tip=\u4e3b\u8981\u79fb\u52d5(Major Move)
-beat.move-custom.dialog.move-2.tip=\u5e73\u79fb(Fine Move)
-beat.move-custom.dialog.direction=\u65b9\u5411
-beat.move-custom.dialog.direction.right=\u5411\u53f3\u79fb
-beat.move-custom.dialog.direction.left=\u5411\u5de6\u79fb
-beat.move-custom.dialog.count=\u6578\u76ee
-beat.move-custom.dialog.duration=\u97f3\u9577
-beat.move-custom.dialog.duration.type=\u4e00\u9ede/\u5169\u9ede
-beat.move-custom.dialog.duration.type.normal=\u6c92\u6709
-beat.move-custom.dialog.duration.division-type=\u5206\u5c0f\u7bc0\u65b9\u5f0f(2/4\uff0c3/4\uff0c4/4)
-beat.move-custom.dialog.duration.division-type.normal=\u4e00\u822c (Tuplet)
-
-note=\u97f3\u7b26
-note.semitone-up=\u5347\u534a\u97f3
-note.semitone-down=\u964d\u534a\u97f3
-note.shift-up=\u4e0a\u79fb
-note.shift-down=\u4e0b\u79fb
-note.tiednote=\u9023\u7d50\u97f3
-note.deadnote=\u60b6\u97f3
-
-insert.chord=\u63d2\u5165\u548c\u5f26
-chord.editor=\u548c\u5f26\u7de8\u8f2f\u5668
-chord=\u548c\u5f26
-chord.name=\u548c\u5f26\u540d\u7a31
-chord.custom.name-empty-error=\u548c\u5f26\u540d\u7a31\u4e0d\u53ef\u7a7a\u767d
-chord.custom.name-exist-error=\u548c\u5f26\u540d\u7a31\u5df2\u5b58\u5728
-chord.bass=\u4f4e\u97f3
-chord.custom=\u81ea\u5b9a\u548c\u5f26
-chord.settings.tip=\u81ea\u5b9a\u7684\u8a2d\u5b9a
-chord.settings.type=\u7a2e\u985e
-chord.settings.type.most-common=\u6700\u4e00\u822c
-chord.settings.type.inversions=\u91cd\u6392(Inversions)
-chord.settings.type.close-voiced=\u9589\u8072\u9053(Close Voiced)
-chord.settings.type.open-voiced=\u958b\u8072\u9053(Open Voiced)
-chord.settings.open-chords=\u958b\u653e\u548c\u5f26(Open Chords)
-chord.settings.chords-to-display=\u79c0\u51fa\u4f86\u7684\u548c\u5f26(Chords to Display)
-chord.settings.search-frets=\u641c\u5c0b\u6307\u677f(Search Frets)
-chord.settings.minimum-fret=\u6700\u5c0f
-chord.settings.maximum-fret=\u6700\u5927
-
-instrument=\u6a02\u5668
-instrument.instrument=\u6a02\u5668
-instrument.percussion-track=\u6253\u64ca\u6a02\u5668\u8ecc
-
-tunning=\u8abf\u5f26\u6cd5
-tunning.offset=\u4f4d\u79fb
-tunning.strings=\u5f26
-tuning.strings.transpose=\u56e0\u79fb\u8abf\u53d7\u5f71\u97ff\u7684\u97f3\u7b26
-tuning.strings.transpose.try-keep-strings=\u8a66\u8457\u4fdd\u7559\u97f3\u7b26\u5728\u540c\u4e00\u6839\u5f26\u4e0a
-tuning.strings.transpose.apply-to-chords=\u79fb\u8abf\u548c\u5f26
-
-
-language=\u8a9e\u8a00
-
-choose-color=\u9078\u64c7\u4e00\u500b\u984f\u8272
-
-
-settings=\u8a2d\u5b9a
-settings.config=\u8a2d\u5b9aTuxGuitar
-settings.config.language=\u8a9e\u8a00
-settings.config.language.choose=\u9078\u64c7\u8a9e\u8a00
-settings.config.styles=\u98a8\u683c
-settings.config.styles.general=\u4e00\u822c\u98a8\u683c
-settings.config.styles.printer=\u5370\u8868\u6a5f\u98a8\u683c
-
-settings.config.styles.font.default=\u9810\u8a2d\u5b57\u578b
-settings.config.styles.font.note=\u97f3\u7b26\u5b57\u578b
-settings.config.styles.font.lyric=\u6b4c\u8a5e\u5b57\u578b
-settings.config.styles.font.text=\u6587\u5b57\u5b57\u578b
-
-settings.config.styles.font.time-signature=\u62cd\u5b50\u8a18\u865f\u5b57\u578b
-settings.config.styles.font.printer-default=\u5217\u5370\u7528\u9810\u8a2d\u5b57\u578b
-settings.config.styles.font.printer-note=\u5217\u5370\u7528\u97f3\u7b26\u5b57\u578b
-settings.config.styles.font.printer-time-signature=\u5217\u5370\u7528\u62cd\u5b50\u8a18\u865f\u5b57\u578b
-settings.config.styles.color.score-note=\u4e94\u7dda\u8b5c\u97f3\u7b26\u984f\u8272
-settings.config.styles.color.tab-note=\u516d\u7dda\u8b5c\u97f3\u7b26\u984f\u8272
-settings.config.styles.color.play-note=\u64ad\u653e\u4e2d\u7684\u97f3\u7b26\u984f\u8272
-settings.config.apply-changes-question=\u60a8\u8981\u73fe\u5728\u5957\u7528\u8b8a\u66f4\u55ce?
-
-settings.config.sound=\u8072\u97f3
-
-settings.config.main=\u4e00\u822c
-settings.config.main.window-title=\u8996\u7a97\u6a19\u984c
-settings.config.main.window-title.help=\u4e0b\u5217\u8b8a\u6578\u6703\u986f\u793a\u5728\u8996\u7a97\u6a19\u984c
-settings.config.main.window-title.var.description.appname=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u9019\u500b\u7a0b\u5f0f\u7684\u540d\u7a31:TuxGuitar
-settings.config.main.window-title.var.description.appversion=\u9019\u500b\u8b8a\u6578\u4ee3\u8868TuxGuitar\u7684\u7248\u672c\u865f
-settings.config.main.window-title.var.description.filename=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u958b\u555f\u6a94\u6848\u7684\u6a94\u540d
-settings.config.main.window-title.var.description.filepath=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u958b\u555f\u6a94\u6848\u7684\u8def\u5f91
-settings.config.main.window-title.var.description.songname=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u66f2\u76ee\u540d\u7a31
-settings.config.main.window-title.var.description.songauthor=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u66f2\u76ee\u4f5c\u8005
-settings.config.main.window-title.var.description.songalbum=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u66f2\u76ee\u5c08\u8f2f
-settings.config.main.window-title.var.description.songartist=\u9019\u500b\u8b8a\u6578\u4ee3\u8868\u66f2\u76ee\u6f14\u594f\u8005
-settings.config.main.options=\u9078\u9805
-settings.config.main.splash-enabled=\u986f\u793a\u555f\u52d5\u6b61\u8fce\u756b\u9762
-settings.config.main.table.auto-size.enabled=\u555f\u7528\u81ea\u52d5\u8868\u683c\u5c3a\u5bf8
-
-settings.config.styles.color.lines=\u6c34\u5e73\u7dda\u984f\u8272
-settings.config.toolbars=\u5de5\u5177\u5217
-settings.config.toolbars.tip=\u81ea\u8a02\u4f60\u7684\u5de5\u5177\u5217
-settings.config.toolbars.list=\u53ef\u7528\u7684\u5de5\u5177\u5217
-settings.config.toolbars.move-up=\u4e0a\u79fb
-settings.config.toolbars.move-down=\u4e0b\u79fb
-settings.config.skin=\u76ae\u819a(Skins)
-settings.config.skin.choose=\u9078\u4f60\u7684\u76ae\u819a
-settings.keybindings=\u71b1\u9375\u8a2d\u5b9a
-key-bindings-editor=\u71b1\u9375\u7de8\u8f2f\u5668
-
-key-bindings-editor-action-select=\u9078\u64c7\u52d5\u4f5c
-key-bindings-editor-action-column=\u52d5\u4f5c
-key-bindings-editor-shortcut-column=\u6309\u9375
-key-bindings-editor-push-a-key=\u8acb\u6309\u9375
-key-bindings-editor-save-question=\u6709\u672a\u5132\u5b58\u7684\u8b8a\u66f4\uff0c\u662f\u5426\u5132\u5b58\uff1f
-
-key-bindings-editor-override=\u9019\u500b\u71b1\u9375\u5df2\u88ab\u4f7f\u7528\uff0c\u78ba\u5b9a\u8981\u4f7f\u7528\uff1f
-
-print.print=\u5217\u5370
-print.dialog=\u5217\u5370
-print.service=\u670d\u52d9
-print.service.name=\u540d\u7a31
-print.service.status=\u72c0\u614b
-print.service.type=\u985e\u578b
-print.service.info=\u8cc7\u8a0a
-print.range=\u7bc4\u570d
-print.range.all-pages=\u5168\u90e8
-print.range.pages=\u9801\u9762
-print.range.pages-to=\u5230
-print.copies=\u8907\u5370
-print.copies-number=\u4efd\u6578
-print.print-to-file=\u5217\u5370\u5230\u6a94\u6848
-print.file-chooser=\u9078\u64c7
-print-header.default-song-name=\u672a\u547d\u540d
-print-header.default-song-author=\u4e0d\u8a73
-print.preview=\u9810\u89bd\u5217\u5370
-print.preview.page-of=\u4e4b
-
-
-
-marker=\u6a19\u8a18
-marker.add=\u52a0\u5165\u6a19\u8a18
-marker.list=\u6a19\u8a18\u5217\u8868
-marker.first=\u81f3\u9996\u6a19\u8a18
-marker.last=\u81f3\u672b\u6a19\u8a18
-marker.next=\u4e0b\u4e00\u500b\u6a19\u8a18
-marker.previous=\u524d\u4e00\u500b\u6a19\u8a18
-
-export.tablature-enabled=\u986f\u793a\u516d\u7dda\u8b5c
-export.score-enabled=\u986f\u793a\u4e94\u7dda\u8b5c
-export.chord-name-enabled=\u986f\u793a\u548c\u7d43\u540d\u7a31
-export.chord-diagram-enabled=\u986f\u793a\u548c\u7d43\u6307\u5716
-export.black-and-white=\u9ed1\u548c\u767d\u7684\u6a21\u5f0f
-
-scale=\u97f3\u968e
-scale.list=\u97f3\u968e\u5217\u8868
-
-text.insert=\u63d2\u5165\u6587\u5b57
-text.editor=\u6587\u5b57\u7de8\u8f2f\u5668
-text.text=\u6587\u5b57
-
-tools=\u5de5\u5177
-tools.scale=\u7434\u8b5c\u7684\u6e05\u55ae
-tools.browser=\u700f\u89bd
-tools.plugins=\u5916\u639b
-tools.shortcuts=\u6377\u5f91
-tools.settings=\u8a2d\u5b9a
-
-tools.transpose=\u79fb\u8abf
-tools.transpose.semitones=\u79fb\u8abf \u534a\u97f3
-tools.transpose.apply-to-track=\u6240\u6709\u7684\u5c0f\u7bc0\u90fd\u79fb\u8abf
-tools.transpose.apply-to-measure=\u53ea\u9019\u500b\u5c0f\u7bc0\u79fb\u8abf
-tools.transpose.apply-to-all-tracks=\u7528\u5728\u6240\u6709\u7684\u97f3\u8ecc
-tools.transpose.try-keep-strings=\u76e1\u53ef\u80fd\u8a66\u8457\u4fdd\u7559\u97f3\u7b26\u5728\u540c\u4e00\u6839\u5f26\u4e0a
-tools.transpose.apply-to-chords=\u5c07\u548c\u5f26\u79fb\u8abf
-
-browser.dialog=\u700f\u89bd
-browser.menu.file=\u6a94\u6848
-browser.open=\u958b\u555f
-browser.exit=\u96e2\u958b
-browser.menu.collection=\u5c0f\u66f2\u96c6
-browser.menu.go=Go
-browser.collection.select=\u9078\u66f2\u96c6
-browser.collection.open=\u958b\u555f
-browser.collection.remove=\u79fb\u9664
-browser.collection.close=\u95dc\u9589
-browser.collection.new=\u65b0\u589e
-browser.go-root=Home
-browser.go-back=\u56de\u4f86
-browser.refresh=\u66f4\u65b0
-browser.factory.fs.name=\u6a94\u6848\u7e3d\u7ba1
-browser.collection.fs.name=\u6a94\u540d
-browser.collection.fs.path=\u76ee\u9304
-browser.collection.fs.editor-title=\u6a94\u6848\u7e3d\u7ba1\u7684\u66f2\u96c6
-browser.collection.fs.editor-tip=\u9078\u64c7\u4f60\u7684\u66f2\u96c6\u7684\u76ee\u9304
-browser.collection.fs.invalid-path=\u8acb\u9078\u4e00\u500b\u6709\u6548\u7684\u76ee\u9304
-
-midi.port=MIDI Port
-midi.sequencer=MIDI Sequencer
-
-plugin.unknown-value=\u4e0d\u5b58\u5728\u7684
-plugin.column.name=\u5916\u639b\u540d
-plugin.column.enabled=\u555f\u7528\u7684
-
-
-#########################
-###  Tool Bar Items   ###
-#########################
-file.items=\u6a94\u6848
-edit.items=\u7de8\u8f2f
-property.items=\u5c6c\u6027
-track.items=\u97f3\u8ecc
-duration.items=\u97f3\u9577
-beat.items=\u97f3\u7b26
-composition.items=\u66f2\u76ee
-repeat.items=\u53cd\u8986
-transport.items=\u64ad\u653e\u5668
-marker.items=\u6a19\u8a18
-insert.items=\u63d2\u5165
-layout.items=\u7248\u9762
-view.items=\u6aa2\u8996
-effect.items=\u6548\u679c
-dynamic.items=\u529b\u5ea6
-
-#########################
-###Key Binding Actions###
-#########################
-action.file.new=\u958b\u65b0\u6a94\u6848
-action.file.open=\u958b\u555f\u820a\u6a94
-action.file.open-url=Open URL
-action.file.save=\u5132\u5b58\u6a94\u6848
-action.file.save-as=\u53e6\u5b58\u65b0\u6a94
-action.file.print=\u5217\u5370
-action.file.print-preview=\u9810\u89bd\u5217\u5370
-action.file.exit=\u96e2\u958b\u4f01\u9d5d\u5409\u4ed6(TuxGuitar)
-action.edit.undo=\u4e0a\u4e00\u6b65
-action.edit.redo=\u4e0b\u4e00\u6b65
-action.edit.voice-1=\u9078\u8072\u9053 1
-action.edit.voice-2=\u9078\u8072\u9053 2
-action.composition.change-time-signature=\u8b8a\u66f4\u62cd\u5b50\u8a18\u865f
-action.composition.change-tempo=\u8b8a\u66f4\u7bc0\u62cd
-action.composition.change-info=\u8b8a\u66f4\u6b4c\u66f2\u8a0a\u606f
-action.composition.change-clef=\u8b8a\u66f4\u8b5c\u865f
-action.composition.change-key-signature=\u8b8a\u66f4\u8abf\u865f
-action.composition.change-triplet-feel=\u6539\u8b8a\u4e09\u9023\u97f3\u7684\u611f\u89ba
-
-action.view.layout-set-page=\u7e31\u5411\u5ef6\u4f38\u7248\u9762
-action.view.layout-set-linear=\u6a6b\u5411\u5ef6\u4f38\u7248\u9762
-action.view.layout-set-multitrack=\u591a\u8ecc\u7248\u9762
-action.view.layout-set-score-enabled=\u986f\u793a\u4e94\u7dda\u8b5c
-action.view.layout-set-tablature-enabled=\u986f\u793a\u5409\u4ed6\u8b5c
-action.view.layout-set-compact=\u986f\u793a\u7cbe\u7c21\u6a21\u5f0f
-action.view.layout-set-chord-diagram-enabled=\u555f\u7528\u548c\u5f26\u6307\u5716
-action.view.layout-set-chord-name-enabled=\u555f\u7528\u548c\u5f26\u540d\u7a31
-
-action.view.show-fretboard=\u986f\u793a\u6307\u677f
-action.view.show-piano=\u986f\u793a\u7434\u9375
-action.view.show-matrix=\u986f\u793a\u77e9\u9663
-action.view.show-mixer=\u986f\u793a\u6df7\u97f3\u5668
-action.view.show-transport=\u986f\u793a\u6642\u9593\u8ef8
-
-action.track.add=\u65b0\u589e\u97f3\u8ecc
-action.track.remove=\u79fb\u9664\u97f3\u8ecc
-action.track.clone=\u8907\u88fd\u97f3\u8ecc
-action.track.go-first=\u5230\u7b2c\u4e00\u8ecc
-action.track.go-last=\u5230\u6700\u672b\u8ecc
-action.track.go-next=\u5230\u4e0b\u4e00\u8ecc
-action.track.go-previous=\u5230\u4e0a\u4e00\u8ecc
-action.track.lyrics=\u7de8\u8f2f\u97f3\u8ecc\u6b4c\u8a5e
-action.track.properties=\u8b8a\u66f4\u97f3\u8ecc\u5c6c\u6027
-action.track.move-down=\u4e0b\u79fb\u97f3\u8ecc
-action.track.move-up=\u4e0a\u79fb\u97f3\u8ecc
-
-action.measure.add=\u589e\u52a0\u5c0f\u7bc0
-action.measure.remove=\u79fb\u9664\u5c0f\u7bc0
-action.measure.copy=\u8907\u88fd\u5c0f\u7bc0
-action.measure.paste=\u8cbc\u4e0a\u5c0f\u7bc0
-action.measure.clean=\u6e05\u9664\u5c0f\u7bc0
-action.measure.go-first=\u5230\u7b2c\u4e00\u5c0f\u7bc0
-action.measure.go-last=\u5230\u6700\u5f8c\u5c0f\u7bc0
-action.measure.go-next=\u5230\u4e0b\u4e00\u5c0f\u7bc0
-action.measure.go-previous=\u5230\u4e0a\u4e00\u5c0f\u7bc0
-
-action.beat.general.remove-unused-voice=\u79fb\u9664\u6c92\u7528\u5230\u7684\u8072\u9053
-action.beat.general.voice-up=\u8a2d\u5b9a\u4e0a\u9ede(Set Stems Up)
-action.beat.general.voice-down=\u8a2d\u5b9a\u4e0b\u9ede(Set Stems Down)
-action.beat.general.voice-auto=\u8a2d\u5b9a\u81ea\u52d5\u9ede(Set Auto Stems)
-action.beat.general.set-stroke-up=\u8a2d\u5b9a\u4e0a\u64ca(Set Upstroke)
-action.beat.general.set-stroke-down=\u8a2d\u5b9a\u4e0b\u64ca(Set Downstroke)
-action.beat.general.move-left=\u5de6\u79fb\u4e00\u62cd(Move One Beat Left)
-action.beat.general.move-right=\u53f3\u79fb\u4e00\u62cd(Move One Beat Right)
-action.beat.general.move-custom=\u81ea\u8a02\u79fb\u62cd(Custom Beat Move)
-
-action.note.general.clean-beat=\u6e05\u9664\u62cd\u9ede
-action.note.general.decrement-semitone=\u6e1b\u5c11\u534a\u97f3
-action.note.general.increment-semitone=\u589e\u52a0\u534a\u97f3
-action.note.general.shift-down=\u4e0b\u79fb
-action.note.general.shift-up=\u4e0a\u79fb
-action.note.general.tied=\u589e\u52a0/\u79fb\u9664 \u9023\u7d50\u97f3
-
-action.note.duration.set-whole=\u8a2d\u5b9a\u4e00\u62cd(Set Whole Duration)
-action.note.duration.set-half=\u8a2d\u5b9a\u534a\u62cd(Set Half Duration)
-action.note.duration.set-quarter=\u8a2d\u5b9a\u56db\u5206\u4e4b\u4e00\u62cd(Set Quarter Duration)
-action.note.duration.set-eighth=\u8a2d\u5b9a\u516b\u5206\u4e4b\u4e00\u62cd
-action.note.duration.set-sixteenth=\u8a2d\u5b9a\u5341\u516d\u5206\u4e4b\u4e00\u62cd
-action.note.duration.set-thirty-second=\u8a2d\u5b9a\u4e09\u5341\u4e8c\u5206\u4e4b\u4e00\u62cd
-action.note.duration.set-sixty-fourth=\u8a2d\u5b9a\u516d\u5341\u56db\u5206\u4e4b\u4e00\u62cd
-action.note.duration.change-dotted=\u589e\u52a0/\u79fb\u9664 \u9644\u9ede
-action.note.duration.change-double-dotted=\u589e\u52a0/\u79fb\u9664 \u96d9\u9644\u9ede
-action.note.duration.change-division-type=\u589e\u52a0/\u79fb\u9664 tupleto
-action.note.duration.decrement-duration=\u6e1b\u5c11\u62cd\u9577(Decrement Duration)
-action.note.duration.increment-duration=\u589e\u52a0\u62cd\u9577(Increment Duration)
-
-action.note.effect.change-vibrato=\u589e\u52a0/\u79fb\u9664 \u9707\u97f3
-action.note.effect.change-bend=\u589e\u52a0/\u79fb\u9664 \u63a8\u5f26
-action.note.effect.change-slide=\u589e\u52a0/\u79fb\u9664 \u6ed1\u5f26
-action.note.effect.change-hammer=\u589e\u52a0/\u79fb\u9664 \u5782/\u52fe\u5f26
-action.note.effect.change-accentuated=\u589e\u52a0/\u79fb\u9664 \u91cd\u97f3
-action.note.effect.change-dead=\u589e\u52a0/\u79fb\u9664 \u60b6\u97f3
-action.note.effect.change-fade-in=\u589e\u52a0/\u79fb\u9664 \u6de1\u5165
-action.note.effect.change-ghost=\u589e\u52a0/\u79fb\u9664 \u5e7d\u9748\u97f3
-action.note.effect.change-grace=\u589e\u52a0/\u79fb\u9664 \u88dd\u98fe\u97f3
-action.note.effect.change-harmonic=\u589e\u52a0/\u79fb\u9664 \u6cdb\u97f3
-action.note.effect.change-heavy-accentuated=\u589e\u52a0/\u79fb\u9664 \u5f37\u91cd\u97f3
-action.note.effect.change-palm-mute=\u589e\u52a0/\u79fb\u9664 \u624b\u638c\u60b6\u97f3
-action.note.effect.change-popping=\u589e\u52a0/\u79fb\u9664 \u53f3\u624b\u52fe\u5f26
-action.note.effect.change-slapping=\u589e\u52a0/\u79fb\u9664 \u53f3\u624b\u64ca\u5f26
-action.note.effect.change-staccato=\u589e\u52a0/\u79fb\u9664 \u65b7\u97f3
-action.note.effect.change-tapping=\u589e\u52a0/\u79fb\u9664 \u9ede\u5f26
-action.note.effect.change-tremolo-bar=\u589e\u52a0/\u79fb\u9664 \u6416\u687f\u986b\u97f3\u63a7\u5236\u689d
-action.note.effect.change-tremolo-picking=\u589e\u52a0/\u79fb\u9664 \u6416\u687f\u986b\u97f3\u64a5\u594f
-action.note.effect.change-trill=\u589e\u52a0/\u79fb\u9664 \u986b\u97f3
-
-action.insert.open-repeat=\u958b\u59cb\u53cd\u8986\u5340\u6bb5
-action.insert.close-repeat=\u7d50\u675f\u53cd\u8986\u5340\u6bb5
-action.insert.repeat-alternative=\u4efb\u610f\u53cd\u8986
-action.insert.chord=\u63d2\u5165\u5408\u5f26
-action.insert.text=\u63d2\u5165\u6587\u5b57
-
-action.marker.add=\u52a0\u4e0a\u4e00\u500b\u6a19\u8a18
-action.marker.go-next=\u5230\u4e0b\u4e00\u500b\u6a19\u8a18
-action.marker.go-previous=\u5230\u4e0a\u4e00\u500b\u6a19\u8a18
-
-action.transport.play=\u64ad\u653e
-action.transport.stop=\u505c\u6b62
-action.transport.mode=\u64ad\u653e\u6a21\u5f0f
-action.transport.metronome=\u7bc0\u62cd\u5668
-action.transport.set-loop-start=\u8a2d\u5b9a\u91cd\u64ad\u7684\u8d77\u9ede
-action.transport.set-loop-end=\u8a2d\u5b9a\u91cd\u64ad\u7684\u7d42\u9ede
-
-action.tools.browser=\u700f\u89bd
-action.tools.transpose=\u79fb\u8abf\u97f3\u7b26
-action.settings.configure=\u8a2d\u5b9a
-action.help.doc=\u5e6b\u52a9
-
diff --git a/TuxGuitar-testing/platform-all/share/lang/toutf.pl b/TuxGuitar-testing/platform-all/share/lang/toutf.pl
deleted file mode 100644
index 490a638b..00000000
--- a/TuxGuitar-testing/platform-all/share/lang/toutf.pl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-
-if ($#ARGV < 0){
-	print "** Please, specify a file to convert\n\n";
-	exit 1;
-}
-
-my $file = $ARGV[0];
-
-open(IN, "<:utf8", $file);
-my @data = <IN>;
-close(IN);
-
-my ($i)=0;
-my $line;
-
-foreach (@data){
-	chop;
-
-	my @chars = unpack ("U*", $_);
-	my $line = "";
-
-	foreach my $c (@chars){
-		if ($c > 128){
-			$line .= "\\u".sprintf("%04x",$c);
-		}
-		else {
-			$line .= pack ("U*", $c);
-		}
-	}
-
-	print "$line\n";
-}
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-abc.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-abc.jar
deleted file mode 100644
index edad756a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-abc.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-ascii.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-ascii.jar
deleted file mode 100644
index 62abb7d9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-ascii.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-browser-ftp.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-browser-ftp.jar
deleted file mode 100644
index 35f1858d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-browser-ftp.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-community.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-community.jar
deleted file mode 100644
index baee9f93..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-community.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-compat.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-compat.jar
deleted file mode 100644
index 51054080..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-compat.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-converter.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-converter.jar
deleted file mode 100644
index 14640998..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-converter.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gervill.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gervill.jar
deleted file mode 100644
index b52007fc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gervill.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gpx.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gpx.jar
deleted file mode 100644
index 5dd7ffa8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gpx.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gtp.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gtp.jar
deleted file mode 100644
index 3535cbff..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-gtp.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-image.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-image.jar
deleted file mode 100644
index 08dc908d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-image.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-jsa.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-jsa.jar
deleted file mode 100644
index 5bae473d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-jsa.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-lilypond.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-lilypond.jar
deleted file mode 100644
index 4b701b36..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-lilypond.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-midi.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-midi.jar
deleted file mode 100644
index 3314e08a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-midi.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-musicxml.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-musicxml.jar
deleted file mode 100644
index ecff9d77..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-musicxml.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-pdf.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-pdf.jar
deleted file mode 100644
index 7103fb77..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-pdf.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-ptb.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-ptb.jar
deleted file mode 100644
index 6845fb59..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-ptb.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-svg.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-svg.jar
deleted file mode 100644
index 0ecab7d0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-svg.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tef.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tef.jar
deleted file mode 100644
index 182b3100..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tef.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tray.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tray.jar
deleted file mode 100644
index a5a68a2e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tray.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tuner.jar b/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tuner.jar
deleted file mode 100644
index c8bafe97..00000000
Binary files a/TuxGuitar-testing/platform-all/share/plugins/tuxguitar-tuner.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/scales/scales.xml b/TuxGuitar-testing/platform-all/share/scales/scales.xml
deleted file mode 100644
index 20da1cee..00000000
--- a/TuxGuitar-testing/platform-all/share/scales/scales.xml
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scales>
-	<scale name="Major Scale" keys="1,3,5,6,8,10,12" />
-	<scale name="Pentatonic Major Scale" keys="1,3,5,8,10" />
-	<scale name="Blues Major Scale" keys="1,4,6,7,8,10" />
-	<scale name="Minor Scale" keys="1,3,4,6,8,9,11" />
-	<scale name="Melodic Minor Scale" keys="1,3,4,6,8,10,12" />
-	<scale name="Harmonic Minor Scale" keys="1,3,4,6,8,9,12" />
-	<scale name="Pentatonic Minor Scale" keys="1,4,6,8,11" />
-	<scale name="Blues Minor Scale" keys="1,4,6,7,8,11" />
-	<scale name="Augmented Scale" keys="1,4,5,8,9,12" />
-	<scale name="Be-Bop Scale" keys="1,3,5,6,8,10,11,12" />
-	<scale name="Chromatic Scale" keys="1,2,3,4,5,6,7,8,9,10,11,12" />
-	<scale name="Whole-Half Scale" keys="1,3,4,6,7,9,10,12" />
-	<scale name="Half-Whole Scale" keys="1,2,4,5,7,8,10,11" />
-	<scale name="Whole Tone Scale" keys="1,3,5,7,9,11" />
-	<scale name="Augmented fifth Scale" keys="1,3,5,6,8,9,10,12" />
-	<scale name="Algerian Scale" keys="1,3,4,7,8,9,12"  />
-	<scale name="Arabian Scale" keys="1,3,5,6,7,9,11" />
-	<scale name="Balinese Scale" keys="1,2,4,8,9" />
-	<scale name="Bartok Scale" keys="1,3,5,7,8,10,11" />
-	<scale name="Byzantine Scale" keys="1,2,5,6,8,9,12" />
-	<scale name="Chinese Scale" keys="1,3,5,8,10" />
-	<scale name="Egyptian Scale" keys="1,3,6,8,11" />
-	<scale name="Enigmatic Scale" keys="1,2,5,7,9,11,12" />
-	<scale name="Spanish Scale" keys="1,2,5,6,8,9,11" />
-	<scale name="Spanish 8 Tone Scale" keys="1,2,4,5,6,7,9,11" />
-	<scale name="Ethiopian Scale" keys="1,3,4,6,8,9,11" />
-	<scale name="Gypsy Scale" keys="1,2,5,6,8,10,11" />
-	<scale name="Hungarian Gypsy Scale" keys="1,3,4,7,8,9,11" />
-	<scale name="Hindu Scale" keys="1,3,5,6,8,9,11" />
-	<scale name="Iwato Scale" keys="1,2,6,7,11" />
-	<scale name="Japanese Scale" keys="1,2,6,8,9" />
-	<scale name="Javanese Scale" keys="1,2,4,6,8,10,11" />
-	<scale name="Jewish Scale" keys="1,2,5,6,8,9,11" />
-	<scale name="Hawaiian Scale" keys="1,3,4,6,8,10,12" />
-	<scale name="Hirajoshi Scale" keys="1,3,4,8,9" />
-	<scale name="Hungarian Minor Scale" keys="1,3,4,7,8,9,12" />
-	<scale name="Hungarian Major Scale" keys="1,4,5,7,8,10,11" />
-	<scale name="Kumoi Scale" keys="1,2,6,8,9" />
-	<scale name="Leading Whole Tone Scale" keys="1,3,5,7,9,11,12" />
-	<scale name="Mohammedan Scale" keys="1,3,4,6,8,9,12" />
-	<scale name="Mongolian Scale" keys="1,3,5,8,10" />
-	<scale name="Neapolitan Minor Scale" keys="1,2,4,6,8,9,12" />
-	<scale name="Neapolitan Major Scale" keys="1,2,4,6,8,10,12" />
-	<scale name="Oriental Scale" keys="1,2,5,6,7,10,11" />
-	<scale name="Overtone Scale" keys="1,3,5,7,8,10,11" />
-	<scale name="Pelog Scale" keys="1,2,4,8,11" />
-	<scale name="Persian Scale" keys="1,2,5,6,7,9,12" />
-	<scale name="Ionian Mode" keys="1,3,5,6,8,10,12" />
-	<scale name="Dorian Mode" keys="1,3,4,6,8,10,11" />
-	<scale name="Phrygian Mode" keys="1,2,4,6,8,9,11" />
-	<scale name="Lydian Mode" keys="1,3,5,7,8,10,12" />
-	<scale name="Mixolydian Mode" keys="1,3,5,6,8,10,11" />
-	<scale name="Aeolian Mode" keys="1,3,4,6,8,9,11" />
-	<scale name="Locrian Mode" keys="1,2,4,6,7,9,11" />
-	<scale name="Aeolian Harmonic Mode" keys="1,3,4,6,8,9,12" />
-	<scale name="Locrian Sharp 6 Mode" keys="1,2,4,6,7,10,11" />
-	<scale name="Major Sharp 5 Mode" keys="1,3,5,6,9,10,12" />
-	<scale name="Dorian Sharp 4 Mode" keys="1,3,4,7,8,10,11" />
-	<scale name="Phrygian Major Mode" keys="1,2,5,6,8,9,11" />
-	<scale name="Lydian Sharp 2 mode" keys="1,4,5,7,8,10,12" />
-	<scale name="Superlocrian Double Flat 7 Mode" keys="1,2,4,5,7,9,10" />
-	<scale name="Jazz Minor Mode" keys="1,3,4,6,8,10,12" />
-	<scale name="Dorian b2 Minor Mode" keys="1,2,4,6,8,10,12" />
-	<scale name="Lydian Augmented Minor Mode" keys="1,3,5,7,9,10,12" />
-	<scale name="Lydian Flat 7 Minor Mode" keys="1,3,5,7,8,10,11" />
-	<scale name="Mixolydian Flat 6 Minor Mode" keys="1,3,5,6,8,9,11" />
-	<scale name="Locrian Sharp 2 Minor Mode" keys="1,3,4,6,7,9,11" />
-	<scale name="Superlocrian Minor Mode" keys="1,2,4,5,7,9,11" />
-	<scale name="Pentatonic Majeur Mode" keys="1,3,5,8,10" />
-	<scale name="Pentatonic Mode 2" keys="1,3,6,8,11" />
-	<scale name="Pentatonic Mode 3" keys="1,4,6,9,11" />
-	<scale name="Pentatonic Mode 4" keys="1,3,6,8,10" />
-	<scale name="Pentatonic Dominant Mode" keys="1,3,5,8,11" />
-	<scale name="Pentatonic Minor Mode" keys="1,4,6,8,11" />
-	<scale name="Altered Pentatonic Mode" keys="1,2,5,8,10" />
-	<scale name="Blues Mode" keys="1,4,6,7,8,10" />
-	<scale name="Major Arpeggio" keys="1,5,8" />
-	<scale name="Minor Arpeggio" keys="1,4,8" />
-	<scale name="Major 7th Major Arpeggio" keys="1,5,8,12" />
-	<scale name="Major 7th Minor Arpeggio" keys="1,5,8,11" />
-	<scale name="Minor 7th Major Arpeggio" keys="1,4,8,12" />
-	<scale name="Minor 7th Minor Arpeggio" keys="1,4,8,11" />
-	<scale name="Major 9th Arpeggio" keys="1,3,5,8,11" />
-	<scale name="Minor 9th Arpeggio" keys="1,3,4,8,11" />
-	<scale name="Major 11th Arpeggio" keys="1,3,5,6,8,11" />
-	<scale name="Minor 11th Arpeggio" keys="1,3,4,6,8,11" />
-	<scale name="Major 13th Arpeggio" keys="1,3,5,6,8,10,11" />
-	<scale name="Minor 13th Arpeggio" keys="1,3,4,6,8,10,11" />
-	<scale name="Augmented Arpeggio" keys="1,5,9" />
-	<scale name="Diminished Arpeggio" keys="1,4,7,10" />
-	<scale name="Gb SCALE: Ionian b5 (Nicolas SLONIMSKY n°1074)" keys="1,3,5,6,7,10,12" />
-	<scale name="Gb SCALE: Dorian b4" keys="1,3,4,5,8,10,11" />
-	<scale name="Gb SCALE: Phrygian b3 (Purva Melakarta n° 2)" keys="1,2,3,6,8,9,11" />
-	<scale name="Gb SCALE: Lydian b2 (Uttara Melakarta n° 17, Nicolas SLONIMSKY n°1058)" keys="1,2,5,7,8,10,12" />
-	<scale name="Gb SCALE: Mixolydian b1" keys="1,4,6,7,9,11,12" />
-	<scale name="Gb SCALE: Aeolian b7 (Purva Melakarta n° 19)" keys="1,3,4,6,8,9,10" />
-	<scale name="Gb SCALE: Locian b6" keys="1,2,4,6,7,8,11" />
-	<scale name="Db SCALE: Ionian b2 (Purva Melakarta n° 17, Nicolas SLONIMSKY n°1055)" keys="1,2,5,6,8,10,12" />
-	<scale name="Db SCALE: Dorian b1" keys="1,4,5,7,9,11,12" />
-	<scale name="Db SCALE: Phrygian b7 (Purva Melakarta n° 7)" keys="1,2,4,6,8,9,10" />
-	<scale name="Db SCALE: Lydian b6 (Uttara Melakarta n° 27)" keys="1,3,5,7,8,9,12" />
-	<scale name="Db SCALE: Mixolydian b5 (Nicolas SLONIMSKY n°1073)" keys="1,3,5,6,7,10,11" />
-	<scale name="Db SCALE: Aeolian b4" keys="1,3,4,5,8,9,11" />
-	<scale name="Db SCALE: Locian b3" keys="1,2,3,6,7,9,11" />
-	<scale name="Ab SCALE: Ionian b6 (Purva Melakarta n° 27, Nicolas SLONIMSKY n°1079)" keys="1,3,5,6,8,9,12" />
-	<scale name="Ab SCALE: Dorian b5 (Nicolas SLONIMSKY n°1072)" keys="1,3,4,6,7,10,11" />
-	<scale name="Ab SCALE: Phrygian b4 (Nicolas SLONIMSKY n°1066)" keys="1,2,4,5,8,9,11" />
-	<scale name="Ab SCALE: Lydian b3 (Uttara Melakarta n° 23, Nicolas SLONIMSKY n°1065)" keys="1,3,4,7,8,10,12" />
-	<scale name="Ab SCALE: Mixolydian b2 (Purva Melakarta n° 16, Nicolas SLONIMSKY n°1054)" keys="1,2,5,6,8,10,11" />
-	<scale name="Ab SCALE: Aeolian b1" keys="1,4,5,7,9,10,12" />
-	<scale name="Ab SCALE: Locian b7" keys="1,2,4,6,7,9,10" />
-	<scale name="Eb SCALE: Ionian b3 (Purva Melakarta n° 23, Nicolas SLONIMSKY n°1042, Melodic Minor Scale,)" keys="1,3,4,6,8,10,12" />
-	<scale name="Eb SCALE: Dorian b2 (Purva Melakarta n° 10, Nicolas SLONIMSKY n°1037)" keys="1,2,4,6,8,10,11" />
-	<scale name="Eb SCALE: Phrygian b1 (Nicolas SLONIMSKY n°1066, Lydien Augmenté)" keys="1,3,5,7,9,10,12" />
-	<scale name="Eb SCALE: Lydian b7 (Uttara Melakarta n° 28, Nicolas SLONIMSKY n°1046, Bartok Scale)" keys="1,3,5,7,8,10,11" />
-	<scale name="Eb SCALE: Mixolydian b6 (Purva Melakarta n° 26, Nicolas SLONIMSKY n°1043)" keys="1,3,5,6,8,9,11" />
-	<scale name="Eb SCALE: Aeolian b5 (Nicolas SLONIMSKY n°1039)" keys="1,3,4,6,7,9,11" />
-	<scale name="Eb SCALE: Locian b4 (Nicolas SLONIMSKY n°1034, Altéré)" keys="1,2,4,5,7,9,11" />
-	<scale name="G# SCALE: Ionian #5" keys="1,3,5,6,9,10,12" />
-	<scale name="G# SCALE: Dorian #4 (Uttara Melakarta n° 22, Nicolas SLONIMSKY n°1064)" keys="1,3,4,7,8,10,11" />
-	<scale name="G# SCALE: Phrygian #3 (Purva Melakarta n°14, Nicolas SLONIMSKY n°1053, Spanish Scale, Jewish Scale)" keys="1,2,5,6,8,9,11" />
-	<scale name="G# SCALE: Lydian #2 (Uttara Melakarta n° 35)" keys="1,4,5,7,8,10,12" />
-	<scale name="G# SCALE: Mixolydian #1" keys="1,2,4,5,7,9,10" />
-	<scale name="G# SCALE: Aeolian #7 (Purva Melakarta n° 21, Nicolas SLONIMSKY n°1078, Harmonic Minor Scale)" keys="1,3,4,6,8,9,12" />
-	<scale name="G# SCALE: Locian #6 (Nicolas SLONIMSKY n°1070)" keys="1,2,4,6,7,10,11" />
-	<scale name="D# SCALE: Ionian #2 (Purva Melakarta n° 35, Nicolas SLONIMSKY n°1052)" keys="1,4,5,6,8,10,12" />
-	<scale name="D# SCALE: Dorian #1" keys="1,2,3,5,7,9,10" />
-	<scale name="D# SCALE: Phrygian #7 (Purva Melakarta n° 9, Napolitain Mineur)" keys="1,2,4,6,8,9,12" />
-	<scale name="D# SCALE: Lydian #6 (Uttara Melakarta n° 30)" keys="1,3,5,7,8,11,12" />
-	<scale name="D# SCALE: Mixolydian #5" keys="1,3,5,6,9,10,11" />
-	<scale name="D# SCALE: Aeolian #4 (Uttara Melakarta n° 20, Nicolas SLONIMSKY n°1063)" keys="1,3,4,7,8,9,11" />
-	<scale name="D# SCALE: Locian #3" keys="1,2,5,6,7,9,11" />
-	<scale name="A# SCALE: Ionian #6 (Purva Melakarta n° 30)" keys="1,3,5,6,8,11,12" />
-	<scale name="A# SCALE: Dorian #5" keys="1,3,4,6,9,10,11" />
-	<scale name="A# SCALE: Phrygian #4 (Uttara Melakarta n° 8, Nicolas SLONIMSKY n°1060)" keys="1,2,4,7,8,9,11" />
-	<scale name="A# SCALE: Lydian #3" keys="1,3,6,7,8,10,12" />
-	<scale name="A# SCALE: Mixolydian #2 (Purva Melakarta n° 34, Nicolas SLONIMSKY n°1051)" keys="1,4,5,6,8,10,11" />
-	<scale name="A# SCALE: Aeolian #1" keys="1,2,3,5,7,8,10" />
-	<scale name="A# SCALE: Locian #7 (Nicolas SLONIMSKY n°1076)" keys="1,2,4,6,7,9,12" />
-	<scale name="C#Eb SCALE: Ionian #1b3" keys="1,2,3,5,7,9,11" />
-	<scale name="C#Eb SCALE: Dorian #7b2 (Purva Melakarta n° 11, Nicolas SLONIMSKY n°1038, Napolitain Majeur)" keys="1,2,4,6,8,10,12" />
-	<scale name="C#Eb SCALE: Phrygian #6b1 (Leading Whole Tone)" keys="1,3,5,7,9,11,12" />
-	<scale name="C#Eb SCALE: Lydian #5b7" keys="1,3,5,7,9,10,11" />
-	<scale name="C#Eb SCALE: Mixolydian #4b6 (Uttara Melakarta n° 26, Lydien Mineur)" keys="1,3,5,7,8,9,11" />
-	<scale name="C#Eb SCALE: Aeolian #3b5(Locrien Majeur)" keys="1,3,5,6,7,9,11" />
-	<scale name="C#Eb SCALE: Locrian #2b4" keys="1,3,4,5,7,9,11" />
-	<scale name="GbAb SCALE: Ionian b5b6" keys="1,3,5,6,7,9,12" />
-	<scale name="GbAb SCALE: Dorian b4b5" keys="1,3,4,5,7,10,11" />
-	<scale name="GbAb SCALE: Phrygian b3b4" keys="1,2,3,5,8,9,11" />
-	<scale name="GbAb SCALE: Lydian b2b3 (Uttara Melakarta n° 11, Nicolas SLONIMSKY n°1062)" keys="1,2,4,7,8,10,12" />
-	<scale name="GbAb SCALE: Mixolydian b1b2" keys="1,3,6,7,9,11,12" />
-	<scale name="GbAb SCALE: Aeolian b7b1" keys="1,4,5,7,9,10,11" />
-	<scale name="GbAb SCALE: Locrian b6b7" keys="1,2,4,6,7,8,10" />
-	<scale name="C#Gb SCALE: Ionian #1b5" keys="1,2,4,5,6,9,11" />
-	<scale name="C#Gb SCALE: Dorian #7b4" keys="1,3,4,5,8,10,12" />
-	<scale name="C#Gb SCALE: Phrygian #6b3 (Purva Melakarta n° 4)" keys="1,2,3,6,8,10,11" />
-	<scale name="C#Gb SCALE: Lydian #5b2" keys="1,2,5,7,9,10,12" />
-	<scale name="C#Gb SCALE: Mixolydian #4b1" keys="1,4,6,8,9,11,12" />
-	<scale name="C#Gb SCALE: Aeolian #3b7 (Purva Melakarta n° 25)" keys="1,3,5,6,8,9,10" />
-	<scale name="C#Gb SCALE: Locrian #2b6" keys="1,3,4,6,7,8,11" />
-	<scale name="AbD# SCALE: Ionian #2b6 (Purva Melakarta n° 33)" keys="1,4,5,6,8,9,12" />
-	<scale name="AbD# SCALE: Dorian #1b5" keys="1,2,3,5,6,9,10" />
-	<scale name="AbD# SCALE: Phrygian #7b4 (Nicolas SLONIMSKY n°1086)" keys="1,2,4,5,8,9,12" />
-	<scale name="AbD# SCALE: Lydian #6b3 (Uttara Melakarta n° 24)" keys="1,3,4,7,8,11,12" />
-	<scale name="AbD# SCALE: Mixolydian #5b2 (Nicolas SLONIMSKY n°1080)" keys="1,2,5,6,9,10,11" />
-	<scale name="AbD# SCALE: Aeolian #4b1" keys="1,4,5,8,9,10,12" />
-	<scale name="AbD# SCALE: Locrian #3b7" keys="1,2,5,6,7,9,10" />
-	<scale name="A#Eb SCALE: Ionian #6b3 (Purva Melakarta n° 24)" keys="1,3,4,6,8,11,12" />
-	<scale name="A#Eb SCALE: Dorian #5b2" keys="1,2,4,6,9,10,11" />
-	<scale name="A#Eb SCALE: Phrygian #4b1" keys="1,3,5,8,9,10,12" />
-	<scale name="A#Eb SCALE: Lydian #3b7" keys="1,3,6,7,8,10,11" />
-	<scale name="A#Eb SCALE: Mixolydian #2b6 (Purva Melakarta n° 32, Nicolas SLONIMSKY n°1050)" keys="1,4,5,6,8,9,11" />
-	<scale name="A#Eb SCALE: Aeolian #1b5" keys="1,2,3,5,6,8,10" />
-	<scale name="A#Eb SCALE: Locrian #7b4 (Superlocrien Harmonique, Nicolas SLONIMSKY n°1075)" keys="1,2,4,5,7,9,12" />
-	<scale name="G#Db SCALE: Ionian #5b2 (Nicolas SLONIMSKY n°1081)" keys="1,2,5,6,9,10,12" />
-	<scale name="G#Db SCALE: Dorian #4b1" keys="1,4,5,8,9,11,12" />
-	<scale name="G#Db SCALE: Phrygian #3b7 (Purva Melakarta n° 13)" keys="1,2,5,6,8,9,10" />
-	<scale name="G#Db SCALE: Lydian #2b6 (Uttara Melakarta n° 33)" keys="1,4,5,7,8,9,12" />
-	<scale name="G#Db SCALE: Mixolydian #1b5" keys="1,2,4,5,6,9,10" />
-	<scale name="G#Db SCALE: Aeolian #7b4 (Nicolas SLONIMSKY n°1087)" keys="1,3,4,5,8,9,12" />
-	<scale name="G#Db SCALE: Locrian #6b3" keys="1,2,3,6,7,10,11" />
-	<scale name="G#Eb SCALE: Ionian #5b3 (Nohkan)" keys="1,3,4,6,9,10,12" />
-	<scale name="G#Eb SCALE: Dorian #4b2 (Uttara Melakarta n° 10, Nicolas SLONIMSKY n°1061)" keys="1,2,4,7,8,10,11" />
-	<scale name="G#Eb SCALE: Phrygian #3b1" keys="1,3,6,7,9,10,12" />
-	<scale name="G#Eb SCALE: Lydian #2b7 (Uttara Melakarta n° 34, Hongrois Majeur)" keys="1,4,5,7,8,10,11" />
-	<scale name="G#Eb SCALE: Mixolydian #1b6" keys="1,2,4,5,7,8,10" />
-	<scale name="G#Eb SCALE: Aeolian #7b5 (Nicolas SLONIMSKY n°1077)" keys="1,3,4,6,7,9,12" />
-	<scale name="G#Eb SCALE: Locrian #6b4 (Nicolas SLONIMSKY n°1069)" keys="1,2,4,5,7,10,11" />
-	<scale name="G#D# SCALE: Ionian #5#2" keys="1,4,5,6,9,10,12" />
-	<scale name="G#D# SCALE: Dorian #4#1" keys="1,2,3,6,7,9,10" />
-	<scale name="G#D# SCALE: Phrygian #3#7 (Purva Melakarta n° 15, Nicolas SLONIMSKY n°1082)" keys="1,2,5,6,8,9,12" />
-	<scale name="G#D# SCALE: Lydian #2#6 (Uttara Melakarta n° 36)" keys="1,4,5,7,8,11,12" />
-	<scale name="G#D# SCALE: Mixolydian #1#5" keys="1,2,4,5,8,9,10" />
-	<scale name="G#D# SCALE: Aeolian #7#4 (Uttara Melakarta n° 21, Nicolas SLONIMSKY n°1085)" keys="1,3,4,7,8,9,12" />
-	<scale name="G#D# SCALE: Locrian #6#3" keys="1,2,5,6,7,10,11" />
-	<scale name="AbC# SCALE: Ionian b6#1 (Absidioles 4)" keys="1,2,4,5,7,8,11" />
-	<scale name="AbC# SCALE: Dorian b5#7" keys="1,3,4,6,7,10,12" />
-	<scale name="AbC# SCALE: Phrygian b4#6 (Nicolas SLONIMSKY n°1067, Absidioles 3)" keys="1,2,4,5,8,10,11" />
-	<scale name="AbC# SCALE: Lydian b3#5" keys="1,3,4,7,9,10,12" />
-	<scale name="AbC# SCALE: Mixolydian b2#4 (Uttara Melakarta n° 16, Nicolas SLONIMSKY n°1057)" keys="1,2,5,7,8,10,11" />
-	<scale name="AbC# SCALE: Aeolian b1#3" keys="1,4,6,7,9,10,12" />
-	<scale name="AbC# SCALE: Locrian b7#2 (Blue Scale)" keys="1,3,4,6,7,9,10" />
-	<scale name="G#A# SCALE: Ionian #5#6" keys="1,3,5,6,9,11,12" />
-	<scale name="G#A# SCALE: Dorian #4#5" keys="1,3,4,7,9,10,11" />
-	<scale name="G#A# SCALE: Phrygian #3#4 (Uttara Melakarta n° 14, Nicolas SLONIMSKY n°1056)" keys="1,2,5,7,8,9,11" />
-	<scale name="G#A# SCALE: Lydian #2#3" keys="1,4,6,7,8,10,12" />
-	<scale name="G#A# SCALE: Mixolydian #1#2" keys="1,3,4,5,7,9,10" />
-	<scale name="G#A# SCALE: Aeolian #7#1" keys="1,2,3,5,7,8,11" />
-	<scale name="G#A# SCALE: Locrian #6#5 (Nicolas SLONIMSKY n°1071)" keys="1,2,4,6,7,10,12" />
-	<scale name="DbGb SCALE: Ionian b2b5" keys="1,2,5,6,7,10,12" />
-	<scale name="DbGb SCALE: Dorian b1b4" keys="1,4,5,6,9,11,12" />
-	<scale name="DbGb SCALE: Phrygian b7b3 (Purva Melakarta n° 1)" keys="1,2,3,6,8,9,10" />
-	<scale name="DbGb SCALE: Lydian b6b2 (Uttara Melakarta n° 15, Nicolas SLONIMSKY n°1083, Composite)" keys="1,2,5,7,8,9,12" />
-	<scale name="DbGb SCALE: Mixolydian b5b1" keys="1,4,6,7,8,11,12" />
-	<scale name="DbGb SCALE: Aeolian b4b7" keys="1,3,4,5,8,9,10" />
-	<scale name="DbGb SCALE: Locrian b3b6" keys="1,2,3,6,7,8,11" />
-	<scale name="D#A# SCALE: Ionian #2#6 (Purva Melakarta n° 36)" keys="1,4,5,6,8,11,12" />
-	<scale name="D#A# SCALE: Dorian #1#5" keys="1,2,3,5,8,9,10" />
-	<scale name="D#A# SCALE: Phrygian #7#4 (Uttara Melakarta n° 9, Nicolas SLONIMSKY n°1084, Todî)" keys="1,2,4,7,8,9,12" />
-	<scale name="D#A# SCALE: Lydian #6#3" keys="1,3,6,7,8,11,12" />
-	<scale name="D#A# SCALE: Mixolydian #5#2" keys="1,4,5,6,9,10,11" />
-	<scale name="D#A# SCALE: Aeolian #4#1" keys="1,2,3,6,7,8,10" />
-	<scale name="D#A# SCALE: Locrian #3#7" keys="1,2,5,6,7,9,12" />
-	<scale name="GbD# SCALE: Ionian b5#2" keys="1,4,5,6,7,10,12" />
-	<scale name="GbD# SCALE: Dorian b4#1" keys="1,2,3,4,7,9,10" />
-	<scale name="GbD# SCALE: Phrygian b3#7 (Purva Melakarta n° 3)" keys="1,2,3,6,8,9,12" />
-	<scale name="GbD# SCALE: Lydian b2#6 (Uttara Melakarta n° 18)" keys="1,2,5,7,8,11,12" />
-	<scale name="GbD# SCALE: Mixolydian b1#5" keys="1,4,6,7,10,11,12" />
-	<scale name="GbD# SCALE: Aeolian b7#4 (Uttara Melakarta n° 19)" keys="1,3,4,7,8,9,10" />
-	<scale name="GbD# SCALE: Locrian b6#3" keys="1,2,5,6,7,8,11" />
-	<scale name="A#Db SCALE: Ionian #6b2 (Purva Melakarta n° 18)" keys="1,2,5,6,8,11,12" />
-	<scale name="A#Db SCALE: Dorian #5b1" keys="1,4,5,7,10,11,12" />
-	<scale name="A#Db SCALE: Phrygian #4b7 (Uttara Melakarta n° 7)" keys="1,2,4,7,8,9,10" />
-	<scale name="A#Db SCALE: Lydian #3b6" keys="1,3,6,7,8,9,12" />
-	<scale name="A#Db SCALE: Mixolydian #2b5" keys="1,4,5,6,7,10,11" />
-	<scale name="A#Db SCALE: Aeolian #1b4" keys="1,2,3,4,7,8,10" />
-	<scale name="A#Db SCALE: Locrian #7b3" keys="1,2,3,6,7,9,12" />
-	<scale name="A#Gb SCALE: Ionian #6b5" keys="1,3,5,6,7,11,12" />
-	<scale name="A#Gb SCALE: Dorian #5b4" keys="1,3,4,5,9,10,11" />
-	<scale name="A#Gb SCALE: Phrygian #4b3 (Uttara Melakarta n° 2)" keys="1,2,3,7,8,9,11" />
-	<scale name="A#Gb SCALE: Lydian #3b2" keys="1,2,6,7,8,10,12" />
-	<scale name="A#Gb SCALE: Mixolydian #2b1" keys="1,5,6,7,9,11,12" />
-	<scale name="A#Gb SCALE: Aeolian #1b7" keys="1,2,3,5,7,8,9" />
-	<scale name="A#Gb SCALE: Locrian #7b6" keys="1,2,4,6,7,8,12" />
-	<scale name="GbA#C# SCALE: Phrygian b3#4#6 (Uttara Melakarta n° 4)" keys="1,2,3,7,8,10,11" />
-	<scale name="GbA#C# SCALE: Locrian b6#7#3" keys="1,3,4,6,7,8,12" />
-	<scale name="D omitted Ab added SCALE: Ionian omit2 addb6" keys="1,5,6,8,9,10,12" />
-	<scale name="GbA#D# SCALE: Phrygian b3#4#7 (Uttara Melakarta n° 3)" keys="1,2,3,7,8,9,12" />
-	<scale name="EbGbA# SCALE: Aeolian b5b7#1" keys="1,2,3,5,6,8,9" />
-	<scale name="GbA#Db SCALE: Phrygian b3#4b7" keys="1,2,3,7,8,9,10" />
-	<scale name="B#C#Gb SCALE: Dorian #6#7b4" keys="1,3,4,5,8,11,12" />
-	<scale name="B#C#Gb SCALE: Aeolian #2#3b7" keys="1,4,5,6,8,9,10" />
-	<scale name="DbEbb SCALE: Ionian b2bb3 (Purva Melakarta n° 5)" keys="1,2,3,6,8,10,12" />
-	<scale name="DbEbb SCALE: Dorian b1bb2 (Enigmatic) " keys="1,2,5,7,9,11,12" />
-	<scale name="DbEbb SCALE: Phrygian b7bb1" keys="1,4,6,8,10,11,12" />
-	<scale name="DbEbb SCALE: Lydian b6bb7 (Uttara Melakarta n° 25)" keys="1,3,5,7,8,9,10" />
-	<scale name="DbEbb SCALE: Mixolydian b5bb6" keys="1,3,5,6,7,8,11" />
-	<scale name="C#D#Ab SCALE: Ionian #1#2b6" keys="1,3,4,5,7,8,11" />
-	<scale name="C#D#Ab SCALE: Phrygian 6#7#4b (Nicolas SLONIMSKY n°1068)" keys="1,2,4,5,8,10,12" />
-	<scale name="C#D#Ab SCALE: Aeolian #3#4b1" keys="1,4,6,8,9,10,12" />
-	<scale name="GbAbC# SCALE: Ionian b5b6#1" keys="1,2,4,5,6,8,11" />
-	<scale name="GbAbC# SCALE: Locrian b6b7#2" keys="1,3,4,6,7,8,10" />
-	<scale name="G#A#Eb SCALE: Lydian #2#3b7" keys="1,4,6,7,8,10,11" />
-	<scale name="G#A#Db SCALE: Phrygian #3#4b7 (Uttara Melakarta n° 13)" keys="1,2,5,7,8,9,10" />
-	<scale name="G#A#Db SCALE: Lydian #2#3b6" keys="1,4,6,7,8,9,12" />
-	<scale name="D#GbAb SCALE: Lydian #6b2b3 (Uttara Melakarta n° 12)" keys="1,2,4,7,8,11,12" />
-	<scale name="D#GbAb SCALE: Aeolian #4b7b1" keys="1,4,5,8,9,10,11" />
-	<scale name="A#C#Eb SCALE: Mixolydian #2#4b6 (Uttara Melakarta n° 32)" keys="1,4,5,7,8,9,11" />
-	<scale name="A#DbEb SCALE: Ionian #6b2b3 (Purva Melakarta n° 12)" keys="1,2,4,6,8,11,12" />
-	<scale name="A#DbEb SCALE: Aeolian #1b4b5" keys="1,2,3,4,6,8,10" />
-	<scale name="A#B#C#Eb SCALE: Mixolydian #2#3#4b6" keys="1,4,6,7,8,9,11" />
-	<scale name="C#D#GbAb SCALE: Locrian #2#3b6b7" keys="1,3,5,6,7,8,10" />
-	<scale name="GbA#C#D# SCALE: Locrian b6#7#2#3"  keys="1,3,5,6,7,8,12" />
-	<scale name="GbA#C#D# SCALE: Phrygian b3#4#6#7 (Uttara Melakarta n° 5)"  keys="1,2,3,7,8,10,12" />
-	<scale name="EbFbGbb SCALE: Aeolian b5b6bb7" keys="1,3,4,6,7,8,9" />
-</scales>
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/1.png
deleted file mode 100644
index f371f7b7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/16.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/16.png
deleted file mode 100644
index 05473efd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/2.png
deleted file mode 100644
index b04bb5d0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/32.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/32.png
deleted file mode 100644
index cbb56acd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/4.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/4.png
deleted file mode 100644
index 06dfd1a5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/4.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/64.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/64.png
deleted file mode 100644
index 78c7a38a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/8.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/8.png
deleted file mode 100644
index ef81b9a7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/8.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/about_authors.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/about_authors.png
deleted file mode 100644
index dd00e767..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/about_authors.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/about_description.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/about_description.png
deleted file mode 100644
index 0936ccdf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/about_description.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/about_license.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/about_license.png
deleted file mode 100644
index 95eebbef..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/about_license.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_back.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_back.png
deleted file mode 100644
index 8a36e093..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_back.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_file.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_file.png
deleted file mode 100644
index 50882171..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_file.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_folder.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_folder.png
deleted file mode 100644
index 1b19b3ca..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_new.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_new.png
deleted file mode 100644
index 1d22a4e5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_refresh.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_refresh.png
deleted file mode 100644
index 42d08729..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_root.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_root.png
deleted file mode 100644
index db0d5a5f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/browser_root.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/chord.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/chord.png
deleted file mode 100644
index 11019a73..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/chord.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/closerepeat.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/closerepeat.png
deleted file mode 100644
index 223ce00f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/division-type.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/division-type.png
deleted file mode 100644
index aa18421a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/division-type.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dotted.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dotted.png
deleted file mode 100644
index f5b0ddde..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/doubledotted.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/doubledotted.png
deleted file mode 100644
index 1ce6450a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_f.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_f.png
deleted file mode 100644
index a5479419..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_ff.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_ff.png
deleted file mode 100644
index 0a22c7fe..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_fff.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_fff.png
deleted file mode 100644
index b265522b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_mf.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_mf.png
deleted file mode 100644
index a03c125c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_mp.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_mp.png
deleted file mode 100644
index af9c9f2d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_p.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_p.png
deleted file mode 100644
index 029512d9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_pp.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_pp.png
deleted file mode 100644
index c2a7d593..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_ppp.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_ppp.png
deleted file mode 100644
index e335a535..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_edition.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_edition.png
deleted file mode 100644
index 334bb119..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_edition_no_natural.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_edition_no_natural.png
deleted file mode 100644
index c04448e1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_selection.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_selection.png
deleted file mode 100644
index ca18245b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_redo.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_redo.png
deleted file mode 100644
index e3eaa198..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_undo.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_undo.png
deleted file mode 100644
index 6fcdb7cc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_voice_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_voice_1.png
deleted file mode 100644
index 3338d3cd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_voice_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_voice_2.png
deleted file mode 100644
index f54d9287..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_accentuated.png
deleted file mode 100644
index 8740222c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_bend.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_bend.png
deleted file mode 100644
index ed053565..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_dead.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_dead.png
deleted file mode 100644
index 5c3e07c9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_fade_in.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_fade_in.png
deleted file mode 100644
index ebf9fd0e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_ghost.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_ghost.png
deleted file mode 100644
index 3a9eaf86..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_grace.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_grace.png
deleted file mode 100644
index 29d56953..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_hammer.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_hammer.png
deleted file mode 100644
index d3eca5f9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_harmonic.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_harmonic.png
deleted file mode 100644
index 6fe19a92..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_heavy_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_heavy_accentuated.png
deleted file mode 100644
index 75ed1ef6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_palm_mute.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_palm_mute.png
deleted file mode 100644
index d4ef7551..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_popping.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_popping.png
deleted file mode 100644
index 4964783c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_slapping.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_slapping.png
deleted file mode 100644
index e49fd969..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_slide.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_slide.png
deleted file mode 100644
index ea63a1b8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_staccato.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_staccato.png
deleted file mode 100644
index 524dbbec..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tapping.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tapping.png
deleted file mode 100644
index dec85371..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tremolo_bar.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tremolo_bar.png
deleted file mode 100644
index f3a39396..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tremolo_picking.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tremolo_picking.png
deleted file mode 100644
index b72f5dac..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_trill.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_trill.png
deleted file mode 100644
index 1ccc4d0c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_vibrato.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_vibrato.png
deleted file mode 100644
index 19f4860a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/firstfret.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/firstfret.png
deleted file mode 100644
index a89fa4f2..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/firstfret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/fret.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/fret.png
deleted file mode 100644
index 801b86df..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/fret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/fretboard.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/fretboard.png
deleted file mode 100644
index 3813fb43..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/fretboard.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/grace.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/grace.png
deleted file mode 100644
index 29d56953..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-16x16.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-16x16.png
deleted file mode 100644
index c617291a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-24x24.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-24x24.png
deleted file mode 100644
index 30e43cc5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-32x32.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-32x32.png
deleted file mode 100644
index cebffe09..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-48x48.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-48x48.png
deleted file mode 100644
index c6a172ba..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-64x64.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-64x64.png
deleted file mode 100644
index 83418061..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-96x96.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-96x96.png
deleted file mode 100644
index 296c49bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.icns b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.icns
deleted file mode 100644
index d05a1ce8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.icns and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.ico b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.ico
deleted file mode 100644
index f43d9cad..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.ico and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.png
deleted file mode 100644
index 296c49bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/icon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_compact.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_compact.png
deleted file mode 100644
index e29a92b9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_linear.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_linear.png
deleted file mode 100644
index 89fcd60a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_multitrack.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_multitrack.png
deleted file mode 100644
index 204ce3a9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_page.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_page.png
deleted file mode 100644
index 387c8de1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_page.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_score.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_score.png
deleted file mode 100644
index 19a5746b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/layout_score.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/logo.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/logo.png
deleted file mode 100644
index f52b54bd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/logo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_add.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_add.png
deleted file mode 100644
index 2068746f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_first.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_first.png
deleted file mode 100644
index d7b388fa..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_first.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_last.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_last.png
deleted file mode 100644
index 59449dd9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_last.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_list.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_list.png
deleted file mode 100644
index 9f5603a6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_list.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_next.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_next.png
deleted file mode 100644
index 1a1dbb2b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_next.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_previous.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_previous.png
deleted file mode 100644
index ff95a7ae..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_remove.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_remove.png
deleted file mode 100644
index 21c25e50..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/mixer.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/mixer.png
deleted file mode 100644
index 921e8fb2..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/mixer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/new.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/new.png
deleted file mode 100644
index 1d22a4e5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/open.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/open.png
deleted file mode 100644
index 62f47b59..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/open.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/openrepeat.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/openrepeat.png
deleted file mode 100644
index 1f36f923..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_language.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/option_language.png
deleted file mode 100644
index c5bfc730..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_language.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_skin.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/option_skin.png
deleted file mode 100644
index 1e090750..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_skin.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_sound.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/option_sound.png
deleted file mode 100644
index 905186e9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_sound.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_style.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/option_style.png
deleted file mode 100644
index a3131c90..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_style.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_toolbars.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/option_toolbars.png
deleted file mode 100644
index 91a28310..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_view.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/option_view.png
deleted file mode 100644
index 0936ccdf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/option_view.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/print-preview.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/print-preview.png
deleted file mode 100644
index 9ef1ca97..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/print-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/print.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/print.png
deleted file mode 100644
index 0b677292..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/print.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/repeat_alternative.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/repeat_alternative.png
deleted file mode 100644
index 5611647d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/save-as.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/save-as.png
deleted file mode 100644
index 8675596f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/save-as.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/save.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/save.png
deleted file mode 100644
index f98cc8af..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/save.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/settings.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/settings.png
deleted file mode 100644
index 29b25cba..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/settings.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/skin-preview.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/skin-preview.png
deleted file mode 100644
index 363e6207..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/skin.properties b/TuxGuitar-testing/platform-all/share/skins/Lavender/skin.properties
deleted file mode 100644
index e497ce58..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/Lavender/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=Lavender
-author=Sascha <saschariemer@compuserve.de>
-description=Simple, elegant theme with lavender color.
-date=2007-12-10
-version=0.1
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/song_properties.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/song_properties.png
deleted file mode 100644
index 8ecd9956..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/song_properties.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/splash.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/splash.png
deleted file mode 100644
index 87f71e9d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/splash.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/tempo.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/tempo.png
deleted file mode 100644
index ea62c52d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/tempo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/tempoicon.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/tempoicon.png
deleted file mode 100644
index c2309982..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/tgdoc.icns b/TuxGuitar-testing/platform-all/share/skins/Lavender/tgdoc.icns
deleted file mode 100644
index 2060a6ee..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/tgdoc.icns and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/tiednote.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/tiednote.png
deleted file mode 100644
index d87c292e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/tiednote.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/timesignature.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/timesignature.png
deleted file mode 100644
index 603f1a20..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/timesignature.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/track_add.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/track_add.png
deleted file mode 100644
index 22fbe5bf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/track_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/track_remove.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/track_remove.png
deleted file mode 100644
index 68cfa6c1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/track_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport.png
deleted file mode 100644
index b7f4baf9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_first_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_first_1.png
deleted file mode 100644
index 215c71db..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_first_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_first_2.png
deleted file mode 100644
index 215c71db..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_first_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_first_1.png
deleted file mode 100644
index a1b02c45..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_first_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_first_2.png
deleted file mode 100644
index a1b02c45..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_last_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_last_1.png
deleted file mode 100644
index 0a50f09e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_last_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_last_2.png
deleted file mode 100644
index ab889ad6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_next_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_next_1.png
deleted file mode 100644
index fef2cc23..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_next_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_next_2.png
deleted file mode 100644
index fef2cc23..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_pause.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_pause.png
deleted file mode 100644
index 0b9b7527..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_play_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_play_1.png
deleted file mode 100644
index 36f807e3..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_play_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_play_2.png
deleted file mode 100644
index 36f807e3..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_previous_1.png
deleted file mode 100644
index 23106289..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_previous_2.png
deleted file mode 100644
index 23106289..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_stop_1.png
deleted file mode 100644
index 6f43c457..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_stop_2.png
deleted file mode 100644
index 6f43c457..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_last_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_last_1.png
deleted file mode 100644
index a630f1f0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_last_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_last_2.png
deleted file mode 100644
index a630f1f0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_metronome.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_metronome.png
deleted file mode 100644
index beb32261..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_mode.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_mode.png
deleted file mode 100644
index 1d094626..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_next_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_next_1.png
deleted file mode 100644
index 2c39dac6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_next_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_next_2.png
deleted file mode 100644
index 2c39dac6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_pause.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_pause.png
deleted file mode 100644
index c927b282..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_play_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_play_1.png
deleted file mode 100644
index b70f11ea..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_play_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_play_2.png
deleted file mode 100644
index b70f11ea..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_previous_1.png
deleted file mode 100644
index ad15c273..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_previous_2.png
deleted file mode 100644
index ad15c273..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_stop_1.png
deleted file mode 100644
index 0d1fe933..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_stop_2.png
deleted file mode 100644
index 0d1fe933..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Lavender/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/1.png
deleted file mode 100644
index f371f7b7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/16.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/16.png
deleted file mode 100644
index 05473efd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/2.png
deleted file mode 100644
index b04bb5d0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/32.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/32.png
deleted file mode 100644
index cbb56acd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/4.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/4.png
deleted file mode 100644
index 06dfd1a5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/4.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/64.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/64.png
deleted file mode 100644
index 78c7a38a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/8.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/8.png
deleted file mode 100644
index ef81b9a7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/8.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/README b/TuxGuitar-testing/platform-all/share/skins/Oxygen/README
deleted file mode 100644
index 9a63314e..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/Oxygen/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This theme as been made using the default TuxGuitar theme "Lavender"
-and using icons from the Oxygen Icons project.
-
-http://www.oxygen-icons.org/
-
-Please respect the Oxygen Icons licenses:
-
-http://creativecommons.org/licenses/by-sa/3.0/
-http://www.gnu.org/licenses/lgpl.html
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_authors.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_authors.png
deleted file mode 100644
index a6c1740c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_authors.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_description.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_description.png
deleted file mode 100644
index 0936ccdf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_description.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_license.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_license.png
deleted file mode 100644
index e2fca981..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/about_license.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_back.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_back.png
deleted file mode 100644
index 4459024e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_back.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_file.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_file.png
deleted file mode 100644
index 73a85ae8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_file.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_folder.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_folder.png
deleted file mode 100644
index 9c46c794..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_new.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_new.png
deleted file mode 100644
index fbb4ce05..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_refresh.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_refresh.png
deleted file mode 100644
index 45b5535c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_root.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_root.png
deleted file mode 100644
index aab6a883..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/browser_root.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/chord.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/chord.png
deleted file mode 100644
index 11019a73..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/chord.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/closerepeat.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/closerepeat.png
deleted file mode 100644
index 223ce00f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/division-type.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/division-type.png
deleted file mode 100644
index aa18421a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/division-type.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dotted.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dotted.png
deleted file mode 100644
index f5b0ddde..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/doubledotted.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/doubledotted.png
deleted file mode 100644
index 1ce6450a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_f.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_f.png
deleted file mode 100644
index a5479419..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_ff.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_ff.png
deleted file mode 100644
index 0a22c7fe..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_fff.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_fff.png
deleted file mode 100644
index b265522b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_mf.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_mf.png
deleted file mode 100644
index a03c125c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_mp.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_mp.png
deleted file mode 100644
index af9c9f2d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_p.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_p.png
deleted file mode 100644
index 029512d9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_pp.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_pp.png
deleted file mode 100644
index c2a7d593..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_ppp.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_ppp.png
deleted file mode 100644
index e335a535..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_edition.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_edition.png
deleted file mode 100644
index 334bb119..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_edition_no_natural.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_edition_no_natural.png
deleted file mode 100644
index c04448e1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_selection.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_selection.png
deleted file mode 100644
index ca18245b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_redo.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_redo.png
deleted file mode 100644
index 45f04502..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_undo.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_undo.png
deleted file mode 100644
index 57abbe17..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_voice_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_voice_1.png
deleted file mode 100644
index 3338d3cd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_voice_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_voice_2.png
deleted file mode 100644
index f54d9287..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_accentuated.png
deleted file mode 100644
index 8740222c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_bend.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_bend.png
deleted file mode 100644
index ed053565..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_dead.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_dead.png
deleted file mode 100644
index 5c3e07c9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_fade_in.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_fade_in.png
deleted file mode 100644
index ebf9fd0e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_ghost.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_ghost.png
deleted file mode 100644
index 3a9eaf86..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_grace.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_grace.png
deleted file mode 100644
index 29d56953..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_hammer.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_hammer.png
deleted file mode 100644
index d3eca5f9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_harmonic.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_harmonic.png
deleted file mode 100644
index 6fe19a92..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_heavy_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_heavy_accentuated.png
deleted file mode 100644
index 75ed1ef6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_palm_mute.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_palm_mute.png
deleted file mode 100644
index d4ef7551..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_popping.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_popping.png
deleted file mode 100644
index 4964783c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_slapping.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_slapping.png
deleted file mode 100644
index e49fd969..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_slide.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_slide.png
deleted file mode 100644
index ea63a1b8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_staccato.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_staccato.png
deleted file mode 100644
index 524dbbec..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tapping.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tapping.png
deleted file mode 100644
index dec85371..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tremolo_bar.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tremolo_bar.png
deleted file mode 100644
index f3a39396..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tremolo_picking.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tremolo_picking.png
deleted file mode 100644
index b72f5dac..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_trill.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_trill.png
deleted file mode 100644
index 1ccc4d0c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_vibrato.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_vibrato.png
deleted file mode 100644
index 19f4860a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/firstfret.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/firstfret.png
deleted file mode 100644
index b2ceba83..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/firstfret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/fret.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/fret.png
deleted file mode 100644
index c575c7a3..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/fret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/fretboard.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/fretboard.png
deleted file mode 100644
index 83353670..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/fretboard.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/grace.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/grace.png
deleted file mode 100644
index 29d56953..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-16x16.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-16x16.png
deleted file mode 100644
index c617291a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-24x24.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-24x24.png
deleted file mode 100644
index 30e43cc5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-32x32.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-32x32.png
deleted file mode 100644
index cebffe09..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-48x48.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-48x48.png
deleted file mode 100644
index c6a172ba..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-64x64.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-64x64.png
deleted file mode 100644
index 83418061..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-96x96.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-96x96.png
deleted file mode 100644
index 296c49bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.icns b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.icns
deleted file mode 100644
index d05a1ce8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.icns and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.ico b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.ico
deleted file mode 100644
index f43d9cad..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.ico and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.png
deleted file mode 100644
index 296c49bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/icon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_compact.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_compact.png
deleted file mode 100644
index e29a92b9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_linear.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_linear.png
deleted file mode 100644
index 89fcd60a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_multitrack.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_multitrack.png
deleted file mode 100644
index 204ce3a9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_page.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_page.png
deleted file mode 100644
index 387c8de1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_page.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_score.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_score.png
deleted file mode 100644
index 19a5746b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/layout_score.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/logo.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/logo.png
deleted file mode 100644
index f52b54bd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/logo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_add.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_add.png
deleted file mode 100644
index 62436bd2..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_first.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_first.png
deleted file mode 100644
index cb66e6df..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_first.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_last.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_last.png
deleted file mode 100644
index 3a6557b6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_last.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_list.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_list.png
deleted file mode 100644
index b37b97a0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_list.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_next.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_next.png
deleted file mode 100644
index e8bb6b23..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_next.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_previous.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_previous.png
deleted file mode 100644
index 646ead33..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_remove.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_remove.png
deleted file mode 100644
index a661a31d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/mixer.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/mixer.png
deleted file mode 100644
index 99d35c35..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/mixer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/new.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/new.png
deleted file mode 100644
index a7f3411d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/open.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/open.png
deleted file mode 100644
index 317a3577..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/open.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/openrepeat.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/openrepeat.png
deleted file mode 100644
index 1f36f923..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_language.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_language.png
deleted file mode 100644
index 5c5246e7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_language.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_skin.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_skin.png
deleted file mode 100644
index eddffb6e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_skin.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_sound.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_sound.png
deleted file mode 100644
index 5bc5c237..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_sound.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_style.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_style.png
deleted file mode 100644
index 5abdf6cb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_style.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_toolbars.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_toolbars.png
deleted file mode 100644
index f072ad07..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_view.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_view.png
deleted file mode 100644
index 0936ccdf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/option_view.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/print-preview.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/print-preview.png
deleted file mode 100644
index 03a3edf9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/print-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/print.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/print.png
deleted file mode 100644
index 8eb1c674..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/print.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/repeat_alternative.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/repeat_alternative.png
deleted file mode 100644
index 5611647d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/save-as.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/save-as.png
deleted file mode 100644
index 0ecb79e8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/save-as.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/save.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/save.png
deleted file mode 100644
index a81e70d4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/save.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/settings.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/settings.png
deleted file mode 100644
index 45b8fae8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/settings.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/skin-preview.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/skin-preview.png
deleted file mode 100644
index c4987787..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/skin.properties b/TuxGuitar-testing/platform-all/share/skins/Oxygen/skin.properties
deleted file mode 100644
index 2557cb10..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/Oxygen/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=Oxygen
-author=The Chakra Project 
-description=http://www.oxygen-icons.org
-date=2011-8-19
-version=0.1
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/song_properties.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/song_properties.png
deleted file mode 100644
index 8f76c516..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/song_properties.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/splash.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/splash.png
deleted file mode 100644
index 87f71e9d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/splash.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tempo.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/tempo.png
deleted file mode 100644
index ea62c52d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tempo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tempoicon.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/tempoicon.png
deleted file mode 100644
index 1c6cb4e5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tgdoc.icns b/TuxGuitar-testing/platform-all/share/skins/Oxygen/tgdoc.icns
deleted file mode 100644
index 2060a6ee..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tgdoc.icns and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tiednote.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/tiednote.png
deleted file mode 100644
index d87c292e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/tiednote.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/timesignature.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/timesignature.png
deleted file mode 100644
index 603f1a20..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/timesignature.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/track_add.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/track_add.png
deleted file mode 100644
index c1067018..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/track_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/track_remove.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/track_remove.png
deleted file mode 100644
index 90ba1096..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/track_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport.png
deleted file mode 100644
index cdfbf63f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_first_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_first_1.png
deleted file mode 100644
index dc159696..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_first_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_first_2.png
deleted file mode 100644
index dc159696..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_first_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_first_1.png
deleted file mode 100644
index 120c1e02..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_first_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_first_2.png
deleted file mode 100644
index 120c1e02..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_last_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_last_1.png
deleted file mode 100644
index 73924323..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_last_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_last_2.png
deleted file mode 100644
index 73924323..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_next_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_next_1.png
deleted file mode 100644
index 0a33f97c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_next_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_next_2.png
deleted file mode 100644
index 0a33f97c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_pause.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_pause.png
deleted file mode 100644
index d133bdc5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_play_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_play_1.png
deleted file mode 100644
index 2820368e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_play_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_play_2.png
deleted file mode 100644
index 2820368e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_previous_1.png
deleted file mode 100644
index 6f9d9b96..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_previous_2.png
deleted file mode 100644
index 6f9d9b96..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_stop_1.png
deleted file mode 100644
index 4ecbdf6e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_stop_2.png
deleted file mode 100644
index 4ecbdf6e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_last_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_last_1.png
deleted file mode 100644
index c8d2393a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_last_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_last_2.png
deleted file mode 100644
index c8d2393a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_metronome.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_metronome.png
deleted file mode 100644
index beb32261..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_mode.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_mode.png
deleted file mode 100644
index 1d094626..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_next_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_next_1.png
deleted file mode 100644
index 670df9b0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_next_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_next_2.png
deleted file mode 100644
index 670df9b0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_pause.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_pause.png
deleted file mode 100644
index cb58bfdd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_play_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_play_1.png
deleted file mode 100644
index 23e3d295..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_play_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_play_2.png
deleted file mode 100644
index 23e3d295..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_previous_1.png
deleted file mode 100644
index 29cc2f0d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_previous_2.png
deleted file mode 100644
index 29cc2f0d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_stop_1.png
deleted file mode 100644
index ebf5f88f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_stop_2.png
deleted file mode 100644
index ebf5f88f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/Oxygen/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/1.png
deleted file mode 100644
index e5d1bf37..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/16.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/16.png
deleted file mode 100644
index c2ab703c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/2.png
deleted file mode 100644
index f7fa1cfd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/32.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/32.png
deleted file mode 100644
index a88e284b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/4.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/4.png
deleted file mode 100644
index 603799d5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/4.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/64.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/64.png
deleted file mode 100644
index f91b54f8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/8.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/8.png
deleted file mode 100644
index 42a3efda..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/8.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_authors.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_authors.png
deleted file mode 100644
index 69f5b04e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_authors.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_description.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_description.png
deleted file mode 100644
index 59b02683..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_description.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_license.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_license.png
deleted file mode 100644
index c3262c5f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/about_license.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_back.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_back.png
deleted file mode 100644
index 8a36e093..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_back.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_file.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_file.png
deleted file mode 100644
index 50882171..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_file.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_folder.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_folder.png
deleted file mode 100644
index 1b19b3ca..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_new.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_new.png
deleted file mode 100644
index 72a6ea21..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_refresh.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_refresh.png
deleted file mode 100644
index 42d08729..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_root.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_root.png
deleted file mode 100644
index db0d5a5f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/browser_root.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/chord.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/chord.png
deleted file mode 100644
index 5c23bb6a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/chord.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/closerepeat.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/closerepeat.png
deleted file mode 100644
index cd0810ac..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/division-type.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/division-type.png
deleted file mode 100644
index eb47b50d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/division-type.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dotted.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dotted.png
deleted file mode 100644
index d963a7e5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/doubledotted.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/doubledotted.png
deleted file mode 100644
index 0ae90818..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_f.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_f.png
deleted file mode 100644
index 042cf3db..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_ff.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_ff.png
deleted file mode 100644
index dc16cd8f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_fff.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_fff.png
deleted file mode 100644
index 94dedd52..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_mf.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_mf.png
deleted file mode 100644
index 6a2d1082..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_mp.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_mp.png
deleted file mode 100644
index acb00776..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_p.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_p.png
deleted file mode 100644
index 8560e077..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_pp.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_pp.png
deleted file mode 100644
index b5f3145f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_ppp.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_ppp.png
deleted file mode 100644
index 1c14f87e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_edition.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_edition.png
deleted file mode 100644
index f230bd1d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_edition_no_natural.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_edition_no_natural.png
deleted file mode 100644
index 277f7ba7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_selection.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_selection.png
deleted file mode 100644
index 9e56aa38..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_redo.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_redo.png
deleted file mode 100644
index 5e1717e5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_undo.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_undo.png
deleted file mode 100644
index c439e9d8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_voice_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_voice_1.png
deleted file mode 100644
index 95957147..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_voice_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_voice_2.png
deleted file mode 100644
index f9a90d44..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_accentuated.png
deleted file mode 100644
index ccbac086..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_bend.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_bend.png
deleted file mode 100644
index a49c9602..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_dead.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_dead.png
deleted file mode 100644
index 68111440..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_fade_in.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_fade_in.png
deleted file mode 100644
index 0b48773b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_ghost.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_ghost.png
deleted file mode 100644
index af04c4e8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_grace.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_grace.png
deleted file mode 100644
index 079f3452..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_hammer.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_hammer.png
deleted file mode 100644
index 5eec73ab..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_harmonic.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_harmonic.png
deleted file mode 100644
index 29239335..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_heavy_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_heavy_accentuated.png
deleted file mode 100644
index c62fac99..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_palm_mute.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_palm_mute.png
deleted file mode 100644
index 77144368..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_popping.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_popping.png
deleted file mode 100644
index 8012eef9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_slapping.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_slapping.png
deleted file mode 100644
index dc64d579..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_slide.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_slide.png
deleted file mode 100644
index 731a67f3..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_staccato.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_staccato.png
deleted file mode 100644
index f3adff74..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tapping.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tapping.png
deleted file mode 100644
index c624cf1d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tremolo_bar.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tremolo_bar.png
deleted file mode 100644
index ed7fd9d6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tremolo_picking.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tremolo_picking.png
deleted file mode 100644
index f3daa7d7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_trill.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_trill.png
deleted file mode 100644
index f9524f87..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_vibrato.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_vibrato.png
deleted file mode 100644
index ae5dcca7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/firstfret.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/firstfret.png
deleted file mode 100644
index 2313352d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/firstfret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/fret.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/fret.png
deleted file mode 100644
index 479d6a7b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/fret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/fretboard.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/fretboard.png
deleted file mode 100644
index 32996e9a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/fretboard.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/grace.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/grace.png
deleted file mode 100644
index 6c67a4cb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-16x16.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-16x16.png
deleted file mode 100644
index 536ed539..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-24x24.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-24x24.png
deleted file mode 100644
index 9465961a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-32x32.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-32x32.png
deleted file mode 100644
index 414c1a30..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-48x48.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-48x48.png
deleted file mode 100644
index 323124da..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-64x64.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-64x64.png
deleted file mode 100644
index 253a826d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-96x96.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-96x96.png
deleted file mode 100644
index a9734963..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.icns b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.icns
deleted file mode 100644
index 0a379706..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.icns and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.ico b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.ico
deleted file mode 100644
index 3f978beb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.ico and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.png
deleted file mode 100644
index 253a826d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/icon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_compact.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_compact.png
deleted file mode 100644
index d765101e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_linear.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_linear.png
deleted file mode 100644
index 3f98e43b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_multitrack.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_multitrack.png
deleted file mode 100644
index 5d82d5ec..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_page.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_page.png
deleted file mode 100644
index a5641598..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_page.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_score.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_score.png
deleted file mode 100644
index 356dc02b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/layout_score.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/logo.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/logo.png
deleted file mode 100644
index 06e6deb8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/logo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_add.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_add.png
deleted file mode 100644
index cd747a59..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_first.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_first.png
deleted file mode 100644
index f48dc2c6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_first.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_last.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_last.png
deleted file mode 100644
index 82890a60..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_last.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_list.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_list.png
deleted file mode 100644
index 687ac512..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_list.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_next.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_next.png
deleted file mode 100644
index 37af476a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_next.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_previous.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_previous.png
deleted file mode 100644
index 967968ea..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_remove.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_remove.png
deleted file mode 100644
index 81db28f6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/mixer.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/mixer.png
deleted file mode 100644
index 20f08042..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/mixer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/new.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/new.png
deleted file mode 100644
index 0ae7d443..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/open.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/open.png
deleted file mode 100644
index 49aed35f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/open.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/openrepeat.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/openrepeat.png
deleted file mode 100644
index 680d64fc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_language.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_language.png
deleted file mode 100644
index 2470001f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_language.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_skin.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_skin.png
deleted file mode 100644
index 7a19c688..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_skin.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_sound.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_sound.png
deleted file mode 100644
index c9033316..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_sound.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_style.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_style.png
deleted file mode 100644
index 45f6c7ae..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_style.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_toolbars.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_toolbars.png
deleted file mode 100644
index d8c71e5e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_view.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_view.png
deleted file mode 100644
index 9fbe7d4a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/option_view.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/print-preview.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/print-preview.png
deleted file mode 100644
index 39df1371..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/print-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/print.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/print.png
deleted file mode 100644
index 08404f23..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/print.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/repeat_alternative.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/repeat_alternative.png
deleted file mode 100644
index bdceba2a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/save-as.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/save-as.png
deleted file mode 100644
index 66f2e736..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/save-as.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/save.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/save.png
deleted file mode 100644
index 45ab2fce..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/save.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/settings.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/settings.png
deleted file mode 100644
index 83af57d0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/settings.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin-preview.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin-preview.png
deleted file mode 100644
index c8e13688..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin.properties b/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin.properties
deleted file mode 100644
index ee57c234..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=blue_serious
-author=licnep <licnep@users.sourceforge.net>
-description=A more serious theme, where blue dominates.
-date=2007-07-17
-version=0.1
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin.svg b/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin.svg
deleted file mode 100644
index 78fe369d..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/blue_serious/skin.svg
+++ /dev/null
@@ -1,8639 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg4934"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="C:\Documents and Settings\Bruno Preziosi\Desktop"
-   sodipodi:docname="skin.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4936">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective1371" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34716">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop34718" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop34720" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient23605">
-      <stop
-         style="stop-color:#0100ff;stop-opacity:1;"
-         offset="0"
-         id="stop23607" />
-      <stop
-         style="stop-color:#00a7ff;stop-opacity:1;"
-         offset="1"
-         id="stop23609" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14515">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop14517" />
-      <stop
-         id="stop14603"
-         offset="0.5"
-         style="stop-color:#4c4c4c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#444444;stop-opacity:1;"
-         offset="1"
-         id="stop14519" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8897">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8899" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8901" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7257">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7259" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7261" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5204">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5206" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop5208" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4884">
-      <stop
-         style="stop-color:#e7e7e7;stop-opacity:1;"
-         offset="0"
-         id="stop4886" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4888" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient29570">
-      <stop
-         style="stop-color:#7f7f7f;stop-opacity:1;"
-         offset="0"
-         id="stop29572" />
-      <stop
-         id="stop29578"
-         offset="0.5"
-         style="stop-color:#999999;stop-opacity:0.68932039;" />
-      <stop
-         style="stop-color:#b3b3b3;stop-opacity:0;"
-         offset="1"
-         id="stop29574" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient29560">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop29562" />
-      <stop
-         style="stop-color:#fffa00;stop-opacity:0;"
-         offset="1"
-         id="stop29564" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient26619">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop26621" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop26623" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient24651">
-      <stop
-         style="stop-color:#838383;stop-opacity:1;"
-         offset="0"
-         id="stop24653" />
-      <stop
-         style="stop-color:#ececec;stop-opacity:1;"
-         offset="1"
-         id="stop24655" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient24639">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop24641" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop24643" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient23660">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop23662" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop23664" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient22671">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop22673" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop22675" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21690">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop21692" />
-      <stop
-         style="stop-color:#c3c3c3;stop-opacity:1;"
-         offset="1"
-         id="stop21694" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20702">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop20704" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop20706" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19703">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop19705" />
-      <stop
-         style="stop-color:#d8a588;stop-opacity:0;"
-         offset="1"
-         id="stop19707" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13756">
-      <stop
-         style="stop-color:#916f6f;stop-opacity:1;"
-         offset="0"
-         id="stop13758" />
-      <stop
-         style="stop-color:#372929;stop-opacity:1;"
-         offset="1"
-         id="stop13760" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12721">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12723" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop12725" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12711">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12713" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop12715" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11707">
-      <stop
-         style="stop-color:#ffcc00;stop-opacity:1;"
-         offset="0"
-         id="stop11709" />
-      <stop
-         style="stop-color:#e5b804;stop-opacity:1;"
-         offset="1"
-         id="stop11711" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11689">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop11691" />
-      <stop
-         style="stop-color:#e0a01c;stop-opacity:0;"
-         offset="1"
-         id="stop11693" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient56561">
-      <stop
-         id="stop56563"
-         offset="0"
-         style="stop-color:#9cffff;stop-opacity:1;" />
-      <stop
-         id="stop56565"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient48382">
-      <stop
-         style="stop-color:#34a7f6;stop-opacity:1;"
-         offset="0"
-         id="stop48384" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop48386" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4856">
-      <stop
-         style="stop-color:white;stop-opacity:0.84536082"
-         offset="0"
-         id="stop4858" />
-      <stop
-         style="stop-color:#6898f1;stop-opacity:0.46391752"
-         offset="1"
-         id="stop4860" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4791">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop4793" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4795" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient22002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.920046,0,0,1.086901,0,13.71543)"
-       x1="313.19742"
-       y1="886.34753"
-       x2="399.59286"
-       y2="886.34753" />
-    <linearGradient
-       id="linearGradient33795">
-      <stop
-         style="stop-color:#ff9e00;stop-opacity:1"
-         offset="0"
-         id="stop33801" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0.5"
-         id="stop33803" />
-      <stop
-         style="stop-color:#ffffa0;stop-opacity:1"
-         offset="1"
-         id="stop33799" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3974">
-      <stop
-         style="stop-color:#dd9600;stop-opacity:1"
-         offset="0"
-         id="stop3976" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3978" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11729">
-      <stop
-         style="stop-color:#806805;stop-opacity:1"
-         offset="0"
-         id="stop11731" />
-      <stop
-         style="stop-color:#e1e2ce;stop-opacity:1"
-         offset="0.44999999"
-         id="stop11735" />
-      <stop
-         style="stop-color:#b4a66d;stop-opacity:1"
-         offset="1"
-         id="stop11733" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9900">
-      <stop
-         style="stop-color:#ffd988;stop-opacity:1"
-         offset="0"
-         id="stop9902" />
-      <stop
-         style="stop-color:#97812c;stop-opacity:1"
-         offset="1"
-         id="stop9904" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9009">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop9011" />
-      <stop
-         style="stop-color:#d3bc5f;stop-opacity:1"
-         offset="1"
-         id="stop9013" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23057"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,982.7389,22.5298)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23061"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,643.9049,22.52983)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23063"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,530.9602,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-167.3496,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient3567"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4133997,0.4055754,-0.3422418,-0.3488223,10.276589,-74.784609)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24213"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24211"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24217"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24215"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       id="linearGradient32988">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop32990" />
-      <stop
-         style="stop-color:#cbcbcb;stop-opacity:1"
-         offset="0.5"
-         id="stop32994" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop32992" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)"
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643" />
-    <linearGradient
-       id="linearGradient6462">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop6464" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop6466" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       id="linearGradient9267">
-      <stop
-         style="stop-color:#ffd428;stop-opacity:1;"
-         offset="0"
-         id="stop9269" />
-      <stop
-         id="stop10163"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffd322;stop-opacity:1;"
-         offset="1"
-         id="stop9271" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9267"
-       id="linearGradient24251"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.105702,-0.132634,0.122908,0.142271,-123.5758,437.4912)"
-       x1="205.4043"
-       y1="464.48911"
-       x2="207.19127"
-       y2="498.23825" />
-    <linearGradient
-       id="linearGradient7463">
-      <stop
-         style="stop-color:lime;stop-opacity:1;"
-         offset="0"
-         id="stop7465" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop7467" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7463"
-       id="linearGradient24249"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.120379,0.139344,-0.171115,0.214715,20.77584,293.7269)"
-       x1="331.695"
-       y1="486.6479"
-       x2="399.73358"
-       y2="486.6479" />
-    <linearGradient
-       id="linearGradient19203">
-      <stop
-         style="stop-color:#a49e88;stop-opacity:1;"
-         offset="0"
-         id="stop19205" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop19207" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19203"
-       id="linearGradient24247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.463664,0.283515,-0.266017,0.432012,-24.98543,167.9069)"
-       x1="209.59592"
-       y1="469.32986"
-       x2="228.7281"
-       y2="494.3299" />
-    <linearGradient
-       id="linearGradient14138">
-      <stop
-         style="stop-color:#afc6e9;stop-opacity:1;"
-         offset="0"
-         id="stop14140" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop14142" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20139">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop20141" />
-      <stop
-         style="stop-color:#5696f6;stop-opacity:0"
-         offset="1"
-         id="stop20143" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21032">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop21034" />
-      <stop
-         style="stop-color:red;stop-opacity:0"
-         offset="1"
-         id="stop21036" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18353">
-      <stop
-         style="stop-color:yellow;stop-opacity:1"
-         offset="0"
-         id="stop18355" />
-      <stop
-         style="stop-color:yellow;stop-opacity:0"
-         offset="1"
-         id="stop18357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19246">
-      <stop
-         style="stop-color:#f95;stop-opacity:1"
-         offset="0"
-         id="stop19248" />
-      <stop
-         style="stop-color:#f95;stop-opacity:0"
-         offset="1"
-         id="stop19250" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4550"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <linearGradient
-       id="linearGradient5684">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop5686" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop5688" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4546"
-       gradientUnits="userSpaceOnUse"
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218" />
-    <linearGradient
-       id="linearGradient4644">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop4646" />
-      <stop
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1"
-         id="stop4648" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4644"
-       id="radialGradient4544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       id="linearGradient4672">
-      <stop
-         style="stop-color:#9b9b9b;stop-opacity:1"
-         offset="0"
-         id="stop4674" />
-      <stop
-         style="stop-color:#2f2f2f;stop-opacity:1"
-         offset="1"
-         id="stop4676" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218" />
-    <linearGradient
-       id="linearGradient7720">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop7722" />
-      <stop
-         style="stop-color:#81baff;stop-opacity:1;"
-         offset="1"
-         id="stop7724" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7720"
-       id="radialGradient4540"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       id="linearGradient5880">
-      <stop
-         style="stop-color:#6d91d4;stop-opacity:1"
-         offset="0"
-         id="stop5882" />
-      <stop
-         style="stop-color:black;stop-opacity:0.02061856"
-         offset="1"
-         id="stop5884" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6814">
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="0"
-         id="stop6816" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6820" />
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="1"
-         id="stop6818" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6798">
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="0"
-         id="stop6800" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6804" />
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="1"
-         id="stop6802" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6830">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop6832" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6836" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="1"
-         id="stop6834" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6846">
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="0"
-         id="stop6848" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6852" />
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="1"
-         id="stop6850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9201">
-      <stop
-         style="stop-color:#007d00;stop-opacity:1;"
-         offset="0"
-         id="stop9203" />
-      <stop
-         style="stop-color:#00d900;stop-opacity:0;"
-         offset="1"
-         id="stop9205" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient16401"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <linearGradient
-       id="linearGradient10979">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop10981" />
-      <stop
-         style="stop-color:#fff2d7;stop-opacity:1;"
-         offset="1"
-         id="stop10983" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient16399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient21760"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       id="linearGradient15469">
-      <stop
-         style="stop-color:#25a2e3;stop-opacity:1;"
-         offset="0"
-         id="stop15471" />
-      <stop
-         style="stop-color:#dfdfdf;stop-opacity:1;"
-         offset="1"
-         id="stop15473" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient3382"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21493"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       id="linearGradient9644">
-      <stop
-         style="stop-color:#f8e70a;stop-opacity:1;"
-         offset="0"
-         id="stop9646" />
-      <stop
-         style="stop-color:#ffa021;stop-opacity:0;"
-         offset="1"
-         id="stop9648" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21491"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       id="linearGradient1315">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop1317" />
-      <stop
-         style="stop-color:black;stop-opacity:0.73958325"
-         offset="1"
-         id="stop1319" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient22911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4134002,0.4055758,-0.3422416,-0.3488226,336.05906,-255.33691)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <marker
-       inkscape:stockid="TriangleInM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleInM"
-       style="overflow:visible">
-      <path
-         id="path4538"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.4)" />
-    </marker>
-    <linearGradient
-       id="linearGradient43975">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop43977" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop43979" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient40035">
-      <stop
-         style="stop-color:#3c3c3c;stop-opacity:1;"
-         offset="0"
-         id="stop40037" />
-      <stop
-         style="stop-color:#9a8d8d;stop-opacity:1;"
-         offset="1"
-         id="stop40039" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient34131">
-      <stop
-         style="stop-color:#006e0b;stop-opacity:1;"
-         offset="0"
-         id="stop34133" />
-      <stop
-         style="stop-color:#07ff00;stop-opacity:1;"
-         offset="1"
-         id="stop34135" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11686">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11688" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop11690" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient30048">
-      <stop
-         style="stop-color:#007100;stop-opacity:1;"
-         offset="0"
-         id="stop30050" />
-      <stop
-         style="stop-color:#00d100;stop-opacity:0.70873785;"
-         offset="1"
-         id="stop30052" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient24170">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop24172" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop24174" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4552">
-      <stop
-         style="stop-color:#ffcd1d;stop-opacity:1"
-         offset="0"
-         id="stop4554" />
-      <stop
-         style="stop-color:#ffe691;stop-opacity:1"
-         offset="0.67500001"
-         id="stop6334" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4556" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3661">
-      <stop
-         style="stop-color:#ffd74f;stop-opacity:1"
-         offset="0"
-         id="stop3663" />
-      <stop
-         style="stop-color:#795d00;stop-opacity:0"
-         offset="1"
-         id="stop3665" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19023">
-      <stop
-         style="stop-color:#fff6f6;stop-opacity:1;"
-         offset="0"
-         id="stop19025" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop19027" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18995">
-      <stop
-         style="stop-color:#7887b6;stop-opacity:1;"
-         offset="0"
-         id="stop18997" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop18999" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18969">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop18971" />
-      <stop
-         id="stop18977"
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop18973" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18960">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.79611653;"
-         offset="0"
-         id="stop18962" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop18964" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient17829">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop17831" />
-      <stop
-         id="stop17837"
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop17833" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16852">
-      <stop
-         style="stop-color:#d3bc5f;stop-opacity:1;"
-         offset="0"
-         id="stop16854" />
-      <stop
-         style="stop-color:#d38d5f;stop-opacity:1;"
-         offset="1"
-         id="stop16856" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14070">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop14072" />
-      <stop
-         style="stop-color:#8e8e8e;stop-opacity:1"
-         offset="1"
-         id="stop14074" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21068">
-      <stop
-         style="stop-color:#999;stop-opacity:1"
-         offset="0"
-         id="stop21070" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop21072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16226">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop16228" />
-      <stop
-         style="stop-color:#e85700;stop-opacity:1"
-         offset="1"
-         id="stop16230" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34131"
-       id="linearGradient43969"
-       gradientUnits="userSpaceOnUse"
-       x1="315.21429"
-       y1="601.46936"
-       x2="334.42856"
-       y2="601.46936" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16852"
-       id="linearGradient46199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(32.857143,-92.857143)"
-       x1="330.38367"
-       y1="341.9724"
-       x2="335.30689"
-       y2="341.9724" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16852"
-       id="linearGradient46291"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(32.857143,-92.857143)"
-       x1="330.38367"
-       y1="341.9724"
-       x2="335.30689"
-       y2="341.9724" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30048"
-       id="linearGradient46308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-47.5,-58.214286)"
-       x1="394.7171"
-       y1="463.6958"
-       x2="387.64603"
-       y2="456.62473" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24170"
-       id="linearGradient46322"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9152246,0,39.62588)"
-       x1="327.79449"
-       y1="446.52319"
-       x2="310.87445"
-       y2="448.03842" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24170"
-       id="linearGradient46324"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9152246,0,39.62588)"
-       x1="333.21429"
-       y1="452.49219"
-       x2="334.64285"
-       y2="475.23166" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient46350"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1573476,0,0,0.1985639,254.36744,448.40529)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40035"
-       id="linearGradient46352"
-       gradientUnits="userSpaceOnUse"
-       x1="332.07446"
-       y1="565.65918"
-       x2="318.41772"
-       y2="569.03137" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34131"
-       id="linearGradient46354"
-       gradientUnits="userSpaceOnUse"
-       x1="315.21429"
-       y1="601.46936"
-       x2="334.42856"
-       y2="601.46936" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient46382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1573476,0,0,0.1985639,254.36744,448.40529)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40035"
-       id="linearGradient46384"
-       gradientUnits="userSpaceOnUse"
-       x1="332.07446"
-       y1="565.65918"
-       x2="318.41772"
-       y2="569.03137" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient43975"
-       id="linearGradient46386"
-       gradientUnits="userSpaceOnUse"
-       x1="332.5"
-       y1="642.36218"
-       x2="346.98233"
-       y2="656.62982"
-       gradientTransform="translate(31.071397,-471.8956)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56421"
-       gradientUnits="userSpaceOnUse"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56423"
-       gradientUnits="userSpaceOnUse"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="168.01244"
-       y1="765.50165"
-       x2="172.57751"
-       y2="783.052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56427"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56429"
-       gradientUnits="userSpaceOnUse"
-       x1="146.07144"
-       y1="773.9693"
-       x2="138.39285"
-       y2="763.61218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56431"
-       gradientUnits="userSpaceOnUse"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56433"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9553524,0,0,0.9553524,6.3805055,33.68767)"
-       x1="131.91823"
-       y1="757.63336"
-       x2="156.74184"
-       y2="786.12646" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56435"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9553524,0,0,0.9553524,6.3805055,33.68767)"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56437"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9095867,0,69.541934)"
-       x1="226.12527"
-       y1="767.38849"
-       x2="229.06473"
-       y2="779.35138" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56443"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56445"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56447"
-       gradientUnits="userSpaceOnUse"
-       x1="224.28571"
-       y1="767.7193"
-       x2="228.0826"
-       y2="779.06696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56449"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56453"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9095867,0,69.541934)"
-       x1="226.12527"
-       y1="767.38849"
-       x2="229.06473"
-       y2="779.35138" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56455"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56457"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56459"
-       gradientUnits="userSpaceOnUse"
-       x1="224.28571"
-       y1="767.7193"
-       x2="228.0826"
-       y2="779.06696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56511"
-       gradientUnits="userSpaceOnUse"
-       x1="175.71429"
-       y1="787.12646"
-       x2="171.60715"
-       y2="767.1731" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56515"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56549"
-       x1="218.45901"
-       y1="770.17187"
-       x2="237.88474"
-       y2="770.17187"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56551"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56553"
-       x1="162.91429"
-       y1="770.93361"
-       x2="180.3"
-       y2="770.93361"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56555"
-       x1="135.39285"
-       y1="770.755"
-       x2="153.53571"
-       y2="770.755"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56557"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56559"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56577"
-       gradientUnits="userSpaceOnUse"
-       x1="162.91429"
-       y1="770.93361"
-       x2="174.23909"
-       y2="780.53003" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56579"
-       gradientUnits="userSpaceOnUse"
-       x1="162.91429"
-       y1="770.93361"
-       x2="171.60715"
-       y2="767.1731" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56582"
-       gradientUnits="userSpaceOnUse"
-       x1="162.91429"
-       y1="770.93361"
-       x2="174.23909"
-       y2="780.53003"
-       gradientTransform="translate(-0.2550204,29.247583)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,6.8094052,110.6955)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56607"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56615"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56667"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(227.41176,-673.03754)"
-       x1="156.3483"
-       y1="774.46912"
-       x2="171.60715"
-       y2="768.18323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56669"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(227.41176,-673.03754)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="171.60715"
-       y2="768.18323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56671"
-       gradientUnits="userSpaceOnUse"
-       x1="135.39285"
-       y1="770.755"
-       x2="153.53571"
-       y2="770.755" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56673"
-       gradientUnits="userSpaceOnUse"
-       x1="135.39285"
-       y1="770.755"
-       x2="153.53571"
-       y2="770.755" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56675"
-       gradientUnits="userSpaceOnUse"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56677"
-       gradientUnits="userSpaceOnUse"
-       x1="136.38519"
-       y1="765.59845"
-       x2="152.59634"
-       y2="778.37634" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9553524,0,0,0.9553524,6.3805055,33.68767)"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56681"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56683"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56687"
-       gradientUnits="userSpaceOnUse"
-       x1="220.6384"
-       y1="776.77808"
-       x2="234.15274"
-       y2="757.90942" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56689"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56691"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56695"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56697"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56699"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56701"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56703"
-       gradientUnits="userSpaceOnUse"
-       x1="220.6384"
-       y1="776.77808"
-       x2="234.15274"
-       y2="757.90942" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56705"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56707"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56711"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient3722"
-       x1="-484.87323"
-       y1="170.99902"
-       x2="-480.08008"
-       y2="156.60942"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(849.99998,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient3738"
-       x1="-482.34784"
-       y1="168.47871"
-       x2="-489.41891"
-       y2="163.93301"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(849.99998,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient6854"
-       gradientUnits="userSpaceOnUse"
-       x1="-484.87323"
-       y1="170.99902"
-       x2="-480.08008"
-       y2="156.60942"
-       gradientTransform="translate(859.59643,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient6856"
-       gradientUnits="userSpaceOnUse"
-       x1="-482.34784"
-       y1="168.47871"
-       x2="-489.41891"
-       y2="163.93301"
-       gradientTransform="translate(859.59643,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient6883"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.955585e-2,-9.4442571e-2,9.3098111e-2,9.0849027e-2,220.18116,469.85854)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient6899"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.955585e-2,-9.4442571e-2,9.3098111e-2,9.0849027e-2,219.81213,516.8131)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34131"
-       id="linearGradient6901"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1321943,0,0,1.1321943,-46.203278,-70.99291)"
-       x1="339.28571"
-       y1="539.14789"
-       x2="341.78571"
-       y2="551.64789" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient8039"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7526038,0.6083978,-0.5733311,0.5393683,798.58831,284.04424)"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13756"
-       id="linearGradient13762"
-       x1="450.78058"
-       y1="666.98901"
-       x2="461.38718"
-       y2="681.48468"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13756"
-       id="linearGradient14783"
-       gradientUnits="userSpaceOnUse"
-       x1="450.78058"
-       y1="666.98901"
-       x2="461.38718"
-       y2="681.48468" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient29570"
-       id="radialGradient29636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.103689,5.2299076e-7,-1.9780151e-7,0.1370966,-46.037807,651.99982)"
-       cx="439.46976"
-       cy="757.58337"
-       fx="439.46976"
-       fy="757.58337"
-       r="62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21690"
-       id="linearGradient29638"
-       gradientUnits="userSpaceOnUse"
-       x1="595.5"
-       y1="696.36218"
-       x2="596.75"
-       y2="767.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11707"
-       id="linearGradient29640"
-       gradientUnits="userSpaceOnUse"
-       x1="634.88086"
-       y1="751.11469"
-       x2="634.88086"
-       y2="742.24536" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11689"
-       id="linearGradient29642"
-       gradientUnits="userSpaceOnUse"
-       x1="616.4325"
-       y1="739.86218"
-       x2="616.81653"
-       y2="768.41132" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11707"
-       id="linearGradient29644"
-       gradientUnits="userSpaceOnUse"
-       x1="634.88086"
-       y1="751.11469"
-       x2="634.88086"
-       y2="742.24536" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11689"
-       id="linearGradient29646"
-       gradientUnits="userSpaceOnUse"
-       x1="616.4325"
-       y1="739.86218"
-       x2="616.81653"
-       y2="768.41132" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12721"
-       id="linearGradient29648"
-       gradientUnits="userSpaceOnUse"
-       x1="575"
-       y1="712.7193"
-       x2="529.9032"
-       y2="696.14789" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12711"
-       id="linearGradient29650"
-       gradientUnits="userSpaceOnUse"
-       x1="538.57141"
-       y1="699.14789"
-       x2="562.85712"
-       y2="719.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13756"
-       id="linearGradient29652"
-       gradientUnits="userSpaceOnUse"
-       x1="450.78058"
-       y1="666.98901"
-       x2="461.38718"
-       y2="681.48468" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19703"
-       id="linearGradient29654"
-       gradientUnits="userSpaceOnUse"
-       x1="660.5"
-       y1="643.11218"
-       x2="647"
-       y2="681.86218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20702"
-       id="radialGradient29656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7877615,-0.3068366,0.2750567,1.6025984,-339.57925,-281.42543)"
-       cx="392"
-       cy="682.68359"
-       fx="392"
-       fy="682.68359"
-       r="11" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22671"
-       id="radialGradient29658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4334045,-0.7857037,2.2183534,1.2236733,-1042.1562,234.44432)"
-       cx="474.38373"
-       cy="659.97424"
-       fx="474.38373"
-       fy="659.97424"
-       r="15.8" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23660"
-       id="linearGradient29660"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9699248,0,0,1,173.57519,6)"
-       x1="434.75"
-       y1="609.86218"
-       x2="434.75"
-       y2="641.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24639"
-       id="linearGradient29662"
-       gradientUnits="userSpaceOnUse"
-       x1="441.00461"
-       y1="648.47522"
-       x2="403.06418"
-       y2="645.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24639"
-       id="linearGradient29664"
-       gradientUnits="userSpaceOnUse"
-       x1="457.867"
-       y1="648.99261"
-       x2="407.80673"
-       y2="645.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24651"
-       id="linearGradient29666"
-       gradientUnits="userSpaceOnUse"
-       x1="434.68118"
-       y1="653.64905"
-       x2="408.33368"
-       y2="651.57947" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient26619"
-       id="linearGradient29668"
-       gradientUnits="userSpaceOnUse"
-       x1="590"
-       y1="636.34375"
-       x2="578"
-       y2="651.84375" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24651"
-       id="linearGradient29670"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9488566,0,0,0.9664004,179.5499,26.675505)"
-       x1="434.68118"
-       y1="653.64905"
-       x2="408.33368"
-       y2="651.57947" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23660"
-       id="linearGradient29672"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8989058,0,0,0.863818,225.09145,95.352673)"
-       x1="419.85327"
-       y1="633.24628"
-       x2="434.31531"
-       y2="653.70087" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient29560"
-       id="linearGradient29674"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9721378,0,0,0.9641253,16.310943,23.529189)"
-       x1="607.40472"
-       y1="666.98901"
-       x2="588.66638"
-       y2="657.79657" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient29690"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029204,0.186021,-0.1860214,0.2029204,422.55483,563.24879)"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient29692"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029204,0.186021,-0.1860214,0.2029204,422.55483,563.24879)"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient29708"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029202,0.1860211,-0.1860211,0.2029202,415.50085,608.72154)"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient29710"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029202,0.1860211,-0.1860211,0.2029202,415.50085,608.72154)"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient29749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient29751"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient29763"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient29765"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient30770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.347396,5.8469281e-3,-6.45542e-3,0.3835499,278.79698,446.0576)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient30772"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6801604,0,0,0.6801604,143.23448,260.49617)"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4884"
-       id="linearGradient4986"
-       gradientUnits="userSpaceOnUse"
-       x1="468.45825"
-       y1="368.94348"
-       x2="460.32651"
-       y2="332.88104"
-       gradientTransform="translate(-50.622053,-134.67858)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8558"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0606601,-0.3535534)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8560"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0606601,-0.3535534)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8562"
-       gradientUnits="userSpaceOnUse"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(65.15738,0)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(65.15738,0)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8568"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,597.96234,0.3535534)"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8570"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,741.85857,-1.4142136)"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(213.29625,-1.4142136)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8574"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(213.29625,-1.4142136)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8576"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.7071068,0)"
-       x1="476.58997"
-       y1="953.36725"
-       x2="476.23642"
-       y2="936.50024" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8578"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.11366,-1.4142134)"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8580"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(142.93168,-1.4142134)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(142.93168,-1.4142134)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-887.26512,-4.4513212e-7)"
-       x1="476.58997"
-       y1="953.36725"
-       x2="476.23642"
-       y2="936.50024" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8586"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(250.41936,-1.767767)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8588"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(250.41936,-1.767767)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8590"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(298.50262,-1.767767)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8592"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(298.50262,-1.767767)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(104.75536,-1.4142136)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(104.75536,-1.4142136)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient8903"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9082"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9084"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9086"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9088"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9090"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9092"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10632"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0002987,0,0,0.9606692,-0.1380491,15.912347)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10634"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2485904,0,0,0.9568426,-107.4476,25.962975)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0180271,0,0,0.9603807,-13.103176,33.000931)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10638"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0002987,0,0,0.9606692,0.2155043,67.177589)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10640"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2485904,0,0,0.9568426,-107.09405,77.228217)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0180271,0,0,0.9603807,-12.749623,84.266173)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient12422"
-       gradientUnits="userSpaceOnUse"
-       x1="448.76281"
-       y1="542.00787"
-       x2="465.87982"
-       y2="542.00787" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient12424"
-       gradientUnits="userSpaceOnUse"
-       x1="462.80139"
-       y1="548.90216"
-       x2="454.3161"
-       y2="539.00269" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient14671"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4620139,0,0,0.3894886,57.182807,0.9387358)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient14673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient14675"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient14677"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient14679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4620139,0,0,0.3894886,57.182807,0.9387358)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14515"
-       id="linearGradient14681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6887344,0,0,0.6887344,123.12631,180.07568)"
-       x1="504.69748"
-       y1="581.25232"
-       x2="504.69748"
-       y2="592.21246" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14515"
-       id="linearGradient14683"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6887344,0,0,0.6887344,123.12631,180.07568)"
-       x1="504.69748"
-       y1="581.25232"
-       x2="504.69748"
-       y2="592.21246" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14515"
-       id="linearGradient14685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6887344,0,0,0.6887344,123.12631,180.07568)"
-       x1="504.69748"
-       y1="581.25232"
-       x2="504.69748"
-       y2="592.21246" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16699"
-       gradientUnits="userSpaceOnUse"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16701"
-       gradientUnits="userSpaceOnUse"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16703"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="168.01244"
-       y1="765.50165"
-       x2="172.57751"
-       y2="783.052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16705"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient20674"
-       x1="550.44476"
-       y1="253.6601"
-       x2="617.09191"
-       y2="253.6601"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4884"
-       id="linearGradient20676"
-       x1="550.45654"
-       y1="279.77587"
-       x2="617.10101"
-       y2="279.77587"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23605"
-       id="linearGradient23611"
-       x1="671.5"
-       y1="273.36218"
-       x2="642"
-       y2="258.36218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.5,-1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32738"
-       gradientUnits="userSpaceOnUse"
-       x1="657.81122"
-       y1="561.36737"
-       x2="667.31006"
-       y2="509.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32740"
-       gradientUnits="userSpaceOnUse"
-       x1="698.62152"
-       y1="559.50873"
-       x2="637.10321"
-       y2="525.56763" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32742"
-       gradientUnits="userSpaceOnUse"
-       x1="661.5"
-       y1="522.48663"
-       x2="668.9314"
-       y2="568.8941" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32744"
-       gradientUnits="userSpaceOnUse"
-       x1="657.81122"
-       y1="561.36737"
-       x2="667.31006"
-       y2="509.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32746"
-       gradientUnits="userSpaceOnUse"
-       x1="698.62152"
-       y1="559.50873"
-       x2="637.10321"
-       y2="525.56763" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32748"
-       gradientUnits="userSpaceOnUse"
-       x1="661.5"
-       y1="522.48663"
-       x2="668.9314"
-       y2="568.8941" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32750"
-       gradientUnits="userSpaceOnUse"
-       x1="657.81122"
-       y1="561.36737"
-       x2="667.31006"
-       y2="509.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32752"
-       gradientUnits="userSpaceOnUse"
-       x1="698.62152"
-       y1="559.50873"
-       x2="637.10321"
-       y2="525.56763" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32754"
-       gradientUnits="userSpaceOnUse"
-       x1="661.5"
-       y1="522.48663"
-       x2="668.9314"
-       y2="568.8941" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4884"
-       id="linearGradient34698"
-       x1="631.90344"
-       y1="523.90344"
-       x2="698.16439"
-       y2="547.48794"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34716"
-       id="linearGradient34722"
-       x1="692.96466"
-       y1="529.10315"
-       x2="636.39612"
-       y2="571.07245"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient34743"
-       x1="551.61316"
-       y1="604.48474"
-       x2="574.93854"
-       y2="619.33398"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-237.34822,100.04162)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient35720"
-       x1="560.02856"
-       y1="633.04785"
-       x2="530.33008"
-       y2="597.6925"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-237.34822,100.04162)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23605"
-       id="linearGradient4519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.5,-1)"
-       x1="671.5"
-       y1="273.36218"
-       x2="642"
-       y2="258.36218" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="579.49621"
-     inkscape:cy="593.75733"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1280"
-     inkscape:window-height="931"
-     inkscape:window-x="0"
-     inkscape:window-y="33"
-     showgrid="false" />
-  <metadata
-     id="metadata4939">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       id="text22931"
-       style="font-size:27.52882576px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.39196366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931228)"
-       y="569.82336"
-       x="102.38081"><tspan
-         id="tspan22933"
-         style="stroke-width:0.39196366"
-         y="569.82336"
-         x="102.38081">Windows dialogs  icons</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text13940"
-       style="font-size:22.53170586px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.32081166px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931229)"
-       y="66.432938"
-       x="104.47573"><tspan
-         id="tspan13942"
-         style="stroke-width:0.32081166"
-         y="66.432938"
-         x="104.47573">TuxGuitar Player 0.8 Version</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text14708"
-       style="font-size:7.94642401px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.11314224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931229)"
-       y="79.741409"
-       x="104.01778"><tspan
-         id="tspan14710"
-         style="stroke-width:0.11314226"
-         y="79.741409"
-         x="104.01778">Buttons defaut</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text14712"
-       style="font-size:7.94658947px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.1131442px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931229)"
-       y="80.345016"
-       x="270.76242"><tspan
-         id="tspan14714"
-         style="stroke-width:0.1131442"
-         y="80.345016"
-         x="270.76242">Buttons is on</tspan></text>
-    <rect
-       id="rect2827"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="389.56476"
-       x="104.71769"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_accentuated.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect2837"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="389.56476"
-       x="153.22922"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_fade_in.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect6548"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="389.35748"
-       x="201.66434"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_ghost.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect6595"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.02417"
-       x="249.47281"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_grace.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect7500"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.02417"
-       x="297.9993"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_hammer.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect7533"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.66095"
-       x="346.74661"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_harmonic.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3143"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.66095"
-       x="395.84604"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_heavy_accentuated.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3182"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.66095"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_palm_mute.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <text
-       xml:space="preserve"
-       id="text17219"
-       style="font-size:23.18305969px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.33008549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931228)"
-       y="137.11647"
-       x="103.68752"><tspan
-         id="tspan17221"
-         style="stroke-width:0.33008549"
-         y="137.11647"
-         x="103.68752">Toolbar  icons</tspan></text>
-    <rect
-       id="rect34943"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.37198"
-       x="104.68711"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect37863"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.14096"
-       x="201.2482"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect37847"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.37198"
-       x="154.58469"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect49778"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="247.90994"
-       x="248.60471"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52722"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path49780"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 338.50001,696.12549 L 406.50001,696.12549" />
-      <path
-         id="path50667"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(-6.499994,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path50669"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 369.35853,695.26143 L 369.35853,634.48955" />
-      <path
-         id="path50671"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 338.50001,675.62549 L 406.50001,675.62549" />
-    </g>
-    <rect
-       id="rect50689"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.14096"
-       x="295.96121"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect52500"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="247.90994"
-       x="345.85873"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52715"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path50709"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 473.56682,634.97014 C 491.05994,635.4857 491.47546,647.90583 491.48512,663.18131 C 486.73449,647.1487 488.86877,643.70599 473.61907,643.74026 C 473.53193,630.54852 473.6402,648.16276 473.56682,634.97014 z " />
-      <path
-         id="path52546"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 441.00001,696.62549 L 509.00001,696.62549" />
-      <path
-         id="path52548"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(96.00001,7.763308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52550"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 471.85853,695.76143 L 471.85853,634.98955" />
-      <path
-         id="path52552"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 441.00001,676.12549 L 509.00001,676.12549" />
-    </g>
-    <g
-       id="g52707"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path52519"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 581.65647,634.49305 C 599.14959,634.96367 599.56511,646.30103 599.57477,660.24482 C 594.82414,645.6099 596.95842,642.46732 581.70872,642.4986 C 581.62158,630.4569 581.72985,646.53556 581.65647,634.49305 z " />
-      <path
-         id="path52570"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 549.00001,696.12549 L 617.00001,696.12549" />
-      <path
-         id="path52572"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(204,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52574"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 579.85853,695.26143 L 579.85853,634.48955" />
-      <path
-         id="path52576"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 549.00001,675.62549 L 617.00001,675.62549" />
-      <path
-         id="path52578"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 581.51919,644.69678 C 599.01231,645.1674 599.42783,656.50476 599.43749,670.44855 C 594.68686,655.81363 596.82114,652.67105 581.57144,652.70233 C 581.4843,640.66063 581.59257,656.73929 581.51919,644.69678 z " />
-    </g>
-    <rect
-       id="rect52589"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.14096"
-       x="393.67725"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52697"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path52593"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,634.99305 C 702.64959,635.46096 703.06511,646.7332 703.07477,660.59689 C 698.32414,646.04604 700.45842,642.92151 685.20872,642.95261 C 685.12158,630.98009 685.22985,646.96638 685.15647,634.99305 z " />
-      <path
-         id="path52597"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 652.50001,696.62549 L 720.50001,696.62549" />
-      <path
-         id="path52599"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(307.5,7.763308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52601"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 683.35853,695.76143 L 683.35853,634.98955" />
-      <path
-         id="path52603"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 652.50001,676.12549 L 720.50001,676.12549" />
-      <path
-         id="path52605"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,644.55268 C 702.64959,645.02059 703.06511,656.29283 703.07477,670.15652 C 698.32414,655.60567 700.45842,652.48114 685.20872,652.51224 C 685.12158,640.53972 685.22985,656.52601 685.15647,644.55268 z " />
-      <path
-         id="path52614"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,654.60879 C 702.64959,655.07671 703.06511,666.34894 703.07477,680.21263 C 698.32414,665.66178 700.45842,662.53726 685.20872,662.56836 C 685.12158,650.59583 685.22985,666.58212 685.15647,654.60879 z " />
-      <path
-         id="path52629"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,664.55689 C 702.64959,665.02481 703.06511,676.29704 703.07477,690.16073 C 698.32414,675.60988 700.45842,672.48536 685.20872,672.51646 C 685.12158,660.54393 685.22985,676.53022 685.15647,664.55689 z " />
-    </g>
-    <rect
-       id="rect52728"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.03989"
-       x="104.41618"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52730"
-       style="display:inline"
-       transform="matrix(0.4620139,0,0,0.4620139,-47.017263,8.9897668)">
-      <path
-         id="path52732"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 338.50001,696.12549 L 406.50001,696.12549" />
-      <path
-         id="path52734"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(-6.499994,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52736"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 369.35853,695.26143 L 369.35853,634.48955" />
-      <path
-         id="path52738"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 338.50001,675.62549 L 406.50001,675.62549" />
-    </g>
-    <rect
-       id="rect52740"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       y="137.10782"
-       x="319.00745"
-       height="4.6201973"
-       width="4.8512053" />
-    <rect
-       id="rect52758"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.50052"
-       x="154.8157"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52774"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <g
-         id="g52760"
-         style="display:inline"
-         transform="translate(-203,109.5)">
-        <path
-           id="path52762"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 338.50001,696.12549 L 406.50001,696.12549" />
-        <path
-           id="path52764"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="translate(-6.499994,7.263308)"
-           d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-        <path
-           id="path52766"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 369.35853,695.26143 L 369.35853,634.48955" />
-        <path
-           id="path52768"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 338.50001,675.62549 L 406.50001,675.62549" />
-      </g>
-      <rect
-         id="rect52770"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-         y="431.48001"
-         x="683.43604"
-         height="10.000011"
-         width="10.500011" />
-      <rect
-         id="rect52772"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-         y="420.75739"
-         x="694.15863"
-         height="10.00004"
-         width="10.50004" />
-    </g>
-    <rect
-       id="rect52783"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="297.80753"
-       x="203.09622"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52910"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path52789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 240.00001,804.12549 L 308.00001,804.12549" />
-      <path
-         id="path52795"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 240.00001,783.62549 L 308.00001,783.62549" />
-      <path
-         id="path52791"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(0.571633,0,0,1,45.35674,115.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52793"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 260.01295,803.45836 L 260.01295,758.79263" />
-      <path
-         id="path52812"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.571633,0,0,1,62.29158,115.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52814"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 277.14348,803.45838 L 277.14348,758.79265" />
-      <path
-         id="path52826"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.571633,0,0,1,79.44058,115.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52828"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 294.49064,803.45838 L 294.49064,758.79265" />
-      <rect
-         id="rect52830"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         y="758.36218"
-         x="258.86331"
-         height="9.6007662"
-         width="36.69611" />
-      <text
-         xml:space="preserve"
-         id="text52858"
-         style="font-size:25.4596386px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         transform="scale(1.099156,0.909789)"
-         y="832.28827"
-         x="243.78136"><tspan
-           id="tspan52860"
-           style="font-family:Arial Black"
-           y="832.28827"
-           x="243.78136">3</tspan></text>
-    </g>
-    <rect
-       id="rect52923"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.26956"
-       x="249.2977"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\timesignature.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       id="g16732"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\timesignature.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(849.99998,-63.999998)">
-      <path
-         id="path52961"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.68045378;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -590.64703,394.71663 L -568.46504,371.86246" />
-      <text
-         xml:space="preserve"
-         id="text53848"
-         style="font-size:28.30521774px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-         transform="scale(1.1990521,0.8339921)"
-         y="479.10339"
-         x="-485.94577"><tspan
-           id="tspan53850"
-           y="479.10339"
-           x="-485.94577">4</tspan></text>
-      <text
-         xml:space="preserve"
-         id="text54737"
-         style="font-size:28.30520058px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-         transform="scale(1.1990521,0.8339921)"
-         y="459.57449"
-         x="-498.8335"><tspan
-           id="tspan54739"
-           y="459.57449"
-           x="-498.8335">4</tspan></text>
-    </g>
-    <rect
-       id="rect54748"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.73154"
-       x="297.34726"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g57494"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <g
-         id="g56568"
-         transform="translate(4.064981,5.555418)">
-        <g
-           id="g56560">
-          <rect
-             id="rect54762"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="460.12595"
-             ry="0"
-             height="72.622528"
-             width="10.422997" />
-          <rect
-             id="rect54764"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="473.64929"
-             height="72.622528"
-             width="2.5666234" />
-        </g>
-        <g
-           id="g56564"
-           transform="translate(0,-0.109804)">
-          <path
-             id="path55655"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-          <path
-             id="path55657"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-             transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        </g>
-      </g>
-      <g
-         id="g57487">
-        <path
-           id="path55661"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 440.47831,744.01169 L 515.5217,743.84996" />
-        <path
-           id="path55663"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,816.87437 L 515.5217,816.71263" />
-        <path
-           id="path55665"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,798.65871 L 515.52169,798.49697" />
-        <path
-           id="path55667"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,780.44305 L 515.52169,780.28131" />
-        <path
-           id="path55669"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,762.22737 L 515.5217,762.06564" />
-      </g>
-    </g>
-    <rect
-       id="rect61934"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="scale(-1,1)"
-       y="298.26956"
-       x="-388.11679"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g61936"
-       style="display:inline"
-       transform="matrix(-0.4620139,0,0,0.4620139,588.29285,-41.602207)">
-      <g
-         id="g61938"
-         transform="translate(4.064981,5.555418)">
-        <g
-           id="g61940">
-          <rect
-             id="rect61942"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="460.12595"
-             ry="0"
-             height="72.622528"
-             width="10.422997" />
-          <rect
-             id="rect61944"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="473.64929"
-             height="72.622528"
-             width="2.5666234" />
-        </g>
-        <g
-           id="g61946"
-           transform="translate(0,-0.109804)">
-          <path
-             id="path61948"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-          <path
-             id="path61950"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-             transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        </g>
-      </g>
-      <g
-         id="g61952">
-        <path
-           id="path61954"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 440.47831,744.01169 L 515.5217,743.84996" />
-        <path
-           id="path61956"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,816.87437 L 515.5217,816.71263" />
-        <path
-           id="path61958"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,798.65871 L 515.52169,798.49697" />
-        <path
-           id="path61960"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,780.44305 L 515.52169,780.28131" />
-        <path
-           id="path61962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,762.22737 L 515.5217,762.06564" />
-      </g>
-    </g>
-    <rect
-       id="rect2795"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="297.34549"
-       x="395.29428"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g2826"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path2799"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 656.00001,803.12549 L 724.00001,803.12549" />
-      <path
-         id="path2801"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(311,114.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path2803"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 686.85853,802.26143 L 686.85853,741.48955" />
-      <path
-         id="path2805"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 656.00001,782.62549 L 724.00001,782.62549" />
-    </g>
-    <rect
-       id="rect2811"
-       style="opacity:0;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="296.91403"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\chord.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       id="g2829"
-       style="display:inline"
-       transform="matrix(0.4620139,0,0,0.4620139,432.20283,-140.79809)">
-      <path
-         id="path2831"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 29.00003,909.12551 L 97.00003,909.12551" />
-      <path
-         id="path2833"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="translate(-316,220.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path2835"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 29.00003,888.62551 L 97.00003,888.62551" />
-    </g>
-    <g
-       id="g16721"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\chord.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(849.99998,-63.999998)">
-      <text
-         xml:space="preserve"
-         id="text6554"
-         style="font-size:33.25069046px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-         transform="scale(0.9879705,1.012176)"
-         y="389.72214"
-         x="-392.5192"><tspan
-           id="tspan6556"
-           y="389.72214"
-           x="-392.5192">7</tspan></text>
-      <text
-         xml:space="preserve"
-         id="text6567"
-         style="font-size:31.83207703px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-         transform="scale(1.0055344,0.9944961)"
-         y="395.96545"
-         x="-405.44424"><tspan
-           id="tspan6569"
-           y="395.96545"
-           x="-405.44424">G</tspan></text>
-    </g>
-    <path
-       id="path6599"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 109.94912,280.07177 L 141.36612,280.07177" />
-    <path
-       id="path6601"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.84805799;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       d="M 124.04047,271.1779 C 124.04047,273.53817 121.7134,275.45154 118.84281,275.45154 C 115.97222,275.45154 113.64515,273.53817 113.64515,271.1779 C 113.64515,268.81764 115.97222,266.90426 118.84281,266.90426 C 121.7134,266.90426 124.04047,268.81764 124.04047,271.1779 z " />
-    <path
-       id="path6603"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.42819726;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 124.20621,270.06859 L 124.20621,251.30528" />
-    <path
-       id="path6605"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 109.94912,270.60047 L 141.36612,270.60047" />
-    <path
-       id="path6613"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.75689816;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 123.72752,273.79496 C 132.43241,281.53816 140.30826,273.79496 140.30826,273.79496 L 140.30826,273.79496" />
-    <g
-       id="g7524"
-       transform="matrix(0.4620139,0,0,0.4620139,-96.715983,-138.41685)">
-      <path
-         id="path7504"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 585.0017,844.15855 C 602.49482,844.62917 602.91034,855.96653 602.92,869.91032 C 598.16937,855.2754 600.30365,852.13282 585.05395,852.1641 C 584.96681,840.1224 585.07508,856.20106 585.0017,844.15855 z " />
-      <path
-         id="path7506"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 552.34524,905.79099 L 620.34524,905.79099" />
-      <path
-         id="path7508"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(207.3452,216.9288)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path7510"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 583.20376,904.92693 L 583.20376,844.15505" />
-      <path
-         id="path7512"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 552.34524,885.29099 L 620.34524,885.29099" />
-      <path
-         id="path7514"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 584.86442,854.36228 C 602.35754,854.8329 602.77306,866.17026 602.78272,880.11405 C 598.03209,865.47913 600.16637,862.33655 584.91667,862.36783 C 584.82953,850.32613 584.9378,866.40479 584.86442,854.36228 z " />
-      <path
-         id="path7522"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 584.74905,864.74215 C 602.24217,865.21277 602.65769,876.55013 602.66735,890.49392 C 597.91672,875.859 600.051,872.71642 584.8013,872.7477 C 584.71416,860.706 584.82243,876.78466 584.74905,864.74215 z " />
-    </g>
-    <text
-       xml:space="preserve"
-       id="text7535"
-       style="font-size:43.93042374px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       y="284.18216"
-       x="209.71799"><tspan
-         id="tspan7537"
-         y="284.18216"
-         x="209.71799">X</tspan></text>
-    <rect
-       id="rect3132"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="247.76437"
-       x="441.0032"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect3703"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="147.76259"
-       x="394.47055"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g7499"
-       transform="matrix(0.4373357,0,0,0.4683741,65.447487,-49.039827)">
-      <g
-         id="g7361"
-         style="display:inline"
-         transform="matrix(0.518198,0.328578,-0.328578,0.518198,562.3445,-50.07558)">
-        <path
-           id="path7363"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-        <path
-           id="path7365"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 798.11196,486.32746 L 798.11196,425.55558" />
-        <path
-           id="path7367"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-        <path
-           id="path7369"
-           style="fill:url(#radialGradient24225);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-           d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      </g>
-      <path
-         id="rect3745"
-         style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.945538,0.325513,0,1,0,0)"
-         d="M 822.72691,174.61087 L 889.276,169.13496 L 889.276,199.72689 L 823.4895,199.72689 L 822.72691,174.61087 z " />
-      <path
-         id="rect3739"
-         style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.945538,0.325513,0,1,0,0)"
-         d="M 800.22229,188.70871 L 866.00876,188.70871 L 866.00876,219.30063 L 800.49191,214.62408 L 800.22229,188.70871 z " />
-      <rect
-         id="rect3741"
-         style="opacity:1;color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.882353,-0.470588,0,1,0,0)"
-         y="907.16882"
-         x="927.44476"
-         height="30.591925"
-         width="26.003122" />
-      <path
-         id="rect3743"
-         style="color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.701289,-0.712877,0.945817,0.324701,0,0)"
-         d="M -198.67545,947.41547 L -177.04075,950.94075 L -171.02987,1011.6918 L -199.05916,1012.7404 L -198.67545,947.41547 z " />
-      <path
-         id="rect3753"
-         style="color:#000000;fill:url(#linearGradient24227);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 788.37444,442.41233 C 790.98554,441.49944 800.28366,439.76223 810.12708,450.22181 C 809.39758,451.00304 806.96255,454.45726 805.25704,455.95851 C 798.77005,448.84021 786.55315,444.31821 781.43076,448.7918 C 782.36313,447.56946 787.21848,443.63946 788.37444,442.41233 z " />
-      <g
-         id="g7353"
-         transform="matrix(0.996519,0,0,0.996519,3.974373,5.043832)">
-        <path
-           id="path4656"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-        <path
-           id="path4662"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 798.11196,486.32746 L 798.11196,425.55558" />
-        <path
-           id="path4666"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-        <path
-           id="path4660"
-           style="fill:url(#radialGradient24229);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-           d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      </g>
-    </g>
-    <rect
-       id="rect23627"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.17255"
-       x="104.5211"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23629"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="152.85513"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23631"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="200.99265"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23633"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="249.13016"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23635"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="297.26773"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23637"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="345.40518"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23639"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="393.54269"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23685"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect4189"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.92548"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g4191"
-       transform="matrix(0.8455204,0,0,0.7937234,6.5663167,-153.69652)">
-      <path
-         id="path4193"
-         style="color:#000000;fill:url(#radialGradient4540);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4542);stroke-width:19.88428688;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.253681,-2.501311e-2,2.459378e-2,0.246667,229.9229,877.6432)"
-         d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-      <path
-         id="path4195"
-         style="color:#000000;fill:url(#radialGradient4544);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4546);stroke-width:24.22555733;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(7.590656e-2,-7.48444e-3,8.865423e-3,8.891693e-2,402.9419,934.5995)"
-         d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-      <path
-         id="path4198"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,281.3689,848.9056)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4200"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,302.3878,837.0276)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4202"
-         style="color:#000000;fill:#000000;fill-opacity:0.44495413;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,325.3773,845.8586)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4204"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,275.7409,869.832)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4206"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,332.8209,863.8999)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4208"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,326.1424,885.6138)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4210"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,287.9716,890.5937)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4212"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4548);stroke-width:3.50856757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 451.50995,943.25668 C 435.78414,960.38604 437.18199,983.78233 452.90778,996.73372" />
-      <path
-         id="path4214"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4550);stroke-width:2.95746279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 468.42158,952.25773 C 454.79821,963.2013 456.00919,978.14862 469.63254,986.42309" />
-      <path
-         id="path4216"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4552);stroke-width:3.47961354;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 505.32732,943.2543 C 520.79326,960.38517 519.4185,983.78352 503.95255,996.73612" />
-      <path
-         id="path4218"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4554);stroke-width:2.96080017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 488.70524,951.88864 C 502.07067,963.06859 500.88263,978.33881 487.51722,986.79199" />
-      <path
-         id="path4220"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 465.49828,937.54255 C 475.04316,934.00456 478.02606,940.68448 481.42441,949.00956 C 475.30206,941.30677 475.6879,938.96409 467.47456,942.31203 C 464.4973,935.13979 468.46833,944.71828 465.49828,937.54255 z " />
-      <path
-         id="path4222"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(0.539089,-0.218317,0.243345,0.597197,109.4028,645.3595)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path4224"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.31586146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 479.31673,974.22578 L 464.52817,937.93298" />
-      <path
-         id="path4226"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 467.90731,943.66616 C 477.45219,940.12817 480.43507,946.80809 483.83344,955.13317 C 477.71109,947.43038 478.09693,945.08769 469.88359,948.43564 C 466.90632,941.2634 470.87734,950.8419 467.90731,943.66616 z " />
-      <path
-         id="path4228"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 470.37101,949.89018 C 479.91589,946.35219 482.89878,953.03211 486.29715,961.3572 C 480.1748,953.6544 480.56062,951.31171 472.34729,954.65967 C 469.37002,947.48741 473.34105,957.06591 470.37101,949.89018 z " />
-      <path
-         id="path4230"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 505.72899,950.50171 C 520.25906,957.10155 515.96029,967.3979 510.25127,979.88426 C 512.25344,965.10468 515.33826,963.04516 502.49058,957.68701 C 507.35452,946.87609 500.85315,961.30851 505.72899,950.50171 z " />
-      <path
-         id="path4232"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(0.841647,0.353197,-0.410015,0.895235,445.2498,255.6813)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path4234"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.58397031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 479.29983,1004.2686 L 504.21719,949.86355" />
-    </g>
-    <rect
-       id="rect4236"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.43713"
-       x="104.5211"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\tempoicon.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       id="rect4248"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.63367"
-       x="393.54269"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\edit_mode_selection.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       id="rect4250"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.63367"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g16749"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\tempoicon.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(849.99998,-63.999998)">
-      <path
-         id="path4256"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.84805679;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M -728.72109,529.74258 C -728.72109,532.10284 -731.04817,534.01621 -733.91875,534.01621 C -736.78934,534.01621 -739.11641,532.10284 -739.11641,529.74258 C -739.11641,527.38232 -736.78934,525.46895 -733.91875,525.46895 C -731.04817,525.46895 -728.72109,527.38232 -728.72109,529.74258 z " />
-      <path
-         id="path4258"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.74707758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M -728.6706,529.70396 L -728.6706,501.62649" />
-      <g
-         transform="translate(5.6568542,-1.4142136)"
-         id="g16745">
-        <path
-           d="M -729.88064,528.4216 L -719.96388,528.4216"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11852527;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4254" />
-        <path
-           d="M -729.88064,521.49842 L -719.96388,521.49842"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11852527;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path4260" />
-      </g>
-    </g>
-    <g
-       id="g2988"
-       transform="matrix(0.5633612,0,0,0.5633612,94.016587,27.970368)">
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path4570"
-         d="M 48.485517,575.51074 C 47.057601,575.53345 40.824521,575.50157 39.272311,589.79823 L 35.150004,589.79823 L 35.150004,592.07556 L 39.134654,592.07556 C 38.761213,596.18447 35.172599,613.87811 32.848466,613.95576 C 30.453707,614.03577 33.091056,614.04051 33.113086,611.43574 C 33.135117,608.83094 29.615875,608.89369 29.548583,611.44041 C 29.479763,614.04493 29.820497,616.0356 34.173133,616.00346 C 38.572698,615.97098 41.807204,603.64647 43.628053,592.07556 L 47.598261,592.07556 L 47.598261,589.79823 L 44.047779,589.79823 C 45.171812,581.85589 47.016459,577.23072 49.112651,577.21692 C 51.182106,577.20312 51.941425,580.65289 50.411982,580.16323 C 48.247364,579.4702 48.029551,584.05353 50.349925,584.13071 C 52.709916,584.20789 52.77139,580.31354 52.266111,578.31047 C 51.75305,576.27654 49.913433,575.48802 48.485517,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2984"
-         d="M 62.485517,575.51074 C 61.057601,575.53345 54.824521,575.50157 53.272311,589.79823 L 49.150004,589.79823 L 49.150004,592.07556 L 53.134654,592.07556 C 52.761213,596.18447 49.172599,613.87811 46.848466,613.95576 C 44.453707,614.03577 47.091056,614.04051 47.113086,611.43574 C 47.135117,608.83094 43.615875,608.89369 43.548583,611.44041 C 43.479763,614.04493 43.820497,616.0356 48.173133,616.00346 C 52.572698,615.97098 55.807204,603.64647 57.628053,592.07556 L 61.598261,592.07556 L 61.598261,589.79823 L 58.047779,589.79823 C 59.171812,581.85589 61.016459,577.23072 63.112651,577.21692 C 65.182106,577.20312 65.941425,580.65289 64.411982,580.16323 C 62.247364,579.4702 62.029551,584.05353 64.349925,584.13071 C 66.709916,584.20789 66.77139,580.31354 66.266111,578.31047 C 65.75305,576.27654 63.913433,575.48802 62.485517,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2986"
-         d="M 76.485517,575.51074 C 75.057601,575.53345 68.824521,575.50157 67.272311,589.79823 L 63.150004,589.79823 L 63.150004,592.07556 L 67.134654,592.07556 C 66.761213,596.18447 63.172599,613.87811 60.848466,613.95576 C 58.453707,614.03577 61.091056,614.04051 61.113086,611.43574 C 61.135117,608.83094 57.615875,608.89369 57.548583,611.44041 C 57.479763,614.04493 57.820497,616.0356 62.173133,616.00346 C 66.572698,615.97098 69.807204,603.64647 71.628053,592.07556 L 75.598261,592.07556 L 75.598261,589.79823 L 72.047779,589.79823 C 73.171812,581.85589 75.016459,577.23072 77.112651,577.21692 C 79.182106,577.20312 79.941429,580.65289 78.411982,580.16323 C 76.247364,579.4702 76.029551,584.05353 78.349925,584.13071 C 80.709919,584.20789 80.771389,580.31354 80.266109,578.31047 C 79.753049,576.27654 77.913433,575.48802 76.485517,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <g
-       id="g3012"
-       transform="matrix(0.5633612,0,0,0.5633612,98.523477,27.970368)">
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2995"
-         d="M 136.48552,575.51074 C 135.0576,575.53345 128.82452,575.50157 127.27231,589.79823 L 123.15,589.79823 L 123.15,592.07556 L 127.13465,592.07556 C 126.76121,596.18447 123.1726,613.87811 120.84847,613.95576 C 118.45371,614.03577 121.09106,614.04051 121.11309,611.43574 C 121.13512,608.83094 117.61588,608.89369 117.54858,611.44041 C 117.47976,614.04493 117.8205,616.0356 122.17313,616.00346 C 126.5727,615.97098 129.8072,603.64647 131.62805,592.07556 L 135.59826,592.07556 L 135.59826,589.79823 L 132.04778,589.79823 C 133.17181,581.85589 135.01646,577.23072 137.11265,577.21692 C 139.18211,577.20312 139.94143,580.65289 138.41198,580.16323 C 136.24736,579.4702 136.02955,584.05353 138.34992,584.13071 C 140.70992,584.20789 140.77139,580.31354 140.26611,578.31047 C 139.75305,576.27654 137.91343,575.48802 136.48552,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2997"
-         d="M 150.48552,575.51074 C 149.0576,575.53345 142.82452,575.50157 141.27231,589.79823 L 137.15,589.79823 L 137.15,592.07556 L 141.13465,592.07556 C 140.76121,596.18447 137.1726,613.87811 134.84847,613.95576 C 132.45371,614.03577 135.09106,614.04051 135.11309,611.43574 C 135.13512,608.83094 131.61588,608.89369 131.54858,611.44041 C 131.47976,614.04493 131.8205,616.0356 136.17313,616.00346 C 140.5727,615.97098 143.8072,603.64647 145.62805,592.07556 L 149.59826,592.07556 L 149.59826,589.79823 L 146.04778,589.79823 C 147.17181,581.85589 149.01646,577.23072 151.11265,577.21692 C 153.18211,577.20312 153.94142,580.65289 152.41198,580.16323 C 150.24736,579.4702 150.02955,584.05353 152.34992,584.13071 C 154.70992,584.20789 154.77139,580.31354 154.26611,578.31047 C 153.75305,576.27654 151.91343,575.48802 150.48552,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 229.49687,352.191 C 228.69245,352.20379 225.18097,352.18583 224.30651,360.24001 L 221.98416,360.24001 L 221.98416,361.52298 L 224.22896,361.52298 C 224.01858,363.83778 221.9969,373.8057 220.68757,373.84944 C 219.33845,373.89451 220.82423,373.89719 220.83664,372.42975 C 220.84906,370.96232 218.86645,370.99766 218.82854,372.43239 C 218.78977,373.89968 218.98172,375.02114 221.43383,375.00303 C 223.91238,374.98474 225.73457,368.04158 226.76037,361.52298 L 228.99703,361.52298 L 228.99703,360.24001 L 226.99683,360.24001 C 227.63007,355.76561 228.66927,353.15997 229.85018,353.15219 C 231.01603,353.14442 231.4438,355.08789 230.58218,354.81203 C 229.36271,354.4216 229.24001,357.00368 230.54721,357.04715 C 231.87674,357.09064 231.91138,354.89671 231.62672,353.76825 C 231.33768,352.62241 230.30131,352.1782 229.49687,352.191 z "
-       id="path3005"
-       sodipodi:nodetypes="cccccszzzcccczszzz" />
-    <path
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 279.07269,352.191 C 278.26826,352.20379 274.75678,352.18583 273.88232,360.24001 L 271.55998,360.24001 L 271.55998,361.52298 L 273.80477,361.52298 C 273.59439,363.83778 271.57271,373.8057 270.26339,373.84944 C 268.91427,373.89451 270.40005,373.89719 270.41246,372.42975 C 270.42487,370.96232 268.44226,370.99766 268.40435,372.43239 C 268.36558,373.89968 268.55754,375.02114 271.00964,375.00303 C 273.4882,374.98474 275.31039,368.04158 276.33618,361.52298 L 278.57285,361.52298 L 278.57285,360.24001 L 276.57264,360.24001 C 277.20588,355.76561 278.24508,353.15997 279.426,353.15219 C 280.59185,353.14442 281.01961,355.08789 280.15799,354.81203 C 278.93853,354.4216 278.81582,357.00368 280.12303,357.04715 C 281.45256,357.09064 281.48719,354.89671 281.20254,353.76825 C 280.9135,352.62241 279.87713,352.1782 279.07269,352.191 z "
-       id="path3019"
-       sodipodi:nodetypes="cccccszzzcccczszzz" />
-    <text
-       xml:space="preserve"
-       style="font-size:16.14900208px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="343.08582"
-       y="342.56519"
-       id="text3036"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3038"
-         x="343.08582"
-         y="342.56519"
-         style="font-size:16.14901543px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">m</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.14931297px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="395.86255"
-       y="342.57013"
-       id="text3044"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3046"
-         x="395.86255"
-         y="342.57013"
-         style="font-size:16.14933777px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">mp</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.14957619px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="445.04129"
-       y="342.5744"
-       id="text3048"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3050"
-         x="445.04129"
-         y="342.5744"
-         style="font-size:16.14960098px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">ppp</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.14987183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="500.21811"
-       y="342.5791"
-       id="text3052"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3054"
-         x="500.21811"
-         y="342.5791"
-         style="font-size:16.14989853px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">pp</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.15017509px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="555.39612"
-       y="342.58392"
-       id="text3056"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3058"
-         x="555.39612"
-         y="342.58392"
-         style="font-size:16.1502018px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">p</tspan></text>
-    <path
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       d="M 134.6265,410.19998 L 118.81885,420.77364 L 118.81885,416.97306 L 129.21871,410.19998 L 118.81885,403.49058 L 118.81885,399.69 L 134.6265,410.19998 z "
-       id="text3060"
-       sodipodi:nodetypes="ccccccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:30.45602417px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       x="186.68878"
-       y="468.9649"
-       id="text3065"
-       transform="scale(1.1209993,0.8920612)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3067"
-         x="186.68878"
-         y="468.9649">()</tspan></text>
-    <path
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       d="M 165.0145,410.19998 L 180.82214,420.77364 L 180.82214,416.97306 L 170.4223,410.19998 L 180.82214,403.49058 L 180.82214,399.69 L 165.0145,410.19998 z "
-       id="path3069"
-       sodipodi:nodetypes="ccccccc" />
-    <g
-       id="g3104"
-       transform="matrix(0.5633612,0,0,0.5633612,94.016587,27.970368)">
-      <path
-         id="path3073"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 312.30593,647.99065 C 323.97335,648.37311 324.2505,657.58689 324.25694,668.9189 C 321.0884,657.02522 322.5119,654.47127 312.34078,654.4967 C 312.28266,644.71049 312.35487,657.77749 312.30593,647.99065 z " />
-      <path
-         id="path3077"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.8136487;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M 310.92742,694.2856 C 310.92742,698.0754 307.56802,701.14764 303.42398,701.14764 C 299.27995,701.14764 295.92055,698.0754 295.92055,694.2856 C 295.92055,690.49579 299.27995,687.42354 303.42398,687.42354 C 307.56802,687.42354 310.92742,690.49579 310.92742,694.2856 z " />
-      <path
-         id="path3075"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.83327127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 293.82309,681.8583 L 327.47426,657.4004" />
-      <path
-         id="path3079"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.65990877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 311.16655,693.08823 L 311.16655,648.00504" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:34.65638351px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       x="-414.60809"
-       y="337.56183"
-       id="text3110"
-       transform="matrix(0,-1.024355,0.976224,0,0,0)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3112"
-         x="-414.60809"
-         y="337.56183">)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:15.52974701px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="331.20074"
-       y="380.70523"
-       id="text3114"
-       transform="scale(0.9278539,1.0777559)"><tspan
-         sodipodi:role="line"
-         id="tspan3116"
-         x="331.20074"
-         y="380.70523">HO</tspan></text>
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 367.82984,407.43075 L 375.7702,415.72262 L 367.82984,423.56851 L 359.48734,415.72262 L 367.82984,407.43075 z "
-       id="rect3126"
-       sodipodi:nodetypes="ccccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:14.66517448px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="401.82806"
-       y="361.38586"
-       id="text3133"
-       transform="scale(0.8879582,1.1261792)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3135"
-         x="401.82806"
-         y="361.38586"
-         style="font-size:14.66517448px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">NH</tspan></text>
-    <path
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       d="M 416.54259,399.29957 L 406.74589,420.03662 L 408.54392,420.03662 L 414.57313,408.35804 L 420.05098,420.03662 L 426.28028,420.03662 L 416.54259,399.29957 z "
-       id="path3141"
-       sodipodi:nodetypes="ccccccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:21.2996788px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="570.43744"
-       y="328.33853"
-       id="text3143"
-       transform="scale(0.7835739,1.2762038)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3145"
-         x="570.43744"
-         y="328.33853"
-         style="font-size:21.2996788px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P.M</tspan></text>
-    <rect
-       id="rect3147"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54208785;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.63367"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_left.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3149"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.29358"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_right.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3151"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.52423"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_up.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3153"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.52423"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_down.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3155"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="342.13184"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_bend.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3157"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="342.13184"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3159"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="387.0224"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_vibrato.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3161"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="387.0224"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3163"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.26968"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slide.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3165"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.26968"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3167"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="294.5206"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3169"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="294.5206"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3171"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="148.96628"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_picking.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3173"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="148.96628"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3175"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.29816"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3177"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.29816"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <g
-       id="g4068"
-       transform="matrix(0.6801604,0,0,0.6801604,92.878547,36.861792)">
-      <path
-         sodipodi:nodetypes="cc"
-         id="path3179"
-         d="M 594.00003,497.36216 C 617.85953,497.555 627.69114,488.66969 628.00003,460.36216"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="matrix(0.749399,0,0,0.807087,168.8359,92.77775)"
-         d="M 622.22856,466.26925 L 611.6474,466.26925 L 601.06624,466.26925 L 606.35682,457.1057 L 611.6474,447.94215 L 616.93798,457.1057 L 622.22856,466.26925 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.5707963"
-         sodipodi:arg1="0.52359878"
-         sodipodi:r2="6.1090355"
-         sodipodi:r1="12.218071"
-         sodipodi:cy="460.16022"
-         sodipodi:cx="611.6474"
-         sodipodi:sides="3"
-         id="path4066"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="star" />
-    </g>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.44790959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 549.9004,372.99053 L 566.96245,356.41925"
-       id="path4072"
-       sodipodi:nodetypes="cc" />
-    <g
-       id="g5882"
-       transform="matrix(1.0269525,0,0,0.9790352,-142.70822,-105.10055)">
-      <path
-         sodipodi:nodetypes="cc"
-         id="path4074"
-         d="M 674.43107,471.32979 L 691.12154,488.11001"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.94400001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="469.35751"
-         x="672.41663"
-         height="6"
-         width="6"
-         id="rect4961"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="469.35751"
-         x="687.11115"
-         height="6"
-         width="6"
-         id="rect4963"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="483.72479"
-         x="687.11115"
-         height="6"
-         width="6"
-         id="rect4965"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="483.72479"
-         x="672.41663"
-         height="6"
-         width="6"
-         id="rect4967"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:23.50349617px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="485.84433"
-       y="333.74701"
-       id="text5893"
-       transform="scale(1.0327709,0.9682689)"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-       inkscape:export-xdpi="71.751251"
-       inkscape:export-ydpi="71.751251"><tspan
-         sodipodi:role="line"
-         id="tspan5895"
-         x="485.84433"
-         y="333.74701"
-         style="font-size:23.50349617px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:31.86540413px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="527.66418"
-       y="335.72772"
-       id="text5897"
-       transform="scale(1.0413973,0.9602483)"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-       inkscape:export-xdpi="61.67075"
-       inkscape:export-ydpi="61.67075"><tspan
-         sodipodi:role="line"
-         id="tspan5899"
-         x="527.66418"
-         y="335.72772"
-         style="font-size:31.86540413px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">s</tspan></text>
-    <g
-       id="g5911"
-       transform="matrix(0.9778313,0,0,1.3442636,-87.783773,-189.18239)">
-      <text
-         transform="scale(0.902157,1.108454)"
-         id="text5901"
-         y="312.95807"
-         x="662.24274"
-         style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-         xml:space="preserve"><tspan
-           y="312.95807"
-           x="662.24274"
-           id="tspan5903"
-           sodipodi:role="line">1</tspan></text>
-      <text
-         transform="scale(0.902157,1.108454)"
-         id="text5905"
-         y="312.87729"
-         x="682.92804"
-         style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-         xml:space="preserve"><tspan
-           y="312.87729"
-           x="682.92804"
-           id="tspan5907"
-           sodipodi:role="line">3</tspan></text>
-      <path
-         id="path5909"
-         d="M 605.35606,346.58166 L 615.29346,336.53376"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.20514083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <g
-       id="g5948"
-       transform="matrix(0.6801604,0,0,0.6801604,92.878547,36.861792)">
-      <g
-         transform="matrix(0.83334,0,0,1,120.4233,-6.810365)"
-         id="g5932">
-        <path
-           d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path5922" />
-        <path
-           d="M 683.05261,356.83776 L 683.05261,326.03045"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path5924" />
-      </g>
-      <path
-         transform="translate(0.645704,6.4635e-2)"
-         d="M 684.625 362.17465 A 2.0625 2.0625 0 1 1  680.5,362.17465 A 2.0625 2.0625 0 1 1  684.625 362.17465 z"
-         sodipodi:ry="2.0625"
-         sodipodi:rx="2.0625"
-         sodipodi:cy="362.17465"
-         sodipodi:cx="682.5625"
-         id="path5936"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.44400001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:25.10733032px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="452.36047"
-       y="250.97691"
-       id="text5954"
-       transform="scale(1.1044258,0.9054479)"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-       inkscape:export-xdpi="68.070755"
-       inkscape:export-ydpi="68.070755"><tspan
-         sodipodi:role="line"
-         id="tspan5956"
-         x="452.36047"
-         y="250.97691"
-         style="font-size:25.10733032px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">T</tspan></text>
-    <g
-       id="g6849"
-       transform="matrix(0.8038258,0,0,0.8952428,8.6184267,-25.377783)">
-      <path
-         sodipodi:nodetypes="ccc"
-         id="path5958"
-         d="M 667.00003,271.36215 L 683.00003,284.86215 L 698.00003,271.36215"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <text
-         sodipodi:linespacing="125%"
-         transform="scale(1.077771,0.927841)"
-         id="text6845"
-         y="293.27463"
-         x="627.5741"
-         style="font-size:17.07377625px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-         xml:space="preserve"><tspan
-           y="293.27463"
-           x="627.5741"
-           id="tspan6847"
-           sodipodi:role="line">X</tspan></text>
-    </g>
-    <g
-       id="g6860"
-       transform="matrix(0.6037383,0,0,0.7722113,145.67626,19.685128)">
-      <rect
-         transform="matrix(0.880153,-0.474689,0,1,0,0)"
-         y="507.96887"
-         x="671.18982"
-         height="5.25"
-         width="25.279688"
-         id="rect6854"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         transform="matrix(0.880153,-0.474689,0,1,0,0)"
-         y="515.96887"
-         x="671.18945"
-         height="5.25"
-         width="25.279675"
-         id="rect6856"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         transform="matrix(0.880153,-0.474689,0,1,0,0)"
-         y="523.96887"
-         x="671.18945"
-         height="5.25"
-         width="25.279675"
-         id="rect6858"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:11.30146599px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="554.96161"
-       y="173.9628"
-       id="text6865"
-       sodipodi:linespacing="125%"
-       transform="matrix(0.9705969,0,3.6240001e-2,1.0302939,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan6867"
-         x="554.96161"
-         y="173.9628"
-         style="font-size:30.13725471px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Vivaldi">tr</tspan></text>
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 499.14904,409.23966 C 499.14904,409.23966 503.10919,403.91788 505.09545,406.7731 C 506.77868,409.19273 507.2044,410.42046 508.34068,410.09152 C 509.45783,409.76811 510.19933,405.92246 513.65472,405.9502 C 516.22932,405.97125 515.73893,410.62861 519.95582,411.5253 C 518.46198,412.69577 515.8624,412.79055 514.47433,412.04608 C 513.15991,411.34111 512.59281,408.68166 511.12865,409.3599 C 509.70073,410.02135 509.44825,412.4489 506.56495,412.39759 C 503.73012,412.34628 503.85063,410.76014 502.29959,409.20068 C 500.7248,407.61732 499.14904,409.23966 499.14904,409.23966 z "
-       id="path6878"
-       sodipodi:nodetypes="cszscszzzc" />
-    <g
-       id="g21770"
-       transform="matrix(0.6801604,0,0,0.6801604,92.878547,36.861792)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\edit_mode_selection.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51">
-      <text
-         sodipodi:linespacing="125%"
-         transform="matrix(0,-1.06756,0.936716,0,0,0)"
-         id="text21766"
-         y="508.78696"
-         x="-580.42908"
-         style="font-size:44.71162415px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-         xml:space="preserve"><tspan
-           y="508.78696"
-           x="-580.42908"
-           id="tspan21768"
-           sodipodi:role="line">)</tspan></text>
-      <g
-         transform="translate(2.828427,-2.65165)"
-         id="g21749">
-        <g
-           id="g16378"
-           transform="matrix(0.83334,0,0,1.26493,-81.035,178.0078)">
-          <path
-             id="path16380"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z " />
-          <path
-             id="path16382"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-             d="M 683.05261,356.83776 L 683.05261,326.03045" />
-        </g>
-        <g
-           id="g15477"
-           transform="matrix(0.289054,1.22178,-1.331968,1.944028e-2,1154.889,24.19248)"
-           style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-          <path
-             id="path12800"
-             d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-             style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="ccccccsccccsc" />
-          <path
-             transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-             style="fill:url(#linearGradient21760);fill-opacity:1;stroke-width:1.00046873"
-             d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-             id="rect14581"
-             sodipodi:nodetypes="ccccc" />
-        </g>
-        <path
-           sodipodi:type="arc"
-           style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path16432"
-           sodipodi:cx="449.8125"
-           sodipodi:cy="637.17468"
-           sodipodi:rx="4.3707523"
-           sodipodi:ry="4.0625"
-           d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-           transform="matrix(0.819316,0.899502,-0.550332,0.501274,431.3845,-87.32081)" />
-        <path
-           style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 484.50072,592.19035 L 477.27498,598.81948 L 478.13677,604.94037 L 479.88494,606.41213 L 478.88807,599.72546 L 484.41233,593.98021 L 484.50072,592.19035 z "
-           id="path16435"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 491.96404,614.17206 C 487.52149,616.98813 481.99224,615.61946 480.03711,615.85633 C 478.33,616.06315 476.50158,617.62409 476.50158,617.62409 L 476.3248,615.10502 L 478.79969,613.73501 C 478.79969,613.73501 480.86422,613.06577 485.56139,613.46984 C 489.14203,613.77787 492.60171,611.64036 493.64891,609.31558 L 495.85862,604.41003 C 495.35966,607.74069 493.83974,612.98308 491.96404,614.17206 z "
-           id="path17322"
-           sodipodi:nodetypes="cscccsscs" />
-      </g>
-      <text
-         inkscape:transform-center-x="11"
-         inkscape:transform-center-y="-10.103847"
-         transform="matrix(0.717341,-0.596996,0.540854,0.94392,0,0)"
-         sodipodi:linespacing="100%"
-         id="text21762"
-         y="709.63062"
-         x="105.70007"
-         style="font-size:14.4750843px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-         xml:space="preserve"><tspan
-           style="font-size:14.47510719px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook"
-           y="709.63062"
-           x="105.70007"
-           id="tspan21764"
-           sodipodi:role="line">pp</tspan></text>
-    </g>
-    <g
-       id="g3407"
-       transform="matrix(9.7000401e-2,8.1066758e-3,-1.1753914e-2,0.1240388,298.45948,558.24877)">
-      <g
-         id="g3296"
-         transform="matrix(3.608871,12.53273,-16.62977,0.199414,8930.251,-5616.342)"
-         style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path3298"
-           d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-           style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:nodetypes="ccccccsccccsc" />
-        <path
-           transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-           style="fill:url(#linearGradient3382);fill-opacity:1;stroke-width:1.00046873"
-           d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-           id="path3300"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path3302"
-         sodipodi:cx="449.8125"
-         sodipodi:cy="637.17468"
-         sodipodi:rx="4.3707523"
-         sodipodi:ry="4.0625"
-         d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-         transform="matrix(10.22925,9.226876,-6.870956,5.141948,-102.7821,-6760.219)" />
-      <path
-         style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:2.26335382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 560.37978,210.04348 L 470.16563,278.04351 L 480.92517,340.83013 L 502.75126,355.92709 L 490.30523,287.33683 L 559.27623,228.40344 L 560.37978,210.04348 z "
-         id="path3304"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.39503074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 653.56016,435.52659 C 598.09443,464.41316 529.06114,450.37367 504.65112,452.80343 C 483.33767,454.92494 460.50964,470.93669 460.50964,470.93669 L 458.30252,445.09667 L 489.2018,431.04344 C 489.2018,431.04344 514.97768,424.17853 573.62237,428.32339 C 618.32705,431.48308 661.52154,409.55702 674.59594,385.70998 L 702.18442,335.39003 C 695.95484,369.55514 676.97848,423.33032 653.56016,435.52659 z "
-         id="path3306"
-         sodipodi:nodetypes="cscccsscs" />
-    </g>
-    <g
-       id="g21483"
-       transform="matrix(0.6801604,0,0,0.6801604,97.639667,38.222112)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/option_skin.png"
-       inkscape:export-xdpi="54.250492"
-       inkscape:export-ydpi="54.250492">
-      <a
-         style="fill:url(#linearGradient21491);fill-opacity:1"
-         transform="matrix(1.0935538,0,0,0.9875559,-81.605798,-98.323313)"
-         id="a3635">
-        <path
-           style="fill:url(#linearGradient21493);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.40568686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 573.46809,989.25496 C 561.43446,918.49524 637.03499,915.96748 645.83589,919.79716 C 674.43146,931.00974 654.3464,985.51774 650.05535,987.75336 C 644.89956,990.4395 620.42002,988.48086 620.50756,989.43376 C 620.52581,989.44042 615.71426,1009.4048 598.77641,1009.9117 C 590.46857,1010.1603 574.46337,997.70295 573.46809,989.25496 z "
-           id="path3633"
-           sodipodi:nodetypes="ccscsc" />
-      </a>
-      <path
-         transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,425.79798,629.67088)"
-         d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-0.66417817"
-         sodipodi:arg1="-1.2924967"
-         sodipodi:r2="7.7217226"
-         sodipodi:r1="3.8608613"
-         sodipodi:cy="839.52301"
-         sodipodi:cx="566.39252"
-         sodipodi:sides="5"
-         id="path3644"
-         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#d22d2d;stroke-width:35.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,443.91514,614.48309)"
-         d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-0.66417817"
-         sodipodi:arg1="-1.2924967"
-         sodipodi:r2="7.7217226"
-         sodipodi:r1="3.8608613"
-         sodipodi:cy="839.52301"
-         sodipodi:cx="566.39252"
-         sodipodi:sides="5"
-         id="path3646"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#00a100;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.272574,1.2309989e-2,-1.2858322e-2,0.2609503,464.35714,598.38051)"
-         d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-0.66417817"
-         sodipodi:arg1="-1.2924967"
-         sodipodi:r2="7.7217226"
-         sodipodi:r1="3.8608613"
-         sodipodi:cy="839.52301"
-         sodipodi:cx="566.39252"
-         sodipodi:sides="5"
-         id="path3648"
-         style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4bff;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.1668918,0.1065936,-0.1502726,0.1897914,624.05104,651.11923)"
-         d="M 559.81399 897.85938 A 44.686672 47.620178 0 1 1  470.44065,897.85938 A 44.686672 47.620178 0 1 1  559.81399 897.85938 z"
-         sodipodi:ry="47.620178"
-         sodipodi:rx="44.686672"
-         sodipodi:cy="897.85938"
-         sodipodi:cx="515.12732"
-         id="path4681"
-         style="fill:#ffffff;fill-opacity:0.96703342;fill-rule:nonzero;stroke:#090303;stroke-width:8.73597431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98360656"
-         sodipodi:type="arc" />
-    </g>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 557.56346,455.06672 L 539.02909,455.06672"
-       id="path5612"
-       inkscape:connector-type="polyline" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 509.06904,455.06672 L 527.60341,455.06672"
-       id="path5617"
-       inkscape:connector-type="polyline" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 509.64684,499.7196 L 509.64684,518.25397"
-       id="path5619"
-       inkscape:connector-type="polyline" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 557.76819,500.87519 L 557.76819,482.34082"
-       id="path5621"
-       inkscape:connector-type="polyline" />
-    <g
-       id="g5456"
-       transform="matrix(0.6801604,0,0,0.6801604,92.397597,36.982022)">
-      <path
-         inkscape:connector-type="polyline"
-         id="path3479"
-         d="M 660.56485,524.48896 L 711.90839,524.46219"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.57923365px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <g
-         id="g5451">
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.78366613px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 658.18058,522.19705 L 658.18058,550.37123"
-           id="path3481"
-           inkscape:connector-type="polyline" />
-        <text
-           xml:space="preserve"
-           style="font-size:21.18201256px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           x="664.1015"
-           y="546.73944"
-           id="text3483"><tspan
-             sodipodi:role="line"
-             id="tspan3485"
-             x="664.1015"
-             y="546.73944">*</tspan></text>
-      </g>
-    </g>
-    <rect
-       id="rect3503"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="342.15051"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3505"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="387.04108"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3507"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.28836"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3509"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="294.53928"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3511"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="148.98497"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3513"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.31683"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <g
-       id="g4645"
-       transform="matrix(2.1169218e-2,0,0,-2.1169218e-2,598.752,175.85533)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_treble.png"
-       inkscape:export-xdpi="112.41393"
-       inkscape:export-ydpi="112.41393">
-      <path
-         id="path4647"
-         d="M 297,1245 C 303,1248 304,1248 310,1248 C 318,1247 323,1244 334,1232 C 406,1158 466,1026 481,914 C 483,896 483,854 481,835 C 470,732 427,638 328,503 L 314,484 L 322,461 C 341,406 363,339 377,290 C 381,278 384,268 384,267 C 384,267 391,267 398,266 C 433,263 463,255 494,240 C 519,227 541,212 562,192 C 585,169 600,148 614,119 C 635,77 644,33 643,-11 C 642,-39 638,-60 629,-86 C 617,-124 595,-159 565,-189 C 539,-215 515,-231 483,-244 L 471,-249 L 471,-285 C 471,-336 468,-396 464,-432 C 460,-469 450,-504 434,-536 C 392,-621 318,-666 235,-658 C 141,-649 65,-585 46,-499 C 37,-460 41,-430 57,-405 C 78,-372 118,-353 157,-354 C 203,-356 240,-392 247,-442 C 252,-482 235,-519 203,-539 C 185,-550 160,-555 141,-552 C 138,-552 135,-551 135,-552 L 147,-564 C 169,-586 194,-600 226,-607 C 233,-608 239,-608 255,-608 C 273,-608 275,-608 285,-606 C 299,-602 311,-597 322,-591 C 372,-561 406,-499 415,-424 C 418,-396 421,-336 421,-292 C 421,-263 421,-261 419,-261 C 415,-263 394,-265 379,-266 C 360,-267 328,-267 313,-265 C 254,-258 200,-238 153,-205 C 83,-156 33,-83 12,1 C -15,106 4,218 70,336 C 98,385 125,425 192,514 L 230,565 L 223,584 C 175,711 159,784 154,890 C 152,936 154,975 160,1007 C 175,1091 214,1166 275,1226 C 287,1238 292,1242 297,1245 z M 376,1074 C 366,1091 368,1090 359,1084 C 331,1067 302,1041 281,1015 C 238,960 214,896 211,827 C 210,799 213,781 226,738 C 236,703 264,618 266,616 C 266,615 272,622 278,631 C 347,730 384,811 398,892 C 401,913 403,930 404,954 C 405,1009 399,1036 376,1074 z M 290,401 C 284,420 278,435 278,435 C 277,435 235,379 217,354 C 158,271 122,204 101,138 C 87,97 81,59 79,17 C 79,-6 80,-20 84,-37 C 107,-126 202,-199 314,-215 C 331,-217 379,-217 400,-215 C 421,-212 419,-213 418,-204 C 412,-109 404,-51 388,35 C 382,71 365,147 364,148 C 363,149 344,147 333,144 C 319,141 310,138 298,132 C 233,99 214,24 255,-37 C 262,-47 280,-65 291,-72 C 295,-75 304,-81 310,-84 C 319,-89 321,-91 323,-95 C 331,-108 326,-124 311,-131 C 303,-135 297,-134 281,-126 C 242,-107 213,-81 192,-49 C 153,11 148,88 180,153 C 208,209 258,247 322,261 C 328,263 333,264 333,264 C 334,265 306,356 290,401 z M 426,143 C 423,143 420,144 419,144 L 416,145 L 421,124 C 444,23 461,-87 467,-180 C 468,-190 468,-198 468,-198 C 469,-198 482,-192 489,-187 C 506,-177 522,-162 535,-145 C 566,-104 577,-53 565,-1 C 556,41 532,80 498,107 C 477,123 449,137 426,143 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g4687"
-       transform="matrix(2.5582031e-2,0,0,-2.5582031e-2,597.33302,216.29795)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_bass.png"
-       inkscape:export-xdpi="88.486824"
-       inkscape:export-ydpi="88.486824">
-      <path
-         id="path4689"
-         d="M 207,266 C 218,267 261,266 277,265 C 402,251 487,189 515,91 C 522,64 525,44 524,10 C 524,-33 519,-69 505,-107 C 454,-258 305,-383 33,-503 C 22,-508 12,-513 11,-514 C 5,-518 -1,-519 -7,-516 C -12,-514 -14,-512 -16,-507 C -19,-502 -18,-497 -16,-493 C -14,-489 -10,-486 12,-473 C 101,-420 166,-373 221,-325 C 238,-309 270,-277 284,-261 C 345,-190 377,-121 388,-41 C 390,-22 390,23 388,42 C 384,71 377,98 368,122 C 361,138 359,143 351,156 C 322,205 278,232 229,232 C 181,232 141,205 115,154 C 111,146 101,120 101,119 C 101,118 105,119 109,119 C 132,120 157,111 176,96 C 212,65 222,15 200,-30 C 185,-63 153,-84 118,-87 C 69,-90 21,-58 5,-12 C 0,3 -1,18 1,42 C 10,142 74,227 162,256 C 177,261 192,264 207,266 z M 596,172 C 612,177 631,172 644,160 C 653,150 658,137 658,124 C 658,97 636,75 609,75 C 581,75 559,97 559,124 C 559,147 574,166 596,172 z M 596,-77 C 612,-72 631,-77 644,-89 C 656,-102 661,-120 656,-136 C 651,-159 632,-174 609,-174 C 581,-174 559,-152 559,-125 C 559,-102 574,-83 596,-77 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g4729"
-       transform="matrix(2.3963563e-2,0,0,-2.3963563e-2,597.45916,268.7724)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_alto.png"
-       inkscape:export-xdpi="92.514755"
-       inkscape:export-ydpi="92.514755">
-      <path
-         id="path4731"
-         d="M 9,498 C 12,500 18,500 72,500 L 132,500 L 135,497 C 137,495 139,493 140,491 C 142,487 142,450 142,0 C 142,-450 142,-487 140,-491 C 139,-493 137,-495 135,-497 L 132,-499 L 71,-499 L 10,-499 L 7,-497 C 5,-495 3,-493 2,-491 C 0,-487 0,-450 0,1 L 1,490 L 3,493 C 5,495 7,497 9,498 z M 201,498 C 204,500 207,500 218,500 C 231,500 232,499 235,497 C 243,491 242,514 242,254 L 242,21 L 248,26 C 273,50 296,87 309,120 C 317,144 322,171 324,200 C 324,213 325,215 327,218 C 329,221 336,225 341,225 C 346,225 352,222 355,219 C 357,215 358,214 359,195 C 362,154 376,120 399,96 C 422,74 449,65 482,69 C 505,72 522,79 535,92 C 549,106 557,122 563,147 C 569,169 571,191 572,236 C 574,391 545,454 464,465 C 432,469 411,463 402,448 C 400,444 400,443 400,435 C 400,426 400,425 403,419 C 406,413 408,410 420,398 C 432,387 434,383 437,378 C 444,363 441,341 430,321 C 426,314 412,300 405,296 C 380,281 351,281 326,296 C 319,300 305,314 301,321 C 291,338 288,356 291,379 C 296,408 309,433 330,455 C 352,476 379,490 411,497 C 430,501 467,501 499,496 C 617,479 680,407 689,281 C 692,242 689,214 680,185 C 652,103 577,44 487,35 C 458,32 450,34 423,52 C 407,63 399,67 391,69 C 379,72 367,69 358,61 C 347,52 342,33 342,0 C 342,-33 347,-52 358,-61 C 367,-69 379,-72 391,-69 C 399,-67 407,-63 423,-52 C 450,-34 458,-32 487,-35 C 577,-44 652,-103 680,-185 C 689,-214 692,-242 689,-280 C 679,-418 607,-489 469,-499 C 436,-501 413,-499 390,-491 C 345,-476 308,-440 295,-397 C 287,-367 289,-343 301,-321 C 305,-314 319,-300 326,-296 C 351,-281 380,-281 405,-296 C 412,-300 426,-314 430,-321 C 441,-341 444,-363 437,-378 C 434,-383 432,-387 420,-398 C 408,-410 406,-413 403,-419 C 400,-425 400,-426 400,-434 C 400,-443 400,-444 402,-448 C 411,-463 432,-469 464,-465 C 513,-458 543,-432 558,-380 C 568,-346 573,-300 572,-236 C 571,-191 569,-169 563,-146 C 551,-98 526,-74 482,-69 C 449,-65 422,-74 399,-96 C 376,-120 362,-154 359,-195 C 358,-214 357,-215 355,-219 C 352,-222 346,-225 341,-225 C 336,-225 329,-221 327,-218 C 325,-215 324,-213 324,-200 C 322,-160 314,-130 298,-95 C 286,-71 266,-44 248,-26 L 242,-21 L 242,-254 C 242,-514 243,-491 235,-497 C 232,-499 231,-499 217,-499 C 203,-499 202,-499 199,-497 C 197,-495 195,-493 194,-491 C 192,-487 192,-450 192,1 L 193,490 L 195,493 C 197,495 199,497 201,498 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g3548"
-       transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,602.52128,370.85889)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_flat.png"
-       inkscape:export-xdpi="40.069347"
-       inkscape:export-ydpi="40.069347">
-      <path
-         id="path3550"
-         d="M -12,469 C -1,471 17,469 24,464 C 26,463 26,452 23,289 C 21,194 20,116 20,116 C 20,115 24,117 28,120 C 49,134 75,142 101,144 C 128,145 150,137 169,118 C 188,100 198,76 200,50 C 201,31 197,14 188,-4 C 174,-31 154,-50 94,-91 C 56,-117 46,-125 34,-139 C 28,-145 21,-152 19,-153 C 10,-159 0,-158 -8,-151 C -10,-148 -12,-145 -13,-142 C -14,-140 -16,-33 -19,136 C -22,287 -24,422 -25,437 L -25,463 L -21,465 C -19,466 -15,468 -12,469 z M 94,102 C 87,106 76,107 67,104 C 49,99 34,83 28,62 C 26,52 24,-34 26,-67 C 27,-81 27,-94 28,-97 L 29,-101 L 44,-88 C 65,-70 86,-49 96,-35 C 106,-21 116,-2 120,12 C 126,35 123,61 114,81 C 109,91 103,98 94,102 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g3590"
-       transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,601.62143,408.04533)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_natural.png"
-       inkscape:export-xdpi="40.012753"
-       inkscape:export-ydpi="40.012753">
-      <path
-         id="path3592"
-         d="M 7,380 C 15,382 33,380 40,375 C 41,374 41,359 40,288 C 39,240 39,201 39,201 C 39,200 64,204 95,209 C 127,215 152,218 153,218 C 158,217 162,213 165,208 L 167,204 L 170,-85 C 173,-317 174,-374 173,-374 C 172,-375 169,-376 166,-377 C 158,-380 142,-380 134,-377 C 131,-376 128,-375 127,-374 C 126,-373 126,-358 127,-287 C 128,-239 128,-200 128,-200 C 128,-199 103,-203 72,-208 C 40,-214 15,-217 14,-217 C 9,-216 5,-212 2,-207 L 0,-202 L -3,49 C -5,187 -6,317 -7,338 L -7,375 L -2,377 C 1,378 5,379 7,380 z M 132,100 C 132,111 132,114 131,114 C 127,114 38,99 38,98 C 37,98 35,-112 35,-113 C 36,-113 128,-98 129,-97 C 129,-97 132,54 132,100 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g3632"
-       transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,598.54322,315.09834)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_sharp.png"
-       inkscape:export-xdpi="32.806053"
-       inkscape:export-ydpi="32.806053">
-      <path
-         id="path3634"
-         d="M 191,373 C 198,377 209,374 213,365 C 215,361 215,358 215,288 C 215,247 215,214 216,214 C 216,214 225,218 236,222 C 259,231 262,232 268,227 C 275,222 275,221 275,181 C 275,147 275,144 273,141 C 272,139 270,137 269,136 C 267,135 255,129 241,124 L 216,113 L 215,32 C 215,-12 215,-49 216,-49 C 216,-49 225,-45 236,-41 C 259,-32 262,-31 268,-36 C 275,-41 275,-42 275,-82 C 275,-116 275,-119 273,-122 C 272,-124 270,-126 269,-127 C 267,-128 255,-134 241,-139 L 216,-150 L 215,-234 C 215,-310 214,-319 213,-322 C 206,-334 189,-334 182,-322 C 181,-319 180,-311 180,-241 L 180,-164 L 137,-181 L 95,-198 L 95,-279 C 95,-365 95,-363 90,-368 C 88,-371 81,-374 78,-374 C 74,-374 67,-371 65,-368 C 60,-363 60,-365 60,-287 C 60,-246 60,-213 59,-213 C 59,-213 50,-217 39,-221 C 16,-230 13,-231 7,-226 C 0,-221 0,-220 0,-180 C 0,-146 0,-143 2,-140 C 3,-138 5,-136 6,-135 C 8,-134 20,-128 34,-123 L 60,-112 L 60,-31 C 60,13 60,50 59,50 C 59,50 50,46 39,42 C 16,33 13,32 7,37 C 0,42 0,43 0,83 C 0,117 0,120 2,123 C 3,125 5,127 6,128 C 8,129 20,135 34,140 L 60,151 L 60,235 C 60,311 61,320 62,323 C 69,335 86,335 93,323 C 94,320 95,312 95,242 L 96,165 L 138,182 L 180,199 L 180,280 C 180,356 180,361 182,365 C 184,369 186,371 191,373 z M 180,18 L 180,99 L 137,82 L 95,65 L 95,-17 L 95,-98 L 98,-97 C 100,-96 119,-88 141,-80 L 180,-64 L 180,18 z "
-         style="fill:currentColor" />
-    </g>
-    <rect
-       id="rect46109"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="147.69514"
-       x="105.04722"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\fretboard.png"
-       inkscape:export-xdpi="51.581112"
-       inkscape:export-ydpi="51.581112" />
-    <g
-       id="g46111"
-       transform="translate(-239.97292,-93.208822)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\fretboard.png"
-       inkscape:export-xdpi="51.581112"
-       inkscape:export-ydpi="51.581112">
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#312e2e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 356.78571,244.32647 C 353.66319,246.47578 354.37107,249.39116 354.46428,252.18361 C 355.58661,255.37224 356.79093,258.66335 356.60714,260.21933 C 355.07725,264.44552 351.99862,268.67171 353.21428,272.8979 C 354.19924,277.32599 360.76555,278.9478 362.5,279.1479 C 366.65572,279.50067 368.87789,279.08001 371.42857,278.79076 C 375.1921,277.79337 376.7561,276.58639 377.57397,274.45274 C 377.83672,273.33968 378.09947,272.07293 377.85714,270.75504 C 375.54249,264.60725 374.45744,262.11719 374.53825,260.62877 C 374.60213,258.71015 377.07825,254.83744 376.65944,252.66703 C 376.62491,250.73727 376.19658,249.45385 374.15944,249.52671 C 372.7534,249.56886 373.7945,254.1656 370.71428,254.22187 C 367.89452,254.31348 366.7118,251.67669 365.89285,248.43361 L 363.71936,248.84306 C 363.10352,250.62227 362.21487,250.98212 360.89285,250.75504 C 358.55113,251.77339 358.11307,243.63749 356.78571,244.32647 z "
-         id="path46113"
-         sodipodi:nodetypes="cccccccccccccccc" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#d6d6d6;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 359.38895,267.92936 C 362.0294,270.76601 365.91542,269.08474 368.85913,269.19205 C 374.03586,269.61356 373.85893,272.66115 376.56155,272.34877 C 377.31917,272.09624 377.40333,271.33862 376.81408,270.07593 C 376.44181,268.23522 373.40705,263.38032 373.40482,260.60575 C 373.43341,258.94466 375.75999,256.44195 375.80393,253.28214 C 375.69313,252.48244 375.49215,251.17766 375.04632,250.88303 C 374.34436,251.14843 374.64966,254.43708 371.76332,255.55499 C 369.69466,256.98962 361.83777,251.59722 361.15672,252.52453 C 360.80311,253.38875 362.74642,257.29146 361.03045,260.85829 C 359.37516,264.13875 359.02812,266.329 359.38895,267.92936 z "
-         id="path46115"
-         sodipodi:nodetypes="ccccccccccc" />
-      <rect
-         style="fill:url(#linearGradient46199);fill-opacity:1;stroke:#d38d5f;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect46117"
-         width="4.7982244"
-         height="13.637059"
-         x="363.30331"
-         y="242.29672"
-         rx="0.2"
-         ry="0.2" />
-      <g
-         id="g46119"
-         transform="translate(0.911069,-92.225798)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46121"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46123">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46125"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46127"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46129"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46131"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46133"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46135"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         transform="translate(0.911069,-87.427573)"
-         id="g46137">
-        <rect
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46139"
-           width="6.4397225"
-           height="1.6414979"
-           x="361.76089"
-           y="348.91721"
-           rx="0.69999999"
-           ry="0.69999999" />
-        <g
-           id="g46141"
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46143"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46145"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46147"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46149"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46151"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46153"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <g
-         id="g46155"
-         transform="matrix(0.9818469,0.189675,-0.189675,0.9818469,73.746857,-146.26586)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46157"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46159">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46161"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46163"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46165"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46167"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46169"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46171"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         id="g46173"
-         transform="translate(-9.9084e-2,-86.669959)">
-        <rect
-           style="fill:#333333;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46175"
-           width="6.4397225"
-           height="1.1364216"
-           x="362.77106"
-           y="354.97812"
-           rx="0.2"
-           ry="0.13846155" />
-        <g
-           style="fill:#666666"
-           id="g46177"
-           transform="matrix(0.1606529,0,0,0.1606529,307.82015,299.98093)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46179"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46181"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46183"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46185"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46187"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46189"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46191"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(8.234675,-87.427573)" />
-      <path
-         transform="translate(10.633787,-85.280999)"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         sodipodi:ry="0.69447988"
-         sodipodi:rx="0.75761443"
-         sodipodi:cy="356.17767"
-         sodipodi:cx="364.9176"
-         id="path46193"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46195"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(5.583024,-89.069071)" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 372.01586,263.88874 L 373.65736,266.03532"
-         id="path46197" />
-    </g>
-    <rect
-       id="rect46201"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="-192.80984"
-       x="147.69516"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       transform="matrix(0,1,-1,0,0,0)" />
-    <g
-       id="g46203"
-       transform="matrix(0,1,-1,0,432.78378,-197.77037)">
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#312e2e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 356.78571,244.32647 C 353.66319,246.47578 354.37107,249.39116 354.46428,252.18361 C 355.58661,255.37224 356.79093,258.66335 356.60714,260.21933 C 355.07725,264.44552 351.99862,268.67171 353.21428,272.8979 C 354.19924,277.32599 360.76555,278.9478 362.5,279.1479 C 366.65572,279.50067 368.87789,279.08001 371.42857,278.79076 C 375.1921,277.79337 376.7561,276.58639 377.57397,274.45274 C 377.83672,273.33968 378.09947,272.07293 377.85714,270.75504 C 375.54249,264.60725 374.45744,262.11719 374.53825,260.62877 C 374.60213,258.71015 377.07825,254.83744 376.65944,252.66703 C 376.62491,250.73727 376.19658,249.45385 374.15944,249.52671 C 372.7534,249.56886 373.7945,254.1656 370.71428,254.22187 C 367.89452,254.31348 366.7118,251.67669 365.89285,248.43361 L 363.71936,248.84306 C 363.10352,250.62227 362.21487,250.98212 360.89285,250.75504 C 358.55113,251.77339 358.11307,243.63749 356.78571,244.32647 z "
-         id="path46205"
-         sodipodi:nodetypes="cccccccccccccccc" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#d6d6d6;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 359.38895,267.92936 C 362.0294,270.76601 365.91542,269.08474 368.85913,269.19205 C 374.03586,269.61356 373.85893,272.66115 376.56155,272.34877 C 377.31917,272.09624 377.40333,271.33862 376.81408,270.07593 C 376.44181,268.23522 373.40705,263.38032 373.40482,260.60575 C 373.43341,258.94466 375.75999,256.44195 375.80393,253.28214 C 375.69313,252.48244 375.49215,251.17766 375.04632,250.88303 C 374.34436,251.14843 374.64966,254.43708 371.76332,255.55499 C 369.69466,256.98962 361.83777,251.59722 361.15672,252.52453 C 360.80311,253.38875 362.74642,257.29146 361.03045,260.85829 C 359.37516,264.13875 359.02812,266.329 359.38895,267.92936 z "
-         id="path46207"
-         sodipodi:nodetypes="ccccccccccc" />
-      <rect
-         style="fill:url(#linearGradient46291);fill-opacity:1;stroke:#d38d5f;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect46209"
-         width="4.7982244"
-         height="13.637059"
-         x="363.30331"
-         y="242.29672"
-         rx="0.2"
-         ry="0.2" />
-      <g
-         id="g46211"
-         transform="translate(0.911069,-92.225798)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46213"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46215">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46217"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46219"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46221"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46223"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46225"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46227"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         transform="translate(0.911069,-87.427573)"
-         id="g46229">
-        <rect
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46231"
-           width="6.4397225"
-           height="1.6414979"
-           x="361.76089"
-           y="348.91721"
-           rx="0.69999999"
-           ry="0.69999999" />
-        <g
-           id="g46233"
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46235"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46237"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46239"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46241"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46243"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46245"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <g
-         id="g46247"
-         transform="matrix(0.9818469,0.189675,-0.189675,0.9818469,73.746857,-146.26586)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46249"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46251">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46253"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46255"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46257"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46259"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46261"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46263"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         id="g46265"
-         transform="translate(-9.9084e-2,-86.669959)">
-        <rect
-           style="fill:#333333;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46267"
-           width="6.4397225"
-           height="1.1364216"
-           x="362.77106"
-           y="354.97812"
-           rx="0.2"
-           ry="0.13846155" />
-        <g
-           style="fill:#666666"
-           id="g46269"
-           transform="matrix(0.1606529,0,0,0.1606529,307.82015,299.98093)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46271"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46273"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46275"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46277"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46279"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46281"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46283"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(8.234675,-87.427573)" />
-      <path
-         transform="translate(10.633787,-85.280999)"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         sodipodi:ry="0.69447988"
-         sodipodi:rx="0.75761443"
-         sodipodi:cy="356.17767"
-         sodipodi:cx="364.9176"
-         id="path46285"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46287"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(5.583024,-89.069071)" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 372.01586,263.88874 L 373.65736,266.03532"
-         id="path46289" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="199.33298"
-       y="147.69514"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect46298" />
-    <g
-       id="g46300"
-       transform="translate(-112.68645,-233.57666)">
-      <path
-         sodipodi:nodetypes="cccccc"
-         id="path46302"
-         d="M 319.5425,392.25851 L 326.77266,385.82994 L 347.57424,385.82994 L 347.57424,417.14467 L 319.5425,417.14467 L 319.5425,392.25851 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path46304"
-         d="M 319.77466,392.18383 L 327.03272,392.53521 L 326.45668,386.17002 L 319.77466,392.18383 z "
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.46774149;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path46306"
-         d="M 340.16186,394.29247 L 340.16186,399.14094 L 335.34158,399.14094 L 335.34158,403.82028 L 340.16186,403.82028 L 340.16186,408.64056 L 344.8412,408.64056 L 344.8412,403.79209 L 349.66148,403.79209 L 349.66148,399.11275 L 344.8412,399.11275 L 344.8412,394.29247 L 340.16186,394.29247 z "
-         style="opacity:1;fill:url(#linearGradient46308);fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="247.90439"
-       y="147.69516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect46310" />
-    <g
-       id="g46312"
-       transform="translate(-64.273873,-282.45416)">
-      <path
-         id="path46314"
-         d="M 317.14286,466.38665 L 313.92857,441.8717 L 316.60714,437.29558 L 326.96429,436.80528 L 331.07143,440.72767 L 343.57143,440.07394 L 348.39286,464.91575 L 317.14286,466.38665 z "
-         style="opacity:0.8;fill:url(#linearGradient46322);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.47833687;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path46316"
-         d="M 318.39286,466.22321 L 317.5,442.19857 L 343.21429,441.05454 L 346.42857,464.91575 L 318.39286,466.22321 z "
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path46318"
-         d="M 319.10714,466.38665 L 320.53571,443.99633 L 347.32143,442.68887 L 345.89286,464.91575 L 319.10714,466.38665 z "
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path46320"
-         d="M 321.71428,446.93812 L 351.14285,445.46723 C 351.69685,445.46723 352.14285,445.87542 352.14285,446.38245 L 348.57142,464.32739 C 348.57142,464.83442 348.12542,465.24261 347.57142,465.24261 L 318.14285,466.71351 C 317.58885,466.71351 317.14285,466.30532 317.14285,465.79828 L 320.71428,447.85335 C 320.71428,447.34631 321.16028,446.93812 321.71428,446.93812 z "
-         style="opacity:0.78719991;fill:url(#linearGradient46324);fill-opacity:1;stroke:#000000;stroke-width:0.47833687;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="295.04727"
-       y="147.69516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect46326" />
-    <g
-       id="g46328"
-       transform="translate(-17.500033,-425.42856)">
-      <path
-         d="M 329.89237,582.19858 L 346.57124,582.19858 L 341.38263,594.53987 L 324.70377,594.53987 L 329.89237,582.19858 z "
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path46330" />
-      <path
-         d="M 325.36076,590.2392 C 320.8422,590.51315 316.91065,594.47845 316.23949,597.10206 C 315.58524,599.65962 316.99792,605.95711 317.27166,607.24633 C 317.32233,607.48495 335.3486,609.7667 337.50068,609.7667 C 337.32165,608.47808 337.11719,602.34738 337.12299,600.45896 C 337.14863,592.19968 342.92469,590.59289 342.92469,590.59289 L 325.36076,590.2392 z "
-         style="fill:url(#linearGradient46350);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path46332" />
-      <path
-         d="M 350.31616,596.3078 C 350.31616,601.59804 350.16747,603.31024 349.87749,606.18941 C 349.70035,606.42297 338.12735,609.61157 337.95243,609.71086 C 337.62091,607.25452 337.32158,604.09884 337.16024,601.47186 C 336.90347,597.29055 338.38209,591.07056 343.89828,590.59603 C 347.56257,590.27771 350.31616,591.01756 350.31616,596.3078 z "
-         style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path46334" />
-      <path
-         d="M 335.53485,576.99555 L 347.60259,577.30259 C 347.60259,577.30259 343.00827,581.4236 340.40363,590.46128 C 336.76593,590.45942 331.00119,590.04235 328.33589,590.15425 C 331.05325,580.93901 335.53485,576.99555 335.53485,576.99555 z "
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path46336" />
-      <path
-         d="M 323.04971,594.62001 C 323.04971,594.62001 332.88394,595.31498 333.04129,595.31498 C 333.19864,595.31498 334.85079,592.83294 334.85079,592.83294 L 325.25258,592.43581 L 323.04971,594.62001 z "
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path46338" />
-      <rect
-         width="13.617006"
-         height="2.6806109"
-         x="321.83487"
-         y="566.54987"
-         transform="matrix(0.993753,0.111602,0,1,0,0)"
-         style="fill:url(#linearGradient46352);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50156909;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect46340" />
-      <path
-         d="M 335.59969,580.34416 L 343.01028,580.42532"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path46342" />
-      <path
-         d="M 333.25408,583.54052 L 340.66467,583.62168"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path46344" />
-      <path
-         d="M 331.74,586.86786 L 339.1506,587.03017"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path46346" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path46348"
-         d="M 315.71428,591.6479 L 315.71428,611.29075 L 333.92857,600.57647 L 315.71428,591.6479 z "
-         style="fill:url(#linearGradient46354);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <rect
-       id="rect46356"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="147.69516"
-       x="343.61868"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g46358"
-       transform="translate(31.071397,-425.42859)">
-      <path
-         id="path46360"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 329.89237,582.19858 L 346.57124,582.19858 L 341.38263,594.53987 L 324.70377,594.53987 L 329.89237,582.19858 z " />
-      <path
-         id="path46362"
-         style="fill:url(#linearGradient46382);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 325.36076,590.2392 C 320.8422,590.51315 316.91065,594.47845 316.23949,597.10206 C 315.58524,599.65962 316.99792,605.95711 317.27166,607.24633 C 317.32233,607.48495 335.3486,609.7667 337.50068,609.7667 C 337.32165,608.47808 337.11719,602.34738 337.12299,600.45896 C 337.14863,592.19968 342.92469,590.59289 342.92469,590.59289 L 325.36076,590.2392 z " />
-      <path
-         id="path46364"
-         style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 350.31616,596.3078 C 350.31616,601.59804 350.16747,603.31024 349.87749,606.18941 C 349.70035,606.42297 338.12735,609.61157 337.95243,609.71086 C 337.62091,607.25452 337.32158,604.09884 337.16024,601.47186 C 336.90347,597.29055 338.38209,591.07056 343.89828,590.59603 C 347.56257,590.27771 350.31616,591.01756 350.31616,596.3078 z " />
-      <path
-         id="path46366"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 335.53485,576.99555 L 347.60259,577.30259 C 347.60259,577.30259 343.00827,581.4236 340.40363,590.46128 C 336.76593,590.45942 331.00119,590.04235 328.33589,590.15425 C 331.05325,580.93901 335.53485,576.99555 335.53485,576.99555 z " />
-      <path
-         id="path46368"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 323.04971,594.62001 C 323.04971,594.62001 332.88394,595.31498 333.04129,595.31498 C 333.19864,595.31498 334.85079,592.83294 334.85079,592.83294 L 325.25258,592.43581 L 323.04971,594.62001 z " />
-      <rect
-         id="rect46370"
-         style="fill:url(#linearGradient46384);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50156909;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.993753,0.111602,0,1,0,0)"
-         y="566.54987"
-         x="321.83487"
-         height="2.6806109"
-         width="13.617006" />
-      <path
-         id="path46372"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 335.59969,580.34416 L 343.01028,580.42532" />
-      <path
-         id="path46374"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 333.25408,583.54052 L 340.66467,583.62168" />
-      <path
-         id="path46376"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 331.74,586.86786 L 339.1506,587.03017" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.82480014;fill:#e6e6e6;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path46378"
-       sodipodi:cx="326.40555"
-       sodipodi:cy="634.53784"
-       sodipodi:rx="9.4701805"
-       sodipodi:ry="7.7024131"
-       d="M 335.87573 634.53784 A 9.4701805 7.7024131 0 1 1  316.93537,634.53784 A 9.4701805 7.7024131 0 1 1  335.87573 634.53784 z"
-       transform="translate(31.071397,-471.8956)" />
-    <path
-       style="fill:url(#linearGradient46386);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 362.1489,169.58703 C 362.4574,174.46944 371.82691,179.35184 377.55372,184.23425 C 373.26295,178.67127 370.28614,169.16642 364.67428,167.56673 L 362.1489,169.58703 z "
-       id="path46380"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56373"
-       width="24.642857"
-       height="24.642857"
-       x="187.7767"
-       y="84.759689"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56375"
-       transform="translate(28.490947,-673.6739)"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_1.png">
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path56377"
-         d="M 163.21429,762.8979 L 163.21429,778.96933 C 169.18918,776.60095 175.46615,774.07658 180,770.75504 C 174.66202,767.10698 169.02779,764.64388 163.21429,762.8979 z "
-         style="fill:url(#linearGradient56421);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56423);stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56379"
-         d="M 171.79136,769.68303 C 168.72709,769.68303 165.85828,770.1268 163.49554,770.88459 L 163.49554,777.98214 C 169.16989,775.88352 175.12269,773.64741 179.45825,770.71693 C 177.21614,770.06809 174.60773,769.68302 171.79136,769.68303 z "
-         style="fill:url(#linearGradient56425);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56427);stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       y="84.759689"
-       x="160.50253"
-       height="24.642857"
-       width="24.642857"
-       id="rect56381"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56383"
-       transform="translate(28.490947,-673.6739)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <rect
-         y="762.005"
-         x="135.89285"
-         height="17.5"
-         width="17.142857"
-         id="rect56385"
-         style="opacity:1;fill:url(#linearGradient56429);fill-opacity:1;stroke:url(#linearGradient56431);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path56387"
-         d="M 150.86476,765.59848 C 142.86027,765.59848 136.3852,770.59601 136.3852,776.76416 C 136.3852,777.31124 136.43575,777.85021 136.53447,778.37632 L 152.59634,778.37632 L 152.59634,765.68805 C 152.03048,765.63628 151.44859,765.59848 150.86476,765.59848 z "
-         style="opacity:1;fill:url(#linearGradient56433);fill-opacity:1;stroke:url(#linearGradient56435);stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       y="84.402573"
-       x="214.91953"
-       height="24.642857"
-       width="24.642857"
-       id="rect56389"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56391"
-       transform="translate(-1.8136333,-673.16882)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         id="path56393"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         style="fill:url(#linearGradient56437);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56439);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56395"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         style="fill:url(#linearGradient56441);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56397"
-       width="24.642857"
-       height="24.642857"
-       x="243.20383"
-       y="84.402573"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56399"
-       transform="translate(28.490947,-673.6739)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         id="path56401"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         style="fill:url(#linearGradient56443);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56445);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56403"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         style="fill:url(#linearGradient56447);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56405"
-       width="24.642857"
-       height="24.642857"
-       x="-157.74002"
-       y="84.402573"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       transform="matrix(-1,0,0,1,374.47318,-673.16882)"
-       id="g56407"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56449);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56451);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         id="path56409" />
-      <path
-         style="fill:url(#linearGradient56453);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         id="path56411" />
-    </g>
-    <rect
-       y="84.402573"
-       x="-129.45572"
-       height="24.642857"
-       width="24.642857"
-       id="rect56413"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56415"
-       transform="matrix(-1,0,0,1,344.1686,-673.6739)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56455);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56457);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         id="path56417" />
-      <path
-         style="fill:url(#linearGradient56459);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         id="path56419" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56623"
-       width="24.642857"
-       height="24.642857"
-       x="386.69745"
-       y="85.396027"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <path
-       style="fill:url(#linearGradient56667);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56669);stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.62605,89.860362 L 390.62605,105.93179 C 396.60094,103.56341 402.87791,101.03904 407.41176,97.717502 C 402.07378,94.069442 396.43955,91.606342 390.62605,89.860362 z "
-       id="path56625"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       y="85.396027"
-       x="331.13913"
-       height="24.642857"
-       width="24.642857"
-       id="rect56627"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <g
-       id="g56629"
-       transform="translate(199.12749,-673.03754)"
-       style="fill:url(#linearGradient56671)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321">
-      <rect
-         y="762.005"
-         x="135.89285"
-         height="17.5"
-         width="17.142857"
-         id="rect56631"
-         style="opacity:1;fill:url(#linearGradient56673);fill-opacity:1;stroke:url(#linearGradient56675);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path56633"
-         d="M 150.86476,765.59848 C 142.86027,765.59848 136.3852,770.59601 136.3852,776.76416 C 136.3852,777.31124 136.43575,777.85021 136.53447,778.37632 L 152.59634,778.37632 L 152.59634,765.68805 C 152.03048,765.63628 151.44859,765.59848 150.86476,765.59848 z "
-         style="opacity:1;fill:url(#linearGradient56677);fill-opacity:1;stroke:url(#linearGradient56679);stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56635"
-       width="24.642857"
-       height="24.642857"
-       x="-328.37662"
-       y="85.03891"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       transform="matrix(-1,0,0,1,545.10972,-672.53246)"
-       id="g56637"
-       style="fill:url(#linearGradient56681)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56683);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56685);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         id="path56639" />
-      <path
-         style="fill:url(#linearGradient56687);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         id="path56641" />
-    </g>
-    <rect
-       y="85.03891"
-       x="-300.09232"
-       height="24.642857"
-       width="24.642857"
-       id="rect56643"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56645"
-       transform="matrix(-1,0,0,1,514.80514,-673.03754)"
-       style="fill:url(#linearGradient56689)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56691);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56693);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         id="path56647" />
-      <path
-         style="fill:url(#linearGradient56695);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         id="path56649" />
-    </g>
-    <rect
-       y="85.03891"
-       x="414.34537"
-       height="24.642857"
-       width="24.642857"
-       id="rect56651"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <g
-       style="fill:url(#linearGradient56697)"
-       id="g56653"
-       transform="translate(197.61224,-672.53246)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321">
-      <path
-         id="path56655"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         style="fill:url(#linearGradient56699);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56701);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56657"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         style="fill:url(#linearGradient56703);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56659"
-       width="24.642857"
-       height="24.642857"
-       x="442.62967"
-       y="85.03891"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <g
-       style="fill:url(#linearGradient56705)"
-       transform="translate(227.91682,-673.03754)"
-       id="g56661"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321">
-      <path
-         id="path56663"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         style="fill:url(#linearGradient56707);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56709);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56665"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         style="fill:url(#linearGradient56711);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       transform="scale(-1,1)"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56713"
-       width="24.642857"
-       height="24.642857"
-       x="-383.42987"
-       y="85.03891"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_pause.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       style="fill:url(#linearGradient3722);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3738);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect3714"
-       width="6.060915"
-       height="17.67767"
-       x="363.35898"
-       y="88.82135"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_pause.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       y="88.82135"
-       x="372.95541"
-       height="17.67767"
-       width="6.060915"
-       id="rect6852"
-       style="fill:url(#linearGradient6854);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6856);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_pause.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="200.76157"
-       y="199.48087"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect6871" />
-    <g
-       id="g6873"
-       transform="translate(-111.78574,-276.14284)">
-      <rect
-         id="rect6875"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50002563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.6880851,-0.72563,0.7156989,0.698409,0,0)"
-         y="579.13556"
-         x="-139.53285"
-         height="8.1236973"
-         width="9.9346428" />
-      <path
-         id="path6877"
-         style="fill:url(#linearGradient6883);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 322.15549,498.51581 L 331.24526,507.386 L 345.19505,492.67507 L 345.18921,492.66938 C 348.9382,488.60428 349.98666,483.41283 347.51339,480.99931 C 345.04012,478.58579 339.96998,479.8527 336.11111,483.81057 L 336.10527,483.80488 L 322.15549,498.51581 z " />
-      <path
-         id="path6879"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.38604188;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 345.24279,485.51892 C 345.24279,486.79461 344.29483,487.82876 343.12545,487.82876 C 341.95607,487.82876 341.0081,486.79461 341.0081,485.51892 C 341.0081,484.24324 341.95607,483.20909 343.12545,483.20909 C 344.29483,483.20909 345.24279,484.24324 345.24279,485.51892 z " />
-      <path
-         id="path6881"
-         d="M 322.22677,504.05281 L 326.70179,508.17154"
-         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.6, 1.6;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="248.9758"
-       y="199.4809"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect6885" />
-    <g
-       id="g6887"
-       transform="translate(-63.202443,-323.09743)">
-      <rect
-         id="rect6889"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50002563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.6880851,-0.72563,0.7156989,0.698409,0,0)"
-         y="611.17981"
-         x="-173.39938"
-         height="8.1236973"
-         width="9.9346428" />
-      <path
-         id="path6891"
-         style="fill:url(#linearGradient6899);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 321.78646,545.47037 L 330.87623,554.34056 L 344.82602,539.62963 L 344.82018,539.62394 C 348.56917,535.55884 349.61763,530.36739 347.14436,527.95387 C 344.67109,525.54035 339.60095,526.80726 335.74208,530.76513 L 335.73624,530.75944 L 321.78646,545.47037 z " />
-      <path
-         id="path6893"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.38604188;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 344.87376,532.47348 C 344.87376,533.74917 343.9258,534.78332 342.75642,534.78332 C 341.58704,534.78332 340.63907,533.74917 340.63907,532.47348 C 340.63907,531.1978 341.58704,530.16365 342.75642,530.16365 C 343.9258,530.16365 344.87376,531.1978 344.87376,532.47348 z " />
-      <path
-         id="path6895"
-         d="M 321.85774,551.00737 L 326.33276,555.1261"
-         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.6, 1.6;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path6897"
-         d="M 319.20536,530.05615 C 328.00186,533.54983 339.28994,534.71803 337.21846,548.35518 L 330.64224,550.92847 L 340.3636,561.22168 L 349.22719,545.21003 L 343.79467,546.35372 C 341.83779,536.76149 334.86363,530.51411 319.20536,530.05615 z "
-         style="opacity:0.82480014;fill:url(#linearGradient6901);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g29580"
-       transform="translate(-110.00002,83.999995)">
-      <path
-         transform="translate(158.5,4)"
-         d="M 503.5 755.86218 A 62 8.5 0 1 1  379.5,755.86218 A 62 8.5 0 1 1  503.5 755.86218 z"
-         sodipodi:ry="8.5"
-         sodipodi:rx="62"
-         sodipodi:cy="755.86218"
-         sodipodi:cx="441.5"
-         id="path29568"
-         style="opacity:1;fill:url(#radialGradient29636);fill-opacity:1;stroke:#ff6600;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path20696"
-         d="M 594.5,614.86218 C 552.40848,617.69466 561.64571,666.64838 554.5,676.36218 L 539.5,707.86218 L 580.5,759.36218 C 584.76589,759.73453 585.4146,760.70975 597,759.86218 C 607.4517,760.21727 615.73083,754.05466 625,750.86218 C 645.93916,739.72991 650.56211,719.35832 651.5,710.86218 C 646.92624,680.73098 638.84915,671.11644 635,656.86218 C 628.41474,635.94744 621.90069,614.96149 594.5,614.86218 z "
-         style="opacity:1;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csssc"
-         id="path21679"
-         d="M 636.98486,720.02026 C 636.98486,744.1619 618.95964,758.34702 596.75,758.34702 C 574.54036,758.34702 556.51515,738.7538 556.51515,714.61216 C 556.51515,690.47052 574.54036,670.87731 596.75,670.87731 C 618.95964,670.87731 636.98486,695.87862 636.98486,720.02026 z "
-         style="opacity:1;fill:url(#linearGradient29638);fill-opacity:1;stroke:#e6e6e6;stroke-width:1.63029492;stroke-linecap:round;stroke-miterlimit:4" />
-      <g
-         id="g11715">
-        <path
-           style="fill:url(#linearGradient29640);fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 621.78571,738.07647 C 601.4768,738.83145 597.50087,758.48065 602.14286,761.6479 C 603.92524,764.7448 612.14769,764.08596 621.42857,764.1479 C 632.20032,764.09863 642.79369,764.76381 643.21428,760.21933 C 644.26956,741.64371 627.94331,737.79123 621.78571,738.07647 z "
-           id="path9717"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           transform="matrix(0.9300312,0,0,1.1125113,46.341387,-82.861238)"
-           style="opacity:1;fill:url(#linearGradient29642);fill-opacity:1;stroke:#d4aa00;stroke-width:0;stroke-miterlimit:4"
-           d="M 637.14287,750.75507 C 637.14287,756.76792 628.98287,759.72178 618.92859,759.72178 C 608.8743,759.72178 600.7143,756.76792 600.7143,750.75507 C 600.7143,744.74221 608.8743,739.86221 618.92859,739.86221 C 628.98287,739.86221 637.14287,744.74221 637.14287,750.75507 z "
-           id="path10700"
-           sodipodi:nodetypes="csssc" />
-      </g>
-      <g
-         transform="translate(-50.5,0)"
-         id="g20684">
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path20686"
-           d="M 621.78571,738.07647 C 601.4768,738.83145 597.50087,758.48065 602.14286,761.6479 C 603.92524,764.7448 612.14769,764.08596 621.42857,764.1479 C 632.20032,764.09863 642.79369,764.76381 643.21428,760.21933 C 644.26956,741.64371 627.94331,737.79123 621.78571,738.07647 z "
-           style="fill:url(#linearGradient29644);fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="csssc"
-           id="path20688"
-           d="M 637.14287,750.75507 C 637.14287,756.76792 628.98287,759.72178 618.92859,759.72178 C 608.8743,759.72178 600.7143,756.76792 600.7143,750.75507 C 600.7143,744.74221 608.8743,739.86221 618.92859,739.86221 C 628.98287,739.86221 637.14287,744.74221 637.14287,750.75507 z "
-           style="opacity:1;fill:url(#linearGradient29646);fill-opacity:1;stroke:#d4aa00;stroke-width:0;stroke-miterlimit:4"
-           transform="matrix(0.9300312,0,0,1.1125113,46.341387,-82.861238)" />
-      </g>
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path11731"
-         d="M 587.5,719.1479 C 594.71083,712.39959 632.2891,710.86762 631.07143,703.07647 C 630.43514,700.13312 598.26051,705.27759 593.57143,697.00504 C 586.65564,692.01313 591.68263,668.84065 587.5,668.79076 C 582.61905,668.31457 572.7381,689.37796 567.5,693.07647 C 562.15456,695.41451 542.57403,691.61453 526.78571,703.07647 C 519.40952,709.86219 528.1022,727.36219 533.92857,736.29076 C 540.40541,746.90851 555.37198,758.40393 562.85714,754.50504 C 577.09461,747.71461 577.19406,729.71053 587.5,719.1479 z "
-         style="opacity:1;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path12719"
-         d="M 587.85714,693.79076 C 569.43249,693.87082 549.3787,697.64018 547.85714,703.07647 C 546.0789,712.01712 552.26025,716.18721 557.85714,722.36218 C 566.19665,734.93551 564.0273,742.73593 566.78571,746.29076 C 570.94368,749.66757 579.61904,725.67171 586.28571,718.29076 C 593.21644,712.1663 628.8104,710.01122 626.78571,705.21933 C 625.55648,701.93191 594.22137,709.76003 587.85714,693.79076 z "
-         style="opacity:1;fill:url(#linearGradient29648);fill-opacity:1;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <g
-         id="g13736"
-         transform="matrix(1.0602134,2.043068e-2,-1.8607258e-2,0.9655901,140.14006,26.920654)">
-        <rect
-           style="opacity:1;fill:#ffffff;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect12733"
-           width="23.300003"
-           height="4.743"
-           x="797.07562"
-           y="105.04495"
-           transform="matrix(0.6199037,0.7846779,-0.7846779,0.6199037,0,0)"
-           rx="2"
-           ry="2" />
-        <g
-           id="g13718"
-           transform="matrix(0.1525646,0.2012171,-0.1780037,0.1640598,473.69043,481.42722)"
-           style="fill:#b3b3b3">
-          <path
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z"
-             sodipodi:ry="3.7123106"
-             sodipodi:rx="4.2426405"
-             sodipodi:cy="738.58356"
-             sodipodi:cx="458.91229"
-             id="path13704"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="translate(12.374369,0)"
-             sodipodi:type="arc"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path13706"
-             sodipodi:cx="458.91229"
-             sodipodi:cy="738.58356"
-             sodipodi:rx="4.2426405"
-             sodipodi:ry="3.7123106"
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z" />
-          <path
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z"
-             sodipodi:ry="3.7123106"
-             sodipodi:rx="4.2426405"
-             sodipodi:cy="738.58356"
-             sodipodi:cx="458.91229"
-             id="path13708"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc"
-             transform="translate(25.102291,-0.3535534)" />
-          <path
-             transform="translate(36.769553,-0.3535534)"
-             sodipodi:type="arc"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path13712"
-             sodipodi:cx="458.91229"
-             sodipodi:cy="738.58356"
-             sodipodi:rx="4.2426405"
-             sodipodi:ry="3.7123106"
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z" />
-          <path
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z"
-             sodipodi:ry="3.7123106"
-             sodipodi:rx="4.2426405"
-             sodipodi:cy="738.58356"
-             sodipodi:cx="458.91229"
-             id="path13714"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc"
-             transform="translate(49.143922,-0.3535534)" />
-          <path
-             transform="translate(61.871844,-0.7071068)"
-             sodipodi:type="arc"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path13716"
-             sodipodi:cx="458.91229"
-             sodipodi:cy="738.58356"
-             sodipodi:rx="4.2426405"
-             sodipodi:ry="3.7123106"
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z" />
-        </g>
-      </g>
-      <path
-         id="path11735"
-         d="M 585.45075,671.63811 C 580.80949,671.17901 571.41375,691.48149 566.43287,695.04715 C 561.34992,697.30119 542.72667,693.63772 527.71366,704.68793 C 520.69968,711.22989 528.97823,728.10558 534.51849,736.71343 C 536.96434,740.77861 540.69955,744.96297 544.7406,748.3125 C 547.43682,721.1535 555.12632,714.3442 560.99494,705.38087 C 569.15679,693.56381 577.98981,685.60747 587.26339,678.14564 C 587.15269,674.4087 586.83461,671.65484 585.45075,671.63811 z "
-         style="opacity:0.68999999;fill:url(#linearGradient29650);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         transform="translate(0,-0.5)"
-         id="g16761">
-        <g
-           id="g14799"
-           transform="translate(160.51324,6.0104076)">
-          <path
-             style="opacity:1;fill:url(#linearGradient29652);fill-opacity:1;fill-rule:evenodd;stroke:#483e37;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 481.18617,646.12934 L 487.19657,652.84685 L 429.92092,695.62681 L 424.26407,688.9093 L 481.18617,646.12934 z "
-             id="path13746" />
-          <g
-             transform="matrix(0.999936,-1.1314943e-2,1.1314943e-2,0.999936,-7.5687352,5.1956633)"
-             style="opacity:0.79999994"
-             id="g14773">
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 427.92536,685.74952 L 434.09846,692.73328"
-               id="path13766" />
-            <path
-               id="path14737"
-               d="M 434.42536,681.24952 L 440.59846,688.23328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 441.92536,675.74952 L 448.09846,682.73328"
-               id="path14739" />
-            <path
-               id="path14763"
-               d="M 450.67536,668.74952 L 456.84846,675.73328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 465.92536,658.24952 L 472.09846,665.23328"
-               id="path14765" />
-            <path
-               id="path14767"
-               d="M 469.67536,655.74952 L 475.84846,662.73328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 473.17536,652.99952 L 479.34846,659.98328"
-               id="path14769" />
-            <path
-               id="path14771"
-               d="M 476.67536,650.24952 L 482.84846,657.23328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-        </g>
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#502d16;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 583.00954,694.2126 L 591.14127,703.75854"
-           id="path14813" />
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 642.40651,652.4933 L 585.13086,695.98036"
-           id="path15784" />
-        <path
-           id="path16755"
-           d="M 643.82072,653.90751 L 586.54507,697.39457"
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 645.58849,655.32172 L 588.31284,698.80878"
-           id="path16757" />
-        <path
-           id="path16759"
-           d="M 646.64915,657.08949 L 589.3735,700.57655"
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-      <g
-         id="g20680">
-        <path
-           style="fill:#d4ab6f;fill-opacity:1;fill-rule:evenodd;stroke:#deaa87;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 640.75,652.61218 L 647,659.61218 C 650.61861,657.21802 654.54024,656.73289 658.5,657.11218 C 668.26157,644.34434 672.64366,645.3023 677.75,644.61218 C 678.94606,641.73657 674.14673,641.17174 671.25,639.86218 C 668.59028,639.35871 646.03414,647.30344 643.25,648.86218 C 641.2211,650.36218 640.72443,651.36218 640.75,652.61218 z "
-           id="path16789"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="opacity:0.56999978;fill:url(#linearGradient29654);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 670.53125,639.875 C 665.85142,640.33869 645.86013,647.41368 643.25,648.875 C 641.2211,650.375 640.72443,651.375 640.75,652.625 L 644.03125,656.3125 C 644.56084,653.98048 645.91603,651.76579 648,650.375 C 666.38569,640.51108 671.1161,642.39764 677.65625,642.875 C 676.69517,641.42388 673.43462,640.86263 671.25,639.875 C 671.08377,639.84353 670.84324,639.84409 670.53125,639.875 z "
-           id="path17760" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path20698"
-         d="M 557,665.36218 C 527.34482,673.09896 530.01507,708.03337 534,708.36218 C 539.29883,707.83157 551.63196,693.22095 559.5,684.36218 C 567.28411,674.58187 569.13882,667.17332 557,665.36218 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path20700"
-         d="M 557.5,680.36218 C 551.729,689.36218 546.15502,698.36218 536.5,707.36218"
-         style="opacity:0.65959999;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient29656);stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path21698"
-         d="M 616,668.86218 C 610.37322,671.44501 636.33333,685.19551 646.5,705.36218 C 651.5796,702.96354 656.16927,700.19747 656,693.86218 C 658.40083,684.11256 636.49233,664.46841 616,668.86218 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path21700"
-         d="M 625.5,670.86218 C 638.79868,674.06424 652.41351,683.70961 654,693.36218"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient29658);stroke-width:3.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csssc"
-         id="path22680"
-         d="M 627.49999,653.11218 C 627.49999,673.67418 613.05199,690.36218 595.24999,690.36218 C 577.448,690.36218 563,673.67418 563,653.11218 C 563,632.55018 577.448,615.86218 595.24999,615.86218 C 613.05199,615.86218 627,629.55018 627.49999,653.11218 z "
-         style="opacity:1;fill:url(#linearGradient29660);fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient29662);fill-opacity:1;stroke:#ececec;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path24647"
-         sodipodi:cx="426.25"
-         sodipodi:cy="645.11218"
-         sodipodi:rx="14.25"
-         sodipodi:ry="14.25"
-         d="M 440.5 645.11218 A 14.25 14.25 0 1 1  412,645.11218 A 14.25 14.25 0 1 1  440.5 645.11218 z"
-         transform="matrix(0.8989058,0,0,0.863818,225.09145,95.352673)" />
-      <path
-         transform="matrix(0.9488566,0,0,0.9664004,179.5499,26.675505)"
-         d="M 440.5 645.11218 A 14.25 14.25 0 1 1  412,645.11218 A 14.25 14.25 0 1 1  440.5 645.11218 z"
-         sodipodi:ry="14.25"
-         sodipodi:rx="14.25"
-         sodipodi:cy="645.11218"
-         sodipodi:cx="426.25"
-         id="path23668"
-         style="opacity:1;fill:url(#linearGradient29664);fill-opacity:1;stroke:url(#linearGradient29666);stroke-width:0.62657404;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         id="path25630"
-         d="M 584,636.34375 C 579.45462,636.34375 575.42051,638.61872 572.96875,642.125 C 574.27536,641.94885 575.62359,641.875 577,641.875 C 586.22185,641.875 594.13713,645.98706 597.40625,651.84375 C 597.47588,651.27787 597.53125,650.71 597.53125,650.125 C 597.53125,642.52329 591.46373,636.34378 584,636.34375 z "
-         style="opacity:1;fill:url(#linearGradient29668);fill-opacity:1;stroke:url(#linearGradient29670);stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         id="path26629"
-         d="M 608.25,640.3125 C 601.17921,640.3125 595.43753,645.83021 595.4375,652.625 C 595.4375,655.41646 596.43095,657.96552 598.0625,660.03125 C 597.71257,658.95525 597.5,657.81393 597.5,656.625 C 597.49999,650.415 602.652,645.375 609,645.375 C 615.21911,645.375 620.2654,650.21418 620.46875,656.25 C 620.83739,655.10209 621.0625,653.88871 621.0625,652.625 C 621.0625,645.83021 615.32078,640.31248 608.25,640.3125 z "
-         style="fill:url(#linearGradient29672);fill-opacity:1;stroke:#ececec;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         transform="translate(159,5)"
-         d="M 450.5 645.86218 A 5.75 5.5 0 1 1  439,645.86218 A 5.75 5.5 0 1 1  450.5 645.86218 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5.75"
-         sodipodi:cy="645.86218"
-         sodipodi:cx="444.75"
-         id="path27607"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="csssc"
-         id="path27612"
-         d="M 595.38391,651.96296 C 595.38391,653.57375 594.00787,655.49849 590.96449,655.67527 C 587.74974,655.862 585.01473,653.39698 585.01473,650.37197 C 585.01473,647.34697 587.28157,644.41243 590.43416,645.06867 C 593.8311,645.77578 594.85358,649.29151 595.38391,651.96296 z "
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path27615"
-         d="M 584,660.86218 L 598.5,674.86218 L 611.5,660.86218 C 602.9585,654.61053 593.87379,653.79099 584,660.86218 z "
-         style="fill:#f6c43e;fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         id="path28586"
-         d="M 598.52978,655.87446 C 594.54135,655.78487 589.71993,657.83674 585.41421,660.92844 L 598.06041,674.87499 L 610.08579,660.2467 C 606.36104,657.51331 602.51821,655.96403 598.52978,655.87446 z M 593.40589,658.27918 C 596.07686,658.20257 599.05726,659.15366 602.20917,663.11595 C 603.32559,665.69232 601.18947,670.65906 599.04159,673.23541 L 587.2176,659.09897 C 588.59482,658.74535 591.80331,658.32516 593.40589,658.27918 z "
-         style="opacity:0.76000001;fill:url(#linearGradient29674);fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       id="rect29676"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.0701"
-       x="104.5485"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g29678"
-       transform="translate(-207.12462,-513.41685)">
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29680"
-         style="fill:url(#radialGradient29690);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient29692);stroke-width:2.39153099;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         d="M 344.35143,743.67873 C 340.21628,748.18954 333.20733,748.49407 328.69652,744.35893 C 324.18571,740.22378 323.88118,733.21485 328.01634,728.70404 C 332.15149,724.19323 339.16043,723.88869 343.67125,728.02384 C 348.18206,732.15898 348.48659,739.16792 344.35143,743.67873 L 344.35143,743.67873 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29682"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.14639039;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 336.759,736.16388 L 335.60872,736.16388 L 336.18386,726.55584 L 336.759,736.16388 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29684"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.12551381;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 336.14185,736.77701 L 336.14185,735.60586 L 343.079,736.19144 L 336.14185,736.77701 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29686"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.354114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 337.21677,736.19141 C 337.21711,736.7621 336.75457,737.22489 336.18389,737.22489 C 335.61321,737.22489 335.15067,736.7621 335.151,736.19141 C 335.15067,735.62072 335.61321,735.15793 336.18389,735.15793 C 336.75457,735.15793 337.21711,735.62072 337.21677,736.19141 L 337.21677,736.19141 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29688"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.41645598;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         d="M 348.42952,738.63306 C 350.08245,729.37578 338.87704,717.35529 327.49667,726.29396 C 321.29287,731.16672 331.29558,732.08792 331.29558,732.08792 L 316.92219,742.0067 L 315.52061,724.65302 C 315.52061,724.65302 319.65768,729.86092 323.61398,723.6396 C 329.2821,714.72642 351.70848,716.2692 348.42952,738.63306 z " />
-    </g>
-    <rect
-       id="rect29694"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.0701"
-       x="152.63174"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\redo.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g29696"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\redo.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-159.20122,-559.05369)">
-      <path
-         id="path29698"
-         style="fill:url(#radialGradient29708);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient29710);stroke-width:2.39152908;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         d="M 337.29761,789.15137 C 333.16246,793.66217 326.15353,793.9667 321.64272,789.83155 C 317.13191,785.69641 316.82738,778.68747 320.96253,774.17667 C 325.09768,769.66586 332.10661,769.36133 336.61742,773.49648 C 341.12822,777.63163 341.43275,784.64056 337.29761,789.15137 L 337.29761,789.15137 z " />
-      <path
-         id="path29700"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.14639021;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 329.70508,781.63644 L 328.5548,781.63644 L 329.12994,772.02841 L 329.70508,781.63644 z " />
-      <path
-         id="path29702"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.12551373;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 329.08793,782.24954 L 329.08793,781.07839 L 336.02508,781.66397 L 329.08793,782.24954 z " />
-      <path
-         id="path29704"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.35411379;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 330.16285,781.66407 C 330.16318,782.23476 329.70064,782.69755 329.12996,782.69755 C 328.55928,782.69755 328.09674,782.23476 328.09708,781.66407 C 328.09674,781.09338 328.55928,780.63059 329.12996,780.63059 C 329.70064,780.63059 330.16318,781.09338 330.16285,781.66407 L 330.16285,781.66407 z " />
-      <path
-         id="path29706"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.41645515;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         d="M 316.46797,784.21365 C 314.81504,774.95637 326.02044,762.93589 337.40081,771.87455 C 343.60461,776.7473 333.6019,777.6685 333.6019,777.6685 L 347.97528,787.58728 L 349.37686,770.23361 C 349.37686,770.23361 345.23979,775.44151 341.28349,769.22019 C 335.61537,760.30701 313.18901,761.84979 316.46797,784.21365 z " />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="347.33295"
-       y="434.19516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect30754" />
-    <g
-       style="display:inline"
-       id="g30756"
-       transform="translate(-46.804983,-232.72995)">
-      <g
-         id="g30758"
-         transform="matrix(0.5668049,0,0,0.8603553,21.508226,389.93057)">
-        <path
-           id="path30760"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z " />
-        <path
-           id="path30762"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 683.05261,356.83776 L 683.05261,326.03045" />
-      </g>
-      <g
-         id="g30764">
-        <path
-           sodipodi:nodetypes="cccc"
-           id="path30766"
-           d="M 420.31951,679.88826 L 409.67858,694.61724 L 426.69205,688.54529 L 420.31951,679.88826 z "
-           style="fill:url(#radialGradient30770);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6801604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path30768"
-           d="M 420.37963,679.64779 L 431.38127,669.66816 L 431.38127,683.91619 L 426.93252,688.42505 L 420.37963,679.64779 z "
-           style="fill:url(#linearGradient30772);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6801604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-    </g>
-    <path
-       id="path4972"
-       style="opacity:1;fill:#929292;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.96170586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 392.78269,198.7959 L 392.78269,199.07759 L 392.78269,240.39663 L 392.78269,240.67831 L 393.04677,240.67831 L 434.38342,240.67831 L 434.6475,240.67831 L 434.6475,240.39663 L 434.6475,199.07759 L 434.6475,198.7959 L 434.38342,198.7959 L 393.04677,198.7959 L 392.78269,198.7959 z M 393.31084,199.34166 L 434.10174,199.34166 L 434.10174,240.13255 L 393.31084,240.13255 L 393.31084,199.34166 z "
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       style="fill:url(#linearGradient4986);fill-opacity:1;stroke:#000000;stroke-width:0.50995189;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-       id="rect4974"
-       width="31.809853"
-       height="36.052494"
-       x="398.04214"
-       y="201.03586"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <text
-       xml:space="preserve"
-       style="font-size:10.18971634px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Arial"
-       x="431.22424"
-       y="195.04681"
-       id="text4976"
-       transform="scale(0.9261728,1.0797122)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"><tspan
-         sodipodi:role="line"
-         id="tspan4978"
-         x="431.22424"
-         y="195.04681"
-         style="font-weight:bold;font-family:Book Antiqua">AUTH</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 402.98695,216.58722 L 424.55371,216.58722"
-       id="path4980"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <path
-       id="path4982"
-       d="M 402.98695,220.82987 L 424.55371,220.82987"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 402.98695,225.42606 L 424.55371,225.42606"
-       id="path4984"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="104.37174"
-       y="481.91278"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8482"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_previous.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       id="rect8484"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="481.5592"
-       x="152.80856"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_next.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g8486"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_previous.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         id="path8488"
-         d="M 266.92706,936.40242 L 266.58501,962.20032"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8490"
-         d="M 260.2153,928.26495 L 266.93281,937.10378 L 273.65032,928.26495 L 260.2153,928.26495 z "
-         style="fill:url(#linearGradient8558);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8560);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path8492"
-         d="M 266.93281,946.64972 L 286.7318,933.56824 L 286.7318,958.67053 L 266.93281,946.64972 z "
-         style="fill:url(#linearGradient8562);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       style="display:inline"
-       id="g8494"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 331.03528,936.75597 L 331.37733,962.55387"
-         id="path8496" />
-      <path
-         style="fill:url(#linearGradient8564);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8566);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 324.31202,928.6185 L 331.02953,937.45733 L 337.74704,928.6185 L 324.31202,928.6185 z "
-         id="path8498" />
-      <path
-         style="fill:url(#linearGradient8568);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 331.02953,947.00327 L 311.23054,933.92179 L 311.23054,959.02408 L 331.02953,947.00327 z "
-         id="path8500"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       inkscape:export-ydpi="51"
-       inkscape:export-xdpi="51"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_last.png"
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="297.76541"
-       y="480.49854"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8502" />
-    <g
-       style="display:inline"
-       id="g8504"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_last.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path8506"
-         d="M 474.92576,945.2355 L 455.12677,932.15402 L 455.12677,957.25631 L 474.92576,945.2355 z "
-         style="fill:url(#linearGradient8570);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path8508"
-         d="M 479.17415,935.34176 L 479.5162,961.13966"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8510"
-         d="M 472.45089,927.20429 L 479.1684,936.04312 L 485.88591,927.20429 L 472.45089,927.20429 z "
-         style="fill:url(#linearGradient8572);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8574);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="936.75024"
-         x="474.46863"
-         height="17.324116"
-         width="4.9497476"
-         id="rect8512"
-         style="opacity:1;fill:url(#linearGradient8576);fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
-    <rect
-       id="rect8514"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="480.49854"
-       x="-289.95554"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_first.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="scale(-1,1)" />
-    <g
-       style="display:inline"
-       id="g8516"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_first.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:url(#linearGradient8578);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 413.04647,945.2355 L 432.84546,932.15402 L 432.84546,957.25628 L 413.04647,945.2355 z "
-         id="path8518"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 408.79808,935.34176 L 408.45603,961.13968"
-         id="path8520" />
-      <path
-         style="fill:url(#linearGradient8580);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8582);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 402.08632,927.20429 L 408.80383,936.04312 L 415.52134,927.20429 L 402.08632,927.20429 z "
-         id="path8522" />
-      <rect
-         transform="scale(-1,1)"
-         style="opacity:1;fill:url(#linearGradient8584);fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect8524"
-         width="4.9497476"
-         height="17.324116"
-         x="-413.5036"
-         y="936.75024" />
-    </g>
-    <rect
-       transform="scale(-1,1)"
-       inkscape:export-ydpi="51"
-       inkscape:export-xdpi="51"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_add.png"
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="-387.88983"
-       y="480.49854"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8526" />
-    <g
-       style="display:inline"
-       id="g8528"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_add.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         id="path8530"
-         d="M 516.29726,934.9882 L 516.63931,960.7861"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8532"
-         d="M 509.574,926.85073 L 516.29151,935.68956 L 523.00902,926.85073 L 509.574,926.85073 z "
-         style="fill:url(#linearGradient8586);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8588);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8534"
-         d="M 523.39422,945.83963 L 523.39422,950.6881 L 518.57394,950.6881 L 518.57394,955.36744 L 523.39422,955.36744 L 523.39422,960.18772 L 528.07356,960.18772 L 528.07356,955.33925 L 532.89384,955.33925 L 532.89384,950.65991 L 528.07356,950.65991 L 528.07356,945.83963 L 523.39422,945.83963 z "
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
-    </g>
-    <rect
-       id="rect8536"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="480.49854"
-       x="-435.97308"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="scale(-1,1)" />
-    <g
-       style="display:inline"
-       id="g8538"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 564.38052,934.9882 L 564.72257,960.7861"
-         id="path8540" />
-      <path
-         style="fill:url(#linearGradient8590);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8592);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 557.65726,926.85073 L 564.37477,935.68956 L 571.09228,926.85073 L 557.65726,926.85073 z "
-         id="path8542" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 571.47748,950.6881 L 566.6572,950.6881 L 566.6572,955.36744 L 571.47748,955.36744 L 576.15682,955.33925 L 580.9771,955.33925 L 580.9771,950.65991 L 576.15682,950.65991 L 571.47748,950.6881 z "
-         id="path8544" />
-    </g>
-    <rect
-       id="rect8546"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="480.85211"
-       x="-242.2258"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_list.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="scale(-1,1)" />
-    <g
-       style="display:inline"
-       id="g8548"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_list.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 370.63326,935.34175 L 370.97531,961.13965"
-         id="path8550" />
-      <path
-         style="fill:url(#linearGradient8594);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8596);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 363.91,927.20428 L 370.62751,936.04311 L 377.34502,927.20428 L 363.91,927.20428 z "
-         id="path8552" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 358.63833,946.19318 L 358.63833,951.04165 L 353.81805,951.04165 L 353.81805,955.72099 L 358.63833,955.72099 L 358.63833,960.54127 L 363.31767,960.54127 L 363.31767,955.6928 L 368.13795,955.6928 L 368.13795,951.01346 L 363.31767,951.01346 L 363.31767,946.19318 L 358.63833,946.19318 z "
-         id="path8554" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 378.08377,950.68811 L 373.26349,950.68811 L 373.26349,955.36745 L 378.08377,955.36745 L 382.76311,955.33926 L 387.58339,955.33926 L 387.58339,950.65992 L 382.76311,950.65992 L 378.08377,950.68811 z "
-         id="path8556" />
-    </g>
-    <rect
-       id="rect8964"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="435.24377"
-       x="153.08762"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_page.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="201.67343"
-       y="435.24377"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8966"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_linear.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g8968"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_linear.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-246.15952,-306.45138)">
-      <g
-         style="fill-opacity:1;stroke:url(#linearGradient9082)"
-         id="g8970"
-         transform="matrix(0.5415254,0,0,0.1703656,391.14724,651.90036)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9084);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path8972" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9086);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8974" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9088);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8976" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9090);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8978" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9092);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8980" />
-      </g>
-      <g
-         id="g8982"
-         transform="matrix(0.1244078,0,0,0.1397183,394.52898,645.2736)">
-        <rect
-           id="rect8984"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect8986"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g8988"
-         transform="matrix(0.1508028,0,0,0.1460898,467.77752,664.93465)">
-        <path
-           id="path8990"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path8992"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g8994"
-         transform="matrix(0.1508028,0,0,0.1460898,463.33954,662.15996)">
-        <path
-           id="path8996"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path8998"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-    </g>
-    <g
-       style="display:inline"
-       id="g9000"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_page.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-244.74532,-306.45138)">
-      <g
-         transform="matrix(0.5338832,0,0,0.1703656,342.00081,669.11726)"
-         id="g9002">
-        <path
-           id="path9004"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 111.87488,566.71352 L 173.41819,566.58088" />
-        <path
-           id="path9006"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,626.46842 L 173.41819,626.33578" />
-        <path
-           id="path9008"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,611.5297 L 173.41818,611.39706" />
-        <path
-           id="path9010"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,596.59099 L 173.41818,596.45834" />
-        <path
-           id="path9012"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,581.65225 L 173.41819,581.51962" />
-      </g>
-      <g
-         transform="matrix(0.1244078,0,0,0.1397183,344.52898,662.49057)"
-         id="g9014">
-        <rect
-           width="10.422997"
-           height="72.622528"
-           ry="0"
-           x="460.12595"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9016" />
-        <rect
-           width="2.5666234"
-           height="72.622528"
-           x="473.64929"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9018" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,417.77752,682.15163)"
-         id="g9020">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9022" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9024" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,413.33954,679.37694)"
-         id="g9026">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9028" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9030" />
-      </g>
-      <g
-         transform="matrix(0.5415254,0,0,0.1703656,341.14724,651.90036)"
-         id="g9032">
-        <path
-           id="path9034"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 111.87488,566.71352 L 173.41819,566.58088" />
-        <path
-           id="path9036"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,626.46842 L 173.41819,626.33578" />
-        <path
-           id="path9038"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,611.5297 L 173.41818,611.39706" />
-        <path
-           id="path9040"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,596.59099 L 173.41818,596.45834" />
-        <path
-           id="path9042"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,581.65225 L 173.41819,581.51962" />
-      </g>
-      <g
-         transform="matrix(0.1244078,0,0,0.1397183,344.52898,645.2736)"
-         id="g9044">
-        <rect
-           width="10.422997"
-           height="72.622528"
-           ry="0"
-           x="460.12595"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9046" />
-        <rect
-           width="2.5666234"
-           height="72.622528"
-           x="473.64929"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9048" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,417.77752,664.93465)"
-         id="g9050">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9052" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9054" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,413.33954,662.15996)"
-         id="g9056">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9058" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9060" />
-      </g>
-      <rect
-         width="0.31930798"
-         height="10.146696"
-         x="434.70465"
-         y="748.70496"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="rect9062" />
-      <g
-         id="g9064"
-         transform="matrix(0.1508028,0,0,0.1460898,424.52752,664.93465)">
-        <path
-           id="path9066"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path9068"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,431.27752,667.43465)"
-         id="g9070">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9072" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9074" />
-      </g>
-      <g
-         id="g9076"
-         transform="matrix(-0.1244078,0,0,0.1397183,491.76721,662.2736)">
-        <rect
-           id="rect9078"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect9080"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="440.95456"
-       y="147.27452"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect10556"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_add.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g10558"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_add.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-2.2404833,-253.78593)">
-      <path
-         id="path10560"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.69704974px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 446.48376,404.46465 L 446.48376,438.99017" />
-      <path
-         id="path10562"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 452.22135,404.83883 L 452.22135,439.10134" />
-      <path
-         id="path10564"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 457.16922,404.83883 L 457.16922,439.10134" />
-      <path
-         id="path10566"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 462.1171,404.83883 L 462.1171,439.10134" />
-      <path
-         id="path10568"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 467.06498,404.83883 L 467.06498,439.10134" />
-      <path
-         id="path10570"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 472.01285,404.83883 L 472.01285,439.10134" />
-      <path
-         id="path10572"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 476.96073,404.83883 L 476.96073,439.10134" />
-      <path
-         id="path10574"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.90861,404.83883 L 481.90861,439.10134" />
-      <path
-         id="path10576"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 481.94255,404.62435 L 447.34974,404.62435" />
-      <path
-         id="path10578"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,413.17627 L 447.34974,413.17627" />
-      <path
-         id="path10580"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,421.7282 L 447.34974,421.7282" />
-      <path
-         id="path10582"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,430.28013 L 447.34974,430.28013" />
-      <path
-         id="path10584"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,438.83205 L 447.34974,438.83205" />
-      <rect
-         y="404.64941"
-         x="452.19183"
-         height="8.4911966"
-         width="19.804905"
-         id="rect10586"
-         style="opacity:1;fill:url(#linearGradient10632);fill-opacity:1;stroke:#000000;stroke-width:0.29408514;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:url(#linearGradient10634);fill-opacity:1;stroke:#000000;stroke-width:0.32790762;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect10588"
-         width="24.720829"
-         height="8.4573736"
-         x="457.15851"
-         y="413.15164" />
-      <rect
-         y="421.62128"
-         x="447.24338"
-         height="8.4886465"
-         width="20.155907"
-         id="rect10590"
-         style="opacity:1;fill:url(#linearGradient10636);fill-opacity:1;stroke:#000000;stroke-width:0.29663515;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path10592"
-         d="M 469.30055,421.51995 L 469.30055,426.36842 L 464.48027,426.36842 L 464.48027,431.04776 L 469.30055,431.04776 L 469.30055,435.86804 L 473.97989,435.86804 L 473.97989,431.01957 L 478.80017,431.01957 L 478.80017,426.34023 L 473.97989,426.34023 L 473.97989,421.51995 L 469.30055,421.51995 z "
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
-    </g>
-    <rect
-       id="rect10594"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="198.53976"
-       x="441.30811"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g10596"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-2.2404833,-253.78593)">
-      <path
-         d="M 446.83731,455.72989 L 446.83731,490.25541"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.69704974px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path10598" />
-      <path
-         d="M 452.5749,456.10407 L 452.5749,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10600" />
-      <path
-         d="M 457.52277,456.10407 L 457.52277,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10602" />
-      <path
-         d="M 462.47065,456.10407 L 462.47065,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10604" />
-      <path
-         d="M 467.41853,456.10407 L 467.41853,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10606" />
-      <path
-         d="M 472.3664,456.10407 L 472.3664,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10608" />
-      <path
-         d="M 477.31428,456.10407 L 477.31428,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10610" />
-      <path
-         d="M 482.26216,456.10407 L 482.26216,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10612" />
-      <path
-         d="M 482.2961,455.88959 L 447.70329,455.88959"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path10614" />
-      <path
-         d="M 482.2961,464.44151 L 447.70329,464.44151"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10616" />
-      <path
-         d="M 482.2961,472.99344 L 447.70329,472.99344"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10618" />
-      <path
-         d="M 482.2961,481.54537 L 447.70329,481.54537"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10620" />
-      <path
-         d="M 482.2961,490.09729 L 447.70329,490.09729"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10622" />
-      <rect
-         style="fill:url(#linearGradient10638);fill-opacity:1;stroke:#000000;stroke-width:0.29408514;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect10624"
-         width="19.804905"
-         height="8.4911966"
-         x="452.54538"
-         y="455.91464" />
-      <rect
-         y="464.41687"
-         x="457.51205"
-         height="8.4573736"
-         width="24.720829"
-         id="rect10626"
-         style="fill:url(#linearGradient10640);fill-opacity:1;stroke:#000000;stroke-width:0.32790762;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="fill:url(#linearGradient10642);fill-opacity:1;stroke:#000000;stroke-width:0.29663515;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect10628"
-         width="20.155907"
-         height="8.4886465"
-         x="447.59692"
-         y="472.88651" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 468.6541,479.13366 L 463.83382,479.13366 L 463.83382,483.813 L 468.6541,483.813 L 473.33344,483.78481 L 478.15372,483.78481 L 478.15372,479.10547 L 473.33344,479.10547 L 468.6541,479.13366 z "
-         id="path10630" />
-    </g>
-    <rect
-       inkscape:export-ydpi="51"
-       inkscape:export-xdpi="51"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_multitrack.png"
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="249.15182"
-       y="435.07074"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect11028" />
-    <g
-       style="display:inline"
-       id="g11030"
-       transform="translate(-254.74712,-300.96752)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_multitrack.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51">
-      <g
-         id="g11032"
-         transform="matrix(0.4447275,0,0,0.1703656,464.02114,641.74351)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path11034" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11036" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11038" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11040" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11042" />
-      </g>
-      <g
-         id="g11044"
-         transform="matrix(0.1244078,0,0,0.1397183,456.595,635.11675)">
-        <rect
-           id="rect11046"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect11048"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g11050"
-         transform="matrix(0.1508028,0,0,0.1460898,529.84354,654.7778)">
-        <path
-           id="path11052"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11054"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g11056"
-         transform="matrix(0.1508028,0,0,0.1460898,525.40556,652.00311)">
-        <path
-           id="path11058"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11060"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,536.59354,654.7778)"
-         id="g11062">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11064" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11066" />
-      </g>
-      <text
-         id="text11068"
-         y="746.97223"
-         x="506.70752"
-         style="font-size:11px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           y="746.97223"
-           x="506.70752"
-           id="tspan11070"
-           sodipodi:role="line">1</tspan><tspan
-           id="tspan11072"
-           y="760.72223"
-           x="506.70752"
-           sodipodi:role="line">2</tspan><tspan
-           id="tspan11074"
-           y="774.47223"
-           x="506.70752"
-           sodipodi:role="line">3</tspan></text>
-      <g
-         transform="matrix(0.4447275,0,0,0.1703656,464.02114,655.24351)"
-         id="g11076">
-        <path
-           id="path11078"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 111.87488,566.71352 L 173.41819,566.58088" />
-        <path
-           id="path11080"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,626.46842 L 173.41819,626.33578" />
-        <path
-           id="path11082"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,611.5297 L 173.41818,611.39706" />
-        <path
-           id="path11084"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,596.59099 L 173.41818,596.45834" />
-        <path
-           id="path11086"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,581.65225 L 173.41819,581.51962" />
-      </g>
-      <g
-         transform="matrix(0.1244078,0,0,0.1397183,456.595,648.61675)"
-         id="g11088">
-        <rect
-           width="10.422997"
-           height="72.622528"
-           ry="0"
-           x="460.12595"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect11090" />
-        <rect
-           width="2.5666234"
-           height="72.622528"
-           x="473.64929"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect11092" />
-      </g>
-      <g
-         id="g11094"
-         transform="matrix(0.4447275,0,0,0.1703656,464.02114,668.49351)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path11096" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11098" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11100" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11102" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11104" />
-      </g>
-      <g
-         id="g11106"
-         transform="matrix(0.1244078,0,0,0.1397183,456.595,661.86675)">
-        <rect
-           id="rect11108"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect11110"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,529.84354,668.21283)"
-         id="g11112">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11114" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11116" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,525.40556,665.43814)"
-         id="g11118">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11120" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11122" />
-      </g>
-      <g
-         id="g11124"
-         transform="matrix(0.1508028,0,0,0.1460898,536.59354,668.21283)">
-        <path
-           id="path11126"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11128"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g11130"
-         transform="matrix(0.1508028,0,0,0.1460898,529.66676,681.47108)">
-        <path
-           id="path11132"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11134"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g11136"
-         transform="matrix(0.1508028,0,0,0.1460898,525.22878,678.69639)">
-        <path
-           id="path11138"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11140"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,536.41676,681.47108)"
-         id="g11142">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11144" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11146" />
-      </g>
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="298.33298"
-       y="433.69519"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect12376" />
-    <g
-       style="display:inline"
-       id="g12378"
-       transform="matrix(0.5700447,0,0,0.2618828,237.50828,292.61349)">
-      <path
-         d="M 111.87488,566.71352 L 173.41819,566.58088"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path12380" />
-      <path
-         d="M 111.87488,626.46842 L 173.41819,626.33578"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12382" />
-      <path
-         d="M 111.87488,611.5297 L 173.41818,611.39706"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12384" />
-      <path
-         d="M 111.87488,596.59099 L 173.41818,596.45834"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12386" />
-      <path
-         d="M 111.87488,581.65225 L 173.41819,581.51962"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12388" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12390"
-       transform="matrix(0.1912374,0,0,0.2147724,213.41104,282.42696)">
-      <rect
-         id="rect12392"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         y="738.49548"
-         x="460.12595"
-         ry="0"
-         height="72.622528"
-         width="10.422997" />
-      <rect
-         id="rect12394"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         y="738.49548"
-         x="473.64929"
-         height="72.622528"
-         width="2.5666234" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12396"
-       transform="matrix(0.2318113,0,0,0.2245665,326.00734,312.64956)">
-      <path
-         id="path12398"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-      <path
-         id="path12400"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M -7.156011,622.3181 L -7.156011,572.4789" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12402"
-       transform="matrix(0.2318113,0,0,0.2245665,319.18536,308.38436)">
-      <path
-         id="path12404"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-      <path
-         id="path12406"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M -7.156011,622.3181 L -7.156011,572.4789" />
-    </g>
-    <g
-       style="display:inline"
-       transform="matrix(0.2318113,0,0,0.2245665,336.38332,312.64956)"
-       id="g12408">
-      <path
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path12410" />
-      <path
-         d="M -7.156011,622.3181 L -7.156011,572.4789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path12412" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12414"
-       transform="translate(-140.61944,-77.569368)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path12416"
-         d="M 440.58819,540.43464 C 448.06239,535.50357 447.97881,533.31371 454.73032,532.65647 C 460.92638,533.06006 463.18552,536.33993 469.22601,540.08109 C 465.1484,542.83292 461.92696,547.38979 455.08387,547.85926 C 448.23806,547.45201 446.00644,543.32344 440.58819,540.43464 z "
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="translate(-2.0606602,-1.75)"
-         d="M 465.62982 542.00787 A 8.3085051 7.2478447 0 1 1  449.01281,542.00787 A 8.3085051 7.2478447 0 1 1  465.62982 542.00787 z"
-         sodipodi:ry="7.2478447"
-         sodipodi:rx="8.3085051"
-         sodipodi:cy="542.00787"
-         sodipodi:cx="457.32132"
-         id="path12418"
-         style="fill:url(#linearGradient12422);fill-opacity:1;stroke:url(#linearGradient12424);stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(-1,-1.75)"
-         d="M 458.91229 542.00787 A 2.8284271 3.0052037 0 1 1  453.25544,542.00787 A 2.8284271 3.0052037 0 1 1  458.91229 542.00787 z"
-         sodipodi:ry="3.0052037"
-         sodipodi:rx="2.8284271"
-         sodipodi:cy="542.00787"
-         sodipodi:cx="456.08386"
-         id="path12420"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="344.33295"
-       y="199.69516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect14627" />
-    <rect
-       id="rect14629"
-       style="fill:url(#linearGradient14671);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="203.6138"
-       x="348.25156"
-       height="33.496006"
-       width="33.496006" />
-    <g
-       style="display:inline"
-       id="g14631"
-       transform="matrix(0.4620139,0,0,0.3894886,57.644817,0.1596858)">
-      <path
-         id="path14633"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 646.25,601.61218 L 646.25,529.11218" />
-      <rect
-         id="rect14635"
-         style="fill:url(#linearGradient14673);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="535.61218"
-         x="639"
-         height="27"
-         width="14.5" />
-      <path
-         id="path14637"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 665.25,601.61218 L 665.25,529.11218" />
-      <rect
-         id="rect14639"
-         style="fill:url(#linearGradient14675);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="564.11218"
-         x="658"
-         height="27"
-         width="14.5" />
-      <path
-         id="path14641"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 684.25,601.61218 L 684.25,529.11218" />
-      <rect
-         id="rect14643"
-         style="fill:url(#linearGradient14677);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="546.11218"
-         x="677"
-         height="27"
-         width="14.5" />
-    </g>
-    <rect
-       id="rect14645"
-       style="fill:url(#linearGradient14679);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="203.6138"
-       x="348.25156"
-       height="33.496006"
-       width="33.496006" />
-    <path
-       id="path14647"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.27261233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 356.22131,235.25979 L 356.22131,207.02187" />
-    <path
-       id="path14649"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.27261233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 364.99957,235.25979 L 364.99957,207.02187" />
-    <path
-       id="path14651"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.27261233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 373.77784,235.25979 L 373.77784,207.02187" />
-    <g
-       style="display:inline"
-       id="g14653"
-       transform="translate(-96.729733,-365.93933)">
-      <rect
-         y="578.69958"
-         x="467.31976"
-         height="10.957698"
-         width="6.6963706"
-         id="rect14655"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.34436721;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="580.40417"
-         x="468.41556"
-         height="7.5486355"
-         width="4.6265831"
-         id="rect14657"
-         style="opacity:1;fill:url(#linearGradient14681);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       style="display:inline"
-       transform="translate(-105.74534,-360.63603)"
-       id="g14659">
-      <rect
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.34436721;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect14661"
-         width="6.6963706"
-         height="10.957698"
-         x="467.31976"
-         y="578.69958" />
-      <rect
-         style="opacity:1;fill:url(#linearGradient14683);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect14663"
-         width="4.6265831"
-         height="7.5486355"
-         x="468.41556"
-         y="580.40417" />
-    </g>
-    <g
-       style="display:inline"
-       id="g14665"
-       transform="translate(-114.4074,-363.11091)">
-      <rect
-         y="578.69958"
-         x="467.31976"
-         height="10.957698"
-         width="6.6963706"
-         id="rect14667"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.34436721;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="580.40417"
-         x="468.41556"
-         height="7.5486355"
-         width="4.6265831"
-         id="rect14669"
-         style="opacity:1;fill:url(#linearGradient14685);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="296.17447"
-       y="198.36298"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect16681" />
-    <g
-       id="g16707"
-       transform="translate(849.99998,-63.999998)">
-      <rect
-         y="269.53003"
-         x="-549.65851"
-         height="22.5"
-         width="33.5"
-         id="rect16683"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <rect
-         y="273.03003"
-         x="-546.15851"
-         height="9"
-         width="26"
-         id="rect16685"
-         style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <text
-         id="text16687"
-         y="280.08209"
-         x="-539.21191"
-         style="font-size:7.89853191px;font-style:normal;font-weight:normal;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           y="280.08209"
-           x="-539.21191"
-           id="tspan16689"
-           sodipodi:role="line">1234</tspan></text>
-      <path
-         id="path16691"
-         d="M -546.15852,286.03003 L -520.65852,286.03003"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <g
-         transform="translate(-703.26566,-480.40358)"
-         id="g16693"
-         style="display:inline">
-        <path
-           style="fill:url(#linearGradient16699);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient16701);stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 163.21429,762.8979 L 163.21429,778.96933 C 169.18918,776.60095 175.46615,774.07658 180,770.75504 C 174.66202,767.10698 169.02779,764.64388 163.21429,762.8979 z "
-           id="path16695"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:url(#linearGradient16703);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient16705);stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 171.79136,769.68303 C 168.72709,769.68303 165.85828,770.1268 163.49554,770.88459 L 163.49554,777.98214 C 169.16989,775.88352 175.12269,773.64741 179.45825,770.71693 C 177.21614,770.06809 174.60773,769.68302 171.79136,769.68303 z "
-           id="path16697" />
-      </g>
-    </g>
-    <rect
-       style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect17763"
-       width="66.5"
-       height="60"
-       x="202.50003"
-       y="587.36218"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <g
-       id="g24597"
-       transform="translate(-438.00002,341.99999)">
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="5.250133"
-         height="5.3034863"
-         rx="1.6616579"
-         ry="1.6616576"
-         x="596.60822"
-         y="247.18004"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03204477;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17729" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="65.647148"
-         height="15.808088"
-         rx="3.6109443"
-         ry="3.6109436"
-         x="550.94476"
-         y="245.75606"
-         style="color:#000000;fill:url(#linearGradient20674);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17731" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="65.644463"
-         height="51.361164"
-         rx="0"
-         x="550.95654"
-         y="254.09529"
-         style="color:#000000;fill:url(#linearGradient20676);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17733" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         d="M 610.62428,248.50849 L 610.19569,248.93253 L 611.09722,249.83176 L 610.19569,250.72369 L 610.62428,251.15503 L 611.52581,250.25579 L 612.43473,251.15503 L 612.86333,250.72369 L 611.9618,249.83176 L 612.86333,248.93253 L 612.43473,248.50849 L 611.52581,249.40773 L 610.62428,248.50849 z "
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.2487205;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path17735" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="3.0691075"
-         height="3.0364239"
-         x="603.8468"
-         y="248.31357"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.70561117;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17737" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="3.3248663"
-         height="0.33738044"
-         x="597.57086"
-         y="249.66309"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.70561117;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17739" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="10.912381"
-         height="9.4466524"
-         x="558.87445"
-         y="268.24072"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17741" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="10.912381"
-         height="9.4466524"
-         x="558.87445"
-         y="287.42447"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17743" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         id="path18734"
-         d="M 559,271.36218 L 563.5,276.36218 L 569.5,266.86218"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         id="path20678"
-         d="M 576,272.36218 L 607.5,272.36218"
-         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#333333;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#333333;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 576,291.86218 L 607.5,291.86218"
-         id="path21649" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         id="path21651"
-         d="M 576,276.86218 L 607.5,276.86218"
-         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#333333;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g24582"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85"
-       transform="translate(-420.00002,341.99999)">
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path21665"
-         d="M 650,249.36218 L 631,267.86218 C 685.26159,262.68371 667.38995,281.08726 654.5,297.86218 C 691.93444,270.67633 683.07012,256.59391 650,249.36218 z "
-         style="fill:url(#linearGradient23611);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <text
-         id="text21661"
-         y="296.36218"
-         x="628.5"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           style="font-size:36px;font-weight:normal;font-family:Century"
-           y="296.36218"
-           x="628.5"
-           id="tspan21663"
-           sodipodi:role="line">Aa</tspan></text>
-    </g>
-    <rect
-       inkscape:export-ydpi="85"
-       inkscape:export-xdpi="85"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       y="587.36218"
-       x="202.50003"
-       height="60"
-       width="66.5"
-       id="rect24587"
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:export-ydpi="85"
-       inkscape:export-xdpi="85"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       id="g24589"
-       transform="translate(-420.00002,341.99999)">
-      <path
-         style="fill:url(#linearGradient4519);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 650,249.36218 L 631,267.86218 C 685.26159,262.68371 667.38995,281.08726 654.5,297.86218 C 691.93444,270.67633 683.07012,256.59391 650,249.36218 z "
-         id="path24591"
-         sodipodi:nodetypes="cccc" />
-      <text
-         xml:space="preserve"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="628.5"
-         y="296.36218"
-         id="text24593"><tspan
-           sodipodi:role="line"
-           id="tspan24595"
-           x="628.5"
-           y="296.36218"
-           style="font-size:36px;font-weight:normal;font-family:Century">Aa</tspan></text>
-    </g>
-    <rect
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect31683"
-       width="66.5"
-       height="60"
-       x="107.91422"
-       y="684.28351"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_authors.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <g
-       id="g32727"
-       transform="matrix(0.6116588,0,0,0.6116588,-276.80752,381.33365)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_authors.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85">
-      <g
-         id="g32699">
-        <path
-           style="fill:url(#linearGradient32738);fill-opacity:1;stroke:url(#linearGradient32740);stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
-           d="M 660.78125,510 C 650.82801,510 642.75003,517.45241 642.75,526.625 C 642.75,531.03542 644.64187,535.0241 647.6875,538 C 642.01881,543.0774 636.5037,549.9304 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 687.01058,550.47601 680.87321,543.03088 674.21875,537.6875 C 677.07541,534.74701 678.81249,530.87939 678.8125,526.625 C 678.8125,517.45241 670.73449,510 660.78125,510 z "
-           id="path31685" />
-        <path
-           style="fill:url(#linearGradient32742);fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 659.71875,539.71875 C 653.11193,539.71875 647.00854,541.33674 641.96875,544.09375 C 638.51984,548.56832 635.48631,554.46212 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 688.34092,557.75226 686.47331,552.96151 684.15625,549 C 678.45679,543.34318 669.61983,539.71876 659.71875,539.71875 z "
-           id="path31710" />
-      </g>
-      <g
-         id="g32715"
-         transform="translate(43.84062,1.4142136)">
-        <path
-           style="fill:url(#linearGradient32744);fill-opacity:1;stroke:url(#linearGradient32746);stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
-           d="M 660.78125,510 C 650.82801,510 642.75003,517.45241 642.75,526.625 C 642.75,531.03542 644.64187,535.0241 647.6875,538 C 642.01881,543.0774 636.5037,549.9304 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 687.01058,550.47601 680.87321,543.03088 674.21875,537.6875 C 677.07541,534.74701 678.81249,530.87939 678.8125,526.625 C 678.8125,517.45241 670.73449,510 660.78125,510 z "
-           id="path32717" />
-        <path
-           style="fill:url(#linearGradient32748);fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 659.71875,539.71875 C 653.11193,539.71875 647.00854,541.33674 641.96875,544.09375 C 638.51984,548.56832 635.48631,554.46212 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 688.34092,557.75226 686.47331,552.96151 684.15625,549 C 678.45679,543.34318 669.61983,539.71876 659.71875,539.71875 z "
-           id="path32719" />
-      </g>
-      <g
-         transform="translate(22.627417,9.1923882)"
-         id="g32703">
-        <path
-           id="path32705"
-           d="M 660.78125,510 C 650.82801,510 642.75003,517.45241 642.75,526.625 C 642.75,531.03542 644.64187,535.0241 647.6875,538 C 642.01881,543.0774 636.5037,549.9304 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 687.01058,550.47601 680.87321,543.03088 674.21875,537.6875 C 677.07541,534.74701 678.81249,530.87939 678.8125,526.625 C 678.8125,517.45241 670.73449,510 660.78125,510 z "
-           style="fill:url(#linearGradient32750);fill-opacity:1;stroke:url(#linearGradient32752);stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path32707"
-           d="M 659.71875,539.71875 C 653.11193,539.71875 647.00854,541.33674 641.96875,544.09375 C 638.51984,548.56832 635.48631,554.46212 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 688.34092,557.75226 686.47331,552.96151 684.15625,549 C 678.45679,543.34318 669.61983,539.71876 659.71875,539.71875 z "
-           style="fill:url(#linearGradient32754);fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-    <rect
-       inkscape:export-ydpi="85"
-       inkscape:export-xdpi="85"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_license.png"
-       y="676.3252"
-       x="205.0513"
-       height="60"
-       width="66.5"
-       id="rect32756"
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       id="g34724"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_license.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85"
-       transform="translate(-434.00002,159.99999)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path32758"
-         d="M 649.12402,524.15342 C 650.92972,539.70977 646.70505,555.26611 656.9022,570.82246 L 697.91439,570.11536 C 685.57145,554.79471 690.25808,539.47407 688.0149,524.15342 L 649.12402,524.15342 z "
-         style="fill:url(#linearGradient34698);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient34722);stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path34700"
-         d="M 655.48799,530.51738 L 667.5088,530.51738"
-         style="fill:#666666;fill-rule:evenodd;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path34702"
-         d="M 656.19509,536.88134 L 683.06515,536.88134"
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 656.19509,541.12398 L 683.06515,541.12398"
-         id="path34706" />
-      <path
-         id="path34708"
-         d="M 656.19509,545.36662 L 683.06515,545.36662"
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 656.19509,549.60926 L 683.06515,549.60926"
-         id="path34710" />
-      <path
-         id="path34712"
-         d="M 657.6093,553.8519 L 684.47936,553.8519"
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:0.68351835px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 661.58554,561.63007 L 674.13916,561.63007"
-         id="path34714" />
-    </g>
-    <rect
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect34734"
-       width="66.5"
-       height="60"
-       x="288.56601"
-       y="675.0567"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_description.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <path
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:url(#linearGradient34743);fill-opacity:1;stroke:url(#linearGradient35720);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       d="M 314.26497,681.62011 L 326.98372,681.62011 L 326.98372,690.27636 L 314.26497,690.27636 L 314.26497,681.62011 z M 314.26497,694.24511 L 326.98372,694.24511 L 326.98372,727.43261 L 314.26497,727.43261 L 314.26497,694.24511 z "
-       id="text34736"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_description.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <rect
-       id="rect6511"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.30661"
-       x="584.61633"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_1.png"
-       inkscape:export-xdpi="51.581074"
-       inkscape:export-ydpi="51.581074" />
-    <rect
-       id="rect6513"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.68161"
-       x="584.61633"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_2.png"
-       inkscape:export-xdpi="51.581074"
-       inkscape:export-ydpi="51.581074" />
-    <text
-       xml:space="preserve"
-       style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="779.29431"
-       y="358.28033"
-       id="text3736"
-       transform="scale(0.7694351,1.2996548)"
-       inkscape:label="#text3736"><tspan
-         sodipodi:role="line"
-         id="tspan3738"
-         x="779.29431"
-         y="358.28033">1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="779.29431"
-       y="393.19342"
-       id="text3740"
-       transform="scale(0.7694351,1.2996548)"><tspan
-         sodipodi:role="line"
-         id="tspan3742"
-         x="779.29431"
-         y="393.19342">2</tspan></text>
-  </g>
-</svg>
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/song_properties.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/song_properties.png
deleted file mode 100644
index dfdf04c1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/song_properties.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/splash.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/splash.png
deleted file mode 100644
index 28885f3d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/splash.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tempo.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/tempo.png
deleted file mode 100644
index a06586e8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tempo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tempoicon.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/tempoicon.png
deleted file mode 100644
index 922047c4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tiednote.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/tiednote.png
deleted file mode 100644
index f1a76314..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tiednote.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/timesignature.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/timesignature.png
deleted file mode 100644
index 657c7573..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/timesignature.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/track_add.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/track_add.png
deleted file mode 100644
index 68703b57..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/track_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/track_remove.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/track_remove.png
deleted file mode 100644
index 00f3b5a6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/track_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport.png
deleted file mode 100644
index 84ba4ce4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_first_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_first_1.png
deleted file mode 100644
index 0df6449a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_first_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_first_2.png
deleted file mode 100644
index bf6f597e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_first_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_first_1.png
deleted file mode 100644
index ec9f68bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_first_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_first_2.png
deleted file mode 100644
index 9b1c98e0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_last_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_last_1.png
deleted file mode 100644
index 58308c97..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_last_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_last_2.png
deleted file mode 100644
index 6f995303..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_next_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_next_1.png
deleted file mode 100644
index 153ecf4e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_next_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_next_2.png
deleted file mode 100644
index af395e07..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_pause.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_pause.png
deleted file mode 100644
index 6d01ef3a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_play_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_play_1.png
deleted file mode 100644
index bae4b680..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_play_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_play_2.png
deleted file mode 100644
index 2a0fcd9d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_previous_1.png
deleted file mode 100644
index 648de6b1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_previous_2.png
deleted file mode 100644
index 9dc2973e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_stop_1.png
deleted file mode 100644
index c9c7d9e8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_stop_2.png
deleted file mode 100644
index 586d3df5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_last_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_last_1.png
deleted file mode 100644
index 415edb97..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_last_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_last_2.png
deleted file mode 100644
index 3afb923a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_metronome.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_metronome.png
deleted file mode 100644
index be8f4119..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_mode.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_mode.png
deleted file mode 100644
index b5720041..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_next_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_next_1.png
deleted file mode 100644
index 7fcfe81f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_next_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_next_2.png
deleted file mode 100644
index e687766b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_pause.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_pause.png
deleted file mode 100644
index da2f5427..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_play_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_play_1.png
deleted file mode 100644
index e73beb0d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_play_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_play_2.png
deleted file mode 100644
index 38573cc3..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_previous_1.png
deleted file mode 100644
index b89f4713..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_previous_2.png
deleted file mode 100644
index c3d41af4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_stop_1.png
deleted file mode 100644
index a6c28e8f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_stop_2.png
deleted file mode 100644
index 0a2355ba..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tupleto.png b/TuxGuitar-testing/platform-all/share/skins/blue_serious/tupleto.png
deleted file mode 100644
index eb47b50d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/blue_serious/tupleto.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/1.png
deleted file mode 100644
index e5d1bf37..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/16.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/16.png
deleted file mode 100644
index c2ab703c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/2.png
deleted file mode 100644
index f7fa1cfd..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/32.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/32.png
deleted file mode 100644
index a88e284b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/4.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/4.png
deleted file mode 100644
index 603799d5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/4.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/64.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/64.png
deleted file mode 100644
index f91b54f8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/8.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/8.png
deleted file mode 100644
index 42a3efda..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/8.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/about_authors.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/about_authors.png
deleted file mode 100644
index 7c1a345d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/about_authors.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/about_description.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/about_description.png
deleted file mode 100644
index d3082947..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/about_description.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/about_license.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/about_license.png
deleted file mode 100644
index dbdd97a2..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/about_license.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_back.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_back.png
deleted file mode 100644
index 8a36e093..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_back.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_file.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_file.png
deleted file mode 100644
index 50882171..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_file.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_folder.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_folder.png
deleted file mode 100644
index 1b19b3ca..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_new.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_new.png
deleted file mode 100644
index 72a6ea21..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_refresh.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_refresh.png
deleted file mode 100644
index 42d08729..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_root.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_root.png
deleted file mode 100644
index db0d5a5f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/browser_root.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/chord.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/chord.png
deleted file mode 100644
index 97fbd00b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/chord.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/closerepeat.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/closerepeat.png
deleted file mode 100644
index cd0810ac..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/division-type.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/division-type.png
deleted file mode 100644
index eb47b50d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/division-type.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dotted.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dotted.png
deleted file mode 100644
index d963a7e5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/doubledotted.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/doubledotted.png
deleted file mode 100644
index 0ae90818..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_f.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_f.png
deleted file mode 100644
index 042cf3db..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_ff.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_ff.png
deleted file mode 100644
index dc16cd8f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_fff.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_fff.png
deleted file mode 100644
index 94dedd52..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_mf.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_mf.png
deleted file mode 100644
index 6a2d1082..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_mp.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_mp.png
deleted file mode 100644
index acb00776..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_p.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_p.png
deleted file mode 100644
index 8560e077..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_pp.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_pp.png
deleted file mode 100644
index b5f3145f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_ppp.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_ppp.png
deleted file mode 100644
index 1c14f87e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_edition.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_edition.png
deleted file mode 100644
index 4ad565ae..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_edition_no_natural.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_edition_no_natural.png
deleted file mode 100644
index 277f7ba7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_selection.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_selection.png
deleted file mode 100644
index 957b5ef2..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_redo.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_redo.png
deleted file mode 100644
index 117501f1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_undo.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_undo.png
deleted file mode 100644
index ecc4266c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_voice_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_voice_1.png
deleted file mode 100644
index 95957147..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_voice_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_voice_2.png
deleted file mode 100644
index f9a90d44..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_accentuated.png
deleted file mode 100644
index ccbac086..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_bend.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_bend.png
deleted file mode 100644
index a49c9602..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_dead.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_dead.png
deleted file mode 100644
index 68111440..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_fade_in.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_fade_in.png
deleted file mode 100644
index 0b48773b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_ghost.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_ghost.png
deleted file mode 100644
index af04c4e8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_grace.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_grace.png
deleted file mode 100644
index 079f3452..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_hammer.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_hammer.png
deleted file mode 100644
index 5eec73ab..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_harmonic.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_harmonic.png
deleted file mode 100644
index 29239335..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_heavy_accentuated.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_heavy_accentuated.png
deleted file mode 100644
index c62fac99..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_palm_mute.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_palm_mute.png
deleted file mode 100644
index 77144368..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_popping.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_popping.png
deleted file mode 100644
index 8012eef9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_slapping.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_slapping.png
deleted file mode 100644
index dc64d579..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_slide.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_slide.png
deleted file mode 100644
index 731a67f3..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_staccato.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_staccato.png
deleted file mode 100644
index f3adff74..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tapping.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tapping.png
deleted file mode 100644
index c624cf1d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tremolo_bar.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tremolo_bar.png
deleted file mode 100644
index ed7fd9d6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tremolo_picking.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tremolo_picking.png
deleted file mode 100644
index f3daa7d7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_trill.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_trill.png
deleted file mode 100644
index f9524f87..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_vibrato.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_vibrato.png
deleted file mode 100644
index ae5dcca7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/firstfret.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/firstfret.png
deleted file mode 100644
index 2313352d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/firstfret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/fret.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/fret.png
deleted file mode 100644
index 479d6a7b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/fret.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/fretboard.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/fretboard.png
deleted file mode 100644
index 703cc167..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/fretboard.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/grace.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/grace.png
deleted file mode 100644
index 6c67a4cb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/grace.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-16x16.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-16x16.png
deleted file mode 100644
index 4ba40d81..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-24x24.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-24x24.png
deleted file mode 100644
index e86a3e3f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-32x32.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-32x32.png
deleted file mode 100644
index ff0884f4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-48x48.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-48x48.png
deleted file mode 100644
index 39267cf9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-64x64.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-64x64.png
deleted file mode 100644
index 68352107..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-96x96.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-96x96.png
deleted file mode 100644
index 5941ec30..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.icns b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.icns
deleted file mode 100644
index 430239df..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.icns and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.ico b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.ico
deleted file mode 100644
index 5a7b85f0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.ico and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.png
deleted file mode 100644
index 68352107..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/icon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_compact.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_compact.png
deleted file mode 100644
index d765101e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_linear.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_linear.png
deleted file mode 100644
index cce67ef6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_multitrack.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_multitrack.png
deleted file mode 100644
index ce963dc1..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_page.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_page.png
deleted file mode 100644
index b7d11f79..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_page.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_score.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_score.png
deleted file mode 100644
index 6f4c454c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/layout_score.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/logo.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/logo.png
deleted file mode 100644
index 06e6deb8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/logo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_add.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_add.png
deleted file mode 100644
index 627c7a3c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_first.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_first.png
deleted file mode 100644
index 94383cbf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_first.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_last.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_last.png
deleted file mode 100644
index 6d4f6624..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_last.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_list.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_list.png
deleted file mode 100644
index cd216eaf..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_list.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_next.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_next.png
deleted file mode 100644
index f501f5bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_next.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_previous.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_previous.png
deleted file mode 100644
index 46179024..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_remove.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_remove.png
deleted file mode 100644
index bb6b6f6c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/mixer.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/mixer.png
deleted file mode 100644
index 8407d19a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/mixer.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/new.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/new.png
deleted file mode 100644
index 72a6ea21..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/new.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/open.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/open.png
deleted file mode 100644
index 6bb147ad..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/open.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/openrepeat.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/openrepeat.png
deleted file mode 100644
index 680d64fc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_language.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/option_language.png
deleted file mode 100644
index 88435ccb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_language.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_skin.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/option_skin.png
deleted file mode 100644
index 7a19c688..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_skin.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_sound.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/option_sound.png
deleted file mode 100644
index c025de62..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_sound.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_style.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/option_style.png
deleted file mode 100644
index 4f02fb5c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_style.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_toolbars.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/option_toolbars.png
deleted file mode 100644
index ac2721d5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_view.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/option_view.png
deleted file mode 100644
index 3bed1f1a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/option_view.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/print-preview.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/print-preview.png
deleted file mode 100644
index 37b2d65c..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/print-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/print.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/print.png
deleted file mode 100644
index 9eedd7cb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/print.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/repeat_alternative.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/repeat_alternative.png
deleted file mode 100644
index bdceba2a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/save-as.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/save-as.png
deleted file mode 100644
index bc4de636..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/save-as.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/save.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/save.png
deleted file mode 100644
index 2655790f..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/save.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/settings.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/settings.png
deleted file mode 100644
index f077d28b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/settings.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/skin-preview.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/skin-preview.png
deleted file mode 100644
index a14bd93b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/skin.properties b/TuxGuitar-testing/platform-all/share/skins/ersplus/skin.properties
deleted file mode 100644
index 496578cd..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/ersplus/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=Ersplus
-author=Ersplus <ersplus@gmail.com> http://ersplus.free.fr
-description=Default tuxguitar theme.
-date=2007-01-29
-version=0.9
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/skin.svg b/TuxGuitar-testing/platform-all/share/skins/ersplus/skin.svg
deleted file mode 100644
index 8f9e43f8..00000000
--- a/TuxGuitar-testing/platform-all/share/skins/ersplus/skin.svg
+++ /dev/null
@@ -1,8660 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="210mm"
-   height="297mm"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="skin.svg"
-   sodipodi:docbase="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata21859">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="931"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="1"
-     inkscape:cx="402.19652"
-     inkscape:cy="712.44342"
-     inkscape:window-x="0"
-     inkscape:window-y="33"
-     inkscape:current-layer="svg2"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showgrid="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3751" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective1361" />
-    <marker
-       inkscape:stockid="CurveIn"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="CurveIn"
-       style="overflow:visible">
-      <path
-         id="path5615"
-         d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none;fill:none"
-         transform="scale(0.6)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mstart"
-       style="overflow:visible">
-      <path
-         id="path4606"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Sstart"
-       style="overflow:visible">
-      <path
-         id="path4600"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.3) translate(-2.3,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleInM"
-       style="overflow:visible">
-      <path
-         id="path4538"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.4)" />
-    </marker>
-    <linearGradient
-       id="linearGradient9644">
-      <stop
-         style="stop-color:#f8e70a;stop-opacity:1;"
-         offset="0"
-         id="stop9646" />
-      <stop
-         style="stop-color:#ffa021;stop-opacity:0;"
-         offset="1"
-         id="stop9648" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient3382"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       id="linearGradient15469">
-      <stop
-         style="stop-color:#e40000;stop-opacity:1;"
-         offset="0"
-         id="stop15471" />
-      <stop
-         style="stop-color:#ffa700;stop-opacity:1;"
-         offset="1"
-         id="stop15473" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10979">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop10981" />
-      <stop
-         style="stop-color:yellow;stop-opacity:1;"
-         offset="1"
-         id="stop10983" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9201">
-      <stop
-         style="stop-color:#007d00;stop-opacity:1;"
-         offset="0"
-         id="stop9203" />
-      <stop
-         style="stop-color:#00d900;stop-opacity:0;"
-         offset="1"
-         id="stop9205" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16486">
-      <stop
-         style="stop-color:#008930;stop-opacity:1;"
-         offset="0"
-         id="stop16488" />
-      <stop
-         style="stop-color:black;stop-opacity:0.37113401;"
-         offset="1"
-         id="stop16490" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10211">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop10213" />
-      <stop
-         style="stop-color:#1e9f9f;stop-opacity:1;"
-         offset="1"
-         id="stop10215" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6102">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6104" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6106" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5207">
-      <stop
-         id="stop5209"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5211"
-         offset="1"
-         style="stop-color:#3764ff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5199">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5201" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5203" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5941">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop5943" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop5945" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14138">
-      <stop
-         style="stop-color:#afc6e9;stop-opacity:1;"
-         offset="0"
-         id="stop14140" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop14142" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9152">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop9154" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="1"
-         id="stop9156" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         id="stop4811"
-         offset="0"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         id="stop4813"
-         offset="1"
-         style="stop-color:black;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6481">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6483" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6485" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9267">
-      <stop
-         style="stop-color:#ffd428;stop-opacity:1;"
-         offset="0"
-         id="stop9269" />
-      <stop
-         id="stop10163"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffd322;stop-opacity:1;"
-         offset="1"
-         id="stop9271" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9267"
-       id="linearGradient20340"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.105702,-0.132634,0.122908,0.142271,-123.5758,437.4912)"
-       x1="205.4043"
-       y1="464.48911"
-       x2="207.19127"
-       y2="498.23825" />
-    <linearGradient
-       id="linearGradient7463">
-      <stop
-         style="stop-color:lime;stop-opacity:1;"
-         offset="0"
-         id="stop7465" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop7467" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7463"
-       id="linearGradient20338"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.120379,0.139344,-0.171115,0.214715,20.77584,293.7269)"
-       x1="331.695"
-       y1="486.6479"
-       x2="399.73358"
-       y2="486.6479" />
-    <linearGradient
-       id="linearGradient19203">
-      <stop
-         style="stop-color:#a49e88;stop-opacity:1;"
-         offset="0"
-         id="stop19205" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop19207" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19203"
-       id="linearGradient20336"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.463664,0.283515,-0.266017,0.432012,-24.98543,167.9069)"
-       x1="209.59592"
-       y1="469.32986"
-       x2="228.7281"
-       y2="494.3299" />
-    <linearGradient
-       id="linearGradient14711">
-      <stop
-         style="stop-color:#f4e3d7;stop-opacity:1"
-         offset="0"
-         id="stop14713" />
-      <stop
-         style="stop-color:#f4e3d7;stop-opacity:0"
-         offset="1"
-         id="stop14715" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12779">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop12781" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop12783" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7720">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop7722" />
-      <stop
-         style="stop-color:#81ed9e;stop-opacity:1"
-         offset="1"
-         id="stop7724" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5684">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop5686" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop5688" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4672">
-      <stop
-         style="stop-color:#9b9b9b;stop-opacity:1"
-         offset="0"
-         id="stop4674" />
-      <stop
-         style="stop-color:#2f2f2f;stop-opacity:1"
-         offset="1"
-         id="stop4676" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4644">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop4646" />
-      <stop
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1"
-         id="stop4648" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6846">
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="0"
-         id="stop6848" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6852" />
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="1"
-         id="stop6850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6830">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop6832" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6836" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="1"
-         id="stop6834" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6814">
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="0"
-         id="stop6816" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6820" />
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="1"
-         id="stop6818" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6798">
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="0"
-         id="stop6800" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6804" />
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="1"
-         id="stop6802" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11729">
-      <stop
-         style="stop-color:#806805;stop-opacity:1"
-         offset="0"
-         id="stop11731" />
-      <stop
-         style="stop-color:#e1e2ce;stop-opacity:1"
-         offset="0.44999999"
-         id="stop11735" />
-      <stop
-         style="stop-color:#b4a66d;stop-opacity:1"
-         offset="1"
-         id="stop11733" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9900">
-      <stop
-         style="stop-color:#ffd988;stop-opacity:1"
-         offset="0"
-         id="stop9902" />
-      <stop
-         style="stop-color:#97812c;stop-opacity:1"
-         offset="1"
-         id="stop9904" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9009">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop9011" />
-      <stop
-         style="stop-color:#d3bc5f;stop-opacity:1"
-         offset="1"
-         id="stop9013" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3974">
-      <stop
-         style="stop-color:#dd9600;stop-opacity:1"
-         offset="0"
-         id="stop3976" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3978" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4856">
-      <stop
-         style="stop-color:white;stop-opacity:0.84536082"
-         offset="0"
-         id="stop4858" />
-      <stop
-         style="stop-color:#6898f1;stop-opacity:0.46391752"
-         offset="1"
-         id="stop4860" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4791">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop4793" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4795" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient33795">
-      <stop
-         style="stop-color:#ff9e00;stop-opacity:1"
-         offset="0"
-         id="stop33801" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0.5"
-         id="stop33803" />
-      <stop
-         style="stop-color:#ffffa0;stop-opacity:1"
-         offset="1"
-         id="stop33799" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21032">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop21034" />
-      <stop
-         style="stop-color:red;stop-opacity:0"
-         offset="1"
-         id="stop21036" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20139">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop20141" />
-      <stop
-         style="stop-color:#5696f6;stop-opacity:0"
-         offset="1"
-         id="stop20143" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19246">
-      <stop
-         style="stop-color:#f95;stop-opacity:1"
-         offset="0"
-         id="stop19248" />
-      <stop
-         style="stop-color:#f95;stop-opacity:0"
-         offset="1"
-         id="stop19250" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18353">
-      <stop
-         style="stop-color:yellow;stop-opacity:1"
-         offset="0"
-         id="stop18355" />
-      <stop
-         style="stop-color:yellow;stop-opacity:0"
-         offset="1"
-         id="stop18357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6462">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop6464" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop6466" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5880">
-      <stop
-         style="stop-color:#6d91d4;stop-opacity:1"
-         offset="0"
-         id="stop5882" />
-      <stop
-         style="stop-color:black;stop-opacity:0.02061856"
-         offset="1"
-         id="stop5884" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient32988">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop32990" />
-      <stop
-         style="stop-color:#cbcbcb;stop-opacity:1"
-         offset="0.5"
-         id="stop32994" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop32992" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11686">
-      <stop
-         style="stop-color:#ffc602;stop-opacity:1"
-         offset="0"
-         id="stop11688" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop11690" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4552">
-      <stop
-         style="stop-color:#ffcd1d;stop-opacity:1"
-         offset="0"
-         id="stop4554" />
-      <stop
-         style="stop-color:#ffe691;stop-opacity:1"
-         offset="0.67500001"
-         id="stop6334" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4556" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3661">
-      <stop
-         style="stop-color:#ffd74f;stop-opacity:1"
-         offset="0"
-         id="stop3663" />
-      <stop
-         style="stop-color:#795d00;stop-opacity:0"
-         offset="1"
-         id="stop3665" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21068">
-      <stop
-         style="stop-color:#999;stop-opacity:1"
-         offset="0"
-         id="stop21070" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop21072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16226">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop16228" />
-      <stop
-         style="stop-color:#e85700;stop-opacity:1"
-         offset="1"
-         id="stop16230" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14070">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop14072" />
-      <stop
-         style="stop-color:#8e8e8e;stop-opacity:1"
-         offset="1"
-         id="stop14074" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1315">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop1317" />
-      <stop
-         style="stop-color:black;stop-opacity:0.73958325"
-         offset="1"
-         id="stop1319" />
-    </linearGradient>
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14528"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.654622,1.623305,-1.369812,-1.396152,926.1889,-533.1723)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14544"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,758.4821,146.9962)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14557"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,984.3714,146.9961)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14565"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-168.9821,146.9962)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14573"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,532.5927,146.9962)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14577"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,645.5374,146.9961)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14698"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-167.3496,22.52986)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14700"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,530.9602,22.52986)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14702"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,643.9049,22.52983)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14704"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,982.7389,22.5298)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient1673"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,23.07442,-120.0138)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient1688"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,411.4735,-120.7104)" />
-    <linearGradient
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218"
-       id="linearGradient31977"
-       xlink:href="#linearGradient21068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)" />
-    <linearGradient
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311"
-       id="linearGradient31979"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)" />
-    <radialGradient
-       cx="552.50104"
-       cy="862.58081"
-       r="43.5"
-       fx="552.50104"
-       fy="862.58081"
-       id="radialGradient31999"
-       xlink:href="#linearGradient16226"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="552.50104"
-       cy="862.58081"
-       r="43.5"
-       fx="552.50104"
-       fy="862.58081"
-       id="radialGradient32063"
-       xlink:href="#linearGradient16226"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect" />
-    <linearGradient
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218"
-       id="linearGradient32065"
-       xlink:href="#linearGradient21068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)" />
-    <linearGradient
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311"
-       id="linearGradient32067"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)" />
-    <linearGradient
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218"
-       id="linearGradient34916"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)" />
-    <linearGradient
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218"
-       id="linearGradient34918"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)" />
-    <linearGradient
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218"
-       id="linearGradient34920"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)" />
-    <linearGradient
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218"
-       id="linearGradient34922"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)" />
-    <linearGradient
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218"
-       id="linearGradient34924"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)" />
-    <linearGradient
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847"
-       id="linearGradient42567"
-       xlink:href="#linearGradient11686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)" />
-    <linearGradient
-       x1="277.07773"
-       y1="733.53235"
-       x2="278.26602"
-       y2="793.7782"
-       id="linearGradient45285"
-       xlink:href="#linearGradient4552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640794,0,-0.129638,0.698173,95.93458,46.3081)" />
-    <linearGradient
-       x1="117.67873"
-       y1="688.06342"
-       x2="116.00877"
-       y2="771.71283"
-       id="linearGradient45290"
-       xlink:href="#linearGradient3661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640077,0,0,0.78567,90.88485,-10.2088)" />
-    <linearGradient
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218"
-       id="linearGradient45308"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)" />
-    <radialGradient
-       cx="209.83412"
-       cy="683.00934"
-       r="42.25"
-       fx="209.83412"
-       fy="683.00934"
-       id="radialGradient6540"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218"
-       id="linearGradient6542"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="209.83412"
-       cy="683.00934"
-       r="42.25"
-       fx="209.83412"
-       fy="683.00934"
-       id="radialGradient6544"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218"
-       id="linearGradient6546"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218"
-       id="linearGradient5922"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)" />
-    <linearGradient
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321"
-       id="linearGradient5940"
-       xlink:href="#linearGradient5880"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643"
-       id="linearGradient4651"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)" />
-    <radialGradient
-       cx="360.55887"
-       cy="686.36542"
-       r="13.25"
-       fx="360.55887"
-       fy="686.36542"
-       id="radialGradient7371"
-       xlink:href="#linearGradient6462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)" />
-    <radialGradient
-       cx="360.55887"
-       cy="686.36542"
-       r="13.25"
-       fx="360.55887"
-       fy="686.36542"
-       id="radialGradient7497"
-       xlink:href="#linearGradient6462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)" />
-    <linearGradient
-       x1="445.06726"
-       y1="987.36212"
-       x2="517.55859"
-       y2="987.36212"
-       id="linearGradient21090"
-       xlink:href="#linearGradient21032"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="341.58902"
-       y1="987.36212"
-       x2="414.08035"
-       y2="987.36212"
-       id="linearGradient21092"
-       xlink:href="#linearGradient20139"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212"
-       id="linearGradient21096"
-       xlink:href="#linearGradient19246"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105"
-       id="linearGradient21098"
-       xlink:href="#linearGradient18353"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105"
-       id="linearGradient21120"
-       xlink:href="#linearGradient18353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(524.0663,-56)" />
-    <linearGradient
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212"
-       id="linearGradient22896"
-       xlink:href="#linearGradient19246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(523.8557,-56)" />
-    <linearGradient
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847"
-       id="linearGradient22916"
-       xlink:href="#linearGradient11686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)" />
-    <linearGradient
-       x1="236.75435"
-       y1="987.36212"
-       x2="309.24567"
-       y2="987.36212"
-       id="linearGradient22929"
-       xlink:href="#linearGradient11686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-56)" />
-    <linearGradient
-       x1="212.87547"
-       y1="991.43274"
-       x2="348.82919"
-       y2="991.43274"
-       id="linearGradient4813"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,19.86901)" />
-    <linearGradient
-       x1="212.15625"
-       y1="1068.7657"
-       x2="349.5625"
-       y2="1068.7657"
-       id="linearGradient4815"
-       xlink:href="#linearGradient33795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.701288,0,0,0.704615,92.93315,227.5991)" />
-    <linearGradient
-       x1="313.19742"
-       y1="886.34753"
-       x2="399.59286"
-       y2="886.34753"
-       id="linearGradient4817"
-       xlink:href="#linearGradient4791"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.920046,0,0,1.086901,0,13.71543)" />
-    <radialGradient
-       cx="964.30762"
-       cy="803.47638"
-       r="91.57444"
-       fx="964.30762"
-       fy="803.47638"
-       id="radialGradient12168"
-       xlink:href="#linearGradient4856"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.735963,-0.187801,0.156725,0.614181,134.2038,527.9897)" />
-    <radialGradient
-       cx="760.87744"
-       cy="895.59747"
-       r="39.191177"
-       fx="760.87744"
-       fy="895.59747"
-       id="radialGradient12897"
-       xlink:href="#linearGradient9009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)" />
-    <linearGradient
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151"
-       id="linearGradient12899"
-       xlink:href="#linearGradient9900"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="760.87744"
-       cy="895.59747"
-       r="39.191177"
-       fx="760.87744"
-       fy="895.59747"
-       id="radialGradient12901"
-       xlink:href="#linearGradient9009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)" />
-    <linearGradient
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151"
-       id="linearGradient12903"
-       xlink:href="#linearGradient9900"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="594.95349"
-       y1="966.4024"
-       x2="737.51599"
-       y2="966.4024"
-       id="linearGradient12905"
-       xlink:href="#linearGradient11729"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="441.73926"
-       y1="882.7417"
-       x2="520.36261"
-       y2="882.7417"
-       id="linearGradient12907"
-       xlink:href="#linearGradient3974"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="276.34375"
-       y1="958.8125"
-       x2="357.34375"
-       y2="958.8125"
-       id="linearGradient12909"
-       xlink:href="#linearGradient3974"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="474.60648"
-       y1="964.74359"
-       x2="474.72397"
-       y2="939.47852"
-       id="linearGradient12911"
-       xlink:href="#linearGradient3974"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.678923,0,0,0.512431,92.02415,441.1433)" />
-    <linearGradient
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741"
-       id="linearGradient6961"
-       xlink:href="#linearGradient6814"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894"
-       id="linearGradient6964"
-       xlink:href="#linearGradient6798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186"
-       id="linearGradient6967"
-       xlink:href="#linearGradient6830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127"
-       id="linearGradient6970"
-       xlink:href="#linearGradient6846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127"
-       id="linearGradient8122"
-       xlink:href="#linearGradient6846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186"
-       id="linearGradient8124"
-       xlink:href="#linearGradient6830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894"
-       id="linearGradient8126"
-       xlink:href="#linearGradient6798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741"
-       id="linearGradient8128"
-       xlink:href="#linearGradient6814"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <radialGradient
-       cx="902.47498"
-       cy="488.31769"
-       r="114.14286"
-       fx="902.47498"
-       fy="488.31769"
-       id="radialGradient9889"
-       xlink:href="#linearGradient7720"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)" />
-    <linearGradient
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218"
-       id="linearGradient9891"
-       xlink:href="#linearGradient4672"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="902.47498"
-       cy="488.31769"
-       r="114.14286"
-       fx="902.47498"
-       fy="488.31769"
-       id="radialGradient9893"
-       xlink:href="#linearGradient4644"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)" />
-    <linearGradient
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218"
-       id="linearGradient9895"
-       xlink:href="#linearGradient4672"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9897"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9899"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9901"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9903"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)" />
-    <linearGradient
-       x1="645.98792"
-       y1="748.92639"
-       x2="699.22064"
-       y2="748.92639"
-       id="linearGradient11879"
-       xlink:href="#linearGradient16226"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12789"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12791"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12793"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12795"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12797"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12799"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12801"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12803"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13807"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13809"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13811"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13813"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13815"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13817"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13819"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14719"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14721"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14738"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14740"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9009"
-       id="radialGradient21982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)"
-       cx="760.87744"
-       cy="895.59747"
-       fx="760.87744"
-       fy="895.59747"
-       r="39.191177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9900"
-       id="linearGradient21984"
-       gradientUnits="userSpaceOnUse"
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9009"
-       id="radialGradient21986"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)"
-       cx="760.87744"
-       cy="895.59747"
-       fx="760.87744"
-       fy="895.59747"
-       r="39.191177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9900"
-       id="linearGradient21988"
-       gradientUnits="userSpaceOnUse"
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11729"
-       id="linearGradient21990"
-       gradientUnits="userSpaceOnUse"
-       x1="594.95349"
-       y1="966.4024"
-       x2="737.51599"
-       y2="966.4024" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="linearGradient21992"
-       gradientUnits="userSpaceOnUse"
-       x1="441.73926"
-       y1="882.7417"
-       x2="520.36261"
-       y2="882.7417" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="linearGradient21994"
-       gradientUnits="userSpaceOnUse"
-       x1="276.34375"
-       y1="958.8125"
-       x2="357.34375"
-       y2="958.8125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="linearGradient21996"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.678923,0,0,0.512431,92.02415,441.1433)"
-       x1="474.60648"
-       y1="964.74359"
-       x2="474.72397"
-       y2="939.47852" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="linearGradient21998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,19.86901)"
-       x1="212.87547"
-       y1="991.43274"
-       x2="348.82919"
-       y2="991.43274" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient33795"
-       id="linearGradient22000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.701288,0,0,0.704615,92.93315,227.5991)"
-       x1="212.15625"
-       y1="1068.7657"
-       x2="349.5625"
-       y2="1068.7657" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient22002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.920046,0,0,1.086901,0,13.71543)"
-       x1="313.19742"
-       y1="886.34753"
-       x2="399.59286"
-       y2="886.34753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4856"
-       id="radialGradient22004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.735963,-0.187801,0.156725,0.614181,134.2038,527.9897)"
-       cx="964.30762"
-       cy="803.47638"
-       fx="964.30762"
-       fy="803.47638"
-       r="91.57444" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23057"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,982.7389,22.5298)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23061"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,643.9049,22.52983)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23063"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,530.9602,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-167.3496,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.654622,1.623305,-1.369812,-1.396152,926.1889,-533.1723)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23069"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,984.3714,146.9961)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23071"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,758.4821,146.9962)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23073"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,645.5374,146.9961)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,532.5927,146.9962)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-168.9821,146.9962)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient23079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient23081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23083"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3661"
-       id="linearGradient23087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640077,0,0,0.78567,90.88485,-10.2088)"
-       x1="117.67873"
-       y1="688.06342"
-       x2="116.00877"
-       y2="771.71283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4552"
-       id="linearGradient23089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640794,0,-0.129638,0.698173,95.93458,46.3081)"
-       x1="277.07773"
-       y1="733.53235"
-       x2="278.26602"
-       y2="793.7782" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient23091"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23093"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient23095"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient23097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient23111"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23113"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient23115"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23117"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient23119"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23121"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient23123"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient23125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)"
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient23129"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient23145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient23147"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient23149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient23151"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient23153"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient23155"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient23157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient23159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,23.07442,-120.0138)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23621"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,411.4735,-120.7104)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient23731"
-       gradientUnits="userSpaceOnUse"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient23733"
-       gradientUnits="userSpaceOnUse"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient23735"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-56)"
-       x1="236.75435"
-       y1="987.36212"
-       x2="309.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20139"
-       id="linearGradient23737"
-       gradientUnits="userSpaceOnUse"
-       x1="341.58902"
-       y1="987.36212"
-       x2="414.08035"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21032"
-       id="linearGradient23739"
-       gradientUnits="userSpaceOnUse"
-       x1="445.06726"
-       y1="987.36212"
-       x2="517.55859"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient23741"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(524.0663,-56)"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient23743"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(523.8557,-56)"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7720"
-       id="radialGradient23745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient23747"
-       gradientUnits="userSpaceOnUse"
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4644"
-       id="radialGradient23749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient23751"
-       gradientUnits="userSpaceOnUse"
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23755"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23759"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient24181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient24183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3661"
-       id="linearGradient24187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640077,0,0,0.78567,90.88485,-10.2088)"
-       x1="117.67873"
-       y1="688.06342"
-       x2="116.00877"
-       y2="771.71283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4552"
-       id="linearGradient24189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640794,0,-0.129638,0.698173,95.93458,46.3081)"
-       x1="277.07773"
-       y1="733.53235"
-       x2="278.26602"
-       y2="793.7782" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient24191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient24195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient24197"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24203"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24209"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24211"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24213"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24215"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24217"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient24219"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)"
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient24231"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient24233"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient24235"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient24237"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient24239"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient24241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient24243"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient24245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19203"
-       id="linearGradient24247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.463664,0.283515,-0.266017,0.432012,-24.98543,167.9069)"
-       x1="209.59592"
-       y1="469.32986"
-       x2="228.7281"
-       y2="494.3299" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7463"
-       id="linearGradient24249"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.120379,0.139344,-0.171115,0.214715,20.77584,293.7269)"
-       x1="331.695"
-       y1="486.6479"
-       x2="399.73358"
-       y2="486.6479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9267"
-       id="linearGradient24251"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.105702,-0.132634,0.122908,0.142271,-123.5758,437.4912)"
-       x1="205.4043"
-       y1="464.48911"
-       x2="207.19127"
-       y2="498.23825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient13239"
-       gradientUnits="userSpaceOnUse"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient13241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1104.701,0.426478)"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14138"
-       id="linearGradient14144"
-       x1="682.19747"
-       y1="742.489"
-       x2="749.28423"
-       y2="742.489"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient6081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient6085"
-       gradientUnits="userSpaceOnUse"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient6087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1104.701,0.426478)"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient6115"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14138"
-       id="linearGradient7977"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.999435,-3.359396e-2,2.090913e-2,0.999781,-74.89763,93.16569)"
-       x1="682.19747"
-       y1="742.489"
-       x2="749.28423"
-       y2="742.489" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient7982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient9764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient3109"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321"
-       gradientTransform="matrix(-0.326639,-0.315927,0.325985,-0.316561,303.7813,371.9517)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient3121"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.279302,0,0,0.352463,339.8541,-9.09588)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient3242"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient2953"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.326639,-0.315927,0.325985,-0.316561,303.7813,371.9517)"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient2965"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.279302,0,0,0.352463,339.8541,-9.09588)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient2973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.326639,-0.315927,0.325985,-0.316561,303.7813,371.9517)"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient2976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.394857,-0.381908,0.394066,-0.382674,272.3576,400.6259)"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient4526"
-       gradientUnits="userSpaceOnUse"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient4528"
-       gradientUnits="userSpaceOnUse"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient4530"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-56)"
-       x1="236.75435"
-       y1="987.36212"
-       x2="309.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20139"
-       id="linearGradient4532"
-       gradientUnits="userSpaceOnUse"
-       x1="341.58902"
-       y1="987.36212"
-       x2="414.08035"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21032"
-       id="linearGradient4534"
-       gradientUnits="userSpaceOnUse"
-       x1="445.06726"
-       y1="987.36212"
-       x2="517.55859"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient4536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(524.0663,-56)"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient4538"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(523.8557,-56)"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7720"
-       id="radialGradient4540"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4644"
-       id="radialGradient4544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4546"
-       gradientUnits="userSpaceOnUse"
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4550"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient4556"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient4558"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient4560"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient4562"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient4568"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15288"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,719.1127,73.72802)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15290"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,757.1127,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15414"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15416"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.226661,-2.698342e-3,1.91067e-3,0.160496,490.7324,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15418"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15420"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15422"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,719.1127,73.72802)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15424"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,757.1127,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15440"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.226661,-2.698342e-3,1.91067e-3,0.160496,490.7324,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,719.1127,73.72802)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3661"
-       id="radialGradient18282"
-       cx="590.40625"
-       cy="17.705935"
-       fx="590.40625"
-       fy="17.705935"
-       r="9.96875"
-       gradientTransform="matrix(1,0,0,0.862069,0,2.442198)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient16399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient16401"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient21760"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient9650"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient18524"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20472"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695"
-       spreadMethod="repeat" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20484"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20486"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20502"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20504"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21491"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21493"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient3567"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4133997,0.4055754,-0.3422418,-0.3488223,10.276589,-74.784609)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient17059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,869.7944,22.52976)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient21912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4133997,0.4055754,-0.3422418,-0.3488223,-42.950333,-257.45813)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient21932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4134002,0.4055758,-0.3422416,-0.3488226,336.05906,-255.33691)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient21936"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.3941246,0.3788101,-0.3262839,-0.3258024,186.88118,-258.82238)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient22911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4134002,0.4055758,-0.3422416,-0.3488226,336.05906,-255.33691)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-  </defs>
-  <g
-     id="g13090"
-     transform="matrix(0.4319372,0,0,0.4498758,-158.61068,263.50967)">
-    <path
-       id="path1949"
-       style="fill:#faf8e5"
-       d="M 502.36734,1001.8219 C 500.85685,1000.9055 500.86123,1000.8106 502.69092,994.79585 C 503.71105,991.44235 505.20419,987.4402 506.00902,985.90219 L 507.47234,983.10574 L 503.68786,983.52174 C 501.05428,983.81116 499.20561,983.64401 497.60893,982.97209 C 495.61939,982.13482 494.31862,982.12303 487.82076,982.8834 C 481.32764,983.64319 479.69511,983.62878 475.59419,982.77505 C 468.03486,981.2015 463.1967,978.13448 460.12905,972.97152 C 457.96582,969.33067 457.53667,967.85991 457.49787,963.95422 L 457.45153,959.28738 L 453.00545,957.48865 C 446.35308,954.7972 445.72547,953.67908 445.02719,943.27461 C 443.48518,920.29864 443.38115,922.07125 446.84919,912.22941 C 448.00077,908.96139 450.30546,906.22447 452.36101,905.68391 C 453.22638,905.45634 454.78574,903.89485 455.82625,902.21395 C 458.32624,898.17535 464.18039,893.5834 474.97955,887.19027 C 488.21393,879.35549 497.87259,875.95553 506.8954,875.95553 C 509.41974,875.95553 511.4851,875.6971 511.4851,875.38124 C 511.4851,874.32821 515.75088,873.44507 522.92287,873.01331 C 526.82748,872.77825 530.90958,872.60946 531.9942,872.63824 C 533.07881,872.66703 535.56357,872.65286 537.51588,872.60675 C 554.77417,872.19925 560.26575,872.70655 564.08563,875.06124 C 565.46668,875.91257 567.34164,876.60911 568.25223,876.60911 C 570.78588,876.60911 575.12155,878.30511 576.03208,879.65239 C 576.67917,880.60985 577.79766,880.85741 581.47646,880.85741 C 585.08239,880.85741 587.23175,881.31615 591.19437,882.93155 C 593.99274,884.07233 597.57153,885.18205 599.14723,885.39762 C 602.42492,885.84604 607.8241,888.86082 609.7808,891.33517 C 610.51164,892.25937 612.21052,893.47712 613.5561,894.0413 C 616.52659,895.28682 621.80359,899.8022 622.78292,901.93644 C 623.17528,902.79152 623.49631,904.3658 623.49631,905.43484 C 623.49631,906.82677 624.39227,908.12837 626.65243,910.01988 C 630.35369,913.11743 630.36981,913.1665 631.02782,923.34032 C 631.94435,937.5114 631.53853,942.78748 629.27415,946.14004 C 627.38417,948.93831 619.92581,954.36283 615.36557,956.25586 C 608.04525,959.29469 602.33714,960.26776 591.83128,960.26776 C 583.34799,960.26776 582.54402,960.37331 582.09495,961.54564 C 581.31967,963.56953 573.81862,968.80526 569.06833,970.63816 C 565.22744,972.12016 563.4829,972.34212 553.8573,972.57375 C 543.04819,972.83388 542.97837,972.84544 541.89523,974.55796 C 540.166,977.29206 535.95166,980.22502 530.53434,982.4646 C 524.63611,984.90311 520.4921,988.26051 514.67381,995.31473 C 512.33831,998.14636 509.79283,1000.9779 509.01721,1001.6069 C 507.3114,1002.9904 504.44639,1003.083 502.36734,1001.8219 z " />
-    <path
-       id="path1947"
-       style="fill:#ede3d4"
-       d="M 502.59942,1001.6069 C 501.4642,1000.5616 501.54276,999.87292 503.51273,993.60057 C 504.69819,989.82604 506.27613,985.78205 507.01925,984.61369 C 508.51473,982.26266 508.4069,982.20689 504.22677,983.16887 C 501.94662,983.69355 500.66128,983.61723 498.36009,982.82058 C 495.80822,981.93713 494.38751,981.90643 487.75947,982.59186 C 478.45722,983.55376 473.14726,982.78619 467.52056,979.66627 C 460.91983,976.00627 456.17912,967.16156 457.45754,960.89186 C 457.90458,958.69948 457.77502,958.307 456.60415,958.307 C 454.45161,958.307 448.7638,955.28804 447.11168,953.26854 C 445.59884,951.41933 445.52524,950.8019 444.08955,927.9154 C 443.72522,922.10748 444.25472,918.98703 446.36313,914.51695 C 446.95656,913.2588 447.88321,911.25455 448.42234,910.06307 C 448.96148,908.87158 450.62577,907.20804 452.12075,906.36633 C 453.68201,905.4873 455.60561,903.48845 456.64023,901.67005 C 457.63095,899.92881 459.63865,897.58078 461.10178,896.45221 C 466.08086,892.61164 482.67388,883.01312 488.60957,880.53985 C 495.22924,877.78161 504.78042,875.61577 508.04454,876.13278 C 509.47519,876.35938 510.92056,876.02766 512.36923,875.14022 C 513.9703,874.15942 516.58938,873.64206 522.28363,873.18177 C 526.53982,872.83771 531.08706,872.611 532.3886,872.67796 C 536.29603,872.87899 538.42386,872.81676 544.4243,872.32595 C 552.77135,871.64319 562.28224,873.44496 565.08111,876.23923 C 565.64494,876.80214 567.15102,877.2627 568.42796,877.2627 C 571.22267,877.2627 573.75055,878.25969 575.45592,880.03448 C 576.46313,881.08273 577.7304,881.36268 581.76641,881.42855 C 585.55298,881.49036 587.80342,881.94008 590.76064,883.22593 C 592.92987,884.16915 596.20001,885.149 598.02761,885.4034 C 601.88483,885.94028 606.64157,888.59642 609.70446,891.92364 C 610.88526,893.20636 612.29978,894.25587 612.84782,894.25587 C 614.12148,894.25587 620.69412,899.36117 621.83791,901.23892 C 622.31618,902.02409 622.7075,903.70544 622.7075,904.97524 C 622.7075,906.72534 623.35066,907.81686 625.36562,909.4864 C 630.22335,913.51136 630.69393,914.52199 630.53269,920.58343 C 630.4517,923.62805 630.85271,928.06696 631.42382,930.44765 C 632.34314,934.27981 632.29967,935.35713 631.04472,939.84238 C 628.5987,948.58458 621.38056,954.58667 609.03517,958.144 C 604.27733,959.51495 602.07359,959.74155 593.6084,959.73045 L 583.73241,959.7175 L 579.1309,963.87835 C 572.12007,970.21778 568.44139,971.45272 554.61609,972.10774 C 542.53023,972.68041 543.57398,972.34114 539.20652,977.11615 C 538.18406,978.23397 534.63442,980.3228 531.3184,981.75795 C 524.33664,984.77961 519.74483,988.48391 513.80297,995.88799 C 511.49516,998.76384 509.16747,1001.4844 508.63034,1001.9338 C 507.22346,1003.1107 504.04538,1002.9384 502.59942,1001.6069 z M 501.56044,959.87109 C 503.47283,959.263 503.11555,958.62347 499.06132,955.39771 C 495.74098,952.75579 494.95531,952.4355 492.15922,952.584 C 487.95953,952.80704 487.56157,954.65825 491.01312,957.91537 C 493.15172,959.93358 493.9894,960.26776 496.90929,960.26776 C 498.78117,960.26776 500.8742,960.08926 501.56044,959.87109 z M 459.42356,955.04183 C 459.42356,954.30276 449.38109,945.04037 448.16873,944.66122 C 447.11874,944.33284 448.14759,948.84909 449.68335,951.30979 C 451.25087,953.82139 459.42356,956.95285 459.42356,955.04183 z M 473.67402,945.86596 C 474.51318,945.49383 475.19978,944.94095 475.19978,944.63731 C 475.19978,943.94009 466.8754,938.69953 465.76789,938.69953 C 464.21615,938.69953 464.94657,941.11926 467.31661,943.83014 C 469.75975,946.6246 471.03921,947.03432 473.67402,945.86596 z M 508.9609,944.45106 C 510.6289,943.06903 509.99462,941.64343 506.11486,938.05431 C 502.07747,934.31935 500.44175,934.12735 500.44175,937.38839 C 500.44175,942.8535 505.66391,947.18285 508.9609,944.45106 z M 456.11376,934.36511 C 456.33529,933.07815 456.0194,932.9784 451.97391,933.05795 C 449.50797,933.10644 447.59359,933.44395 447.5928,933.83033 C 447.58982,935.27933 449.66364,936.13812 452.71511,935.95154 C 455.24754,935.79671 455.92146,935.48212 456.11376,934.36511 z M 498.32437,928.79793 C 499.272,928.38465 500.30813,927.7229 500.62687,927.32738 C 501.55509,926.17555 501.31835,921.17489 500.31118,920.65914 C 498.67372,919.82062 492.62748,927.40852 493.74224,928.90301 C 494.38316,929.76227 496.20925,929.72039 498.32437,928.79793 z M 464.43244,922.28911 C 468.72789,919.93167 472.04453,915.67952 472.04453,912.52989 C 472.04453,909.67747 467.99531,906.02037 464.83705,906.02037 C 461.06409,906.02037 461.43507,908.13633 465.31253,908.73239 C 466.16531,908.86348 467.40431,909.76976 468.06586,910.74635 C 469.83979,913.365 467.88475,914.77271 462.41777,914.81321 C 458.95573,914.83885 458.15331,915.07861 457.40897,916.3098 C 456.9215,917.11614 455.93298,918.31575 455.21227,918.97559 C 453.55631,920.49172 453.55499,921.61263 455.20735,923.12546 C 457.11736,924.87419 460.23765,924.5913 464.43244,922.28911 z M 546.33398,920.3992 C 546.02571,916.81858 543.76092,914.66188 539.46644,913.85936 C 535.6395,913.14421 533.24236,914.05609 533.8541,915.99432 C 534.12337,916.84751 533.78528,917.66255 532.95289,918.16687 C 531.71147,918.919 531.72336,919.06793 533.12742,920.35342 C 534.90773,921.98341 540.87367,923.66122 544.22077,923.47322 C 546.51745,923.34424 546.57975,923.25365 546.33398,920.3992 z M 487.398,919.13005 C 488.24588,917.99335 485.87244,913.0946 483.30887,910.69014 C 481.18895,908.70178 480.63665,908.47001 479.9685,909.28828 C 478.20128,911.45259 479.05213,914.06325 482.46332,916.94315 C 485.90654,919.85008 486.62382,920.16796 487.398,919.13005 z M 616.26958,911.49727 C 619.26849,908.48279 620.01618,905.39163 618.3804,902.77065 C 616.94985,900.47853 614.89026,900.22846 612.84736,902.09887 C 611.84268,903.0187 610.41784,903.40604 608.03878,903.40604 C 603.59749,903.40604 602.91745,904.49009 606.02926,906.60943 C 607.40088,907.54359 608.51991,908.49257 608.516,908.71827 C 608.51209,908.94398 609.04611,910.19395 609.70269,911.49601 C 611.24822,914.56084 613.22146,914.56123 616.26958,911.49727 z M 521.87474,912.12811 C 523.74883,910.72285 523.71062,908.27484 521.7829,906.24427 C 520.56799,904.96454 520.3403,903.98601 520.68931,901.54435 C 521.03428,899.13089 520.83908,898.26058 519.79113,897.53995 C 517.95483,896.27722 516.00335,897.38424 515.34192,900.06387 C 515.05837,901.21256 514.20849,902.71812 513.45328,903.40957 C 512.15648,904.59685 512.1545,904.82239 513.41753,907.46769 C 516.16689,913.22593 518.61301,914.57389 521.87474,912.12811 z M 580.53178,912.48266 C 583.91231,911.77736 587.9998,909.35616 587.9998,908.05901 C 587.9998,906.69715 585.39378,905.36678 582.72609,905.36678 C 580.49825,905.36678 578.98993,906.04263 575.28872,908.69936 C 572.7352,910.53229 570.64595,912.29696 570.64595,912.62087 C 570.64595,913.4377 576.33547,913.35816 580.53178,912.48266 z M 478.98613,905.26569 C 479.29632,902.26791 476.77524,899.46307 474.71031,900.50859 C 471.61248,902.07708 471.54223,903.24118 474.39806,905.68253 C 475.88832,906.9565 477.47702,907.89859 477.92853,907.77606 C 478.38003,907.65353 478.85595,906.52387 478.98613,905.26569 z M 571.46455,902.77901 C 572.96663,901.71521 574.78524,900.83287 575.5059,900.81826 C 576.22656,900.80365 577.71225,899.90937 578.80742,898.83095 C 581.18496,896.4898 582.6428,896.36014 584.31918,898.34076 C 585.35374,899.56309 585.69314,899.65236 586.32982,898.8696 C 587.22604,897.76773 585.87266,895.22938 583.40066,893.37578 C 581.46215,891.92219 578.47582,892.30432 573.55536,894.63557 C 569.13797,896.72846 567.17316,896.63997 565.12427,894.25587 C 563.13767,891.94422 560.6463,891.71907 558.1737,893.62775 C 555.71827,895.52317 555.97382,897.77836 558.85028,899.59822 C 560.1719,900.43437 562.39043,901.91868 563.78035,902.89669 C 567.00739,905.16736 568.11624,905.15038 571.46455,902.77901 z M 508.3618,900.0152 C 510.41904,898.75497 510.69629,898.18833 510.69629,895.24405 C 510.69629,893.40645 511.09838,891.56979 511.58984,891.1626 C 512.71432,890.2309 511.91341,888.37362 510.38716,888.37362 C 509.75606,888.37362 508.18508,889.1089 506.89609,890.00758 C 505.6071,890.90625 504.17576,891.64153 503.71535,891.64153 C 503.25493,891.64153 501.57056,890.90625 499.97229,890.00758 C 496.50671,888.05895 492.54489,887.79655 492.57095,889.51739 C 492.59448,891.07093 495.19968,895.71385 496.56988,896.64418 C 497.18094,897.05907 498.56468,897.50024 499.64487,897.62455 C 500.85647,897.76399 501.72243,898.35133 501.90536,899.15775 C 502.49713,901.7666 504.96728,902.09465 508.3618,900.0152 z M 473.10608,895.23625 C 474.66359,894.69704 476.7985,894.25587 477.85032,894.25587 C 479.17653,894.25587 481.11589,893.04484 484.1774,890.30494 C 491.36252,883.8746 491.78547,881.90169 485.17432,885.65458 C 472.84688,892.65237 468.88929,895.07077 468.88929,895.60598 C 468.88929,896.45451 469.82378,896.37257 473.10608,895.23625 z M 527.3017,880.1041 C 530.34358,878.43619 530.62263,878.40205 534.65808,879.20418 C 538.42126,879.95218 539.07737,879.91593 541.03793,878.85154 C 542.69116,877.954 544.83301,877.65594 549.83522,877.62731 C 553.47183,877.60652 556.44727,877.37569 556.44729,877.11437 C 556.44741,876.1672 552.81839,874.74068 549.34451,874.32236 C 547.15892,874.05917 543.82814,874.27028 540.69075,874.87082 C 537.39712,875.50129 535.1113,875.63483 534.23845,875.24777 C 532.1629,874.3274 528.59779,874.53426 526.60516,875.69069 C 525.45588,876.35768 524.07805,876.58095 522.77875,876.31076 C 520.15437,875.765 516.21797,876.48461 516.21797,877.51013 C 516.21797,877.94856 517.42549,878.66906 518.90135,879.11125 C 520.37721,879.55344 522.01802,880.3478 522.54759,880.87651 C 523.77946,882.10636 523.59561,882.13623 527.3017,880.1041 z " />
-    <path
-       id="path1945"
-       style="fill:#e5dac8"
-       d="M 502.76271,1001.725 C 501.90983,1000.8734 502.04684,999.62422 503.56917,994.37217 C 504.57781,990.89227 506.12854,986.80152 507.01523,985.28169 C 508.82224,982.18436 508.50572,981.36225 505.9436,982.49842 C 504.87476,982.97242 502.96023,983.09664 500.94597,982.8228 C 497.13262,982.30426 491.63571,982.21925 482.29908,982.53421 C 474.65809,982.79201 470.65178,981.69146 465.4461,977.90428 C 460.1932,974.08287 456.2939,965.40525 457.83238,960.96056 C 458.53393,958.93373 458.46304,958.85326 454.84601,957.57133 C 446.75407,954.70347 445.06172,952.06718 445.32447,942.73909 C 445.44761,938.36714 445.17847,935.23651 444.60428,934.36189 C 444.02567,933.48052 443.77346,930.45128 443.9206,926.14996 C 444.10499,920.75921 444.51302,918.71956 445.87255,916.3926 C 446.81791,914.77453 447.59271,913.02882 447.59433,912.51325 C 447.59947,910.88154 450.53647,907.50429 452.99813,906.29945 C 454.43471,905.59632 455.86028,904.07564 456.61223,902.44423 C 458.20884,898.98029 462.29963,895.74994 474.01657,888.70068 C 488.49953,879.98731 497.77487,876.60911 507.21577,876.60911 C 509.65761,876.60911 511.64317,876.25845 512.16796,875.73452 C 513.75586,874.14921 519.18855,873.30236 530.5983,872.86153 C 553.49284,871.97697 558.81209,872.42813 563.42745,875.64593 C 564.70287,876.53516 566.68896,877.2627 567.84096,877.2627 C 570.59321,877.2627 574.32368,878.89707 575.40992,880.57877 C 576.17134,881.75759 576.77295,881.87171 580.36337,881.51832 C 583.97559,881.16278 585.1217,881.38567 590.23331,883.43768 C 593.41405,884.71457 596.71161,885.75928 597.56123,885.75928 C 600.23225,885.75928 605.04399,888.20876 608.21561,891.18302 C 609.89538,892.75827 612.15715,894.43366 613.24176,894.90613 C 615.66809,895.96308 620.56527,899.96234 621.7967,901.89251 C 622.29763,902.67768 622.7075,904.32204 622.7075,905.54663 C 622.7075,907.28613 623.47844,908.44944 626.23191,910.8647 C 630.09409,914.25249 630.98578,916.54531 630.37465,921.51704 C 630.163,923.23878 630.54771,926.95058 631.22954,929.76548 C 632.3822,934.52409 632.37174,935.18954 631.08073,939.24243 C 628.55224,947.18009 623.89817,951.85202 614.62763,955.75868 C 607.69982,958.67804 602.18437,959.61417 591.91184,959.61417 L 582.74556,959.61417 L 580.24128,962.50353 C 577.03334,966.20471 569.43225,970.41196 564.30841,971.32246 C 562.11135,971.71285 556.45556,972.03225 551.73999,972.03225 L 543.16623,972.03225 L 541.57952,974.1564 C 539.17274,977.37845 536.11947,979.45491 529.79701,982.1693 C 523.12018,985.03585 519.29028,988.30252 512.61832,996.82165 C 508.6926,1001.8342 507.65127,1002.7506 505.88245,1002.7506 C 504.73168,1002.7506 503.32781,1002.2892 502.76271,1001.725 z M 556.77549,964.63703 C 557.80943,964.01063 558.22456,962.81457 558.30669,960.22534 C 558.40386,957.16186 558.64511,956.64632 560.0599,956.4788 C 561.33448,956.32789 561.98019,956.87461 562.95449,958.92974 C 564.35795,961.89008 566.17787,962.3385 569.028,960.42625 C 570.72212,959.2896 570.72512,959.25012 569.31259,956.66024 C 568.52747,955.22072 565.64592,952.14471 562.90915,949.82472 L 557.9332,945.60652 L 549.10496,944.71874 C 537.76299,943.57817 536.62445,943.58902 535.77561,944.84581 C 534.62123,946.55494 532.70363,946.04741 529.83917,943.27461 C 527.28261,940.79989 526.89947,940.65952 522.6642,940.64593 C 517.20386,940.62842 513.33281,939.25149 507.30268,935.1819 L 502.77366,932.12536 L 499.36916,933.77849 C 494.64982,936.07007 490.2072,936.01198 486.9713,933.61636 C 485.10991,932.23832 484.49927,931.21508 484.4361,929.36807 C 484.37083,927.46065 484.03734,926.93504 482.89238,926.93504 C 482.08913,926.93504 480.42632,926.50416 479.19724,925.97755 C 477.04962,925.05735 476.85289,925.10829 474.14823,927.28471 C 472.60036,928.53026 470.82186,929.54936 470.196,929.54936 C 468.74135,929.54936 467.97521,927.90294 468.54876,926.00949 C 468.91785,924.79104 468.68173,924.5441 467.19226,924.59086 C 464.33719,924.68051 464.42663,922.61572 467.33174,921.37098 C 470.53334,919.99919 473.02616,915.50359 472.68608,911.71483 C 472.47192,909.32896 472.64949,908.96149 474.01657,908.96149 C 475.25117,908.96149 475.80294,909.6624 476.55434,912.18521 C 477.26119,914.55839 478.50208,916.23968 481.2576,918.55768 C 485.94749,922.5029 487.39995,922.91536 489.8599,921.00055 C 492.28196,919.11522 492.26528,918.18363 489.79279,917.2502 C 487.82321,916.50666 487.1039,914.3076 488.58258,913.5504 C 489.03709,913.31765 489.148,911.05011 488.85753,907.92914 C 488.4283,903.31714 488.5875,902.31445 490.20259,899.45731 C 493.13758,894.26522 496.52824,895.46059 494.91453,901.11849 C 494.50443,902.55638 494.16042,905.74071 494.15008,908.19478 C 494.1328,912.29102 494.32522,912.81746 496.49769,914.6175 C 497.79923,915.69591 498.86412,917.0129 498.86412,917.54415 C 498.86412,918.07539 497.43112,920.47868 495.67967,922.88479 C 493.92823,925.29089 492.59711,927.84827 492.72163,928.56784 C 493.06289,930.53982 496.44097,930.55458 499.9184,928.59929 C 503.65355,926.49909 505.20418,926.50552 507.60075,928.63119 C 510.38426,931.10005 515.76951,933.54772 518.56263,933.61353 C 520.0333,933.64818 521.69796,933.11717 522.79454,932.26359 C 525.33233,930.28818 526.21315,930.48735 528.03669,933.44901 C 528.91461,934.87488 530.31835,936.34544 531.15609,936.71693 C 533.24274,937.64222 537.97669,937.56617 539.96837,936.57539 C 541.39272,935.86681 541.77041,935.95354 542.81471,937.22896 C 544.20239,938.92376 546.35098,939.13628 547.77043,937.71916 C 549.25123,936.24077 551.3519,936.53993 552.35977,938.37274 C 553.4006,940.26551 554.40041,940.37556 558.2977,939.02633 C 562.97547,937.4069 563.76533,937.65355 563.17488,940.54928 C 562.69985,942.8789 562.89264,943.22342 565.95336,945.51456 C 568.99619,947.7923 569.49699,947.94486 572.64653,947.55351 L 576.05078,947.13054 L 575.912,950.92143 C 575.80781,953.76765 576.16636,955.19582 577.35084,956.65239 C 578.82814,958.4691 578.94411,958.50276 579.17436,957.18166 C 579.56997,954.91177 577.88337,948.49881 576.07819,945.40908 C 569.83009,934.71486 549.32366,927.66812 536.58071,931.83631 C 535.60212,932.15642 534.72583,931.58172 533.26115,929.65926 C 532.16665,928.22269 530.46744,926.58088 529.48512,926.0108 C 526.81798,924.46292 522.42141,924.71473 519.05386,926.60824 C 515.31062,928.71299 514.01621,928.67344 513.70672,926.44485 C 513.4951,924.92091 512.85713,924.49022 509.51307,923.61369 C 506.21148,922.74827 505.56902,922.32241 505.56902,920.99935 C 505.56902,919.60863 505.92433,919.41882 508.52758,919.41882 C 510.9533,919.41882 511.48604,919.1851 511.48562,918.12103 C 511.48478,916.01527 507.74221,910.50111 503.55309,906.43358 C 498.25506,901.28931 498.45523,899.06905 503.94664,902.06838 L 506.26832,903.33645 L 507.71709,901.36255 C 509.80732,898.51467 511.08062,899.29511 511.14692,903.46478 C 511.19163,906.27744 511.77654,907.8196 514.0063,911.00381 C 515.54805,913.20549 517.14759,915.84732 517.56083,916.87454 C 518.24864,918.58421 518.79741,918.80952 524.04811,919.53795 C 529.91751,920.35221 532.35622,921.28926 536.09064,924.16521 C 538.00101,925.63643 538.95468,925.81719 545.55637,925.95933 C 550.43117,926.0643 554.62034,926.58131 558.02497,927.49816 C 560.84497,928.25758 563.23028,928.88271 563.32567,928.88735 C 563.42106,928.89199 562.63178,927.83681 561.57171,926.5425 C 559.01619,923.42232 558.51123,920.79484 559.15554,913.97049 C 559.45092,910.84201 559.4418,907.74085 559.13529,907.07902 C 558.82878,906.41718 556.09642,904.89031 553.0634,903.68595 C 547.83034,901.60801 547.47964,901.32694 546.19403,898.18038 C 544.53909,894.12987 542.24813,892.01088 537.24079,889.89916 C 533.55229,888.34365 533.43417,888.20611 533.92501,886.03824 C 534.39242,883.97384 534.20558,883.67866 531.63646,882.42269 C 530.09783,881.67051 528.83895,880.80984 528.83895,880.5101 C 528.83895,879.4466 531.96958,879.16487 535.11384,879.94541 C 537.86005,880.62715 538.66315,880.5765 540.89438,879.5809 C 542.88683,878.69185 544.48192,878.51787 547.79724,878.82801 C 560.24346,879.99235 564.36401,880.0456 563.89646,879.03606 C 563.64685,878.49709 561.2475,877.22976 558.56456,876.21976 C 552.87192,874.07676 544.83024,873.40902 539.52799,874.63907 C 536.79608,875.27283 535.53056,875.2644 533.3052,874.59766 C 530.88557,873.87271 530.08967,873.9184 527.35776,874.93913 C 525.41573,875.66473 523.42977,875.95659 522.18955,875.69868 C 520.07603,875.25916 514.64034,876.75895 514.64034,877.78163 C 514.64034,879.26845 521.24082,882.49137 524.28579,882.49137 C 525.29543,882.49137 526.9104,882.94922 527.87462,883.50879 C 529.32345,884.34963 529.62776,885.14768 529.62776,888.10639 C 529.62776,891.66316 529.66381,891.7167 535.14944,896.30721 C 538.18636,898.84859 540.67112,901.20182 540.67112,901.5366 C 540.67112,901.8714 542.23615,902.70116 544.14894,903.38052 C 546.06175,904.05988 547.84563,905.18709 548.11313,905.88543 C 548.80713,907.69714 551.4302,909.54457 552.07712,908.67728 C 552.79969,907.70857 555.64385,907.80275 555.72578,908.7981 C 555.76277,909.24743 555.75915,911.08564 555.71774,912.88298 C 555.67633,914.68035 556.14007,918.06264 556.74828,920.3992 C 557.3565,922.73576 557.69413,924.86808 557.49859,925.13768 C 557.01189,925.8087 551.57037,925.73926 550.24824,925.04515 C 549.46446,924.63368 549.32711,923.74327 549.7372,921.73214 C 550.22329,919.3482 550.0673,918.84794 548.56624,917.9768 C 547.29702,917.24021 546.9394,916.51707 547.22728,915.26929 C 547.8214,912.69418 541.92865,907.98112 538.11489,907.98112 C 535.49221,907.98112 535.32484,907.84519 534.83739,905.31945 C 534.27211,902.39044 530.5395,899.00827 525.81103,897.14056 C 523.19409,896.10689 523.1792,896.07502 523.4446,892.07407 L 523.71168,888.04781 L 519.16413,886.0462 C 516.66297,884.94531 513.27583,882.95983 511.63716,881.63401 C 508.24837,878.89223 506.44822,878.67965 499.4355,880.19309 C 492.20309,881.75394 485.03126,884.76581 476.48548,889.83113 C 465.72043,896.21186 461.66139,899.44726 459.398,903.45125 L 457.49484,906.81799 L 459.58528,908.21653 C 460.73504,908.98573 462.58885,910.1435 463.7049,910.78935 C 464.82093,911.43521 465.73404,912.41868 465.73404,912.97483 C 465.73404,913.80961 465.06025,913.90925 461.87212,913.54594 C 459.05462,913.22486 457.36009,913.38438 455.60639,914.13579 C 452.47339,915.47818 451.68326,914.46734 453.58203,911.54599 C 454.37066,910.33263 454.77383,909.1393 454.47795,908.89416 C 453.56901,908.14104 451.66601,909.92216 451.10058,912.05526 C 450.80561,913.16796 449.71525,915.40142 448.67754,917.0185 C 447.0742,919.51702 446.94989,920.11449 447.84998,920.99592 C 448.43254,921.5664 449.37769,923.06255 449.95031,924.3207 C 450.52292,925.57884 451.67123,927.55874 452.5021,928.72047 C 453.33296,929.88219 453.78939,931.13217 453.51636,931.4982 C 452.7191,932.56704 450.3905,932.26806 448.57053,930.86318 C 446.59126,929.33532 445.74577,930.05735 446.50881,932.62383 C 447.58669,936.24919 449.07621,937.39237 452.722,937.39237 C 457.71192,937.39237 459.81796,935.71584 459.81796,931.74356 C 459.81796,927.62529 461.49664,927.283 465.21338,930.64338 C 467.86798,933.04348 468.04257,933.09722 470.64793,932.31663 C 473.86513,931.35271 476.30831,931.2902 478.16853,932.12422 C 478.92187,932.46199 480.54022,932.91412 481.76485,933.12898 C 483.48407,933.43061 484.35799,934.22151 485.59995,936.59977 C 487.3628,939.9755 492.98856,945.23537 494.83626,945.23537 C 495.4772,945.23537 496.76097,944.64428 497.68907,943.92184 L 499.37656,942.60831 L 501.99574,945.3088 C 504.55326,947.9457 504.70477,948.00048 508.43008,947.6349 C 511.7061,947.31341 512.5699,947.48687 514.54268,948.86228 C 517.16792,950.69257 519.19286,950.88244 521.39168,949.50444 C 523.52432,948.16792 525.90902,948.27469 528.26824,949.81232 C 530.09296,951.00158 530.6491,951.05013 534.34679,950.34291 C 538.38677,949.57024 538.43385,949.57956 540.71815,951.60475 C 542.8264,953.47386 543.23526,953.58818 545.59213,952.96759 C 547.00712,952.59501 548.86368,952.24693 549.71783,952.19408 C 551.79559,952.06552 552.26265,954.23263 550.40337,955.37483 C 548.9973,956.23861 548.9978,956.2926 550.41984,957.16604 C 551.22983,957.66355 551.75637,958.63236 551.5963,959.33058 C 551.15187,961.26957 547.38497,961.31623 543.93679,959.42554 C 535.89274,955.01484 528.62582,953.8421 521.17418,955.75215 C 518.16576,956.52331 517.44814,956.4675 513.66523,955.16837 C 511.36477,954.37832 508.42455,953.72926 507.13139,953.72597 C 505.83824,953.72269 503.00538,952.9966 500.83615,952.11245 C 493.35822,949.06456 486.24246,950.55014 487.77022,954.84027 C 489.226,958.9283 490.39589,960.24174 492.87148,960.56762 C 494.21512,960.74455 502.41377,961.03611 511.0907,961.21565 C 519.76762,961.39512 530.23909,961.62297 534.36063,961.72185 L 541.85433,961.90172 L 542.10393,963.69907 L 542.35352,965.49643 L 548.85527,965.49643 C 552.98284,965.49643 555.87498,965.18264 556.77549,964.63703 z M 523.76768,912.16965 C 524.16102,911.48357 524.51523,908.86346 524.5548,906.34716 C 524.60682,903.03964 524.91327,901.77207 525.66087,901.77207 C 526.22963,901.77207 526.99313,902.21324 527.35754,902.75245 C 527.72195,903.29165 529.09175,905.28985 530.40156,907.1929 C 533.41463,911.57066 533.43551,912.5562 530.51517,912.5562 C 529.26786,912.5562 527.0785,912.7499 525.64991,912.98663 C 523.29375,913.37708 523.11891,913.30119 523.76768,912.16965 z M 464.47138,903.14338 C 463.2883,900.58885 473.64157,894.02336 477.11261,895.12699 C 479.31028,895.82573 478.45548,897.5562 475.39699,898.60016 C 473.77006,899.15547 471.72902,900.13094 470.86132,900.76785 C 469.99363,901.40477 468.31115,902.43782 467.1225,903.06355 C 465.15076,904.1015 464.91836,904.1085 464.47138,903.14338 z M 480.81758,901.91708 C 480.33086,901.5138 479.93265,899.92897 479.93265,898.39522 C 479.93265,896.06645 480.39954,895.21976 482.76403,893.26061 C 484.32129,891.97031 486.1808,891.00802 486.89624,891.12219 C 489.01213,891.4598 488.90742,893.59996 486.6808,895.52562 C 485.53982,896.5124 484.39918,898.37723 484.14604,899.66972 C 483.65499,902.17693 482.26438,903.11586 480.81758,901.91708 z M 513.98135,894.78348 C 511.17083,893.30905 511.18253,893.3312 512.30167,891.59857 C 513.63171,889.53941 516.14473,890.02951 517.44144,892.60091 C 518.83457,895.36357 518.83402,895.34382 517.531,895.75811 C 516.95163,895.94232 515.35429,895.50374 513.98135,894.78348 z M 497.84383,886.6568 C 496.07491,885.19112 503.02754,879.9589 505.64021,880.78961 C 507.58212,881.40704 506.85183,882.80179 503.45359,884.96583 C 500.19737,887.03944 498.81028,887.45755 497.84383,886.6568 z M 474.48179,959.72384 C 473.05735,957.51852 471.51436,956.83919 469.72852,957.63107 C 467.55018,958.59707 467.65821,958.86444 470.66412,959.94698 C 474.32118,961.26402 475.43455,961.19892 474.48179,959.72384 z M 482.32116,957.37473 C 481.87517,956.40285 481.51027,954.61837 481.51027,953.40929 C 481.51027,952.20023 480.97783,950.76982 480.32706,950.23061 C 479.00109,949.13195 478.77027,947.46456 479.86645,946.90322 C 480.26389,946.6997 481.50627,946.82212 482.62729,947.17526 C 484.65972,947.81551 485.27989,947.36077 483.98043,946.18306 C 483.60363,945.84157 482.69912,944.23266 481.97041,942.6077 C 480.88152,940.17963 480.12523,939.50384 477.72542,938.81456 C 476.11941,938.35328 473.18114,938.00384 471.19594,938.03802 C 469.21076,938.07221 466.6246,937.79715 465.44892,937.42678 C 462.84016,936.60497 462.14944,937.57867 462.9217,940.98942 C 463.78412,944.79841 466.4633,946.76332 471.34978,947.17057 L 475.57755,947.5229 L 476.19754,951.10709 C 476.69404,953.97739 477.39249,955.17914 479.70426,957.14075 C 482.94739,959.8926 483.49916,959.94194 482.32116,957.37473 z M 467.45175,954.19865 C 468.61342,953.40275 469.67831,952.35396 469.81819,951.86801 C 470.0842,950.94383 465.7941,949.68134 458.04314,948.40286 C 453.36955,947.63197 452.44312,946.098 456.26831,945.46412 C 457.7734,945.21471 458.63475,944.6714 458.63475,943.97142 C 458.63475,941.88783 456.74012,940.80594 452.55999,940.50252 C 447.81498,940.15809 447.59078,940.38151 447.59261,945.45222 C 447.59512,952.35462 451.86916,955.70973 460.60677,955.66817 C 464.304,955.65058 465.80181,955.32902 467.45175,954.19865 z M 612.41744,953.95782 C 616.6363,952.52634 623.3333,948.05148 624.75856,945.71161 L 626.0439,943.60141 L 622.83374,946.24645 C 621.06814,947.70123 616.50158,950.45086 612.68581,952.35675 C 606.16811,955.61221 606.0853,956.10632 612.41744,953.95782 z M 595.49351,953.07836 C 596.13188,952.22253 587.23166,952.22253 585.63337,953.07836 C 584.80415,953.52238 586.02925,953.71493 589.72807,953.72194 C 592.63092,953.72745 595.22537,953.43784 595.49351,953.07836 z M 605.60271,951.03122 C 609.25815,949.46127 614.13623,945.66527 615.64297,943.21813 C 617.2857,940.55012 620.34106,939.59833 620.34106,941.75459 C 620.34106,942.6838 620.61647,942.6345 622.16673,941.42779 C 623.17084,940.64619 624.90769,940.0067 626.02639,940.0067 C 628.76619,940.0067 629.50754,938.28947 626.99344,937.76664 C 624.50532,937.24921 624.53306,935.60778 627.04596,934.65912 C 628.24129,934.20785 629.01374,933.37676 629.00721,932.54897 C 628.98381,929.58157 628.11881,928.53193 625.04086,927.73599 C 620.78594,926.63569 621.00826,926.58233 616.12973,929.87507 C 611.14012,933.24278 609.70079,933.78225 603.97322,934.43135 C 600.54403,934.82 599.83196,934.72974 599.83196,933.90642 C 599.83196,932.6221 603.54215,930.20295 605.51188,930.20295 C 607.47057,930.20295 609.52147,929.28146 614.54595,926.14388 C 616.89442,924.67736 619.89229,923.44207 621.64526,923.21856 C 623.31411,923.00579 625.30071,922.56815 626.05994,922.24603 C 629.34695,920.85148 626.28478,912.13939 621.8379,910.23404 C 619.8377,909.37702 619.55225,908.89286 619.55225,906.35724 C 619.55225,904.76362 618.94409,902.48101 618.20078,901.28477 C 616.89986,899.19114 612.82934,896.8702 610.45839,896.8702 C 609.8309,896.8702 608.44526,895.72536 607.37918,894.32611 C 604.83014,890.9804 601.3155,888.97664 597.23139,888.5407 C 595.40786,888.34606 593.02847,887.67541 591.94386,887.05037 C 588.24615,884.91948 582.82648,883.76591 580.14784,884.5396 C 577.38927,885.3364 575.37882,884.92655 575.37882,883.56742 C 575.37882,882.59214 572.12545,880.53062 570.58632,880.53062 C 570.08914,880.53062 570.49082,881.07303 571.47891,881.73598 C 572.60821,882.49367 573.09299,883.33535 572.78416,884.00217 C 572.34157,884.95783 572.01826,884.96791 569.52271,884.10397 C 565.95385,882.86844 562.49386,882.88651 559.53063,884.15616 C 557.40084,885.06871 556.70583,885.06871 552.40679,884.15616 C 547.58536,883.13271 543.82637,882.8471 543.82637,883.5042 C 543.82637,883.70178 544.37332,884.73981 545.04182,885.81094 C 545.71031,886.88205 546.03385,888.05796 545.76077,888.42405 C 545.29159,889.05306 549.08516,892.78816 549.62708,892.23075 C 549.76739,892.08642 550.43594,890.79188 551.11274,889.35399 C 552.14081,887.16981 552.71336,886.73438 554.59252,886.70754 C 555.8296,886.68989 558.35877,886.44227 560.21291,886.1573 C 562.72715,885.77086 564.59059,885.93905 567.54387,886.81897 C 570.74566,887.77294 571.79706,887.84701 573.03615,887.20584 C 574.84679,886.26892 577.46893,886.16724 578.09723,887.00958 C 578.34203,887.33777 580.04907,887.80924 581.89065,888.05729 C 583.75399,888.30825 586.14767,889.21495 587.28791,890.10169 C 589.30979,891.67408 589.36933,891.6797 591.7946,890.52639 C 594.16772,889.3979 594.34885,889.40073 597.05591,890.60867 C 600.49829,892.1447 609.2977,898.88737 609.2977,899.9891 C 609.2977,901.38457 607.31957,900.86456 604.11522,898.62672 C 597.17373,893.77899 595.0541,893.27786 591.27723,895.59153 C 588.6737,897.18641 587.35249,896.85213 585.22073,894.05916 L 583.62489,891.96832 L 575.36059,891.8973 C 570.81523,891.85825 565.85627,891.49062 564.34066,891.08033 C 559.62393,889.80348 558.0635,890.09832 556.85506,892.4947 C 554.32312,897.51565 554.40544,897.93315 558.38573,900.25775 C 560.40328,901.43605 563.44876,903.93078 565.15348,905.8016 L 568.25298,909.20307 L 565.89981,913.78494 C 564.60557,916.30496 563.54665,919.13281 563.54665,920.06904 C 563.54665,922.17288 565.45168,925.38626 568.07907,927.71426 C 569.38371,928.87022 569.91926,929.93552 569.64021,930.81968 C 569.40659,931.55988 569.53732,932.00068 569.9307,931.79923 C 570.81806,931.34483 570.80322,926.27103 569.90321,922.40785 C 568.72618,917.35554 570.47334,915.945 579.32077,914.80467 C 582.78829,914.35774 585.49097,912.62851 589.7669,908.12099 C 590.52189,907.32512 592.00656,906.67395 593.06619,906.67395 C 595.23774,906.67395 596.08505,905.23585 595.86687,901.92052 C 595.65226,898.65936 595.80157,898.17737 597.0264,898.17737 C 598.84849,898.17737 600.62078,900.86894 600.62078,903.63614 C 600.62078,905.86711 601.16336,906.62864 604.91536,909.66382 C 609.94581,913.73319 611.18017,916.81698 609.02436,919.92932 C 607.82372,921.66269 607.82277,921.88482 609.01176,922.86999 C 610.20076,923.85515 610.16942,924.01191 608.59671,924.94515 C 607.66103,925.50038 605.63984,926.74537 604.10516,927.71179 C 600.48796,929.98961 591.32663,932.56732 590.19138,931.62667 C 588.6638,930.36097 590.2689,928.95283 595.93334,926.58928 C 599.0342,925.29542 601.42101,924.11231 601.23737,923.96014 C 601.05372,923.80798 597.20146,924.71369 592.6768,925.97282 C 582.66438,928.75912 575.07444,932.11502 574.75194,933.89833 C 574.61728,934.64296 575.88935,936.57911 577.77546,938.50025 C 581.24308,942.03225 582.71686,942.31582 585.30246,939.94855 C 586.57695,938.78169 586.5661,938.52183 585.10585,935.23735 C 583.39628,931.39208 583.50393,930.20295 585.5616,930.20295 C 587.00861,930.20295 589.1899,931.96177 591.39341,934.90528 L 592.71186,936.66648 L 601.00478,936.27737 C 608.37649,935.93148 609.2977,936.00809 609.2977,936.9671 C 609.2977,938.36496 609.96171,938.32224 612.84736,936.73878 C 617.8126,934.01417 620.26937,935.71498 616.28848,939.12108 C 611.34433,943.35136 601.04202,946.54254 592.32919,946.54254 C 588.14512,946.54254 584.05574,947.19828 584.05574,947.8692 C 584.05574,948.14953 585.38686,948.23114 587.01378,948.05056 C 591.11103,947.59577 598.76402,948.87297 601.28416,950.43213 C 603.79631,951.98635 603.48073,951.94257 605.60271,951.03122 z M 616.81841,921.08897 C 616.53542,920.7096 615.45838,920.3992 614.42497,920.3992 C 611.44435,920.3992 611.37549,919.29115 614.18207,916.49063 C 617.66014,913.02007 619.50962,913.01572 619.68372,916.4777 C 619.75602,917.91558 619.84477,919.6027 619.88092,920.22684 C 619.9546,921.49883 617.61532,922.15736 616.81841,921.08897 z M 569.54772,906.1343 C 569.03004,905.44028 570.41825,904.39215 575.61556,901.55297 C 579.52825,899.41554 581.68931,898.94172 581.68931,900.22128 C 581.68931,900.71283 583.01988,900.85208 585.6876,900.63969 C 590.07932,900.29004 591.57942,900.99497 592.43181,903.80897 C 593.07751,905.9406 592.3907,906.39887 589.93804,905.47296 C 586.61972,904.22021 578.36311,904.63012 571.30395,906.39804 C 570.58121,906.57903 569.79092,906.46035 569.54772,906.1343 z M 581.50405,923.56153 C 586.81394,921.13611 590.0665,918.81054 591.64013,916.3143 C 592.32974,915.22037 593.42283,914.51695 594.43313,914.51695 C 595.92886,914.51695 596.0543,914.8021 595.70101,917.39917 L 595.30892,920.2814 L 598.71568,920.5059 C 601.64235,920.69876 602.23896,920.51852 602.94923,919.22688 C 604.73535,915.97881 603.10979,912.64471 599.06286,911.25579 C 596.08051,910.23224 593.87287,910.88124 592.15883,913.28545 C 590.22097,916.0036 584.06871,919.10536 579.55384,919.64047 C 576.65692,919.98382 575.78859,920.35402 575.83896,921.22426 C 576.03384,924.59134 576.20686,925.62787 576.57398,925.62787 C 576.79748,925.62787 579.01601,924.69802 581.50405,923.56153 z " />
-    <path
-       id="path1943"
-       style="fill:#d8c9b6"
-       d="M 502.81458,1001.7768 C 502.03045,1000.9939 502.18949,999.61512 503.62508,994.75074 C 504.60741,991.42203 506.24395,987.12057 507.26183,985.19177 L 509.11252,981.68491 L 507.34076,982.1214 C 503.03335,983.18231 499.81742,983.2479 497.61208,982.31981 C 495.62594,981.48395 494.30333,981.46945 487.8557,982.21237 C 479.06505,983.22522 475.18705,982.73468 469.05881,979.83464 C 461.75571,976.3788 457.40865,969.30813 457.97066,961.79943 L 458.24034,958.19642 L 455.19336,957.32303 C 451.47661,956.25769 447.76885,953.47149 446.31102,950.64842 C 445.09475,948.29314 444.86028,940.18905 445.9665,938.74051 C 446.44206,938.11779 446.17902,936.98115 445.18619,935.36865 C 443.94127,933.34676 443.72791,931.78338 443.92209,926.10638 C 444.12834,920.07655 444.40312,918.92679 446.26795,916.29019 C 447.42968,914.64768 448.3802,912.63867 448.3802,911.82571 C 448.3802,910.90594 449.81962,909.22178 452.19098,907.36702 C 454.2869,905.72769 456.45947,903.43111 457.01892,902.26351 C 458.13527,899.9336 465.76824,893.73647 471.29239,890.67503 C 473.22452,889.60425 476.22523,887.7965 477.96062,886.65782 C 486.05832,881.34448 497.78317,877.31868 506.22006,876.95479 C 509.46836,876.81468 512.12797,876.34185 512.92495,875.76278 C 515.3304,874.01503 517.93585,873.65684 533.96622,872.87002 C 553.37193,871.91752 557.72557,872.38228 563.20686,875.99149 C 565.04108,877.19926 567.05269,877.91628 568.60687,877.91628 C 569.96914,877.91628 571.87265,878.37413 572.83687,878.93372 C 575.09769,880.24578 575.16593,881.48557 572.92257,880.4908 C 572.00549,880.08412 570.02904,879.87 568.53045,880.01496 C 566.49235,880.21211 565.61337,879.98068 565.04229,879.09652 C 562.78224,875.59753 549.61437,872.71564 541.77133,874.00349 C 539.21391,874.42342 536.76651,874.73569 536.33265,874.69743 C 535.89881,874.65915 534.05424,874.45601 532.2336,874.24599 C 530.08039,873.99761 528.1227,874.19509 526.63268,874.81099 C 525.3728,875.33175 523.25078,875.62513 521.91708,875.46294 C 519.16153,875.12784 513.85153,876.37919 513.85153,877.36366 C 513.85153,878.76454 518.49333,881.75816 521.80501,882.49308 C 523.72137,882.91836 525.82175,883.48845 526.47252,883.75997 C 528.30851,884.52598 529.60337,887.12893 529.61614,890.0794 C 529.62689,892.56281 530.13073,893.19178 536.29146,898.41258 C 539.95648,901.51846 543.4891,904.05961 544.14168,904.05961 C 544.79426,904.05961 546.4272,905.38312 547.77043,907.00074 C 550.13808,909.85208 551.89311,910.63508 552.8977,909.28828 C 554.08883,907.69141 554.68607,909.02474 555.16663,914.35356 C 555.45028,917.49892 555.89611,921.19514 556.15735,922.56737 L 556.63235,925.06233 L 553.5818,924.85491 L 550.53126,924.64749 L 550.53126,921.49867 C 550.53126,919.17999 550.16733,918.18065 549.15084,917.70809 C 548.27856,917.30256 547.77043,916.28506 547.77043,914.94391 C 547.77043,912.10231 542.93401,908.09714 538.83754,907.54633 C 536.26608,907.20058 535.84951,906.86739 535.09815,904.55536 C 534.19759,901.78433 531.89216,899.65508 526.99472,897.07126 C 523.99881,895.49066 523.97006,895.43567 524.23389,891.78999 L 524.50049,888.10595 L 519.76762,885.91095 C 517.16455,884.70372 513.52758,882.49802 511.68549,881.00943 L 508.33623,878.3029 L 503.00857,879.06432 C 492.87766,880.51222 487.19822,882.91993 471.42296,892.45457 C 462.71934,897.71509 461.48781,898.71063 459.35657,902.20882 C 456.52724,906.85283 456.81692,908.17316 461.05853,909.96611 C 465.4599,911.82658 465.22832,913.30651 460.61777,912.7829 C 458.26345,912.51552 456.67305,912.66025 455.86583,913.21533 C 454.22789,914.34167 453.33659,913.4563 454.52335,911.88176 C 455.7986,910.18981 455.73926,907.98112 454.41854,907.98112 C 452.9198,907.98112 450.74739,910.13592 450.74259,911.62728 C 450.74037,912.31792 449.86403,914.05944 448.79518,915.49732 C 446.90298,918.04284 446.13878,922.03079 447.45926,922.46888 C 447.82043,922.5887 449.07163,924.42939 450.23971,926.55931 C 452.70851,931.06107 452.03904,932.64038 448.7997,929.95637 C 447.66184,929.01357 446.56953,928.2422 446.37231,928.2422 C 445.30496,928.2422 446.22446,934.07596 447.58274,935.9218 C 449.00248,937.85115 449.49882,938.04595 452.9951,938.04595 C 455.67046,938.04595 457.46595,937.64083 458.88258,936.71754 C 460.72904,935.5141 460.87712,935.08372 460.4567,932.14246 C 459.88213,928.12274 460.96889,927.89758 464.6916,931.26509 C 467.04396,933.39299 467.57207,933.58178 469.87488,933.11787 C 473.6758,932.35218 476.79491,932.50891 480.32643,933.64305 C 482.84201,934.45092 483.9157,935.35308 485.62663,938.09652 C 489.7782,944.75349 495.27184,947.70745 498.15233,944.83167 C 499.10773,943.87784 499.40658,943.96476 501.20696,945.72008 C 504.05091,948.49285 506.0802,949.22531 508.99757,948.53206 C 511.01949,948.05159 511.95053,948.23519 514.35866,949.58923 C 517.33962,951.26537 518.50321,951.29046 522.98637,949.7752 C 525.14832,949.04448 525.6754,949.11266 527.76593,950.39327 C 529.86477,951.679 530.50556,951.76022 533.76949,951.15414 C 537.88877,950.38926 539.56641,950.71447 540.72079,952.50167 C 541.58403,953.83815 546.49206,954.26342 547.37602,953.07836 C 548.05574,952.16709 550.92566,952.25758 550.92566,953.19029 C 550.92566,953.61133 550.30919,954.52021 549.55572,955.21006 C 548.255,956.40096 548.255,956.50632 549.55572,957.29434 C 550.30919,957.75087 550.92566,958.60661 550.92566,959.19608 C 550.92566,960.99343 546.49353,960.502 542.57935,958.27066 C 538.09321,955.71326 533.98567,954.29498 532.46522,954.77838 C 531.8081,954.98732 530.03516,954.82046 528.52538,954.40766 C 526.28762,953.79572 525.34127,953.8451 523.40475,954.67485 C 520.37235,955.97411 516.47289,955.96685 513.45713,954.65622 C 512.15559,954.09061 509.67083,953.55353 507.93545,953.46277 C 506.20007,953.37199 502.92844,952.51309 500.66516,951.55408 C 496.01878,949.5853 491.41145,949.30367 488.78509,950.82788 C 486.70342,952.03597 486.55935,954.03401 488.29478,957.62774 C 489.97813,961.11356 492.10036,961.54773 507.93545,961.64584 C 514.87699,961.68878 525.17098,961.91106 530.81097,962.13962 L 541.06552,962.55529 L 541.31512,964.35265 C 541.54564,966.01262 541.84718,966.157 545.25918,966.24138 C 556.81674,966.52719 558.81378,965.69303 558.81378,960.57951 C 558.81378,956.33161 560.57254,955.63522 562.3581,959.17608 C 562.96167,960.37292 563.91972,961.66257 564.48708,962.04191 C 565.74508,962.88294 568.1781,962.18622 570.069,960.44344 C 571.40388,959.21313 571.4016,959.04203 570.01619,956.47809 C 569.21985,955.00431 566.04554,951.72474 562.96217,949.19014 C 557.66908,944.8391 557.14347,944.57554 553.54925,944.47007 C 547.75137,944.29996 544.56802,944.08204 540.61675,943.58481 C 537.82351,943.23332 536.72708,943.36796 535.74302,944.18334 C 533.99543,945.63132 533.8054,945.58024 529.9308,942.62103 C 526.79382,940.22517 526.14162,940.0067 522.12634,940.0067 C 516.65562,940.0067 513.86224,939.0434 508.18586,935.19928 C 505.7205,933.52971 503.27764,932.1637 502.75728,932.1637 C 502.23692,932.1637 500.57231,932.7981 499.05815,933.57348 C 497.43049,934.40697 494.90095,935.0081 492.87005,935.04404 C 488.43667,935.12249 485.53229,932.91913 484.89714,928.9955 C 484.50286,926.5598 484.23565,926.28145 482.29181,926.28145 C 481.10052,926.28145 479.68393,925.84028 479.14384,925.30107 C 477.636,923.7957 476.37541,924.1099 473.66648,926.66627 C 470.66992,929.49409 468.43216,929.31906 469.15762,926.3136 C 469.54278,924.71797 469.34237,924.37142 467.93515,924.19951 C 465.30608,923.87836 465.38994,922.54095 468.11232,921.37451 C 471.08158,920.10227 472.83334,916.97354 472.83334,912.94256 C 472.83334,908.02122 475.32574,908.20558 476.28926,913.19819 C 476.84037,916.05376 481.88853,921.13615 485.3557,922.3261 C 488.21011,923.30574 490.01938,922.61849 492.0103,919.79831 C 493.27666,918.00448 493.29907,917.738 492.2075,917.45291 C 491.53018,917.27601 490.40591,916.98149 489.70912,916.79841 C 488.74724,916.54567 488.5829,916.03426 489.02653,914.67426 C 489.34789,913.68906 489.5682,910.38304 489.51613,907.32753 C 489.4153,901.41074 491.00992,897.19699 493.34985,897.19699 C 494.28692,897.19699 494.44651,897.86052 494.13585,900.46491 C 493.92146,902.26226 493.74398,905.84633 493.74145,908.42952 C 493.7373,912.66558 493.9496,913.3101 495.90608,915.00112 C 498.4551,917.20429 498.61582,918.58114 496.60069,920.95188 C 493.98252,924.0321 491.64323,928.34412 492.07942,929.28594 C 492.70175,930.62968 497.2593,930.41105 500.2636,928.89333 C 503.49816,927.25932 505.67797,927.23261 506.69973,928.81449 C 507.13521,929.48872 509.2913,930.99727 511.49103,932.16684 C 516.57462,934.86975 521.18397,935.16245 523.37406,932.92147 C 525.12973,931.12501 525.9835,931.43908 527.75558,934.53329 C 529.41071,937.42325 531.95452,938.27175 537.56167,937.80421 C 541.31168,937.49153 542.14349,937.6298 543.31154,938.76011 L 544.67713,940.08159 L 547.5177,938.62698 C 550.26752,937.21884 550.39254,937.21119 551.43078,938.38766 C 552.02067,939.05607 552.50328,939.84085 552.50328,940.13162 C 552.50328,940.96792 555.20777,940.74963 558.35776,939.65911 C 561.78822,938.47149 562.93634,938.86304 562.2891,940.99976 C 561.29016,944.29754 567.46648,948.77398 572.46717,948.37654 L 574.98441,948.17649 L 574.75885,951.11761 C 574.51018,954.35988 576.79302,958.307 578.91687,958.307 C 580.32804,958.307 580.35047,957.95321 579.28434,952.50924 C 577.84881,945.17885 573.26887,939.4221 565.60906,935.32005 C 557.23095,930.83333 545.30278,928.93314 538.26914,930.96474 C 535.95922,931.63192 535.52835,931.57673 534.79898,930.52018 C 534.34097,929.85669 532.83986,928.2639 531.4632,926.98066 C 529.24628,924.91418 528.52496,924.64749 525.15271,924.64749 C 522.46734,924.64749 520.61194,925.08089 518.85704,926.11805 C 515.65111,928.0128 515.16107,927.97243 514.13925,925.7294 C 513.46953,924.25929 512.52535,923.71019 509.62785,923.10565 C 506.80796,922.51733 505.96343,922.04204 505.96343,921.04337 C 505.96343,919.96505 506.49692,919.74561 509.11866,919.74561 C 511.65676,919.74561 512.27391,919.51035 512.27391,918.54284 C 512.27391,916.59025 507.8593,909.88836 504.05551,906.0664 C 500.06304,902.05486 500.06078,900.73966 504.04986,902.78238 L 506.74424,904.16214 L 507.48839,902.54041 C 509.19033,898.8314 512.11166,899.78763 510.82983,903.63415 C 510.12389,905.75256 510.37241,906.50398 513.3956,911.39212 C 515.23666,914.36893 516.93323,917.42388 517.16574,918.18092 C 517.51412,919.31523 518.40456,919.63388 522.2277,919.99233 C 527.60798,920.49677 533.95702,922.77559 536.59182,925.14795 C 538.24711,926.63835 538.87062,926.77017 542.9023,926.48195 C 550.18403,925.96139 562.54474,928.77635 568.49917,932.31124 C 569.6572,932.99872 570.03369,932.97298 570.65633,932.1637 C 571.66257,930.85582 571.62885,927.09568 570.57433,923.02154 C 569.30842,918.13075 570.52148,916.92268 578.10144,915.5254 C 583.72464,914.48882 584.26532,914.22856 587.75706,910.87743 C 590.21438,908.51909 592.05805,907.32753 593.24976,907.32753 C 595.50629,907.32753 596.67672,905.55643 596.67672,902.14183 C 596.67672,900.68032 597.0498,899.48454 597.50578,899.48454 C 598.55778,899.48454 600.62078,903.52092 600.62078,905.57921 C 600.62078,906.57791 602.01722,908.29784 604.49481,910.3507 C 608.97082,914.05936 610.40318,917.65018 608.20819,919.65981 C 606.79179,920.95663 606.49242,923.01354 607.72008,923.01354 C 611.18117,923.01354 602.22704,928.6323 596.09465,930.30857 C 591.88863,931.45828 590.0189,931.39309 590.53321,930.11469 C 590.67084,929.77257 593.25278,928.38525 596.27085,927.03175 C 600.6541,925.06602 601.86658,924.18404 602.2967,922.64842 C 602.59285,921.59108 603.28558,919.8065 603.83611,918.68268 C 605.17826,915.94285 603.73823,913.04739 600.1092,911.18903 C 596.70436,909.44547 594.30179,909.89779 591.96616,912.72206 C 589.15961,916.1158 584.38933,918.60377 580.02234,918.95145 C 577.91814,919.11897 575.85517,919.59685 575.43795,920.01338 C 574.7397,920.71047 575.46594,925.26434 576.39859,926.03709 C 576.60149,926.20521 579.10149,925.27977 581.95415,923.98057 C 586.73704,921.80226 590.70089,918.85552 592.56929,916.08922 C 593.53718,914.65621 596.26839,915.36704 595.57198,916.87072 C 595.3082,917.44029 594.86561,918.65488 594.58847,919.56982 C 594.10447,921.16765 594.19375,921.21637 596.84902,920.80364 C 598.81033,920.49877 599.88973,920.64972 600.56432,921.32322 C 601.87643,922.63317 599.73451,923.66012 590.36624,926.21275 C 581.52394,928.62209 574.9136,931.59646 574.18726,933.49264 C 573.87258,934.31413 574.16538,935.41743 574.92828,936.28495 C 575.62196,937.07376 576.98326,938.66856 577.9534,939.82896 C 580.11777,942.41777 580.95752,942.72061 583.2737,941.74761 C 586.29306,940.4792 586.88781,939.09878 585.77169,935.94969 C 584.30548,931.81278 584.31174,931.25711 585.82755,930.99753 C 586.78316,930.83388 587.97888,931.7932 589.73224,934.13021 L 592.2595,937.49877 L 597.82056,936.99384 C 607.28317,936.13468 608.12319,936.20764 608.05185,937.88255 C 607.97361,939.71961 608.18729,939.71181 612.05855,937.73621 C 615.28734,936.08846 617.97463,935.61226 617.97463,936.68785 C 617.97463,937.70531 611.69185,941.8125 607.82745,943.32129 C 604.26125,944.71365 600.40018,945.34678 589.24187,946.36892 C 581.9538,947.03653 581.19262,948.50186 588.13126,948.50693 C 594.21263,948.51137 598.85807,949.49239 601.16872,951.26019 C 602.35379,952.16685 603.49695,952.46048 604.79266,952.19103 C 607.67631,951.59136 614.32339,946.92342 616.02779,944.30112 C 617.72057,941.69666 618.76344,941.30535 618.76344,943.27461 C 618.76344,945.07934 619.66186,944.91391 622.31309,942.62103 C 624.81259,940.45937 625.86274,940.1626 625.86274,941.61792 C 625.86274,945.60322 605.34178,956.24972 597.46553,956.35063 C 595.36239,956.37763 595.0061,956.53201 595.96991,956.99879 C 597.60396,957.79022 605.64612,956.73403 611.10141,955.01157 C 616.09108,953.43619 621.87648,950.00089 624.47162,947.07257 C 625.52638,945.88237 627.15887,943.19001 628.09936,941.08956 C 629.79889,937.29387 629.79969,937.26845 628.23045,936.92844 C 626.41664,936.53543 626.09053,935.43162 627.78821,935.43162 C 629.56611,935.43162 630.0125,934.27129 629.44369,931.12843 C 628.98313,928.58375 628.57156,928.10519 626.11094,927.25333 C 621.85136,925.77867 620.26428,926.04417 616.03691,928.93861 C 613.90244,930.40005 611.51801,931.87871 610.73815,932.22452 C 608.67458,933.13959 602.23055,934.04272 601.80791,933.47611 C 601.21239,932.67772 603.99667,931.06306 606.69425,930.6424 C 608.08234,930.42594 611.37255,928.93468 614.0058,927.32851 C 617.27468,925.33464 620.16478,924.17233 623.11591,923.66471 C 626.678,923.05199 627.52309,922.64118 627.92053,921.32912 C 628.54344,919.27275 627.6505,915.26396 626.13576,913.31647 C 624.33689,911.00366 625.73915,910.64746 627.88476,912.87221 C 630.12965,915.19987 631.04148,919.41437 630.03833,922.82611 C 629.52199,924.58222 629.60782,925.90403 630.33379,927.37699 C 630.89654,928.51876 631.5791,931.01904 631.85063,932.93317 C 632.26764,935.87303 631.96033,937.23838 629.87153,941.72626 C 627.87248,946.02131 626.59598,947.66818 623.20813,950.32298 C 618.52651,953.99162 611.33647,957.26604 605.60321,958.3404 C 603.51364,958.73202 597.71273,959.04079 592.71229,959.02653 L 583.62058,959.00072 L 579.22823,963.06967 C 571.83033,969.92281 564.99658,971.9884 549.61925,972.01932 L 543.18555,972.03225 L 540.39861,975.24648 C 538.23306,977.74401 536.19557,979.07108 531.26021,981.19855 C 523.73786,984.44114 518.42768,988.87454 512.16751,997.13845 C 508.6148,1001.8283 507.60273,1002.7272 505.8628,1002.738 C 504.72285,1002.7449 503.35114,1002.3124 502.81458,1001.7768 z M 475.06991,958.92451 C 472.92442,956.7124 472.16811,956.34175 470.49707,956.68324 C 467.64573,957.26592 466.88605,958.07498 468.07535,959.26235 C 469.15758,960.34279 472.86174,961.4195 475.82856,961.51603 C 477.58484,961.57315 477.56151,961.49348 475.06991,958.92451 z M 483.49897,959.12398 C 483.19839,958.49491 482.58834,956.3626 482.14331,954.38551 C 481.69828,952.40844 481.00679,950.26417 480.60669,949.62046 C 479.5281,947.88527 480.43651,947.21965 483.03916,947.83812 C 485.81041,948.49665 486.64737,947.99755 485.12279,946.59557 C 484.50471,946.0272 483.30543,944.09159 482.45775,942.29424 C 481.29078,939.81995 480.46178,938.97143 479.04414,938.8003 C 478.01436,938.676 476.79564,938.31878 476.33587,938.0065 C 475.87611,937.69421 473.52437,937.45827 471.10978,937.48216 C 468.6952,937.50606 465.95808,937.18792 465.02731,936.77518 C 462.73617,935.7592 461.78999,936.39993 461.78999,938.96737 C 461.78999,944.28176 464.90204,947.19687 471.24673,947.82561 C 473.57442,948.05629 474.84003,948.51235 474.94105,949.15687 C 475.68889,953.9278 476.35683,955.37307 478.88579,957.69244 C 481.81683,960.38056 484.49677,961.21218 483.49897,959.12398 z M 586.81658,956.99983 C 587.09417,956.62769 586.41485,956.34626 585.23896,956.34626 C 584.06307,956.34626 583.38375,956.62769 583.66133,956.99983 C 583.92947,957.35931 584.6394,957.65342 585.23896,957.65342 C 585.83851,957.65342 586.54845,957.35931 586.81658,956.99983 z M 468.46744,954.31785 C 470.00099,953.20218 471.25572,951.92005 471.25572,951.46865 C 471.25572,950.7288 462.36957,947.86417 459.9986,947.83969 C 459.46541,947.83419 458.51566,947.56051 457.88807,947.23152 C 456.93545,946.73216 457.02768,946.43693 458.44645,945.44417 C 460.00803,944.35149 460.05862,944.08835 459.06989,942.20153 C 458.15354,940.45285 457.48528,940.09862 454.56743,939.81489 C 452.68292,939.63163 450.45548,939.37924 449.61759,939.25402 C 446.49469,938.78729 446.01315,947.72184 448.93993,951.82709 C 450.88596,954.55668 455.72688,956.34514 461.17093,956.3458 C 465.08915,956.3462 466.04406,956.08083 468.46744,954.31785 z M 597.46553,953.75851 L 599.43756,953.26179 L 597.21698,952.51649 C 592.94558,951.08288 583.26693,951.91495 583.26693,953.71577 C 583.26693,954.49106 594.42392,954.52465 597.46553,953.75851 z M 564.8639,928.25204 C 560.63663,925.17674 559.24052,921.47717 559.98323,915.31869 C 561.07411,906.27312 560.74723,905.69722 552.8154,902.69037 C 548.37446,901.00688 547.92394,900.63924 547.01857,897.95993 C 545.95656,894.81709 541.26765,890.53312 537.12147,888.91757 C 535.18803,888.16421 534.79961,887.65531 534.99865,886.13631 C 535.17113,884.82001 534.61208,883.73212 533.08413,882.41069 C 530.35821,880.05321 531.0841,879.41893 535.21516,880.54859 C 537.73278,881.23704 538.73268,881.25996 539.75475,880.65271 C 543.04743,878.69636 544.75104,878.52202 549.64759,879.64029 C 552.3674,880.26144 556.63909,880.67743 559.43095,880.59303 C 564.05664,880.45319 569.38468,881.33782 570.91592,882.4999 C 571.28133,882.77721 569.30638,882.85287 566.52713,882.66802 C 562.80011,882.42014 560.83296,882.60659 559.03153,883.37844 C 556.84348,884.31595 556.1915,884.32499 552.77138,883.46523 C 548.23698,882.32537 544.12755,882.21242 543.38547,883.20727 C 543.09178,883.60103 543.32064,884.64954 543.89408,885.53732 C 544.77221,886.89684 544.75877,887.24256 543.80886,887.729 C 542.91669,888.18586 543.33636,888.78582 545.81734,890.60041 C 547.5423,891.86205 549.24622,892.90653 549.60383,892.92149 C 549.96144,892.93647 550.84885,891.77524 551.57585,890.34101 C 552.57268,888.37451 553.34518,887.73169 554.71763,887.72668 C 555.71859,887.72303 558.02586,887.41291 559.8449,887.03753 C 562.57327,886.47449 563.93274,886.5789 567.61088,887.63395 C 571.69568,888.80564 572.21745,888.82704 573.83362,887.88908 C 575.12179,887.1415 575.9488,887.04695 576.89902,887.53864 C 577.61475,887.90899 579.74965,888.42889 581.64328,888.69396 C 583.77833,888.99284 585.79062,889.80567 586.94044,890.83366 L 588.79465,892.49139 L 591.92875,891.32039 C 595.41276,890.01865 594.65655,889.76897 601.6068,894.51581 C 603.66756,895.92327 605.35364,897.37416 605.35364,897.74002 C 605.35364,898.10588 604.55498,897.82003 603.57882,897.10479 C 598.44322,893.34189 594.08456,892.6263 590.50607,894.95859 L 588.42505,896.31491 L 585.57671,893.54723 L 582.72837,890.77957 L 577.39692,891.19208 C 573.74616,891.47454 570.24959,891.27398 566.30525,890.55586 C 558.244,889.08819 556.91311,889.49424 555.22705,893.93572 C 553.90853,897.40897 553.91232,897.59328 555.32843,898.88983 C 556.1374,899.63048 557.81269,900.72903 559.0513,901.33106 C 561.39387,902.46967 566.70189,908.06927 566.70189,909.40191 C 566.70189,909.82221 565.77664,912.08237 564.64578,914.42449 C 562.10582,919.685 562.41899,922.67464 565.93497,926.73123 C 567.3163,928.32495 568.2687,929.77619 568.05143,929.95621 C 567.83415,930.13624 566.39977,929.36937 564.8639,928.25204 z M 615.34276,919.44804 C 613.94809,918.57235 613.96012,918.46448 615.66541,916.55337 C 617.85398,914.10063 618.76344,914.47347 618.76344,917.82344 C 618.76344,920.58441 617.84632,921.01999 615.34276,919.44804 z M 525.20491,910.86879 C 525.46825,910.30018 525.6837,908.511 525.6837,906.89283 C 525.6837,905.17038 526.01954,904.04344 526.49378,904.17441 C 527.63136,904.48862 532.0247,911.0059 531.43069,911.49808 C 531.16216,911.72057 529.54377,911.90262 527.83427,911.90262 C 525.32411,911.90262 524.81823,911.70371 525.20491,910.86879 z M 620.90697,909.22402 C 619.82118,908.70039 619.61247,908.053 619.99077,906.38216 C 620.31447,904.9525 620.03583,903.50565 619.16949,902.11752 C 618.44833,900.96204 618.0704,899.84089 618.32965,899.62609 C 619.34799,898.78233 621.37776,901.50609 621.96127,904.49938 C 622.29955,906.23461 622.82128,908.16902 623.1207,908.7981 C 623.73289,910.08429 622.98802,910.22761 620.90697,909.22402 z M 572.22357,904.82268 C 572.22357,904.1942 579.07339,900.13811 580.13475,900.13811 C 580.55591,900.13811 580.9005,900.44734 580.9005,900.82528 C 580.9005,901.24136 582.63791,901.45421 585.30454,901.36482 C 588.41099,901.26069 589.91812,901.49151 590.41973,902.14822 C 591.90383,904.09117 591.0904,904.38641 584.25324,904.38641 C 580.45692,904.38641 576.19721,904.59964 574.78721,904.86025 C 573.37721,905.12088 572.22357,905.10397 572.22357,904.82268 z M 465.73404,901.88669 C 465.73404,900.44296 471.55366,896.4098 474.37872,895.8957 C 478.94214,895.06522 478.52459,896.90137 473.77619,898.54526 C 472.18485,899.09618 470.16807,900.07735 469.29446,900.72566 C 466.79151,902.5831 465.73404,902.92794 465.73404,901.88669 z M 481.22589,900.9918 C 480.94845,900.76191 480.72146,899.58914 480.72146,898.38563 C 480.72146,895.60505 485.55277,890.83203 487.09165,892.09229 C 487.83022,892.69713 487.59348,893.3106 486.02572,894.85436 C 484.91728,895.94585 483.77549,897.72489 483.48844,898.8078 C 482.94238,900.86778 482.08041,901.69982 481.22589,900.9918 z M 611.91013,896.69508 C 609.8204,895.86029 608.25312,894.66854 607.64483,893.45177 C 606.41923,891.00015 601.24451,888.27622 597.51059,888.11722 C 595.92311,888.04959 593.57746,887.38518 592.29804,886.64072 C 588.62346,884.50256 584.31605,883.60152 580.02426,884.07325 C 576.99016,884.40674 576.16763,884.30067 576.16763,883.57595 C 576.16763,882.64002 579.40143,881.83735 583.16833,881.8383 C 584.30717,881.83858 587.40444,882.68765 590.05112,883.7251 C 592.69781,884.76255 596.35158,885.81972 598.17059,886.07435 C 600.78011,886.43964 602.69797,887.47468 607.2608,890.9801 C 610.4414,893.42362 613.7982,895.62129 614.72035,895.86379 C 615.64251,896.10629 616.39701,896.72605 616.39701,897.24104 C 616.39701,898.39197 616.05328,898.35015 611.91013,896.69508 z M 513.85793,893.738 C 512.22631,892.64329 512.20034,892.50576 513.4615,891.63853 C 514.64432,890.82516 514.94671,890.86421 515.90892,891.95451 C 517.1501,893.36094 517.35785,894.90945 516.30536,894.90945 C 515.91957,894.90945 514.81823,894.3823 513.85793,893.738 z M 498.86412,885.5185 C 498.86412,884.39757 502.50393,881.83778 504.09777,881.83778 C 505.8376,881.83778 505.33912,882.96156 503.00538,884.30045 C 499.32489,886.41196 498.86412,886.5475 498.86412,885.5185 z " />
-    <path
-       id="path1941"
-       style="fill:#c9b6a0"
-       d="M 503.27677,1001.7384 C 502.30579,1000.9339 502.30768,1000.2552 503.29075,996.71415 C 504.89423,990.93863 505.8141,988.49423 507.72071,984.9425 C 508.63672,983.23602 509.2234,981.70497 509.02443,981.54004 C 508.82546,981.37519 507.09913,981.68663 505.18814,982.2322 C 502.04725,983.12883 501.39149,983.12211 498.35865,982.16242 C 495.45408,981.24335 494.14122,981.20527 488.57911,981.87916 C 474.32079,983.60659 465.21988,980.22592 460.32233,971.38266 C 458.73189,968.51094 458.31591,966.69477 458.26303,962.39191 L 458.19674,956.99983 L 461.87467,956.99983 C 464.91158,956.99983 465.77424,957.28016 466.82426,958.60792 C 467.62889,959.62541 469.59783,960.5856 472.18542,961.22225 C 479.43375,963.00581 480.0764,962.2819 475.27005,957.7478 C 472.63669,955.2636 472.04477,954.99301 470.62267,955.62365 C 467.95106,956.80834 467.68383,956.45528 469.8093,954.5489 C 472.26911,952.34273 472.96244,950.83244 471.91417,949.96385 C 471.37883,949.5203 471.39902,949.16063 471.9758,948.86527 C 473.49692,948.08633 474.41097,949.17248 474.41097,951.75896 C 474.41097,955.6826 480.39111,961.66787 483.36626,960.72193 C 484.42666,960.38475 484.50008,960.00019 483.79161,958.49373 C 483.32066,957.49238 482.66613,955.20249 482.33709,953.40516 C 482.00806,951.60781 481.59867,949.71048 481.42736,949.18887 C 481.18841,948.46138 481.8048,948.28277 484.07391,948.42196 C 487.40073,948.62606 487.68768,948.20815 485.55977,946.25786 C 484.75007,945.51576 483.45977,943.51218 482.69243,941.80549 C 481.46072,939.06597 480.91695,938.61271 478.05132,937.937 C 476.26605,937.51604 472.83763,937.14777 470.43259,937.11859 C 465.132,937.05433 462.10716,935.60111 461.13229,932.65049 C 460.07513,929.45081 461.37452,929.09129 464.39745,931.74704 C 467.38589,934.37249 467.7721,934.45425 472.10504,933.37863 C 474.58524,932.76293 475.58536,932.81995 477.83745,933.70541 C 479.33786,934.29535 481.12262,934.77803 481.80358,934.77803 C 482.52462,934.77803 483.871,936.23055 485.0275,938.25609 C 488.66701,944.6305 494.23844,947.91345 498.03745,945.92216 C 498.8649,945.48846 500.01502,945.94477 502.18099,947.56614 C 505.37825,949.95949 506.30476,950.16755 509.40961,949.18946 C 510.99119,948.69123 511.94387,948.88503 514.22887,950.16984 C 517.60682,952.06919 519.21654,952.16001 522.42886,950.63244 C 524.71867,949.54357 524.93271,949.54712 527.31603,950.71363 C 529.26929,951.66965 530.69949,951.84681 533.92694,951.53251 C 537.62317,951.17256 538.23448,951.29824 539.89015,952.75849 C 541.90313,954.53387 544.22196,954.80373 547.34223,953.62578 C 549.98533,952.62796 550.77293,953.37344 548.89354,955.09412 C 547.43534,956.42919 547.43463,956.48717 548.86584,957.35427 C 550.43526,958.30518 550.11007,960.27547 548.38678,960.25691 C 547.83086,960.25089 544.72997,958.92739 541.49591,957.31577 C 536.92342,955.03713 534.85075,954.38551 532.17552,954.38551 C 530.28336,954.38551 528.04246,954.07833 527.19573,953.70287 C 526.04185,953.19118 525.22054,953.27304 523.91683,954.02966 C 521.74729,955.28876 515.69383,955.30497 513.06272,954.05874 C 511.97811,953.54501 509.90782,953.11426 508.46207,953.10153 C 507.01633,953.08879 503.32007,952.16436 500.24818,951.04723 C 495.47142,949.3101 494.20053,949.09723 491.46858,949.57666 C 489.23448,949.96872 487.918,950.66342 487.0892,951.88762 C 486.01074,953.48061 486.04585,953.92139 487.47976,956.78952 C 488.44838,958.727 489.82753,960.24822 491.05994,960.73846 C 492.31676,961.23846 498.92792,961.67276 508.78252,961.90282 C 517.4274,962.10465 528.05014,962.48106 532.3886,962.73935 C 539.88334,963.18548 540.26776,963.28025 540.09724,964.64009 C 539.86301,966.50784 541.50398,966.9068 549.42018,966.9068 C 558.06968,966.9068 559.60259,966.05268 559.60259,961.2331 C 559.60259,959.26431 559.90365,957.65342 560.2716,957.65342 C 560.63955,957.65342 561.57146,958.81255 562.34248,960.22926 C 563.11351,961.64596 564.2548,962.96745 564.87868,963.16581 C 566.18803,963.58207 569.88492,962.1419 571.40663,960.62265 C 573.07836,958.95366 570.25737,954.71505 564.01999,949.52402 C 559.02651,945.36822 558.20234,944.93963 554.15683,944.3948 C 551.72892,944.06783 548.85504,943.82117 547.77043,943.84665 C 546.6858,943.87215 544.10625,943.57627 542.03808,943.18916 C 538.91194,942.604 537.95215,942.66209 536.34696,943.53354 C 533.56768,945.04241 532.65552,944.85892 530.18574,942.29422 C 528.25304,940.28724 527.54613,940.0067 524.42175,940.0067 C 518.47966,940.0067 514.34856,938.76887 509.52079,935.54185 C 507.01007,933.86361 504.49857,932.21146 503.9397,931.87041 C 503.24704,931.44771 501.6785,931.81182 499.01227,933.01418 C 491.20602,936.53451 485.45433,934.35842 485.45433,927.88466 C 485.45433,925.75677 485.30214,925.62787 482.79007,925.62787 C 481.32473,925.62787 479.68393,925.18669 479.14384,924.64749 C 477.64292,923.14901 476.37736,923.45448 473.72797,925.95466 C 472.39475,927.21281 470.89167,928.2422 470.38781,928.2422 C 469.78134,928.2422 469.62312,927.46898 469.9197,925.95466 C 470.32906,923.86452 470.20182,923.66711 468.44529,923.66711 C 465.97666,923.66711 465.98051,922.77452 468.45316,921.84104 C 471.38771,920.73319 472.93267,918.24435 473.41356,913.85011 C 473.891,909.48753 474.4328,909.46369 475.90197,913.7406 C 477.73102,919.06512 485.77809,924.61891 489.36154,923.02987 C 490.18915,922.66288 491.66059,921.43836 492.63139,920.30871 C 494.33848,918.32232 494.34829,918.22562 492.92989,917.36626 C 492.12326,916.87755 491.07779,916.4777 490.60664,916.4777 C 489.16175,916.4777 489.63024,902.89478 491.17584,899.97473 C 492.53117,897.41415 494.13553,896.7031 494.1253,898.66756 C 494.12201,899.29663 493.74785,901.7084 493.29383,904.02706 C 492.22334,909.49386 492.95055,912.79446 495.82264,915.50483 L 498.14261,917.69415 L 494.47788,923.31009 C 491.4864,927.8943 490.99075,929.10336 491.77997,929.89128 C 493.11439,931.22351 495.98757,931.09873 499.65294,929.54936 C 503.82805,927.78453 504.4754,927.86825 508.00989,930.63024 C 511.29525,933.19755 516.36991,935.39403 519.06963,935.41726 C 519.98728,935.42516 521.72919,934.78566 522.94054,933.99616 L 525.143,932.5607 L 526.39936,934.06827 C 530.13167,938.54678 530.96261,938.90599 536.67264,938.50934 C 541.34639,938.18468 542.16004,938.29941 543.34987,939.45079 C 544.61094,940.67113 544.83639,940.69052 546.60426,939.73075 C 549.19383,938.32487 550.52018,938.43459 551.91583,940.1701 C 553.0919,941.63254 553.119,941.63437 556.83021,940.50199 C 561.01063,939.22643 562.01143,939.40434 561.40815,941.31582 C 560.53189,944.09223 567.23766,949.15687 571.79,949.15687 C 573.57656,949.15687 573.80119,949.42201 573.80119,951.53066 C 573.80119,955.34261 578.2306,960.1271 580.22772,958.4723 C 581.01617,957.81904 579.74265,950.96061 578.12942,947.17206 C 575.41159,940.78949 567.2324,934.58545 557.42195,931.46514 C 552.56188,929.91934 543.43066,929.42267 538.22426,930.42094 C 535.53659,930.93626 535.29471,930.84171 533.74946,928.67168 C 530.45942,924.0514 524.04832,922.66062 519.33892,925.54553 C 516.36681,927.36621 514.92218,927.30084 514.32171,925.31849 C 513.94967,924.09028 512.97057,923.49383 510.2459,922.83556 C 505.65782,921.72707 505.43852,920.7811 509.71027,920.52502 C 512.36552,920.36583 513.06272,920.07128 513.06272,919.10864 C 513.06272,917.006 510.24229,912.39607 506.07765,907.69172 C 503.86824,905.19601 502.23469,903.00976 502.44751,902.83342 C 502.66034,902.65708 503.25451,902.86084 503.7679,903.2862 C 505.29167,904.54876 507.22601,904.17202 508.18634,902.42566 C 509.6509,899.76232 510.85895,900.42709 510.28794,903.58212 C 509.84649,906.02122 510.23766,907.14674 513.39484,912.52146 C 515.38141,915.90336 517.00678,919.05935 517.00678,919.53479 C 517.00678,920.01021 517.27301,920.41819 517.59839,920.44141 C 527.76776,921.16709 532.22648,922.35683 536.00137,925.35196 C 537.81746,926.7929 538.83636,926.99073 545.46711,927.18978 C 553.74652,927.43832 561.4976,929.1746 566.24541,931.8442 C 571.15352,934.60394 572.78487,932.14646 571.3174,924.20368 C 570.14861,917.87755 570.49414,917.46879 578.21902,916.03944 C 583.11976,915.13263 584.06669,914.68158 587.73473,911.50678 C 589.97509,909.56766 592.50512,907.98112 593.35701,907.98112 C 595.38324,907.98112 596.35155,906.89655 597.00401,903.89622 C 597.82058,900.14136 599.83036,901.10796 599.83313,905.25684 C 599.83395,906.48448 600.99689,907.94606 603.76154,910.19403 C 608.37504,913.94531 609.49081,916.88469 607.40945,919.80412 C 606.62463,920.90493 606.28586,922.27899 606.56889,923.21337 C 606.97252,924.54583 606.47249,925.08194 603.20661,926.81838 C 601.09659,927.94026 597.83214,929.3078 595.95227,929.85735 C 591.92216,931.03549 591.94386,931.03344 591.94386,930.23494 C 591.94386,929.89306 594.25217,928.54375 597.07347,927.23647 C 600.90079,925.46305 602.31968,924.41786 602.66237,923.1196 C 602.91499,922.16258 603.62992,920.25815 604.25112,918.88752 C 605.24553,916.69348 605.23406,916.13966 604.15532,914.25609 C 603.47656,913.07092 601.56503,911.48104 599.86961,910.69152 C 597.24811,909.47072 596.50832,909.37988 594.71175,910.05812 C 593.55818,910.49363 592.13323,911.62083 591.54518,912.56303 C 589.93881,915.13689 584.60419,917.87384 579.51511,918.73514 L 574.98441,919.50194 L 575.16668,922.98825 C 575.26692,924.90572 575.54783,926.63936 575.79094,926.84077 C 576.03404,927.0422 578.43678,926.22243 581.13036,925.01907 C 586.3804,922.67357 591.65393,918.91779 592.38801,917.00139 C 593.082,915.1897 595.40078,915.47276 594.79052,917.29468 C 593.13387,922.24061 592.99134,921.89547 596.4883,921.40596 C 599.76088,920.94784 601.38793,921.69778 599.62608,922.85222 C 599.08855,923.20444 595.63155,924.3084 591.94386,925.30546 C 580.70621,928.34389 573.01238,932.08033 573.01238,934.49939 C 573.01238,935.88275 580.25503,942.62103 581.74193,942.62103 C 582.53229,942.62103 584.1693,941.91522 585.37971,941.05255 C 587.49152,939.54745 587.54329,939.36916 586.66035,936.64086 C 586.15427,935.0771 585.48689,933.25312 585.17729,932.5876 C 584.01672,930.09286 587.48748,931.81725 589.58754,934.77877 C 591.92375,938.07328 592.20719,938.12498 602.39561,937.11455 C 607.00198,936.65772 607.72008,936.72653 607.72008,937.62477 C 607.72008,938.6214 603.73512,939.85921 596.87393,940.9938 C 594.42869,941.39814 593.22565,942.63165 595.29631,942.61138 C 598.1812,942.5831 606.75913,940.42118 610.96324,938.66276 C 616.31219,936.42551 617.61574,936.56002 614.78454,939.05705 C 611.01406,942.38251 603.94276,944.60993 595.02109,945.28244 C 583.87768,946.12242 582.3366,946.42908 582.63975,947.74622 C 582.84251,948.62724 584.2407,948.90101 590.11117,949.20915 C 594.97449,949.46443 597.93441,949.94324 599.17416,950.6752 C 600.18673,951.27304 601.75082,952.20658 602.64993,952.74972 C 604.15712,953.6602 604.58008,953.57514 608.07035,951.6596 C 610.15246,950.51691 613.03205,948.57862 614.46944,947.35232 C 616.46131,945.65295 617.39276,945.26637 618.38588,945.72687 C 619.51623,946.251 619.34977,946.5675 617.12976,948.11527 C 612.16646,951.57566 602.78283,954.96608 597.34519,955.26373 C 594.59139,955.41444 593.22567,955.41843 594.31028,955.27261 C 598.76535,954.67367 599.83196,954.31538 599.83196,953.41789 C 599.83196,951.37459 586.20997,950.37843 583.9439,952.25601 C 583.57214,952.56404 583.2067,954.11172 583.13182,955.69529 C 582.8997,960.60337 577.54239,965.8419 569.06833,969.44693 C 566.01522,970.74581 563.93053,971.00939 554.16554,971.33129 C 544.06988,971.66403 542.71568,971.84455 541.93897,972.96087 C 539.67798,976.21059 535.31569,979.40118 530.56467,981.27987 C 524.02679,983.8652 519.19871,987.85948 512.74159,996.02509 C 507.51822,1002.6305 505.68729,1003.7356 503.27677,1001.7384 z M 599.83196,958.4476 C 599.83196,957.964 608.61176,956.31972 609.15899,956.70082 C 609.40871,956.87474 601.23353,958.96059 600.30217,958.96059 C 600.04356,958.96059 599.83196,958.72974 599.83196,958.4476 z M 463.07229,947.56727 C 461.24724,946.8993 460.77145,946.28054 460.63333,944.39536 C 460.53894,943.10723 459.82621,941.24968 459.04948,940.26748 C 457.68641,938.54378 457.68893,938.4502 459.12201,937.57844 C 460.51817,936.72914 460.63623,936.89454 461.10034,940.35018 C 461.4997,943.32372 462.09382,944.45249 464.21311,946.26421 C 466.98761,948.63601 466.74609,948.91188 463.07229,947.56727 z M 445.78521,940.66027 C 446.01212,939.94134 446.33385,939.35311 446.50017,939.35311 C 446.66649,939.35311 446.80258,939.94134 446.80258,940.66027 C 446.80258,941.37923 446.48084,941.96744 446.08761,941.96744 C 445.69438,941.96744 445.5583,941.37923 445.78521,940.66027 z M 630.18459,934.39783 C 630.19373,931.37224 630.42169,928.89654 630.69119,928.89627 C 631.49973,928.89547 632.22784,935.04197 631.68542,937.28918 C 630.7629,941.11095 630.16776,939.9644 630.18459,934.39783 z M 444.12369,933.63426 C 443.36579,931.56419 444.05563,919.79947 444.9798,919.03372 C 445.64486,918.48267 445.80636,918.88775 445.6121,920.61961 C 445.27187,923.6527 445.97371,925.78046 447.18713,925.39464 C 447.99092,925.13908 450.74663,928.68772 450.74663,929.97835 C 450.74663,930.70193 448.20461,928.61638 447.69484,927.47457 C 447.35182,926.70624 446.83234,926.51586 446.10092,926.8904 C 445.38,927.25957 445.02924,928.67622 445.05565,931.11203 C 445.09683,934.90899 444.84245,935.59742 444.12369,933.63426 z M 606.997,931.95322 C 607.17777,931.83746 609.1005,930.90327 611.26974,929.87726 C 613.87232,928.64626 614.83089,928.39906 614.08802,929.15045 C 612.82932,930.42361 609.09866,932.1637 607.62778,932.1637 C 607.10008,932.1637 606.81623,932.06899 606.997,931.95322 z M 626.78634,926.91216 C 623.02978,925.23868 622.9598,925.06125 625.73959,924.25833 C 628.67359,923.41087 629.41963,921.68364 628.76733,917.24833 C 628.44015,915.02356 628.51637,914.59721 629.04708,915.68382 C 629.44831,916.50534 629.69465,919.66559 629.59449,922.7066 C 629.49434,925.74763 629.41239,928.20114 629.41239,928.15888 C 629.41239,928.1166 628.23067,927.55558 626.78634,926.91216 z M 551.74093,924.35726 C 550.97946,923.95217 550.65903,922.88271 550.80324,921.2277 C 550.96527,919.36836 550.60216,918.39846 549.40914,917.50389 C 548.30552,916.67635 547.93969,915.81969 548.25102,914.79192 C 548.93549,912.53227 543.5123,907.94554 539.52035,907.40784 C 536.74416,907.03391 536.41272,906.75859 535.45189,904.02828 C 534.56884,901.51902 533.61902,900.58683 529.35663,898.0462 L 524.30743,895.03659 L 524.40396,891.29496 L 524.50049,887.55334 L 519.98485,885.51254 C 515.0566,883.28527 509.90747,879.59735 509.90747,878.29488 C 509.90747,877.84259 510.88363,877.06711 512.07671,876.5716 C 514.9868,875.36299 516.14002,875.06011 514.44314,875.95008 C 512.52355,876.95685 512.67138,877.37416 515.89301,880.04352 C 517.80143,881.62475 519.98942,882.64026 522.61038,883.16124 C 527.45351,884.1239 528.83895,885.66689 528.83895,890.09808 C 528.83895,893.26137 529.04784,893.62952 531.90759,895.5062 C 533.59533,896.61376 536.31935,898.97925 537.96095,900.76283 C 539.77192,902.73042 541.77223,904.15614 543.04746,904.38821 C 544.34489,904.62431 546.11788,905.90937 547.68043,907.74615 C 549.8228,910.2645 550.50886,910.65979 552.14629,910.31929 C 553.43467,910.05135 554.08756,910.19403 554.10078,910.74639 C 554.11171,911.20258 554.31622,913.48756 554.55526,915.82412 C 555.37328,923.82065 555.33183,924.60456 554.08091,924.79372 C 553.43014,924.89213 552.37715,924.69573 551.74093,924.35726 z M 560.3914,918.25924 C 560.3914,917.03983 560.78422,914.42148 561.26432,912.44072 C 562.511,907.2972 561.14878,905.37479 554.204,902.47702 C 549.40957,900.4765 548.74456,899.96006 547.87838,897.56462 C 546.67754,894.24365 542.96492,890.66367 538.97098,888.9754 C 536.42222,887.89805 535.93825,887.36482 535.93825,885.63406 C 535.93825,884.5014 535.35079,883.03681 534.63278,882.37943 C 533.59805,881.43208 533.55716,881.18628 534.43558,881.19421 C 535.04513,881.19971 536.06582,881.47773 536.70379,881.81204 C 537.4977,882.22805 538.6472,882.01865 540.34654,881.14845 C 543.36048,879.60506 547.26787,879.52928 552.2061,880.91842 C 554.29414,881.5058 556.97137,881.79579 558.34696,881.58355 C 560.67535,881.22433 560.71435,881.2531 559.20819,882.21888 C 558.14157,882.90282 556.7363,883.10887 554.86972,882.85503 C 543.48772,881.30715 540.8528,881.73673 542.30585,884.90337 C 543.01625,886.45154 542.93562,886.53337 541.07988,886.14747 C 538.54354,885.62002 538.32177,887.33183 540.78494,888.42409 C 541.71522,888.83661 544.0215,890.35422 545.90999,891.79655 C 549.79227,894.76161 550.95304,894.55317 552.52411,890.60888 C 553.28275,888.70428 553.77579,888.37362 555.85721,888.37362 L 558.29997,888.37362 L 556.68543,889.84417 C 555.79742,890.65299 554.82663,892.19707 554.52809,893.27549 C 552.96573,898.9194 552.84748,898.56846 557.18072,901.14789 C 559.40876,902.47415 562.31513,904.86407 563.63935,906.45879 L 566.04701,909.3583 L 564.00803,913.57847 C 562.88657,915.89955 561.96902,918.21934 561.96902,918.73354 C 561.96902,919.24776 561.61406,919.85025 561.18021,920.07241 C 560.71355,920.31138 560.3914,919.57088 560.3914,918.25924 z M 616.55591,918.9252 C 615.82066,918.19021 615.77981,917.77413 616.41118,917.45081 C 617.57896,916.85282 618.17587,917.42025 617.84715,918.81587 C 617.60667,919.83693 617.47876,919.84775 616.55591,918.9252 z M 456.26831,910.59545 C 456.26831,908.95045 457.67424,908.95045 460.21237,910.59545 L 462.18439,911.87355 L 459.22635,911.88808 C 456.78835,911.90006 456.26831,911.67281 456.26831,910.59545 z M 526.74106,910.23257 C 526.48214,909.67352 526.61692,908.57246 527.04058,907.78578 C 527.79278,906.38902 527.84069,906.40327 529.08226,908.39259 C 529.78152,909.513 530.13116,910.61407 529.85924,910.83938 C 528.94683,911.59536 527.21624,911.25858 526.74106,910.23257 z M 620.61326,908.27972 C 619.97447,906.90044 621.04068,906.15577 621.9495,907.34646 C 622.91516,908.61163 622.8958,909.28828 621.89393,909.28828 C 621.44646,909.28828 620.87017,908.83442 620.61326,908.27972 z M 457.90927,902.09887 C 459.0592,900.09822 459.42356,899.72744 459.42356,900.55785 C 459.42356,900.90853 458.87152,901.76635 458.19682,902.46414 C 457.04013,903.6604 457.02371,903.63954 457.90927,902.09887 z M 577.12065,902.33628 C 577.83074,901.74792 578.97171,901.44458 579.65611,901.66219 C 581.80038,902.34396 581.01406,903.40604 578.36502,903.40604 C 576.01714,903.40604 575.92507,903.3269 577.12065,902.33628 z M 586.42218,902.75245 C 586.42218,902.39297 587.13211,902.09887 587.9998,902.09887 C 588.86749,902.09887 589.57742,902.39297 589.57742,902.75245 C 589.57742,903.11192 588.86749,903.40604 587.9998,903.40604 C 587.13211,903.40604 586.42218,903.11192 586.42218,902.75245 z M 620.0441,902.40039 C 619.28292,900.75683 619.50747,900.33275 620.43735,901.65769 C 620.89777,902.31373 621.10831,902.98817 620.90522,903.15645 C 620.70213,903.32473 620.31462,902.9845 620.0441,902.40039 z M 482.42308,896.20281 C 482.88,895.11682 483.94702,893.92089 484.79425,893.54519 C 486.09538,892.96823 486.00494,893.27497 484.21206,895.51974 C 481.67689,898.6939 481.31724,898.83123 482.42308,896.20281 z M 473.62216,896.8702 C 475.16695,896.04303 476.21118,896.04303 475.59419,896.8702 C 475.32605,897.22967 474.50643,897.51928 473.7728,897.51378 C 472.6233,897.50514 472.60247,897.41621 473.62216,896.8702 z M 609.28188,894.56686 C 607.75761,893.04507 608.84524,892.7583 610.47654,894.25186 C 611.2642,894.973 611.54213,895.56303 611.09416,895.56303 C 610.6462,895.56303 609.83068,895.11475 609.28188,894.56686 z M 585.86689,892.59425 C 583.88302,890.01544 584.30544,889.68686 586.95409,891.74857 C 588.63823,893.05951 589.00224,893.09951 591.93892,892.29647 C 593.68133,891.82 595.30804,891.59679 595.55383,891.80044 C 595.79962,892.0041 594.93497,892.36468 593.63239,892.60173 C 592.32981,892.83878 590.8411,893.45499 590.32415,893.97109 C 588.88371,895.40916 587.76701,895.06422 585.86689,892.59425 z M 472.04453,891.05787 C 472.04453,890.73687 472.62719,890.28897 473.33933,890.06254 C 474.42195,889.71832 474.47075,889.81396 473.63715,890.6462 C 472.50116,891.78032 472.04453,891.89836 472.04453,891.05787 z M 566.70189,889.93096 C 559.27613,888.50881 558.87517,888.34901 561.01699,887.66522 C 562.29182,887.25822 564.22164,887.48798 567.554,888.44352 C 571.87046,889.68123 572.44329,889.71183 574.13228,888.79489 C 575.66468,887.96294 576.22196,887.93564 577.37771,888.63587 C 580.37058,890.44914 573.65893,891.26333 566.70189,889.93096 z M 592.97978,886.27762 C 591.84825,885.24201 591.92296,885.20449 594.02158,885.75452 C 595.26499,886.0804 597.5247,886.60329 599.04315,886.91646 C 601.73641,887.47196 601.7109,887.48475 598.00135,887.43956 C 595.47396,887.40877 593.78992,887.01911 592.97978,886.27762 z M 587.21099,883.79853 C 586.1913,883.25253 586.21212,883.16358 587.36164,883.15496 C 588.09526,883.14945 588.91489,883.43907 589.18301,883.79853 C 589.80001,884.6257 588.75577,884.6257 587.21099,883.79853 z M 577.21938,883.40485 C 577.58091,883.08216 578.11337,882.80691 578.40259,882.79318 C 578.69182,882.77944 579.91804,882.55046 581.12752,882.28434 C 582.3374,882.01812 583.93408,882.09392 584.67716,882.45284 C 585.76399,882.97779 585.48856,883.11083 583.26693,883.134 C 581.74847,883.14983 579.61868,883.34927 578.53406,883.57716 C 577.38375,883.81888 576.83594,883.74706 577.21938,883.40485 z M 492.15922,880.51822 C 494.7623,879.49163 498.31195,878.4894 500.04734,878.29103 L 503.20258,877.93039 L 499.65294,878.79739 C 497.70063,879.27424 494.37208,880.30046 492.25615,881.07788 C 486.6722,883.12949 486.59969,882.71079 492.15922,880.51822 z M 565.91308,878.56987 C 565.91308,877.7374 569.09129,877.7374 570.64595,878.56987 C 571.52606,879.04114 571.07142,879.206 568.87113,879.21345 C 567.2442,879.21895 565.91308,878.92933 565.91308,878.56987 z M 504.583,877.46576 C 505.34224,877.30136 506.58461,877.30136 507.34384,877.46576 C 508.10307,877.63014 507.48188,877.76465 505.96343,877.76465 C 504.44496,877.76465 503.82377,877.63014 504.583,877.46576 z M 557.96931,874.66165 C 555.65489,873.53972 547.30245,872.79877 542.38513,873.27916 C 539.54067,873.55707 537.77941,873.51499 538.18509,873.17886 C 538.56936,872.86046 541.54656,872.43311 544.80108,872.22916 C 549.26874,871.94919 551.81274,872.14356 555.18553,873.02257 C 557.64247,873.66288 559.83986,874.43769 560.06861,874.74437 C 560.60772,875.46713 559.54452,875.42524 557.96931,874.66165 z M 527.18832,873.13827 C 527.54127,872.84692 529.56565,872.70456 531.68695,872.82192 L 535.54384,873.03528 L 531.04521,873.35163 C 528.57097,873.52563 526.83536,873.42961 527.18832,873.13827 z " />
-    <path
-       id="path1987"
-       style="fill:#951313"
-       d="M 579.32288,945.23537 C 579.32288,944.87589 579.87627,944.58178 580.55264,944.58178 C 581.22902,944.58178 581.56304,944.87589 581.2949,945.23537 C 581.02677,945.59484 580.47337,945.88894 580.06513,945.88894 C 579.65688,945.88894 579.32288,945.59484 579.32288,945.23537 z " />
-    <path
-       id="path1985"
-       style="fill:#951313"
-       d="M 630.65789,937.66469 C 630.69574,936.9033 630.88264,936.74844 631.13446,937.26982 C 631.36232,937.74163 631.3343,938.30533 631.07218,938.52252 C 630.81006,938.7397 630.62364,938.35367 630.65789,937.66469 z " />
-    <path
-       id="path1983"
-       style="fill:#951313"
-       d="M 523.31007,937.07276 C 524.29532,936.08913 525.6837,936.29864 525.6837,937.43094 C 525.6837,937.76919 524.93032,938.04595 524.0095,938.04595 C 522.61626,938.04595 522.49887,937.88263 523.31007,937.07276 z " />
-    <path
-       id="path1981"
-       style="fill:#951313"
-       d="M 630.74939,931.18333 C 630.76546,930.10491 630.94225,929.74286 631.14224,930.37878 C 631.34224,931.0147 631.32909,931.89704 631.11303,932.33953 C 630.89694,932.78203 630.73331,932.26173 630.74939,931.18333 z " />
-    <path
-       id="path1979"
-       style="fill:#951313"
-       d="M 443.77187,930.85653 C 443.77187,929.95785 443.95092,929.59021 444.16974,930.03955 C 444.38857,930.4889 444.38857,931.22417 444.16974,931.67351 C 443.95092,932.12285 443.77187,931.7552 443.77187,930.85653 z " />
-    <path
-       id="path1977"
-       style="fill:#951313"
-       d="M 487.88057,930.66005 C 486.94971,928.63146 487.72551,925.62787 489.18033,925.62787 C 490.01372,925.62787 490.17289,925.96083 489.72704,926.77163 C 489.38112,927.40071 489.07691,928.87127 489.05103,930.03955 C 488.99519,932.56033 488.80001,932.66381 487.88057,930.66005 z " />
-    <path
-       id="path1975"
-       style="fill:#951313"
-       d="M 444.49842,925.9002 C 444.53627,925.13881 444.72318,924.98394 444.97499,925.50532 C 445.20285,925.97712 445.17483,926.54084 444.91272,926.75802 C 444.6506,926.9752 444.46417,926.58918 444.49842,925.9002 z " />
-    <path
-       id="path1973"
-       style="fill:#951313"
-       d="M 472.85843,922.015 C 472.90098,920.93725 475.15085,918.83364 475.73941,919.3213 C 476.04519,919.57464 475.5164,920.42734 474.56435,921.21618 C 473.6123,922.00501 472.84463,922.36448 472.85843,922.015 z " />
-    <path
-       id="path1971"
-       style="fill:#951313"
-       d="M 444.56068,920.3992 C 444.56068,919.50052 444.73973,919.13288 444.95855,919.58222 C 445.17738,920.03156 445.17738,920.76684 444.95855,921.21618 C 444.73973,921.66551 444.56068,921.29788 444.56068,920.3992 z " />
-    <path
-       id="path1969"
-       style="fill:#951313"
-       d="M 550.98795,914.78928 C 551.02579,914.02789 551.2127,913.87302 551.46451,914.3944 C 551.69238,914.8662 551.66436,915.42993 551.40224,915.64711 C 551.14012,915.86429 550.9537,915.47827 550.98795,914.78928 z " />
-    <path
-       id="path1967"
-       style="fill:#951313"
-       d="M 529.43056,872.87995 C 530.40671,872.72417 532.00406,872.72417 532.98021,872.87995 C 533.95637,873.03573 533.15769,873.16319 531.20538,873.16319 C 529.25308,873.16319 528.4544,873.03573 529.43056,872.87995 z " />
-    <path
-       id="path1965"
-       style="fill:#951313"
-       d="M 540.47391,872.90835 C 541.01623,872.72704 541.90364,872.72704 542.44595,872.90835 C 542.98825,873.08966 542.54455,873.23801 541.45993,873.23801 C 540.37531,873.23801 539.93161,873.08966 540.47391,872.90835 z " />
-    <path
-       id="path1963"
-       style="fill:#951313"
-       d="M 553.1442,872.89473 C 553.71363,872.70594 554.39397,872.72915 554.65609,872.94633 C 554.91821,873.16351 554.45231,873.31798 553.62078,873.2896 C 552.70185,873.25824 552.51494,873.10337 553.1442,872.89473 z " />
-    <path
-       id="path1937"
-       style="fill:#951313"
-       d="M 545.99559,872.22636 C 546.97175,872.07057 548.56909,872.07057 549.54525,872.22636 C 550.5214,872.38215 549.72273,872.50961 547.77043,872.50961 C 545.81812,872.50961 545.01944,872.38215 545.99559,872.22636 z " />
-    <path
-       id="path3961"
-       style="fill:url(#radialGradient22004);fill-opacity:1;stroke:#000000;stroke-width:3.67062211;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(1.244123,0,0,0.954503,-693.7876,116.3065)"
-       d="M 1081.5879,860.56061 C 1081.5879,902.77296 1040.5886,936.99283 990.01345,936.99283 C 939.43827,936.99283 898.43899,902.77296 898.43899,860.56061 C 898.43899,818.34826 939.43827,784.12839 990.01345,784.12839 C 1040.5886,784.12839 1081.5879,818.34826 1081.5879,860.56061 L 1081.5879,860.56061 z " />
-    <text
-       xml:space="preserve"
-       id="text6648"
-       style="font-size:68.54483795px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(0.630603,1.585784)"
-       y="615.23743"
-       x="713.86377"><tspan
-         id="tspan6650"
-         style="fill:#808080;font-family:Arial Black"
-         y="615.23743"
-         x="713.86377">Authors</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text6644"
-       style="font-size:68.54482269px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.88828206;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.3853211;font-family:Bitstream Vera Sans"
-       transform="scale(0.630603,1.585784)"
-       y="612.98938"
-       x="707.52148"><tspan
-         id="tspan6646"
-         style="fill:#ffffff;stroke:#000000;stroke-width:1.88828206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.3853211;font-family:Arial Black"
-         y="612.98938"
-         x="707.52148">Authors</tspan></text>
-  </g>
-  <text
-     xml:space="preserve"
-     id="text22931"
-     style="font-size:27.52882576px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.39196366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931228)"
-     y="544.15887"
-     x="24.405096"><tspan
-       id="tspan22933"
-       style="stroke-width:0.39196366"
-       y="544.15887"
-       x="24.405096">Windows dialogs  icons</tspan></text>
-  <g
-     id="g12170"
-     transform="matrix(0.4319372,0,0,0.4498758,18.231026,171.00785)">
-    <rect
-       id="rect23834"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03204477;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="875.74768"
-       x="126.0412"
-       ry="3.6935918"
-       rx="3.8469896"
-       height="11.788779"
-       width="12.154853" />
-    <rect
-       id="rect22941"
-       style="color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="872.5824"
-       x="20.323393"
-       ry="8.0265341"
-       rx="8.3598824"
-       height="35.138783"
-       width="151.98308" />
-    <rect
-       id="rect22945"
-       style="color:#000000;fill:#f8faee;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.00652599;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="891.11914"
-       x="20.350714"
-       rx="0"
-       height="114.16743"
-       width="151.97687" />
-    <path
-       id="rect23842"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.56422842;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 158.49055,878.70062 L 157.49829,879.64318 L 159.58546,881.64203 L 157.49829,883.62464 L 158.49055,884.58344 L 160.57772,882.58458 L 162.682,884.58344 L 163.67427,883.62464 L 161.58709,881.64203 L 163.67427,879.64318 L 162.682,878.70062 L 160.57772,880.69948 L 158.49055,878.70062 z " />
-    <rect
-       id="rect23847"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.60069585;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="878.26733"
-       x="142.79971"
-       height="6.7494717"
-       width="7.1054482" />
-    <rect
-       id="rect24736"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.60069585;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="881.26709"
-       x="128.26984"
-       height="0.74994129"
-       width="7.6975689" />
-    <rect
-       id="rect24738"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="922.56213"
-       x="38.681862"
-       height="20.998356"
-       width="25.263815" />
-    <rect
-       id="rect24740"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="965.20441"
-       x="38.681862"
-       height="20.998356"
-       width="25.263815" />
-    <path
-       id="path24753"
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.89635372;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 40.809598,911.37143 C 41.671713,912.1272 50.069084,939.85801 52.909465,934.84078 C 55.749848,929.8236 62.671602,907.39677 65.284628,901.91556 C 65.284628,901.91556 85.426303,899.02152 85.300786,899.09789 C 83.258501,901.01303 63.116189,930.65337 58.376025,938.85439 C 53.746942,946.86326 51.343507,956.45969 46.494131,945.8154 C 41.64475,935.17112 31.623529,922.50006 30.793189,922.56258 L 40.809598,911.37143 z " />
-  </g>
-  <g
-     id="g4797"
-     transform="matrix(0.4319372,0,0,0.4498758,18.911187,161.30876)">
-    <path
-       id="path32874"
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 222.9139,971.83763 C 224.31188,984.37252 231.43303,979.98107 235.52407,980.16963 C 248.05036,979.31895 302.15353,957.8916 314.34608,969.18834 C 328.07467,981.9082 309.77123,985.26097 314.15627,994.98106 C 318.83077,1005.3427 362.97638,979.65533 372.0669,986.77687 C 380.11625,993.08276 365.01248,1003.6742 374.14148,1007.1155 L 421.92941,1025.1302 C 419.64367,1024.2843 371.28014,1026.1402 359.90159,1021.5514 C 348.52305,1016.9625 367.90754,1007.4422 356.01446,1002.2013 C 343.72668,996.78628 307.04833,1029.1082 293.08722,1016.9041 C 280.13756,1005.5841 303.85281,995.89804 292.168,985.22764 C 279.945,974.06569 232.7771,1005.5371 211.71999,1000.9753 C 190.66289,996.41333 221.50788,959.23051 222.9139,971.83763 z " />
-    <g
-       id="g31971"
-       style="stroke:#000000;stroke-width:5.69030762;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.647295,-0.271121,0.269841,0.650366,-46.38199,391.29)">
-      <path
-         id="rect31968"
-         style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030762;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 217.03863,1016.6698 C 225.90296,1002.2057 241.91515,1002.0683 250.20732,1016.6698 C 258.49949,1031.2712 240.83356,1054.7056 249.84679,1078.6808 C 210.77979,1064.0771 208.1743,1031.1339 217.03863,1016.6698 z " />
-      <path
-         id="path31966"
-         style="color:#000000;fill:#ffd42a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030762;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 220.174,985.51775 C 220.75236,998.84302 225.21669,1008.8408 225.21669,1008.8408 C 225.21669,1008.8408 241.10352,1008.8408 241.10352,1008.8408 C 241.10352,1008.8408 245.77889,998.84302 246.35725,985.51775 L 220.174,985.51775 z " />
-      <path
-         id="path31065"
-         style="color:#000000;fill:#f4eed7;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030762;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 220.05246,985.21867 L 246.47869,985.21867 C 247.88454,957.15577 249.63979,907.26755 245.36077,886.16681 C 239.30506,856.30492 227.195,856.30489 221.13932,886.16681 C 216.86029,907.26758 218.6466,957.15578 220.05246,985.21867 z " />
-    </g>
-    <g
-       id="g35698"
-       transform="translate(0,4.724942)">
-      <path
-         id="path31976"
-         style="color:#000000;fill:url(#linearGradient21998);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.701288,0,0,0.704615,92.93315,213.5991)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-      <path
-         id="path33846"
-         style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.701288,0,0,0.704615,92.93315,229.1006)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-      <path
-         id="rect31978"
-         style="color:#000000;fill:url(#linearGradient22000);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 243.11836,912.92949 L 243.11836,1003.3844 L 243.71007,1003.3844 C 245.06363,1012.8683 265.22012,1020.4053 289.8855,1020.4053 C 314.55089,1020.4053 334.72928,1012.8683 336.08285,1003.3844 L 336.67456,1003.3844 L 336.67456,912.92949 L 336.12668,912.92949 C 335.11525,922.53769 314.78034,930.21461 289.8855,930.21461 C 264.99067,930.21454 244.67767,922.53769 243.66624,912.92949 L 243.11836,912.92949 z " />
-    </g>
-    <g
-       id="g33816"
-       style="stroke:#000000;stroke-width:5.24876118;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.277598,-0.646844,0.807082,0.211518,-689.7975,708.6869)">
-      <path
-         id="path33812"
-         style="opacity:1;color:#000000;fill:#f6cc00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.24876118;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="translate(-321.2316,177.7409)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-      <path
-         id="path32868"
-         style="color:#000000;fill:#f6cc00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.60145378;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.844693,0,0,0.748403,-277.6133,427.1824)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-    </g>
-    <text
-       xml:space="preserve"
-       id="text34758"
-       style="font-size:154.30929565px;font-style:normal;font-weight:normal;fill:url(#linearGradient22002);fill-opacity:1;stroke:#000000;stroke-width:4.33082438;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(0.979674,1.020748)"
-       y="1001.9447"
-       x="282.5267"><tspan
-         id="tspan34760"
-         style="fill:url(#linearGradient22002);fill-opacity:1;stroke:#000000;stroke-width:4.33082438;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Benguiat Bk BT"
-         y="1001.9447"
-         x="282.5267">a</tspan></text>
-  </g>
-  <g
-     id="g12864"
-     transform="matrix(0.4010001,0,0,0.4010001,-84.566987,294.76916)">
-    <g
-       id="g4195"
-       transform="matrix(0.55729,0.197335,-0.177243,0.494042,299.7619,400.7691)">
-      <path
-         id="path4211"
-         style="fill:#f8fcf7"
-         d="M 812.02557,795.05377 L 812.02557,663.55377 L 904.02557,663.55377 L 996.02557,663.55377 L 996.02557,795.05377 L 996.02557,926.55377 L 904.02557,926.55377 L 812.02557,926.55377 L 812.02557,795.05377 z " />
-      <path
-         id="path4209"
-         style="fill:#e6e9e5"
-         d="M 818.76986,923.74306 C 815.86924,923.5031 814.6967,922.81848 813.61986,920.7361 C 812.08668,917.77125 811.73311,910.85255 813.07249,910.02477 C 813.53829,909.73689 813.93352,886.53599 813.95076,858.46721 C 813.96801,830.39844 814.16052,807.12273 814.37856,806.74342 C 814.5966,806.36411 814.4355,803.57877 814.02057,800.55377 C 813.60564,797.52877 813.64889,792.62704 814.11667,789.66104 C 814.58445,786.69504 814.73639,783.89489 814.45432,783.43849 C 814.17225,782.98209 813.96997,763.80882 814.00481,740.83122 C 814.05619,706.94586 814.34802,698.12469 815.54965,694.13559 C 816.78569,690.03223 816.81075,688.95534 815.70088,687.63559 C 813.92889,685.52852 812.02557,678.65459 812.02557,674.36206 C 812.02557,671.93526 812.79631,670.17864 814.60726,668.47808 C 816.8961,666.32876 818.08454,666.05685 825.08442,666.08093 C 829.93962,666.09763 833.45076,666.57896 834.20273,667.33093 C 835.11058,668.23878 842.9334,668.55377 864.57193,668.55377 C 889.2864,668.55377 894.20598,668.31048 896.92557,666.95377 C 901.01336,664.91451 906.03778,664.91451 910.12557,666.95377 C 914.82578,669.29854 969.29818,669.30084 976.02557,666.95655 C 982.43317,664.7237 990.43993,665.82304 993.76285,669.3919 C 995.93757,671.72759 996.17587,672.69489 995.70754,677.28575 C 995.41398,680.16334 994.18283,684.28091 992.97166,686.4359 C 990.84075,690.22735 990.82218,690.50861 992.39755,695.13206 C 994.72541,701.96398 994.87506,783.01381 992.56145,783.90163 C 991.27765,784.39427 991.27689,784.80771 992.55529,787.25862 C 994.25071,790.50902 994.48778,799.20787 992.98841,803.15151 C 992.2722,805.0353 992.2722,806.2004 992.98841,806.91661 C 993.67662,807.60482 994.0336,824.96097 994.04943,858.50377 C 994.06255,886.30627 994.49044,910.85338 995.0003,913.05289 C 995.58009,915.55408 995.57116,917.40818 994.97645,918.00289 C 994.45346,918.52588 994.02557,919.7552 994.02557,920.73472 C 994.02557,921.7516 993.05297,922.75977 991.75855,923.08465 C 989.41751,923.67221 825.45678,924.29627 818.76986,923.74306 z M 909.85832,915.42244 C 915.08662,914.51197 917.01563,913.63037 919.73944,910.90657 C 924.55269,906.09332 922.66182,903.55593 917.23508,907.54593 C 910.35223,912.60651 898.77188,910.58014 892.46459,903.2115 C 887.91572,897.89717 886.81111,893.69314 888.25215,887.1795 C 889.80829,880.14556 892.1041,877.19646 897.99733,874.66127 C 900.76286,873.47157 903.02557,872.223 903.02557,871.88668 C 903.02557,871.55036 900.83708,871.53438 898.16227,871.85117 C 895.09898,872.21397 892.87461,872.00281 892.15245,871.28065 C 891.29044,870.41864 890.28954,870.55734 888.11888,871.83958 C 886.30127,872.91327 884.17491,873.3337 882.37869,872.97457 C 880.80947,872.66082 871.87557,872.32529 862.52557,872.22894 C 846.25063,872.06124 845.52557,871.96847 845.52557,870.05377 C 845.52557,868.16751 846.23644,868.04623 858.02557,867.92117 C 864.90057,867.84825 873.90057,867.73446 878.02557,867.66832 C 882.15057,867.60217 887.02062,867.83019 888.84791,868.17503 C 891.34528,868.64632 892.12287,868.4608 891.97943,867.42789 C 891.54765,864.31866 892.10279,863.42564 894.27557,863.73422 C 895.72153,863.93958 896.63976,864.85781 896.84512,866.30377 C 897.06959,867.88427 897.84174,868.55377 899.44013,868.55377 C 900.69164,868.55377 902.53008,869.45377 903.52557,870.55377 C 904.52106,871.65377 906.60211,872.55377 908.15014,872.55377 C 909.69817,872.55377 912.54441,873.44102 914.47513,874.52544 C 917.83708,876.41373 918.02637,876.42078 918.95151,874.69215 C 919.84176,873.02871 921.50959,872.90882 940.22154,873.16306 L 960.52557,873.43894 L 960.52557,875.74635 L 960.52557,878.05377 L 941.27557,878.32536 C 930.68807,878.47474 922.02557,878.7431 922.02557,878.92172 C 922.02557,879.10035 922.81307,880.77813 923.77557,882.65013 C 924.86001,884.7593 925.56281,888.49606 925.62349,892.47544 C 925.71051,898.18301 925.97244,898.98997 927.97895,899.73223 C 929.2206,900.19154 939.18904,900.26822 950.13103,899.90262 L 970.02557,899.23788 L 970.02557,875.39583 L 970.02557,851.55377 L 956.77557,851.40196 C 949.48807,851.31847 935.20057,851.13465 925.02557,850.99348 C 914.85057,850.85232 901.19403,850.68832 894.6777,850.62905 C 883.75097,850.52967 882.7895,850.36706 882.31107,848.53753 C 881.67541,846.10676 879.19376,845.88413 879.38668,848.27518 C 879.49753,849.64906 878.31426,850.15779 873.52557,850.79507 C 866.02649,851.79305 863.02557,851.14703 863.02557,848.53472 C 863.02557,847.4452 862.55584,846.55377 861.98173,846.55377 C 861.40762,846.55377 861.07012,847.34127 861.23173,848.30377 C 861.4279,849.47208 860.77768,850.15999 859.27557,850.37332 C 857.56409,850.61639 857.02557,850.19754 857.02557,848.62332 C 857.02557,847.48507 856.52742,846.55377 855.91858,846.55377 C 855.30974,846.55377 855.04957,847.17394 855.34044,847.93191 C 855.6313,848.68989 855.36445,849.81489 854.74743,850.43191 C 853.22383,851.95551 844.33794,851.86821 843.38125,850.32025 C 841.95731,848.01627 842.17292,837.7112 843.65698,837.14172 C 844.4097,836.85287 845.02557,835.9344 845.02557,835.10067 C 845.02557,833.77098 849.82326,833.59243 884.08676,833.64696 C 916.89638,833.69917 923.2353,833.93675 923.69375,835.13144 C 924.5009,837.23485 926.02557,836.85714 926.02557,834.55377 C 926.02557,832.6234 926.73062,832.54976 946.27557,832.43862 C 957.41307,832.37528 967.31307,832.40357 968.27557,832.50147 C 969.85747,832.66239 970.02557,831.49193 970.02557,820.31663 C 970.02557,812.53066 970.43989,807.53945 971.14471,806.83463 C 971.97023,806.00911 971.96221,804.44805 971.11416,800.88463 C 970.28643,797.40662 970.2559,794.53037 971.00514,790.61389 C 971.70588,786.95096 971.71586,784.84406 971.03569,784.16389 C 970.38783,783.51603 970.02557,768.20022 970.02557,741.45728 L 970.02557,699.76079 L 937.77557,699.18079 C 899.85803,698.49886 902.69407,698.52013 897.02557,698.87518 C 894.55057,699.0302 880.04768,699.2463 864.79693,699.3554 L 837.06828,699.55377 L 836.63591,741.80377 C 836.3981,765.04127 836.13674,785.40377 836.05511,787.05377 C 835.8379,791.44425 835.82245,801.66537 836.02866,804.55377 C 836.12682,805.92877 836.40014,827.86627 836.63603,853.30377 L 837.06493,899.55377 L 845.29525,899.66963 C 849.82193,899.73336 860.05057,899.84586 868.02557,899.91963 C 876.00057,899.99341 883.12848,900.4428 883.86538,900.91829 C 884.76619,901.49955 885.00498,902.84998 884.59416,905.03983 C 884.09157,907.7189 884.49015,908.83959 886.8404,911.35554 C 889.52681,914.23136 892.12064,915.07542 902.44366,916.43303 C 902.94861,916.49944 906.2852,916.04467 909.85832,915.42244 z M 880.02521,883.05333 C 878.97148,881.78367 879.28076,881.45273 882.03604,880.90168 C 884.003,880.50828 885.48349,879.51867 885.77548,878.40211 C 886.25882,876.55383 890.02557,875.73379 890.02557,877.47685 C 890.02557,878.88101 884.05016,884.55377 882.57109,884.55377 C 881.85574,884.55377 880.7101,883.87857 880.02521,883.05333 z M 846.53715,882.1859 C 842.85458,879.49313 845.80252,878.56718 857.66057,878.69203 C 866.58713,878.78602 869.31033,879.13227 869.73031,880.22671 C 870.0286,881.00404 870.10456,881.78297 869.89911,881.95768 C 869.69366,882.13239 864.76203,882.55418 858.93993,882.89498 C 850.91682,883.36462 847.9144,883.19297 846.53715,882.1859 z M 948.02557,881.55377 C 948.02557,880.99821 950.69224,880.55377 954.02557,880.55377 C 957.3589,880.55377 960.02557,880.99821 960.02557,881.55377 C 960.02557,882.10933 957.3589,882.55377 954.02557,882.55377 C 950.69224,882.55377 948.02557,882.10933 948.02557,881.55377 z M 938.27536,870.97064 C 938.98301,870.263 958.14089,870.33576 958.85394,871.0488 C 959.13167,871.32653 954.4839,871.55377 948.52557,871.55377 C 942.56724,871.55377 937.95464,871.29136 938.27536,870.97064 z M 903.27557,868.89149 C 901.45673,868.15757 901.74589,865.77382 903.78621,864.68187 C 905.75143,863.63012 910.74407,864.28927 911.62644,865.71698 C 913.21564,868.28836 907.32776,870.52658 903.27557,868.89149 z M 915.75458,868.94944 C 915.35362,868.54849 915.02557,867.17044 915.02557,865.8871 C 915.02557,863.73193 915.43616,863.55377 920.40313,863.55377 C 925.80996,863.55377 929.44904,865.59358 927.43319,867.49433 C 926.19145,868.66517 916.65813,869.85299 915.75458,868.94944 z M 840.33171,821.90916 C 839.09692,818.69137 842.54292,817.75283 855.66867,817.73206 C 862.56115,817.72115 868.4611,817.45157 868.77968,817.133 C 869.09825,816.81442 865.7964,816.50974 861.44224,816.45593 C 840.4543,816.19653 840.52557,816.20462 840.52557,814.0833 C 840.52557,812.99955 841.56398,811.59513 842.83315,810.96239 C 844.69801,810.03265 844.8419,809.69727 843.58315,809.21424 C 842.72648,808.8855 842.02557,807.79242 842.02557,806.78515 C 842.02557,805.77789 841.51582,804.44402 840.89279,803.82099 C 840.26976,803.19796 840.03063,801.98296 840.3614,801.12099 C 840.85721,799.82893 842.94347,799.54819 852.24419,799.52197 C 862.38206,799.49339 863.32881,799.34134 861.58444,798.02197 C 860.51682,797.21446 858.71682,796.51509 857.58444,796.46782 C 856.07507,796.4048 856.31419,796.14637 858.48039,795.49952 C 862.00614,794.4467 944.33339,794.50794 946.0432,795.56466 C 946.87396,796.0781 946.60053,796.73807 945.13047,797.76774 C 943.35903,799.00851 938.36777,799.16362 913.12878,798.76223 C 896.68219,798.50068 882.12454,798.5631 880.77845,798.90094 C 878.89547,799.37354 878.31148,800.20264 878.24628,802.49589 C 878.16738,805.27097 878.36361,805.43616 881.09107,804.89067 C 882.77262,804.55436 884.64201,804.82048 885.47928,805.51536 C 886.28156,806.18118 887.39966,806.4406 887.96396,806.09185 C 889.33804,805.24262 943.37973,804.44203 948.77557,805.19096 C 953.00293,805.77772 954.34029,807.58483 951.77557,809.24475 C 951.08807,809.68971 933.89309,810.05377 913.56451,810.05377 L 876.60345,810.05377 L 876.56451,813.00397 C 876.53445,815.28097 875.95511,816.11392 874.02557,816.65429 C 871.21073,817.44258 872.81242,817.8206 878.02557,817.59833 C 879.95057,817.51625 882.40858,818.09896 883.48782,818.89322 C 885.15713,820.12175 885.25082,820.57743 884.11538,821.94556 C 882.96694,823.32934 879.86281,823.55377 861.87174,823.55377 C 843.3914,823.55377 840.8895,823.36275 840.33171,821.90916 z M 854.02557,810.55377 C 854.02557,810.00377 852.78807,809.56066 851.27557,809.56908 C 849.13263,809.58102 848.8567,809.79839 850.02557,810.55377 C 851.9821,811.81818 854.02557,811.81818 854.02557,810.55377 z M 856.52557,791.72682 C 852.67476,791.30715 851.03481,789.79685 853.03393,788.51122 C 853.86591,787.97618 863.0946,787.58488 873.90201,787.62642 C 891.76669,787.69509 896.86138,787.05625 894.80987,785.00473 C 894.48956,784.68443 883.94456,784.20743 871.37653,783.94473 C 858.8085,783.68203 847.96307,783.27572 847.27557,783.04182 C 846.58807,782.80791 846.02557,781.70242 846.02557,780.58515 C 846.02557,778.64513 846.62374,778.55377 859.32557,778.55377 C 868.33668,778.55377 873.01254,778.94074 873.82557,779.75377 C 874.7589,780.6871 875.02551,780.29821 875.02531,778.00377 L 875.02505,775.05377 L 904.57548,775.31211 C 922.95033,775.47274 934.83514,775.19087 936.00126,774.56678 C 937.04556,774.00789 938.82384,773.91352 940.0141,774.35382 C 941.18972,774.78871 945.16073,774.81341 948.83858,774.4087 C 955.94161,773.62709 960.27163,774.16563 958.02889,775.55172 C 957.03695,776.16477 957.11872,777.03413 958.4122,779.62696 C 959.39079,781.58859 959.69081,783.28853 959.15329,783.82605 C 958.65657,784.32277 949.53713,784.80221 938.88786,784.89148 C 913.85021,785.10134 912.73124,786.86151 937.19539,787.55377 C 946.91379,787.82877 955.20879,788.39877 955.62872,788.82044 C 958.31796,791.52078 952.90453,791.86901 906.81914,791.9602 C 880.80768,792.01166 858.17557,791.90664 856.52557,791.72682 z M 866.02557,774.55377 C 866.02557,774.00377 867.12401,773.55377 868.46655,773.55377 C 869.80909,773.55377 871.18565,774.00377 871.52557,774.55377 C 871.88615,775.13719 870.86929,775.55377 869.08459,775.55377 C 867.40213,775.55377 866.02557,775.10377 866.02557,774.55377 z M 917.02557,769.58057 C 914.45538,769.18206 913.60043,768.58905 913.80734,767.34838 C 914.04757,765.90794 913.2449,765.68798 908.3625,765.85632 C 903.19781,766.0344 902.51381,765.81394 901.39171,763.6096 C 900.70742,762.26531 900.32025,760.88599 900.53133,760.54444 C 900.74242,760.2029 912.97748,759.95277 927.72035,759.98861 L 954.52557,760.05377 L 954.84199,762.80377 C 955.03867,764.5131 954.66025,765.61951 953.84199,765.72748 C 952.46218,765.90956 946.82686,766.16326 938.71655,766.40841 C 936.03752,766.48939 934.16236,766.96608 934.48286,767.48467 C 934.7993,767.99667 934.48835,768.77882 933.79188,769.22278 C 932.32607,770.15717 922.14545,770.37442 917.02557,769.58057 z M 845.40973,768.11248 C 844.17762,764.90167 846.1041,764.55377 865.11597,764.55377 C 881.29347,764.55377 884.17557,764.78109 884.68049,766.0969 C 885.00618,766.94562 885.00641,767.90626 884.68102,768.23166 C 884.35562,768.55705 875.51277,768.99252 865.03025,769.19935 C 848.9836,769.51598 845.88238,769.34419 845.40973,768.11248 z M 881.58444,754.02197 C 880.51682,753.21446 878.1402,752.55377 876.30306,752.55377 C 874.18346,752.55377 872.74158,751.97727 872.35744,750.97623 C 870.95146,747.31231 873.52429,747.04493 907.315,747.34325 L 940.10442,747.63272 L 941.22551,750.09325 C 942.29574,752.44215 942.75514,752.55377 951.35275,752.55377 C 956.30614,752.55377 960.11765,752.79503 959.82277,753.0899 C 959.5279,753.38477 951.80877,753.64325 942.66915,753.6643 C 933.52952,753.68534 925.79422,754.11908 925.47959,754.62817 C 925.15764,755.14909 915.86121,755.53986 904.21655,755.52197 C 887.6086,755.49644 883.14252,755.20044 881.58444,754.02197 z M 845.40557,744.10166 C 844.16283,740.86313 846.05881,740.49396 863.09368,740.6576 C 879.93202,740.81935 884.31419,741.65972 882.61933,744.40207 C 882.12502,745.20188 876.41629,745.55377 863.93517,745.55377 C 849.14564,745.55377 845.86412,745.29661 845.40557,744.10166 z M 905.79685,744.99171 C 905.5613,744.75617 901.2542,744.43907 896.22551,744.28704 C 886.89946,744.0051 884.49179,743.10836 885.56335,740.3159 C 886.071,738.99299 888.09852,738.7682 898.34614,738.89869 C 909.83964,739.04504 910.54223,739.17027 910.82135,741.12239 C 911.0206,742.51586 910.3188,743.55477 908.67112,744.3055 C 907.32582,744.91846 906.03239,745.22726 905.79685,744.99171 z M 923.67449,743.86936 C 923.31758,743.51245 923.02557,742.45348 923.02557,741.51609 C 923.02557,740.09182 924.46878,739.69884 931.80782,739.12472 C 941.04308,738.40225 946.02557,739.38716 946.02557,741.93518 C 946.02557,742.90125 944.4825,743.53811 941.27557,743.89561 C 934.51396,744.64937 924.43948,744.63434 923.67449,743.86936 z M 914.02557,741.61279 C 914.02557,740.54525 914.4796,739.3912 915.03452,739.04824 C 916.80198,737.95589 920.02557,739.61766 920.02557,741.62116 C 920.02557,743.10184 919.32403,743.55377 917.02557,743.55377 C 914.72264,743.55377 914.02557,743.10277 914.02557,741.61279 z M 846.56414,732.20563 C 845.43742,731.38175 844.9463,730.20272 845.32201,729.22365 C 846.17564,726.99912 861.88511,727.02416 862.73978,729.25141 C 863.60409,731.50375 862.02154,732.25477 854.97662,732.93548 C 850.19545,733.39746 847.92463,733.20045 846.56414,732.20563 z M 945.77557,732.8062 C 938.43061,732.48723 938.02557,732.34828 938.02557,730.14763 C 938.02557,728.14331 938.66035,727.73861 942.66514,727.18969 C 948.54575,726.38367 958.37702,726.36767 960.44378,727.16076 C 962.0542,727.77873 962.63915,731.08585 961.27557,731.86341 C 959.73797,732.74021 953.28884,733.13248 945.77557,732.8062 z M 891.52557,720.55377 C 891.16011,719.96244 885.056,719.55377 876.589,719.55377 C 865.08136,719.55377 862.02607,719.2593 861.02557,718.05377 C 860.04392,716.87096 860.03904,716.24247 861.00246,715.08162 C 861.67444,714.27193 862.29204,711.90943 862.37491,709.83162 L 862.52557,706.05377 L 904.52557,706.05377 L 946.52557,706.05377 L 946.52557,712.55377 L 946.52557,719.05377 L 921.63305,719.24629 C 905.72437,719.36933 896.35888,719.82046 895.68305,720.49629 C 894.34928,721.83006 892.3316,721.85796 891.52557,720.55377 z M 910.21259,906.72782 C 911.8699,906.62047 914.26168,905.1167 916.45392,902.80377 C 920.46051,898.57658 920.96917,896.55377 918.02557,896.55377 C 916.91446,896.55377 916.02557,895.8871 916.02557,895.05377 C 916.02557,894.22877 915.57557,893.55377 915.02557,893.55377 C 914.47557,893.55377 914.02557,894.22877 914.02557,895.05377 C 914.02557,895.87877 914.47557,896.55377 915.02557,896.55377 C 915.57557,896.55377 916.02557,897.17702 916.02557,897.93876 C 916.02557,899.82471 911.22081,902.84267 909.35695,902.12744 C 908.49696,901.79743 907.1325,902.4351 906.17898,903.61264 C 904.10456,906.17445 902.07209,905.47971 899.75183,901.41571 C 898.05352,898.44107 898.05352,898.25343 899.75183,897.00279 C 901.43618,895.76244 901.43738,895.66242 899.77557,895.0182 C 898.81307,894.64508 898.02557,893.71294 898.02557,892.94678 C 898.02557,892.18063 897.54525,891.55377 896.95818,891.55377 C 896.34587,891.55377 896.16143,892.40646 896.52557,893.55377 C 897.02062,895.11353 896.70527,895.55377 895.09296,895.55377 C 892.05485,895.55377 892.56,897.4956 896.92174,902.58372 C 900.95677,907.29072 901.05409,907.32107 910.21259,906.72782 z M 922.02557,888.99475 C 922.02557,888.13729 921.57557,887.71385 921.02557,888.05377 C 920.47557,888.39369 920.02557,889.09525 920.02557,889.61279 C 920.02557,890.13033 920.47557,890.55377 921.02557,890.55377 C 921.57557,890.55377 922.02557,889.85221 922.02557,888.99475 z M 848.02557,839.99475 C 848.02557,839.13729 847.57557,838.71385 847.02557,839.05377 C 846.47557,839.39369 846.02557,840.09525 846.02557,840.61279 C 846.02557,841.13033 846.47557,841.55377 847.02557,841.55377 C 847.57557,841.55377 848.02557,840.85221 848.02557,839.99475 z M 945.02557,838.99475 C 945.02557,838.20221 944.3927,837.55377 943.61919,837.55377 C 942.70779,837.55377 942.39585,838.25372 942.73288,839.54252 C 943.30198,841.71877 945.02557,841.30697 945.02557,838.99475 z M 970.02557,839.55377 C 970.02557,838.44266 969.3589,837.55377 968.52557,837.55377 C 967.69224,837.55377 967.02557,838.44266 967.02557,839.55377 C 967.02557,840.66488 967.69224,841.55377 968.52557,841.55377 C 969.3589,841.55377 970.02557,840.66488 970.02557,839.55377 z M 893.26833,690.40246 C 891.31864,686.32857 890.89496,684.14229 891.24266,679.94952 C 891.48447,677.03362 891.30954,674.87826 890.85394,675.15984 C 890.39834,675.44142 890.02557,676.49015 890.02557,677.49034 C 890.02557,678.49054 889.35057,679.86908 888.52557,680.55377 C 886.82953,681.96136 886.50987,686.11701 888.02557,687.05377 C 888.57557,687.39369 889.02557,688.41584 889.02557,689.32522 C 889.02557,690.79903 893.58631,695.42592 895.12962,695.51781 C 895.46184,695.53759 894.62426,693.23568 893.26833,690.40246 z M 915.61735,693.30377 C 916.92287,692.06627 917.99879,690.29283 918.00829,689.36279 C 918.0178,688.43275 918.47557,687.39369 919.02557,687.05377 C 919.57557,686.71385 920.02557,685.11229 920.02557,683.49475 C 920.02557,681.87721 919.57557,680.55377 919.02557,680.55377 C 918.47557,680.55377 918.02557,679.90533 918.02557,679.11279 C 918.02557,678.32025 917.50468,677.34988 916.86805,676.95641 C 916.06332,676.45907 915.89561,676.94879 916.31777,678.56315 C 916.82888,680.51763 914.82068,692.22746 913.84053,693.008 C 913.6673,693.14594 912.62557,693.76149 911.52557,694.37588 C 909.6626,695.41642 909.65294,695.49504 911.38462,695.52336 C 912.4071,695.54009 914.31183,694.54127 915.61735,693.30377 z M 895.52557,672.55377 C 895.86549,672.00377 895.6936,671.55377 895.1436,671.55377 C 894.5936,671.55377 893.86549,672.00377 893.52557,672.55377 C 893.18565,673.10377 893.35754,673.55377 893.90754,673.55377 C 894.45754,673.55377 895.18565,673.10377 895.52557,672.55377 z " />
-      <path
-         id="path4207"
-         style="fill:#d7d9d5"
-         d="M 900.92189,923.55556 C 899.99848,923.0158 884.3034,922.65348 863.92189,922.70142 C 844.45392,922.74722 826.95057,922.77684 825.02557,922.76726 C 818.03454,922.73246 815.02017,921.99107 813.5946,919.95579 C 811.97756,917.64714 811.77627,911.70133 813.25204,909.83706 C 813.78178,909.16788 814.09866,906.46788 813.95623,903.83706 C 813.8138,901.20625 813.77114,878.46627 813.86142,853.30377 C 814.00468,813.37673 814.21649,807.55377 815.52557,807.55377 C 817.44738,807.55377 817.42887,806.09892 815.469,803.10778 C 813.41255,799.96923 813.41311,791.48783 815.47005,787.3646 C 816.94979,784.3984 816.95684,783.97668 815.54391,782.94352 C 814.16282,781.93365 814.01766,777.01168 814.29003,740.4276 C 814.56801,703.08888 814.7777,698.58763 816.44007,694.27424 C 818.06355,690.06175 818.1088,689.29059 816.82148,687.77424 C 811.7735,681.82817 810.63732,673.20659 814.43192,669.64175 C 817.51928,666.74132 826.75462,665.75483 832.52557,667.70903 C 835.39212,668.67973 844.31806,669.16016 864.02557,669.4045 C 879.15057,669.59202 891.91118,670.11043 892.38247,670.55651 C 892.85377,671.0026 892.06627,672.13622 890.63247,673.07568 C 889.06003,674.10599 888.02557,675.70677 888.02557,677.10976 C 888.02557,678.38905 887.57557,679.71385 887.02557,680.05377 C 885.72591,680.857 885.72591,687.25054 887.02557,688.05377 C 887.57557,688.39369 888.02557,689.49349 888.02557,690.49778 C 888.02557,691.50206 889.17851,693.07918 890.58766,694.00249 C 896.06556,697.59175 893.53207,698.03279 864.443,698.55377 L 836.52557,699.05377 L 836.27193,740.55377 C 836.04935,776.97151 835.82536,782.19681 834.44289,783.22181 C 833.1462,784.1832 833.0805,784.78789 834.07152,786.63964 C 835.62812,789.54816 835.62769,800.56019 834.07087,803.46913 C 833.08504,805.31117 833.15317,806.03728 834.44587,807.4657 C 835.83697,809.00285 836.02557,814.66778 836.02557,854.91375 L 836.02557,900.61626 L 859.01072,900.51681 C 871.65254,900.46212 882.49296,900.7246 883.10052,901.10009 C 883.75736,901.50604 883.95963,903.09171 883.59947,905.01154 C 883.09043,907.72498 883.51581,908.79382 886.26483,911.70863 C 889.01449,914.62412 890.61325,915.3555 896.29471,916.29695 C 901.12234,917.09691 904.97302,917.11808 909.77151,916.37102 C 915.57133,915.46807 917.02037,914.79427 920.37359,911.44104 C 924.19257,907.62206 924.22953,907.514 922.57862,904.99439 C 921.65513,903.58497 921.06236,901.94341 921.26134,901.34647 C 921.50706,900.60929 929.46689,900.22786 946.07434,900.15745 L 970.52557,900.05377 L 970.79376,875.62403 C 970.95693,860.76025 970.6854,850.96157 970.10033,850.59997 C 969.57144,850.2731 955.27576,850.04653 938.33214,850.09647 C 921.38853,850.14641 906.96565,849.99758 906.28131,849.76574 C 905.59697,849.53389 905.29585,848.92547 905.61215,848.41369 C 905.93721,847.88772 914.08636,847.53444 924.3564,847.60109 C 959.92426,847.83193 970.02557,847.58755 970.02557,846.49621 C 970.02557,845.85614 967.7557,845.50431 964.27557,845.60496 C 954.76159,845.88013 943.5877,844.74017 943.15782,843.45052 C 942.87465,842.601 944.08232,842.41278 947.40974,842.78782 C 949.96583,843.07593 952.30162,842.91613 952.60039,842.43271 C 952.89916,841.94929 952.32955,841.54688 951.33459,841.53846 C 950.33963,841.53004 948.85057,841.08004 948.02557,840.53846 C 946.69224,839.66318 946.69224,839.44436 948.02557,838.56908 C 950.06348,837.23128 964.7347,837.27412 965.56669,838.6203 C 966.53293,840.18372 965.48784,840.8398 960.757,841.63972 C 957.26656,842.22991 957.75138,842.3288 963.52557,842.20448 L 970.52557,842.05377 L 970.82147,839.05377 L 971.11736,836.05377 L 961.91109,836.05377 C 955.43831,836.05377 952.57923,835.68262 952.28186,834.80377 C 951.96296,833.8613 954.21666,833.55377 961.44224,833.55377 L 971.02557,833.55377 L 971.02557,821.17621 C 971.02557,812.01876 971.376,808.50783 972.37257,807.68075 C 973.50096,806.74427 973.49204,805.66952 972.31761,801.05831 C 971.10595,796.30091 971.11315,794.77835 972.37066,789.84093 C 973.61449,784.95725 973.623,783.97755 972.42926,783.09093 C 971.28045,782.23767 970.98787,774.69531 970.77921,740.55377 L 970.52557,699.05377 L 942.52557,698.55377 C 918.34804,698.12203 914.56589,697.84899 914.82094,696.55377 C 914.98339,695.72877 915.99589,694.43638 917.07094,693.6818 C 918.14599,692.92721 919.02557,691.72618 919.02557,691.01284 C 919.02557,690.29949 919.81307,688.32938 920.77557,686.63481 C 922.44224,683.70049 922.44224,683.40705 920.77557,680.47273 C 919.81307,678.77816 919.02557,676.80491 919.02557,676.08774 C 919.02557,675.37057 917.88623,674.03727 916.4937,673.12485 C 915.10118,672.21243 914.22774,671.03568 914.55272,670.50984 C 914.90558,669.9389 926.49966,669.54791 943.33459,669.53922 C 966.44872,669.52728 972.33596,669.23984 976.02557,667.94307 C 981.52911,666.00877 989.40264,666.68968 993.01139,669.41203 C 996.60718,672.1246 996.47591,679.40714 992.72529,685.2839 C 989.50792,690.32511 989.35657,692.94425 992.02931,697.32794 C 993.93739,700.45749 994.02557,702.38744 994.02557,741.02124 C 994.02557,780.86093 993.99567,781.46131 991.93978,782.90131 C 989.95312,784.29282 989.93323,784.48321 991.52143,786.90711 C 993.71561,790.25585 993.78829,799.31849 991.65525,803.59427 C 990.09487,806.72213 990.11371,806.92721 992.08854,808.31043 C 994.13146,809.74134 994.15139,810.27807 993.98599,859.40515 C 993.89406,886.71189 994.14595,909.86068 994.54574,910.8469 C 994.94554,911.83312 995.00789,912.90479 994.68429,913.22838 C 994.3607,913.55198 994.50119,914.57395 994.99649,915.49943 C 995.64002,916.70188 995.27322,917.9567 993.7113,919.8961 C 991.73261,922.353 990.90987,922.60721 985.02557,922.57979 C 975.63499,922.53603 976.5721,922.53831 939.87992,922.46985 C 916.93109,922.42703 906.02337,922.74832 905.5709,923.48042 C 904.76521,924.78406 903.07044,924.81145 900.92189,923.55556 z M 905.45263,897.78846 C 904.86251,897.38438 904.08913,896.26627 903.73401,895.30377 C 903.37889,894.34127 902.39922,893.55377 901.55696,893.55377 C 900.71469,893.55377 900.02557,892.95377 900.02557,892.22044 C 900.02557,890.14499 901.20914,889.46123 902.68356,890.68489 C 903.67682,891.50922 904.41538,891.47515 905.52557,890.55377 C 906.72229,889.56058 907.32885,889.56058 908.52557,890.55377 C 909.74668,891.5672 910.02557,891.51689 910.02557,890.2832 C 910.02557,888.56231 907.3793,887.14075 904.77557,887.46294 C 902.07196,887.79749 902.70815,885.85025 905.5342,885.14096 C 908.92177,884.29073 914.02557,886.99862 914.02557,889.64617 C 914.02557,892.00671 909.33128,898.56112 907.65688,898.53846 C 907.03466,898.53004 906.04275,898.19254 905.45263,897.78846 z M 891.02557,882.74086 C 891.02557,881.55949 896.20383,876.96083 898.41555,876.17803 C 899.52821,875.78423 898.65121,877.16343 896.28319,879.53144 C 892.28657,883.52807 891.02557,884.29782 891.02557,882.74086 z M 848.27557,881.91327 C 845.66859,880.8159 847.18418,879.55377 851.1089,879.55377 C 853.92781,879.55377 855.06514,879.94084 854.78178,880.80377 C 854.34799,882.12487 850.38412,882.80082 848.27557,881.91327 z M 858.52557,880.55377 C 858.86549,880.00377 859.34205,879.55377 859.58459,879.55377 C 859.82713,879.55377 860.02557,880.00377 860.02557,880.55377 C 860.02557,881.10377 859.54901,881.55377 858.96655,881.55377 C 858.38409,881.55377 858.18565,881.10377 858.52557,880.55377 z M 863.02557,880.49475 C 863.02557,879.91229 863.47557,879.71385 864.02557,880.05377 C 864.57557,880.39369 865.02557,880.87025 865.02557,881.11279 C 865.02557,881.35533 864.57557,881.55377 864.02557,881.55377 C 863.47557,881.55377 863.02557,881.07721 863.02557,880.49475 z M 917.4667,879.10351 C 915.59193,877.70282 915.60249,877.67262 917.77557,878.22014 C 919.01307,878.53193 920.02557,879.18455 920.02557,879.6704 C 920.02557,880.86044 919.73093,880.79517 917.4667,879.10351 z M 920.02557,875.63783 C 920.02557,874.22093 922.25125,874.06879 939.77557,874.28781 C 956.58573,874.49789 959.57441,874.76303 959.85367,876.06899 C 960.14102,877.41281 957.6886,877.58045 940.10367,877.41901 C 922.45886,877.25702 920.02557,877.04115 920.02557,875.63783 z M 846.55662,870.60402 C 845.79205,869.36691 848.17706,868.23269 850.51998,868.7192 C 851.40616,868.90321 852.12143,869.50377 852.10948,870.05377 C 852.07932,871.44177 847.36321,871.90911 846.55662,870.60402 z M 855.02557,870.05377 C 855.02557,868.8871 856.3589,868.55377 861.02557,868.55377 C 865.69224,868.55377 867.02557,868.8871 867.02557,870.05377 C 867.02557,871.22044 865.69224,871.55377 861.02557,871.55377 C 856.3589,871.55377 855.02557,871.22044 855.02557,870.05377 z M 870.56827,870.62287 C 869.55158,868.97781 871.72946,868.50912 879.46264,868.70877 C 884.97602,868.85111 887.02557,869.26306 887.02557,870.2289 C 887.02557,871.2175 885.01005,871.55377 879.08459,871.55377 C 874.71705,871.55377 870.88471,871.13486 870.56827,870.62287 z M 904.69224,867.8871 C 904.32557,867.52044 904.02557,866.62044 904.02557,865.8871 C 904.02557,864.25385 909.60587,864.06567 910.59467,865.66557 C 911.80485,867.62369 906.44583,869.6407 904.69224,867.8871 z M 893.02557,866.05377 C 893.02557,865.1371 893.50932,864.54835 894.10057,864.74544 C 894.69182,864.94252 895.17557,865.53127 895.17557,866.05377 C 895.17557,866.57627 894.69182,867.16502 894.10057,867.3621 C 893.50932,867.55919 893.02557,866.97044 893.02557,866.05377 z M 916.02557,866.05377 C 916.02557,864.75746 916.95005,864.50351 920.77557,864.74898 C 923.38807,864.91661 925.52557,865.50377 925.52557,866.05377 C 925.52557,866.60377 923.38807,867.19093 920.77557,867.35856 C 916.95005,867.60403 916.02557,867.35008 916.02557,866.05377 z M 844.73929,849.93416 C 843.05892,848.25378 844.34391,847.55377 849.1089,847.55377 C 852.72813,847.55377 854.07385,847.9138 853.78118,848.80377 C 853.33382,850.16419 845.89882,851.09369 844.73929,849.93416 z M 864.57824,849.63899 C 863.67637,848.17973 864.76152,846.59922 866.83459,846.35263 C 867.76463,846.24201 863.16182,845.90451 856.60613,845.60263 C 848.3674,845.22326 844.55887,844.66777 844.27279,843.80377 C 843.95764,842.85196 846.80106,842.53327 856.19224,842.46782 C 864.35258,842.41095 867.59713,842.1024 865.78154,841.5559 C 864.27233,841.10162 860.67233,840.85414 857.78154,841.00595 C 851.67147,841.32683 850.02557,840.88319 850.02557,838.9154 C 850.02557,838.13198 849.35057,837.23198 848.52557,836.9154 C 845.33784,835.69215 847.26597,834.55377 852.52557,834.55377 C 857.08541,834.55377 858.03077,834.85291 858.05598,836.30377 C 858.08494,837.97044 858.13493,837.97044 859.10567,836.30377 C 859.9678,834.82358 861.65137,834.55377 870.02557,834.55377 C 877.96424,834.55377 880.09955,834.86354 880.80099,836.11696 C 881.59431,837.53454 881.79664,837.53454 882.97313,836.11696 C 884.56226,834.20217 892.65777,833.95617 893.27962,835.80377 C 893.61062,836.78724 894.0431,836.77087 895.30791,835.72701 C 896.19208,834.99729 897.91751,834.54729 899.1422,834.72701 C 901.81787,835.11965 902.93338,837.55377 900.43764,837.55377 C 899.47262,837.55377 897.88608,838.27502 896.912,839.15655 C 895.58252,840.35971 892.73921,840.80701 885.50819,840.95054 C 877.14891,841.11647 875.7485,840.90458 874.91532,839.34776 C 873.57194,836.83764 871.73087,837.12675 870.36965,840.06157 C 869.22885,842.5212 869.27459,842.55498 873.86965,842.64641 C 879.19159,842.7523 900.71272,842.73841 903.13963,842.62752 C 904.34659,842.57237 904.72493,841.60792 904.63963,838.80377 L 904.52557,835.05377 L 912.43718,834.7588 C 922.625,834.37896 923.60731,834.73629 921.44541,838.03576 C 919.96388,840.29687 919.13563,840.55377 913.32723,840.55377 C 908.58859,840.55377 906.97455,840.88803 907.29136,841.80377 C 907.55501,842.56586 909.02184,842.92209 911.04932,842.71641 C 912.87835,842.53087 916.43375,842.70523 918.9502,843.10389 C 923.45896,843.81818 923.48193,843.84099 920.52793,844.671 C 918.87923,845.13424 911.00423,845.49588 903.02793,845.47463 C 874.85957,845.39958 874.28355,845.43427 876.45257,847.07524 C 877.51242,847.87707 878.18742,848.71215 877.95257,848.93099 C 876.78337,850.02046 865.1932,850.63402 864.57824,849.63899 z M 883.02557,848.55377 C 883.02557,848.00377 883.70057,847.55377 884.52557,847.55377 C 885.35057,847.55377 886.02557,848.00377 886.02557,848.55377 C 886.02557,849.10377 885.35057,849.55377 884.52557,849.55377 C 883.70057,849.55377 883.02557,849.10377 883.02557,848.55377 z M 888.02557,848.57282 C 888.02557,847.31634 892.55684,846.15992 894.52333,846.91454 C 897.42655,848.02861 895.98314,849.55377 892.02557,849.55377 C 889.82557,849.55377 888.02557,849.11234 888.02557,848.57282 z M 900.02557,848.55377 C 900.02557,848.00377 900.70057,847.55377 901.52557,847.55377 C 902.35057,847.55377 903.02557,848.00377 903.02557,848.55377 C 903.02557,849.10377 902.35057,849.55377 901.52557,849.55377 C 900.70057,849.55377 900.02557,849.10377 900.02557,848.55377 z M 930.52557,844.59381 C 927.64304,844.10655 926.9857,843.70829 928.17261,843.16823 C 929.07848,842.75605 930.42848,842.50249 931.17261,842.60477 C 933.79195,842.9648 935.13705,842.54317 934.52557,841.55377 C 934.18565,841.00377 931.68409,840.55377 928.96655,840.55377 C 926.24901,840.55377 924.02557,840.14217 924.02557,839.6391 C 924.02557,838.69328 936.17934,837.70193 939.27557,838.3952 C 941.70903,838.94006 941.46097,840.20119 938.77557,840.93711 C 937.02724,841.41624 936.83284,841.75176 937.90369,842.44194 C 938.66165,842.93046 938.97259,843.83047 938.59467,844.44197 C 937.85937,845.63171 936.78518,845.65192 930.52557,844.59381 z M 929.77557,835.73735 C 928.26307,835.56332 927.02557,835.00082 927.02557,834.48735 C 927.02557,833.9654 931.91239,833.55377 938.1089,833.55377 C 946.53277,833.55377 949.09152,833.85371 948.77249,834.80377 C 948.37079,836.00004 936.9405,836.56176 929.77557,835.73735 z M 841.42616,821.39292 C 841.09569,820.8582 841.13275,820.11315 841.50852,819.73724 C 841.8843,819.36133 851.04186,818.99741 861.85866,818.92852 C 880.46356,818.81003 884.87492,819.37048 883.45253,821.67195 C 882.69502,822.89763 842.18992,822.6287 841.42616,821.39292 z M 841.52557,814.55377 C 840.38952,812.7156 842.10769,811.55377 845.96214,811.55377 C 849.60645,811.55377 852.74532,813.50068 851.35023,814.89578 C 850.30548,815.94052 842.20843,815.65866 841.52557,814.55377 z M 854.21594,813.80377 C 854.51133,812.26996 855.84671,812.05377 865.02557,812.05377 C 874.20443,812.05377 875.53981,812.26996 875.8352,813.80377 C 876.1399,815.38593 875.10315,815.55377 865.02557,815.55377 C 854.94799,815.55377 853.91125,815.38593 854.21594,813.80377 z M 858.7069,808.90177 C 858.3483,808.54317 854.93882,808.34075 851.13027,808.45196 C 844.49847,808.6456 840.95297,807.28633 844.51976,805.91762 C 845.88804,805.39257 845.79332,805.12087 843.91211,804.17469 C 842.68638,803.55818 841.49797,802.49127 841.27121,801.80377 C 840.95151,800.83453 844.93701,800.55377 859.01556,800.55377 C 875.76753,800.55377 877.14651,800.68916 876.83995,802.30377 C 876.60436,803.5446 875.20098,804.22829 872.01663,804.65358 L 867.52557,805.25338 L 873.02557,805.55438 C 876.05057,805.71992 879.69198,805.76824 881.11759,805.66176 C 882.54321,805.55527 884.23245,806.09812 884.87147,806.86809 C 885.83857,808.03338 885.00234,808.37581 879.88276,808.91091 C 871.91902,809.74328 859.54308,809.73794 858.7069,808.90177 z M 857.02557,805.55377 C 857.02557,805.00377 856.32401,804.55377 855.46655,804.55377 C 854.60909,804.55377 854.18565,805.00377 854.52557,805.55377 C 854.86549,806.10377 855.56705,806.55377 856.08459,806.55377 C 856.60213,806.55377 857.02557,806.10377 857.02557,805.55377 z M 866.2946,804.89783 C 865.61757,804.62391 864.26757,804.60724 863.2946,804.86078 C 862.32163,805.11432 862.87557,805.33844 864.52557,805.35882 C 866.17557,805.3792 866.97163,805.17176 866.2946,804.89783 z M 895.27557,808.83361 C 894.03807,808.60319 893.02557,807.81569 893.02557,807.0836 C 893.02557,806.05108 894.85826,805.84331 901.19637,806.15728 C 909.30011,806.55871 910.95689,806.95578 909.714,808.19867 C 908.94444,808.96824 898.47195,809.42877 895.27557,808.83361 z M 918.52557,808.55377 C 917.23689,806.46865 919.35227,805.55377 925.46214,805.55377 C 931.4006,805.55377 935.11748,807.12853 933.35023,808.89578 C 932.29232,809.95369 919.20415,809.65174 918.52557,808.55377 z M 936.02919,808.72044 C 935.4772,808.5371 935.02557,807.82218 935.02557,807.13171 C 935.02557,806.27357 936.88066,805.85885 940.88815,805.8211 C 947.45796,805.75922 950.52739,806.90991 948.04617,808.50457 C 946.69715,809.37157 938.43644,809.51996 936.02919,808.72044 z M 912.52557,807.55377 C 912.86549,807.00377 913.79205,806.55377 914.58459,806.55377 C 915.37713,806.55377 916.02557,807.00377 916.02557,807.55377 C 916.02557,808.10377 915.09901,808.55377 913.96655,808.55377 C 912.83409,808.55377 912.18565,808.10377 912.52557,807.55377 z M 865.52557,796.55377 C 868.30484,795.35948 871.78746,795.35948 872.52557,796.55377 C 872.90689,797.17076 871.30169,797.52685 868.33459,797.48348 C 864.72734,797.43076 864.02537,797.19843 865.52557,796.55377 z M 877.83807,796.87066 C 878.55994,796.58179 879.42245,796.61731 879.75474,796.9496 C 880.08703,797.2819 879.4964,797.51824 878.44224,797.47482 C 877.27729,797.42684 877.04034,797.18988 877.83807,796.87066 z M 933.83807,796.87066 C 934.55995,796.58179 935.42244,796.61731 935.75474,796.9496 C 936.08703,797.2819 935.4964,797.51824 934.44224,797.47482 C 933.27729,797.42684 933.04034,797.18988 933.83807,796.87066 z M 939.83807,796.87066 C 940.55995,796.58179 941.42244,796.61731 941.75474,796.9496 C 942.08703,797.2819 941.4964,797.51824 940.44224,797.47482 C 939.27729,797.42684 939.04034,797.18988 939.83807,796.87066 z M 860.83807,789.87066 C 861.55994,789.58179 862.42245,789.61731 862.75474,789.9496 C 863.08703,790.2819 862.4964,790.51824 861.44224,790.47482 C 860.27729,790.42684 860.04034,790.18988 860.83807,789.87066 z M 869.9117,789.39971 C 872.21686,788.73687 873.63746,788.76566 874.3617,789.4899 C 875.11353,790.24173 874.12034,790.52732 870.97557,790.46358 L 866.52557,790.37339 L 869.9117,789.39971 z M 903.87898,789.76635 C 895.95309,789.50288 895.2737,789.32091 895.72811,787.58324 C 896.54444,784.46159 902.23003,782.43671 909.26242,782.76309 C 914.92161,783.02574 915.69952,783.32983 917.32946,785.91655 C 920.09154,790.3 920.07503,790.30472 903.87898,789.76635 z M 930.02557,789.67079 C 930.02557,788.62777 935.55648,788.75135 936.62333,789.8182 C 937.0279,790.22276 935.7089,790.55377 933.69224,790.55377 C 931.67557,790.55377 930.02557,790.15643 930.02557,789.67079 z M 933.83807,782.87066 C 934.55995,782.58179 935.42244,782.61731 935.75474,782.9496 C 936.08703,783.2819 935.4964,783.51824 934.44224,783.47482 C 933.27729,783.42684 933.04034,783.18988 933.83807,782.87066 z M 847.02557,781.03388 C 847.02557,779.89525 849.4235,779.63181 859.52557,779.66061 C 869.29632,779.68846 872.02557,779.98916 872.02557,781.03782 C 872.02557,782.0867 869.29828,782.38632 859.52557,782.41109 C 849.42536,782.43669 847.02557,782.17229 847.02557,781.03388 z M 878.27557,779.54441 C 875.79651,778.52393 875.33591,777.02785 877.27557,776.29631 C 879.01877,775.63886 893.74114,776.936 894.63053,777.8254 C 895.03114,778.226 895.09932,778.81335 894.78205,779.13062 C 893.74748,780.16519 880.58518,780.49514 878.27557,779.54441 z M 899.02557,779.54823 C 895.48796,777.20289 901.24613,776.61013 927.72385,776.59397 C 953.45124,776.57827 957.89176,777.02091 955.54542,779.36726 C 954.42222,780.49045 900.70621,780.66245 899.02557,779.54823 z M 846.48445,767.48724 C 845.33782,765.63195 847.01075,765.05377 853.52557,765.05377 C 860.11236,765.05377 862.51856,765.9979 859.99661,767.59283 C 857.96358,768.87856 847.2928,768.79517 846.48445,767.48724 z M 863.48445,767.48724 C 863.12192,766.90065 863.12972,766.11629 863.50179,765.74422 C 864.19684,765.04916 883.11365,765.30851 883.82803,766.02289 C 884.04683,766.24169 883.92922,766.90065 883.56669,767.48724 C 882.68693,768.91072 864.36421,768.91072 863.48445,767.48724 z M 903.45348,764.25408 C 902.66813,763.81425 902.02535,762.91425 902.02508,762.25408 C 902.02472,761.34658 908.05461,761.10906 926.74308,761.28043 C 951.90312,761.51115 955.17937,761.79997 953.35305,763.62629 C 952.13656,764.84278 905.55116,765.42887 903.45348,764.25408 z M 877.52557,751.71886 C 872.9868,750.96419 871.67305,747.91647 876.02557,748.23906 C 877.40057,748.34098 888.53522,748.49183 900.76923,748.57429 C 914.74081,748.66847 923.24883,749.10599 923.64734,749.7508 C 924.61774,751.32094 922.66052,752.06477 917.87117,751.94601 C 904.13402,751.60534 896.66245,751.61344 889.52557,751.97673 C 885.12557,752.2007 879.72557,752.08466 877.52557,751.71886 z M 926.10255,751.14652 C 924.40707,749.10359 925.91052,748.55377 933.19224,748.55377 C 939.04248,748.55377 940.02557,748.80641 940.02557,750.30982 C 940.02557,751.78401 938.99323,752.09456 933.59387,752.24458 C 929.40214,752.36105 926.79314,751.97863 926.10255,751.14652 z M 846.72144,743.91631 C 844.74686,741.94173 847.12953,741.51825 858.77557,741.77389 C 866.63612,741.94644 871.43104,742.43726 871.27906,743.05377 C 870.99879,744.19071 847.81029,745.00516 846.72144,743.91631 z M 873.55509,743.60153 C 873.19413,743.0175 873.56432,742.28427 874.37771,741.97213 C 876.54804,741.1393 881.52557,741.89252 881.52557,743.05377 C 881.52557,744.42747 874.36949,744.91926 873.55509,743.60153 z M 905.64527,743.84014 C 905.25278,743.44764 901.18794,743.06138 896.61229,742.98178 C 892.03665,742.90218 887.77544,742.51722 887.14295,742.12631 C 884.50555,740.49631 887.61401,739.82182 898.49885,739.66221 C 907.50927,739.5301 910.02557,739.78361 910.02557,740.82349 C 910.02557,742.19728 908.10936,744.55377 906.99224,744.55377 C 906.6439,744.55377 906.03777,744.23264 905.64527,743.84014 z M 924.50714,742.52395 C 924.11812,741.8945 924.24872,740.93062 924.79737,740.38197 C 926.25349,738.92584 930.52557,739.79977 930.52557,741.55377 C 930.52557,743.36786 925.52673,744.17368 924.50714,742.52395 z M 934.14745,742.65026 C 931.96183,741.26591 933.82969,739.55377 937.52557,739.55377 C 941.55275,739.55377 942.85782,741.038 940.11932,742.5036 C 937.74911,743.77209 935.98694,743.81537 934.14745,742.65026 z M 915.71942,741.91429 C 914.92049,741.11536 915.82361,739.55377 917.08459,739.55377 C 917.60213,739.55377 918.02557,740.22877 918.02557,741.05377 C 918.02557,742.60018 916.84561,743.04047 915.71942,741.91429 z M 847.14746,731.65026 C 844.85065,730.19549 846.90679,728.55377 851.02557,728.55377 C 855.14436,728.55377 857.20049,730.19549 854.90369,731.65026 C 854.14572,732.13035 852.40057,732.52314 851.02557,732.52314 C 849.65057,732.52314 847.90542,732.13035 847.14746,731.65026 z M 857.71942,730.91429 C 856.67683,729.8717 857.99736,728.55377 860.08459,728.55377 C 861.15213,728.55377 862.02557,729.22877 862.02557,730.05377 C 862.02557,731.53702 858.95563,732.1505 857.71942,730.91429 z M 939.02557,730.12573 C 939.02557,728.41347 946.80187,727.2491 955.0162,727.73139 C 959.29521,727.98263 960.58025,728.43994 960.83953,729.80377 C 961.14015,731.38511 960.10499,731.55377 950.09889,731.55377 C 941.17059,731.55377 939.02557,731.27714 939.02557,730.12573 z M 891.6853,719.88016 C 891.31481,719.50968 884.71811,719.08828 877.02596,718.94371 C 869.33381,718.79914 862.55625,718.38175 861.96473,718.01617 C 861.3732,717.65058 861.21006,716.60949 861.6022,715.70262 C 861.99433,714.79575 862.58753,712.25377 862.9204,710.05377 L 863.52563,706.05377 L 872.5256,706.27652 C 877.47558,706.39904 885.12557,706.45336 889.52557,706.39723 C 893.92557,706.3411 898.20057,706.33183 899.02557,706.37664 C 899.85057,706.42145 904.35057,706.47628 909.02557,706.4985 C 913.70057,706.52072 918.42557,706.54786 919.52557,706.55881 C 920.62557,706.56976 924.52614,706.55632 928.1935,706.52895 C 931.86086,706.50157 935.12737,706.90946 935.4524,707.43538 C 935.80688,708.00894 937.23747,707.79591 939.0273,706.90302 C 940.66846,706.0843 942.91445,705.70111 944.0184,706.05149 C 945.73082,706.595 946.02557,707.55974 946.02557,712.62116 C 946.02557,715.88409 945.68807,718.59217 945.27557,718.6391 C 944.86307,718.68604 940.47557,718.68014 935.52557,718.62599 C 930.57557,718.57184 925.51307,718.53344 924.27557,718.54065 C 919.37747,718.56921 917.95686,718.54873 916.27557,718.42532 C 911.25252,718.05665 895.02557,719.07595 895.02557,719.76015 C 895.02557,720.72693 892.61855,720.81342 891.6853,719.88016 z M 883.68785,711.30377 C 883.41044,710.61627 883.18347,711.17877 883.18347,712.55377 C 883.18347,713.92877 883.41044,714.49127 883.68785,713.80377 C 883.96526,713.11627 883.96526,711.99127 883.68785,711.30377 z M 937.02557,713.05377 C 937.02557,712.22877 936.57557,711.55377 936.02557,711.55377 C 935.47557,711.55377 935.02557,712.22877 935.02557,713.05377 C 935.02557,713.87877 935.47557,714.55377 936.02557,714.55377 C 936.57557,714.55377 937.02557,713.87877 937.02557,713.05377 z M 917.02557,712.05377 C 917.02557,711.22877 916.57557,710.55377 916.02557,710.55377 C 915.47557,710.55377 915.02557,711.22877 915.02557,712.05377 C 915.02557,712.87877 915.47557,713.55377 916.02557,713.55377 C 916.57557,713.55377 917.02557,712.87877 917.02557,712.05377 z M 898.2373,694.73348 C 896.10209,693.64278 894.74182,692.08215 894.35813,690.28296 C 894.03314,688.75901 893.37537,687.26996 892.89641,686.97394 C 892.41745,686.67793 892.02557,684.24496 892.02557,681.56733 C 892.02557,677.49899 892.45858,676.35833 894.66043,674.62635 C 896.1096,673.48643 898.3971,672.55377 899.74376,672.55377 C 902.76709,672.55377 902.30933,670.19215 899.19724,669.73422 C 895.85386,669.24226 896.61523,667.75699 900.86321,666.48427 C 904.11791,665.50914 905.21917,665.60932 908.11321,667.14383 C 910.9812,668.66452 911.20651,669.01041 909.52557,669.31202 C 905.21143,670.08609 904.71656,670.47651 906.03539,672.0656 C 906.71468,672.88409 908.22786,673.56808 909.39801,673.58557 C 914.19308,673.65725 917.40532,680.10717 914.94005,684.71356 C 914.26979,685.96596 913.67733,688.09003 913.62348,689.43371 C 913.55334,691.18376 912.39093,692.52779 909.52557,694.17189 C 904.79551,696.88592 902.65907,696.99221 898.2373,694.73348 z " />
-      <path
-         id="path4205"
-         style="fill:#e7d4c9"
-         d="M 900.92189,923.55556 C 899.99848,923.0158 884.3034,922.65348 863.92189,922.70142 C 844.45392,922.74722 826.95057,922.77684 825.02557,922.76726 C 818.03454,922.73246 815.02017,921.99107 813.5946,919.95579 C 811.97756,917.64714 811.77627,911.70133 813.25204,909.83706 C 813.78178,909.16788 814.09866,906.46788 813.95623,903.83706 C 813.8138,901.20625 813.77114,878.46627 813.86142,853.30377 C 814.00468,813.37673 814.21649,807.55377 815.52557,807.55377 C 817.44738,807.55377 817.42887,806.09892 815.469,803.10778 C 813.41255,799.96923 813.41311,791.48783 815.47005,787.3646 C 816.94979,784.3984 816.95684,783.97668 815.54391,782.94352 C 814.16282,781.93365 814.01766,777.01168 814.29003,740.4276 C 814.56801,703.08888 814.7777,698.58763 816.44007,694.27424 C 818.06355,690.06175 818.1088,689.29059 816.82148,687.77424 C 811.7735,681.82817 810.63732,673.20659 814.43192,669.64175 C 817.51928,666.74132 826.75462,665.75483 832.52557,667.70903 C 835.39212,668.67973 844.31806,669.16016 864.02557,669.4045 C 879.15057,669.59202 891.91118,670.11043 892.38247,670.55651 C 892.85377,671.0026 892.06627,672.13622 890.63247,673.07568 C 889.06003,674.10599 888.02557,675.70677 888.02557,677.10976 C 888.02557,678.38905 887.57557,679.71385 887.02557,680.05377 C 885.72591,680.857 885.72591,687.25054 887.02557,688.05377 C 887.57557,688.39369 888.02557,689.49349 888.02557,690.49778 C 888.02557,691.50206 889.17851,693.07918 890.58766,694.00249 C 896.06556,697.59175 893.53207,698.03279 864.443,698.55377 L 836.52557,699.05377 L 836.27193,740.55377 C 836.04935,776.97151 835.82536,782.19681 834.44289,783.22181 C 833.1462,784.1832 833.0805,784.78789 834.07152,786.63964 C 835.62812,789.54816 835.62769,800.56019 834.07087,803.46913 C 833.08504,805.31117 833.15317,806.03728 834.44587,807.4657 C 835.83697,809.00285 836.02557,814.66778 836.02557,854.91375 L 836.02557,900.61626 L 859.01072,900.51681 C 871.65254,900.46212 882.49296,900.7246 883.10052,901.10009 C 883.75736,901.50604 883.95963,903.09171 883.59947,905.01154 C 883.09043,907.72498 883.51581,908.79382 886.26483,911.70863 C 889.01449,914.62412 890.61325,915.3555 896.29471,916.29695 C 901.12234,917.09691 904.97302,917.11808 909.77151,916.37102 C 915.46454,915.4847 917.04379,914.77043 920.12244,911.68945 C 923.12215,908.68747 923.67502,907.50793 923.29435,904.92219 C 923.04079,903.19982 923.32286,901.48807 923.92116,901.1183 C 924.51947,900.74852 935.25022,900.35773 947.76728,900.24988 L 970.52557,900.05377 L 970.7279,854.63715 C 970.89319,817.53686 971.18317,808.9676 972.31154,807.83923 C 973.48661,806.66416 973.48552,805.64391 972.30425,801.00585 C 971.10812,796.30944 971.11732,794.76196 972.37066,789.84093 C 973.61449,784.95725 973.623,783.97755 972.42926,783.09093 C 971.28045,782.23767 970.98787,774.69531 970.77921,740.55377 L 970.52557,699.05377 L 942.52557,698.55377 C 918.34804,698.12203 914.56589,697.84899 914.82094,696.55377 C 914.98339,695.72877 915.99589,694.43638 917.07094,693.6818 C 918.14599,692.92721 919.02557,691.72618 919.02557,691.01284 C 919.02557,690.29949 919.81307,688.32938 920.77557,686.63481 C 922.44224,683.70049 922.44224,683.40705 920.77557,680.47273 C 919.81307,678.77816 919.02557,676.80491 919.02557,676.08774 C 919.02557,675.37057 917.88623,674.03727 916.4937,673.12485 C 915.10118,672.21243 914.22774,671.03568 914.55272,670.50984 C 914.90558,669.9389 926.49966,669.54791 943.33459,669.53922 C 966.44872,669.52728 972.33596,669.23984 976.02557,667.94307 C 981.52911,666.00877 989.40264,666.68968 993.01139,669.41203 C 996.60718,672.1246 996.47591,679.40714 992.72529,685.2839 C 989.50792,690.32511 989.35657,692.94425 992.02931,697.32794 C 993.93739,700.45749 994.02557,702.38744 994.02557,741.02124 C 994.02557,780.86093 993.99567,781.46131 991.93978,782.90131 C 989.95312,784.29282 989.93323,784.48321 991.52143,786.90711 C 993.71561,790.25585 993.78829,799.31849 991.65525,803.59427 C 990.09487,806.72213 990.11371,806.92721 992.08854,808.31043 C 994.13146,809.74134 994.15139,810.27807 993.98599,859.40515 C 993.89406,886.71189 994.14595,909.86068 994.54574,910.8469 C 994.94554,911.83312 995.00789,912.90479 994.68429,913.22838 C 994.3607,913.55198 994.50119,914.57395 994.99649,915.49943 C 995.64002,916.70188 995.27322,917.9567 993.7113,919.8961 C 991.73261,922.353 990.90987,922.60721 985.02557,922.57979 C 975.63499,922.53603 976.5721,922.53831 939.87992,922.46985 C 916.93109,922.42703 906.02337,922.74832 905.5709,923.48042 C 904.76521,924.78406 903.07044,924.81145 900.92189,923.55556 z M 937.21861,876.37406 C 936.28744,876.00021 940.10127,875.66271 945.69378,875.62406 C 951.2863,875.5854 956.5738,875.28063 957.44378,874.94678 C 958.31377,874.61294 959.02557,874.80805 959.02557,875.38037 C 959.02557,876.57296 939.88634,877.44509 937.21861,876.37406 z M 921.02557,875.55377 C 921.02557,875.00377 921.47557,874.55377 922.02557,874.55377 C 922.57557,874.55377 923.02557,875.00377 923.02557,875.55377 C 923.02557,876.10377 922.57557,876.55377 922.02557,876.55377 C 921.47557,876.55377 921.02557,876.10377 921.02557,875.55377 z M 925.02557,875.55377 C 925.02557,875.00377 925.47557,874.55377 926.02557,874.55377 C 926.57557,874.55377 927.02557,875.00377 927.02557,875.55377 C 927.02557,876.10377 926.57557,876.55377 926.02557,876.55377 C 925.47557,876.55377 925.02557,876.10377 925.02557,875.55377 z M 852.77557,835.89149 C 853.46307,835.61408 854.58807,835.61408 855.27557,835.89149 C 855.96307,836.1689 855.40057,836.39588 854.02557,836.39588 C 852.65057,836.39588 852.08807,836.1689 852.77557,835.89149 z M 843.83807,820.87066 C 844.55994,820.58179 845.42245,820.61731 845.75474,820.9496 C 846.08703,821.2819 845.4964,821.51824 844.44224,821.47482 C 843.27729,821.42684 843.04034,821.18988 843.83807,820.87066 z M 848.02557,820.55377 C 848.02557,820.00377 848.67401,819.55377 849.46655,819.55377 C 850.25909,819.55377 851.18565,820.00377 851.52557,820.55377 C 851.86549,821.10377 851.21705,821.55377 850.08459,821.55377 C 848.95213,821.55377 848.02557,821.10377 848.02557,820.55377 z M 875.82557,820.35377 C 876.7589,819.42044 877.29224,819.42044 878.22557,820.35377 C 879.1589,821.2871 878.89224,821.55377 877.02557,821.55377 C 875.1589,821.55377 874.89224,821.2871 875.82557,820.35377 z M 860.77557,814.88578 C 859.81307,814.62252 859.02557,813.99012 859.02557,813.48045 C 859.02557,812.22524 870.74699,812.294 871.52557,813.55377 C 871.88097,814.12882 870.94992,814.55957 869.33459,814.56742 C 867.78963,814.57493 865.62557,814.75734 864.52557,814.97276 C 863.42557,815.18819 861.73807,815.14905 860.77557,814.88578 z M 842.02557,813.55377 C 842.02557,813.00377 843.82557,812.55377 846.02557,812.55377 C 848.22557,812.55377 850.02557,813.00377 850.02557,813.55377 C 850.02557,814.10377 848.22557,814.55377 846.02557,814.55377 C 843.82557,814.55377 842.02557,814.10377 842.02557,813.55377 z M 858.59553,807.66696 C 858.29174,807.17542 862.0541,806.79539 867.03651,806.81435 C 871.98049,806.83316 876.02557,807.23222 876.02557,807.70116 C 876.02557,808.83651 859.29806,808.80369 858.59553,807.66696 z M 920.02557,807.55377 C 920.02557,807.00377 920.70057,806.55377 921.52557,806.55377 C 922.35057,806.55377 923.02557,807.00377 923.02557,807.55377 C 923.02557,808.10377 922.35057,808.55377 921.52557,808.55377 C 920.70057,808.55377 920.02557,808.10377 920.02557,807.55377 z M 928.52557,807.55377 C 926.61721,806.73372 926.62867,806.69112 928.77557,806.62406 C 930.01307,806.5854 931.02557,807.00377 931.02557,807.55377 C 931.02557,808.10377 930.91307,808.52214 930.77557,808.48348 C 930.63807,808.44483 929.62557,808.02646 928.52557,807.55377 z M 850.77557,806.89149 C 851.46307,806.61408 852.58807,806.61408 853.27557,806.89149 C 853.96307,807.1689 853.40057,807.39588 852.02557,807.39588 C 850.65057,807.39588 850.08807,807.1689 850.77557,806.89149 z M 843.52557,802.55377 C 843.17366,801.98437 844.03486,801.55377 845.52557,801.55377 C 847.01628,801.55377 847.87748,801.98437 847.52557,802.55377 C 847.18565,803.10377 846.28565,803.55377 845.52557,803.55377 C 844.76549,803.55377 843.86549,803.10377 843.52557,802.55377 z M 853.52557,802.55377 C 853.12709,801.90902 857.03486,801.55377 864.52557,801.55377 C 872.01628,801.55377 875.92405,801.90902 875.52557,802.55377 C 875.17776,803.11654 870.36819,803.55377 864.52557,803.55377 C 858.68295,803.55377 853.87338,803.11654 853.52557,802.55377 z M 899.73469,786.44465 C 901.77322,784.40613 911.02557,784.59112 911.02557,786.6704 C 911.02557,787.15625 908.23557,787.55377 904.82557,787.55377 C 900.28559,787.55377 898.92253,787.25681 899.73469,786.44465 z M 849.2946,780.86078 C 850.26757,780.60724 851.61757,780.62391 852.2946,780.89783 C 852.97163,781.17176 852.17557,781.3792 850.52557,781.35882 C 848.87557,781.33844 848.32163,781.11432 849.2946,780.86078 z M 867.83807,780.87066 C 868.55994,780.58179 869.42245,780.61731 869.75474,780.9496 C 870.08703,781.2819 869.4964,781.51824 868.44224,781.47482 C 867.27729,781.42684 867.04034,781.18988 867.83807,780.87066 z M 903.52557,778.55377 C 903.18565,778.00377 903.38409,777.55377 903.96655,777.55377 C 904.54901,777.55377 905.02557,778.00377 905.02557,778.55377 C 905.02557,779.10377 904.82713,779.55377 904.58459,779.55377 C 904.34205,779.55377 903.86549,779.10377 903.52557,778.55377 z M 937.52557,778.55377 C 937.14339,777.9354 938.74278,777.59181 941.71655,777.65345 C 945.61871,777.73433 946.05413,777.90411 944.02557,778.55377 C 940.4391,779.70236 938.23544,779.70236 937.52557,778.55377 z M 878.77557,777.89149 C 879.46307,777.61408 880.58807,777.61408 881.27557,777.89149 C 881.96307,778.1689 881.40057,778.39588 880.02557,778.39588 C 878.65057,778.39588 878.08807,778.1689 878.77557,777.89149 z M 849.52557,766.55377 C 850.30668,765.28991 853.06989,765.28991 855.02557,766.55377 C 856.13905,767.27336 855.54407,767.52709 852.71655,767.53846 C 850.42858,767.54766 849.15433,767.15444 849.52557,766.55377 z M 867.77557,766.89149 C 868.46307,766.61408 869.58807,766.61408 870.27557,766.89149 C 870.96307,767.1689 870.40057,767.39588 869.02557,767.39588 C 867.65057,767.39588 867.08807,767.1689 867.77557,766.89149 z M 931.2946,762.86078 C 932.26757,762.60724 933.61757,762.62391 934.2946,762.89783 C 934.97163,763.17176 934.17557,763.3792 932.52557,763.35882 C 930.87557,763.33844 930.32163,763.11432 931.2946,762.86078 z M 945.83807,762.87066 C 946.55995,762.58178 947.42244,762.61731 947.75474,762.9496 C 948.08703,763.28189 947.4964,763.51824 946.44224,763.47482 C 945.27729,763.42684 945.04034,763.18988 945.83807,762.87066 z M 874.02557,749.55377 C 874.02557,749.00377 874.67401,748.55377 875.46655,748.55377 C 876.25909,748.55377 877.18565,749.00377 877.52557,749.55377 C 877.86549,750.10377 877.21705,750.55377 876.08459,750.55377 C 874.95213,750.55377 874.02557,750.10377 874.02557,749.55377 z M 882.2946,749.86078 C 883.26757,749.60724 884.61757,749.62391 885.2946,749.89783 C 885.97163,750.17176 885.17557,750.3792 883.52557,750.35882 C 881.87557,750.33844 881.32163,750.11432 882.2946,749.86078 z M 930.83807,749.87066 C 931.55995,749.58178 932.42244,749.61731 932.75474,749.9496 C 933.08703,750.28189 932.4964,750.51824 931.44224,750.47482 C 930.27729,750.42684 930.04034,750.18988 930.83807,749.87066 z M 893.52557,741.55377 C 893.86549,741.00377 894.56705,740.55377 895.08459,740.55377 C 895.60213,740.55377 896.02557,741.00377 896.02557,741.55377 C 896.02557,742.10377 895.32401,742.55377 894.46655,742.55377 C 893.60909,742.55377 893.18565,742.10377 893.52557,741.55377 z M 906.02557,741.55377 C 906.02557,741.00377 906.70057,740.55377 907.52557,740.55377 C 908.35057,740.55377 909.02557,741.00377 909.02557,741.55377 C 909.02557,742.10377 908.35057,742.55377 907.52557,742.55377 C 906.70057,742.55377 906.02557,742.10377 906.02557,741.55377 z M 926.83807,741.87066 C 927.55995,741.58178 928.42244,741.61731 928.75474,741.9496 C 929.08703,742.28189 928.4964,742.51824 927.44224,742.47482 C 926.27729,742.42684 926.04034,742.18988 926.83807,741.87066 z M 936.2946,740.86078 C 937.26757,740.60724 938.61757,740.62391 939.2946,740.89783 C 939.97163,741.17176 939.17557,741.3792 937.52557,741.35882 C 935.87557,741.33844 935.32163,741.11432 936.2946,740.86078 z M 848.02557,730.55377 C 848.02557,730.00377 849.37557,729.55377 851.02557,729.55377 C 852.67557,729.55377 854.02557,730.00377 854.02557,730.55377 C 854.02557,731.10377 852.67557,731.55377 851.02557,731.55377 C 849.37557,731.55377 848.02557,731.10377 848.02557,730.55377 z M 946.26074,730.88924 C 945.01508,730.62609 944.25414,729.99295 944.56976,729.48228 C 945.34438,728.22891 958.74636,728.29297 959.52557,729.55377 C 959.86889,730.10927 959.11724,730.55866 957.83459,730.56478 C 956.56463,730.57083 953.95057,730.75396 952.02557,730.97174 C 950.10057,731.18952 947.5064,731.1524 946.26074,730.88924 z M 891.6853,719.88016 C 891.31481,719.50968 884.71811,719.08828 877.02596,718.94371 C 869.33381,718.79914 862.55625,718.38175 861.96473,718.01617 C 861.3732,717.65058 861.21006,716.60949 861.6022,715.70262 C 861.99433,714.79575 862.58753,712.25377 862.9204,710.05377 L 863.52563,706.05377 L 872.5256,706.27652 C 877.47558,706.39904 885.12557,706.45336 889.52557,706.39723 C 893.92557,706.3411 898.20057,706.33183 899.02557,706.37664 C 899.85057,706.42145 904.35057,706.47628 909.02557,706.4985 C 913.70057,706.52072 918.42557,706.54786 919.52557,706.55881 C 920.62557,706.56976 924.52614,706.55632 928.1935,706.52895 C 931.86086,706.50157 935.12737,706.90946 935.4524,707.43538 C 935.80688,708.00894 937.23747,707.79591 939.0273,706.90302 C 940.66846,706.0843 942.91445,705.70111 944.0184,706.05149 C 945.73082,706.595 946.02557,707.55974 946.02557,712.62116 C 946.02557,715.88409 945.68807,718.59217 945.27557,718.6391 C 944.86307,718.68604 940.47557,718.68014 935.52557,718.62599 C 930.57557,718.57184 925.51307,718.53344 924.27557,718.54065 C 919.37747,718.56921 917.95686,718.54873 916.27557,718.42532 C 911.25252,718.05665 895.02557,719.07595 895.02557,719.76015 C 895.02557,720.72693 892.61855,720.81342 891.6853,719.88016 z M 883.68785,711.30377 C 883.41044,710.61627 883.18347,711.17877 883.18347,712.55377 C 883.18347,713.92877 883.41044,714.49127 883.68785,713.80377 C 883.96526,713.11627 883.96526,711.99127 883.68785,711.30377 z M 937.02557,713.05377 C 937.02557,712.22877 936.57557,711.55377 936.02557,711.55377 C 935.47557,711.55377 935.02557,712.22877 935.02557,713.05377 C 935.02557,713.87877 935.47557,714.55377 936.02557,714.55377 C 936.57557,714.55377 937.02557,713.87877 937.02557,713.05377 z M 917.02557,712.05377 C 917.02557,711.22877 916.57557,710.55377 916.02557,710.55377 C 915.47557,710.55377 915.02557,711.22877 915.02557,712.05377 C 915.02557,712.87877 915.47557,713.55377 916.02557,713.55377 C 916.57557,713.55377 917.02557,712.87877 917.02557,712.05377 z M 898.2373,694.73348 C 896.10209,693.64278 894.74182,692.08215 894.35813,690.28296 C 894.03314,688.75901 893.37537,687.26996 892.89641,686.97394 C 892.41745,686.67793 892.02557,684.24496 892.02557,681.56733 C 892.02557,677.49899 892.45858,676.35833 894.66043,674.62635 C 896.1096,673.48643 898.3971,672.55377 899.74376,672.55377 C 902.76709,672.55377 902.30933,670.19215 899.19724,669.73422 C 895.85386,669.24226 896.61523,667.75699 900.86321,666.48427 C 904.11791,665.50914 905.21917,665.60932 908.11321,667.14383 C 910.9812,668.66452 911.20651,669.01041 909.52557,669.31202 C 905.21143,670.08609 904.71656,670.47651 906.03539,672.0656 C 906.71468,672.88409 908.22786,673.56808 909.39801,673.58557 C 914.19308,673.65725 917.40532,680.10717 914.94005,684.71356 C 914.26979,685.96596 913.67733,688.09003 913.62348,689.43371 C 913.55334,691.18376 912.39093,692.52779 909.52557,694.17189 C 904.79551,696.88592 902.65907,696.99221 898.2373,694.73348 z " />
-      <path
-         id="path4203"
-         style="fill:#dec6b7"
-         d="M 900.15318,922.69278 C 899.39836,922.1932 884.34447,921.7118 866.70009,921.623 C 845.18008,921.5147 834.18561,921.10156 833.3017,920.36798 C 832.57698,919.76651 831.4877,917.30335 830.8811,914.8943 C 829.98732,911.34478 829.51719,910.7308 828.40187,911.65643 C 826.70192,913.06727 826.63293,915.9522 828.23771,918.52186 C 829.82031,921.056 828.77123,921.97128 824.42525,921.84809 C 820.04052,921.7238 819.2617,921.00657 820.81342,918.52186 C 822.42038,915.94872 822.34862,913.06677 820.64235,911.65069 C 819.14459,910.40766 818.02557,912.02997 818.02557,915.44443 C 818.02557,916.39432 817.37839,918.04502 816.5874,919.11264 C 815.1666,921.03032 815.13194,921.03043 813.71796,919.12208 C 812.24489,917.13397 812.11816,912.831 813.46835,910.64636 C 813.88861,909.96635 814.16433,886.96972 814.08105,859.54273 C 813.93132,810.23236 813.9525,809.66325 815.9776,808.57944 C 818.44233,807.26036 818.56751,805.81009 816.42134,803.43859 C 814.07142,800.84196 814.16876,790.81282 816.58356,786.72488 C 818.44953,783.56605 818.44749,783.53759 816.2432,781.99365 L 814.02557,780.44036 L 814.02557,741.95723 C 814.02557,706.39719 814.16722,703.19228 815.89037,699.76393 C 818.69117,694.19151 819.38268,689.09503 817.5449,687.56981 C 816.70927,686.8763 816.02557,685.72112 816.02557,685.00275 C 816.02557,684.28438 815.3061,682.97715 814.42674,682.0978 C 812.29366,679.96471 811.40131,673.01088 813.01167,671.07052 C 814.39457,669.40423 821.15022,667.26343 825.02557,667.26343 C 826.40057,667.26343 829.55057,667.83166 832.02557,668.52615 C 837.21218,669.98154 839.75413,670.1103 869.52557,670.42564 C 889.84121,670.64083 891.35331,670.77884 889.27557,672.22819 C 888.03807,673.09143 887.02557,674.65866 887.02557,675.71092 C 887.02557,676.76319 886.34789,678.6584 885.51962,679.9225 C 884.1651,681.98977 884.19768,682.80187 885.84367,687.9991 C 886.85016,691.17712 888.42784,694.19939 889.34961,694.71524 C 893.6814,697.13943 889.83886,697.55377 863.02557,697.55377 C 837.03404,697.55377 835.02398,697.42824 835.00333,695.80377 C 834.9911,694.84127 834.14735,692.96926 833.12833,691.64376 L 831.27557,689.23374 L 831.27557,692.07513 C 831.27557,693.6379 832.11764,696.2974 833.14683,697.98515 C 834.89311,700.84882 835.01834,703.73969 835.02183,741.26859 C 835.02552,780.90315 834.99573,781.49937 832.95749,782.59021 C 830.95519,783.6618 830.94524,783.78221 832.64472,786.37539 C 835.0069,789.97976 835.04731,800.34545 832.71307,803.90795 C 830.59776,807.13633 830.60343,807.21012 833.01552,807.84089 C 834.96123,808.34971 835.01125,809.3916 835.26552,854.70752 L 835.52557,901.05377 L 859.02557,901.19343 L 882.52557,901.3331 L 882.52557,905.19343 C 882.52557,910.21153 886.85581,914.90444 892.52974,916.03548 C 901.32344,917.78843 903.87995,917.96001 908.52557,917.10905 C 910.17557,916.80682 913.21307,916.284 915.27557,915.94724 C 917.33807,915.61049 919.02557,914.90882 919.02557,914.38799 C 919.02557,913.86716 920.41913,912.16821 922.12237,910.61254 C 924.82094,908.14778 925.06979,907.50491 924.05752,905.61347 C 921.76528,901.33038 922.47136,901.20047 946.64893,901.45682 C 965.69299,901.65875 969.86505,901.45211 970.85622,900.25783 C 971.73604,899.19771 971.95664,892.47893 971.68769,874.93432 C 971.48634,861.80002 971.06472,849.25804 970.75075,847.06325 C 970.43679,844.86847 970.5954,842.5721 971.10322,841.96021 C 971.61104,841.34832 971.9198,838.19405 971.78935,834.95073 C 971.6589,831.7074 971.65869,824.39914 971.78887,818.71015 C 972.00392,809.31273 972.20852,808.31869 974.02557,807.84352 C 976.44582,807.21061 976.4523,807.13468 974.3589,803.93975 C 973.28379,802.29891 972.69224,799.32248 972.69224,795.55377 C 972.69224,791.78506 973.28379,788.80863 974.3589,787.16779 C 976.52581,783.86068 976.46056,782.90078 974.02557,782.26402 C 972.06701,781.75184 972.02557,780.90001 972.02557,741.14739 C 972.02557,718.8209 972.40334,700.55377 972.86505,700.55377 C 974.07425,700.55377 976.34132,695.52482 976.58419,692.30377 C 976.88074,688.37066 975.55453,688.90709 973.19591,693.67427 L 971.15725,697.79477 L 943.86756,697.61709 C 928.85824,697.51937 916.34111,697.19095 916.05172,696.88728 C 915.76234,696.58361 916.53807,695.65445 917.77557,694.82249 C 919.01307,693.99052 920.02557,692.70498 920.02557,691.96573 C 920.02557,691.22647 920.80088,688.99579 921.74848,687.00865 C 923.37902,683.58937 923.37902,683.23474 921.74848,680.39368 C 920.80088,678.74259 920.02557,676.58305 920.02557,675.5947 C 920.02557,674.60636 919.01307,673.09143 917.77557,672.22819 C 915.70008,670.78041 917.30949,670.6446 938.52557,670.47718 C 951.17557,670.37735 963.58269,670.38918 966.09695,670.50346 C 968.61121,670.61774 973.0189,669.94241 975.89181,669.00273 C 981.97825,667.01196 989.19113,667.57698 992.91702,670.33639 C 995.99195,672.61371 996.54923,677.26954 994.14231,680.57311 C 993.13276,681.95875 991.98817,684.09625 991.59878,685.32311 C 991.20939,686.54997 990.47112,687.55377 989.95818,687.55377 C 988.70034,687.55377 988.76219,696.27296 990.02557,697.05377 C 992.17513,698.38227 991.04943,700.63207 988.38046,700.34162 C 985.42462,700.01995 983.95741,702.20665 986.47966,703.17453 C 987.39236,703.52476 988.95996,703.01813 990.06895,702.01451 C 991.15183,701.03452 992.37257,700.56773 992.7817,700.9772 C 993.68697,701.88325 994.0589,748.77045 993.31158,767.77662 C 992.82922,780.04434 992.57337,781.56252 990.89879,782.09401 C 988.59871,782.82403 988.512,784.84033 990.64095,788.08953 C 992.86234,791.47978 992.73175,799.54971 990.3914,803.51161 C 988.53234,806.65875 988.53388,806.67428 990.87945,808.44355 L 993.23243,810.21841 L 993.09316,856.60482 C 993.01655,882.11734 992.6954,904.02108 992.37949,905.27978 C 992.06357,906.53849 992.45067,908.57756 993.23971,909.81106 C 994.94956,912.48405 994.95738,916.29528 993.25866,919.05377 C 992.04152,921.03025 992.00939,921.03094 990.52631,919.11264 C 989.7009,918.04502 989.02557,915.70908 989.02557,913.92166 C 989.02557,908.04867 985.92453,908.92619 984.58944,915.17698 C 984.09043,917.51328 984.31329,918.4502 985.47396,918.89559 C 988.48448,920.05084 986.97178,921.26806 982.52557,921.26806 C 978.12805,921.26806 976.2514,919.44856 979.40196,918.23958 C 981.72914,917.34655 979.48722,909.55377 976.90313,909.55377 C 976.42047,909.55377 976.02557,910.92612 976.02557,912.60343 C 976.02557,916.57906 973.43792,921.51228 971.24989,921.70804 C 970.30151,921.79289 955.35057,921.94153 938.02557,922.03836 C 920.70057,922.13518 905.40057,922.52641 904.02557,922.90776 C 902.65057,923.2891 900.90799,923.19237 900.15318,922.69278 z M 980.52557,701.55377 C 980.52557,700.55632 979.70868,700.14475 978.08734,700.32533 C 975.11542,700.65633 974.61838,701.08591 975.51979,702.54443 C 976.50844,704.14409 980.52557,703.34909 980.52557,701.55377 z M 822.48287,701.62287 C 822.7993,701.11087 822.59683,700.40683 822.03293,700.05832 C 820.60732,699.17724 816.86839,700.49043 817.57007,701.62577 C 818.31356,702.82877 821.73883,702.82675 822.48287,701.62287 z M 831.77557,701.30377 C 831.5464,700.61627 830.5339,700.05377 829.52557,700.05377 C 828.51724,700.05377 827.50474,700.61627 827.27557,701.30377 C 827.01168,702.09544 827.83668,702.55377 829.52557,702.55377 C 831.21446,702.55377 832.03946,702.09544 831.77557,701.30377 z M 937.21861,876.37406 C 936.28744,876.00021 940.10127,875.66271 945.69378,875.62406 C 951.2863,875.5854 956.5738,875.28063 957.44378,874.94678 C 958.31377,874.61294 959.02557,874.80805 959.02557,875.38037 C 959.02557,876.57296 939.88634,877.44509 937.21861,876.37406 z M 921.02557,875.55377 C 921.02557,875.00377 921.47557,874.55377 922.02557,874.55377 C 922.57557,874.55377 923.02557,875.00377 923.02557,875.55377 C 923.02557,876.10377 922.57557,876.55377 922.02557,876.55377 C 921.47557,876.55377 921.02557,876.10377 921.02557,875.55377 z M 925.02557,875.55377 C 925.02557,875.00377 925.47557,874.55377 926.02557,874.55377 C 926.57557,874.55377 927.02557,875.00377 927.02557,875.55377 C 927.02557,876.10377 926.57557,876.55377 926.02557,876.55377 C 925.47557,876.55377 925.02557,876.10377 925.02557,875.55377 z M 852.77557,835.89149 C 853.46307,835.61408 854.58807,835.61408 855.27557,835.89149 C 855.96307,836.1689 855.40057,836.39588 854.02557,836.39588 C 852.65057,836.39588 852.08807,836.1689 852.77557,835.89149 z M 843.83807,820.87066 C 844.55994,820.58179 845.42245,820.61731 845.75474,820.9496 C 846.08703,821.2819 845.4964,821.51824 844.44224,821.47482 C 843.27729,821.42684 843.04034,821.18988 843.83807,820.87066 z M 848.02557,820.55377 C 848.02557,820.00377 848.67401,819.55377 849.46655,819.55377 C 850.25909,819.55377 851.18565,820.00377 851.52557,820.55377 C 851.86549,821.10377 851.21705,821.55377 850.08459,821.55377 C 848.95213,821.55377 848.02557,821.10377 848.02557,820.55377 z M 875.82557,820.35377 C 876.7589,819.42044 877.29224,819.42044 878.22557,820.35377 C 879.1589,821.2871 878.89224,821.55377 877.02557,821.55377 C 875.1589,821.55377 874.89224,821.2871 875.82557,820.35377 z M 860.77557,814.88578 C 859.81307,814.62252 859.02557,813.99012 859.02557,813.48045 C 859.02557,812.22524 870.74699,812.294 871.52557,813.55377 C 871.88097,814.12882 870.94992,814.55957 869.33459,814.56742 C 867.78963,814.57493 865.62557,814.75734 864.52557,814.97276 C 863.42557,815.18819 861.73807,815.14905 860.77557,814.88578 z M 842.02557,813.55377 C 842.02557,813.00377 843.82557,812.55377 846.02557,812.55377 C 848.22557,812.55377 850.02557,813.00377 850.02557,813.55377 C 850.02557,814.10377 848.22557,814.55377 846.02557,814.55377 C 843.82557,814.55377 842.02557,814.10377 842.02557,813.55377 z M 858.59553,807.66696 C 858.29174,807.17542 862.0541,806.79539 867.03651,806.81435 C 871.98049,806.83316 876.02557,807.23222 876.02557,807.70116 C 876.02557,808.83651 859.29806,808.80369 858.59553,807.66696 z M 920.02557,807.55377 C 920.02557,807.00377 920.70057,806.55377 921.52557,806.55377 C 922.35057,806.55377 923.02557,807.00377 923.02557,807.55377 C 923.02557,808.10377 922.35057,808.55377 921.52557,808.55377 C 920.70057,808.55377 920.02557,808.10377 920.02557,807.55377 z M 928.52557,807.55377 C 926.61721,806.73372 926.62867,806.69112 928.77557,806.62406 C 930.01307,806.5854 931.02557,807.00377 931.02557,807.55377 C 931.02557,808.10377 930.91307,808.52214 930.77557,808.48348 C 930.63807,808.44483 929.62557,808.02646 928.52557,807.55377 z M 850.77557,806.89149 C 851.46307,806.61408 852.58807,806.61408 853.27557,806.89149 C 853.96307,807.1689 853.40057,807.39588 852.02557,807.39588 C 850.65057,807.39588 850.08807,807.1689 850.77557,806.89149 z M 843.52557,802.55377 C 843.17366,801.98437 844.03486,801.55377 845.52557,801.55377 C 847.01628,801.55377 847.87748,801.98437 847.52557,802.55377 C 847.18565,803.10377 846.28565,803.55377 845.52557,803.55377 C 844.76549,803.55377 843.86549,803.10377 843.52557,802.55377 z M 853.52557,802.55377 C 853.12709,801.90902 857.03486,801.55377 864.52557,801.55377 C 872.01628,801.55377 875.92405,801.90902 875.52557,802.55377 C 875.17776,803.11654 870.36819,803.55377 864.52557,803.55377 C 858.68295,803.55377 853.87338,803.11654 853.52557,802.55377 z M 899.73469,786.44465 C 901.77322,784.40613 911.02557,784.59112 911.02557,786.6704 C 911.02557,787.15625 908.23557,787.55377 904.82557,787.55377 C 900.28559,787.55377 898.92253,787.25681 899.73469,786.44465 z M 849.2946,780.86078 C 850.26757,780.60724 851.61757,780.62391 852.2946,780.89783 C 852.97163,781.17176 852.17557,781.3792 850.52557,781.35882 C 848.87557,781.33844 848.32163,781.11432 849.2946,780.86078 z M 867.83807,780.87066 C 868.55994,780.58179 869.42245,780.61731 869.75474,780.9496 C 870.08703,781.2819 869.4964,781.51824 868.44224,781.47482 C 867.27729,781.42684 867.04034,781.18988 867.83807,780.87066 z M 903.52557,778.55377 C 903.18565,778.00377 903.38409,777.55377 903.96655,777.55377 C 904.54901,777.55377 905.02557,778.00377 905.02557,778.55377 C 905.02557,779.10377 904.82713,779.55377 904.58459,779.55377 C 904.34205,779.55377 903.86549,779.10377 903.52557,778.55377 z M 937.52557,778.55377 C 937.14339,777.9354 938.74278,777.59181 941.71655,777.65345 C 945.61871,777.73433 946.05413,777.90411 944.02557,778.55377 C 940.4391,779.70236 938.23544,779.70236 937.52557,778.55377 z M 878.77557,777.89149 C 879.46307,777.61408 880.58807,777.61408 881.27557,777.89149 C 881.96307,778.1689 881.40057,778.39588 880.02557,778.39588 C 878.65057,778.39588 878.08807,778.1689 878.77557,777.89149 z M 849.52557,766.55377 C 850.30668,765.28991 853.06989,765.28991 855.02557,766.55377 C 856.13905,767.27336 855.54407,767.52709 852.71655,767.53846 C 850.42858,767.54766 849.15433,767.15444 849.52557,766.55377 z M 867.77557,766.89149 C 868.46307,766.61408 869.58807,766.61408 870.27557,766.89149 C 870.96307,767.1689 870.40057,767.39588 869.02557,767.39588 C 867.65057,767.39588 867.08807,767.1689 867.77557,766.89149 z M 931.2946,762.86078 C 932.26757,762.60724 933.61757,762.62391 934.2946,762.89783 C 934.97163,763.17176 934.17557,763.3792 932.52557,763.35882 C 930.87557,763.33844 930.32163,763.11432 931.2946,762.86078 z M 945.83807,762.87066 C 946.55995,762.58178 947.42244,762.61731 947.75474,762.9496 C 948.08703,763.28189 947.4964,763.51824 946.44224,763.47482 C 945.27729,763.42684 945.04034,763.18988 945.83807,762.87066 z M 874.02557,749.55377 C 874.02557,749.00377 874.67401,748.55377 875.46655,748.55377 C 876.25909,748.55377 877.18565,749.00377 877.52557,749.55377 C 877.86549,750.10377 877.21705,750.55377 876.08459,750.55377 C 874.95213,750.55377 874.02557,750.10377 874.02557,749.55377 z M 882.2946,749.86078 C 883.26757,749.60724 884.61757,749.62391 885.2946,749.89783 C 885.97163,750.17176 885.17557,750.3792 883.52557,750.35882 C 881.87557,750.33844 881.32163,750.11432 882.2946,749.86078 z M 930.83807,749.87066 C 931.55995,749.58178 932.42244,749.61731 932.75474,749.9496 C 933.08703,750.28189 932.4964,750.51824 931.44224,750.47482 C 930.27729,750.42684 930.04034,750.18988 930.83807,749.87066 z M 893.52557,741.55377 C 893.86549,741.00377 894.56705,740.55377 895.08459,740.55377 C 895.60213,740.55377 896.02557,741.00377 896.02557,741.55377 C 896.02557,742.10377 895.32401,742.55377 894.46655,742.55377 C 893.60909,742.55377 893.18565,742.10377 893.52557,741.55377 z M 906.02557,741.55377 C 906.02557,741.00377 906.70057,740.55377 907.52557,740.55377 C 908.35057,740.55377 909.02557,741.00377 909.02557,741.55377 C 909.02557,742.10377 908.35057,742.55377 907.52557,742.55377 C 906.70057,742.55377 906.02557,742.10377 906.02557,741.55377 z M 926.83807,741.87066 C 927.55995,741.58178 928.42244,741.61731 928.75474,741.9496 C 929.08703,742.28189 928.4964,742.51824 927.44224,742.47482 C 926.27729,742.42684 926.04034,742.18988 926.83807,741.87066 z M 936.2946,740.86078 C 937.26757,740.60724 938.61757,740.62391 939.2946,740.89783 C 939.97163,741.17176 939.17557,741.3792 937.52557,741.35882 C 935.87557,741.33844 935.32163,741.11432 936.2946,740.86078 z M 848.02557,730.55377 C 848.02557,730.00377 849.37557,729.55377 851.02557,729.55377 C 852.67557,729.55377 854.02557,730.00377 854.02557,730.55377 C 854.02557,731.10377 852.67557,731.55377 851.02557,731.55377 C 849.37557,731.55377 848.02557,731.10377 848.02557,730.55377 z M 946.26074,730.88924 C 945.01508,730.62609 944.25414,729.99295 944.56976,729.48228 C 945.34438,728.22891 958.74636,728.29297 959.52557,729.55377 C 959.86889,730.10927 959.11724,730.55866 957.83459,730.56478 C 956.56463,730.57083 953.95057,730.75396 952.02557,730.97174 C 950.10057,731.18952 947.5064,731.1524 946.26074,730.88924 z M 888.02557,718.67213 L 884.52557,718.05377 L 884.52557,712.55377 L 884.52557,707.05377 L 888.34536,706.73924 C 890.48127,706.56337 892.86731,707.0042 893.75798,707.73924 C 895.01438,708.77612 895.43968,708.78975 895.77153,707.80377 C 896.24984,706.38263 900.84081,706.15051 902.88258,707.44424 C 903.73153,707.98215 903.98816,709.09628 903.56804,710.41998 C 903.19868,711.58372 903.26302,713.1024 903.71102,713.79482 C 904.2306,714.59786 904.70664,713.60524 905.02557,711.05377 C 905.52557,707.05377 905.52557,707.05377 910.02557,707.05377 C 914.50373,707.05377 914.52708,707.07197 914.83594,710.80377 C 915.14191,714.50068 916.26602,715.59176 917.57942,713.46664 C 917.94896,712.86871 917.75051,711.87871 917.13844,711.26664 C 915.29382,709.42202 915.87683,707.62921 918.53856,706.96115 C 921.84548,706.13117 923.99038,708.02311 924.16748,711.92621 C 924.29453,714.72642 924.37303,714.6351 924.91748,711.05377 C 925.52314,707.06978 925.54359,707.05377 930.02557,707.05377 L 934.52557,707.05377 L 934.83307,711.30377 C 935.19701,716.33392 937.02557,717.06154 937.02557,712.17621 C 937.02557,708.11303 938.92351,706.29676 942.7151,706.73151 C 945.416,707.04121 945.52557,707.26819 945.52557,712.55377 L 945.52557,718.05377 L 936.03841,718.22939 C 930.82048,718.32598 926.01824,717.96265 925.36677,717.42198 C 924.57816,716.76749 923.51245,716.85727 922.17802,717.69063 C 920.63333,718.65531 919.59171,718.67712 917.63537,717.78575 C 916.10355,717.08781 914.86737,717.00073 914.51792,717.56615 C 914.19943,718.08147 909.68315,718.40201 904.48175,718.27844 C 899.28034,718.15487 895.02486,718.39127 895.02511,718.80377 C 895.02562,719.63318 893.27935,719.60033 888.02557,718.67213 z M 896.02557,712.55377 C 896.02557,710.90377 895.57557,709.55377 895.02557,709.55377 C 894.47557,709.55377 894.02557,710.90377 894.02557,712.55377 C 894.02557,714.20377 894.47557,715.55377 895.02557,715.55377 C 895.57557,715.55377 896.02557,714.20377 896.02557,712.55377 z M 862.39094,717.33593 C 862.08403,716.83935 862.31336,715.22272 862.90056,713.74341 C 863.48776,712.26411 863.8686,710.15377 863.74688,709.05377 C 863.55837,707.35022 864.11847,707.05377 867.52557,707.05377 L 871.52557,707.05377 L 871.52557,712.55377 L 871.52557,718.05377 L 867.23726,718.14629 C 864.87869,718.19717 862.69784,717.83251 862.39094,717.33593 z M 873.45333,717.22612 C 873.14867,716.43217 873.04028,713.8186 873.21248,711.41817 L 873.52557,707.05377 L 878.02557,707.05377 L 882.52557,707.05377 L 882.52557,712.55377 L 882.52557,718.05377 L 878.26642,718.36172 C 875.26066,718.57904 873.84426,718.24485 873.45333,717.22612 z M 899.22022,694.41863 C 896.32701,693.09227 895.02557,691.87323 895.02557,690.48953 C 895.02557,689.38616 894.30012,687.37622 893.41345,686.023 C 890.20038,681.11922 893.92244,673.55377 899.54808,673.55377 C 900.6907,673.55377 902.11252,673.06682 902.70767,672.47167 C 903.44501,671.73433 904.3849,671.70775 905.65767,672.38825 C 906.68502,672.93753 908.99379,673.93144 910.78829,674.59694 C 914.39204,675.93342 915.67294,678.8825 914.57802,683.32225 C 914.20751,684.82458 913.65787,687.2756 913.35658,688.76895 C 912.85653,691.2475 909.49545,694.04727 904.97022,695.75474 C 904.11478,696.07752 901.52728,695.47627 899.22022,694.41863 z M 901.52121,668.54671 C 900.76649,667.32555 903.50997,666.11708 904.97768,667.02417 C 905.55402,667.38037 906.02557,668.09525 906.02557,668.61279 C 906.02557,669.87393 902.30777,669.81939 901.52121,668.54671 z " />
-      <path
-         id="path4201"
-         style="fill:#d9b6a7"
-         d="M 891.52557,921.4949 C 886.02557,921.04221 870.99197,920.71013 858.11756,920.75695 C 831.67968,920.8531 832.03147,920.95614 832.01925,913.11264 C 832.01382,909.63005 831.57637,908.8053 828.93821,907.30377 C 824.94173,905.02914 823.56294,905.0966 819.98508,907.74183 C 817.76813,909.38089 817.02557,910.74036 817.02557,913.16004 C 817.02557,918.11524 816.15361,919.69266 814.03984,918.5614 C 812.03696,917.4895 811.9235,911.42113 813.89405,910.76428 C 814.71611,910.49026 815.02557,896.60829 815.02557,860.00562 C 815.02557,810.64759 815.0662,809.60239 817.02557,808.55377 C 819.46021,807.25079 819.55601,805.79739 817.36672,803.37825 C 814.71223,800.44506 814.96742,790.47628 817.79489,786.65191 L 820.04294,783.61126 L 817.53426,781.9675 L 815.02557,780.32375 L 815.02557,741.5747 L 815.02557,702.82565 L 818.77557,702.93971 C 821.89692,703.03465 822.52557,702.71849 822.52557,701.05377 C 822.52557,699.62284 821.88537,699.07636 820.27557,699.13317 C 818.08156,699.2106 817.15881,697.20749 818.89436,696.13486 C 820.11355,695.38136 819.54126,687.66946 818.16395,686.29215 C 817.53784,685.66604 817.02557,684.52103 817.02557,683.74769 C 817.02557,682.97435 815.91507,681.46809 814.5578,680.40046 C 810.9166,677.53629 811.29108,671.98495 815.26409,669.93043 C 819.50975,667.73491 827.68823,667.37852 831.94338,669.2036 C 835.89051,670.89657 848.9025,671.99151 860.02557,671.56667 C 861.12557,671.52465 863.48807,671.50928 865.27557,671.5325 C 867.06307,671.55572 870.4944,671.56166 872.90074,671.54569 C 875.30709,671.52972 877.91366,672.04593 878.69313,672.69283 C 879.76657,673.58371 880.39113,673.58821 881.26795,672.71139 C 881.90464,672.0747 883.44932,671.55377 884.70057,671.55377 C 886.7273,671.55377 886.90815,671.90844 886.35775,674.80377 C 886.01795,676.59127 885.20866,679.17877 884.55934,680.55377 C 883.32971,683.15759 883.57284,686.3732 885.12264,688.00377 C 885.61925,688.52627 886.02557,690.18345 886.02557,691.68638 C 886.02557,693.61135 886.69058,694.66058 888.27557,695.23638 C 890.99186,696.22316 864.90633,697.19631 847.8501,696.74449 L 836.17464,696.4352 L 834.3501,691.99824 C 833.34661,689.5579 831.96307,687.55958 831.27557,687.55752 C 829.69545,687.55278 829.58274,694.71093 831.13844,696.26664 C 832.48213,697.61033 831.45122,699.64567 829.74355,699.0206 C 827.80957,698.3127 825.89665,700.05424 826.59869,701.88372 C 827.29444,703.69681 831.52364,704.17493 832.52557,702.55377 C 834.6718,699.0811 835.02557,704.53269 835.02557,741.07852 L 835.02557,780.60327 L 832.52557,781.55377 C 829.58188,782.67296 829.36897,784.17076 831.77557,786.83002 C 834.31797,789.63934 834.25156,801.54159 831.67761,804.38577 C 829.76235,806.5021 830.15614,808.55377 832.4776,808.55377 C 833.2113,808.55377 834.08474,809.26557 834.41858,810.13556 C 834.75243,811.00554 835.02557,831.8824 835.02557,856.52857 C 835.02557,898.27899 835.1451,901.38646 836.77557,902.02299 C 837.73807,902.39875 848.2955,902.57932 860.23653,902.42427 C 872.17756,902.26922 882.22652,902.42139 882.56755,902.76242 C 882.90858,903.10345 882.64057,904.40464 881.97196,905.65394 C 880.90785,907.64225 881.07068,908.19582 883.27817,910.09463 C 884.6652,911.2877 886.28131,913.16311 886.86953,914.26221 C 887.68031,915.77717 889.70327,916.53918 895.2323,917.41231 C 904.27783,918.84076 903.25714,918.84627 911.07524,917.32676 C 916.46363,916.27947 918.29854,915.37724 921.42421,912.23813 C 924.69288,908.9554 925.14005,907.97773 924.6259,905.23813 L 924.02827,902.05377 L 944.56915,902.40714 C 955.86663,902.60149 966.6955,902.46307 968.6333,902.09954 L 972.15658,901.43857 L 972.01793,872.24617 C 971.75895,817.71954 971.92227,809.5218 973.27557,809.11832 C 973.96307,808.91334 975.42557,808.4095 976.52557,807.99866 C 982.65488,805.70944 984.65095,805.80051 989.35988,808.58417 L 993.19418,810.85081 L 992.89797,862.7623 C 992.64343,907.36923 992.80677,914.80051 994.05879,915.5743 C 995.28438,916.33176 995.19991,916.7058 993.52703,917.92904 C 990.97987,919.79157 990.06154,918.48228 990.04088,912.95876 C 990.02328,908.2501 988.03583,905.90582 983.25002,904.94866 C 980.61231,904.42112 979.59813,904.82736 976.95542,907.47007 C 974.51084,909.91465 973.92102,911.22654 974.32244,913.32642 C 974.84482,916.05909 973.62034,919.473 971.66147,920.74529 C 971.07588,921.12563 957.08075,921.40995 940.56117,921.37711 C 924.04159,921.34428 908.50057,921.54254 906.02557,921.8177 C 903.55057,922.09286 897.02557,921.9476 891.52557,921.4949 z M 984.52557,897.55377 C 984.18565,897.00377 983.28565,896.55377 982.52557,896.55377 C 981.76549,896.55377 980.86549,897.00377 980.52557,897.55377 C 980.17366,898.12317 981.03486,898.55377 982.52557,898.55377 C 984.01628,898.55377 984.87748,898.12317 984.52557,897.55377 z M 823.02557,804.55377 C 823.02557,804.00377 822.57557,803.55377 822.02557,803.55377 C 821.47557,803.55377 821.02557,804.00377 821.02557,804.55377 C 821.02557,805.10377 821.47557,805.55377 822.02557,805.55377 C 822.57557,805.55377 823.02557,805.10377 823.02557,804.55377 z M 828.02557,804.55377 C 828.02557,804.00377 827.57557,803.55377 827.02557,803.55377 C 826.47557,803.55377 826.02557,804.00377 826.02557,804.55377 C 826.02557,805.10377 826.47557,805.55377 827.02557,805.55377 C 827.57557,805.55377 828.02557,805.10377 828.02557,804.55377 z M 823.02557,786.05377 C 823.02557,785.22877 822.57557,784.55377 822.02557,784.55377 C 821.47557,784.55377 821.02557,785.22877 821.02557,786.05377 C 821.02557,786.87877 821.47557,787.55377 822.02557,787.55377 C 822.57557,787.55377 823.02557,786.87877 823.02557,786.05377 z M 828.02557,785.55377 C 828.02557,785.00377 827.57557,784.55377 827.02557,784.55377 C 826.47557,784.55377 826.02557,785.00377 826.02557,785.55377 C 826.02557,786.10377 826.47557,786.55377 827.02557,786.55377 C 827.57557,786.55377 828.02557,786.10377 828.02557,785.55377 z M 871.75474,693.9496 C 871.42245,693.61731 870.55994,693.58178 869.83807,693.87066 C 869.04034,694.18988 869.27729,694.42684 870.44224,694.47482 C 871.4964,694.51824 872.08703,694.28189 871.75474,693.9496 z M 881.02557,693.55377 C 881.02557,693.00377 880.37713,692.55377 879.58459,692.55377 C 878.79205,692.55377 877.86549,693.00377 877.52557,693.55377 C 877.18565,694.10377 877.83409,694.55377 878.96655,694.55377 C 880.09901,694.55377 881.02557,694.10377 881.02557,693.55377 z M 827.80306,682.99707 C 831.71149,680.2595 829.61487,674.55377 824.70051,674.55377 C 820.42048,674.55377 818.1819,681.38055 821.77557,683.47367 C 824.19062,684.88031 825.23191,684.79797 827.80306,682.99707 z M 821.48237,909.48386 C 821.16621,908.97231 822.58409,908.55377 824.63322,908.55377 C 826.68235,908.55377 828.05962,908.85305 827.69384,909.21884 C 826.61265,910.30002 822.10563,910.49232 821.48237,909.48386 z M 843.49858,813.59744 C 843.82365,813.07146 844.75021,812.89461 845.55759,813.20443 C 847.62471,813.99766 847.38112,814.55377 844.96655,814.55377 C 843.83409,814.55377 843.1735,814.12342 843.49858,813.59744 z M 861.77557,813.89149 C 862.46307,813.61408 863.58807,813.61408 864.27557,813.89149 C 864.96307,814.1689 864.40057,814.39588 863.02557,814.39588 C 861.65057,814.39588 861.08807,814.1689 861.77557,813.89149 z M 986.67374,804.07929 C 985.97085,802.2476 977.02557,801.87388 977.02557,803.67621 C 977.02557,804.43646 976.52626,804.38427 975.47824,803.51449 C 974.24106,802.48772 974.19094,802.06229 975.22824,801.39204 C 976.27594,800.71507 976.25298,800.37828 975.1089,799.64175 C 973.04579,798.31356 973.30257,792.53788 975.47888,791.31996 C 976.91881,790.51413 977.00129,790.1568 975.90391,789.47858 C 974.79578,788.79372 974.78119,788.39815 975.82557,787.35377 C 976.73615,786.44319 977.31458,786.39044 977.81721,787.17215 C 978.77298,788.65859 985.94389,788.30397 986.92165,786.72191 C 987.53567,785.72841 987.96022,785.7701 988.9124,786.91741 C 989.85257,788.05024 989.85485,788.54124 988.92264,789.11739 C 988.03211,789.66776 988.12307,790.15189 989.27531,790.99443 C 991.79303,792.83544 991.98946,799.55377 989.52557,799.55377 C 987.78022,799.55377 987.58025,800.70845 989.06795,802.19615 C 989.79113,802.91933 989.67378,803.60084 988.68473,804.42168 C 987.56397,805.35183 987.13396,805.27862 986.67374,804.07929 z M 981.00542,784.48326 C 980.1915,784.06358 977.78613,782.962 975.66015,782.0353 L 971.79473,780.3504 L 972.07499,742.70208 C 972.22913,721.99551 972.5339,704.27413 972.75225,703.32124 C 973.11267,701.74836 973.36095,701.72741 975.44651,703.09392 C 977.93212,704.72256 980.54863,704.23903 981.41101,701.99171 C 982.01394,700.42051 978.54281,698.11607 977.0049,699.06654 C 976.46627,699.39944 976.02557,698.97025 976.02557,698.11279 C 976.02557,697.25533 976.43807,696.55377 976.94224,696.55377 C 977.4464,696.55377 977.8589,694.54647 977.8589,692.09312 C 977.8589,686.36521 978.4301,685.55377 982.46214,685.55377 C 984.28734,685.55377 986.33677,684.88373 987.01643,684.06478 C 987.6961,683.24584 988.6512,682.82239 989.13888,683.1238 C 990.4803,683.95284 990.20053,686.55377 988.76993,686.55377 C 987.10109,686.55377 987.2849,694.95638 988.99892,697.02165 C 989.69826,697.86432 990.10286,698.59127 989.89801,698.6371 C 989.69317,698.68294 988.51329,698.83272 987.27606,698.96995 C 984.38513,699.29061 983.63236,700.08669 984.37935,702.03332 C 985.23609,704.26595 987.97847,705.06428 990.14447,703.71159 C 991.16415,703.07479 992.22954,702.55377 992.512,702.55377 C 992.79446,702.55377 993.02557,720.11789 993.02557,741.58515 C 993.02557,777.85481 992.90175,780.66045 991.27557,781.23715 C 990.31307,781.57849 988.85057,782.40091 988.02557,783.06474 C 985.93455,784.74727 982.76106,785.38853 981.00542,784.48326 z M 946.52557,729.55377 C 946.86549,729.00377 948.44049,728.55377 950.02557,728.55377 C 951.61065,728.55377 953.18565,729.00377 953.52557,729.55377 C 953.89938,730.1586 952.51628,730.55377 950.02557,730.55377 C 947.53486,730.55377 946.15176,730.1586 946.52557,729.55377 z M 888.52557,718.68599 C 885.63568,718.05805 885.52557,717.83262 885.52557,712.54395 L 885.52557,707.05377 L 888.90273,706.73093 C 890.76016,706.55336 892.63895,706.77836 893.07781,707.23093 C 893.51667,707.68349 894.00136,710.52657 894.1549,713.54889 C 894.45938,719.54218 894.076,719.89204 888.52557,718.68599 z M 865.19519,717.81593 C 862.52687,717.49475 862.00703,717.08097 862.58021,715.73442 C 862.97367,714.81006 863.57997,712.47877 863.92755,710.55377 C 864.48304,707.4772 864.92039,707.05377 867.54253,707.05377 C 870.48611,707.05377 870.52557,707.12543 870.52557,712.47044 C 870.52557,718.24497 870.33632,718.43476 865.19519,717.81593 z M 874.21452,717.69171 C 873.34672,717.14137 873.00863,715.20256 873.21452,711.95702 C 873.5157,707.20944 873.63082,707.04367 876.84089,706.73554 C 878.66432,706.56051 880.71941,706.88472 881.40776,707.45599 C 882.69194,708.52177 882.8208,715.45805 881.59331,717.44416 C 880.79254,718.73983 876.11471,718.89676 874.21452,717.69171 z M 896.69224,717.8871 C 895.60729,716.80216 895.93301,707.72901 897.0824,707.01864 C 897.66367,706.65941 899.17943,706.62655 900.45078,706.94564 C 902.35294,707.42305 902.8574,708.36943 903.29923,712.2893 C 903.64387,715.347 903.42244,717.31607 902.68086,717.78798 C 901.23019,718.71111 897.57672,718.77159 896.69224,717.8871 z M 906.27557,717.89149 C 904.92935,717.34828 904.46487,707.63901 905.77557,707.43975 C 910.26475,706.75727 912.60932,706.79335 913.53201,707.55912 C 914.76642,708.58358 914.86731,715.38279 913.67669,717.30925 C 912.91695,718.53854 908.70107,718.8702 906.27557,717.89149 z M 917.09256,717.13449 C 916.16592,716.01795 916.2707,715.51597 917.58378,714.78113 C 918.97053,714.00507 919.05147,713.47068 918.06223,711.62227 C 916.02252,707.81103 918.35158,705.20545 921.82737,707.41011 C 922.54336,707.86426 923.31464,710.10021 923.54133,712.3789 C 923.87046,715.6872 923.57104,716.72666 922.05528,717.53787 C 919.507,718.90167 918.49063,718.81906 917.09256,717.13449 z M 926.30879,717.35433 C 925.19157,715.96468 925.28039,709.56851 926.44304,707.68731 C 927.25586,706.37213 931.92076,706.20084 933.83662,707.41583 C 934.70442,707.96617 935.04251,709.90498 934.83662,713.15052 C 934.5298,717.9871 934.47682,718.05786 930.93998,718.35433 C 928.86348,718.5284 926.91432,718.10752 926.30879,717.35433 z M 937.53079,717.21928 C 937.32884,716.57825 937.24505,714.26429 937.34459,712.07716 C 937.49658,708.73764 937.95657,707.94908 940.21582,707.15513 C 944.33267,705.70837 945.74086,707.47732 945.0763,713.26084 C 944.54713,717.86617 944.39587,718.06025 941.21176,718.21928 C 939.38917,718.31031 937.73273,717.86032 937.53079,717.21928 z M 924.52557,696.60678 C 918.73795,696.2067 917.1478,695.82772 918.77557,695.23638 C 920.01307,694.78682 921.03212,693.66182 921.04012,692.73638 C 921.04813,691.81095 921.73951,689.08729 922.57653,686.68381 C 923.88348,682.93095 923.90208,682.01305 922.70824,680.18381 C 921.24276,677.93836 919.96555,671.61286 920.94876,671.4699 C 925.76053,670.77024 933.97541,671.17246 935.68301,672.19132 C 937.46387,673.25389 937.93207,673.23982 938.36534,672.11072 C 939.06695,670.28236 953.29376,670.70153 955.60371,672.61862 C 956.97415,673.75598 957.36363,673.70107 958.17204,672.25653 C 959.38067,670.09682 963.64001,670.04239 964.83148,672.17144 C 965.64522,673.6255 965.97892,673.63689 968.13117,672.28398 C 974.04814,668.56457 986.80887,667.83899 992.70274,670.88683 C 994.87564,672.01048 995.58339,673.08367 995.55857,675.21723 C 995.54042,676.77733 995.15642,678.05377 994.70523,678.05377 C 994.25404,678.05377 993.44418,678.84127 992.90554,679.80377 C 992.3669,680.76627 991.27355,681.55377 990.47588,681.55377 C 989.67821,681.55377 989.01126,680.76627 988.99377,679.80377 C 988.94991,677.39053 986.94957,674.98181 984.28771,674.13697 C 982.5054,673.57129 981.16596,674.3081 977.6179,677.80597 C 974.60024,680.78094 973.44178,682.60917 974.00099,683.514 C 974.50018,684.3217 975.54236,684.56944 976.65112,684.14397 C 978.17808,683.55802 978.11247,683.83237 976.25204,685.8127 C 975.02748,687.11618 974.02557,688.72227 974.02557,689.38179 C 974.02557,690.0413 973.60842,691.3623 973.09857,692.31734 C 972.58872,693.27238 971.93135,694.83213 971.63774,695.78347 C 971.15335,697.35302 969.31804,697.49681 951.81475,697.33648 C 941.2057,697.23931 928.92557,696.91094 924.52557,696.60678 z M 898.24455,693.36076 C 895.71688,691.79892 895.21509,691.03034 896.05912,690.01334 C 896.89008,689.0121 896.65603,688.42637 895.09014,687.58832 C 893.43185,686.70084 893.02557,685.51144 893.02557,681.54427 C 893.02557,677.03477 893.29462,676.466 896.1185,675.00571 C 897.81961,674.12604 899.46571,673.66057 899.77649,673.97136 C 900.08727,674.28214 900.9608,674.02249 901.71765,673.39436 C 902.71427,672.56724 903.70481,672.54817 905.30966,673.32524 C 906.52841,673.91535 908.77837,674.6706 910.30958,675.00356 C 914.18669,675.84664 915.82745,679.67665 914.10975,683.87426 C 913.39416,685.62299 912.84903,688.02523 912.89837,689.21258 C 912.96274,690.7618 911.8552,691.96187 908.97603,693.46258 C 904.10923,695.99929 902.48989,695.98393 898.24455,693.36076 z " />
-      <path
-         id="path4199"
-         style="fill:#d2a89a"
-         d="M 901.02557,921.55858 C 900.20057,921.02278 896.40457,920.5775 892.59002,920.56908 C 886.85168,920.55641 885.25369,920.17726 883.33273,918.37261 C 881.11952,916.29341 880.94947,916.27558 879.69486,917.99136 C 878.56335,919.53879 878.08481,919.60771 876.28335,918.48269 C 874.67574,917.47871 873.86025,917.44608 872.78013,918.34251 C 871.70524,919.23458 870.62179,919.22763 868.19893,918.3131 C 865.76472,917.39429 864.30463,917.38742 861.93042,918.28358 C 859.55222,919.18125 858.38697,919.17413 856.89991,918.25282 C 855.63541,917.46941 854.71514,917.40041 854.24506,918.05377 C 853.8479,918.60577 849.04693,919.05377 843.52863,919.05377 L 833.5317,919.05377 L 833.52863,913.88433 C 833.52458,907.03982 830.53861,903.55377 824.68,903.55377 C 822.35874,903.55377 819.91379,904.24994 818.84818,905.21431 C 817.839,906.1276 816.69535,906.55688 816.30673,906.16826 C 815.35191,905.21344 815.03993,812.14857 815.98642,810.61712 C 817.33154,808.44067 825.10004,807.3147 829.7632,808.6203 L 834.00576,809.80815 L 834.26567,855.92171 L 834.52557,902.03528 L 839.77557,902.8708 C 842.66307,903.33034 845.02557,904.12199 845.02557,904.63004 C 845.02557,905.13809 845.70057,905.55377 846.52557,905.55377 C 847.35057,905.55377 848.02557,905.10377 848.02557,904.55377 C 848.02557,903.98234 851.02557,903.55377 855.02557,903.55377 C 858.87557,903.55377 862.02557,903.95129 862.02557,904.43714 C 862.02557,905.99321 866.46433,906.60393 867.52557,905.19387 C 868.07557,904.46309 871.24148,903.5587 874.56093,903.1841 L 880.59629,902.50302 L 880.82049,905.7784 C 880.9636,907.86917 881.9454,909.79069 883.53513,911.09133 C 884.90487,912.212 886.02557,913.64794 886.02557,914.28232 C 886.02557,916.28931 887.77917,916.9297 896.02557,917.93418 C 897.40057,918.10167 899.57833,918.5777 900.86504,918.99202 C 902.25812,919.4406 906.30343,919.01748 910.86504,917.94608 C 917.09809,916.4821 919.15937,915.48596 921.92685,912.6003 C 923.79756,910.64971 925.61984,907.70377 925.97637,906.05377 C 926.61999,903.0751 926.6669,903.05635 932.57509,903.41638 C 935.84785,903.61582 938.75057,904.11767 939.02557,904.5316 C 939.30057,904.94554 940.54029,905.60089 941.7805,905.98794 C 943.37461,906.48544 944.21186,906.23188 944.63748,905.12272 C 945.09833,903.92178 946.75291,903.55377 951.69158,903.55377 C 955.51107,903.55377 957.90409,903.94131 957.55658,904.5036 C 956.77181,905.77338 960.49364,907.69512 962.35459,906.98101 C 963.16523,906.66994 964.04782,905.57669 964.31589,904.55159 C 964.66448,903.21857 965.90295,902.59747 968.66443,902.37076 L 972.52557,902.05377 L 972.5248,876.05377 C 972.52438,861.75377 972.45951,848.47877 972.38064,846.55377 C 972.30177,844.62877 972.43561,835.51627 972.67805,826.30377 L 973.11886,809.55377 L 981.32222,809.56908 C 985.83406,809.5775 990.08457,809.9394 990.76778,810.37329 C 991.73434,810.98712 991.95625,821.61693 991.76778,858.27508 C 991.63457,884.18718 991.19083,905.72252 990.7817,906.13141 C 990.37257,906.5403 989.24757,906.18804 988.2817,905.34861 C 986.10485,903.45674 982.10975,902.45749 979.47619,903.14618 C 976.28599,903.98044 972.52877,910.34864 972.50244,914.96617 C 972.48251,918.46042 972.106,919.15316 969.78272,919.97022 C 967.69676,920.70381 966.66517,920.53758 965.22711,919.23616 C 963.03891,917.25587 960.13129,917.09285 956.50101,918.74691 C 954.36512,919.72009 953.71681,919.674 952.98447,918.49691 C 952.23675,917.29511 951.73749,917.27018 949.99904,918.34787 C 948.33685,919.37828 947.23082,919.39584 944.57108,918.43407 C 941.92293,917.47648 940.58755,917.49256 938.12723,918.51166 C 935.64922,919.53809 934.72164,919.54642 933.52467,918.55302 C 932.37874,917.60199 931.69472,917.58346 930.62122,918.47438 C 929.81832,919.14073 928.09967,919.35949 926.60824,918.98516 C 925.05912,918.59636 923.3881,918.83793 922.49405,919.57993 C 921.61102,920.31278 917.79161,920.88106 913.25703,920.95429 C 909.00473,921.02297 904.85057,921.40622 904.02557,921.80596 C 903.20057,922.2057 901.85057,922.09438 901.02557,921.55858 z M 963.70267,912.95285 C 964.45117,911.0023 962.48423,909.62107 959.91487,910.29297 C 958.03782,910.78383 957.41623,912.61109 958.69224,913.8871 C 959.94639,915.14126 963.08766,914.55553 963.70267,912.95285 z M 848.19984,911.32803 C 847.64984,910.77803 846.66258,910.66008 846.00594,911.0659 C 845.09886,911.62651 845.12652,911.99813 846.12106,912.61279 C 847.827,913.66711 849.50305,912.63125 848.19984,911.32803 z M 868.02557,912.05377 C 868.02557,911.05377 867.02557,910.55377 865.02557,910.55377 C 863.02557,910.55377 862.02557,911.05377 862.02557,912.05377 C 862.02557,913.05377 863.02557,913.55377 865.02557,913.55377 C 867.02557,913.55377 868.02557,913.05377 868.02557,912.05377 z M 944.78178,911.80377 C 945.04938,910.98884 944.13961,910.55377 942.16792,910.55377 C 939.11657,910.55377 937.50129,911.69615 938.76533,912.9602 C 939.84978,914.04465 944.32865,913.18376 944.78178,911.80377 z M 952.52557,905.55377 C 952.18565,905.00377 951.48409,904.55377 950.96655,904.55377 C 950.44901,904.55377 950.02557,905.00377 950.02557,905.55377 C 950.02557,906.10377 950.72713,906.55377 951.58459,906.55377 C 952.44205,906.55377 952.86549,906.10377 952.52557,905.55377 z M 985.67557,897.55377 C 985.17093,895.03056 985.38946,894.55377 987.05057,894.55377 C 988.1979,894.55377 989.02557,893.88032 989.02557,892.94678 C 989.02557,891.86639 988.48665,891.5466 987.38095,891.97089 C 986.44422,892.33035 984.90244,891.84733 983.79896,890.84869 C 981.95194,889.17716 981.81532,889.17808 980.86936,890.86841 C 980.21756,892.03311 979.2164,892.43172 977.95135,892.03021 C 976.49735,891.56873 976.02557,891.89925 976.02557,893.37939 C 976.02557,894.45761 976.72909,895.60976 977.58895,895.93972 C 978.44881,896.26968 978.87225,896.99282 978.52994,897.54671 C 977.41139,899.35655 979.07546,900.55377 982.70959,900.55377 C 986.13846,900.55377 986.2525,900.43842 985.67557,897.55377 z M 828.02557,898.61279 C 828.02557,898.09525 827.57557,897.39369 827.02557,897.05377 C 826.47557,896.71385 826.02557,895.75697 826.02557,894.92737 C 826.02557,893.84444 826.62501,893.60925 828.1508,894.09352 C 829.58094,894.54742 830.05224,894.40593 829.59178,893.6609 C 829.21545,893.05198 828.30724,892.55377 827.57354,892.55377 C 826.83984,892.55377 825.96958,891.85025 825.63962,890.99039 C 824.79714,888.79493 823.02557,890.19331 823.02557,893.05377 C 823.02557,894.36385 822.57557,895.71385 822.02557,896.05377 C 819.64775,897.52335 821.09805,899.55377 824.52557,899.55377 C 826.45057,899.55377 828.02557,899.13033 828.02557,898.61279 z M 821.02557,893.55377 C 821.02557,893.00377 820.57557,892.55377 820.02557,892.55377 C 819.47557,892.55377 819.02557,893.00377 819.02557,893.55377 C 819.02557,894.10377 819.47557,894.55377 820.02557,894.55377 C 820.57557,894.55377 821.02557,894.10377 821.02557,893.55377 z M 983.55102,880.87099 C 982.85431,879.16035 982.76588,879.17107 982.04337,881.05377 C 981.11127,883.48257 981.86575,885.11359 983.27122,883.70812 C 983.83217,883.14717 983.95808,881.87046 983.55102,880.87099 z M 989.71856,880.8228 C 989.46502,879.84983 989.2409,880.40377 989.22052,882.05377 C 989.20014,883.70377 989.40758,884.49983 989.68151,883.8228 C 989.95543,883.14577 989.9721,881.79577 989.71856,880.8228 z M 982.70868,863.36627 C 982.38946,862.56854 982.1525,862.80549 982.10452,863.97044 C 982.0611,865.0246 982.29744,865.61523 982.62974,865.28294 C 982.96203,864.95064 982.99755,864.08815 982.70868,863.36627 z M 982.68785,824.30377 C 982.41044,823.61627 982.18346,824.17877 982.18346,825.55377 C 982.18346,826.92877 982.41044,827.49127 982.68785,826.80377 C 982.96526,826.11627 982.96526,824.99127 982.68785,824.30377 z M 812.62334,917.8182 C 811.41957,916.61444 812.07638,915.55377 814.02557,915.55377 C 815.12557,915.55377 816.02557,915.95563 816.02557,916.44678 C 816.02557,917.57082 813.42445,918.61932 812.62334,917.8182 z M 826.13074,799.80377 C 825.2591,798.26953 824.86133,798.22253 822.90447,799.42252 C 820.94478,800.62425 820.51091,800.57042 819.34899,798.98139 C 817.66093,796.67284 817.70789,793.55672 819.46568,791.23803 C 820.64243,789.6858 821.14212,789.60961 822.90892,790.71299 C 824.53977,791.73148 825.234,791.74534 826.20061,790.77873 C 828.0201,788.95924 828.65656,789.24868 830.00744,792.51 C 830.99184,794.88656 830.96776,796.06308 829.88465,798.51 C 828.34158,801.99604 827.53428,802.27427 826.13074,799.80377 z M 978.02557,796.22275 C 978.02557,795.49069 979.13523,794.29786 980.49148,793.57201 C 982.44261,792.5278 983.26524,792.50779 984.43204,793.47615 C 985.2431,794.14926 985.66029,795.3421 985.35914,796.12688 C 984.64381,797.99101 978.02557,798.07753 978.02557,796.22275 z M 822.02557,781.64017 C 815.01337,780.64555 814.84725,780.39363 815.46259,771.68743 C 815.76125,767.46188 816.06239,752.19742 816.1318,737.76639 C 816.20121,723.33536 816.65571,711.28236 817.14179,710.98194 C 817.62787,710.68153 818.02557,709.11229 818.02557,707.49475 C 818.02557,705.05944 818.43702,704.55377 820.41858,704.55377 C 821.73474,704.55377 823.09412,703.81752 823.43943,702.91765 C 824.01291,701.4232 824.23629,701.43449 826.01928,703.04808 C 827.39818,704.29596 828.86007,704.63687 830.99843,704.2092 L 834.02557,703.60377 L 834.02557,741.97036 L 834.02557,780.33695 L 831.61847,780.9411 C 830.29457,781.27338 828.60707,781.71022 827.86847,781.91185 C 827.12987,782.11349 824.50057,781.99123 822.02557,781.64017 z M 824.70868,726.36627 C 824.38946,725.56854 824.1525,725.80549 824.10452,726.97044 C 824.0611,728.0246 824.29745,728.61523 824.62974,728.28294 C 824.96203,727.95065 824.99756,727.08814 824.70868,726.36627 z M 826.02557,708.61279 C 826.02557,707.54525 825.57557,706.39369 825.02557,706.05377 C 824.45841,705.70325 824.02557,706.54339 824.02557,707.99475 C 824.02557,709.40221 824.47557,710.55377 825.02557,710.55377 C 825.57557,710.55377 826.02557,709.68033 826.02557,708.61279 z M 974.77557,780.86686 C 973.16465,780.44366 973.02557,778.3069 973.02557,753.98045 C 973.02557,737.02933 973.38413,727.55377 974.02557,727.55377 C 974.57557,727.55377 975.02557,728.22877 975.02557,729.05377 C 975.02557,729.87877 975.47557,730.55377 976.02557,730.55377 C 976.57557,730.55377 977.02557,729.18404 977.02557,727.50993 C 977.02557,725.16577 976.62331,724.53364 975.27557,724.75993 C 973.83834,725.00125 973.46975,724.17198 973.21328,720.12004 C 972.80121,713.61018 973.62074,710.46119 975.53576,711.19606 C 976.65851,711.62689 977.02557,711.00224 977.02557,708.66076 C 977.02557,706.6347 977.52257,705.55377 978.45414,705.55377 C 979.23986,705.55377 980.56116,704.87532 981.39038,704.0461 C 982.2196,703.21688 983.14916,702.94473 983.45607,703.44131 C 983.76298,703.9379 983.34167,704.60223 982.51983,704.9176 C 981.63813,705.25594 981.02557,706.76376 981.02557,708.59571 C 981.02557,711.01234 981.41341,711.62687 982.77557,711.36854 C 983.83105,711.16838 984.65115,709.94867 984.84199,708.29522 C 985.06525,706.36092 985.72771,705.55377 987.09199,705.55377 C 988.64605,705.55377 989.02557,706.26174 989.02557,709.16076 C 989.02557,711.95613 989.36309,712.63823 990.52557,712.19214 C 992.75041,711.33839 992.67028,722.36186 990.43978,723.99284 C 989.41496,724.74221 988.99478,726.1962 989.25197,728.10308 L 989.64994,731.05377 L 990.77437,728.55377 C 991.72239,726.44598 991.90874,727.34808 991.96218,734.30377 C 992.01231,740.82746 991.7258,742.55377 990.59296,742.55377 C 988.89298,742.55377 987.73041,745.62103 988.58565,747.84975 C 988.91864,748.7175 989.82885,749.18275 990.60833,748.88364 C 991.57129,748.51412 992.05713,749.0953 992.12402,750.69678 C 992.36321,756.42348 991.80716,780.09532 991.42434,780.48298 C 990.8195,781.09546 976.8701,781.4171 974.77557,780.86686 z M 975.68785,764.30377 C 975.41044,763.61627 975.18346,764.17877 975.18346,765.55377 C 975.18346,766.92877 975.41044,767.49127 975.68785,766.80377 C 975.96526,766.11627 975.96526,764.99127 975.68785,764.30377 z M 984.02557,764.49475 C 984.02557,762.40846 982.55442,761.88905 981.49597,763.60166 C 980.58888,765.06937 981.79735,767.81285 983.01851,767.05814 C 983.57239,766.71582 984.02557,765.56229 984.02557,764.49475 z M 991.02557,765.05377 C 991.02557,763.67877 990.57557,762.55377 990.02557,762.55377 C 989.47557,762.55377 989.02557,763.67877 989.02557,765.05377 C 989.02557,766.42877 989.47557,767.55377 990.02557,767.55377 C 990.57557,767.55377 991.02557,766.42877 991.02557,765.05377 z M 977.02557,745.99475 C 977.02557,744.65221 976.57557,743.55377 976.02557,743.55377 C 975.47557,743.55377 975.02557,744.93033 975.02557,746.61279 C 975.02557,748.39749 975.44215,749.41435 976.02557,749.05377 C 976.57557,748.71385 977.02557,747.33729 977.02557,745.99475 z M 984.02557,746.05377 C 984.02557,744.49821 983.4589,743.55377 982.52557,743.55377 C 981.59224,743.55377 981.02557,744.49821 981.02557,746.05377 C 981.02557,747.60933 981.59224,748.55377 982.52557,748.55377 C 983.4589,748.55377 984.02557,747.60933 984.02557,746.05377 z M 989.70868,736.36627 C 989.38946,735.56854 989.1525,735.80549 989.10452,736.97044 C 989.0611,738.0246 989.29744,738.61523 989.62974,738.28294 C 989.96203,737.95065 989.99755,737.08814 989.70868,736.36627 z M 984.02557,727.55377 C 984.02557,725.55377 983.52557,724.55377 982.52557,724.55377 C 981.52557,724.55377 981.02557,725.55377 981.02557,727.55377 C 981.02557,729.55377 981.52557,730.55377 982.52557,730.55377 C 983.52557,730.55377 984.02557,729.55377 984.02557,727.55377 z M 976.70868,717.36627 C 976.38946,716.56854 976.1525,716.80549 976.10452,717.97044 C 976.0611,719.0246 976.29744,719.61523 976.62974,719.28294 C 976.96203,718.95065 976.99755,718.08814 976.70868,717.36627 z M 891.02557,718.55377 C 890.20057,718.02061 888.51307,717.5775 887.27557,717.56908 C 885.24085,717.55524 885.02557,717.06988 885.02557,712.49627 L 885.02557,707.43877 L 889.27557,707.74627 L 893.52557,708.05377 L 893.82547,713.80377 C 894.1291,719.62517 893.73032,720.30171 891.02557,718.55377 z M 863.02557,715.90029 C 863.02557,715.22462 863.50192,714.37741 864.08412,714.01759 C 864.67554,713.65206 864.87341,712.13748 864.53251,710.58536 C 863.85632,707.50667 865.81318,706.0342 869.16645,707.09848 C 870.644,707.56744 871.02557,708.69006 871.02557,712.56817 L 871.02557,717.4478 L 867.02557,717.28829 C 864.61615,717.19221 863.02557,716.64028 863.02557,715.90029 z M 874.02557,712.55377 L 874.02557,707.55377 L 878.02557,707.55377 L 882.02557,707.55377 L 882.02557,712.55377 L 882.02557,717.55377 L 878.02557,717.55377 L 874.02557,717.55377 L 874.02557,712.55377 z M 896.59369,716.36764 C 896.36372,715.64501 896.25431,713.47877 896.35056,711.55377 C 896.50974,708.37044 896.797,708.05377 899.52557,708.05377 C 902.17042,708.05377 902.53719,708.40892 902.62373,711.05377 C 902.67772,712.70377 902.90272,714.72877 903.12373,715.55377 C 903.64963,717.51685 897.21465,718.31887 896.59369,716.36764 z M 905.92942,717.12429 C 905.69321,716.88807 905.66352,714.63807 905.86345,712.12429 L 906.22696,707.55377 L 910.12626,707.55377 L 914.02557,707.55377 L 914.02557,712.55377 L 914.02557,717.55377 L 910.19224,717.55377 C 908.0839,717.55377 906.16564,717.3605 905.92942,717.12429 z M 917.02557,716.1371 C 917.02557,715.35794 917.58807,714.51673 918.27557,714.26776 C 919.27557,713.90561 919.27557,713.39166 918.27557,711.69799 C 916.36266,708.45816 916.76375,707.39067 919.76373,707.73735 C 922.06701,708.00351 922.59694,708.64354 923.10036,711.76714 C 923.43521,713.84485 923.24221,715.93713 922.6622,716.51714 C 921.11767,718.06167 917.02557,717.78576 917.02557,716.1371 z M 926.02557,712.55377 L 926.02557,707.55377 L 930.02557,707.55377 L 934.02557,707.55377 L 934.02557,712.55377 L 934.02557,717.55377 L 930.02557,717.55377 L 926.02557,717.55377 L 926.02557,712.55377 z M 937.54515,712.9393 C 937.9763,707.64829 937.88281,707.81776 940.52557,707.5364 C 944.696,707.09238 945.02557,707.45984 945.02557,712.55377 L 945.02557,717.55377 L 941.09735,717.55377 L 937.16914,717.55377 L 937.54515,712.9393 z M 973.02557,705.05377 C 973.02557,704.22877 973.47557,703.55377 974.02557,703.55377 C 974.57557,703.55377 975.02557,704.22877 975.02557,705.05377 C 975.02557,705.87877 974.57557,706.55377 974.02557,706.55377 C 973.47557,706.55377 973.02557,705.87877 973.02557,705.05377 z M 822.48856,698.6014 C 820.79421,697.91468 820.51838,697.07496 820.84885,693.60961 C 821.22222,689.69453 821.35289,689.54002 823.01701,691.04602 C 824.61522,692.49239 824.93872,692.49776 826.33529,691.1012 C 828.58537,688.85111 829.33169,689.19794 828.59092,692.14942 C 828.22243,693.61761 828.43973,695.34788 829.0912,696.13285 C 830.00926,697.23905 829.70044,697.72689 827.56916,698.5372 C 826.09858,699.09631 824.81217,699.52525 824.71047,699.49038 C 824.60878,699.45552 823.60891,699.05548 822.48856,698.6014 z M 980.77557,698.86444 C 978.90086,698.37453 978.67384,697.63393 979.63256,695.13556 C 980.48784,692.90673 984.74342,693.15805 986.0031,695.51178 C 986.84486,697.08463 986.66801,697.67476 985.10402,698.51178 C 984.03319,699.08488 983.01497,699.50157 982.84131,699.43777 C 982.66765,699.37397 981.73807,699.11597 980.77557,698.86444 z M 961.02557,695.55377 C 961.02557,695.00377 961.47557,694.55377 962.02557,694.55377 C 962.57557,694.55377 963.02557,695.00377 963.02557,695.55377 C 963.02557,696.10377 962.57557,696.55377 962.02557,696.55377 C 961.47557,696.55377 961.02557,696.10377 961.02557,695.55377 z M 899.29828,693.73348 C 896.08534,692.06124 894.89478,689.58243 897.27557,689.52209 C 897.96307,689.50467 897.28807,688.56713 895.77557,687.43868 C 890.51399,683.51311 892.86334,674.55377 899.15431,674.55377 C 900.5135,674.55377 902.16557,674.01377 902.82557,673.35377 C 903.7589,672.42044 904.29224,672.42044 905.22557,673.35377 C 905.88557,674.01377 907.34807,674.56808 908.47557,674.58557 C 913.3377,674.661 915.989,680.14286 913.49156,684.95668 C 912.68527,686.51082 912.02557,688.64208 912.02557,689.69283 C 912.02557,690.78991 911.00256,691.99222 909.62271,692.51684 C 908.30114,693.0193 906.92458,693.90816 906.56369,694.49209 C 905.64846,695.97297 903.08727,695.70555 899.29828,693.73348 z M 940.38703,692.61107 L 939.79849,689.66837 L 936.16203,691.97825 L 932.52557,694.28813 L 928.27557,691.37291 C 924.37964,688.70055 922.40328,684.55377 925.02557,684.55377 C 926.54431,684.55377 926.22011,681.96011 924.52557,680.55377 C 922.02159,678.47565 922.80196,677.02943 927.82337,674.44207 L 932.62117,671.96993 L 937.54835,674.86482 C 941.37898,677.11545 942.81493,677.51287 944.00055,676.65057 C 944.83931,676.04055 946.91795,674.8193 948.61975,673.9367 C 951.5908,672.39581 951.87852,672.43585 955.84988,674.94286 C 960.5714,677.92343 961.75652,678.07184 964.4667,676.02197 C 967.01522,674.09436 969.40862,674.11317 968.66349,676.05494 C 968.34666,676.88059 969.19852,679.19339 970.5565,681.19449 C 973.54488,685.5981 973.62299,686.58478 971.03682,687.26108 C 969.943,687.54712 969.31352,688.21067 969.63797,688.73563 C 969.96241,689.2606 970.85735,689.44856 971.62672,689.15333 C 973.13366,688.57506 973.38238,689.46037 972.41858,691.97198 C 971.57777,694.16309 970.245,693.95852 966.43668,691.05377 C 962.20858,687.82884 960.63315,687.9045 956.02557,691.55377 C 951.53473,695.11058 951.5469,695.10901 948.29844,692.55377 C 944.85218,689.84294 943.02557,690.01615 943.02557,693.05377 C 943.02557,696.51883 941.1041,696.19644 940.38703,692.61107 z M 962.44378,684.94678 C 965.23031,683.87749 964.25904,681.55377 961.02557,681.55377 C 957.97586,681.55377 956.7584,683.87579 959.27557,684.89149 C 959.96307,685.1689 960.60127,685.4314 960.69378,685.47482 C 960.7863,685.51824 961.5738,685.28062 962.44378,684.94678 z M 944.05666,683.05377 C 944.01016,681.55798 939.76116,681.84699 939.24992,683.38071 C 938.94093,684.3077 939.60335,684.60911 941.44768,684.38071 C 942.89972,684.20089 944.07376,683.60377 944.05666,683.05377 z M 835.30111,692.37329 C 833.70982,690.43761 833.46011,685.37968 834.83189,682.86951 C 836.79863,679.27066 836.2899,676.60477 833.4288,675.51698 C 832.00058,674.97397 830.5981,673.63511 830.31217,672.54173 C 830.02625,671.44835 829.16979,670.55377 828.40894,670.55377 C 827.64809,670.55377 827.02557,670.14286 827.02557,669.64063 C 827.02557,668.6951 831.16819,669.77096 836.52557,672.10785 C 842.18624,674.57703 843.99638,674.79342 844.65405,673.07955 C 845.22002,671.60465 845.4224,671.60292 847.03153,673.05916 C 848.81752,674.67547 853.44605,674.30048 854.59177,672.44666 C 854.89279,671.9596 856.54823,672.28981 858.27053,673.18044 C 860.75878,674.46717 861.79023,674.55732 863.29214,673.61937 C 864.74983,672.70902 865.51498,672.71505 866.63636,673.64572 C 867.77411,674.58997 868.9355,674.57358 871.9752,673.57039 C 875.50629,672.40503 876.18616,672.4899 879.44277,674.5026 C 882.44289,676.35677 883.02557,676.45967 883.02557,675.13533 C 883.02557,674.26547 883.47557,673.55377 884.02557,673.55377 C 885.93194,673.55377 885.03124,678.43639 882.842,679.9698 C 880.85047,681.36472 880.78044,681.72723 882.04582,684.0916 C 883.71966,687.21921 882.73786,689.21985 878.23438,691.85822 C 875.23969,693.61267 875.03652,693.60574 870.90213,691.60822 C 865.82506,689.15524 866.02557,689.17804 866.02557,691.05377 C 866.02557,692.75892 864.87861,693.00655 863.47557,691.60432 C 862.8759,691.00499 861.30393,691.24664 859.21283,692.25961 C 856.16152,693.73771 855.6263,693.7338 852.43105,692.21009 C 849.3845,690.75729 848.89196,690.73837 848.3868,692.0548 C 847.72328,693.78391 844.02557,694.10808 844.02557,692.43714 C 844.02557,691.82299 843.23807,691.56857 842.27557,691.87176 C 841.31307,692.17495 839.59414,692.70872 838.45571,693.05792 C 837.24499,693.42929 835.93561,693.14512 835.30111,692.37329 z M 867.7964,682.74127 C 868.25747,681.35806 864.41808,681.10965 863.57836,682.46836 C 862.981,683.4349 864.87731,684.54557 866.46307,684.15794 C 866.9787,684.03189 867.5787,683.3944 867.7964,682.74127 z M 812.52557,678.55377 C 812.18565,678.00377 812.38409,677.55377 812.96655,677.55377 C 813.54901,677.55377 814.02557,678.00377 814.02557,678.55377 C 814.02557,679.10377 813.82713,679.55377 813.58459,679.55377 C 813.34205,679.55377 812.86549,679.10377 812.52557,678.55377 z M 812.4791,673.86923 C 812.51846,671.59539 813.02279,671.12792 815.77557,670.81368 C 818.42942,670.51073 819.02557,670.79028 819.02557,672.33771 C 819.02557,673.39799 817.90361,674.74394 816.47852,675.39325 C 812.85342,677.04496 812.42695,676.88245 812.4791,673.86923 z M 941.02557,674.05377 C 941.02557,673.22877 941.47557,672.55377 942.02557,672.55377 C 942.57557,672.55377 943.02557,673.22877 943.02557,674.05377 C 943.02557,674.87877 942.57557,675.55377 942.02557,675.55377 C 941.47557,675.55377 941.02557,674.87877 941.02557,674.05377 z M 971.52557,672.55377 C 971.86549,672.00377 972.34205,671.55377 972.58459,671.55377 C 972.82713,671.55377 973.02557,672.00377 973.02557,672.55377 C 973.02557,673.10377 972.54901,673.55377 971.96655,673.55377 C 971.38409,673.55377 971.18565,673.10377 971.52557,672.55377 z M 821.02557,669.55377 C 821.02557,669.00377 821.47557,668.55377 822.02557,668.55377 C 822.57557,668.55377 823.02557,669.00377 823.02557,669.55377 C 823.02557,670.10377 822.57557,670.55377 822.02557,670.55377 C 821.47557,670.55377 821.02557,670.10377 821.02557,669.55377 z " />
-      <path
-         id="path4197"
-         style="fill:#cda394"
-         d="M 885.65451,919.03985 C 884.75859,918.14394 884.02557,917.06529 884.02557,916.64286 C 884.02557,914.82206 879.41445,913.77528 877.02557,915.05377 C 872.38042,917.53978 867.60267,912.80948 871.49556,909.57868 C 874.44114,907.13406 878.97724,907.73976 882.6043,911.06202 C 884.486,912.78559 886.02557,914.71775 886.02557,915.35572 C 886.02557,915.99369 887.26307,916.78134 888.77557,917.10605 C 890.28807,917.43077 892.42557,918.08389 893.52557,918.55743 C 895.31699,919.32862 895.2473,919.42547 892.85736,919.48609 C 891.38984,919.52331 889.53536,919.80465 888.7363,920.11128 C 887.93723,920.41791 886.55043,919.93577 885.65451,919.03985 z M 897.02557,919.55377 C 897.02557,919.00377 897.67401,918.55377 898.46655,918.55377 C 899.25909,918.55377 900.18565,919.00377 900.52557,919.55377 C 900.86549,920.10377 900.21705,920.55377 899.08459,920.55377 C 897.95213,920.55377 897.02557,920.10377 897.02557,919.55377 z M 907.02557,919.55377 C 907.02557,919.00377 907.50213,918.55377 908.08459,918.55377 C 908.66705,918.55377 908.86549,919.00377 908.52557,919.55377 C 908.18565,920.10377 907.70909,920.55377 907.46655,920.55377 C 907.22401,920.55377 907.02557,920.10377 907.02557,919.55377 z M 911.39191,919.33309 C 911.14543,918.93671 912.19968,918.34307 913.73467,918.01388 C 918.40749,917.01177 921.02557,915.66496 921.02557,914.26327 C 921.02557,912.39487 925.91525,909.00811 929.68835,908.26313 C 931.96091,907.81443 933.22752,908.09469 934.18835,909.25884 C 935.30638,910.61344 935.30213,910.95416 934.16242,911.33744 C 933.01155,911.72448 933.01155,911.92712 934.16242,912.63866 C 935.29602,913.33952 935.26769,913.7394 933.9942,915.01326 C 932.70267,916.30518 931.94531,916.34999 929.15852,915.29943 C 926.03496,914.12191 925.71275,914.21787 923.2679,917.05377 C 921.12048,919.54467 919.93137,920.05377 916.26081,920.05377 C 913.82939,920.05377 911.63838,919.72946 911.39191,919.33309 z M 834.98582,918.41076 C 834.96396,918.21441 834.79937,915.66345 834.62006,912.74194 C 834.36757,908.62809 833.79757,907.08237 832.09263,905.88819 C 830.85115,905.01862 830.13147,903.72019 830.44218,902.91048 C 830.74521,902.1208 830.45497,900.61296 829.79721,899.55972 C 828.42176,897.35726 829.24156,896.03894 831.45776,896.88937 C 832.2929,897.20985 833.49073,899.51544 834.1196,902.01291 C 835.19482,906.28299 838.02557,908.48677 838.02557,905.05377 C 838.02557,903.17159 840.62822,903.07592 841.34044,904.93191 C 841.6313,905.68989 841.41524,906.7641 840.86029,907.31905 C 840.18164,907.9977 840.20723,908.54801 840.93844,908.99992 C 842.31117,909.84832 842.36232,914.22761 841.00926,915.06385 C 840.45029,915.40931 840.20549,916.03587 840.46527,916.4562 C 840.72505,916.87653 840.39489,917.24184 839.73158,917.26799 C 839.06827,917.29415 837.73807,917.6423 836.77557,918.04165 C 835.81307,918.441 835.00768,918.6071 834.98582,918.41076 z M 852.77557,915.47367 C 849.21591,913.40036 851.246,907.55377 855.52557,907.55377 C 860.08975,907.55377 861.56171,912.36441 857.80306,914.99707 C 855.21844,916.80741 855.08687,916.81988 852.77557,915.47367 z M 969.11849,915.6112 C 968.35299,915.13809 968.10093,914.24085 968.53584,913.53716 C 969.10947,912.609 969.54219,912.72554 970.25562,914.00036 C 971.41247,916.06753 970.93994,916.73691 969.11849,915.6112 z M 947.62839,913.66739 C 946.006,911.87466 946.05112,911.67883 948.53723,909.72326 C 949.97602,908.5915 951.7647,907.90017 952.51207,908.18697 C 954.15381,908.81696 955.35859,911.55377 953.99419,911.55377 C 953.46145,911.55377 953.02557,912.45377 953.02557,913.55377 C 953.02557,916.13498 949.92068,916.20034 947.62839,913.66739 z M 966.02557,912.70876 C 966.02557,911.5077 969.4585,908.55377 970.85431,908.55377 C 972.81707,908.55377 972.15892,910.70614 970.02557,911.26402 C 968.92557,911.55168 968.02557,912.18455 968.02557,912.6704 C 968.02557,913.15625 967.57557,913.55377 967.02557,913.55377 C 966.47557,913.55377 966.02557,913.17351 966.02557,912.70876 z M 972.31428,904.86374 C 971.9522,903.92018 972.1869,902.99999 972.84566,902.78041 C 973.49461,902.56409 974.02557,901.8047 974.02557,901.09288 C 974.02557,900.38106 974.70057,899.23846 975.52557,898.55377 C 976.47146,897.76875 977.02557,897.70172 977.02557,898.37231 C 977.02557,898.95719 976.54489,899.73281 975.9574,900.0959 C 975.3699,900.459 975.13078,901.38555 975.42601,902.15492 C 976.08443,903.87074 975.14585,906.55377 973.8872,906.55377 C 973.37878,906.55377 972.67096,905.79326 972.31428,904.86374 z M 816.02557,901.60572 C 816.02557,898.81957 816.52382,897.2998 817.5687,896.89885 C 819.83061,896.03087 820.14794,896.81438 819.26181,901.07933 C 818.13927,906.48218 816.02557,906.82598 816.02557,901.60572 z M 988.94906,904.80377 C 988.79362,903.28008 988.22028,900.7426 987.56481,898.67742 C 986.82331,896.34114 987.95186,895.88006 989.82557,897.75377 C 991.27356,899.20176 991.43643,905.55377 990.02557,905.55377 C 989.47557,905.55377 988.99114,905.21627 988.94906,904.80377 z M 832.18347,891.55377 C 832.18347,890.17877 832.41044,889.61627 832.68785,890.30377 C 832.96526,890.99127 832.96526,892.11627 832.68785,892.80377 C 832.41044,893.49127 832.18347,892.92877 832.18347,891.55377 z M 820.11655,890.1634 C 819.43609,889.34349 818.23724,888.91905 817.45246,889.2202 C 816.60743,889.54447 816.02557,889.15608 816.02557,888.26775 C 816.02557,887.44275 816.70057,886.50873 817.52557,886.19214 C 818.40711,885.85386 819.02557,884.35374 819.02557,882.55377 C 819.02557,880.7538 818.40711,879.25368 817.52557,878.9154 C 816.42705,878.49385 816.02557,876.76252 816.02557,872.44678 C 816.02557,869.20563 816.42679,866.55377 816.91716,866.55377 C 818.6953,866.55377 819.25052,861.19143 817.59753,859.98273 C 815.81334,858.67809 815.30141,847.55377 817.02557,847.55377 C 817.57557,847.55377 818.02557,846.23033 818.02557,844.61279 C 818.02557,842.99525 817.57557,841.39369 817.02557,841.05377 C 816.47557,840.71385 816.02557,837.76229 816.02557,834.49475 C 816.02557,831.20076 816.47112,828.55377 817.02557,828.55377 C 817.57557,828.55377 818.02557,826.97877 818.02557,825.05377 C 818.02557,823.12877 817.57557,821.55377 817.02557,821.55377 C 816.47557,821.55377 816.02557,819.12691 816.02557,816.16076 C 816.02557,809.91263 816.49526,809.55377 824.6731,809.55377 C 832.43892,809.55377 834.02557,810.64859 834.02557,816.00717 C 834.02557,821.06392 833.2058,823.78319 831.92079,822.98901 C 831.42842,822.68471 831.02557,823.53915 831.02557,824.88776 C 831.02557,826.23638 831.66021,827.58333 832.43589,827.88098 C 833.50416,828.29092 833.7695,830.07521 833.52994,835.23797 C 833.11879,844.09859 833.1823,843.76867 832.02557,843.05377 C 830.53787,842.13432 830.81511,845.48616 832.35405,847.02511 C 834.13828,848.80933 833.54567,857.83036 831.43237,861.05567 C 829.77283,863.58844 830.19431,867.18555 832.01851,866.05814 C 833.16334,865.35059 833.27194,866.09684 833.02958,873.00557 C 832.93404,875.72906 832.26449,878.42906 831.5417,879.00557 C 828.94056,881.08026 828.80184,884.27838 831.23516,886.07248 C 832.78856,887.2178 833.1176,887.91744 832.25771,888.24677 C 831.56039,888.51383 830.30315,889.41904 829.46385,890.25835 C 828.09584,891.62636 827.75538,891.61923 826.17555,890.1895 C 824.59384,888.75807 824.25651,888.7514 822.88351,890.1244 C 821.52958,891.47833 821.21157,891.48282 820.11655,890.1634 z M 826.63256,883.97198 C 826.29872,883.102 826.02557,881.527 826.02557,880.47198 C 826.02557,879.22044 825.33048,878.55377 824.02557,878.55377 C 822.49616,878.55377 822.02557,879.22044 822.02557,881.3871 C 822.02557,884.7272 822.67499,885.55377 825.29922,885.55377 C 826.6577,885.55377 827.05753,885.07944 826.63256,883.97198 z M 825.84199,863.02268 C 825.66796,861.63058 825.07557,860.49159 824.52557,860.49159 C 823.97557,860.49159 823.38318,861.63058 823.20915,863.02268 C 822.98363,864.82658 823.36184,865.55377 824.52557,865.55377 C 825.6893,865.55377 826.06751,864.82658 825.84199,863.02268 z M 825.84512,844.3821 C 825.37404,841.1806 823.02557,840.83772 823.02557,843.97044 C 823.02557,845.65094 823.5741,846.55377 824.59512,846.55377 C 825.63746,846.55377 826.05733,845.82431 825.84512,844.3821 z M 825.84512,825.3821 C 825.37404,822.1806 823.02557,821.83772 823.02557,824.97044 C 823.02557,826.65094 823.5741,827.55377 824.59512,827.55377 C 825.63746,827.55377 826.05733,826.82431 825.84512,825.3821 z M 973.02557,889.05377 C 973.02557,887.67877 973.47557,886.55377 974.02557,886.55377 C 974.57557,886.55377 975.02557,887.67877 975.02557,889.05377 C 975.02557,890.42877 974.57557,891.55377 974.02557,891.55377 C 973.47557,891.55377 973.02557,890.42877 973.02557,889.05377 z M 979.38058,889.071 C 979.73533,888.14656 980.02557,887.202 980.02557,886.97198 C 980.02557,885.74294 984.90438,886.79557 985.41858,888.13556 C 986.36617,890.60494 986.15124,890.90296 984.44437,889.48638 C 983.15086,888.41286 982.48768,888.4086 980.79938,889.46295 C 978.99224,890.59153 978.81581,890.54279 979.38058,889.071 z M 979.02642,881.05377 C 978.89928,880.50377 978.861,879.35105 978.94136,878.49217 C 979.02171,877.63329 978.43216,875.38329 977.63126,873.49217 C 976.44192,870.68389 976.04923,870.37681 975.48844,871.8165 C 975.1092,872.79012 975.3827,874.27916 976.09939,875.14272 C 977.1677,876.42996 977.15174,876.85776 976.00901,877.564 C 973.70215,878.98972 973.02557,877.70248 973.02557,871.88776 C 973.02557,867.66009 973.34462,866.46222 974.36625,866.85426 C 975.10363,867.13722 976.32925,866.98412 977.08986,866.51404 C 977.91782,866.00233 978.74127,866.09377 979.14184,866.7419 C 979.52712,867.3653 980.91679,867.5469 982.41824,867.17007 C 984.60333,866.62164 985.02557,865.95195 985.02557,863.03472 C 985.02557,859.87949 984.76055,859.55377 982.19335,859.55377 C 979.85273,859.55377 979.18292,858.97309 978.3344,856.20837 C 976.95592,851.71687 979.01783,847.55377 982.62087,847.55377 C 984.87444,847.55377 985.11789,847.19705 984.83893,844.30377 C 984.59992,841.82489 984.05103,841.05377 982.52557,841.05377 C 981.42557,841.05377 980.46498,841.72877 980.39092,842.55377 C 980.31686,843.37877 980.20436,844.84127 980.14092,845.80377 C 979.95128,848.68085 978.02159,847.78386 977.36776,844.51471 C 976.67066,841.02924 974.69226,841.06733 974.1806,844.57607 C 973.97877,845.96014 974.53023,847.44961 975.50965,848.16578 C 976.85196,849.14731 976.96288,849.80239 976.06943,851.47181 C 975.26521,852.97451 975.25653,854.1168 976.03821,855.57738 C 976.88037,857.15099 976.76642,857.95578 975.52577,859.19643 C 974.64828,860.07392 973.70029,860.56182 973.41913,860.28066 C 972.73659,859.59813 972.75906,828.48695 973.44258,827.80343 C 973.73664,827.50936 974.63171,827.81193 975.43162,828.4758 C 976.23152,829.13966 978.6049,829.54128 980.70578,829.3683 C 984.0365,829.09404 984.56608,828.70167 984.84199,826.30377 C 985.01602,824.79127 985.77363,823.55377 986.52557,823.55377 C 987.27751,823.55377 988.03512,824.79127 988.20915,826.30377 C 988.42491,828.17896 989.03892,828.97025 990.1393,828.79123 C 991.35362,828.59366 991.6375,829.13299 991.28628,830.97031 C 991.0036,832.44903 990.30849,833.21583 989.5237,832.91468 C 987.62529,832.18619 986.65132,834.39791 988.10121,836.14491 C 989.10179,837.35053 989.51209,837.39139 990.17199,836.3511 C 990.72838,835.474 990.9999,835.43217 991.01026,836.22198 C 991.01868,836.8645 991.28497,838.06619 991.60202,838.89241 C 991.99707,839.92189 991.44636,840.49834 989.85202,840.7242 C 988.11742,840.96993 987.60134,841.60363 987.82342,843.21518 C 987.98724,844.40396 987.64974,845.66801 987.07342,846.0242 C 985.19551,847.18481 985.96676,848.41416 988.77557,848.73735 C 991.3498,849.03355 991.54516,849.39711 991.83205,854.42556 L 992.13854,859.79735 L 989.03911,859.34245 C 986.50347,858.9703 986.06183,859.17552 986.61122,860.47066 C 986.98057,861.34137 987.50942,863.10324 987.78645,864.38592 C 988.06347,865.6686 988.9056,866.95424 989.65785,867.2429 C 991.75826,868.04891 991.27991,870.55377 989.02557,870.55377 C 987.53513,870.55377 987.02557,871.22044 987.02557,873.1704 C 987.02557,875.2947 987.40188,875.68863 989.02557,875.26402 C 990.30994,874.92815 991.02557,875.23334 991.02557,876.11694 C 991.02557,877.02709 989.92538,877.45246 987.77557,877.3735 C 983.28269,877.20847 980.23721,878.33208 979.70585,880.35076 C 979.4593,881.28741 979.15355,881.60377 979.02642,881.05377 z M 990.02557,854.05377 C 990.02557,853.22877 989.57557,852.55377 989.02557,852.55377 C 988.47557,852.55377 988.02557,853.22877 988.02557,854.05377 C 988.02557,854.87877 988.47557,855.55377 989.02557,855.55377 C 989.57557,855.55377 990.02557,854.87877 990.02557,854.05377 z M 977.25274,834.96182 C 976.92055,833.22404 976.50241,832.78222 975.98394,833.62114 C 975.1364,834.99247 975.79418,837.55377 976.99389,837.55377 C 977.40877,837.55377 977.52526,836.38739 977.25274,834.96182 z M 978.02557,824.99475 C 978.02557,824.13729 978.48291,823.71839 979.04188,824.06385 C 979.60085,824.40931 979.7993,825.11087 979.48286,825.62287 C 978.62563,827.00991 978.02557,826.75128 978.02557,824.99475 z M 973.02557,817.05377 C 973.02557,811.22044 973.2307,810.55377 975.02557,810.55377 C 977.14409,810.55377 977.57918,812.13091 976.10365,814.46168 C 975.56734,815.30884 975.62626,816.77804 976.25159,818.15048 C 977.05393,819.91143 976.93495,820.78725 975.72963,821.99257 C 974.87097,822.85123 973.91128,823.55377 973.597,823.55377 C 973.28271,823.55377 973.02557,820.62877 973.02557,817.05377 z M 989.70003,821.89489 C 989.33764,821.53251 986.80944,821.31501 984.0818,821.41155 C 979.18455,821.58488 979.11443,821.54435 978.48247,818.17572 C 978.11046,816.19274 978.34081,813.83326 979.03261,812.54062 C 980.07422,810.59435 980.74073,810.40072 984.37414,810.98886 C 986.65743,811.35845 989.08807,811.71175 989.77557,811.77398 C 990.46307,811.8362 991.01868,812.8246 991.01026,813.97044 C 990.99794,815.64557 990.81255,815.76536 990.06405,814.5818 C 989.26288,813.31494 989.04364,813.34311 988.49075,814.78391 C 987.61237,817.07294 988.97258,819.24548 990.13526,817.41053 C 990.71785,816.49107 990.99988,817.10129 991.01026,819.30377 C 991.02602,822.6489 990.83392,823.02879 989.70003,821.89489 z M 823.71307,796.90794 C 822.33923,795.53409 823.05183,793.41218 824.77557,793.74414 C 825.73807,793.9295 826.52557,794.7125 826.52557,795.48413 C 826.52557,797.06299 824.76128,797.95614 823.71307,796.90794 z M 982.02557,795.55377 C 982.02557,795.00377 982.50213,794.55377 983.08459,794.55377 C 983.66705,794.55377 983.86549,795.00377 983.52557,795.55377 C 983.18565,796.10377 982.70909,796.55377 982.46655,796.55377 C 982.22401,796.55377 982.02557,796.10377 982.02557,795.55377 z M 817.27557,779.91124 C 815.75113,779.27203 815.53543,768.55377 817.04701,768.55377 C 817.6088,768.55377 818.5802,767.4306 819.20567,766.05783 C 820.14944,763.98648 820.02577,763.21147 818.47862,761.50189 C 816.94289,759.80493 816.82681,759.10168 817.81996,757.5114 C 819.38522,755.00502 819.3403,754.55377 817.52557,754.55377 C 815.61943,754.55377 815.54341,750.67602 817.43532,749.95003 C 819.80902,749.03915 820.34492,744.56413 818.34495,742.35419 C 816.66496,740.49782 816.66229,740.33658 818.29638,739.42209 C 820.41849,738.2345 820.59177,734.55377 818.52557,734.55377 C 816.81003,734.55377 816.49372,732.0005 818.08725,731.01565 C 818.67118,730.65476 819.65151,729.1657 820.26578,727.70663 L 821.38262,725.05377 L 821.80212,727.52109 C 822.03285,728.87812 821.72752,730.15312 821.1236,730.35443 C 818.64133,731.18185 820.26981,732.12365 823.52557,731.74356 C 826.7702,731.36477 827.02557,731.08326 827.02557,727.88535 C 827.02557,725.84025 827.43272,724.68737 828.02557,725.05377 C 828.57557,725.39369 829.02557,726.77025 829.02557,728.11279 C 829.02557,730.29143 829.97111,731.03605 832.27557,730.67219 C 832.68807,730.60706 833.02557,733.21164 833.02557,736.46015 C 833.02557,741.91278 832.86885,742.32555 830.98559,741.83307 C 829.13211,741.34837 829.0864,741.14403 830.48559,739.59794 C 832.33344,737.55609 832.53534,734.21752 830.77557,734.80294 C 830.08807,735.03164 829.30057,736.53164 829.02557,738.13627 C 828.64118,740.37921 827.77413,741.27499 825.27557,742.01057 C 822.46051,742.83932 822.02557,743.40809 822.02557,746.26057 C 822.02557,749.10665 822.365,749.55377 824.52557,749.55377 C 826.62553,749.55377 827.02557,749.08317 827.02557,746.61279 C 827.02557,744.99525 827.42842,743.42283 827.92079,743.11853 C 829.24525,742.29997 830.11706,745.34106 829.38925,748.2409 C 828.81286,750.53741 828.94124,750.66927 830.79018,749.67975 C 833.25448,748.36089 834.02557,749.77105 834.02557,755.5966 C 834.02557,758.20366 833.36168,760.09437 832.00121,761.36184 C 830.42125,762.83379 830.17199,763.77535 830.86576,765.6508 C 831.35466,766.97243 832.15313,767.94127 832.64012,767.80377 C 833.12712,767.66627 833.52557,770.36627 833.52557,773.80377 L 833.52557,780.05377 L 826.02557,780.24458 C 821.90057,780.34952 817.96307,780.19952 817.27557,779.91124 z M 826.03922,767.30377 C 826.04674,766.61627 826.33456,765.00174 826.67883,763.71592 C 827.22123,761.69012 826.98583,761.42317 824.91517,761.71592 C 823.17527,761.96191 822.60646,762.59754 822.82308,764.05377 C 823.30973,767.32529 823.90243,768.55377 824.99419,768.55377 C 825.56145,768.55377 826.03171,767.99127 826.03922,767.30377 z M 832.02557,755.61279 C 832.02557,755.09525 831.57557,754.39369 831.02557,754.05377 C 830.47557,753.71385 830.02557,754.13729 830.02557,754.99475 C 830.02557,755.85221 830.47557,756.55377 831.02557,756.55377 C 831.57557,756.55377 832.02557,756.13033 832.02557,755.61279 z M 973.66505,779.85992 C 972.69168,778.88655 972.90211,769.74811 973.91226,769.1238 C 974.39994,768.82239 975.3218,769.20577 975.96082,769.97575 C 976.75617,770.93409 976.79192,771.58014 976.07413,772.02376 C 974.5385,772.97283 974.79524,776.11772 976.52557,777.55377 C 977.79564,778.60783 978.02557,778.38659 978.02557,776.11047 C 978.02557,768.68099 983.70226,767.03954 987.00525,773.51393 C 988.11642,775.69202 989.02557,777.89202 989.02557,778.40282 C 989.02557,778.91362 986.1385,779.33155 982.60986,779.33155 C 979.08122,779.33155 975.76899,779.59431 975.24934,779.91547 C 974.72969,780.23663 974.01676,780.21163 973.66505,779.85992 z M 974.18346,758.55377 C 974.18346,757.17877 974.41044,756.61627 974.68785,757.30377 C 974.96526,757.99127 974.96526,759.11627 974.68785,759.80377 C 974.41044,760.49127 974.18346,759.92877 974.18346,758.55377 z M 979.17379,757.97973 C 978.16645,755.76887 978.23207,754.88756 979.55424,752.86967 C 982.66738,748.11842 988.39339,751.74665 986.46876,757.251 C 985.07919,761.22512 980.84519,761.64807 979.17379,757.97973 z M 990.69224,755.8871 C 989.65487,754.84973 989.9084,751.55377 991.02557,751.55377 C 991.57557,751.55377 992.02557,752.67877 992.02557,754.05377 C 992.02557,756.67183 991.79458,756.98944 990.69224,755.8871 z M 974.10452,752.97044 C 974.1525,751.80549 974.38946,751.56854 974.70868,752.36627 C 974.99755,753.08814 974.96203,753.95065 974.62974,754.28294 C 974.29744,754.61523 974.0611,754.0246 974.10452,752.97044 z M 974.10452,739.97044 C 974.1525,738.80549 974.38946,738.56854 974.70868,739.36627 C 974.99755,740.08814 974.96203,740.95065 974.62974,741.28294 C 974.29744,741.61523 974.0611,741.0246 974.10452,739.97044 z M 979.51953,739.5471 C 977.73887,737.57948 977.72322,737.28862 979.26169,734.75308 C 981.35993,731.295 984.03247,731.31172 985.98723,734.79514 C 988.82655,739.8549 983.40377,743.83914 979.51953,739.5471 z M 817.69224,722.8871 C 816.5416,721.73647 816.964,720.55377 818.52557,720.55377 C 819.35057,720.55377 820.02557,721.22877 820.02557,722.05377 C 820.02557,723.61534 818.84287,724.03774 817.69224,722.8871 z M 822.30723,722.88618 C 821.63714,722.6233 820.79956,720.86596 820.44594,718.98099 C 820.0803,717.03197 819.20402,715.55377 818.41428,715.55377 C 816.75111,715.55377 816.57807,713.94837 818.13737,712.98467 C 818.74887,712.60675 819.64197,712.91769 820.12206,713.67566 C 820.75416,714.67361 820.99917,714.70895 821.01026,713.80377 C 821.01941,713.05701 822.36661,712.55377 824.35659,712.55377 C 826.86159,712.55377 828.01044,713.15699 828.98947,714.98631 C 829.70549,716.32421 830.02945,718.10129 829.70937,718.93538 C 829.31181,719.97142 829.58654,720.27573 830.5765,719.89585 C 832.22655,719.26267 832.53063,715.98395 831.02557,715.05377 C 829.53189,714.13063 829.81886,712.8871 831.52557,712.8871 C 832.57195,712.8871 833.07093,714.04636 833.17557,716.72044 C 833.25807,718.82877 833.37057,721.1137 833.42557,721.79806 C 833.5261,723.04894 824.87917,723.89519 822.30723,722.88618 z M 980.22557,721.35377 C 977.41075,718.53895 979.88072,712.98564 983.62035,713.72119 C 986.42033,714.27192 987.58081,717.03973 986.24291,719.97611 C 984.99752,722.70945 982.21769,723.34589 980.22557,721.35377 z M 888.27557,717.83037 C 885.09658,717.43587 885.02557,717.31793 885.02557,712.43291 L 885.02557,707.43877 L 889.11045,707.74627 L 893.19534,708.05377 L 893.47288,713.30377 C 893.6538,716.72587 893.36312,718.49805 892.638,718.39373 C 892.02616,718.30571 890.06307,718.0522 888.27557,717.83037 z M 863.02557,716.17621 C 863.02557,715.41856 863.69111,714.24631 864.50456,713.57121 C 865.57897,712.67952 865.71575,711.84338 865.00456,710.51451 C 863.53757,707.77341 863.72459,707.55377 867.52557,707.55377 L 871.02557,707.55377 L 871.02557,712.55377 C 871.02557,716.8871 870.7589,717.55377 869.02557,717.55377 C 867.92557,717.55377 867.02557,717.01377 867.02557,716.35377 C 867.02557,715.42044 866.7589,715.42044 865.82557,716.35377 C 864.22999,717.94935 863.02557,717.87298 863.02557,716.17621 z M 874.02557,712.55377 L 874.02557,707.55377 L 878.02557,707.55377 L 882.02557,707.55377 L 882.02557,712.55377 L 882.02557,717.55377 L 878.02557,717.55377 L 874.02557,717.55377 L 874.02557,712.55377 z M 896.94865,717.05377 C 896.90634,716.77877 896.83711,714.64127 896.7948,712.30377 C 896.72212,708.28799 896.87366,708.05377 899.54452,708.05377 C 902.22191,708.05377 902.38174,708.3046 902.57133,712.80377 C 902.76562,717.41465 902.68733,717.55377 899.89852,717.55377 C 898.3184,717.55377 896.99095,717.32877 896.94865,717.05377 z M 906.02557,712.55377 L 906.02557,707.55377 L 910.02557,707.55377 L 914.02557,707.55377 L 914.02557,712.55377 L 914.02557,717.55377 L 910.02557,717.55377 L 906.02557,717.55377 L 906.02557,712.55377 z M 917.74996,716.94483 C 917.36864,716.56351 917.72283,715.75703 918.53705,715.15265 C 919.83814,714.18686 919.8406,713.71524 918.55738,711.25862 C 917.27657,708.80661 917.27707,708.39449 918.56145,707.90163 C 921.7002,706.69718 923.15398,708.36226 922.83351,712.79462 C 922.58758,716.19615 922.11456,717.1126 920.48442,717.34595 C 919.36179,717.50665 918.13128,717.32615 917.74996,716.94483 z M 926.02557,712.55377 L 926.02557,707.55377 L 930.02557,707.55377 L 934.02557,707.55377 L 934.02557,712.55377 L 934.02557,717.55377 L 930.02557,717.55377 L 926.02557,717.55377 L 926.02557,712.55377 z M 937.55817,713.80377 C 938.53981,707.89718 938.78355,707.55377 941.99419,707.55377 C 944.96518,707.55377 945.02557,707.65338 945.02557,712.55377 L 945.02557,717.55377 L 940.98026,717.55377 L 936.93494,717.55377 L 937.55817,713.80377 z M 827.55679,709.26064 C 827.12873,708.27442 827.05908,707.18692 827.40203,706.84398 C 828.41752,705.82848 829.23612,707.25492 828.76873,709.2255 C 828.35438,710.97244 828.30047,710.97401 827.55679,709.26064 z M 822.34847,696.95285 C 821.73911,695.36488 823.47226,693.59851 825.66858,693.56908 C 827.02981,693.55085 828.26812,696.3523 827.4698,697.64401 C 826.54107,699.14672 823.00733,698.66982 822.34847,696.95285 z M 980.52557,696.55377 C 980.86549,696.00377 982.01705,695.55377 983.08459,695.55377 C 984.15213,695.55377 985.02557,696.00377 985.02557,696.55377 C 985.02557,697.10377 983.87401,697.55377 982.46655,697.55377 C 981.01519,697.55377 980.17505,697.12093 980.52557,696.55377 z M 899.24873,693.42173 C 896.61437,691.7348 896.20116,691.04712 897.14123,689.91441 C 897.78437,689.13947 898.13395,688.40381 897.91807,688.2796 C 897.7022,688.1554 896.62557,687.55819 895.52557,686.95249 C 892.61759,685.35125 892.29106,679.28828 894.9686,676.61074 C 896.09993,675.47941 898.06057,674.55377 899.32557,674.55377 C 900.59057,674.55377 902.11252,674.06682 902.70767,673.47167 C 903.40623,672.77311 904.45183,672.71562 905.65767,673.30947 C 906.68502,673.81542 908.87557,674.879 910.52557,675.67299 C 912.95899,676.84397 913.58497,677.83207 913.8401,680.90498 C 914.01555,683.01824 913.5734,685.39367 912.84015,686.27718 C 912.1172,687.14829 911.65708,688.63659 911.81767,689.58451 C 912.01263,690.73534 910.75635,692.01339 908.03682,693.43089 C 903.08687,696.01095 903.29246,696.01116 899.24873,693.42173 z M 949.02557,691.55648 L 946.52557,689.60366 L 950.69563,689.82872 C 954.59539,690.03918 954.7636,690.16721 953.29065,691.80377 C 952.42437,692.76627 951.67284,693.54376 951.62058,693.53153 C 951.56833,693.5193 950.40057,692.63053 949.02557,691.55648 z M 835.02557,691.1704 C 835.02557,690.40955 836.03807,689.45242 837.27557,689.04345 L 839.52557,688.29987 L 837.36012,687.86835 C 834.62267,687.32284 833.70435,685.06525 835.58501,683.50444 C 836.37732,682.84688 837.02557,681.67486 837.02557,680.89994 C 837.02557,680.12502 837.71398,679.22683 838.55537,678.90396 C 839.52084,678.53347 839.86488,677.62283 839.48798,676.43534 C 838.69366,673.93264 840.41993,674.04613 844.05787,676.73577 L 847.0092,678.91778 L 849.26738,676.86074 C 853.49982,673.0053 855.50855,672.44914 858.96794,674.17491 C 861.99924,675.68712 862.74137,678.46599 859.90057,677.66708 C 855.73889,676.4967 854.02557,676.42966 854.02557,677.43719 C 854.02557,678.05131 855.06057,678.55377 856.32557,678.55377 C 859.13528,678.55377 861.02557,680.29918 861.02557,682.89353 C 861.02557,685.29528 858.28394,687.47972 855.21655,687.52197 C 853.89167,687.54021 853.17903,687.99306 853.54453,688.58445 C 853.91398,689.18223 855.61883,689.3455 857.60355,688.97316 C 861.82614,688.181 862.16082,689.84089 858.1163,691.51619 C 854.36834,693.06864 850.57996,691.36579 851.33745,688.46915 C 851.61265,687.41679 851.43006,686.30376 850.93169,685.99575 C 850.43332,685.68774 850.02557,684.33729 850.02557,682.99475 C 850.02557,680.88639 849.56323,680.55377 846.63256,680.55377 C 843.27793,680.55377 841.90981,681.8773 842.75621,684.30377 C 842.99603,684.99127 843.85629,685.55377 844.66792,685.55377 C 845.47955,685.55377 845.90279,685.94342 845.60845,686.41966 C 845.31412,686.8959 843.82506,687.11467 842.29944,686.90581 C 840.14477,686.61083 839.95068,686.71158 841.42993,687.35715 C 843.25101,688.15189 843.23183,688.2837 840.99137,690.371 C 838.35794,692.82442 835.02557,693.27095 835.02557,691.1704 z M 872.13777,691.28903 C 869.79287,690.07597 869.12272,687.62474 871.37557,688.50114 C 872.00807,688.74719 873.98807,688.97219 875.77557,689.00114 C 879.50624,689.06155 879.69121,689.32799 877.27557,691.16172 C 875.11413,692.80249 875.06567,692.80369 872.13777,691.28903 z M 930.62214,691.71002 C 930.33534,691.24597 931.65878,690.38809 933.56312,689.80363 C 937.2716,688.66546 938.28902,689.80723 935.09131,691.51859 C 932.74558,692.77399 931.31751,692.83516 930.62214,691.71002 z M 969.52557,691.55377 C 969.18565,691.00377 969.63565,690.55377 970.52557,690.55377 C 971.41549,690.55377 971.86549,691.00377 971.52557,691.55377 C 971.18565,692.10377 970.73565,692.55377 970.52557,692.55377 C 970.31549,692.55377 969.86549,692.10377 969.52557,691.55377 z M 949.18018,685.94951 C 947.99514,685.11948 947.02557,683.8164 947.02557,683.05377 C 947.02557,682.29114 947.99514,680.98806 949.18018,680.15803 C 951.97908,678.19761 955.02557,679.7068 955.02557,683.05377 C 955.02557,686.40074 951.97908,687.90993 949.18018,685.94951 z M 871.27557,685.91473 C 868.25483,684.63967 871.52582,678.55377 875.23187,678.55377 C 877.47003,678.55377 879.23065,681.08005 878.85233,683.74873 C 878.60189,685.51543 877.82493,686.09915 875.52557,686.24806 C 873.87557,686.35492 871.96307,686.20493 871.27557,685.91473 z M 929.03614,685.06651 C 927.5932,683.32787 928.32687,680.75912 930.50512,679.92324 C 933.05568,678.9445 937.02557,680.4359 937.02557,682.37282 C 937.02557,686.25019 931.55051,688.09614 929.03614,685.06651 z M 968.56828,685.62287 C 968.25184,685.11087 968.45029,684.40931 969.00926,684.06385 C 970.20263,683.3263 972.02557,684.26242 972.02557,685.61279 C 972.02557,686.82959 969.31895,686.83748 968.56828,685.62287 z M 928.02557,676.59743 C 928.02557,674.49224 932.0965,673.34051 935.1163,674.59135 C 936.7164,675.25413 938.02557,676.19182 938.02557,676.67509 C 938.02557,677.9172 936.33653,677.76491 934.012,676.31322 C 932.42957,675.32498 931.61881,675.3267 930.02557,676.3217 C 928.91769,677.01358 928.02557,677.13657 928.02557,676.59743 z M 812.58472,673.96547 C 813.00487,670.13796 814.02557,669.72825 814.02557,673.3871 C 814.02557,675.12877 813.63745,676.55377 813.16308,676.55377 C 812.68872,676.55377 812.42845,675.38903 812.58472,673.96547 z M 871.58439,674.8871 C 873.58922,673.42113 875.04581,673.24057 877.44378,674.16076 C 880.40473,675.29698 879.03703,676.22044 874.39326,676.22044 C 870.28794,676.22044 869.96839,676.06875 871.58439,674.8871 z M 948.84944,674.96458 C 950.19595,674.02145 951.81092,673.67088 952.82195,674.10223 C 954.26037,674.71592 954.1364,674.94779 952.02557,675.59174 C 947.69948,676.91149 946.42822,676.66047 948.84944,674.96458 z " />
-    </g>
-    <g
-       id="g9933"
-       transform="translate(-126.2218,-1.22947)">
-      <rect
-         id="rect9935"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-0.985935,0.167129,0.16871,0.985666,0,0)"
-         y="1029.7926"
-         x="-565.01947"
-         height="116.82966"
-         width="2.5678744" />
-      <rect
-         id="rect9937"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.981474,0.191593,-0.19145,0.981502,0,0)"
-         y="763.79895"
-         x="890.80157"
-         height="117.90984"
-         width="2.8053782" />
-      <g
-         id="g9939"
-         transform="matrix(0.571057,0,0,0.646281,293.2046,457.7222)">
-        <path
-           id="path9941"
-           style="opacity:1;color:#000000;fill:url(#radialGradient21982);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 800.06862,895.59747 C 800.06862,898.51334 782.52213,900.87711 760.87744,900.87711 C 739.23275,900.87711 721.68626,898.51334 721.68626,895.59747 C 721.68626,892.6816 739.23275,890.31783 760.87744,890.31783 C 782.52213,890.31783 800.06862,892.6816 800.06862,895.59747 z " />
-        <path
-           id="path9943"
-           style="color:#000000;fill:url(#linearGradient21984);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           transform="translate(-2.027946e-7,12.18378)"
-           d="M 799.86556,884.22593 C 793.36754,893.23219 782.51097,900.87711 760.87744,900.87711 C 739.24391,900.87711 727.66931,891.94233 721.68626,883.81981 C 756.92502,889.9117 765.34483,889.4341 799.86556,884.22593 z " />
-      </g>
-      <rect
-         id="rect9945"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.999488,-3.199729e-2,-6.823932e-2,0.997669,0,0)"
-         y="948.75696"
-         x="793.65533"
-         height="119.00449"
-         width="2.421216" />
-    </g>
-    <g
-       id="g9925">
-      <rect
-         id="rect8100"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-0.985935,0.167129,0.16871,0.985666,0,0)"
-         y="1029.7926"
-         x="-565.01947"
-         height="116.82966"
-         width="2.5678744" />
-      <rect
-         id="rect8102"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.981474,0.191593,-0.19145,0.981502,0,0)"
-         y="763.79895"
-         x="890.80157"
-         height="117.90984"
-         width="2.8053782" />
-      <g
-         id="g9911"
-         transform="matrix(0.571057,0,0,0.646281,293.2046,457.7222)">
-        <path
-           id="path8109"
-           style="opacity:1;color:#000000;fill:url(#radialGradient21986);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 800.06862,895.59747 C 800.06862,898.51334 782.52213,900.87711 760.87744,900.87711 C 739.23275,900.87711 721.68626,898.51334 721.68626,895.59747 C 721.68626,892.6816 739.23275,890.31783 760.87744,890.31783 C 782.52213,890.31783 800.06862,892.6816 800.06862,895.59747 z " />
-        <path
-           id="path8111"
-           style="color:#000000;fill:url(#linearGradient21988);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           transform="translate(-2.027946e-7,12.18378)"
-           d="M 799.86556,884.22593 C 793.36754,893.23219 782.51097,900.87711 760.87744,900.87711 C 739.24391,900.87711 727.66931,891.94233 721.68626,883.81981 C 756.92502,889.9117 765.34483,889.4341 799.86556,884.22593 z " />
-      </g>
-      <rect
-         id="rect8098"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.999488,-3.199729e-2,-6.823932e-2,0.997669,0,0)"
-         y="948.75696"
-         x="793.65533"
-         height="119.00449"
-         width="2.421216" />
-    </g>
-    <path
-       id="path7172"
-       style="color:#000000;fill:url(#linearGradient21990);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 666.98477,874.01151 C 661.91215,874.01154 657.79726,877.03628 657.79727,880.76151 C 657.7973,883.28322 659.69239,885.47812 662.48477,886.63651 L 662.48477,915.10526 L 596.45352,915.10526 L 596.73477,922.57401 L 662.23477,928.01151 L 662.48477,928.01151 L 662.48477,1033.7303 C 659.87852,1037.3812 648.16738,1048.352 634.76602,1050.9491 C 622.71362,1053.2844 649.18306,1058.8524 667.45352,1058.7928 C 685.7232,1058.7333 709.07681,1053.1347 697.79727,1050.9491 C 688.57051,1049.161 675.86195,1038.2246 671.48477,1034.2616 L 671.48477,927.98026 L 736.01602,921.69901 L 736.01602,915.10526 L 671.48477,915.10526 L 671.48477,886.63651 C 674.27963,885.47864 676.17228,883.28453 676.17227,880.76151 C 676.1723,877.03631 672.05742,874.0115 666.98477,874.01151 z " />
-    <path
-       id="path11769"
-       style="color:#000000;fill:url(#linearGradient21992);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(-0.134374,0.335517,-0.340315,-0.132479,1032.981,877.1416)"
-       d="M 507.72468,916.81576 L 484.07619,918.83319 L 460.36885,919.96576 L 451.14238,898.09813 L 442.73927,875.90109 L 460.68548,860.36872 L 479.19942,845.51763 L 499.51726,857.78573 L 519.36261,870.80429 L 513.97352,893.91875 L 507.72468,916.81576 z " />
-    <g
-       id="g4054"
-       style="stroke:#000000;stroke-width:2.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.649307,0.410145,-0.289594,0.919597,699.6512,1.482277)">
-      <g
-         id="g3996"
-         style="stroke:#000000;stroke-width:4.76802254;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.576811,0,0,0.686329,128.7083,280.1342)">
-        <path
-           id="rect3032"
-           style="fill:url(#linearGradient21994);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.76802254;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 276.84375,911.0625 L 276.84375,989.28125 L 277.09375,989.28125 C 276.92316,989.86231 276.84375,990.46384 276.84375,991.0625 C 276.84375,999.6226 294.76374,1006.5625 316.84375,1006.5625 C 338.92375,1006.5625 356.84374,999.62261 356.84375,991.0625 C 356.84375,990.46304 356.73354,989.86305 356.5625,989.28125 L 356.84375,989.28125 L 356.84375,911.0625 L 276.84375,911.0625 z " />
-        <path
-           id="path3034"
-           style="fill:#f2d8a1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.74592447;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="matrix(1.009334,0,0,1,-3.743411,21.52787)"
-           d="M 357.2452,887.52399 C 357.25372,896.09086 339.50823,903.03745 317.61511,903.03745 C 295.72199,903.03745 277.9765,896.09086 277.98502,887.52399 C 277.9765,878.95712 295.72199,872.01053 317.61511,872.01053 C 339.50823,872.01053 357.25372,878.95712 357.2452,887.52399 L 357.2452,887.52399 z " />
-      </g>
-      <path
-         id="rect3932"
-         style="fill:url(#linearGradient21996);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 334.9799,922.80826 C 330.15845,922.80826 326.25154,927.12009 326.25154,932.42554 C 326.25154,937.731 330.15845,942.02679 334.9799,942.02678 C 335.41809,942.02678 335.83965,941.98324 336.26058,941.91458 L 465.5309,941.91458 L 465.5309,922.92046 L 336.26058,922.92046 C 335.83965,922.8518 335.41809,922.80826 334.9799,922.80826 z " />
-      <path
-         id="path3934"
-         style="color:#000000;fill:#dd9600;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:9.71709728;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0,0.24316,-0.391992,0,813.2404,855.1861)"
-         d="M 357.2452,887.52399 C 357.25372,896.09086 339.50823,903.03745 317.61511,903.03745 C 295.72199,903.03745 277.9765,896.09086 277.98502,887.52399 C 277.9765,878.95712 295.72199,872.01053 317.61511,872.01053 C 339.50823,872.01053 357.25372,878.95712 357.2452,887.52399 L 357.2452,887.52399 z " />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     id="layer1" />
-  <rect
-     id="rect19117"
-     style="fill:#ddddd3;fill-opacity:1;stroke:black;stroke-width:1.29999995;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     y="809.36218"
-     x="295"
-     ry="10.456966"
-     rx="10.456965"
-     height="19"
-     width="0" />
-  <text
-     xml:space="preserve"
-     id="text13940"
-     style="font-size:22.53170586px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.32081166px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931229)"
-     y="40.768425"
-     x="26.500059"><tspan
-       id="tspan13942"
-       style="stroke-width:0.32081166"
-       y="40.768425"
-       x="26.500059">TuxGuitar Player 0.8 Version</tspan></text>
-  <text
-     xml:space="preserve"
-     id="text14708"
-     style="font-size:7.94642258px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.11314224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931229)"
-     y="54.076897"
-     x="26.042126"><tspan
-       id="tspan14710"
-       style="stroke-width:0.11314224"
-       y="54.076897"
-       x="26.042126">Buttons defaut</tspan></text>
-  <text
-     xml:space="preserve"
-     id="text14712"
-     style="font-size:7.94658804px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.11314419px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931229)"
-     y="54.680504"
-     x="192.78673"><tspan
-       id="tspan14714"
-       style="stroke-width:0.11314419"
-       y="54.680504"
-       x="192.78673">Buttons is on</tspan></text>
-  <g
-     id="g14668"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11961"
-       style="fill:url(#radialGradient23057);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="423.20502"
-       x="468.68112"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11963"
-       style="fill:#d4aa00;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 486.4644,431.15917 L 486.4644,473.09596 L 486.4644,515.03274 L 507.773,494.07524 L 508.08182,493.77025 L 508.08182,506.6236 L 529.39041,489.87067 L 550.67971,473.09596 L 529.39041,456.32124 L 508.08182,439.56831 L 508.08182,452.42167 L 507.773,452.11667 L 486.4644,431.15917 z " />
-  </g>
-  <g
-     id="g14680"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11977"
-       style="fill:url(#radialGradient23061);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="423.20511"
-       x="129.84697"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11979"
-       style="fill:#d4aa00;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 211.84556,431.15928 L 211.84556,473.09605 L 211.84556,515.03284 L 190.53697,494.07534 L 190.22814,493.77035 L 190.22814,506.6237 L 168.91955,489.87077 L 147.63025,473.09605 L 168.91955,456.32135 L 190.22814,439.56842 L 190.22814,452.42178 L 190.53697,452.11678 L 211.84556,431.15928 z " />
-  </g>
-  <g
-     id="g14672"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11983"
-       style="fill:url(#radialGradient23063);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="423.20508"
-       x="16.902269"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11985"
-       style="fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 107.04162,430.81066 L 90.746186,446.99717 L 90.746186,431.15923 L 69.44012,452.11673 L 69.135125,452.42172 L 69.135125,439.56837 L 47.829059,456.3213 L 26.544777,473.09601 L 47.829059,489.87073 L 69.135125,506.62366 L 69.135125,493.7703 L 69.44012,494.0753 L 90.746186,515.0328 L 90.746186,499.19485 L 107.04162,515.38136 L 107.04162,473.09601 L 107.04162,430.81066 z " />
-  </g>
-  <g
-     id="g14656"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11989"
-       style="fill:url(#radialGradient23065);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="scale(-1,1)"
-       y="423.20508"
-       x="-681.40753"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11991"
-       style="fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 591.26818,430.81066 L 607.56361,446.99717 L 607.56361,431.15923 L 628.86968,452.11673 L 629.17467,452.42172 L 629.17467,439.56837 L 650.48074,456.3213 L 671.76502,473.09601 L 650.48074,489.87073 L 629.17467,506.62366 L 629.17467,493.7703 L 628.86968,494.0753 L 607.56361,515.0328 L 607.56361,499.19485 L 591.26818,515.38136 L 591.26818,473.09601 L 591.26818,430.81066 z " />
-  </g>
-  <g
-     id="g14488"
-     style="fill-rule:evenodd;display:inline"
-     transform="matrix(0.1699352,0,0,0.1699352,278.84004,51.405169)">
-    <rect
-       id="rect14490"
-       style="fill:url(#radialGradient23067);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="41.576488"
-       x="188.79814"
-       ry="31.803694"
-       rx="31.803694"
-       height="143.13216"
-       width="143.13216" />
-    <path
-       id="path14492"
-       style="opacity:1;fill:#56ff00;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.62562513;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="matrix(0.648516,0,0,0.694809,486.9305,19.37587)"
-       d="M -418.05177,221.55162 L -418.05177,134.95318 L -418.05177,48.354749 L -343.05532,91.653969 L -268.05888,134.95319 L -343.05532,178.25241 L -418.05177,221.55162 z " />
-  </g>
-  <g
-     id="g14664"
-     transform="matrix(0.2437635,0,0,0.2437635,223.81,-75.031711)">
-    <rect
-       id="rect14496"
-       style="fill:url(#radialGradient23069);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67133"
-       x="470.31363"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14498"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 488.0969,555.62547 L 488.0969,597.56226 L 488.0969,639.49904 L 509.4055,618.54154 L 509.71432,618.23655 L 509.71432,631.0899 L 531.02291,614.33697 L 552.31221,597.56226 L 531.02291,580.78754 L 509.71432,564.03461 L 509.71432,576.88797 L 509.4055,576.58297 L 488.0969,555.62547 z " />
-  </g>
-  <g
-     id="g14688"
-     transform="matrix(0.2437635,0,0,0.2437635,223.81,-75.031711)">
-    <rect
-       id="rect14502"
-       style="fill:url(#radialGradient23071);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67133"
-       x="244.42415"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <g
-       id="g14504"
-       style="fill:#2a7fff;fill-opacity:0.75;fill-rule:evenodd"
-       transform="matrix(0.697131,0,0,0.697131,114.7389,494.0779)">
-      <rect
-         id="rect14506"
-         style="opacity:1;fill:#2a7fff;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.43374991;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="86.419327"
-         x="214.01666"
-         ry="31.803694"
-         rx="31.803694"
-         height="124.04787"
-         width="38.168575" />
-      <rect
-         id="rect14508"
-         style="opacity:1;fill:#2a7fff;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.43374991;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="86.419327"
-         x="263.00107"
-         ry="31.803694"
-         rx="31.803694"
-         height="124.04787"
-         width="38.168575" />
-    </g>
-  </g>
-  <g
-     id="g14684"
-     transform="matrix(0.2437635,0,0,0.2437635,194.95323,-74.069821)">
-    <rect
-       id="rect14512"
-       style="fill:url(#radialGradient23073);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67139"
-       x="131.47948"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14514"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 213.47806,555.62558 L 213.47806,597.56235 L 213.47806,639.49914 L 192.16947,618.54164 L 191.86064,618.23665 L 191.86064,631.09 L 170.55205,614.33707 L 149.26275,597.56235 L 170.55205,580.78765 L 191.86064,564.03472 L 191.86064,576.88808 L 192.16947,576.58308 L 213.47806,555.62558 z " />
-  </g>
-  <g
-     id="g14676"
-     transform="matrix(0.2437635,0,0,0.2437635,195.43418,-74.550761)">
-    <rect
-       id="rect14518"
-       style="fill:url(#radialGradient23075);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67139"
-       x="18.534769"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14520"
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 108.67412,555.27696 L 92.378686,571.46347 L 92.378686,555.62553 L 71.07262,576.58303 L 70.767625,576.88802 L 70.767625,564.03467 L 49.461559,580.7876 L 28.177277,597.56231 L 49.461559,614.33703 L 70.767625,631.08996 L 70.767625,618.2366 L 71.07262,618.5416 L 92.378686,639.4991 L 92.378686,623.66115 L 108.67412,639.84766 L 108.67412,597.56231 L 108.67412,555.27696 z " />
-  </g>
-  <g
-     id="g14660"
-     transform="matrix(0.2437635,0,0,0.2437635,223.81,-75.031711)">
-    <rect
-       id="rect14524"
-       style="fill:url(#radialGradient23077);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="scale(-1,1)"
-       y="547.67139"
-       x="-683.04004"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14526"
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 592.90068,555.27696 L 609.19611,571.46347 L 609.19611,555.62553 L 630.50218,576.58303 L 630.80717,576.88802 L 630.80717,564.03467 L 652.11324,580.7876 L 673.39752,597.56231 L 652.11324,614.33703 L 630.80717,631.08996 L 630.80717,618.2366 L 630.50218,618.5416 L 609.19611,639.4991 L 609.19611,623.66115 L 592.90068,639.84766 L 592.90068,597.56231 L 592.90068,555.27696 z " />
-  </g>
-  <g
-     id="g3617"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/transport_stop_1.png"
-     inkscape:export-xdpi="93.671768"
-     inkscape:export-ydpi="93.671768"
-     transform="matrix(0.6801604,0,0,0.6801604,-12.570086,11.373789)">
-    <rect
-       width="35.760925"
-       height="35.760925"
-       rx="7.9460096"
-       ry="7.9460096"
-       x="-173.95715"
-       y="68.81382"
-       transform="scale(-1,1)"
-       style="fill:url(#radialGradient3567);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74953651;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect1657" />
-    <rect
-       width="26.976021"
-       height="30.992802"
-       rx="22.477581"
-       ry="7.9460096"
-       x="142.58868"
-       y="71.306572"
-       style="fill:#722a2d;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.02269864;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect1692" />
-  </g>
-  <rect
-     id="rect32996"
-     style="fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     y="525.36218"
-     x="687.5"
-     height="0"
-     width="2" />
-  <rect
-     id="rect2827"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="364.07678"
-     x="26.202015"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_accentuated.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect2837"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="364.07678"
-     x="74.713554"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_fade_in.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect6548"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.86951"
-     x="123.14871"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_ghost.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect6595"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="362.53619"
-     x="170.95718"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_grace.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect7500"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="362.53619"
-     x="219.48363"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_hammer.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect7533"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.17297"
-     x="268.23099"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_harmonic.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3143"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.17297"
-     x="317.33041"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_heavy_accentuated.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3182"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.17297"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_palm_mute.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <text
-     xml:space="preserve"
-     id="text17219"
-     style="font-size:23.18305969px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.33008549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931228)"
-     y="111.45198"
-     x="25.711828"><tspan
-       id="tspan17221"
-       style="stroke-width:0.33008549"
-       y="111.45198"
-       x="25.711828">Toolbar  icons</tspan></text>
-  <rect
-     id="rect4097"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.2746"
-     x="264.20929"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect14867"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.48258"
-     x="26.252657"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect15996"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.25077"
-     x="74.015976"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g32002"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path17175"
-       style="fill:url(#radialGradient24181);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 145.47587,425.69429 C 133.63167,425.69429 124.02417,438.17757 124.02415,453.55736 C 124.02415,468.93714 133.63253,481.2776 145.47587,481.42044 C 158.43256,481.58056 162.04794,467.44225 166.22497,467.54379 C 170.40896,467.64549 173.39835,473.20864 179.66248,473.20863 C 181.97807,473.20861 184.16425,472.36905 186.07384,470.92513 C 182.71696,470.14458 180.23335,467.46246 180.23335,464.27224 C 180.23335,461.8528 181.65978,459.7477 183.8123,458.51958 L 178.63051,458.51958 L 178.63051,447.93644 L 192.59499,447.93644 C 192.7307,436.89206 186.65471,434.38915 181.26532,434.38915 C 175.08106,434.38916 172.09783,439.6069 167.08128,439.74659 C 162.07174,439.88606 160.32745,425.69429 145.47587,425.69429 z " />
-    <g
-       id="g31944">
-      <rect
-         id="rect17179"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-178.47929"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect17181"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-177.67867"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <g
-       id="g31940">
-      <rect
-         id="rect17185"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-165.349"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect17187"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-164.54837"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <rect
-       id="rect17189"
-       style="fill:#50211b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-205.54079"
-       x="447.94327"
-       height="26.741035"
-       width="10.568314" />
-    <path
-       id="path17191"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.2851,232.6176)"
-       d="M 462.5,843.48718 C 462.5,845.075 461.21282,846.36218 459.625,846.36218 C 458.03718,846.36218 456.75,845.075 456.75,843.48718 C 456.75,841.89936 458.03718,840.61218 459.625,840.61218 C 461.21282,840.61218 462.5,841.89936 462.5,843.48718 z " />
-    <path
-       id="path17193"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.5079,232.6176)"
-       d="M 489.75,843.98718 C 489.75,845.575 488.46282,846.86218 486.875,846.86218 C 485.28718,846.86218 484,845.575 484,843.98718 C 484,842.39936 485.28718,841.11218 486.875,841.11218 C 488.46282,841.11218 489.75,842.39936 489.75,843.98718 L 489.75,843.98718 z " />
-    <rect
-       id="rect17197"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-154.30049"
-       x="444.74075"
-       ry="4.4671021"
-       rx="4.4671021"
-       height="3.0423932"
-       width="16.172722" />
-    <g
-       id="g17199"
-       transform="matrix(0,0.414685,-0.450725,0,527.3259,253.3075)">
-      <rect
-         id="rect17201"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="831.05066"
-         x="466.6709"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17203"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="471.80353"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17205"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="476.93613"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17207"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="482.06876"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17209"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="487.20135"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17211"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="492.33401"
-         height="1.7859424"
-         width="3.2650242" />
-    </g>
-    <rect
-       id="rect17195"
-       style="fill:url(#linearGradient24183);fill-opacity:1;stroke:url(#linearGradient24185);stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-147.45714"
-       x="446.52585"
-       height="2.0050554"
-       width="13.102184" />
-  </g>
-  <rect
-     id="rect22848"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.2508"
-     x="121.7793"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect26806"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.25077"
-     x="169.5426"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect26904"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.25077"
-     x="217.30595"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect2675"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="74.221016"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g45292"
-     transform="matrix(0.4620139,0,0,0.4620139,114.26669,-118.59787)">
-    <path
-       id="rect2755"
-       style="fill:url(#linearGradient24187);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 138.73058,531.2239 C 133.41154,531.2239 129.12943,536.48003 129.12943,543.00896 L 128.99617,587.91492 C 128.99617,594.44385 128.69562,599.14377 129.68196,599.88538 L 179.81549,599.69998 C 185.13453,599.69998 189.41664,594.44383 189.41664,587.91492 L 189.41664,551.89685 C 189.41664,545.36793 185.13453,540.11179 179.81549,540.11179 L 163.71357,540.11179 C 162.66613,534.99411 158.91569,531.2239 154.41245,531.2239 L 138.73058,531.2239 z " />
-    <rect
-       id="rect5447"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.74023503;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="matrix(1,0,-7.419016e-2,0.997244,0,0)"
-       y="544.21033"
-       x="176.32399"
-       height="54.450268"
-       width="46.882996" />
-    <rect
-       id="rect4560"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.74563318;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(1,0,-0.181321,0.983424,0,0)"
-       y="554.75165"
-       x="242.48486"
-       height="55.214611"
-       width="46.882996" />
-    <path
-       id="rect2762"
-       style="fill:url(#linearGradient24189);fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 152.00486,552.73763 L 193.00752,552.73763 C 198.33252,552.73763 201.84799,556.89227 200.88974,562.05297 L 195.6123,590.47494 C 194.65405,595.63564 193.79374,599.79028 189.34611,599.79028 L 129.79758,599.97568 C 134.8901,598.97255 136.08684,585.60303 137.3379,580.01541 L 140.66326,562.05297 C 141.62151,556.89227 146.67986,552.73763 152.00486,552.73763 z " />
-  </g>
-  <rect
-     id="rect14372"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="121.90878"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g43463"
-     transform="matrix(0.4620139,0,0,0.4620139,18.988746,-66.628171)">
-    <rect
-       id="rect11694"
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.00020504;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.688085,-0.72563,0.715699,0.698409,0,0)"
-       y="574.77551"
-       x="-255.44737"
-       height="17.583229"
-       width="21.502913" />
-    <path
-       id="path11681"
-       style="fill:url(#linearGradient24191);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 243.56035,571.18984 L 263.2346,590.38882 L 293.42803,558.54794 L 293.4154,558.53561 C 301.52985,549.73696 303.79917,538.50041 298.44593,533.27648 C 293.09269,528.05257 282.1187,530.79473 273.76641,539.36129 L 273.75378,539.34896 L 243.56035,571.18984 z " />
-    <g
-       id="g13472"
-       style="stroke:none;stroke-width:10.65287209;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.193838,-0.204415,0.201505,0.196637,23.43035,509.7359)">
-      <rect
-         id="rect13468"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="772.02551"
-         x="349.14398"
-         height="13.878055"
-         width="13.878055" />
-      <rect
-         id="rect13470"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="746.92316"
-         x="349.14398"
-         height="13.878055"
-         width="13.878055" />
-    </g>
-    <path
-       id="path16173"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.60036874;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.833248,0,0,0.833248,129.3815,-26.35132)"
-       d="M 197,683.36218 C 197,686.67589 194.53757,689.36218 191.5,689.36218 C 188.46243,689.36218 186,686.67589 186,683.36218 C 186,680.04847 188.46243,677.36218 191.5,677.36218 C 194.53757,677.36218 197,680.04847 197,683.36218 z " />
-  </g>
-  <rect
-     id="rect18957"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="169.59654"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g27239"
-     style="stroke:#000000;stroke-width:4.48613548;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     transform="matrix(0.4119487,0,0,0.4119487,84.557559,-38.340731)">
-    <path
-       id="path18941"
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 360.92803,523.51862 L 360.92803,541.25088 L 360.92803,558.98314 L 351.90518,550.12162 L 351.77441,549.99266 L 351.77441,555.42748 L 342.75156,548.34378 L 333.73689,541.25088 L 342.75156,534.15798 L 351.77441,527.07428 L 351.77441,532.50911 L 351.90518,532.38015 L 360.92803,523.51862 z " />
-    <path
-       id="path18943"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 381.93992,524.38097 L 381.93992,542.11324 L 381.93992,559.8455 L 390.96277,550.98397 L 391.09354,550.85501 L 391.09354,556.28983 L 400.11638,549.20614 L 409.13106,542.11324 L 400.11638,535.02033 L 391.09354,527.93663 L 391.09354,533.37145 L 390.96277,533.2425 L 381.93992,524.38097 z " />
-    <rect
-       id="rect18947"
-       style="fill:#5696f6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="571.25983"
-       x="382.67221"
-       ry="14.159336"
-       rx="14.159328"
-       height="36.565613"
-       width="11.267021" />
-    <rect
-       id="rect18949"
-       style="fill:#5696f6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="571.25983"
-       x="397.13196"
-       ry="14.159336"
-       rx="14.159328"
-       height="36.565613"
-       width="11.267021" />
-    <path
-       id="path18951"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 360.92806,571.81035 L 360.92806,589.54262 L 360.92806,607.27489 L 351.90521,598.41336 L 351.77444,598.2844 L 351.77444,603.71922 L 342.7516,596.63553 L 333.73692,589.54262 L 342.7516,582.44972 L 351.77444,575.36601 L 351.77444,580.80084 L 351.90521,580.67188 L 360.92806,571.81035 z " />
-    <path
-       id="path18953"
-       style="fill:#54fb00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:11.65600395;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="matrix(0.37892,0,0,0.390929,505.6404,512.6397)"
-       d="M -418.05177,221.55162 L -418.05177,134.95318 L -418.05177,48.354749 L -343.05532,91.653969 L -268.05888,134.95319 L -343.05532,178.25241 L -418.05177,221.55162 z " />
-  </g>
-  <rect
-     id="rect22612"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="217.2843"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g46196"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-118.59787)">
-    <path
-       id="rect19917"
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.90116501;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 467.50855,540.94367 L 503.60891,540.94367 L 492.37849,567.65561 L 456.27815,567.65561 L 467.50855,540.94367 z " />
-    <path
-       id="path19910"
-       style="fill:url(#linearGradient24193);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.90116501;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 457.70016,558.34707 C 447.92002,558.94002 439.41043,567.52267 437.95776,573.2013 C 436.54168,578.73699 439.59933,592.36751 440.19183,595.15793 C 440.30149,595.67442 479.31823,600.61312 483.97626,600.61312 C 483.58877,597.82398 483.14623,584.55447 483.15878,580.4671 C 483.21427,562.59041 495.7162,559.11261 495.7162,559.11261 L 457.70016,558.34707 z " />
-    <path
-       id="path19914"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.90116501;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 511.71457,571.48217 C 511.71457,582.93257 511.39274,586.63852 510.76509,592.8703 C 510.38168,593.37582 485.33265,600.27736 484.95405,600.49226 C 484.23649,595.17567 483.5886,588.3454 483.23941,582.65947 C 482.68363,573.60927 485.88401,560.14651 497.82346,559.11941 C 505.75458,558.43043 511.71457,560.03179 511.71457,571.48217 z " />
-    <path
-       id="path19922"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 479.72135,529.68203 L 505.84121,530.3466 C 505.84121,530.3466 495.8971,539.26626 490.25951,558.82776 C 482.38594,558.82373 469.90852,557.92101 464.13966,558.1632 C 470.0212,538.21741 479.72135,529.68203 479.72135,529.68203 z " />
-    <path
-       id="path21721"
-       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.93912643;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 452.69804,567.82906 C 452.69804,567.82906 473.98361,569.33328 474.32419,569.33328 C 474.66476,569.33328 478.24075,563.96106 478.24075,563.96106 L 457.46601,563.1015 L 452.69804,567.82906 z " />
-    <rect
-       id="rect21723"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.87049818;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.993753,0.111602,0,1,0,0)"
-       y="534.75836"
-       x="448.51889"
-       height="5.8020134"
-       width="29.473152" />
-    <path
-       id="path22677"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97529125px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 479.86168,536.92989 L 495.90144,537.10555" />
-    <path
-       id="path22679"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97529125px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.78476,543.84821 L 490.82452,544.02386" />
-    <path
-       id="path22681"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97529125px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 471.50763,551.05002 L 487.5474,551.40133" />
-  </g>
-  <rect
-     id="rect23611"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.91042"
-     x="26.171482"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g7666"
-     transform="matrix(0.4620139,0,0,0.4620139,114.26669,-118.59787)">
-    <path
-       id="rect26292"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.91859531;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 47.833889,531.14138 L 26.403966,550.01861 L 26.403966,599.84603 L 93.939784,599.84603 L 93.939784,531.14138 L 47.833889,531.14138 z " />
-    <path
-       id="rect24514"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 78.23077,548.38599 L 78.23077,558.60577 L 68.01099,558.60577 L 68.01099,568.14423 L 78.23077,568.14423 L 78.23077,578.36401 L 87.76923,578.36401 L 87.76923,568.14423 L 97.98901,568.14423 L 97.98901,558.60577 L 87.76923,558.60577 L 87.76923,548.38599 L 78.23077,548.38599 z " />
-    <path
-       id="path26307"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 47.234451,548.9744 L 26.127061,549.11157 L 46.937686,531.35609 L 47.234451,548.9744 z " />
-  </g>
-  <g
-     id="g32023"
-     style="display:inline"
-     transform="matrix(0,-0.4620139,0.4620139,0,-162.63077,218.93502)">
-    <path
-       id="path32025"
-       style="fill:url(#radialGradient24195);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 145.47587,425.69429 C 133.63167,425.69429 124.02417,438.17757 124.02415,453.55736 C 124.02415,468.93714 133.63253,481.2776 145.47587,481.42044 C 158.43256,481.58056 162.04794,467.44225 166.22497,467.54379 C 170.40896,467.64549 173.39835,473.20864 179.66248,473.20863 C 181.97807,473.20861 184.16425,472.36905 186.07384,470.92513 C 182.71696,470.14458 180.23335,467.46246 180.23335,464.27224 C 180.23335,461.8528 181.65978,459.7477 183.8123,458.51958 L 178.63051,458.51958 L 178.63051,447.93644 L 192.59499,447.93644 C 192.7307,436.89206 186.65471,434.38915 181.26532,434.38915 C 175.08106,434.38916 172.09783,439.6069 167.08128,439.74659 C 162.07174,439.88606 160.32745,425.69429 145.47587,425.69429 z " />
-    <g
-       id="g32027">
-      <rect
-         id="rect32029"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-178.47929"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect32031"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-177.67867"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <g
-       id="g32033">
-      <rect
-         id="rect32035"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-165.349"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect32037"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-164.54837"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <rect
-       id="rect32039"
-       style="fill:#50211b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-205.54079"
-       x="447.94327"
-       height="26.741035"
-       width="10.568314" />
-    <path
-       id="path32041"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.2851,232.6176)"
-       d="M 462.5,843.48718 C 462.5,845.075 461.21282,846.36218 459.625,846.36218 C 458.03718,846.36218 456.75,845.075 456.75,843.48718 C 456.75,841.89936 458.03718,840.61218 459.625,840.61218 C 461.21282,840.61218 462.5,841.89936 462.5,843.48718 z " />
-    <path
-       id="path32043"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.5079,232.6176)"
-       d="M 489.75,843.98718 C 489.75,845.575 488.46282,846.86218 486.875,846.86218 C 485.28718,846.86218 484,845.575 484,843.98718 C 484,842.39936 485.28718,841.11218 486.875,841.11218 C 488.46282,841.11218 489.75,842.39936 489.75,843.98718 L 489.75,843.98718 z " />
-    <rect
-       id="rect32045"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-154.30049"
-       x="444.74075"
-       ry="4.4671021"
-       rx="4.4671021"
-       height="3.0423932"
-       width="16.172722" />
-    <g
-       id="g32047"
-       transform="matrix(0,0.414685,-0.450725,0,527.3259,253.3075)">
-      <rect
-         id="rect32049"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="831.05066"
-         x="466.6709"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32051"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="471.80353"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32053"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="476.93613"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32055"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="482.06876"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32057"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="487.20135"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32059"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="492.33401"
-         height="1.7859424"
-         width="3.2650242" />
-    </g>
-    <rect
-       id="rect32061"
-       style="fill:url(#linearGradient24197);fill-opacity:1;stroke:url(#linearGradient24199);stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-147.45714"
-       x="446.52585"
-       height="2.0050554"
-       width="13.102184" />
-  </g>
-  <rect
-     id="rect32069"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.91042"
-     x="265.26404"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g34880"
-     transform="matrix(0.4620139,0,0,0.4267007,18.65561,-46.663401)">
-    <rect
-       id="rect33907"
-       style="fill:url(#linearGradient24201);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="526.11218"
-       x="542.25"
-       height="78.5"
-       width="72.5" />
-    <g
-       id="g33899"
-       transform="matrix(1,0,0,0.912791,-86.75002,49.30465)">
-      <path
-         id="path33885"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 646.25,601.61218 L 646.25,529.11218" />
-      <rect
-         id="rect32093"
-         style="fill:url(#linearGradient24203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="535.61218"
-         x="639"
-         height="27"
-         width="14.5" />
-      <path
-         id="path33887"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 665.25,601.61218 L 665.25,529.11218" />
-      <rect
-         id="rect33889"
-         style="fill:url(#linearGradient24205);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="564.11218"
-         x="658"
-         height="27"
-         width="14.5" />
-      <path
-         id="path33893"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 684.25,601.61218 L 684.25,529.11218" />
-      <rect
-         id="rect33895"
-         style="fill:url(#linearGradient24207);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="546.11218"
-         x="677"
-         height="27"
-         width="14.5" />
-    </g>
-    <rect
-       id="rect34810"
-       style="fill:url(#linearGradient24209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="526.11218"
-       x="542.25"
-       height="78.5"
-       width="72.5" />
-    <path
-       id="path34814"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.86620283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 559.49998,600.27658 L 559.49998,534.09924" />
-    <rect
-       id="rect34816"
-       style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="540.03241"
-       x="552.25"
-       height="24.645357"
-       width="14.5" />
-    <path
-       id="path34818"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.86620283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 578.49998,600.27658 L 578.49998,534.09924" />
-    <rect
-       id="rect34820"
-       style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="566.04694"
-       x="571.25"
-       height="24.645357"
-       width="14.5" />
-    <path
-       id="path34822"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.86620283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 597.49998,600.27658 L 597.49998,534.09924" />
-    <rect
-       id="rect34824"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="549.6167"
-       x="590.25"
-       height="24.645357"
-       width="14.5" />
-  </g>
-  <rect
-     id="rect34943"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.88399"
-     x="26.171482"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect37863"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.65297"
-     x="122.73254"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect37847"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.88399"
-     x="76.069054"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect49778"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.42195"
-     x="170.08907"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52722"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path49780"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 338.50001,696.12549 L 406.50001,696.12549" />
-    <path
-       id="path50667"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(-6.499994,7.263308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path50669"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 369.35853,695.26143 L 369.35853,634.48955" />
-    <path
-       id="path50671"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 338.50001,675.62549 L 406.50001,675.62549" />
-  </g>
-  <rect
-     id="rect50689"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.65297"
-     x="217.44554"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect52500"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.42195"
-     x="267.34311"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52715"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path50709"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 473.56682,634.97014 C 491.05994,635.4857 491.47546,647.90583 491.48512,663.18131 C 486.73449,647.1487 488.86877,643.70599 473.61907,643.74026 C 473.53193,630.54852 473.6402,648.16276 473.56682,634.97014 z " />
-    <path
-       id="path52546"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 441.00001,696.62549 L 509.00001,696.62549" />
-    <path
-       id="path52548"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(96.00001,7.763308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52550"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 471.85853,695.76143 L 471.85853,634.98955" />
-    <path
-       id="path52552"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 441.00001,676.12549 L 509.00001,676.12549" />
-  </g>
-  <g
-     id="g52707"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path52519"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 581.65647,634.49305 C 599.14959,634.96367 599.56511,646.30103 599.57477,660.24482 C 594.82414,645.6099 596.95842,642.46732 581.70872,642.4986 C 581.62158,630.4569 581.72985,646.53556 581.65647,634.49305 z " />
-    <path
-       id="path52570"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 549.00001,696.12549 L 617.00001,696.12549" />
-    <path
-       id="path52572"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(204,7.263308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52574"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 579.85853,695.26143 L 579.85853,634.48955" />
-    <path
-       id="path52576"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 549.00001,675.62549 L 617.00001,675.62549" />
-    <path
-       id="path52578"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 581.51919,644.69678 C 599.01231,645.1674 599.42783,656.50476 599.43749,670.44855 C 594.68686,655.81363 596.82114,652.67105 581.57144,652.70233 C 581.4843,640.66063 581.59257,656.73929 581.51919,644.69678 z " />
-  </g>
-  <rect
-     id="rect52589"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.65297"
-     x="315.16162"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52697"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path52593"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,634.99305 C 702.64959,635.46096 703.06511,646.7332 703.07477,660.59689 C 698.32414,646.04604 700.45842,642.92151 685.20872,642.95261 C 685.12158,630.98009 685.22985,646.96638 685.15647,634.99305 z " />
-    <path
-       id="path52597"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 652.50001,696.62549 L 720.50001,696.62549" />
-    <path
-       id="path52599"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(307.5,7.763308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52601"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 683.35853,695.76143 L 683.35853,634.98955" />
-    <path
-       id="path52603"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 652.50001,676.12549 L 720.50001,676.12549" />
-    <path
-       id="path52605"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,644.55268 C 702.64959,645.02059 703.06511,656.29283 703.07477,670.15652 C 698.32414,655.60567 700.45842,652.48114 685.20872,652.51224 C 685.12158,640.53972 685.22985,656.52601 685.15647,644.55268 z " />
-    <path
-       id="path52614"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,654.60879 C 702.64959,655.07671 703.06511,666.34894 703.07477,680.21263 C 698.32414,665.66178 700.45842,662.53726 685.20872,662.56836 C 685.12158,650.59583 685.22985,666.58212 685.15647,654.60879 z " />
-    <path
-       id="path52629"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,664.55689 C 702.64959,665.02481 703.06511,676.29704 703.07477,690.16073 C 698.32414,675.60988 700.45842,672.48536 685.20872,672.51646 C 685.12158,660.54393 685.22985,676.53022 685.15647,664.55689 z " />
-  </g>
-  <rect
-     id="rect52728"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="272.55188"
-     x="25.900524"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52730"
-     style="display:inline"
-     transform="matrix(0.4620139,0,0,0.4620139,-125.53291,-16.498231)">
-    <path
-       id="path52732"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 338.50001,696.12549 L 406.50001,696.12549" />
-    <path
-       id="path52734"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(-6.499994,7.263308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52736"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 369.35853,695.26143 L 369.35853,634.48955" />
-    <path
-       id="path52738"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 338.50001,675.62549 L 406.50001,675.62549" />
-  </g>
-  <rect
-     id="rect52740"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-     transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-     y="174.604"
-     x="245.46577"
-     height="4.6201973"
-     width="4.8512053" />
-  <rect
-     id="rect52758"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="273.01251"
-     x="76.300064"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52774"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <g
-       id="g52760"
-       style="display:inline"
-       transform="translate(-203,109.5)">
-      <path
-         id="path52762"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 338.50001,696.12549 L 406.50001,696.12549" />
-      <path
-         id="path52764"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(-6.499994,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52766"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 369.35853,695.26143 L 369.35853,634.48955" />
-      <path
-         id="path52768"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 338.50001,675.62549 L 406.50001,675.62549" />
-    </g>
-    <rect
-       id="rect52770"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-       y="431.48001"
-       x="683.43604"
-       height="10.000011"
-       width="10.500011" />
-    <rect
-       id="rect52772"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-       y="420.75739"
-       x="694.15863"
-       height="10.00004"
-       width="10.50004" />
-  </g>
-  <rect
-     id="rect52783"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="272.31952"
-     x="124.58059"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52910"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path52789"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 240.00001,804.12549 L 308.00001,804.12549" />
-    <path
-       id="path52795"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 240.00001,783.62549 L 308.00001,783.62549" />
-    <path
-       id="path52791"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.571633,0,0,1,45.35674,115.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52793"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 260.01295,803.45836 L 260.01295,758.79263" />
-    <path
-       id="path52812"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.571633,0,0,1,62.29158,115.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52814"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 277.14348,803.45838 L 277.14348,758.79265" />
-    <path
-       id="path52826"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.571633,0,0,1,79.44058,115.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52828"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 294.49064,803.45838 L 294.49064,758.79265" />
-    <rect
-       id="rect52830"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       y="758.36218"
-       x="258.86331"
-       height="9.6007662"
-       width="36.69611" />
-    <text
-       xml:space="preserve"
-       id="text52858"
-       style="font-size:25.4596386px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.099156,0.909789)"
-       y="832.28827"
-       x="243.78136"><tspan
-         id="tspan52860"
-         style="font-family:Arial Black"
-         y="832.28827"
-         x="243.78136">3</tspan></text>
-  </g>
-  <rect
-     id="rect52923"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="272.78156"
-     x="170.78207"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g54741"
-     transform="matrix(0.4620139,0,0,0.4620139,19.579651,-67.321181)">
-    <path
-       id="path52961"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 339,814.86218 L 405,746.86218" />
-    <text
-       xml:space="preserve"
-       id="text53848"
-       style="font-size:61.26486969px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-       transform="scale(1.199052,0.833992)"
-       y="979.46033"
-       x="305.48175"><tspan
-         id="tspan53850"
-         y="979.46033"
-         x="305.48175">4</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text54737"
-       style="font-size:61.26483154px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-       transform="scale(1.199052,0.833992)"
-       y="937.19122"
-       x="277.58707"><tspan
-         id="tspan54739"
-         y="937.19122"
-         x="277.58707">4</tspan></text>
-  </g>
-  <rect
-     id="rect54748"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="273.24353"
-     x="218.8316"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g57494"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <g
-       id="g56568"
-       transform="translate(4.064981,5.555418)">
-      <g
-         id="g56560">
-        <rect
-           id="rect54762"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect54764"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g56564"
-         transform="translate(0,-0.109804)">
-        <path
-           id="path55655"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        <path
-           id="path55657"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-           transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-      </g>
-    </g>
-    <g
-       id="g57487">
-      <path
-         id="path55661"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 440.47831,744.01169 L 515.5217,743.84996" />
-      <path
-         id="path55663"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,816.87437 L 515.5217,816.71263" />
-      <path
-         id="path55665"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,798.65871 L 515.52169,798.49697" />
-      <path
-         id="path55667"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,780.44305 L 515.52169,780.28131" />
-      <path
-         id="path55669"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,762.22737 L 515.5217,762.06564" />
-    </g>
-  </g>
-  <rect
-     id="rect61934"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     transform="scale(-1,1)"
-     y="272.78156"
-     x="-309.60117"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g61936"
-     style="display:inline"
-     transform="matrix(-0.4620139,0,0,0.4620139,509.7772,-67.090201)">
-    <g
-       id="g61938"
-       transform="translate(4.064981,5.555418)">
-      <g
-         id="g61940">
-        <rect
-           id="rect61942"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect61944"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g61946"
-         transform="translate(0,-0.109804)">
-        <path
-           id="path61948"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        <path
-           id="path61950"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-           transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-      </g>
-    </g>
-    <g
-       id="g61952">
-      <path
-         id="path61954"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 440.47831,744.01169 L 515.5217,743.84996" />
-      <path
-         id="path61956"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,816.87437 L 515.5217,816.71263" />
-      <path
-         id="path61958"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,798.65871 L 515.52169,798.49697" />
-      <path
-         id="path61960"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,780.44305 L 515.52169,780.28131" />
-      <path
-         id="path61962"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,762.22737 L 515.5217,762.06564" />
-    </g>
-  </g>
-  <rect
-     id="rect2795"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="271.85748"
-     x="316.77866"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g2826"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path2799"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 656.00001,803.12549 L 724.00001,803.12549" />
-    <path
-       id="path2801"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(311,114.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path2803"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 686.85853,802.26143 L 686.85853,741.48955" />
-    <path
-       id="path2805"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 656.00001,782.62549 L 724.00001,782.62549" />
-  </g>
-  <rect
-     id="rect2811"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="271.42603"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g2829"
-     style="display:inline"
-     transform="matrix(0.4620139,0,0,0.4620139,353.68718,-166.28609)">
-    <path
-       id="path2831"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 29.00003,909.12551 L 97.00003,909.12551" />
-    <path
-       id="path2833"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="translate(-316,220.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path2835"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 29.00003,888.62551 L 97.00003,888.62551" />
-  </g>
-  <g
-     id="g6505"
-     transform="matrix(0.354114,0,0,0.354114,-33.453263,-158.43119)">
-    <path
-       id="path3732"
-       style="fill:url(#radialGradient24211);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24213);stroke-width:8.68754482;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-       transform="matrix(0.573037,0.525314,-0.525315,0.573037,481.5014,517.0748)"
-       d="M 233.5,675.11218 C 233.5,697.34164 215.47946,715.36218 193.25,715.36218 C 171.02054,715.36218 153,697.34164 153,675.11218 C 153,652.88272 171.02054,634.86218 193.25,634.86218 C 215.47946,634.86218 233.5,652.88272 233.5,675.11218 L 233.5,675.11218 z " />
-    <path
-       id="path3764"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(3.327811e-2,0,0,0.320967,240.7223,764.1587)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path3766"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0,3.388209e-2,-0.231743,0,411.6397,1008.641)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path3768"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="translate(0.978643,0.558407)"
-       d="M 239.53242,1004.8976 C 239.53336,1006.5092 238.22718,1007.8161 236.61561,1007.8161 C 235.00403,1007.8161 233.69785,1006.5092 233.69879,1004.8976 C 233.69785,1003.286 235.00403,1001.9791 236.61561,1001.9791 C 238.22718,1001.9791 239.53336,1003.286 239.53242,1004.8976 L 239.53242,1004.8976 z " />
-    <path
-       id="path4655"
-       style="fill:#ff9955;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 272.1753,1012.3511 C 276.84309,986.20902 245.19958,952.26377 213.06198,977.50611 C 195.54275,991.26653 223.78991,993.86796 223.78991,993.86796 L 183.20018,1021.8781 L 179.24219,972.87219 C 179.24219,972.87219 190.92506,987.57904 202.09746,970.01034 C 218.10395,944.83997 281.43491,949.19669 272.1753,1012.3511 z " />
-  </g>
-  <g
-     id="g3157"
-     transform="matrix(0.4620139,0,0,0.4620139,-30.982179,-213.54269)">
-    <path
-       id="path4657"
-       style="fill:url(#radialGradient24215);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24217);stroke-width:8.68754482;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-       transform="matrix(0.439208,0.402631,-0.402631,0.439208,452.0883,515.4839)"
-       d="M 233.5,675.11218 C 233.5,697.34164 215.47946,715.36218 193.25,715.36218 C 171.02054,715.36218 153,697.34164 153,675.11218 C 153,652.88272 171.02054,634.86218 193.25,634.86218 C 215.47946,634.86218 233.5,652.88272 233.5,675.11218 L 233.5,675.11218 z " />
-    <path
-       id="path4659"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(2.550624e-2,0,0,0.246007,267.5415,704.8631)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path4661"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0,2.596917e-2,-0.177621,0,398.5423,892.248)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path4663"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.766457,0,0,0.766457,83.78826,119.5963)"
-       d="M 239.53242,1004.8976 C 239.53336,1006.5092 238.22718,1007.8161 236.61561,1007.8161 C 235.00403,1007.8161 233.69785,1006.5092 233.69879,1004.8976 C 233.69785,1003.286 235.00403,1001.9791 236.61561,1001.9791 C 238.22718,1001.9791 239.53336,1003.286 239.53242,1004.8976 L 239.53242,1004.8976 z " />
-    <path
-       id="path6522"
-       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.06582808;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 237.73786,895.32552 C 234.1602,875.28872 258.41359,849.27115 283.04568,868.61832 C 296.47341,879.16509 274.82318,881.15897 274.82318,881.15897 L 305.93346,902.62755 L 308.96709,865.06662 C 308.96709,865.06662 300.01267,876.33878 291.44951,862.87313 C 279.18122,843.58112 230.64077,846.92036 237.73786,895.32552 z " />
-  </g>
-  <g
-     id="g6581"
-     transform="matrix(0.4620139,0,0,0.4620139,209.47582,-116.03325)">
-    <text
-       xml:space="preserve"
-       id="text6554"
-       style="font-size:83.65219116px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-       transform="scale(0.849987,1.176489)"
-       y="781.05951"
-       x="441.81683"><tspan
-         id="tspan6556"
-         y="781.05951"
-         x="441.81683">7</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text6567"
-       style="font-size:85.42720032px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       transform="scale(0.865098,1.155939)"
-       y="794.94482"
-       x="392.89487"><tspan
-         id="tspan6569"
-         y="794.94482"
-         x="392.89487">A</tspan></text>
-  </g>
-  <path
-     id="path6599"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 31.433469,254.58377 L 62.850463,254.58377" />
-  <path
-     id="path6601"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.84805799;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-     d="M 45.524822,245.6899 C 45.524822,248.05017 43.197748,249.96354 40.327159,249.96354 C 37.456571,249.96354 35.129496,248.05017 35.129496,245.6899 C 35.129496,243.32964 37.456571,241.41626 40.327159,241.41626 C 43.197748,241.41626 45.524822,243.32964 45.524822,245.6899 z " />
-  <path
-     id="path6603"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.42819726;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     d="M 45.690556,244.58059 L 45.690556,225.81728" />
-  <path
-     id="path6605"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     d="M 31.433469,245.11247 L 62.850463,245.11247" />
-  <path
-     id="path6613"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.75689816;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 45.211872,248.30696 C 53.916759,256.05016 61.792607,248.30696 61.792607,248.30696 L 61.792607,248.30696" />
-  <g
-     id="g7524"
-     transform="matrix(0.4620139,0,0,0.4620139,-175.23163,-163.90485)">
-    <path
-       id="path7504"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 585.0017,844.15855 C 602.49482,844.62917 602.91034,855.96653 602.92,869.91032 C 598.16937,855.2754 600.30365,852.13282 585.05395,852.1641 C 584.96681,840.1224 585.07508,856.20106 585.0017,844.15855 z " />
-    <path
-       id="path7506"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 552.34524,905.79099 L 620.34524,905.79099" />
-    <path
-       id="path7508"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(207.3452,216.9288)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path7510"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 583.20376,904.92693 L 583.20376,844.15505" />
-    <path
-       id="path7512"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 552.34524,885.29099 L 620.34524,885.29099" />
-    <path
-       id="path7514"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 584.86442,854.36228 C 602.35754,854.8329 602.77306,866.17026 602.78272,880.11405 C 598.03209,865.47913 600.16637,862.33655 584.91667,862.36783 C 584.82953,850.32613 584.9378,866.40479 584.86442,854.36228 z " />
-    <path
-       id="path7522"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 584.74905,864.74215 C 602.24217,865.21277 602.65769,876.55013 602.66735,890.49392 C 597.91672,875.859 600.051,872.71642 584.8013,872.7477 C 584.71416,860.706 584.82243,876.78466 584.74905,864.74215 z " />
-  </g>
-  <text
-     xml:space="preserve"
-     id="text7535"
-     style="font-size:43.93042374px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-     y="258.69415"
-     x="131.20235"><tspan
-       id="tspan7537"
-       y="258.69415"
-       x="131.20235">X</tspan></text>
-  <rect
-     id="rect3132"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.27638"
-     x="362.48758"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g22906"
-     transform="matrix(0.4620139,0,0,0.4620139,-128.59214,-40.755341)">
-    <g
-       id="g3134"
-       style="display:inline"
-       transform="translate(420,-56)">
-      <rect
-         id="rect3136"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.00020504;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.688085,-0.72563,0.715699,0.698409,0,0)"
-         y="574.77551"
-         x="-255.44737"
-         height="17.583229"
-         width="21.502913" />
-      <path
-         id="path3138"
-         style="fill:url(#linearGradient24219);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 243.56035,571.18984 L 263.2346,590.38882 L 293.42803,558.54794 L 293.4154,558.53561 C 301.52985,549.73696 303.79917,538.50041 298.44593,533.27648 C 293.09269,528.05257 282.1187,530.79473 273.76641,539.36129 L 273.75378,539.34896 L 243.56035,571.18984 z " />
-      <g
-         id="g3140"
-         style="stroke:none;stroke-width:10.65287209;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.193838,-0.204415,0.201505,0.196637,23.43035,509.7359)">
-        <rect
-           id="rect3142"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           y="772.02551"
-           x="349.14398"
-           height="13.878055"
-           width="13.878055" />
-        <rect
-           id="rect3144"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           y="746.92316"
-           x="349.14398"
-           height="13.878055"
-           width="13.878055" />
-      </g>
-      <path
-         id="path3146"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.60036874;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.833248,0,0,0.833248,129.3815,-26.35132)"
-         d="M 197,683.36218 C 197,686.67589 194.53757,689.36218 191.5,689.36218 C 188.46243,689.36218 186,686.67589 186,683.36218 C 186,680.04847 188.46243,677.36218 191.5,677.36218 C 194.53757,677.36218 197,680.04847 197,683.36218 z " />
-    </g>
-    <path
-       id="path3155"
-       style="opacity:0.77999998;fill:#54fb00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.06582808;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 654.67947,481.30948 C 671.50634,485.47105 691.20183,476.90604 703.07467,498.55094 C 710.65078,512.36265 691.10137,509.32277 691.10137,509.32277 L 710.70966,541.63785 L 728.84064,508.60311 C 728.84064,508.60311 713.68537,511.93526 713.75245,499.43667 C 713.85441,480.43967 677.04539,468.19461 654.67947,481.30948 z " />
-  </g>
-  <g
-     id="g2984"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,2.4823692)">
-    <path
-       d="M 473.91549,228.39543 L 503.52151,228.39543 L 494.31141,250.30197 L 464.70541,250.30197 L 473.91549,228.39543 z "
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.19935703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4077" />
-    <path
-       d="M 465.8716,242.66801 C 457.85088,243.15429 450.87214,250.19294 449.6808,254.85001 C 448.51947,259.38984 451.02706,270.56827 451.51297,272.8567 C 451.6029,273.28028 483.60065,277.33052 487.42071,277.33052 C 487.10293,275.04314 486.74,264.16077 486.75029,260.80871 C 486.7958,246.14798 497.04867,243.29583 497.04867,243.29583 L 465.8716,242.66801 z "
-       style="fill:url(#linearGradient2965);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.19935703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4079" />
-    <path
-       d="M 510.16898,253.44014 C 510.16898,262.83065 509.90505,265.86991 509.39031,270.98061 C 509.07588,271.39519 488.53309,277.05516 488.2226,277.2314 C 487.63413,272.87125 487.10279,267.26973 486.81642,262.60668 C 486.36062,255.18458 488.98526,244.14373 498.77684,243.30141 C 505.28118,242.73637 510.16898,244.04965 510.16898,253.44014 z "
-       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.19935703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="path4081" />
-    <path
-       d="M 483.93125,219.15972 L 505.35222,219.70474 C 505.35222,219.70474 497.19703,227.01978 492.57362,243.06222 C 486.11649,243.05892 475.88372,242.31859 471.15266,242.51721 C 475.97613,226.15961 483.93125,219.15972 483.93125,219.15972 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.64020598;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="path4083" />
-    <path
-       d="M 461.76935,250.44422 C 461.76935,250.44422 479.22571,251.67783 479.50502,251.67783 C 479.78432,251.67783 482.717,247.27206 482.717,247.27206 L 465.67958,246.56713 L 461.76935,250.44422 z "
-       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.7701804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4085" />
-    <rect
-       width="24.171026"
-       height="4.7582488"
-       x="458.91107"
-       y="213.1582"
-       transform="matrix(0.993753,0.111602,0,1,0,0)"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.35410452;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4087" />
-    <path
-       d="M 484.04633,225.10371 L 497.20059,225.24777"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79983926px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path4089" />
-    <path
-       d="M 479.88274,230.77745 L 493.03699,230.9215"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79983926px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path4091" />
-    <path
-       d="M 477.19515,236.68367 L 490.34942,236.97178"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79983926px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path4093" />
-    <g
-       transform="matrix(0.870386,0,0,0.870386,65.82635,34.20091)"
-       id="g2980">
-      <rect
-         id="rect5886"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.87870872;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="-160.10472"
-         x="518.27454"
-         height="9.4662237"
-         width="33.064384"
-         transform="matrix(0.718795,0.695222,-0.7174,0.696661,0,0)" />
-      <path
-         id="rect5888"
-         style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89792925;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 481.88591,246.17093 L 487.69785,248.42527 L 480.23833,255.66914 L 477.45311,250.64427 L 481.88591,246.17093 z " />
-    </g>
-    <path
-       d="M 454.79288,222.68432 C 462.78239,214.92578 475.74896,214.91317 483.75449,222.65618 C 491.76003,230.3992 491.77304,242.96569 483.78352,250.72423 C 475.79401,258.48277 462.82745,258.49537 454.8219,250.75237 C 446.81637,243.00936 446.80337,230.44285 454.79288,222.68432 L 454.79288,222.68432 z "
-       style="opacity:0.77999998;color:#000000;fill:url(#linearGradient2976);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.74589944;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path4100" />
-  </g>
-  <rect
-     id="rect3703"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.2746"
-     x="315.95493"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g7499"
-     transform="matrix(0.4373357,0,0,0.4683741,-13.068161,-74.527821)">
-    <g
-       id="g7361"
-       style="display:inline"
-       transform="matrix(0.518198,0.328578,-0.328578,0.518198,562.3445,-50.07558)">
-      <path
-         id="path7363"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-      <path
-         id="path7365"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 798.11196,486.32746 L 798.11196,425.55558" />
-      <path
-         id="path7367"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-      <path
-         id="path7369"
-         style="fill:url(#radialGradient24225);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    </g>
-    <path
-       id="rect3745"
-       style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.945538,0.325513,0,1,0,0)"
-       d="M 822.72691,174.61087 L 889.276,169.13496 L 889.276,199.72689 L 823.4895,199.72689 L 822.72691,174.61087 z " />
-    <path
-       id="rect3739"
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.945538,0.325513,0,1,0,0)"
-       d="M 800.22229,188.70871 L 866.00876,188.70871 L 866.00876,219.30063 L 800.49191,214.62408 L 800.22229,188.70871 z " />
-    <rect
-       id="rect3741"
-       style="opacity:1;color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.882353,-0.470588,0,1,0,0)"
-       y="907.16882"
-       x="927.44476"
-       height="30.591925"
-       width="26.003122" />
-    <path
-       id="rect3743"
-       style="color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.701289,-0.712877,0.945817,0.324701,0,0)"
-       d="M -198.67545,947.41547 L -177.04075,950.94075 L -171.02987,1011.6918 L -199.05916,1012.7404 L -198.67545,947.41547 z " />
-    <path
-       id="rect3753"
-       style="color:#000000;fill:url(#linearGradient24227);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 788.37444,442.41233 C 790.98554,441.49944 800.28366,439.76223 810.12708,450.22181 C 809.39758,451.00304 806.96255,454.45726 805.25704,455.95851 C 798.77005,448.84021 786.55315,444.31821 781.43076,448.7918 C 782.36313,447.56946 787.21848,443.63946 788.37444,442.41233 z " />
-    <g
-       id="g7353"
-       transform="matrix(0.996519,0,0,0.996519,3.974373,5.043832)">
-      <path
-         id="path4656"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-      <path
-         id="path4662"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 798.11196,486.32746 L 798.11196,425.55558" />
-      <path
-         id="path4666"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-      <path
-         id="path4660"
-         style="fill:url(#radialGradient24229);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    </g>
-  </g>
-  <path
-     id="rect3184"
-     style="fill:#929292;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.96170586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     d="M 314.45226,173.63294 L 314.45226,173.91463 L 314.45226,215.23367 L 314.45226,215.51535 L 314.71634,215.51535 L 356.05299,215.51535 L 356.31707,215.51535 L 356.31707,215.23367 L 356.31707,173.91463 L 356.31707,173.63294 L 356.05299,173.63294 L 314.71634,173.63294 L 314.45226,173.63294 z M 314.98041,174.1787 L 355.77131,174.1787 L 355.77131,214.96959 L 314.98041,214.96959 L 314.98041,174.1787 z " />
-  <rect
-     id="rect3190"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.40111"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect3192"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.69855"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g8022"
-     transform="matrix(0.5633612,0,0,0.5633612,16.18383,2.0513492)">
-    <g
-       id="g6989"
-       transform="translate(-211.5918,-4.873514)">
-      <path
-         id="path4086"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.01236534px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 833.34122,225.07216 L 833.34122,286.35703" />
-      <path
-         id="path4088"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 843.52579,225.73634 L 843.52579,286.55437" />
-      <path
-         id="path4090"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 852.30857,225.73634 L 852.30857,286.55437" />
-      <path
-         id="path4092"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 861.09135,225.73634 L 861.09135,286.55437" />
-      <path
-         id="path4094"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 869.87413,225.73634 L 869.87413,286.55437" />
-      <path
-         id="path4096"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 878.6569,225.73634 L 878.6569,286.55437" />
-      <path
-         id="path4098"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 887.43968,225.73634 L 887.43968,286.55437" />
-      <path
-         id="path4101"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.22246,225.73634 L 896.22246,286.55437" />
-      <rect
-         id="rect4115"
-         style="color:#000000;fill:url(#linearGradient24231);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83745855;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="270.90326"
-         x="870.24017"
-         height="15.065637"
-         width="25.749367" />
-      <rect
-         id="rect3198"
-         style="color:#000000;fill:url(#linearGradient24233);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85693413;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="255.7885"
-         x="834.93457"
-         height="15.699371"
-         width="25.872597" />
-      <rect
-         id="rect3194"
-         style="color:#000000;fill:url(#linearGradient24235);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77284241;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="225.60927"
-         x="843.66455"
-         height="15.549897"
-         width="35.031761" />
-      <rect
-         id="rect3196"
-         style="color:#000000;fill:url(#linearGradient24237);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83925015;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="240.99434"
-         x="852.5072"
-         height="14.594875"
-         width="43.547024" />
-      <path
-         id="path6856"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 896.28272,225.35563 L 834.8784,225.35563" />
-      <path
-         id="path6858"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,240.53581 L 834.8784,240.53581" />
-      <path
-         id="path6860"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,255.71599 L 834.8784,255.71599" />
-      <path
-         id="path6862"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,270.89618 L 834.8784,270.89618" />
-      <path
-         id="path6864"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,286.07636 L 834.8784,286.07636" />
-      <rect
-         id="rect6880"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.53349"
-         x="843.96301"
-         height="2.1720431"
-         width="8.6314974" />
-      <rect
-         id="rect6882"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.22321"
-         x="857.89111"
-         height="2.7926269"
-         width="7.2583046" />
-      <rect
-         id="rect6884"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.34735"
-         x="852.98682"
-         height="3.1029184"
-         width="13.928099" />
-      <rect
-         id="rect6886"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="871.03455"
-         height="2.7926269"
-         width="2.7463856" />
-      <rect
-         id="rect6888"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="886.11169"
-         height="2.7926269"
-         width="9.2200089" />
-      <g
-         id="g6896"
-         transform="matrix(0.665193,0,0,1.080499,302.4562,-1.363347)">
-        <rect
-           id="rect6890"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect6892"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect6894"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-      <g
-         id="g6901"
-         style="display:inline"
-         transform="matrix(-0.665193,0,0,1.080499,1428.48,13.68581)">
-        <rect
-           id="rect6903"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect6905"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect6907"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-    </g>
-    <path
-       id="rect7021"
-       style="opacity:1;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 663.20513,248.15279 L 663.20513,258.18327 L 653.17465,258.18327 L 653.17465,266.32173 L 663.20513,266.32173 L 663.20513,276.35221 L 671.34359,276.35221 L 671.34359,266.32173 L 681.37407,266.32173 L 681.37407,258.18327 L 671.34359,258.18327 L 671.34359,248.15279 L 663.20513,248.15279 z " />
-  </g>
-  <g
-     id="g8088"
-     transform="matrix(0.5633612,0,0,0.5633612,16.18383,2.0513492)">
-    <g
-       id="g7916"
-       style="display:inline"
-       transform="translate(-211.5918,85.12649)">
-      <path
-         id="path7918"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.01236534px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 833.34122,225.07216 L 833.34122,286.35703" />
-      <path
-         id="path7920"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 843.52579,225.73634 L 843.52579,286.55437" />
-      <path
-         id="path7922"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 852.30857,225.73634 L 852.30857,286.55437" />
-      <path
-         id="path7924"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 861.09135,225.73634 L 861.09135,286.55437" />
-      <path
-         id="path7926"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 869.87413,225.73634 L 869.87413,286.55437" />
-      <path
-         id="path7928"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 878.6569,225.73634 L 878.6569,286.55437" />
-      <path
-         id="path7930"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 887.43968,225.73634 L 887.43968,286.55437" />
-      <path
-         id="path7932"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.22246,225.73634 L 896.22246,286.55437" />
-      <rect
-         id="rect7934"
-         style="color:#000000;fill:url(#linearGradient24239);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83745855;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="270.90326"
-         x="870.24017"
-         height="15.065637"
-         width="25.749367" />
-      <rect
-         id="rect7936"
-         style="color:#000000;fill:url(#linearGradient24241);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85693413;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="255.7885"
-         x="834.93457"
-         height="15.699371"
-         width="25.872597" />
-      <rect
-         id="rect7938"
-         style="color:#000000;fill:url(#linearGradient24243);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77284241;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="225.60927"
-         x="843.66455"
-         height="15.549897"
-         width="35.031761" />
-      <rect
-         id="rect7940"
-         style="color:#000000;fill:url(#linearGradient24245);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83925015;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="240.99434"
-         x="852.5072"
-         height="14.594875"
-         width="43.547024" />
-      <path
-         id="path7942"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 896.28272,225.35563 L 834.8784,225.35563" />
-      <path
-         id="path7944"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,240.53581 L 834.8784,240.53581" />
-      <path
-         id="path7946"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,255.71599 L 834.8784,255.71599" />
-      <path
-         id="path7948"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,270.89618 L 834.8784,270.89618" />
-      <path
-         id="path7950"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,286.07636 L 834.8784,286.07636" />
-      <rect
-         id="rect7952"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.53349"
-         x="843.96301"
-         height="2.1720431"
-         width="8.6314974" />
-      <rect
-         id="rect7954"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.22321"
-         x="857.89111"
-         height="2.7926269"
-         width="7.2583046" />
-      <rect
-         id="rect7956"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.34735"
-         x="852.98682"
-         height="3.1029184"
-         width="13.928099" />
-      <rect
-         id="rect7958"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="871.03455"
-         height="2.7926269"
-         width="2.7463856" />
-      <rect
-         id="rect7960"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="886.11169"
-         height="2.7926269"
-         width="9.2200089" />
-      <g
-         id="g7962"
-         transform="matrix(0.665193,0,0,1.080499,302.4562,-1.363347)">
-        <rect
-           id="rect7964"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect7966"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect7968"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-      <g
-         id="g7970"
-         style="display:inline"
-         transform="matrix(-0.665193,0,0,1.080499,1428.48,13.68581)">
-        <rect
-           id="rect7972"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect7974"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect7976"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-    </g>
-    <rect
-       id="rect7913"
-       style="color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.24493694;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="347.35495"
-       x="653.5304"
-       height="8.7881775"
-       width="27.46998" />
-  </g>
-  <g
-     id="g20319"
-     transform="matrix(0.4655032,0,0,0.4314278,354.03978,-4.4490608)">
-    <g
-       id="g20300">
-      <path
-         style="fill:url(#linearGradient24247);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -75.575296,431.90521 C -73.937648,432.42571 -29.496247,420.64933 -29.496247,420.64933 C -34.637534,448.2407 -15.25247,459.98469 -8.1305811,479.65236 L -58.396477,498.5955 C -69.087342,473.32972 -80.466399,465.44724 -75.575296,431.90521 z "
-         id="path10175"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -71.027778,449.99442 C -70.009501,447.53999 -68.398618,441.37472 -66.969552,437.93014 C -65.946608,435.46446 -65.237025,431.67221 -63.993519,434.66952 C -63.084799,436.85988 -62.911325,441.30405 -62.911325,443.47319 C -62.911325,444.79542 -62.636319,446.10316 -62.370228,447.38592"
-         id="path19269" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -58.853099,439.23438 C -58.853099,440.64638 -59.715197,444.76223 -57.500357,445.42956 C -57.025146,445.57274 -55.050818,440.65767 -54.794872,439.88651"
-         id="path19271" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -49.925001,429.45254 C -48.979735,429.73734 -50.352286,444.55483 -50.736646,446.40774 C -50.826829,446.84249 -50.917011,445.53824 -51.007194,445.10349"
-         id="path19273" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -50.736646,438.58226 C -51.021829,439.95706 -48.592058,437.30188 -47.760613,436.29983"
-         id="path19275" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -43.972935,438.58226 C -45.10834,444.05576 -35.210389,422.24755 -41.808548,424.23555 C -43.159642,424.64263 -43.033905,437.5076 -43.702387,443.14712 C -43.767419,443.69575 -43.882752,442.06025 -43.972935,441.51682"
-         id="path19277" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -39.914709,437.93014 C -40.051984,439.08824 -38.611318,432.0897 -37.750321,437.27802 C -37.588459,438.25339 -37.479773,446.95305 -37.479773,443.14712"
-         id="path19279" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.18195009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -60.782843,484.92628 C -54.577716,469.84232 -40.969952,454.28974 -30.680157,448.6469"
-         id="path20180" />
-      <g
-         id="g20290"
-         transform="matrix(1,-0.116962,0.135948,0.984099,-62.09387,4.364348)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="rect9275"
-           d="M -49.982767,486.1569 L -39.137026,471.65336 L -34.873557,476.58849 L -46.697446,486.95336 L -49.982767,486.1569 z "
-           style="color:#000000;fill:#241f1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00000095;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           id="rect4009"
-           d="M -2.7603501,424.87027 L 1.0377747,429.26675 C 1.5585103,429.86953 0.97082956,431.61824 -0.27989515,433.18765 L -14.302519,453.07614 C -15.553233,454.64553 -32.240422,475.73483 -32.76115,475.13207 L -39.414996,467.42998 C -39.935728,466.82721 -23.123949,445.88214 -21.873234,444.31274 L -5.957931,426.6151 C -4.7072063,425.04569 -3.2810857,424.2675 -2.7603501,424.87027 z "
-           style="color:#000000;fill:url(#linearGradient24249);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           sodipodi:nodetypes="czcczzc"
-           id="path8380"
-           d="M -52.721673,489.88632 C -52.721673,489.88632 -47.18516,478.65824 -45.320698,475.65775 C -43.451737,472.65001 -40.499168,469.76234 -40.499168,469.76234 L -36.773772,474.21779 C -36.773772,474.21779 -37.426884,475.05544 -38.182951,478.38207 C -38.930141,481.66963 -42.073061,481.41261 -44.158348,482.0615 C -46.243634,482.71038 -52.25841,489.68578 -52.721673,489.88632 z "
-           style="fill:url(#linearGradient24251);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.8796891;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           transform="matrix(0.66655,-0.74546,0.663245,0.748402,0,0)"
-           y="281.93237"
-           x="-345.08524"
-           height="14.299413"
-           width="2.7105966"
-           id="rect8378"
-           style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.65272236;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      </g>
-    </g>
-    <path
-       id="path20317"
-       d="M -69.85298,443.99975 C -70.332761,443.63992 -66.057745,443.13276 -62.012339,440.43582 C -61.570288,440.14112 -61.061958,439.96063 -60.586768,439.72304"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-  <rect
-     id="rect23627"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.68457"
-     x="26.005444"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23629"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="74.339523"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23631"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="122.47703"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23633"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="170.61453"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23635"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="218.75206"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23637"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="266.88956"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23639"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="315.02707"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23685"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g9766"
-     transform="matrix(0.6801604,0,0,0.6801604,-159.07802,125.64074)">
-    <path
-       sodipodi:nodetypes="cscscssc"
-       id="path12302"
-       d="M 690.29712,806.33899 C 696.73115,809.91842 713.17167,819.01654 707.91834,831.53579 C 703.26078,842.63527 700.72452,845.85918 700.72452,845.85918 C 700.72452,845.85918 699.44562,841.814 697.414,840.56405 C 695.42042,839.33751 693.67845,839.19193 693.67845,839.19193 C 694.47719,836.67574 698.83819,830.56582 698.32224,826.59934 C 697.59598,821.01469 684.02284,817.86365 683.7315,812.80058 C 683.44016,807.7375 684.69006,805.11665 690.29712,806.33899 z "
-       style="fill:#ffda5c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       inkscape:transform-center-y="-1.3957057"
-       inkscape:transform-center-x="-2.2680218"
-       transform="matrix(-0.972446,-0.834234,0.747504,-1.033058,657.2054,2164.879)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path5951"
-       style="fill:url(#radialGradient6081);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csssssz"
-       id="path12291"
-       d="M 688.00688,782.73476 C 681.28413,779.25117 636.10673,778.4231 623.43682,783.90136 C 610.7669,789.37962 601.34418,795.50064 598.80599,803.20934 C 596.26779,810.91805 591.53198,823.47835 597.77932,831.12638 C 604.02665,838.7744 614.16395,843.81797 625.80657,844.09786 C 637.44919,844.37775 687.99759,843.58515 690.71721,840.07417 C 693.43684,836.56318 694.54874,786.12462 688.00688,782.73476 z "
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="czzzz"
-       id="rect12289"
-       d="M 626.64537,790.62125 C 632.05743,782.1495 680.48654,782.60978 684.9113,788.66276 C 689.23278,794.57446 689.9078,830.0134 685.86504,834.26646 C 681.77401,838.57032 631.7887,841.09821 627.59911,836.22495 C 623.21793,831.12883 621.35549,798.90174 626.64537,790.62125 z "
-       style="fill:url(#linearGradient7977);fill-opacity:1;stroke:#000000;stroke-width:1.29999948;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path12298"
-       d="M 644.62512,816.02125 C 653.16596,828.20399 670.13139,826.24078 675.81727,813.32745 C 666.29419,818.61805 649.49978,817.30747 644.62512,816.02125 z "
-       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       transform="matrix(1.045493,-5.786072e-2,-0.131469,1.028004,178.2572,93.9675)"
-       id="g13235"
-       style="stroke:#000000;stroke-width:1.25842619;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         style="fill:url(#linearGradient6085);fill-opacity:1;stroke:#000000;stroke-width:1.25842619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 514.6665,745.65582 C 514.6665,745.65582 532.11281,743.73672 541.53383,745.65582 C 550.95484,747.57491 552.35056,753.3322 552.35056,753.3322 L 552.35056,795.20338 C 552.35056,795.20338 550.60591,789.70778 541.1849,787.87592 C 531.76388,786.04405 514.6665,787.87592 514.6665,787.87592 L 514.6665,745.65582 z "
-         id="rect12334"
-         sodipodi:nodetypes="czcczcc" />
-      <path
-         style="fill:url(#linearGradient6087);fill-opacity:1;stroke:#000000;stroke-width:1.25842619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 590.03462,746.0823 C 590.03462,746.0823 572.58831,744.1632 563.16729,746.0823 C 553.74628,748.00139 552.35056,753.75868 552.35056,753.75868 L 552.35056,795.62986 C 552.35056,795.62986 554.09521,790.13426 563.51622,788.3024 C 572.93724,786.47053 590.03462,788.3024 590.03462,788.3024 L 590.03462,746.0823 z "
-         id="path13231"
-         sodipodi:nodetypes="czcczcc" />
-    </g>
-    <path
-       sodipodi:nodetypes="csssccczc"
-       id="path12332"
-       d="M 695.41019,838.62042 C 700.14569,841.15924 700.88837,843.47237 700.32054,848.50081 C 699.91686,852.0756 697.61441,855.10314 694.13438,856.67894 C 691.47288,857.8841 687.41491,857.32238 684.23254,856.09748 C 682.29552,855.35192 683.08837,852.66442 684.31205,852.58794 C 683.36498,851.99335 683.02181,849.44083 684.83359,849.02147 C 683.26668,848.4213 684.19241,845.40115 685.54978,845.44861 C 684.52439,844.51298 684.51889,841.35152 686.74802,841.75345 C 688.85054,842.13256 695.53607,841.79196 695.41019,838.62042 z "
-       style="fill:#f4d7d7;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssscccsc"
-       id="path12327"
-       d="M 616.47306,842.59642 C 609.11971,841.85248 608.289,842.5384 606.36072,847.21702 C 604.54093,851.63234 602.80301,855.13257 605.57704,857.75909 C 608.26763,860.30661 611.06,861.66953 615.97938,862.18413 C 619.3229,862.53389 619.44445,859.85288 618.55719,858.94771 C 619.41319,858.74371 621.21149,857.26159 620.00408,855.5157 C 621.66781,855.41218 621.94956,852.3917 620.74187,851.47597 C 622.117,850.9917 625.27655,846.97293 615.7578,846.89124 C 614.59263,846.88124 615.68265,844.97239 616.47306,842.59642 z "
-       style="fill:#f4d7d7;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cscscssc"
-       id="path12300"
-       d="M 601.98808,811.38003 C 593.42745,816.90941 572.79691,830.36838 583.46745,841.45089 C 594.13798,852.53338 603.50388,855.77314 603.50388,855.77314 C 603.50388,855.77314 603.63238,852.67913 606.26744,847.43369 C 608.15568,843.6749 611.44568,842.47821 611.44568,842.47821 C 609.43579,840.29378 595.22475,838.91411 596.36391,833.59398 C 597.52277,828.18182 616.19414,825.80432 613.95955,815.54536 C 612.86556,810.52288 610.0553,808.40088 601.98808,811.38003 z "
-       style="fill:#ffda5c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       transform="matrix(0.64065,-7.819027e-2,8.137048e-2,0.615612,182.9143,353.6568)"
-       d="M 632.25471 802.35638 A 5.2338967 5.40836 0 1 1  621.78692,802.35638 A 5.2338967 5.40836 0 1 1  632.25471 802.35638 z"
-       sodipodi:ry="5.40836"
-       sodipodi:rx="5.2338967"
-       sodipodi:cy="802.35638"
-       sodipodi:cx="627.02081"
-       id="path12294"
-       style="fill:#000000;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.745485,-9.468581e-2,9.468581e-2,0.745485,107.8102,266.4833)"
-       d="M 630.39072 795.33301 A 2.2205544 2.2822363 0 1 1  625.94961,795.33301 A 2.2205544 2.2822363 0 1 1  630.39072 795.33301 z"
-       sodipodi:ry="2.2822363"
-       sodipodi:rx="2.2205544"
-       sodipodi:cy="795.33301"
-       sodipodi:cx="628.17017"
-       id="path13247"
-       style="fill:#ffffff;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.64065,-7.819027e-2,8.137048e-2,0.615612,203.1678,353.6921)"
-       d="M 632.25471 802.35638 A 5.2338967 5.40836 0 1 1  621.78692,802.35638 A 5.2338967 5.40836 0 1 1  632.25471 802.35638 z"
-       sodipodi:ry="5.40836"
-       sodipodi:rx="5.2338967"
-       sodipodi:cy="802.35638"
-       sodipodi:cx="627.02081"
-       id="path4998"
-       style="fill:#000000;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.738859,-9.589021e-2,9.384422e-2,0.754968,132.7997,259.5372)"
-       d="M 630.39072 795.33301 A 2.2205544 2.2822363 0 1 1  625.94961,795.33301 A 2.2205544 2.2822363 0 1 1  630.39072 795.33301 z"
-       sodipodi:ry="2.2822363"
-       sodipodi:rx="2.2205544"
-       sodipodi:cy="795.33301"
-       sodipodi:cx="628.17017"
-       id="path5000"
-       style="fill:#ffffff;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(-0.117288,-1.501864,1.255807,-0.260356,-349.076,1925.719)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path5027"
-       style="fill:url(#radialGradient7982);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(1.133228,-0.787475,0.869641,1.065272,-780.3416,382.5937)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path6113"
-       style="fill:url(#radialGradient6115);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <g
-       style="opacity:0.67000002"
-       transform="translate(-2.351629e-6,-2.093557)"
-       id="g5050">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.3220526;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-         d="M 634.41022,795.67887 C 634.41022,801.40692 632.13944,806.95204 640.51512,817.50771 C 625.71185,808.81231 615.76813,815.5429 609.09378,815.5429 C 595.11911,815.5429 583.77735,806.64381 583.77735,795.67887 C 583.77735,784.71392 595.11911,775.81484 609.09378,775.81484 C 623.06845,775.81484 634.41022,784.71392 634.41022,795.67887 z "
-         id="path4026"
-         sodipodi:nodetypes="ccsssc" />
-      <text
-         xml:space="preserve"
-         style="font-size:43.05487061px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="534.76764"
-         y="902.87823"
-         id="text4029"
-         transform="scale(1.11482,0.897006)"><tspan
-           sodipodi:role="line"
-           id="tspan4031"
-           x="534.76764"
-           y="902.87823">?</tspan></text>
-    </g>
-    <path
-       transform="matrix(1.202308,-0.907638,0.895676,0.917932,-862.0372,601.6811)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path9762"
-       style="fill:url(#radialGradient9764);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-  </g>
-  <rect
-     id="rect4131"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="455.34137"
-     x="26.202015"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4133"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="455.34137"
-     x="74.713554"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4135"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="455.13403"
-     x="123.14871"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4137"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="453.80078"
-     x="170.95718"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4139"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="453.80078"
-     x="219.48363"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4141"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.4375"
-     x="268.23099"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4143"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.4375"
-     x="317.33041"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g4145"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4147"
-       style="fill:url(#linearGradient4526);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 28.033255,951.24411 L 38.230475,967.49704 L 28.033255,967.49704 L 45.156086,994.76755 L 62.278917,1022.038 L 79.401751,994.76755 L 96.524582,967.49704 L 86.327363,967.49704 L 96.524582,951.24411 L 62.278917,951.24411 L 28.033255,951.24411 z " />
-    <path
-       id="path4149"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 68.907579,979.062 L 53.232542,988.3243 L 37.557505,997.5866 L 53.232542,1006.8488 L 68.907579,1016.1261 L 68.907579,1003.9374 L 88.442449,1003.9374 L 88.442449,991.2508 L 68.907579,991.2508 L 68.907579,979.062 z " />
-  </g>
-  <g
-     id="g4151"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4153"
-       style="fill:url(#linearGradient4528);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 133.75435,951.96518 L 143.95157,968.21811 L 133.75435,968.21811 L 150.87718,995.48862 L 168.00001,1022.7591 L 185.12284,995.48862 L 202.24567,968.21811 L 192.04845,968.21811 L 202.24567,951.96518 L 168.00001,951.96518 L 133.75435,951.96518 z " />
-    <path
-       id="path4155"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 162.09241,979.062 L 177.76744,988.3243 L 193.44248,997.5866 L 177.76744,1006.8488 L 162.09241,1016.1261 L 162.09241,1003.9374 L 142.55754,1003.9374 L 142.55754,991.2508 L 162.09241,991.2508 L 162.09241,979.062 z " />
-  </g>
-  <g
-     id="g4157"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,46.449199)">
-    <path
-       id="path4159"
-       style="fill:url(#linearGradient4530);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 238.75435,895.9652 L 248.95157,912.21813 L 238.75435,912.21813 L 255.87718,939.48864 L 273.00001,966.7591 L 290.12284,939.48864 L 307.24567,912.21813 L 297.04845,912.21813 L 307.24567,895.9652 L 273.00001,895.9652 L 238.75435,895.9652 z " />
-    <path
-       id="path4161"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 245.46663,926.60502 L 245.46663,936.8248 L 235.24685,936.8248 L 235.24685,946.3632 L 245.46663,946.3632 L 245.46663,956.5831 L 255.00509,956.5831 L 255.00509,946.3632 L 265.22487,946.3632 L 265.22487,936.8248 L 255.00509,936.8248 L 255.00509,926.60502 L 245.46663,926.60502 z " />
-    <rect
-       id="rect4163"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4.23082352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="937.00116"
-       x="285.13812"
-       height="9.1857538"
-       width="27.285976" />
-  </g>
-  <g
-     id="g4165"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4167"
-       style="fill:url(#linearGradient4532);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 343.58903,951.96517 L 353.78625,968.2181 L 343.58903,968.2181 L 360.71186,995.48861 L 377.8347,1022.7591 L 394.95753,995.48861 L 412.08036,968.2181 L 401.88314,968.2181 L 412.08036,951.96517 L 377.8347,951.96517 L 343.58903,951.96517 z " />
-    <path
-       id="path4169"
-       style="opacity:1;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.43875265;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 351.24094,977.84406 L 351.24094,1017.3441 L 362.80344,1017.3441 L 362.80344,1003.0629 L 369.20969,1006.8441 L 384.89719,1016.1254 L 384.89719,1003.9379 L 404.42844,1003.9379 L 404.42844,991.25031 L 384.89719,991.25031 L 384.89719,979.06281 L 369.20969,988.31281 L 362.80344,992.12531 L 362.80344,977.84406 L 351.24094,977.84406 z " />
-  </g>
-  <g
-     id="g4171"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4173"
-       style="fill:url(#linearGradient4534);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 447.06727,951.96518 L 457.26449,968.21811 L 447.06727,968.21811 L 464.1901,995.48862 L 481.31293,1022.7591 L 498.43576,995.48862 L 515.55859,968.21811 L 505.36137,968.21811 L 515.55859,951.96518 L 481.31293,951.96518 L 447.06727,951.96518 z " />
-    <path
-       id="path4175"
-       style="opacity:1;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.43875265;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 507.90668,977.84406 L 507.90668,1017.3441 L 496.34418,1017.3441 L 496.34418,1003.0629 L 489.93793,1006.8441 L 474.25043,1016.1254 L 474.25043,1003.9379 L 454.71918,1003.9379 L 454.71918,991.25031 L 474.25043,991.25031 L 474.25043,979.06281 L 489.93793,988.31281 L 496.34418,992.12531 L 496.34418,977.84406 L 507.90668,977.84406 z " />
-  </g>
-  <g
-     id="g4177"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,46.449199)">
-    <path
-       id="path4179"
-       style="fill:url(#linearGradient4536);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 552.09953,895.24411 L 562.29675,911.49704 L 552.09953,911.49704 L 569.22236,938.76755 L 586.34519,966.038 L 603.46802,938.76755 L 620.59085,911.49704 L 610.39363,911.49704 L 620.59085,895.24411 L 586.34519,895.24411 L 552.09953,895.24411 z " />
-    <path
-       id="path4181"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 596.42552,926.94358 L 596.42552,938.53032 L 584.10133,938.53032 L 584.10133,949.34454 L 596.42552,949.34454 L 596.42552,960.93142 L 607.9281,960.93142 L 607.9281,949.34454 L 620.25229,949.34454 L 620.25229,938.53032 L 607.9281,938.53032 L 607.9281,926.94358 L 596.42552,926.94358 z " />
-  </g>
-  <g
-     id="g4183"
-     transform="matrix(0.4620139,0,0,0.4620139,18.349914,45.009029)">
-    <path
-       id="path4185"
-       style="fill:url(#linearGradient4538);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 657.61003,895.96518 L 667.80725,912.21811 L 657.61003,912.21811 L 674.73286,939.48862 L 691.85569,966.7591 L 708.97852,939.48862 L 726.10135,912.21811 L 715.90413,912.21811 L 726.10135,895.96518 L 691.85569,895.96518 L 657.61003,895.96518 z " />
-    <rect
-       id="rect4187"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4.21595383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="939.37506"
-       x="689.06104"
-       height="11.648645"
-       width="35.517338" />
-  </g>
-  <rect
-     id="rect4189"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.4375"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g4191"
-     transform="matrix(0.8455204,0,0,0.7937234,-71.949331,-179.18452)">
-    <path
-       id="path4193"
-       style="color:#000000;fill:url(#radialGradient4540);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4542);stroke-width:19.88428688;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.253681,-2.501311e-2,2.459378e-2,0.246667,229.9229,877.6432)"
-       d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-    <path
-       id="path4195"
-       style="color:#000000;fill:url(#radialGradient4544);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4546);stroke-width:24.22555733;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(7.590656e-2,-7.48444e-3,8.865423e-3,8.891693e-2,402.9419,934.5995)"
-       d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-    <path
-       id="path4198"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,281.3689,848.9056)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4200"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,302.3878,837.0276)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4202"
-       style="color:#000000;fill:#000000;fill-opacity:0.44495413;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,325.3773,845.8586)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4204"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,275.7409,869.832)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4206"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,332.8209,863.8999)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4208"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,326.1424,885.6138)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4210"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,287.9716,890.5937)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4212"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4548);stroke-width:3.50856757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 451.50995,943.25668 C 435.78414,960.38604 437.18199,983.78233 452.90778,996.73372" />
-    <path
-       id="path4214"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4550);stroke-width:2.95746279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 468.42158,952.25773 C 454.79821,963.2013 456.00919,978.14862 469.63254,986.42309" />
-    <path
-       id="path4216"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4552);stroke-width:3.47961354;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 505.32732,943.2543 C 520.79326,960.38517 519.4185,983.78352 503.95255,996.73612" />
-    <path
-       id="path4218"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4554);stroke-width:2.96080017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 488.70524,951.88864 C 502.07067,963.06859 500.88263,978.33881 487.51722,986.79199" />
-    <path
-       id="path4220"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 465.49828,937.54255 C 475.04316,934.00456 478.02606,940.68448 481.42441,949.00956 C 475.30206,941.30677 475.6879,938.96409 467.47456,942.31203 C 464.4973,935.13979 468.46833,944.71828 465.49828,937.54255 z " />
-    <path
-       id="path4222"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.539089,-0.218317,0.243345,0.597197,109.4028,645.3595)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path4224"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.31586146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 479.31673,974.22578 L 464.52817,937.93298" />
-    <path
-       id="path4226"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 467.90731,943.66616 C 477.45219,940.12817 480.43507,946.80809 483.83344,955.13317 C 477.71109,947.43038 478.09693,945.08769 469.88359,948.43564 C 466.90632,941.2634 470.87734,950.8419 467.90731,943.66616 z " />
-    <path
-       id="path4228"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 470.37101,949.89018 C 479.91589,946.35219 482.89878,953.03211 486.29715,961.3572 C 480.1748,953.6544 480.56062,951.31171 472.34729,954.65967 C 469.37002,947.48741 473.34105,957.06591 470.37101,949.89018 z " />
-    <path
-       id="path4230"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 505.72899,950.50171 C 520.25906,957.10155 515.96029,967.3979 510.25127,979.88426 C 512.25344,965.10468 515.33826,963.04516 502.49058,957.68701 C 507.35452,946.87609 500.85315,961.30851 505.72899,950.50171 z " />
-    <path
-       id="path4232"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.841647,0.353197,-0.410015,0.895235,445.2498,255.6813)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path4234"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.58397031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 479.29983,1004.2686 L 504.21719,949.86355" />
-  </g>
-  <rect
-     id="rect4236"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="408.94916"
-     x="26.005444"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4238"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="74.339523"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4240"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="122.47703"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4242"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="170.61453"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4244"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="218.75206"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4246"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="266.88956"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4248"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="315.02707"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4250"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;opacity:1"
-     y="409.14569"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/blue_serious/layout_compact.png"
-     inkscape:export-xdpi="51.581036"
-     inkscape:export-ydpi="51.581036" />
-  <g
-     id="g4252"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,93.746929)">
-    <path
-       id="path4254"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.76050973;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 46.333943,612.72709 L 63.936792,612.72709" />
-    <path
-       id="path4256"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       d="M 40.861277,617.58222 C 40.861277,621.77182 36.730582,625.16817 31.635118,625.16817 C 26.539654,625.16817 22.408959,621.77182 22.408959,617.58222 C 22.408959,613.39261 26.539654,609.99626 31.635118,609.99626 C 36.730582,609.99626 40.861277,613.39261 40.861277,617.58222 z " />
-    <path
-       id="path4258"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 40.950899,616.25852 L 40.950899,566.41932" />
-    <path
-       id="path4260"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.76050973;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 46.333943,600.43803 L 63.936792,600.43803" />
-    <text
-       transform="scale(0.978716,1.021747)"
-       id="text4262"
-       y="613.46783"
-       x="50.292049"
-       style="font-size:83.26845551px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       xml:space="preserve"><tspan
-         y="613.46783"
-         x="50.292049"
-         id="tspan4264"
-         sodipodi:role="line">?</tspan></text>
-  </g>
-  <g
-     id="g4266"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,93.746929)">
-    <g
-       id="g4268">
-      <g
-         id="g4270"
-         transform="matrix(1.022343,0,0,0.225964,-3.639687,485.0216)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4272" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4274" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4276" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4278" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4280" />
-      </g>
-      <g
-         id="g4282"
-         transform="matrix(0.165008,0,0,0.185315,34.80966,476.2322)">
-        <rect
-           id="rect4284"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4286"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g4288"
-         transform="matrix(0.200017,0,0,0.193766,131.9627,502.3096)">
-        <path
-           id="path4290"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4292"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4294"
-         transform="matrix(0.200017,0,0,0.193766,126.0764,498.6294)">
-        <path
-           id="path4296"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4298"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4300"
-         transform="matrix(1.022343,0,0,0.225964,-3.639687,462.1859)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4302" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4304" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4306" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4308" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4310" />
-      </g>
-      <g
-         id="g4312"
-         transform="matrix(0.165008,0,0,0.185315,34.80966,453.3966)">
-        <rect
-           id="rect4314"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4316"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g4318"
-         transform="matrix(0.200017,0,0,0.193766,131.9627,479.474)">
-        <path
-           id="path4320"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4322"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4324"
-         transform="matrix(0.200017,0,0,0.193766,126.0764,475.7938)">
-        <path
-           id="path4326"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4328"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4330"
-         transform="matrix(1.022343,0,0,0.225964,-3.639687,439.3503)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4332" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4334" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4336" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4338" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4340" />
-      </g>
-      <g
-         id="g4342"
-         transform="matrix(0.165008,0,0,0.185315,34.80966,430.5609)">
-        <rect
-           id="rect4344"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4346"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g4348"
-         transform="matrix(0.200017,0,0,0.193766,131.9627,456.6383)">
-        <path
-           id="path4350"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4352"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4354"
-         transform="matrix(0.200017,0,0,0.193766,126.0764,452.9581)">
-        <path
-           id="path4356"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4358"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-    </g>
-    <g
-       inkscape:transform-center-y="-249.13318"
-       inkscape:transform-center-x="-414.5246"
-       id="g4360"
-       transform="matrix(0.326639,0.315927,-0.325985,0.316561,52.01311,186.7728)">
-      <rect
-         id="rect4362"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.56066203;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="499.875"
-         x="797.08252"
-         height="17.941612"
-         width="62.664028" />
-      <path
-         id="path4364"
-         style="opacity:1;color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70223784;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 786.26355,503.58129 L 797.00751,498.99201 L 797.00751,518.69962 L 786.493,515.52242 L 786.26355,503.58129 z " />
-      <path
-         id="path4366"
-         style="opacity:0.77999998;color:#000000;fill:url(#linearGradient4556);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-1,0,0,-1,715.286,971.8034)"
-         d="M 1.0197296,463.97751 C 1.0197298,484.25205 -15.416035,500.68782 -35.690579,500.68782 C -55.965122,500.68782 -72.400887,484.25205 -72.400887,463.97751 C -72.400887,443.70297 -55.965122,427.2672 -35.690579,427.2672 C -15.416035,427.2672 1.0197298,443.70297 1.0197296,463.97751 L 1.0197296,463.97751 z " />
-    </g>
-  </g>
-  <g
-     id="g4368"
-     transform="matrix(0.5633612,0,0,0.5633612,-32.215099,93.570219)">
-    <g
-       transform="matrix(1.090844,0,0,1.73063,158.8704,-417.9589)"
-       id="g4370">
-      <g
-         id="g4372"
-         transform="matrix(0.957878,0,0,0.55144,3.319204,256.4117)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4374" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4376" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4378" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4380" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4382" />
-      </g>
-      <g
-         id="g4384"
-         transform="matrix(0.427741,0,0,0.452238,-86.33369,234.9625)">
-        <rect
-           id="rect4386"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4388"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.635101,0,0,0.818349,307.0637,112.2701)"
-       id="g4390">
-      <path
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path4392" />
-      <path
-         d="M -7.156011,622.3181 L -7.156011,572.4789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path4394" />
-    </g>
-    <g
-       transform="matrix(0.635101,0,0,0.818349,328.2121,96.72718)"
-       id="g4396">
-      <path
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path4398" />
-      <path
-         d="M -7.156011,622.3181 L -7.156011,572.4789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path4400" />
-    </g>
-    <g
-       inkscape:transform-center-y="-249.13318"
-       inkscape:transform-center-x="-414.52458"
-       id="g4402"
-       transform="matrix(0.326639,0.315927,-0.325985,0.316561,221.3609,188.6469)">
-      <rect
-         id="rect4404"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.56066203;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="499.875"
-         x="797.08252"
-         height="17.941612"
-         width="62.664028" />
-      <path
-         id="path4406"
-         style="opacity:1;color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70223784;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 786.26355,503.58129 L 797.00751,498.99201 L 797.00751,518.69962 L 786.493,515.52242 L 786.26355,503.58129 z " />
-      <path
-         id="path4408"
-         style="opacity:0.77999998;color:#000000;fill:url(#linearGradient4558);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-1,0,0,-1,715.286,971.8034)"
-         d="M 1.0197296,463.97751 C 1.0197298,484.25205 -15.416035,500.68782 -35.690579,500.68782 C -55.965122,500.68782 -72.400887,484.25205 -72.400887,463.97751 C -72.400887,443.70297 -55.965122,427.2672 -35.690579,427.2672 C -15.416035,427.2672 1.0197298,443.70297 1.0197296,463.97751 L 1.0197296,463.97751 z " />
-    </g>
-  </g>
-  <g
-     id="g4410"
-     transform="matrix(0.5633612,0,0,0.5633612,63.747173,93.040039)">
-    <g
-       id="g4412"
-       style="display:inline"
-       transform="translate(-636.6883,341.6475)">
-      <path
-         id="path4414"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.01236534px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 833.34122,225.07216 L 833.34122,286.35703" />
-      <path
-         id="path4416"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 843.52579,225.73634 L 843.52579,286.55437" />
-      <path
-         id="path4418"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 852.30857,225.73634 L 852.30857,286.55437" />
-      <path
-         id="path4420"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 861.09135,225.73634 L 861.09135,286.55437" />
-      <path
-         id="path4422"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 869.87413,225.73634 L 869.87413,286.55437" />
-      <path
-         id="path4424"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 878.6569,225.73634 L 878.6569,286.55437" />
-      <path
-         id="path4426"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 887.43968,225.73634 L 887.43968,286.55437" />
-      <path
-         id="path4428"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.22246,225.73634 L 896.22246,286.55437" />
-      <rect
-         id="rect4430"
-         style="color:#000000;fill:url(#linearGradient4560);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83745855;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="270.90326"
-         x="870.24017"
-         height="15.065637"
-         width="25.749367" />
-      <rect
-         id="rect4432"
-         style="color:#000000;fill:url(#linearGradient4562);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85693413;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="255.7885"
-         x="834.93457"
-         height="15.699371"
-         width="25.872597" />
-      <rect
-         id="rect4434"
-         style="color:#000000;fill:url(#linearGradient4564);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77284241;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="225.60927"
-         x="843.66455"
-         height="15.549897"
-         width="35.031761" />
-      <rect
-         id="rect4436"
-         style="color:#000000;fill:url(#linearGradient4566);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83925015;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="240.99434"
-         x="852.5072"
-         height="14.594875"
-         width="43.547024" />
-      <path
-         id="path4438"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 896.28272,225.35563 L 834.8784,225.35563" />
-      <path
-         id="path4440"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,240.53581 L 834.8784,240.53581" />
-      <path
-         id="path4442"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,255.71599 L 834.8784,255.71599" />
-      <path
-         id="path4444"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,270.89618 L 834.8784,270.89618" />
-      <path
-         id="path4446"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,286.07636 L 834.8784,286.07636" />
-      <rect
-         id="rect4448"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.53349"
-         x="843.96301"
-         height="2.1720431"
-         width="8.6314974" />
-      <rect
-         id="rect4450"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.22321"
-         x="857.89111"
-         height="2.7926269"
-         width="7.2583046" />
-      <rect
-         id="rect4452"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.34735"
-         x="852.98682"
-         height="3.1029184"
-         width="13.928099" />
-      <rect
-         id="rect4454"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="871.03455"
-         height="2.7926269"
-         width="2.7463856" />
-      <rect
-         id="rect4456"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="886.11169"
-         height="2.7926269"
-         width="9.2200089" />
-      <g
-         id="g4458"
-         transform="matrix(0.665193,0,0,1.080499,302.4562,-1.363347)">
-        <rect
-           id="rect4460"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect4462"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect4464"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-      <g
-         id="g4466"
-         style="display:inline"
-         transform="matrix(-0.665193,0,0,1.080499,1428.48,13.68581)">
-        <rect
-           id="rect4468"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect4470"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect4472"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-    </g>
-    <g
-       inkscape:transform-center-y="-249.13318"
-       inkscape:transform-center-x="-414.52458"
-       id="g4474"
-       transform="matrix(0.326639,0.315927,-0.325985,0.316561,137.3191,188.96)">
-      <rect
-         id="rect4476"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.56066203;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="499.875"
-         x="797.08252"
-         height="17.941612"
-         width="62.664028" />
-      <path
-         id="path4478"
-         style="opacity:1;color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70223784;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 786.26355,503.58129 L 797.00751,498.99201 L 797.00751,518.69962 L 786.493,515.52242 L 786.26355,503.58129 z " />
-      <path
-         id="path4480"
-         style="opacity:0.77999998;color:#000000;fill:url(#linearGradient4568);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-1,0,0,-1,715.286,971.8034)"
-         d="M 1.0197296,463.97751 C 1.0197298,484.25205 -15.416035,500.68782 -35.690579,500.68782 C -55.965122,500.68782 -72.400887,484.25205 -72.400887,463.97751 C -72.400887,443.70297 -55.965122,427.2672 -35.690579,427.2672 C -15.416035,427.2672 1.0197298,443.70297 1.0197296,463.97751 L 1.0197296,463.97751 z " />
-    </g>
-  </g>
-  <g
-     id="g4482"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,93.746929)">
-    <g
-       id="g4484">
-      <g
-         id="g4486"
-         transform="matrix(1.090844,0,0,1.73063,245.4128,-416.8902)">
-        <g
-           transform="matrix(0.957878,0,0,0.55144,3.319204,256.4117)"
-           id="g4488">
-          <path
-             id="path4490"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 111.87488,566.71352 L 173.41819,566.58088" />
-          <path
-             id="path4492"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,626.46842 L 173.41819,626.33578" />
-          <path
-             id="path4494"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,611.5297 L 173.41818,611.39706" />
-          <path
-             id="path4496"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,596.59099 L 173.41818,596.45834" />
-          <path
-             id="path4498"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,581.65225 L 173.41819,581.51962" />
-        </g>
-        <g
-           transform="matrix(0.427741,0,0,0.452238,-86.33369,234.9625)"
-           id="g4500">
-          <rect
-             width="10.422997"
-             height="72.622528"
-             ry="0"
-             x="460.12595"
-             y="738.49548"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             id="rect4502" />
-          <rect
-             width="2.5666234"
-             height="72.622528"
-             x="473.64929"
-             y="738.49548"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             id="rect4504" />
-        </g>
-      </g>
-      <g
-         id="g4506"
-         transform="matrix(0.635101,0,0,0.818349,393.6061,113.3388)">
-        <path
-           id="path4508"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4510"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4512"
-         transform="matrix(0.635101,0,0,0.818349,414.7545,97.79592)">
-        <path
-           id="path4514"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4516"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-    </g>
-    <path
-       sodipodi:nodetypes="czczczc"
-       id="path4518"
-       d="M 411.78985,624.6666 C 411.78985,624.6666 400.16655,624.17722 392.02482,616.70732 C 383.88308,609.23742 377.16967,600.9919 377.16967,600.9919 C 377.16967,600.9919 381.93058,591.7906 389.99449,583.72289 C 398.05841,575.65517 410.05022,571.58486 410.05022,571.58486 C 410.05022,571.58486 415.66282,582.34945 415.74064,597.88706 C 415.81847,613.42468 411.78985,624.6666 411.78985,624.6666 z "
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       transform="matrix(2.115244,0,0,1.423109,-586.4825,-238.9625)"
-       d="M 478.70496 588.40106 A 7.5287805 18.194553 0 1 1  463.6474,588.40106 A 7.5287805 18.194553 0 1 1  478.70496 588.40106 z"
-       sodipodi:ry="18.194553"
-       sodipodi:rx="7.5287805"
-       sodipodi:cy="588.40106"
-       sodipodi:cx="471.17618"
-       id="path4520"
-       style="fill:#3771c8;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(1.163385,0,0,0.936892,-135.6486,46.23215)"
-       d="M 478.70496 588.40106 A 7.5287805 18.194553 0 1 1  463.6474,588.40106 A 7.5287805 18.194553 0 1 1  478.70496 588.40106 z"
-       sodipodi:ry="18.194553"
-       sodipodi:rx="7.5287805"
-       sodipodi:cy="588.40106"
-       sodipodi:cx="471.17618"
-       id="path4522"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.474681,0,0,0.282167,191.8461,422.9515)"
-       d="M 478.70496 588.40106 A 7.5287805 18.194553 0 1 1  463.6474,588.40106 A 7.5287805 18.194553 0 1 1  478.70496 588.40106 z"
-       sodipodi:ry="18.194553"
-       sodipodi:rx="7.5287805"
-       sodipodi:cy="588.40106"
-       sodipodi:cx="471.17618"
-       id="path4524"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     id="g2988"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,2.4823692)">
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path4570"
-       d="M 48.485517,575.51074 C 47.057601,575.53345 40.824521,575.50157 39.272311,589.79823 L 35.150004,589.79823 L 35.150004,592.07556 L 39.134654,592.07556 C 38.761213,596.18447 35.172599,613.87811 32.848466,613.95576 C 30.453707,614.03577 33.091056,614.04051 33.113086,611.43574 C 33.135117,608.83094 29.615875,608.89369 29.548583,611.44041 C 29.479763,614.04493 29.820497,616.0356 34.173133,616.00346 C 38.572698,615.97098 41.807204,603.64647 43.628053,592.07556 L 47.598261,592.07556 L 47.598261,589.79823 L 44.047779,589.79823 C 45.171812,581.85589 47.016459,577.23072 49.112651,577.21692 C 51.182106,577.20312 51.941425,580.65289 50.411982,580.16323 C 48.247364,579.4702 48.029551,584.05353 50.349925,584.13071 C 52.709916,584.20789 52.77139,580.31354 52.266111,578.31047 C 51.75305,576.27654 49.913433,575.48802 48.485517,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2984"
-       d="M 62.485517,575.51074 C 61.057601,575.53345 54.824521,575.50157 53.272311,589.79823 L 49.150004,589.79823 L 49.150004,592.07556 L 53.134654,592.07556 C 52.761213,596.18447 49.172599,613.87811 46.848466,613.95576 C 44.453707,614.03577 47.091056,614.04051 47.113086,611.43574 C 47.135117,608.83094 43.615875,608.89369 43.548583,611.44041 C 43.479763,614.04493 43.820497,616.0356 48.173133,616.00346 C 52.572698,615.97098 55.807204,603.64647 57.628053,592.07556 L 61.598261,592.07556 L 61.598261,589.79823 L 58.047779,589.79823 C 59.171812,581.85589 61.016459,577.23072 63.112651,577.21692 C 65.182106,577.20312 65.941425,580.65289 64.411982,580.16323 C 62.247364,579.4702 62.029551,584.05353 64.349925,584.13071 C 66.709916,584.20789 66.77139,580.31354 66.266111,578.31047 C 65.75305,576.27654 63.913433,575.48802 62.485517,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2986"
-       d="M 76.485517,575.51074 C 75.057601,575.53345 68.824521,575.50157 67.272311,589.79823 L 63.150004,589.79823 L 63.150004,592.07556 L 67.134654,592.07556 C 66.761213,596.18447 63.172599,613.87811 60.848466,613.95576 C 58.453707,614.03577 61.091056,614.04051 61.113086,611.43574 C 61.135117,608.83094 57.615875,608.89369 57.548583,611.44041 C 57.479763,614.04493 57.820497,616.0356 62.173133,616.00346 C 66.572698,615.97098 69.807204,603.64647 71.628053,592.07556 L 75.598261,592.07556 L 75.598261,589.79823 L 72.047779,589.79823 C 73.171812,581.85589 75.016459,577.23072 77.112651,577.21692 C 79.182106,577.20312 79.941429,580.65289 78.411982,580.16323 C 76.247364,579.4702 76.029551,584.05353 78.349925,584.13071 C 80.709919,584.20789 80.771389,580.31354 80.266109,578.31047 C 79.753049,576.27654 77.913433,575.48802 76.485517,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <g
-     id="g3012"
-     transform="matrix(0.5633612,0,0,0.5633612,20.007825,2.4823692)">
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2995"
-       d="M 136.48552,575.51074 C 135.0576,575.53345 128.82452,575.50157 127.27231,589.79823 L 123.15,589.79823 L 123.15,592.07556 L 127.13465,592.07556 C 126.76121,596.18447 123.1726,613.87811 120.84847,613.95576 C 118.45371,614.03577 121.09106,614.04051 121.11309,611.43574 C 121.13512,608.83094 117.61588,608.89369 117.54858,611.44041 C 117.47976,614.04493 117.8205,616.0356 122.17313,616.00346 C 126.5727,615.97098 129.8072,603.64647 131.62805,592.07556 L 135.59826,592.07556 L 135.59826,589.79823 L 132.04778,589.79823 C 133.17181,581.85589 135.01646,577.23072 137.11265,577.21692 C 139.18211,577.20312 139.94143,580.65289 138.41198,580.16323 C 136.24736,579.4702 136.02955,584.05353 138.34992,584.13071 C 140.70992,584.20789 140.77139,580.31354 140.26611,578.31047 C 139.75305,576.27654 137.91343,575.48802 136.48552,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2997"
-       d="M 150.48552,575.51074 C 149.0576,575.53345 142.82452,575.50157 141.27231,589.79823 L 137.15,589.79823 L 137.15,592.07556 L 141.13465,592.07556 C 140.76121,596.18447 137.1726,613.87811 134.84847,613.95576 C 132.45371,614.03577 135.09106,614.04051 135.11309,611.43574 C 135.13512,608.83094 131.61588,608.89369 131.54858,611.44041 C 131.47976,614.04493 131.8205,616.0356 136.17313,616.00346 C 140.5727,615.97098 143.8072,603.64647 145.62805,592.07556 L 149.59826,592.07556 L 149.59826,589.79823 L 146.04778,589.79823 C 147.17181,581.85589 149.01646,577.23072 151.11265,577.21692 C 153.18211,577.20312 153.94142,580.65289 152.41198,580.16323 C 150.24736,579.4702 150.02955,584.05353 152.34992,584.13071 C 154.70992,584.20789 154.77139,580.31354 154.26611,578.31047 C 153.75305,576.27654 151.91343,575.48802 150.48552,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <path
-     style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 150.98122,326.703 C 150.1768,326.71579 146.66532,326.69783 145.79086,334.75201 L 143.46851,334.75201 L 143.46851,336.03498 L 145.71331,336.03498 C 145.50293,338.34978 143.48125,348.3177 142.17192,348.36144 C 140.8228,348.40651 142.30858,348.40919 142.32099,346.94175 C 142.33341,345.47432 140.3508,345.50966 140.31289,346.94439 C 140.27412,348.41168 140.46607,349.53314 142.91818,349.51503 C 145.39673,349.49674 147.21892,342.55358 148.24472,336.03498 L 150.48138,336.03498 L 150.48138,334.75201 L 148.48118,334.75201 C 149.11442,330.27761 150.15362,327.67197 151.33453,327.66419 C 152.50038,327.65642 152.92815,329.59989 152.06653,329.32403 C 150.84706,328.9336 150.72436,331.51568 152.03156,331.55915 C 153.36109,331.60264 153.39573,329.40871 153.11107,328.28025 C 152.82203,327.13441 151.78566,326.6902 150.98122,326.703 z "
-     id="path3005"
-     sodipodi:nodetypes="cccccszzzcccczszzz" />
-  <path
-     style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 200.55704,326.703 C 199.75261,326.71579 196.24113,326.69783 195.36667,334.75201 L 193.04433,334.75201 L 193.04433,336.03498 L 195.28912,336.03498 C 195.07874,338.34978 193.05706,348.3177 191.74774,348.36144 C 190.39862,348.40651 191.8844,348.40919 191.89681,346.94175 C 191.90922,345.47432 189.92661,345.50966 189.8887,346.94439 C 189.84993,348.41168 190.04189,349.53314 192.49399,349.51503 C 194.97255,349.49674 196.79474,342.55358 197.82053,336.03498 L 200.0572,336.03498 L 200.0572,334.75201 L 198.05699,334.75201 C 198.69023,330.27761 199.72943,327.67197 200.91035,327.66419 C 202.0762,327.65642 202.50396,329.59989 201.64234,329.32403 C 200.42288,328.9336 200.30017,331.51568 201.60738,331.55915 C 202.93691,331.60264 202.97154,329.40871 202.68689,328.28025 C 202.39785,327.13441 201.36148,326.6902 200.55704,326.703 z "
-     id="path3019"
-     sodipodi:nodetypes="cccccszzzcccczszzz" />
-  <text
-     xml:space="preserve"
-     style="font-size:16.14900208px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="254.68269"
-     y="318.62085"
-     id="text3036"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3038"
-       x="254.68269"
-       y="318.62085"
-       style="font-size:16.14901543px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">m</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.14931297px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="307.45944"
-     y="318.62579"
-     id="text3044"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3046"
-       x="307.45944"
-       y="318.62579"
-       style="font-size:16.14933777px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">mp</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.14957619px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="356.63824"
-     y="318.63007"
-     id="text3048"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3050"
-       x="356.63824"
-       y="318.63007"
-       style="font-size:16.14960098px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">ppp</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.14987183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="411.81506"
-     y="318.63477"
-     id="text3052"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3054"
-       x="411.81506"
-       y="318.63477"
-       style="font-size:16.14989853px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">pp</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.15017509px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="466.99307"
-     y="318.63959"
-     id="text3056"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3058"
-       x="466.99307"
-       y="318.63959"
-       style="font-size:16.1502018px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">p</tspan></text>
-  <path
-     style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     d="M 56.110843,384.71198 L 40.303198,395.28564 L 40.303198,391.48506 L 50.703054,384.71198 L 40.303198,378.00258 L 40.303198,374.202 L 56.110843,384.71198 z "
-     id="text3060"
-     sodipodi:nodetypes="ccccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:30.45602417px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-     x="116.64803"
-     y="440.39285"
-     id="text3065"
-     transform="scale(1.1209993,0.8920612)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3067"
-       x="116.64803"
-       y="440.39285">()</tspan></text>
-  <path
-     style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     d="M 86.498845,384.71198 L 102.30649,395.28564 L 102.30649,391.48506 L 91.906645,384.71198 L 102.30649,378.00258 L 102.30649,374.202 L 86.498845,384.71198 z "
-     id="path3069"
-     sodipodi:nodetypes="ccccccc" />
-  <g
-     id="g3104"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,2.4823692)">
-    <path
-       id="path3073"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 312.30593,647.99065 C 323.97335,648.37311 324.2505,657.58689 324.25694,668.9189 C 321.0884,657.02522 322.5119,654.47127 312.34078,654.4967 C 312.28266,644.71049 312.35487,657.77749 312.30593,647.99065 z " />
-    <path
-       id="path3077"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.8136487;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       d="M 310.92742,694.2856 C 310.92742,698.0754 307.56802,701.14764 303.42398,701.14764 C 299.27995,701.14764 295.92055,698.0754 295.92055,694.2856 C 295.92055,690.49579 299.27995,687.42354 303.42398,687.42354 C 307.56802,687.42354 310.92742,690.49579 310.92742,694.2856 z " />
-    <path
-       id="path3075"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.83327127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 293.82309,681.8583 L 327.47426,657.4004" />
-    <path
-       id="path3079"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.65990877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 311.16655,693.08823 L 311.16655,648.00504" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:34.65638351px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-     x="-389.72617"
-     y="257.13391"
-     id="text3110"
-     transform="matrix(0,-1.024355,0.976224,0,0,0)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3112"
-       x="-389.72617"
-       y="257.13391">)</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:15.52974701px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="246.58002"
-     y="357.05609"
-     id="text3114"
-     transform="scale(0.9278539,1.0777559)"><tspan
-       sodipodi:role="line"
-       id="tspan3116"
-       x="246.58002"
-       y="357.05609">HO</tspan></text>
-  <path
-     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-     d="M 289.31419,381.94275 L 297.25455,390.23462 L 289.31419,398.08051 L 280.97169,390.23462 L 289.31419,381.94275 z "
-     id="rect3126"
-     sodipodi:nodetypes="ccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:14.66517448px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="313.40533"
-     y="338.75354"
-     id="text3133"
-     transform="scale(0.8879582,1.1261792)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3135"
-       x="313.40533"
-       y="338.75354"
-       style="font-size:14.66517448px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">NH</tspan></text>
-  <path
-     style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     d="M 338.02694,373.81157 L 328.23024,394.54862 L 330.02827,394.54862 L 336.05748,382.87004 L 341.53533,394.54862 L 347.76463,394.54862 L 338.02694,373.81157 z "
-     id="path3141"
-     sodipodi:nodetypes="ccccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:21.2996788px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="470.23547"
-     y="308.36682"
-     id="text3143"
-     transform="scale(0.7835739,1.2762038)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3145"
-       x="470.23547"
-       y="308.36682"
-       style="font-size:21.2996788px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P.M</tspan></text>
-  <rect
-     id="rect3147"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54208785;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_left.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3149"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="408.8056"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_right.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3151"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.03625"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_up.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3153"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.03625"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_down.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3155"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="316.64386"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_bend.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3157"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="316.64386"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3159"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="361.53442"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_vibrato.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3161"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="361.53442"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3163"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.78169"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slide.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3165"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.78169"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3167"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="269.03259"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3169"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="269.03259"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3171"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="123.47828"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_picking.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3173"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="123.47828"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3175"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.81017"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3177"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.81017"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <g
-     id="g4068"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <path
-       sodipodi:nodetypes="cc"
-       id="path3179"
-       d="M 594.00003,497.36216 C 617.85953,497.555 627.69114,488.66969 628.00003,460.36216"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       transform="matrix(0.749399,0,0,0.807087,168.8359,92.77775)"
-       d="M 622.22856,466.26925 L 611.6474,466.26925 L 601.06624,466.26925 L 606.35682,457.1057 L 611.6474,447.94215 L 616.93798,457.1057 L 622.22856,466.26925 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="1.5707963"
-       sodipodi:arg1="0.52359878"
-       sodipodi:r2="6.1090355"
-       sodipodi:r1="12.218071"
-       sodipodi:cy="460.16022"
-       sodipodi:cx="611.6474"
-       sodipodi:sides="3"
-       id="path4066"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="star" />
-  </g>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.44790959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 471.38475,347.50253 L 488.4468,330.93125"
-     id="path4072"
-     sodipodi:nodetypes="cc" />
-  <g
-     id="g5882"
-     transform="matrix(1.0269525,0,0,0.9790352,-221.22387,-130.58855)">
-    <path
-       sodipodi:nodetypes="cc"
-       id="path4074"
-       d="M 674.43107,471.32979 L 691.12154,488.11001"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.94400001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="469.35751"
-       x="672.41663"
-       height="6"
-       width="6"
-       id="rect4961"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       y="469.35751"
-       x="687.11115"
-       height="6"
-       width="6"
-       id="rect4963"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       y="483.72479"
-       x="687.11115"
-       height="6"
-       width="6"
-       id="rect4965"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       y="483.72479"
-       x="672.41663"
-       height="6"
-       width="6"
-       id="rect4967"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:23.50349617px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="409.8201"
-     y="307.42377"
-     id="text5893"
-     transform="scale(1.0327709,0.9682689)"
-     sodipodi:linespacing="125%"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-     inkscape:export-xdpi="71.751251"
-     inkscape:export-ydpi="71.751251"><tspan
-       sodipodi:role="line"
-       id="tspan5895"
-       x="409.8201"
-       y="307.42377"
-       style="font-size:23.50349617px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:31.86540413px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="452.26965"
-     y="309.18457"
-     id="text5897"
-     transform="scale(1.0413973,0.9602483)"
-     sodipodi:linespacing="125%"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-     inkscape:export-xdpi="61.67075"
-     inkscape:export-ydpi="61.67075"><tspan
-       sodipodi:role="line"
-       id="tspan5899"
-       x="452.26965"
-       y="309.18457"
-       style="font-size:31.86540413px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">s</tspan></text>
-  <g
-     id="g5911"
-     transform="matrix(0.9778313,0,0,1.3442636,-166.29942,-214.67039)">
-    <text
-       transform="scale(0.902157,1.108454)"
-       id="text5901"
-       y="312.95807"
-       x="662.24274"
-       style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       xml:space="preserve"><tspan
-         y="312.95807"
-         x="662.24274"
-         id="tspan5903"
-         sodipodi:role="line">1</tspan></text>
-    <text
-       transform="scale(0.902157,1.108454)"
-       id="text5905"
-       y="312.87729"
-       x="682.92804"
-       style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       xml:space="preserve"><tspan
-         y="312.87729"
-         x="682.92804"
-         id="tspan5907"
-         sodipodi:role="line">3</tspan></text>
-    <path
-       id="path5909"
-       d="M 605.35606,346.58166 L 615.29346,336.53376"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.20514083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <g
-     id="g5948"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <g
-       transform="matrix(0.83334,0,0,1,120.4233,-6.810365)"
-       id="g5932">
-      <path
-         d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path5922" />
-      <path
-         d="M 683.05261,356.83776 L 683.05261,326.03045"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path5924" />
-    </g>
-    <path
-       transform="translate(0.645704,6.4635e-2)"
-       d="M 684.625 362.17465 A 2.0625 2.0625 0 1 1  680.5,362.17465 A 2.0625 2.0625 0 1 1  684.625 362.17465 z"
-       sodipodi:ry="2.0625"
-       sodipodi:rx="2.0625"
-       sodipodi:cy="362.17465"
-       sodipodi:cx="682.5625"
-       id="path5936"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.44400001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:25.10733032px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="381.26865"
-     y="222.82732"
-     id="text5954"
-     transform="scale(1.1044258,0.9054479)"
-     sodipodi:linespacing="125%"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-     inkscape:export-xdpi="68.070755"
-     inkscape:export-ydpi="68.070755"><tspan
-       sodipodi:role="line"
-       id="tspan5956"
-       x="381.26865"
-       y="222.82732"
-       style="font-size:25.10733032px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">T</tspan></text>
-  <g
-     id="g6849"
-     transform="matrix(0.8038258,0,0,0.8952428,-69.897219,-50.865781)">
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path5958"
-       d="M 667.00003,271.36215 L 683.00003,284.86215 L 698.00003,271.36215"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       sodipodi:linespacing="125%"
-       transform="scale(1.077771,0.927841)"
-       id="text6845"
-       y="293.27463"
-       x="627.5741"
-       style="font-size:17.07377625px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       xml:space="preserve"><tspan
-         y="293.27463"
-         x="627.5741"
-         id="tspan6847"
-         sodipodi:role="line">X</tspan></text>
-  </g>
-  <g
-     id="g6860"
-     transform="matrix(0.6037383,0,0,0.7722113,67.160612,-5.8028708)">
-    <rect
-       transform="matrix(0.880153,-0.474689,0,1,0,0)"
-       y="507.96887"
-       x="671.18982"
-       height="5.25"
-       width="25.279688"
-       id="rect6854"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       transform="matrix(0.880153,-0.474689,0,1,0,0)"
-       y="515.96887"
-       x="671.18945"
-       height="5.25"
-       width="25.279675"
-       id="rect6856"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       transform="matrix(0.880153,-0.474689,0,1,0,0)"
-       y="523.96887"
-       x="671.18945"
-       height="5.25"
-       width="25.279675"
-       id="rect6858"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:11.30146599px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="474.99112"
-     y="149.22421"
-     id="text6865"
-     sodipodi:linespacing="125%"
-     transform="matrix(0.9705969,0,3.6240004e-2,1.0302939,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan6867"
-       x="474.99112"
-       y="149.22421"
-       style="font-size:30.13724899px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Vivaldi">tr</tspan></text>
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 420.63339,383.75166 C 420.63339,383.75166 424.59354,378.42988 426.5798,381.2851 C 428.26303,383.70473 428.68875,384.93246 429.82503,384.60352 C 430.94218,384.28011 431.68368,380.43446 435.13907,380.4622 C 437.71367,380.48325 437.22328,385.14061 441.44017,386.0373 C 439.94633,387.20777 437.34675,387.30255 435.95868,386.55808 C 434.64426,385.85311 434.07716,383.19366 432.613,383.8719 C 431.18508,384.53335 430.9326,386.9609 428.0493,386.90959 C 425.21447,386.85828 425.33498,385.27214 423.78394,383.71268 C 422.20915,382.12932 420.63339,383.75166 420.63339,383.75166 z "
-     id="path6878"
-     sodipodi:nodetypes="cszscszzzc" />
-  <g
-     id="g16418"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <g
-       style="stroke:#000000;stroke-width:1.60443127;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(1.052881,0,0,1.752712,-2.969829,-445.0024)"
-       id="g8293">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60443127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 380.60127,591.32856 L 394.60485,591.32856 L 394.60485,591.32856"
-         id="path7402" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60443127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 387.60306,591.68211 L 387.60306,618.11023"
-         id="path7404" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60443127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 380.58984,618.11023 L 394.61628,618.11023"
-         id="path7406" />
-    </g>
-    <g
-       transform="matrix(0.83334,0,0,1.26493,-176.5805,177.5719)"
-       id="g11878">
-      <path
-         d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path11880" />
-      <path
-         d="M 683.05261,356.83776 L 683.05261,326.03045"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path11882" />
-    </g>
-    <g
-       transform="translate(2.386486,-12.72792)"
-       id="g11890">
-      <path
-         style="fill:url(#radialGradient16399);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 407.38189,616.60763 L 391.73716,638.26278 L 416.75106,629.33555 L 407.38189,616.60763 z "
-         id="path8312"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:url(#linearGradient16401);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 407.47028,616.25408 L 423.64535,601.58161 L 423.64535,622.52965 L 417.10461,629.15877 L 407.47028,616.25408 z "
-         id="path8314"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-  <g
-     id="g21770"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <text
-       sodipodi:linespacing="125%"
-       transform="matrix(0,-1.06756,0.936716,0,0,0)"
-       id="text21766"
-       y="508.78696"
-       x="-580.42908"
-       style="font-size:44.71162415px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       xml:space="preserve"><tspan
-         y="508.78696"
-         x="-580.42908"
-         id="tspan21768"
-         sodipodi:role="line">)</tspan></text>
-    <g
-       transform="translate(2.828427,-2.65165)"
-       id="g21749">
-      <g
-         id="g16378"
-         transform="matrix(0.83334,0,0,1.26493,-81.035,178.0078)">
-        <path
-           id="path16380"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z " />
-        <path
-           id="path16382"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 683.05261,356.83776 L 683.05261,326.03045" />
-      </g>
-      <g
-         id="g15477"
-         transform="matrix(0.289054,1.22178,-1.331968,1.944028e-2,1154.889,24.19248)"
-         style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path12800"
-           d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-           style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:nodetypes="ccccccsccccsc" />
-        <path
-           transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-           style="fill:url(#linearGradient21760);fill-opacity:1;stroke-width:1.00046873"
-           d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-           id="rect14581"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path16432"
-         sodipodi:cx="449.8125"
-         sodipodi:cy="637.17468"
-         sodipodi:rx="4.3707523"
-         sodipodi:ry="4.0625"
-         d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-         transform="matrix(0.819316,0.899502,-0.550332,0.501274,431.3845,-87.32081)" />
-      <path
-         style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 484.50072,592.19035 L 477.27498,598.81948 L 478.13677,604.94037 L 479.88494,606.41213 L 478.88807,599.72546 L 484.41233,593.98021 L 484.50072,592.19035 z "
-         id="path16435"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 491.96404,614.17206 C 487.52149,616.98813 481.99224,615.61946 480.03711,615.85633 C 478.33,616.06315 476.50158,617.62409 476.50158,617.62409 L 476.3248,615.10502 L 478.79969,613.73501 C 478.79969,613.73501 480.86422,613.06577 485.56139,613.46984 C 489.14203,613.77787 492.60171,611.64036 493.64891,609.31558 L 495.85862,604.41003 C 495.35966,607.74069 493.83974,612.98308 491.96404,614.17206 z "
-         id="path17322"
-         sodipodi:nodetypes="cscccsscs" />
-    </g>
-    <text
-       inkscape:transform-center-x="11"
-       inkscape:transform-center-y="-10.103847"
-       transform="matrix(0.717341,-0.596996,0.540854,0.94392,0,0)"
-       sodipodi:linespacing="100%"
-       id="text21762"
-       y="709.63062"
-       x="105.70007"
-       style="font-size:14.4750843px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       xml:space="preserve"><tspan
-         style="font-size:14.47510719px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook"
-         y="709.63062"
-         x="105.70007"
-         id="tspan21764"
-         sodipodi:role="line">pp</tspan></text>
-  </g>
-  <g
-     id="g3407"
-     transform="matrix(9.7000401e-2,8.1066758e-3,-1.1753914e-2,0.1240388,219.94383,532.76077)">
-    <g
-       id="g3296"
-       transform="matrix(3.608871,12.53273,-16.62977,0.199414,8930.251,-5616.342)"
-       style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         id="path3298"
-         d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-         style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="ccccccsccccsc" />
-      <path
-         transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-         style="fill:url(#linearGradient3382);fill-opacity:1;stroke-width:1.00046873"
-         d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-         id="path3300"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3302"
-       sodipodi:cx="449.8125"
-       sodipodi:cy="637.17468"
-       sodipodi:rx="4.3707523"
-       sodipodi:ry="4.0625"
-       d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-       transform="matrix(10.22925,9.226876,-6.870956,5.141948,-102.7821,-6760.219)" />
-    <path
-       style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:2.26335382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 560.37978,210.04348 L 470.16563,278.04351 L 480.92517,340.83013 L 502.75126,355.92709 L 490.30523,287.33683 L 559.27623,228.40344 L 560.37978,210.04348 z "
-       id="path3304"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.39503074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 653.56016,435.52659 C 598.09443,464.41316 529.06114,450.37367 504.65112,452.80343 C 483.33767,454.92494 460.50964,470.93669 460.50964,470.93669 L 458.30252,445.09667 L 489.2018,431.04344 C 489.2018,431.04344 514.97768,424.17853 573.62237,428.32339 C 618.32705,431.48308 661.52154,409.55702 674.59594,385.70998 L 702.18442,335.39003 C 695.95484,369.55514 676.97848,423.33032 653.56016,435.52659 z "
-       id="path3306"
-       sodipodi:nodetypes="cscccsscs" />
-  </g>
-  <g
-     id="g21483"
-     transform="matrix(0.6801604,0,0,0.6801604,19.124016,12.734109)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/option_skin.png"
-     inkscape:export-xdpi="54.250492"
-     inkscape:export-ydpi="54.250492">
-    <a
-       style="fill:url(#linearGradient21491);fill-opacity:1"
-       transform="matrix(1.0935538,0,0,0.9875559,-81.605798,-98.323313)"
-       id="a3635">
-      <path
-         style="fill:url(#linearGradient21493);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.40568686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 573.46809,989.25496 C 561.43446,918.49524 637.03499,915.96748 645.83589,919.79716 C 674.43146,931.00974 654.3464,985.51774 650.05535,987.75336 C 644.89956,990.4395 620.42002,988.48086 620.50756,989.43376 C 620.52581,989.44042 615.71426,1009.4048 598.77641,1009.9117 C 590.46857,1010.1603 574.46337,997.70295 573.46809,989.25496 z "
-         id="path3633"
-         sodipodi:nodetypes="ccscsc" />
-    </a>
-    <path
-       transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,425.79798,629.67088)"
-       d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.66417817"
-       sodipodi:arg1="-1.2924967"
-       sodipodi:r2="7.7217226"
-       sodipodi:r1="3.8608613"
-       sodipodi:cy="839.52301"
-       sodipodi:cx="566.39252"
-       sodipodi:sides="5"
-       id="path3644"
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#d22d2d;stroke-width:35.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,443.91514,614.48309)"
-       d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.66417817"
-       sodipodi:arg1="-1.2924967"
-       sodipodi:r2="7.7217226"
-       sodipodi:r1="3.8608613"
-       sodipodi:cy="839.52301"
-       sodipodi:cx="566.39252"
-       sodipodi:sides="5"
-       id="path3646"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#00a100;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(0.272574,1.2309989e-2,-1.2858322e-2,0.2609503,464.35714,598.38051)"
-       d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.66417817"
-       sodipodi:arg1="-1.2924967"
-       sodipodi:r2="7.7217226"
-       sodipodi:r1="3.8608613"
-       sodipodi:cy="839.52301"
-       sodipodi:cx="566.39252"
-       sodipodi:sides="5"
-       id="path3648"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4bff;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(0.1668918,0.1065936,-0.1502726,0.1897914,624.05104,651.11923)"
-       d="M 559.81399 897.85938 A 44.686672 47.620178 0 1 1  470.44065,897.85938 A 44.686672 47.620178 0 1 1  559.81399 897.85938 z"
-       sodipodi:ry="47.620178"
-       sodipodi:rx="44.686672"
-       sodipodi:cy="897.85938"
-       sodipodi:cx="515.12732"
-       id="path4681"
-       style="fill:#ffffff;fill-opacity:0.96703342;fill-rule:nonzero;stroke:#090303;stroke-width:8.73597431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98360656"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     style="display:inline"
-     id="g17053"
-     transform="matrix(0.2445295,0,0,0.2430948,131.58122,35.384719)">
-    <rect
-       ry="29.257792"
-       rx="29.086124"
-       y="423.20496"
-       x="355.73645"
-       height="99.78186"
-       width="99.78186"
-       id="rect17055"
-       style="fill:url(#radialGradient17059);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       transform="matrix(0.452101,0,0,0.484373,563.5737,407.7282)"
-       d="M -418.05177,221.55162 L -418.05177,134.95318 L -418.05177,48.354749 L -343.05532,91.653969 L -268.05888,134.95319 L -343.05532,178.25241 L -418.05177,221.55162 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="3.1415927"
-       sodipodi:arg1="2.0943951"
-       sodipodi:r2="49.997631"
-       sodipodi:r1="99.995262"
-       sodipodi:cy="134.95319"
-       sodipodi:cx="-368.05414"
-       sodipodi:sides="3"
-       id="path17057"
-       style="fill:#008033;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.62562513;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       sodipodi:type="star" />
-  </g>
-  <g
-     id="g21908"
-     transform="matrix(0.6801604,0,0,0.6801604,124.49954,136.41977)">
-    <rect
-       width="35.760925"
-       height="35.760925"
-       rx="7.9460096"
-       ry="7.9460096"
-       x="-227.18408"
-       y="-113.8597"
-       transform="scale(-1,1)"
-       style="fill:url(#radialGradient21912);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74953651;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect19956" />
-    <rect
-       width="26.976021"
-       height="30.992802"
-       rx="22.477581"
-       ry="7.9460096"
-       x="195.81561"
-       y="-111.36695"
-       style="fill:#f95557;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.02269864;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect19958" />
-  </g>
-  <g
-     id="g22907"
-     transform="matrix(0.6801604,0,0,0.6801604,5.2249174,134.01503)">
-    <rect
-       id="rect21916"
-       style="fill:url(#radialGradient22911);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74953711;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="-111.7384"
-       x="151.82515"
-       ry="7.9460163"
-       rx="7.9460163"
-       height="35.760952"
-       width="35.760952" />
-    <path
-       id="path21918"
-       style="fill:#008033;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.60806185;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 158.57577,-78.824867 L 158.57577,-93.857923 L 158.57577,-108.89098 L 170.72736,-101.37445 L 182.87895,-93.857921 L 170.72736,-86.341393 L 158.57577,-78.824867 z " />
-  </g>
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 479.04781,429.57872 L 460.51344,429.57872"
-     id="path5612"
-     inkscape:connector-type="polyline" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 430.55339,429.57872 L 449.08776,429.57872"
-     id="path5617"
-     inkscape:connector-type="polyline" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 431.13119,474.2316 L 431.13119,492.76597"
-     id="path5619"
-     inkscape:connector-type="polyline" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 479.25254,475.38719 L 479.25254,456.85282"
-     id="path5621"
-     inkscape:connector-type="polyline" />
-  <g
-     id="g5456"
-     transform="matrix(0.6801604,0,0,0.6801604,13.881947,11.494019)">
-    <path
-       inkscape:connector-type="polyline"
-       id="path3479"
-       d="M 660.56485,524.48896 L 711.90839,524.46219"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.57923365px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    <g
-       id="g5451">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.78366613px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 658.18058,522.19705 L 658.18058,550.37123"
-         id="path3481"
-         inkscape:connector-type="polyline" />
-      <text
-         xml:space="preserve"
-         style="font-size:21.18201256px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="664.1015"
-         y="546.73944"
-         id="text3483"><tspan
-           sodipodi:role="line"
-           id="tspan3485"
-           x="664.1015"
-           y="546.73944">*</tspan></text>
-    </g>
-  </g>
-  <rect
-     id="rect3499"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54178809999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="408.77814"
-     x="505"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_1.png"
-     inkscape:export-xdpi="51.581074"
-     inkscape:export-ydpi="51.581074" />
-  <rect
-     id="rect3501"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54178809999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.15314"
-     x="505"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_2.png"
-     inkscape:export-xdpi="51.581074"
-     inkscape:export-ydpi="51.581074" />
-  <rect
-     id="rect3503"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="316.66254"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3505"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="361.5531"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3507"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.80037"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3509"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="269.05127"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3511"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="123.49697"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3513"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.82884"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <g
-     id="g4645"
-     transform="matrix(2.1169218e-2,0,0,-2.1169218e-2,520.23635,150.36733)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_treble.png"
-     inkscape:export-xdpi="112.41393"
-     inkscape:export-ydpi="112.41393">
-    <path
-       id="path4647"
-       d="M 297,1245 C 303,1248 304,1248 310,1248 C 318,1247 323,1244 334,1232 C 406,1158 466,1026 481,914 C 483,896 483,854 481,835 C 470,732 427,638 328,503 L 314,484 L 322,461 C 341,406 363,339 377,290 C 381,278 384,268 384,267 C 384,267 391,267 398,266 C 433,263 463,255 494,240 C 519,227 541,212 562,192 C 585,169 600,148 614,119 C 635,77 644,33 643,-11 C 642,-39 638,-60 629,-86 C 617,-124 595,-159 565,-189 C 539,-215 515,-231 483,-244 L 471,-249 L 471,-285 C 471,-336 468,-396 464,-432 C 460,-469 450,-504 434,-536 C 392,-621 318,-666 235,-658 C 141,-649 65,-585 46,-499 C 37,-460 41,-430 57,-405 C 78,-372 118,-353 157,-354 C 203,-356 240,-392 247,-442 C 252,-482 235,-519 203,-539 C 185,-550 160,-555 141,-552 C 138,-552 135,-551 135,-552 L 147,-564 C 169,-586 194,-600 226,-607 C 233,-608 239,-608 255,-608 C 273,-608 275,-608 285,-606 C 299,-602 311,-597 322,-591 C 372,-561 406,-499 415,-424 C 418,-396 421,-336 421,-292 C 421,-263 421,-261 419,-261 C 415,-263 394,-265 379,-266 C 360,-267 328,-267 313,-265 C 254,-258 200,-238 153,-205 C 83,-156 33,-83 12,1 C -15,106 4,218 70,336 C 98,385 125,425 192,514 L 230,565 L 223,584 C 175,711 159,784 154,890 C 152,936 154,975 160,1007 C 175,1091 214,1166 275,1226 C 287,1238 292,1242 297,1245 z M 376,1074 C 366,1091 368,1090 359,1084 C 331,1067 302,1041 281,1015 C 238,960 214,896 211,827 C 210,799 213,781 226,738 C 236,703 264,618 266,616 C 266,615 272,622 278,631 C 347,730 384,811 398,892 C 401,913 403,930 404,954 C 405,1009 399,1036 376,1074 z M 290,401 C 284,420 278,435 278,435 C 277,435 235,379 217,354 C 158,271 122,204 101,138 C 87,97 81,59 79,17 C 79,-6 80,-20 84,-37 C 107,-126 202,-199 314,-215 C 331,-217 379,-217 400,-215 C 421,-212 419,-213 418,-204 C 412,-109 404,-51 388,35 C 382,71 365,147 364,148 C 363,149 344,147 333,144 C 319,141 310,138 298,132 C 233,99 214,24 255,-37 C 262,-47 280,-65 291,-72 C 295,-75 304,-81 310,-84 C 319,-89 321,-91 323,-95 C 331,-108 326,-124 311,-131 C 303,-135 297,-134 281,-126 C 242,-107 213,-81 192,-49 C 153,11 148,88 180,153 C 208,209 258,247 322,261 C 328,263 333,264 333,264 C 334,265 306,356 290,401 z M 426,143 C 423,143 420,144 419,144 L 416,145 L 421,124 C 444,23 461,-87 467,-180 C 468,-190 468,-198 468,-198 C 469,-198 482,-192 489,-187 C 506,-177 522,-162 535,-145 C 566,-104 577,-53 565,-1 C 556,41 532,80 498,107 C 477,123 449,137 426,143 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g4687"
-     transform="matrix(2.5582031e-2,0,0,-2.5582031e-2,518.81737,190.80995)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_bass.png"
-     inkscape:export-xdpi="88.486824"
-     inkscape:export-ydpi="88.486824">
-    <path
-       id="path4689"
-       d="M 207,266 C 218,267 261,266 277,265 C 402,251 487,189 515,91 C 522,64 525,44 524,10 C 524,-33 519,-69 505,-107 C 454,-258 305,-383 33,-503 C 22,-508 12,-513 11,-514 C 5,-518 -1,-519 -7,-516 C -12,-514 -14,-512 -16,-507 C -19,-502 -18,-497 -16,-493 C -14,-489 -10,-486 12,-473 C 101,-420 166,-373 221,-325 C 238,-309 270,-277 284,-261 C 345,-190 377,-121 388,-41 C 390,-22 390,23 388,42 C 384,71 377,98 368,122 C 361,138 359,143 351,156 C 322,205 278,232 229,232 C 181,232 141,205 115,154 C 111,146 101,120 101,119 C 101,118 105,119 109,119 C 132,120 157,111 176,96 C 212,65 222,15 200,-30 C 185,-63 153,-84 118,-87 C 69,-90 21,-58 5,-12 C 0,3 -1,18 1,42 C 10,142 74,227 162,256 C 177,261 192,264 207,266 z M 596,172 C 612,177 631,172 644,160 C 653,150 658,137 658,124 C 658,97 636,75 609,75 C 581,75 559,97 559,124 C 559,147 574,166 596,172 z M 596,-77 C 612,-72 631,-77 644,-89 C 656,-102 661,-120 656,-136 C 651,-159 632,-174 609,-174 C 581,-174 559,-152 559,-125 C 559,-102 574,-83 596,-77 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g4729"
-     transform="matrix(2.3963563e-2,0,0,-2.3963563e-2,518.94351,243.2844)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_alto.png"
-     inkscape:export-xdpi="92.514755"
-     inkscape:export-ydpi="92.514755">
-    <path
-       id="path4731"
-       d="M 9,498 C 12,500 18,500 72,500 L 132,500 L 135,497 C 137,495 139,493 140,491 C 142,487 142,450 142,0 C 142,-450 142,-487 140,-491 C 139,-493 137,-495 135,-497 L 132,-499 L 71,-499 L 10,-499 L 7,-497 C 5,-495 3,-493 2,-491 C 0,-487 0,-450 0,1 L 1,490 L 3,493 C 5,495 7,497 9,498 z M 201,498 C 204,500 207,500 218,500 C 231,500 232,499 235,497 C 243,491 242,514 242,254 L 242,21 L 248,26 C 273,50 296,87 309,120 C 317,144 322,171 324,200 C 324,213 325,215 327,218 C 329,221 336,225 341,225 C 346,225 352,222 355,219 C 357,215 358,214 359,195 C 362,154 376,120 399,96 C 422,74 449,65 482,69 C 505,72 522,79 535,92 C 549,106 557,122 563,147 C 569,169 571,191 572,236 C 574,391 545,454 464,465 C 432,469 411,463 402,448 C 400,444 400,443 400,435 C 400,426 400,425 403,419 C 406,413 408,410 420,398 C 432,387 434,383 437,378 C 444,363 441,341 430,321 C 426,314 412,300 405,296 C 380,281 351,281 326,296 C 319,300 305,314 301,321 C 291,338 288,356 291,379 C 296,408 309,433 330,455 C 352,476 379,490 411,497 C 430,501 467,501 499,496 C 617,479 680,407 689,281 C 692,242 689,214 680,185 C 652,103 577,44 487,35 C 458,32 450,34 423,52 C 407,63 399,67 391,69 C 379,72 367,69 358,61 C 347,52 342,33 342,0 C 342,-33 347,-52 358,-61 C 367,-69 379,-72 391,-69 C 399,-67 407,-63 423,-52 C 450,-34 458,-32 487,-35 C 577,-44 652,-103 680,-185 C 689,-214 692,-242 689,-280 C 679,-418 607,-489 469,-499 C 436,-501 413,-499 390,-491 C 345,-476 308,-440 295,-397 C 287,-367 289,-343 301,-321 C 305,-314 319,-300 326,-296 C 351,-281 380,-281 405,-296 C 412,-300 426,-314 430,-321 C 441,-341 444,-363 437,-378 C 434,-383 432,-387 420,-398 C 408,-410 406,-413 403,-419 C 400,-425 400,-426 400,-434 C 400,-443 400,-444 402,-448 C 411,-463 432,-469 464,-465 C 513,-458 543,-432 558,-380 C 568,-346 573,-300 572,-236 C 571,-191 569,-169 563,-146 C 551,-98 526,-74 482,-69 C 449,-65 422,-74 399,-96 C 376,-120 362,-154 359,-195 C 358,-214 357,-215 355,-219 C 352,-222 346,-225 341,-225 C 336,-225 329,-221 327,-218 C 325,-215 324,-213 324,-200 C 322,-160 314,-130 298,-95 C 286,-71 266,-44 248,-26 L 242,-21 L 242,-254 C 242,-514 243,-491 235,-497 C 232,-499 231,-499 217,-499 C 203,-499 202,-499 199,-497 C 197,-495 195,-493 194,-491 C 192,-487 192,-450 192,1 L 193,490 L 195,493 C 197,495 199,497 201,498 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g3548"
-     transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,524.00563,345.37089)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_flat.png"
-     inkscape:export-xdpi="40.069347"
-     inkscape:export-ydpi="40.069347">
-    <path
-       id="path3550"
-       d="M -12,469 C -1,471 17,469 24,464 C 26,463 26,452 23,289 C 21,194 20,116 20,116 C 20,115 24,117 28,120 C 49,134 75,142 101,144 C 128,145 150,137 169,118 C 188,100 198,76 200,50 C 201,31 197,14 188,-4 C 174,-31 154,-50 94,-91 C 56,-117 46,-125 34,-139 C 28,-145 21,-152 19,-153 C 10,-159 0,-158 -8,-151 C -10,-148 -12,-145 -13,-142 C -14,-140 -16,-33 -19,136 C -22,287 -24,422 -25,437 L -25,463 L -21,465 C -19,466 -15,468 -12,469 z M 94,102 C 87,106 76,107 67,104 C 49,99 34,83 28,62 C 26,52 24,-34 26,-67 C 27,-81 27,-94 28,-97 L 29,-101 L 44,-88 C 65,-70 86,-49 96,-35 C 106,-21 116,-2 120,12 C 126,35 123,61 114,81 C 109,91 103,98 94,102 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g3590"
-     transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,523.10578,382.55733)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_natural.png"
-     inkscape:export-xdpi="40.012753"
-     inkscape:export-ydpi="40.012753">
-    <path
-       id="path3592"
-       d="M 7,380 C 15,382 33,380 40,375 C 41,374 41,359 40,288 C 39,240 39,201 39,201 C 39,200 64,204 95,209 C 127,215 152,218 153,218 C 158,217 162,213 165,208 L 167,204 L 170,-85 C 173,-317 174,-374 173,-374 C 172,-375 169,-376 166,-377 C 158,-380 142,-380 134,-377 C 131,-376 128,-375 127,-374 C 126,-373 126,-358 127,-287 C 128,-239 128,-200 128,-200 C 128,-199 103,-203 72,-208 C 40,-214 15,-217 14,-217 C 9,-216 5,-212 2,-207 L 0,-202 L -3,49 C -5,187 -6,317 -7,338 L -7,375 L -2,377 C 1,378 5,379 7,380 z M 132,100 C 132,111 132,114 131,114 C 127,114 38,99 38,98 C 37,98 35,-112 35,-113 C 36,-113 128,-98 129,-97 C 129,-97 132,54 132,100 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g3632"
-     transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,520.02757,289.61034)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_sharp.png"
-     inkscape:export-xdpi="32.806053"
-     inkscape:export-ydpi="32.806053">
-    <path
-       id="path3634"
-       d="M 191,373 C 198,377 209,374 213,365 C 215,361 215,358 215,288 C 215,247 215,214 216,214 C 216,214 225,218 236,222 C 259,231 262,232 268,227 C 275,222 275,221 275,181 C 275,147 275,144 273,141 C 272,139 270,137 269,136 C 267,135 255,129 241,124 L 216,113 L 215,32 C 215,-12 215,-49 216,-49 C 216,-49 225,-45 236,-41 C 259,-32 262,-31 268,-36 C 275,-41 275,-42 275,-82 C 275,-116 275,-119 273,-122 C 272,-124 270,-126 269,-127 C 267,-128 255,-134 241,-139 L 216,-150 L 215,-234 C 215,-310 214,-319 213,-322 C 206,-334 189,-334 182,-322 C 181,-319 180,-311 180,-241 L 180,-164 L 137,-181 L 95,-198 L 95,-279 C 95,-365 95,-363 90,-368 C 88,-371 81,-374 78,-374 C 74,-374 67,-371 65,-368 C 60,-363 60,-365 60,-287 C 60,-246 60,-213 59,-213 C 59,-213 50,-217 39,-221 C 16,-230 13,-231 7,-226 C 0,-221 0,-220 0,-180 C 0,-146 0,-143 2,-140 C 3,-138 5,-136 6,-135 C 8,-134 20,-128 34,-123 L 60,-112 L 60,-31 C 60,13 60,50 59,50 C 59,50 50,46 39,42 C 16,33 13,32 7,37 C 0,42 0,43 0,83 C 0,117 0,120 2,123 C 3,125 5,127 6,128 C 8,129 20,135 34,140 L 60,151 L 60,235 C 60,311 61,320 62,323 C 69,335 86,335 93,323 C 94,320 95,312 95,242 L 96,165 L 138,182 L 180,199 L 180,280 C 180,356 180,361 182,365 C 184,369 186,371 191,373 z M 180,18 L 180,99 L 137,82 L 95,65 L 95,-17 L 95,-98 L 98,-97 C 100,-96 119,-88 141,-80 L 180,-64 L 180,18 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g4514"
-     transform="translate(0.7071068,2.4748737)">
-    <g
-       transform="matrix(0.5668049,0,0,0.8603553,-3.5065048,130.39104)"
-       id="g3515">
-      <path
-         d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path3517" />
-      <path
-         d="M 683.05261,356.83776 L 683.05261,326.03045"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path3519" />
-    </g>
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path3541"
-       d="M 387.957,426.78352 L 398.26464,437.35718 L 398.26464,433.5566 L 391.48325,426.78352 L 398.26464,420.07412 L 398.26464,416.27354 L 387.957,426.78352 z "
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path3543"
-       d="M 378.09836,426.89402 L 367.79072,416.32036 L 367.79072,420.12094 L 374.57211,426.89402 L 367.79072,433.60342 L 367.79072,437.404 L 378.09836,426.89402 z "
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="675.8205"
-     y="338.63779"
-     id="text3736"
-     transform="scale(0.7694351,1.2996548)"
-     inkscape:label="#text3736"><tspan
-       sodipodi:role="line"
-       id="tspan3738"
-       x="675.8205"
-       y="338.63779">1</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="675.8205"
-     y="373.55087"
-     id="text3740"
-     transform="scale(0.7694351,1.2996548)"><tspan
-       sodipodi:role="line"
-       id="tspan3742"
-       x="675.8205"
-       y="373.55087">2</tspan></text>
-</svg>
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/song_properties.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/song_properties.png
deleted file mode 100644
index bbb0e9c8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/song_properties.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/splash.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/splash.png
deleted file mode 100644
index 4f0383a2..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/splash.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/tempo.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/tempo.png
deleted file mode 100644
index a06586e8..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/tempo.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/tempoicon.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/tempoicon.png
deleted file mode 100644
index 922047c4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/tiednote.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/tiednote.png
deleted file mode 100644
index f1a76314..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/tiednote.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/timesignature.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/timesignature.png
deleted file mode 100644
index c047cdf5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/timesignature.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/track_add.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/track_add.png
deleted file mode 100644
index 5fae2a91..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/track_add.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/track_remove.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/track_remove.png
deleted file mode 100644
index b7c4a74e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/track_remove.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport.png
deleted file mode 100644
index 7dd06499..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_first_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_first_1.png
deleted file mode 100644
index 0611b440..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_first_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_first_2.png
deleted file mode 100644
index 4b952866..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_first_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_first_1.png
deleted file mode 100644
index 0ba109b5..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_first_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_first_2.png
deleted file mode 100644
index aaf03e67..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_last_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_last_1.png
deleted file mode 100644
index 2e038f67..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_last_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_last_2.png
deleted file mode 100644
index 70070647..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_next_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_next_1.png
deleted file mode 100644
index 2ce4d78a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_next_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_next_2.png
deleted file mode 100644
index 31cef808..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_pause.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_pause.png
deleted file mode 100644
index 841e0d62..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_play_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_play_1.png
deleted file mode 100644
index 2d744dba..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_play_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_play_2.png
deleted file mode 100644
index f2b8ad32..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_previous_1.png
deleted file mode 100644
index 7e37f199..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_previous_2.png
deleted file mode 100644
index 65fa720b..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_stop_1.png
deleted file mode 100644
index 60351a8d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_stop_2.png
deleted file mode 100644
index 61b7be2e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_last_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_last_1.png
deleted file mode 100644
index 4df5a1cc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_last_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_last_2.png
deleted file mode 100644
index 4408e75d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_metronome.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_metronome.png
deleted file mode 100644
index be8f4119..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_mode.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_mode.png
deleted file mode 100644
index b5720041..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_next_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_next_1.png
deleted file mode 100644
index 76d960b9..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_next_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_next_2.png
deleted file mode 100644
index 35fc6c2a..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_pause.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_pause.png
deleted file mode 100644
index 55d0affb..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_play_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_play_1.png
deleted file mode 100644
index a1975f3d..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_play_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_play_2.png
deleted file mode 100644
index 5dd58430..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_previous_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_previous_1.png
deleted file mode 100644
index 5fe8efb7..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_previous_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_previous_2.png
deleted file mode 100644
index 0a2008a0..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_stop_1.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_stop_1.png
deleted file mode 100644
index bf0010f4..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_stop_2.png b/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_stop_2.png
deleted file mode 100644
index 9ab8e3bc..00000000
Binary files a/TuxGuitar-testing/platform-all/share/skins/ersplus/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/templates/template-1.tg b/TuxGuitar-testing/platform-all/share/templates/template-1.tg
deleted file mode 100644
index f0feb3d6..00000000
Binary files a/TuxGuitar-testing/platform-all/share/templates/template-1.tg and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/templates/template-2.tg b/TuxGuitar-testing/platform-all/share/templates/template-2.tg
deleted file mode 100644
index 09c8dd4e..00000000
Binary files a/TuxGuitar-testing/platform-all/share/templates/template-2.tg and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/templates/template-default.tg b/TuxGuitar-testing/platform-all/share/templates/template-default.tg
deleted file mode 100644
index 4edb0437..00000000
Binary files a/TuxGuitar-testing/platform-all/share/templates/template-default.tg and /dev/null differ
diff --git a/TuxGuitar-testing/platform-all/share/templates/templates.xml b/TuxGuitar-testing/platform-all/share/templates/templates.xml
deleted file mode 100644
index f0ece2f3..00000000
--- a/TuxGuitar-testing/platform-all/share/templates/templates.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<templates>
-	<template resource="template-1.tg" name="Blues Trio"/>
-	<template resource="template-2.tg" name="Classical Guitar Duo"/>
-</templates>
\ No newline at end of file
diff --git a/TuxGuitar-testing/platform-all/tuxguitar.jar b/TuxGuitar-testing/platform-all/tuxguitar.jar
deleted file mode 100644
index febf64f7..00000000
Binary files a/TuxGuitar-testing/platform-all/tuxguitar.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-alsa-jni.so b/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-alsa-jni.so
deleted file mode 100755
index 6e3d41cd..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-alsa-jni.so and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-fluidsynth-jni.so b/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-fluidsynth-jni.so
deleted file mode 100755
index ec81a7bc..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-fluidsynth-jni.so and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-jack-jni.so b/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-jack-jni.so
deleted file mode 100755
index 78d52e74..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/lib/libtuxguitar-jack-jni.so and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/lib/swt.jar b/TuxGuitar-testing/platform-linux-x86/lib/swt.jar
deleted file mode 100644
index dc48467c..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/lib/swt.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/lib/tuxguitar-dist.jar b/TuxGuitar-testing/platform-linux-x86/lib/tuxguitar-dist.jar
deleted file mode 100644
index 6127c08c..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/lib/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-alsa.jar b/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-alsa.jar
deleted file mode 100644
index 121dc982..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-alsa.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-fluidsynth.jar b/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-fluidsynth.jar
deleted file mode 100644
index 0b08c680..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-fluidsynth.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-jack.jar b/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-jack.jar
deleted file mode 100644
index fb565cf6..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86/share/plugins/tuxguitar-jack.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86_64/lib/libtuxguitar-alsa-jni.so b/TuxGuitar-testing/platform-linux-x86_64/lib/libtuxguitar-alsa-jni.so
deleted file mode 100644
index 6141daad..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86_64/lib/libtuxguitar-alsa-jni.so and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86_64/lib/swt.jar b/TuxGuitar-testing/platform-linux-x86_64/lib/swt.jar
deleted file mode 100644
index 314da6ab..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86_64/lib/swt.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86_64/lib/tuxguitar-dist.jar b/TuxGuitar-testing/platform-linux-x86_64/lib/tuxguitar-dist.jar
deleted file mode 100644
index e1b68ee8..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86_64/lib/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-linux-x86_64/share/plugins/tuxguitar-alsa.jar b/TuxGuitar-testing/platform-linux-x86_64/share/plugins/tuxguitar-alsa.jar
deleted file mode 100644
index 10a896b4..00000000
Binary files a/TuxGuitar-testing/platform-linux-x86_64/share/plugins/tuxguitar-alsa.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/fluidsynth.dll b/TuxGuitar-testing/platform-win32/fluidsynth.dll
deleted file mode 100755
index 3b6694ee..00000000
Binary files a/TuxGuitar-testing/platform-win32/fluidsynth.dll and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/lib/swt.jar b/TuxGuitar-testing/platform-win32/lib/swt.jar
deleted file mode 100644
index 4511b30a..00000000
Binary files a/TuxGuitar-testing/platform-win32/lib/swt.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/lib/tuxguitar-dist.jar b/TuxGuitar-testing/platform-win32/lib/tuxguitar-dist.jar
deleted file mode 100644
index d59cc73f..00000000
Binary files a/TuxGuitar-testing/platform-win32/lib/tuxguitar-dist.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/lib/tuxguitar-fluidsynth-jni.dll b/TuxGuitar-testing/platform-win32/lib/tuxguitar-fluidsynth-jni.dll
deleted file mode 100755
index 3a3e6f23..00000000
Binary files a/TuxGuitar-testing/platform-win32/lib/tuxguitar-fluidsynth-jni.dll and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/lib/tuxguitar-jack-jni.dll b/TuxGuitar-testing/platform-win32/lib/tuxguitar-jack-jni.dll
deleted file mode 100755
index 75e767c6..00000000
Binary files a/TuxGuitar-testing/platform-win32/lib/tuxguitar-jack-jni.dll and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/pthreadVC2.dll b/TuxGuitar-testing/platform-win32/pthreadVC2.dll
deleted file mode 100755
index 93f562ba..00000000
Binary files a/TuxGuitar-testing/platform-win32/pthreadVC2.dll and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/share/plugins/tuxguitar-fluidsynth.jar b/TuxGuitar-testing/platform-win32/share/plugins/tuxguitar-fluidsynth.jar
deleted file mode 100644
index f2cd681d..00000000
Binary files a/TuxGuitar-testing/platform-win32/share/plugins/tuxguitar-fluidsynth.jar and /dev/null differ
diff --git a/TuxGuitar-testing/platform-win32/share/plugins/tuxguitar-jack.jar b/TuxGuitar-testing/platform-win32/share/plugins/tuxguitar-jack.jar
deleted file mode 100644
index b733aa5f..00000000
Binary files a/TuxGuitar-testing/platform-win32/share/plugins/tuxguitar-jack.jar and /dev/null differ
diff --git a/TuxGuitar-testing/tuxguitar.bat b/TuxGuitar-testing/tuxguitar.bat
deleted file mode 100755
index 3a216bf7..00000000
--- a/TuxGuitar-testing/tuxguitar.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-cd "platform-win32"
-
-SET "JAVA=java"
-
-SET "JAVA_LIBRARY_PATH=%JAVA_LIBRARY_PATH%;lib\"
-
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;..\platform-all\tuxguitar.jar"
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;..\platform-all\lib\itext.jar"
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;..\platform-all\lib\gervill.jar"
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;..\platform-all\share\"
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;lib\tuxguitar-dist.jar"
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;lib\swt.jar"
-SET "JAVA_CLASSPATH=%JAVA_CLASSPATH%;share\"
-
-SET "TG_MAIN_CLASS=org.herac.tuxguitar.app.TGMain"
-
-%JAVA% -cp %JAVA_CLASSPATH% -Djava.library.path=%JAVA_LIBRARY_PATH% %TG_MAIN_CLASS% %1 %2 %3 %4 %5 %6 %7 %8 %9 %10
diff --git a/TuxGuitar-testing/tuxguitar_x86.sh b/TuxGuitar-testing/tuxguitar_x86.sh
deleted file mode 100755
index 32e4de41..00000000
--- a/TuxGuitar-testing/tuxguitar_x86.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-##SCRIPT DIR
-DIR_NAME=`dirname "$0"`
-DIR_NAME=`cd "$DIR_NAME"; pwd`
-cd "${DIR_NAME}"
-
-##JAVA
-if [ -z $JAVA ]; then
-	JAVA=${JAVA_HOME}/bin/java
-	[ ! -f ${JAVA} ] && JAVA=/usr/bin/java
-	[ ! -f ${JAVA} ] && JAVA=java
-fi
-
-##PLATFORM_HOME
-PLATFORM_OS=./platform-linux-x86
-PLATFORM_ALL=./platform-all
-
-##LIBRARY_PATH
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PLATFORM_OS}/lib
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/jni
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-
-##CLASSPATH
-CLASSPATH=${CLASSPATH}:${PLATFORM_ALL}/tuxguitar.jar
-CLASSPATH=${CLASSPATH}:${PLATFORM_ALL}/share
-CLASSPATH=${CLASSPATH}:${PLATFORM_OS}/lib/tuxguitar-dist.jar
-CLASSPATH=${CLASSPATH}:${PLATFORM_OS}/lib/swt.jar
-CLASSPATH=${CLASSPATH}:${PLATFORM_OS}/share
-
-##MAINCLASS
-MAINCLASS=org.herac.tuxguitar.app.TGMain
-
-##JVM ARGUMENTS
-VM_ARGS="-Xmx512m"
-
-##EXPORT VARS
-export CLASSPATH
-export LD_LIBRARY_PATH
-export MOZILLA_FIVE_HOME
-
-##LAUNCH
-${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2"
diff --git a/TuxGuitar-testing/tuxguitar_x86_64.sh b/TuxGuitar-testing/tuxguitar_x86_64.sh
deleted file mode 100755
index 5810ec84..00000000
--- a/TuxGuitar-testing/tuxguitar_x86_64.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-##SCRIPT DIR
-DIR_NAME=`dirname "$0"`
-DIR_NAME=`cd "$DIR_NAME"; pwd`
-cd "${DIR_NAME}"
-
-##JAVA
-if [ -z $JAVA ]; then
-	JAVA=${JAVA_HOME}/bin/java
-	[ ! -f ${JAVA} ] && JAVA=/usr/bin/java
-	[ ! -f ${JAVA} ] && JAVA=java
-fi
-
-##PLATFORM_HOME
-PLATFORM_OS=./platform-linux-x86_64
-PLATFORM_ALL=./platform-all
-
-##LIBRARY_PATH
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PLATFORM_OS}/lib
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib/jni
-LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-
-##CLASSPATH
-CLASSPATH=${CLASSPATH}:${PLATFORM_ALL}/tuxguitar.jar
-CLASSPATH=${CLASSPATH}:${PLATFORM_ALL}/share
-CLASSPATH=${CLASSPATH}:${PLATFORM_OS}/lib/tuxguitar-dist.jar
-CLASSPATH=${CLASSPATH}:${PLATFORM_OS}/lib/swt.jar
-CLASSPATH=${CLASSPATH}:${PLATFORM_OS}/share
-
-##MAINCLASS
-MAINCLASS=org.herac.tuxguitar.app.TGMain
-
-##JVM ARGUMENTS
-VM_ARGS="-Xmx512m"
-
-##EXPORT VARS
-export CLASSPATH
-export LD_LIBRARY_PATH
-export MOZILLA_FIVE_HOME
-
-##LAUNCH
-${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2"
diff --git a/TuxGuitar-tray/GNUmakefile b/TuxGuitar-tray/GNUmakefile
deleted file mode 100644
index 2174bee6..00000000
--- a/TuxGuitar-tray/GNUmakefile
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.4 2008/02/26 15:23:52 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-PACKAGE?=tuxguitar-tray
-LIBRARY?=lib$(PACKAGE).so
-
-PREFIX?=/usr
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# tuxguitar paths
-TG_PREFIX?=$(PREFIX)
-TG_SOURCE_PATH?=$(TG_PREFIX)/src
-TG_LIBRARY_PATH?=$(TG_PREFIX)/lib
-TG_NATIVE_PLUGINS_PATH?=$(TG_PREFIX)/share/tuxguitar/plugins
-
-# install paths
-INSTALL_LIBRARY_DIR?=$(TG_NATIVE_PLUGINS_PATH)
-INSTALL_SHARED_DIR?=$(TG_NATIVE_PLUGINS_PATH)/$(PACKAGE)
-
-# resources
-SHARE_PATH?=./share/
-
-# build paths
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-OBJECTS?=$(PACKAGE).o
-
-GCJ?=gcj
-GCJFLAGS+=-fjni -I$(SOURCE_PATH) -I$(TG_SOURCE_PATH) -I$(SWT_PATH)
-
-default: all
-
-all: objects library
-
-objects: tmp.classes.tmp
-
-tmp.classes.tmp: $(OBJECTS)
-	@touch $@
-
-library: $(LIBRARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(INSTALL_LIBRARY_DIR)/
-	-install -d $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-install $(LIBRARY) $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-	-cp -rfa $(SHARE_PATH)/* $(DESTDIR)$(INSTALL_SHARED_DIR)
-
-uninstall:
-	-rm -rf $(DESTDIR)$(INSTALL_SHARED_DIR)/
-	-rm $(DESTDIR)$(INSTALL_LIBRARY_DIR)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) -shared -o $@ -ltuxguitar -L$(TG_LIBRARY_PATH) $(^F)
-
-#eof "$Id: GNUmakefile,v 1.4 2008/02/26 15:23:52 akdmia Exp $"
\ No newline at end of file
diff --git a/TuxGuitar-tray/build.properties b/TuxGuitar-tray/build.properties
deleted file mode 100644
index fda6bfad..00000000
--- a/TuxGuitar-tray/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
-path.swt=../TuxGuitar/lib/swt.jar
\ No newline at end of file
diff --git a/TuxGuitar-tray/build.xml b/TuxGuitar-tray/build.xml
deleted file mode 100644
index 26d36713..00000000
--- a/TuxGuitar-tray/build.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-tray" basedir="." default="all">
-	<description>
-		TuxGuitar System Tray
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-tray.jar" />
-	
-	<property name="service.class" value="org.herac.tuxguitar.app.system.plugins.TGPlugin" />
-	<property name="service.provider" value="org.herac.tuxguitar.tray.TGTrayPlugin" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   P L U G I N          |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   P L U G I N        |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
-
-<!-- eof "$Id: build.xml,v 1.3 2008/02/28 00:35:01 rzr Exp $" -->
diff --git a/TuxGuitar-tuner/build.properties b/TuxGuitar-tuner/build.properties
deleted file mode 100644
index 4b04fb66..00000000
--- a/TuxGuitar-tuner/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../../tuxguitar/TuxGuitar/bin
-path.swt=../../tuxguitar/TuxGuitar/lib/swt.jar
diff --git a/TuxGuitar-tuner/build.xml b/TuxGuitar-tuner/build.xml
deleted file mode 100644
index 191458f3..00000000
--- a/TuxGuitar-tuner/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-tuner" basedir="." default="all">
-	<description>
-		TuxGuitar-converter
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-tuner.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="build" depends="init">
-		<echo>+-------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   L I B R A R Y        |</echo>
-		<echo>+-------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+-----------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   L I B R A R Y      |</echo>
-		<echo>+-----------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
diff --git a/TuxGuitar-viewer/build.xml b/TuxGuitar-viewer/build.xml
deleted file mode 100644
index 46b5692f..00000000
--- a/TuxGuitar-viewer/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-viewer" basedir="." default="all">
-	<description>
-		TuxGuitar-viewer
-	</description>
-	
-	<property name="ant.build.javac.source" value="1.4" />
-	<property name="ant.build.javac.target" value="1.4" />
-	
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.resource.path" value="resources${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar-viewer.jar" />
-	
-	<property name="dist.dst.path" value="" />
-	<property name="dist.jar.path" value="." />
-	
-	<target name="all" depends="package" />
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="clean">
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|                B U I L D I N G   T U X G U I T A R                 |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<mkdir dir="${build.path}" />
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.resource.path}"/>
-		</copy>
-		
-	</target>
-	
-	<target name="package" depends="build">
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|              P A C K A G I N G   T U X G U I T A R                 |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}">
-			<fileset dir="${build.path}" />
-		</jar>
-		
-		<genkey alias="tuxguitar" storepass="tuxguitar" keystore="${build.path}/tuxguitar-keystore" >
-			<dname>
-				<param name="CN" value="TuxGuitar"/>
-				<param name="OU" value="TuxGuitar"/>
-				<param name="O"  value="Herac"/>
-				<param name="C"  value="AR"/>
-			</dname>
-		</genkey>
-		<signjar alias="tuxguitar" keystore="${build.path}/tuxguitar-keystore" storepass="tuxguitar" keypass="tuxguitar">
-			<fileset file="${build.jar}" />
-		</signjar>
-	</target>
-	
-	<target name="install" depends="all">
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|              I N S T A L L I N G   T U X G U I T A R               |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<mkdir dir="${dist.dst.path}${dist.jar.path}" />
-		<copy todir="${dist.dst.path}${dist.jar.path}">
-			<fileset file="${build.jar}"/>
-		</copy>
-	</target>
-	
-</project>
diff --git a/TuxGuitar-viewer/pom.xml b/TuxGuitar-viewer/pom.xml
new file mode 100644
index 00000000..dc637a35
--- /dev/null
+++ b/TuxGuitar-viewer/pom.xml
@@ -0,0 +1,60 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.herac.tuxguitar</groupId>
+	<artifactId>tuxguitar-viewer</artifactId>
+	<version>1.3-SNAPSHOT</version>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: TuxGuitar viewer</name>
+	<description>TuxGuitar viewer application</description>
+
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			
+			<!-- execute app with exec:exec -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.2.1</version>
+
+				<executions>
+					<execution>
+						<goals>
+							<goal>java</goal>
+						</goals>
+					</execution>
+				</executions>
+
+				<configuration>
+					<executable>java</executable>
+					<arguments>
+						<argument>-Xms128m</argument>
+						<argument>-Xmx128m</argument>
+						<argument>-classpath</argument>
+						<!-- automatically creates the classpath using all project dependencies,
+						also adding the project build directory -->
+						<classpath/>
+						<argument>org.herac.tuxguitar.app.TGApplet</argument>
+					</arguments>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</build>
+
+</project>
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/TGApplet.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/TGApplet.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/TGApplet.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/TGApplet.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/TuxGuitar.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/TuxGuitar.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/TuxGuitar.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/TuxGuitar.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/Action.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/Action.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/Action.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/Action.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionAdapter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionAdapter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionAdapter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionAdapter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionDialog.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionDialog.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionDialog.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionDialog.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionLock.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionLock.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionLock.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionLock.java
diff --git a/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionManager.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionManager.java
new file mode 100644
index 00000000..837e4861
--- /dev/null
+++ b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/ActionManager.java
@@ -0,0 +1,92 @@
+/*
+ * Created on 18-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.app.actions;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.herac.tuxguitar.app.actions.layout.SetChordDiagramEnabledAction;
+import org.herac.tuxguitar.app.actions.layout.SetChordNameEnabledAction;
+import org.herac.tuxguitar.app.actions.layout.SetScoreEnabledAction;
+import org.herac.tuxguitar.app.actions.layout.SetTablatureEnabledAction;
+import org.herac.tuxguitar.app.actions.measure.GoNextMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.GoPreviousMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.SelectMeasureAction;
+import org.herac.tuxguitar.app.actions.settings.SettingsAction;
+import org.herac.tuxguitar.app.actions.track.SelectTrackAction;
+import org.herac.tuxguitar.app.actions.transport.TransportMixerAction;
+import org.herac.tuxguitar.app.actions.transport.TransportPlayAction;
+import org.herac.tuxguitar.app.actions.transport.TransportSetupAction;
+import org.herac.tuxguitar.app.actions.transport.TransportStopAction;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class ActionManager {
+	
+	private Map<String, Action> actions;
+	
+	public ActionManager(){
+		this.actions = new HashMap<String, Action>();
+		this.init();
+	}
+	
+	public void init(){
+		//layout actions
+		addAction(new SetScoreEnabledAction());
+		addAction(new SetTablatureEnabledAction());
+		addAction(new SetChordNameEnabledAction());
+		addAction(new SetChordDiagramEnabledAction());
+		
+		//track actions	
+		addAction(new SelectTrackAction());
+		
+		//measure actions
+		addAction(new SelectMeasureAction());
+		addAction(new GoNextMeasureAction());
+		addAction(new GoPreviousMeasureAction());
+		
+		//player actions
+		addAction(new TransportPlayAction());
+		addAction(new TransportStopAction());
+		addAction(new TransportMixerAction());
+		addAction(new TransportSetupAction());
+		
+		//Settings
+		addAction(new SettingsAction());
+	}
+	
+	public void addAction(Action action){
+		this.actions.put(action.getName(),action);
+	}
+	
+	public void removeAction(String name){
+		this.actions.remove(name);
+	}
+	
+	public Action getAction(String name){
+		return this.actions.get(name);
+	}
+	
+	public List<String> getAvailableKeyBindingActions(){
+		List<String> availableKeyBindingActions = new ArrayList<String>();
+		Iterator<String> it = this.actions.keySet().iterator();
+		while(it.hasNext()){
+			String actionName = it.next();
+			if(getAction(actionName).isKeyBindingAvailable()){
+				availableKeyBindingActions.add(actionName);
+			}
+		}
+		return availableKeyBindingActions;
+	}
+}
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/measure/SelectMeasureAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/measure/SelectMeasureAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/measure/SelectMeasureAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/measure/SelectMeasureAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/settings/SettingsAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/settings/SettingsAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/settings/SettingsAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/settings/SettingsAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/track/SelectTrackAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/track/SelectTrackAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/track/SelectTrackAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/track/SelectTrackAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportMixerAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportMixerAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportMixerAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportMixerAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportSetupAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetupAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportSetupAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetupAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/EditorCache.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/EditorCache.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/EditorCache.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/EditorCache.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGColorImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGColorImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGColorImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGColorImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGFontImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGFontImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGFontImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGFontImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGImageImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGImageImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGImageImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGImageImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGPainterImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGPainterImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGPainterImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGPainterImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGScrollBar.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGScrollBar.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TGScrollBar.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TGScrollBar.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TablatureEditor.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TablatureEditor.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/TablatureEditor.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/TablatureEditor.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/tab/Caret.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/tab/Caret.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/tab/Caret.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/tab/Caret.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/tab/Tablature.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/tab/Tablature.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/editors/tab/Tablature.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/editors/tab/Tablature.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/config/TGConfig.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/config/TGConfig.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/config/TGConfig.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/config/TGConfig.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionList.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionList.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionList.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionList.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingConstants.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingConstants.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingConstants.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingConstants.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/toolbar/TGToolBar.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/toolbar/TGToolBar.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/toolbar/TGToolBar.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/toolbar/TGToolBar.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/transport/TGTransport.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/transport/TGTransport.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/transport/TGTransport.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/transport/TGTransport.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/util/MidiTickUtil.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/util/MidiTickUtil.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/util/MidiTickUtil.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/util/MidiTickUtil.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/util/SyncThread.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/util/SyncThread.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/util/SyncThread.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/util/SyncThread.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/util/TGResourceUtils.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/util/TGResourceUtils.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/app/util/TGResourceUtils.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/app/util/TGResourceUtils.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGColor.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGColor.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGColor.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGColor.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGColorModel.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGColorModel.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGColorModel.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGColorModel.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGDimension.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGDimension.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGDimension.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGDimension.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGFont.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGFont.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGFont.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGFont.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGFontModel.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGFontModel.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGFontModel.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGFontModel.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGImage.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGImage.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGImage.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGImage.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGPainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGPainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGPainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGPainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGPainterFactory.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGPainterFactory.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGPainterFactory.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGPainterFactory.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGPoint.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGPoint.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGPoint.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGPoint.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGRectangle.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGRectangle.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGRectangle.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGRectangle.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGResource.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGResource.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGResource.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGResource.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGResourceFactory.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGResourceFactory.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/TGResourceFactory.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/TGResourceFactory.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGBeatGroup.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGBeatImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGChordImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGChordImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGChordImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGChordImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGController.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGController.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGController.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGController.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayout.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayout.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayout.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayout.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLyricImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGNoteImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGResources.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGResources.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGResources.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGResources.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGSpacing.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGSpacing.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGSpacing.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGSpacing.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGTextImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGTextImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGTextImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGTextImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGTrackImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGFileFormat.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGFileFormat.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGFileFormat.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGFileFormat.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGFileFormatException.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatException.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGFileFormatException.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatException.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGFileFormatManager.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatManager.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGFileFormatManager.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatManager.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGInputStreamBase.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGInputStreamBase.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGInputStreamBase.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGInputStreamBase.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGSongLoader.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGSongLoader.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/base/TGSongLoader.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/base/TGSongLoader.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg/TGInputStream.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg/TGInputStream.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg/TGInputStream.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg/TGInputStream.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg/TGStream.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg/TGStream.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg/TGStream.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg/TGStream.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg10/TGInputStream.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg10/TGInputStream.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg10/TGInputStream.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg10/TGInputStream.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg10/TGStream.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg10/TGStream.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg10/TGStream.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg10/TGStream.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg11/TGInputStream.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg11/TGInputStream.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg11/TGInputStream.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg11/TGInputStream.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg11/TGStream.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg11/TGStream.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/io/tg11/TGStream.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/io/tg11/TGStream.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiControllers.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiControllers.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiControllers.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiControllers.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiInstrument.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiInstrument.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiInstrument.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiInstrument.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiOutputPort.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPort.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiOutputPort.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPort.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPercussion.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPercussion.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPercussion.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPercussion.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPlayer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPlayer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPlayer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPlayer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPlayerException.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerException.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPlayerException.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerException.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPlayerMode.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerMode.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPlayerMode.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerMode.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPort.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPort.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiPort.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiPort.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiReceiver.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiReceiver.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiReceiver.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiReceiver.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiRepeatController.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiRepeatController.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiRepeatController.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiRepeatController.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequenceHandler.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequenceParser.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceParser.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequenceParser.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceParser.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequencer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequencer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequencer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequencer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequencerProvider.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiTransmitter.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiTransmitter.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/base/MidiTransmitter.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/base/MidiTransmitter.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
similarity index 100%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
similarity index 100%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
similarity index 100%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/factory/TGFactory.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/factory/TGFactory.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/factory/TGFactory.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/factory/TGFactory.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/helpers/TGSongSegment.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegment.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/helpers/TGSongSegment.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegment.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/helpers/TGTrackSegment.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/managers/TGMeasureManager.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/managers/TGMeasureManager.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/managers/TGMeasureManager.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/managers/TGMeasureManager.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/managers/TGSongManager.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/managers/TGSongManager.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/managers/TGSongManager.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/managers/TGSongManager.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/managers/TGTrackManager.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/managers/TGTrackManager.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/managers/TGTrackManager.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/managers/TGTrackManager.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGBeat.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGBeat.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGBeat.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGBeat.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGChannel.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGChannel.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGChannel.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGChannel.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGChord.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGChord.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGChord.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGChord.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGColor.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGColor.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGColor.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGColor.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGDivisionType.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGDivisionType.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGDivisionType.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGDivisionType.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGDuration.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGDuration.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGDuration.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGDuration.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGLyric.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGLyric.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGLyric.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGLyric.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGMarker.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGMarker.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGMarker.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGMarker.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGMeasure.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGMeasure.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGMeasure.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGMeasure.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGMeasureHeader.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGMeasureHeader.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGMeasureHeader.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGMeasureHeader.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGNote.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGNote.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGNote.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGNote.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGNoteEffect.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGNoteEffect.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGNoteEffect.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGNoteEffect.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGScale.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGScale.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGScale.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGScale.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGSong.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGSong.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGSong.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGSong.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGString.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGString.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGString.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGString.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGStroke.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGStroke.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGStroke.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGStroke.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGTempo.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGTempo.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGTempo.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGTempo.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGText.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGText.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGText.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGText.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGTimeSignature.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGTimeSignature.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGTimeSignature.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGTimeSignature.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGTrack.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGTrack.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGTrack.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGTrack.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGVelocities.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGVelocities.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGVelocities.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGVelocities.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGVoice.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGVoice.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/TGVoice.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/TGVoice.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectBend.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGClassLoader.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGClassLoader.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGClassLoader.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGClassLoader.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGLibraryLoader.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGLibraryLoader.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGLibraryLoader.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGLibraryLoader.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGLock.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGLock.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGLock.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGLock.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGServiceReader.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGServiceReader.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGServiceReader.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGServiceReader.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGSynchronizer.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGSynchronizer.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGSynchronizer.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGSynchronizer.java
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGVersion.java b/TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGVersion.java
similarity index 100%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/util/TGVersion.java
rename to TuxGuitar-viewer/src/main/java/org/herac/tuxguitar/util/TGVersion.java
diff --git a/TuxGuitar-viewer/resources/skin/scroll_down.png b/TuxGuitar-viewer/src/main/resources/skin/scroll_down.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/scroll_down.png
rename to TuxGuitar-viewer/src/main/resources/skin/scroll_down.png
diff --git a/TuxGuitar-viewer/resources/skin/scroll_down_pressed.png b/TuxGuitar-viewer/src/main/resources/skin/scroll_down_pressed.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/scroll_down_pressed.png
rename to TuxGuitar-viewer/src/main/resources/skin/scroll_down_pressed.png
diff --git a/TuxGuitar-viewer/resources/skin/scroll_up.png b/TuxGuitar-viewer/src/main/resources/skin/scroll_up.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/scroll_up.png
rename to TuxGuitar-viewer/src/main/resources/skin/scroll_up.png
diff --git a/TuxGuitar-viewer/resources/skin/scroll_up_pressed.png b/TuxGuitar-viewer/src/main/resources/skin/scroll_up_pressed.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/scroll_up_pressed.png
rename to TuxGuitar-viewer/src/main/resources/skin/scroll_up_pressed.png
diff --git a/TuxGuitar-viewer/resources/skin/setup.png b/TuxGuitar-viewer/src/main/resources/skin/setup.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/setup.png
rename to TuxGuitar-viewer/src/main/resources/skin/setup.png
diff --git a/TuxGuitar-viewer/resources/skin/setup_over.png b/TuxGuitar-viewer/src/main/resources/skin/setup_over.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/setup_over.png
rename to TuxGuitar-viewer/src/main/resources/skin/setup_over.png
diff --git a/TuxGuitar-viewer/resources/skin/setup_pressed.png b/TuxGuitar-viewer/src/main/resources/skin/setup_pressed.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/setup_pressed.png
rename to TuxGuitar-viewer/src/main/resources/skin/setup_pressed.png
diff --git a/TuxGuitar-viewer/resources/skin/transport_play.png b/TuxGuitar-viewer/src/main/resources/skin/transport_play.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/transport_play.png
rename to TuxGuitar-viewer/src/main/resources/skin/transport_play.png
diff --git a/TuxGuitar-viewer/resources/skin/transport_play_over.png b/TuxGuitar-viewer/src/main/resources/skin/transport_play_over.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/transport_play_over.png
rename to TuxGuitar-viewer/src/main/resources/skin/transport_play_over.png
diff --git a/TuxGuitar-viewer/resources/skin/transport_play_pressed.png b/TuxGuitar-viewer/src/main/resources/skin/transport_play_pressed.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/transport_play_pressed.png
rename to TuxGuitar-viewer/src/main/resources/skin/transport_play_pressed.png
diff --git a/TuxGuitar-viewer/resources/skin/transport_play_selected.png b/TuxGuitar-viewer/src/main/resources/skin/transport_play_selected.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/transport_play_selected.png
rename to TuxGuitar-viewer/src/main/resources/skin/transport_play_selected.png
diff --git a/TuxGuitar-viewer/resources/skin/transport_play_selected_over.png b/TuxGuitar-viewer/src/main/resources/skin/transport_play_selected_over.png
similarity index 100%
rename from TuxGuitar-viewer/resources/skin/transport_play_selected_over.png
rename to TuxGuitar-viewer/src/main/resources/skin/transport_play_selected_over.png
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionManager.java b/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionManager.java
deleted file mode 100644
index 144a601a..00000000
--- a/TuxGuitar-viewer/src/org/herac/tuxguitar/app/actions/ActionManager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Created on 18-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.herac.tuxguitar.app.actions.layout.SetChordDiagramEnabledAction;
-import org.herac.tuxguitar.app.actions.layout.SetChordNameEnabledAction;
-import org.herac.tuxguitar.app.actions.layout.SetScoreEnabledAction;
-import org.herac.tuxguitar.app.actions.layout.SetTablatureEnabledAction;
-import org.herac.tuxguitar.app.actions.measure.GoNextMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.GoPreviousMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.SelectMeasureAction;
-import org.herac.tuxguitar.app.actions.settings.SettingsAction;
-import org.herac.tuxguitar.app.actions.track.SelectTrackAction;
-import org.herac.tuxguitar.app.actions.transport.TransportMixerAction;
-import org.herac.tuxguitar.app.actions.transport.TransportPlayAction;
-import org.herac.tuxguitar.app.actions.transport.TransportSetupAction;
-import org.herac.tuxguitar.app.actions.transport.TransportStopAction;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ActionManager {
-	
-	private Map actions;
-	
-	public ActionManager(){
-		this.actions = new HashMap();
-		this.init();
-	}
-	
-	public void init(){
-		//layout actions
-		addAction(new SetScoreEnabledAction());
-		addAction(new SetTablatureEnabledAction());
-		addAction(new SetChordNameEnabledAction());
-		addAction(new SetChordDiagramEnabledAction());
-		
-		//track actions	
-		addAction(new SelectTrackAction());
-		
-		//measure actions
-		addAction(new SelectMeasureAction());
-		addAction(new GoNextMeasureAction());
-		addAction(new GoPreviousMeasureAction());
-		
-		//player actions
-		addAction(new TransportPlayAction());
-		addAction(new TransportStopAction());
-		addAction(new TransportMixerAction());
-		addAction(new TransportSetupAction());
-		
-		//Settings
-		addAction(new SettingsAction());
-	}
-	
-	public void addAction(Action action){
-		this.actions.put(action.getName(),action);
-	}
-	
-	public void removeAction(String name){
-		this.actions.remove(name);
-	}
-	
-	public Action getAction(String name){
-		return (Action)this.actions.get(name);
-	}
-	
-	public List getAvailableKeyBindingActions(){
-		List availableKeyBindingActions = new ArrayList();
-		Iterator it = this.actions.keySet().iterator();
-		while(it.hasNext()){
-			String actionName = (String)it.next();
-			if(getAction(actionName).isKeyBindingAvailable()){
-				availableKeyBindingActions.add(actionName);
-			}
-		}
-		return availableKeyBindingActions;
-	}
-}
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java b/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
deleted file mode 100644
index 65bdc720..00000000
--- a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa.sequencer;
-
-import javax.sound.midi.InvalidMidiDataException;
-import javax.sound.midi.MidiEvent;
-import javax.sound.midi.Sequence;
-import javax.sound.midi.Track;
-
-import org.herac.tuxguitar.player.base.MidiSequenceHandler;
-import org.herac.tuxguitar.player.impl.jsa.utils.MidiMessageUtils;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
-	
-	private MidiSequenceLoader loader;
-	private Sequence sequence;
-	private Track[] midiTracks;
-	
-	public MidiSequenceHandlerImpl(MidiSequenceLoader loader,int tracks){
-		super(tracks);
-		this.loader = loader;
-		this.init();
-	}
-	
-	private void init(){
-		try {
-			this.sequence = new Sequence(Sequence.PPQ,(int)TGDuration.QUARTER_TIME);
-			this.midiTracks = new Track[getTracks()];
-			for (int i = 0; i < this.midiTracks.length; i++) {
-				this.midiTracks[i] = this.sequence.createTrack();
-			}
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public Sequence getSequence(){
-		return this.sequence;
-	}
-	
-	public void addEvent(int track, MidiEvent event) {
-		if(track >= 0 && track < this.midiTracks.length){
-			this.midiTracks[track].add(event);
-		}
-	}
-	
-	public void addControlChange(long tick,int track,int channel, int controller, int value) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.controlChange(channel, controller, value), tick ));
-	}
-	
-	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.noteOff(channel, note, velocity), tick ));
-	}
-	
-	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.noteOn(channel, note, velocity), tick ));
-	}
-	
-	public void addPitchBend(long tick,int track,int channel, int value) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.pitchBend(channel, value), tick ));
-	}
-	
-	public void addProgramChange(long tick,int track,int channel, int instrument) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.programChange(channel, instrument), tick ));
-	}
-	
-	public void addTempoInUSQ(long tick,int track,int usq) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.tempoInUSQ(usq), tick ));
-	}
-	
-	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
-		addEvent(track,new MidiEvent(MidiMessageUtils.timeSignature(ts), tick ));
-	}
-	
-	public void notifyFinish(){
-		this.loader.setSequence(getSequence());
-	}
-}
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java b/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
deleted file mode 100644
index 8901afd6..00000000
--- a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.herac.tuxguitar.player.impl.jsa.utils;
-
-import javax.sound.midi.InvalidMidiDataException;
-import javax.sound.midi.MetaMessage;
-import javax.sound.midi.MidiMessage;
-import javax.sound.midi.ShortMessage;
-
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiMessageUtils {
-	
-	public static final byte TICK_MOVE = 0x01;
-	
-	private static int fixValue(int value){
-		int fixedValue = value;
-		fixedValue = Math.min(fixedValue,127);
-		fixedValue = Math.max(fixedValue,0);
-		return fixedValue;
-	}
-	
-	private static int fixChannel(int channel){
-		int fixedChannel = channel;
-		fixedChannel = Math.min(fixedChannel,15);
-		fixedChannel = Math.max(fixedChannel,0);
-		return fixedChannel;
-	}
-	
-	public static MidiMessage noteOn(int channel,int note,int velocity){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.NOTE_ON, fixChannel(channel), fixValue(note), fixValue(velocity));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage noteOff(int channel,int note,int velocity){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.NOTE_OFF, fixChannel(channel), fixValue(note), fixValue(velocity));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage controlChange(int channel,int controller,int value){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.CONTROL_CHANGE,fixChannel(channel),fixValue(controller), fixValue(value));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage programChange(int channel,int instrument){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.PROGRAM_CHANGE, fixChannel(channel), fixValue(instrument), 0);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage pitchBend(int channel,int value){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.PITCH_BEND, fixChannel(channel), 0, fixValue(value));
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage systemReset(){
-		try {
-			ShortMessage message = new ShortMessage();
-			message.setMessage(ShortMessage.SYSTEM_RESET);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage tempoInUSQ(int usq){
-		try {
-			MetaMessage message = new MetaMessage();
-			message.setMessage(0x51, new byte[]{ (byte)((usq >> 16) & 0x00FF),(byte)((usq >> 8) & 0x00FF),(byte)((usq) & 0x00FF) }, 3);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public static MidiMessage timeSignature(TGTimeSignature ts){
-		try {
-			MetaMessage message = new MetaMessage();
-			message.setMessage(0x58, new byte[]{  (byte)ts.getNumerator(),(byte)ts.getDenominator().getIndex(),(byte)(96 / ts.getDenominator().getValue()),8 }, 4);
-			return message;
-		} catch (InvalidMidiDataException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-winmm/build.properties b/TuxGuitar-winmm/build.properties
deleted file mode 100644
index dff1f472..00000000
--- a/TuxGuitar-winmm/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-path.tuxguitar=../TuxGuitar/bin
\ No newline at end of file
diff --git a/TuxGuitar-winmm/build.xml b/TuxGuitar-winmm/build.xml
deleted file mode 100644
index d6dc32fc..00000000
--- a/TuxGuitar-winmm/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar-winmm" basedir="." default="all">
-	<description>
-		TuxGuitar Winmm
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src" />
-	<property name="build.share.path" value="share" />
-	<property name="build.path" value="build" />
-	<property name="build.jar" value="tuxguitar-winmm.jar" />
-	
-	<path id="class.path">
-		<pathelement location="${path.tuxguitar}"/>
-		<pathelement location="${path.swt}"/>
-	</path >
-	
-	<target name="init" depends="clean">
-		<mkdir dir="${build.path}" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-	</target>
-	
-	<target name="build" depends="init">
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|          B U I L D I N G   T U X G U I T A R  -  W I N M M         |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|        P A C K A G I N G   T U X G U I T A R  -  W I N M M         |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}" basedir="${build.path}" />
-		<delete quiet="true" dir="${build.path}" />
-	</target>
-	
-	<target name="all" depends="build" />
-</project>
\ No newline at end of file
diff --git a/TuxGuitar-winmm/jni/GNUmakefile b/TuxGuitar-winmm/jni/GNUmakefile
deleted file mode 100644
index 5ab38981..00000000
--- a/TuxGuitar-winmm/jni/GNUmakefile
+++ /dev/null
@@ -1,21 +0,0 @@
-CFLAGS?=-mno-cygwin -I$(shell gcj -print-file-name=include/)
-LDFLAGS?=-mno-cygwin -Wl,--kill-at
-LDLIBS?=-lwinmm
-LDPATH?=
-LIBRARY_PREFIX?=
-LIBRARY_NAME?=tuxguitar-winmm-jni
-LIBRARY_EXTENSION?=.dll
-
-LIBRARY=$(LIBRARY_PREFIX)$(LIBRARY_NAME)$(LIBRARY_EXTENSION)
-OBJECTS=org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.o
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-all:    $(LIBRARY)
-
-$(LIBRARY):	$(OBJECTS)
-	$(CC) $(LDFLAGS) -shared -o $(LIBRARY) $(OBJECTS) $(LDPATH) $(LDLIBS)
-
-clean: 
-	rm -f $(OBJECTS) $(LIBRARY)
diff --git a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/JNILibraryLoader.java b/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/JNILibraryLoader.java
deleted file mode 100644
index 874847c2..00000000
--- a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/JNILibraryLoader.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.winmm;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.herac.tuxguitar.util.TGClassLoader;
-
-public class JNILibraryLoader {
-	
-	private static final String JNI_EXTENSION = ".jnilib";
-	
-	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
-	
-	public static void loadLibrary(String libname){
-		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
-			System.loadLibrary(libname);
-		}
-	}
-	
-	private static boolean loadFromClassPath(String filename){
-		File file = new File(JNI_TMP_PATH + filename);
-		try{
-			if(!file.exists()){
-				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
-				if (inputStream != null) {
-					OutputStream outputStream = new FileOutputStream(file);
-					
-					int read;
-					byte [] buffer = new byte [4096];
-					while ((read = inputStream.read (buffer)) != -1) {
-						outputStream.write(buffer, 0, read);
-					}
-					outputStream.close();
-					inputStream.close();
-				}
-			}
-			if(file.exists()){
-				System.load(file.getAbsolutePath());
-				return true;
-			}
-		}catch(Throwable throwable){
-			return false;
-		}finally{
-			if(file.exists()){
-				file.delete();
-			}
-		}
-		return false;
-	}
-}
diff --git a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java b/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java
deleted file mode 100644
index 63f5f3b8..00000000
--- a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.winmm;
-
-import org.herac.tuxguitar.player.base.MidiOutputPort;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiOutputPortImpl implements MidiOutputPort{
-	
-	private int device;
-	private String name;
-	private MidiReceiverImpl receiver;
-	
-	public MidiOutputPortImpl(MidiSystem midiSystem,String name,int device){
-		this.name = name;
-		this.device = device;
-		this.receiver = new MidiReceiverImpl(this,midiSystem);
-	}
-	
-	public void open(){
-		if(!this.receiver.isConnected()){
-			this.receiver.connect();
-		}
-	}
-	
-	public void close(){
-		this.receiver.disconnect();
-	}
-	
-	public MidiReceiver getReceiver(){
-		this.open();
-		return this.receiver;
-	}
-	
-	public void check(){
-		// Not implemented
-	}
-	
-	public int getDevice() {
-		return this.device;
-	}
-	
-	public static String toString(int device){
-		return (Integer.toString(device));
-	}
-	
-	public String getKey() {
-		return (Integer.toString(this.device));
-	}
-	
-	public String getName() {
-		return this.name;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderImpl.java b/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderImpl.java
deleted file mode 100644
index 20ebc62d..00000000
--- a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.winmm;
-
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
-	
-	private MidiSystem midiSystem;
-	
-	public MidiOutputPortProviderImpl(){
-		super();
-	}
-	
-	public List listPorts() {
-		if(this.midiSystem == null){
-			this.midiSystem = new MidiSystem();
-		}
-		return this.midiSystem.findPorts();
-	}
-	
-	public void closeAll(){
-		if(this.midiSystem != null){
-			this.midiSystem.finalize();
-			this.midiSystem = null;
-		}
-	}
-}
diff --git a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderPlugin.java b/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderPlugin.java
deleted file mode 100644
index c5adea00..00000000
--- a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderPlugin.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.winmm;
-
-import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
-import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-
-public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin{
-	
-	private MidiOutputPortProviderImpl portReader;
-	
-	protected MidiOutputPortProvider getProvider() {
-		if(this.portReader == null){
-			this.portReader = new MidiOutputPortProviderImpl();
-		}
-		return this.portReader;
-	}
-	
-	public String getAuthor() {
-		return "Julian Casadesus <julian@casadesus.com.ar>";
-	}
-	
-	public String getDescription() {
-		return "WinMM output plugin";
-	}
-	
-	public String getName() {
-		return "WinMM output plugin";
-	}
-	
-	public String getVersion() {
-		return "1.0";
-	}
-}
diff --git a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiReceiverImpl.java b/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiReceiverImpl.java
deleted file mode 100644
index f514fe44..00000000
--- a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiReceiverImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.winmm;
-
-import org.herac.tuxguitar.player.base.MidiControllers;
-import org.herac.tuxguitar.player.base.MidiReceiver;
-
-public class MidiReceiverImpl implements MidiReceiver{
-	
-	private boolean connected;
-	private MidiOutputPortImpl midiPort;
-	private MidiSystem midiSystem;
-	
-	public MidiReceiverImpl(MidiOutputPortImpl midiPort, MidiSystem midiSystem){
-		this.midiPort = midiPort;
-		this.midiSystem = midiSystem;
-		this.connected = false;
-	}
-	
-	public boolean isConnected(){
-		return this.connected;
-	}
-	
-	public void connect(){
-		if(!isConnected()){
-			this.midiSystem.openPort(this.midiPort);
-			this.connected = true;
-		}
-	}
-	
-	public void disconnect() {
-		if(isConnected()){
-			this.midiSystem.closePort();
-			this.connected = false;
-		}
-	}
-	
-	public void sendAllNotesOff() {
-		for(int i = 0; i < 16; i ++){
-			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
-		}
-	}
-	
-	public void sendControlChange(int channel, int controller, int value) {
-		if(isConnected()){
-			this.midiSystem.controlChange(channel, controller, value);
-		}
-	}
-	
-	public void sendNoteOff(int channel, int key, int velocity) {
-		if(isConnected()){
-			this.midiSystem.noteOff(channel, key, velocity);
-		}
-	}
-	
-	public void sendNoteOn(int channel, int key, int velocity) {
-		if(isConnected()){
-			this.midiSystem.noteOn(channel, key, velocity);
-		}
-	}
-	
-	public void sendPitchBend(int channel, int value) {
-		if(isConnected()){
-			this.midiSystem.pitchBend(channel, value);
-		}
-	}
-	
-	public void sendProgramChange(int channel, int value) {
-		if(isConnected()){
-			this.midiSystem.programChange(channel, value);
-		}
-	}
-	
-	public void sendSystemReset() {
-		//not implemented
-	}
-}
diff --git a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiSystem.java b/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiSystem.java
deleted file mode 100644
index 05dec499..00000000
--- a/TuxGuitar-winmm/src/org/herac/tuxguitar/player/impl/midiport/winmm/MidiSystem.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.herac.tuxguitar.player.impl.midiport.winmm;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MidiSystem{
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-winmm-jni");
-	
-	static{
-		System.loadLibrary(JNI_LIBRARY_NAME);
-	}
-	
-	private long instance;
-	private List ports;
-	private MidiOutputPortImpl connection;
-	
-	public MidiSystem() {
-		this.instance = malloc();
-		this.ports = new ArrayList();
-		this.connection = null;
-	}
-	
-	public void finalize(){
-		if(this.instance != 0 ){
-			this.free(this.instance);
-			this.instance = 0;
-		}
-	}
-	
-	public List findPorts(){
-		this.ports.clear();
-		if(this.instance != 0){
-			this.findPorts(this.instance);
-		}
-		return this.ports;
-	}
-	
-	public void openPort(MidiOutputPortImpl port){
-		if(this.instance != 0){
-			this.openPort(this.instance, port.getDevice());
-			this.connection = port;
-		}
-	}
-	
-	public void closePort(){
-		if(this.instance != 0){
-			this.closePort(this.instance);
-			this.connection = null;
-		}
-	}
-	
-	public void noteOn(int channel,int note,int velocity){
-		if(this.instance != 0){
-			this.noteOn(this.instance, channel, note, velocity);
-		}
-	}
-	
-	public void noteOff(int channel,int note,int velocity){
-		if(this.instance != 0){
-			this.noteOff(this.instance, channel, note, velocity);
-		}
-	}
-	
-	public void controlChange(int channel,int control,int value){
-		if(this.instance != 0){
-			this.controlChange(this.instance, channel, control, value);
-		}
-	}
-	
-	public void programChange(int channel,int program){
-		if(this.instance != 0){
-			this.programChange(this.instance, channel, program);
-		}
-	}
-	
-	public void pitchBend(int channel,int value){
-		if(this.instance != 0){
-			this.pitchBend(this.instance, channel, value);
-		}
-	}
-	
-	public MidiOutputPortImpl getConnection(){
-		return this.connection;
-	}
-	
-	protected void addPort(String name,int device){
-		this.ports.add(new MidiOutputPortImpl(this,name,device));
-	}
-	
-	private native long malloc();
-	
-	private native void free(long instance);
-	
-	protected native void open(long instance,String device);
-	
-	protected native void close(long instance);
-	
-	protected native void findPorts(long instance);
-	
-	protected native void openPort(long instance,int device);
-	
-	protected native void closePort(long instance);
-	
-	protected native void noteOn(long instance,int channel,int note,int velocity);
-	
-	protected native void noteOff(long instance,int channel,int note,int velocity);
-	
-	protected native void controlChange(long instance,int channel,int control,int value);
-	
-	protected native void programChange(long instance,int channel,int program);
-	
-	protected native void pitchBend(long instance,int channel,int value);
-	
-}
diff --git a/TuxGuitar/GNUmakefile b/TuxGuitar/GNUmakefile
deleted file mode 100644
index e8636615..00000000
--- a/TuxGuitar/GNUmakefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#! /usr/bin/make -f
-# -*- makefile -*-
-#ident "$Id: GNUmakefile,v 1.7 2008/02/29 12:55:24 akdmia Exp $"
-#@author: created by www.philippe.coval.online.fr -- revision: $Author: akdmia $
-#licence: LGPL
-#------------------------------------------------------------------------------
-OS_LIBRARY_PREFIX?=lib
-OS_LIBRARY_EXTENSION?=.so
-
-PACKAGE?=tuxguitar
-BINARY?=$(PACKAGE).bin
-LIBRARY?=$(OS_LIBRARY_PREFIX)$(PACKAGE)$(OS_LIBRARY_EXTENSION)
-
-# constants
-SHARE_DIR?=./share/
-DOC_DIR?=./doc/
-
-# dependencies
-SWT_PATH?=/usr/share/java/swt.jar
-
-# install
-PREFIX?=/usr
-TG_BINARY_PATH?=$(PREFIX)/bin
-TG_LIBRARY_PATH?=$(PREFIX)/lib
-TG_LIBRARY_PATH_JNI?=$(TG_LIBRARY_PATH)/jni
-TG_SHARE_PATH?=$(PREFIX)/share/$(PACKAGE)
-TG_DOC_PATH?=$(PREFIX)/share/doc/$(PACKAGE)
-TG_NATIVE_PLUGINS_PATH?=$(TG_SHARE_PATH)/plugins
-TG_NATIVE_PLUGINS_PREFIX?=$(OS_LIBRARY_PREFIX)
-TG_NATIVE_PLUGINS_EXTENSION?=$(OS_LIBRARY_EXTENSION)
-
-# dependencies
-SWT_JAR?=$(SWT_PATH)
-
-# sources
-SOURCE_PATH?=./src/
-SOURCES?=$(shell find $(SOURCE_PATH) -name "*.java")
-RESOURCE_PATH?=./dist/
-RESOURCES_XML?=$(shell find $(RESOURCE_PATH) -name "*.xml")
-RESOURCES_DIST?=$(shell find $(RESOURCE_PATH) -name "*.dist")
-DEPENDENCIES?=$(SWT_JAR)
-OBJECTS?=\
- $(PACKAGE).o\
- $(RESOURCES_DIST:%.dist=%.o)\
- $(RESOURCES_XML:%.xml=%.o)\
- $(DEPENDENCIES:%.jar=%.o)\
-
-# runtime
-MAINCLASS?=org.herac.tuxguitar.app.TGMain
-PROPERTIES?=\
- -Djava.library.path=$(TG_LIBRARY_PATH_JNI) \
- -Djava.class.path=$(TG_SHARE_PATH) \
- -Dtuxguitar.share.path=$(TG_SHARE_PATH) \
- -Dtuxguitar.library.path=$(TG_NATIVE_PLUGINS_PATH) \
- -Dtuxguitar.library.prefix=$(TG_NATIVE_PLUGINS_PREFIX) \
- -Dtuxguitar.library.extension=$(TG_NATIVE_PLUGINS_EXTENSION) \
-
-GCJ?=gcj
-GCJFLAGS+=-fbootstrap-classes -fjni -I$(SOURCE_PATH) -I$(SWT_PATH)
-LDFLAGS?=
-
-default: all
-
-all: objects library binary
-
-objects: $(OBJECTS)
-
-library: $(LIBRARY)
-
-binary: $(BINARY)
-
-install:
-	-install -d $(DESTDIR)$(PREFIX)/
-	-install -d $(DESTDIR)$(TG_BINARY_PATH)/
-	-install -d $(DESTDIR)$(TG_LIBRARY_PATH)/
-	-install -d $(DESTDIR)$(TG_SHARE_PATH)/
-	-install -d $(DESTDIR)$(TG_DOC_PATH)/
-	-install $(BINARY) $(DESTDIR)$(TG_BINARY_PATH)/$(BINARY)
-	-install $(LIBRARY) $(DESTDIR)$(TG_LIBRARY_PATH)/$(LIBRARY)
-	cp -rfa $(SHARE_DIR)/* $(DESTDIR)$(TG_SHARE_PATH)/
-	cp -rfa $(DOC_DIR)/* $(DESTDIR)$(TG_DOC_PATH)/
-
-uninstall:
-	-rm $(DESTDIR)$(TG_BINARY_PATH)/$(BINARY)
-	-rm $(DESTDIR)$(TG_LIBRARY_PATH)/$(LIBRARY)
-
-clean:
-	-@find . -name "*.o" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.so" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.bin" -exec rm -f {} \; > /dev/null 2>&1
-	-@find . -name "*.tmp" -exec rm -f {} \; > /dev/null 2>&1
-
-%.o: %.jar
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $<
-
-%.o: %.dist
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) --resource $(<F) $<
-
-%.o: %.xml
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) --resource $(<F) $<
-
-$(PACKAGE).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $(@F) $^
-
-$(LIBRARY): $(OBJECTS)
-	$(GCJ) $(LDFLAGS) -shared -o $@ $(^F)
-
-$(BINARY):
-	$(GCJ) -o $@ --main=$(MAINCLASS) $(PROPERTIES) -l$(PACKAGE) -L$(TG_LIBRARY_PATH) -L./
diff --git a/TuxGuitar/build.properties b/TuxGuitar/build.properties
deleted file mode 100644
index 4dfdb22f..00000000
--- a/TuxGuitar/build.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-### ANT Flags
-#
-# build.compiler=gcj
-ant.build.javac.source=1.4
-ant.build.javac.target=1.4
-
-########## DEFAULT LINUX BUILD PROPERTIES ##########
-lib.swt.jni=lib/
-lib.swt.jar=lib/swt.jar
-lib.itext.jar=lib/itext.jar
-dist.file=xml/build-linux.xml
-dist.version=1.2
-dist.jar.path=./
-dist.bin.path=./
-dist.share.path=share/
-dist.doc.path=doc/
-
-########## UBUNTU BUILD PROPERTIES ##########
-#lib.swt.jni=/usr/lib/jni/
-#lib.swt.jar=/usr/share/java/swt.jar:/usr/lib/java/swt.jar
-#lib.itext.jar=/usr/share/java/itext.jar
-#dist.file=xml/build-ubuntu.xml
-#dist.version=1.2-ubuntu-x86
-#dist.prefix=/usr
-#dist.jar.path=${dist.prefix}/share/java/
-#dist.bin.path=${dist.prefix}/bin/
-#dist.lib.path=${dist.prefix}/lib/jni/
-#dist.share.path=${dist.prefix}/share/tuxguitar/
-#dist.doc.path=${dist.prefix}/share/doc/tuxguitar/
-
-########## FREEBSD BUILD PROPERTIES ##########
-#lib.swt.jni=/usr/local/lib/
-#lib.swt.jar=/usr/local/share/java/classes/swt.jar
-#lib.itext.jar=/usr/local/share/java/classes/itext.jar
-#dist.file=xml/build-freebsd.xml
-#dist.version=1.2
-#dist.jar.path=/usr/local/share/java/TuxGuitar-${dist.version}/
-#dist.bin.path=/usr/local/bin/
-#dist.share.path=/usr/local/share/TuxGuitar-${dist.version}/
-#dist.doc.path=/usr/local/share/doc/TuxGuitar-${dist.version}/
-
-########## DEFAULT MAC BUILD PROPERTIES ##########
-#lib.swt.jni=lib/
-#lib.swt.jar=lib/swt.jar
-#lib.itext.jar=lib/itext.jar
-#dist.file=xml/build-mac.xml
-#dist.version=1.2
-#dist.jar.path=./
-#dist.bin.path=./
-#dist.share.path=./share/
-#dist.doc.path=./doc/
-
-########## WINDOWS BUILD PROPERTIES ############
-#lib.swt.jni=lib\\
-#lib.swt.jar=lib\\swt.jar
-#lib.itext.jar=lib\\itext.jar
-#dist.file=xml/build-windows.xml
-#dist.version=1.2
-#dist.jar.path=
-#dist.bin.path=
-#dist.share.path=share\\
-#dist.doc.path=doc\\
-## get JanelWindows.exe from http://sourceforge.net/projects/janel/
-#janel.exe=utilities\\tuxguitar.exe
-#janel.lap.prefix=${FOUND_EXE_FOLDER}\\
\ No newline at end of file
diff --git a/TuxGuitar/build.xml b/TuxGuitar/build.xml
deleted file mode 100644
index e6908275..00000000
--- a/TuxGuitar/build.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<project name="TuxGuitar" basedir="." default="all">
-	<description>
-		TuxGuitar
-	</description>
-	
-	<property file="build.properties" />
-	<property name="build.src.path" value="src${file.separator}" />
-	<property name="build.lib.path" value="lib${file.separator}" />
-	<property name="build.share.path" value="share${file.separator}" />
-	<property name="build.doc.path" value="doc${file.separator}" />
-	<property name="build.dist.path" value="dist${file.separator}" />
-	<property name="build.path" value="build${file.separator}" />
-	<property name="build.jar" value="tuxguitar.jar" />
-	
-	<property name="dist.dst.path" value="" />
-	<property name="dist.file" value="" />
-	<property name="dist.jar.path" value="." />
-	<property name="dist.share.path" value="${build.share.path}" />
-	<property name="dist.doc.path" value="${build.doc.path}" />
-	
-	<available file="${dist.file}" type="file" property="dist.available"/>
-	
-	<path id="class.path">
-		<pathelement path="${lib.swt.jar}"/>
-	</path >
-	
-	<target name="all">
-		<antcall target="clean" />
-		<antcall target="build" />
-		<antcall target="package" />
-	</target>
-	
-	<target name="clean">
-		<delete quiet="true" dir="${build.path}" />
-		<delete quiet="true" file="${build.jar}" />
-		
-		<antcall target="dist-clean" />
-	</target>
-	
-	<target name="build">
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|                B U I L D I N G   T U X G U I T A R                 |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<mkdir dir="${build.path}" />
-		
-		<javac srcdir="${build.src.path}" destdir="${build.path}" debug="false" >
-			<classpath refid="class.path"/>
-			<include name="**/*.java"/>
-		</javac>
-		
-		<copy todir="${build.path}">
-			<fileset dir="${build.dist.path}"/>
-		</copy>
-		
-		<antcall target="dist-build" />
-	</target>
-	
-	<target name="package">
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|              P A C K A G I N G   T U X G U I T A R                 |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<jar destfile="${build.jar}">
-			<fileset dir="${build.path}" />
-		</jar>
-		
-		<antcall target="dist-package" />
-	</target>
-	
-	<target name="install">
-		<echo>+--------------------------------------------------------------------+</echo>
-		<echo>|              I N S T A L L I N G   T U X G U I T A R               |</echo>
-		<echo>+--------------------------------------------------------------------+</echo>
-		
-		<mkdir dir="${dist.dst.path}${dist.jar.path}" />
-		<copy todir="${dist.dst.path}${dist.jar.path}">
-			<fileset file="${build.jar}"/>
-		</copy>
-		
-		<mkdir dir="${dist.dst.path}${dist.share.path}" />
-		<copy todir="${dist.dst.path}${dist.share.path}">
-			<fileset dir="${build.share.path}"/>
-		</copy>
-		
-		<mkdir dir="${dist.dst.path}${dist.doc.path}" />
-		<copy todir="${dist.dst.path}${dist.doc.path}">
-			<fileset dir="${build.doc.path}"/>
-		</copy>
-		
-		<antcall target="dist-install" />
-	</target>
-	
-	<target name="dist-build" if="dist.available">
-		<ant antfile="${dist.file}" target="build"/>
-	</target>
-	
-	<target name="dist-package" if="dist.available">
-		<ant antfile="${dist.file}" target="package"/>
-	</target>
-	
-	<target name="dist-clean" if="dist.available">
-		<ant antfile="${dist.file}" target="clean"/>
-	</target>
-	
-	<target name="dist-install" if="dist.available">
-		<ant antfile="${dist.file}" target="install"/>
-	</target>
-	
-</project>
diff --git a/TuxGuitar/dist/tunings-default.xml b/TuxGuitar/dist/tunings-default.xml
new file mode 100644
index 00000000..e37fa178
--- /dev/null
+++ b/TuxGuitar/dist/tunings-default.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tunings>
+	<tuning instrument="guitar" name="standard" strings="E3 A3 D4 G4 B4 E5" />
+	<tuning instrument="guitar" name="drop D" strings="D3 A3 D4 G4 B4 E5" />
+	<tuning instrument="guitar" name="double drop D" strings="D3 A3 D4 G4 B4 D5" />
+
+	<tuning instrument="bass" name="standard" strings="E2 A2 D3 G3" />
+	<tuning instrument="bass" name="drop D" strings="D2 A2 D3 G3" />
+	<tuning instrument="bass" name="standard" strings="B1 E2 A2 D3 G3" />
+	<tuning instrument="bass" name="standard" strings="B1 E2 A2 D3 G3 C4" />
+
+	<tuning instrument="ukulele" name="standard" strings="G5 C5 E5 A5" />
+	<tuning instrument="ukulele" name="low G" strings="G4 C5 E5 A5" />
+	<tuning instrument="ukulele" name="baritone" strings="D4 G4 B4 E5" />
+	<tuning instrument="ukulele" name="D tunning" strings="A5 D5 F#5 B5" />
+	<tuning instrument="ukulele" name="canadian tunning" strings="A4 D5 F#5 B5" />
+
+	<tuning instrument="banjo" name="standard" strings="C4 G4 D5 A5" />
+	<tuning instrument="banjo" name="standard" strings="G5 D4 G4 B4 D5" />
+	<tuning instrument="banjo" name="standard" strings="E3 A3 D4 G4 B4 E5" />
+</tunings>
diff --git a/TuxGuitar/lib/libtuxguitar-alsa-jni.so b/TuxGuitar/lib/libtuxguitar-alsa-jni.so
deleted file mode 100755
index 6e3d41cd..00000000
Binary files a/TuxGuitar/lib/libtuxguitar-alsa-jni.so and /dev/null differ
diff --git a/TuxGuitar/lib/libtuxguitar-fluidsynth-jni.so b/TuxGuitar/lib/libtuxguitar-fluidsynth-jni.so
deleted file mode 100755
index ec81a7bc..00000000
Binary files a/TuxGuitar/lib/libtuxguitar-fluidsynth-jni.so and /dev/null differ
diff --git a/TuxGuitar/pom.xml b/TuxGuitar/pom.xml
new file mode 100644
index 00000000..e045a56c
--- /dev/null
+++ b/TuxGuitar/pom.xml
@@ -0,0 +1,71 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-app</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Application</name>
+	<description>TuxGuitar runnable application</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+
+			<!-- execute app with exec:exec -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+
+				<executions>
+					<execution>
+						<goals>
+							<goal>java</goal>
+						</goals>
+					</execution>
+				</executions>
+
+				<configuration>
+					<executable>java</executable>
+					<arguments>
+						<argument>-Xms128m</argument>
+						<argument>-Xmx128m</argument>
+						<argument>-Dtuxguitar.share.path=${project.basedir}/share:${project.basedir}/dist</argument>
+						<argument>-classpath</argument>
+						<!-- automatically creates the classpath using all project dependencies,
+						also adding the project build directory -->
+						<classpath/>
+						<argument>org.herac.tuxguitar.app.TGMain</argument>
+					</arguments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<artifactId>tuxguitar-swt</artifactId>
+			<groupId>org.herac.tuxguitar</groupId>
+			<version>${tuxguitar.core.version}</version>
+			<scope>compile</scope>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/TuxGuitar/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
index 26c6d3ef..d1f04c53 100644
--- a/TuxGuitar/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
+++ b/TuxGuitar/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
@@ -1 +1,2 @@
 # Add here the TGPlugin implementation class names.
+org.herac.tuxguitar.app.tools.custom.tuner.TGTunerPlugin
diff --git a/TuxGuitar/share/lang/last_additions b/TuxGuitar/share/lang/last_additions
index 32bb416b..59142fde 100644
--- a/TuxGuitar/share/lang/last_additions
+++ b/TuxGuitar/share/lang/last_additions
@@ -1,5 +1,11 @@
 # 1.3
 
+composition.doublebar=Double bar
+
+tuning.load=Load...
+tuning.dialog.properties=Tuning selection
+tuning.string-instrument={0} {1}-strings
+
 action.caret.go-up=Move cursor up
 action.caret.go-down=Move cursor down
 action.caret.go-left=Move cursor left
diff --git a/TuxGuitar/share/lang/messages_en.properties b/TuxGuitar/share/lang/messages_en.properties
index 6bfa01d0..37826bb4 100644
--- a/TuxGuitar/share/lang/messages_en.properties
+++ b/TuxGuitar/share/lang/messages_en.properties
@@ -338,6 +338,7 @@ repeat.alternative=Alternative Repeats
 repeat.alternative.editor=Edit Alternative Repeats
 repetitions=Repetitions
 repeat.number-of-repetitions=Number of Repetitions
+composition.doublebar=Double bar
 
 beat=Beat
 beat.clean=Clean Beat
@@ -684,3 +685,7 @@ action.tools.browser=Browser
 action.tools.transpose=Transpose Notes
 action.settings.configure=Settings
 action.help.doc=Help
+
+tuning.load=Load...
+tuning.dialog.properties=Tuning selection
+tuning.string-instrument={0} {1}-strings
diff --git a/TuxGuitar/share/plugins/tuxguitar-ascii.jar b/TuxGuitar/share/plugins/tuxguitar-ascii.jar
new file mode 120000
index 00000000..8a030074
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-ascii.jar
@@ -0,0 +1 @@
+../../../plugins/ascii/target/tuxguitar-ascii-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-community.jar b/TuxGuitar/share/plugins/tuxguitar-community.jar
new file mode 120000
index 00000000..2009a12d
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-community.jar
@@ -0,0 +1 @@
+../../../plugins/community/target/tuxguitar-community-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-compat.jar b/TuxGuitar/share/plugins/tuxguitar-compat.jar
new file mode 120000
index 00000000..0b1bf9c2
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-compat.jar
@@ -0,0 +1 @@
+../../../plugins/compat/target/tuxguitar-compat-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-converter.jar b/TuxGuitar/share/plugins/tuxguitar-converter.jar
new file mode 120000
index 00000000..35838a4d
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-converter.jar
@@ -0,0 +1 @@
+../../../plugins/converter/target/tuxguitar-converter-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-gtp.jar b/TuxGuitar/share/plugins/tuxguitar-gtp.jar
new file mode 120000
index 00000000..16d3d956
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-gtp.jar
@@ -0,0 +1 @@
+../../../plugins/gtp/target/tuxguitar-gtp-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-jsa.jar b/TuxGuitar/share/plugins/tuxguitar-jsa.jar
new file mode 120000
index 00000000..7a9802ba
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-jsa.jar
@@ -0,0 +1 @@
+../../../plugins/jsa/target/tuxguitar-jsa-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-midi.jar b/TuxGuitar/share/plugins/tuxguitar-midi.jar
new file mode 120000
index 00000000..e190bc7c
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-midi.jar
@@ -0,0 +1 @@
+../../../plugins/midi/target/tuxguitar-midi-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-musicxml.jar b/TuxGuitar/share/plugins/tuxguitar-musicxml.jar
new file mode 120000
index 00000000..5ec0f707
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-musicxml.jar
@@ -0,0 +1 @@
+../../../plugins/musicxml/target/tuxguitar-musicxml-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-pdf.jar b/TuxGuitar/share/plugins/tuxguitar-pdf.jar
new file mode 120000
index 00000000..aa84cb7a
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-pdf.jar
@@ -0,0 +1 @@
+../../../plugins/pdf/target/tuxguitar-pdf-1.3-SNAPSHOT-dep.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-ptb.jar b/TuxGuitar/share/plugins/tuxguitar-ptb.jar
new file mode 120000
index 00000000..5b797dc2
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-ptb.jar
@@ -0,0 +1 @@
+../../../plugins/ptb/target/tuxguitar-ptb-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-tef.jar b/TuxGuitar/share/plugins/tuxguitar-tef.jar
new file mode 120000
index 00000000..c144f490
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-tef.jar
@@ -0,0 +1 @@
+../../../plugins/tef/target/tuxguitar-tef-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-tray.jar b/TuxGuitar/share/plugins/tuxguitar-tray.jar
new file mode 120000
index 00000000..6ea06203
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-tray.jar
@@ -0,0 +1 @@
+../../../plugins/tray/target/tuxguitar-tray-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/plugins/tuxguitar-tuner.jar b/TuxGuitar/share/plugins/tuxguitar-tuner.jar
new file mode 120000
index 00000000..a687e6cf
--- /dev/null
+++ b/TuxGuitar/share/plugins/tuxguitar-tuner.jar
@@ -0,0 +1 @@
+../../../plugins/tuner/target/tuxguitar-tuner-1.3-SNAPSHOT.jar
\ No newline at end of file
diff --git a/TuxGuitar/share/skins/Lavender/doublebar.png b/TuxGuitar/share/skins/Lavender/doublebar.png
new file mode 100644
index 00000000..32ebab5a
Binary files /dev/null and b/TuxGuitar/share/skins/Lavender/doublebar.png differ
diff --git a/TuxGuitar/share/skins/Oxygen/1.png b/TuxGuitar/share/skins/Oxygen/1.png
deleted file mode 100644
index f371f7b7..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/16.png b/TuxGuitar/share/skins/Oxygen/16.png
deleted file mode 100644
index 05473efd..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/16.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/2.png b/TuxGuitar/share/skins/Oxygen/2.png
deleted file mode 100644
index b04bb5d0..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/32.png b/TuxGuitar/share/skins/Oxygen/32.png
deleted file mode 100644
index cbb56acd..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/32.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/4.png b/TuxGuitar/share/skins/Oxygen/4.png
deleted file mode 100644
index 06dfd1a5..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/4.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/64.png b/TuxGuitar/share/skins/Oxygen/64.png
deleted file mode 100644
index 78c7a38a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/64.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/8.png b/TuxGuitar/share/skins/Oxygen/8.png
deleted file mode 100644
index ef81b9a7..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/8.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/README b/TuxGuitar/share/skins/Oxygen/README
deleted file mode 100644
index 9a63314e..00000000
--- a/TuxGuitar/share/skins/Oxygen/README
+++ /dev/null
@@ -1,9 +0,0 @@
-This theme as been made using the default TuxGuitar theme "Lavender"
-and using icons from the Oxygen Icons project.
-
-http://www.oxygen-icons.org/
-
-Please respect the Oxygen Icons licenses:
-
-http://creativecommons.org/licenses/by-sa/3.0/
-http://www.gnu.org/licenses/lgpl.html
\ No newline at end of file
diff --git a/TuxGuitar/share/skins/Oxygen/about_authors.png b/TuxGuitar/share/skins/Oxygen/about_authors.png
deleted file mode 100644
index a6c1740c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/about_authors.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/about_description.png b/TuxGuitar/share/skins/Oxygen/about_description.png
deleted file mode 100644
index 0936ccdf..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/about_description.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/about_license.png b/TuxGuitar/share/skins/Oxygen/about_license.png
deleted file mode 100644
index e2fca981..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/about_license.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/browser_back.png b/TuxGuitar/share/skins/Oxygen/browser_back.png
deleted file mode 100644
index 4459024e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/browser_back.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/browser_file.png b/TuxGuitar/share/skins/Oxygen/browser_file.png
deleted file mode 100644
index 73a85ae8..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/browser_file.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/browser_folder.png b/TuxGuitar/share/skins/Oxygen/browser_folder.png
deleted file mode 100644
index 9c46c794..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/browser_new.png b/TuxGuitar/share/skins/Oxygen/browser_new.png
deleted file mode 100644
index fbb4ce05..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/browser_new.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/browser_refresh.png b/TuxGuitar/share/skins/Oxygen/browser_refresh.png
deleted file mode 100644
index 45b5535c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/browser_root.png b/TuxGuitar/share/skins/Oxygen/browser_root.png
deleted file mode 100644
index aab6a883..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/browser_root.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/chord.png b/TuxGuitar/share/skins/Oxygen/chord.png
deleted file mode 100644
index 11019a73..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/chord.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/closerepeat.png b/TuxGuitar/share/skins/Oxygen/closerepeat.png
deleted file mode 100644
index 223ce00f..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/division-type.png b/TuxGuitar/share/skins/Oxygen/division-type.png
deleted file mode 100644
index aa18421a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/division-type.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dotted.png b/TuxGuitar/share/skins/Oxygen/dotted.png
deleted file mode 100644
index f5b0ddde..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dotted.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/doubledotted.png b/TuxGuitar/share/skins/Oxygen/doubledotted.png
deleted file mode 100644
index 1ce6450a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_f.png b/TuxGuitar/share/skins/Oxygen/dynamic_f.png
deleted file mode 100644
index a5479419..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_ff.png b/TuxGuitar/share/skins/Oxygen/dynamic_ff.png
deleted file mode 100644
index 0a22c7fe..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_fff.png b/TuxGuitar/share/skins/Oxygen/dynamic_fff.png
deleted file mode 100644
index b265522b..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_mf.png b/TuxGuitar/share/skins/Oxygen/dynamic_mf.png
deleted file mode 100644
index a03c125c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_mp.png b/TuxGuitar/share/skins/Oxygen/dynamic_mp.png
deleted file mode 100644
index af9c9f2d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_p.png b/TuxGuitar/share/skins/Oxygen/dynamic_p.png
deleted file mode 100644
index 029512d9..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_pp.png b/TuxGuitar/share/skins/Oxygen/dynamic_pp.png
deleted file mode 100644
index c2a7d593..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/dynamic_ppp.png b/TuxGuitar/share/skins/Oxygen/dynamic_ppp.png
deleted file mode 100644
index e335a535..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_mode_edition.png b/TuxGuitar/share/skins/Oxygen/edit_mode_edition.png
deleted file mode 100644
index 334bb119..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_mode_edition_no_natural.png b/TuxGuitar/share/skins/Oxygen/edit_mode_edition_no_natural.png
deleted file mode 100644
index c04448e1..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_mode_selection.png b/TuxGuitar/share/skins/Oxygen/edit_mode_selection.png
deleted file mode 100644
index ca18245b..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_redo.png b/TuxGuitar/share/skins/Oxygen/edit_redo.png
deleted file mode 100644
index 45f04502..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_undo.png b/TuxGuitar/share/skins/Oxygen/edit_undo.png
deleted file mode 100644
index 57abbe17..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_voice_1.png b/TuxGuitar/share/skins/Oxygen/edit_voice_1.png
deleted file mode 100644
index 3338d3cd..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/edit_voice_2.png b/TuxGuitar/share/skins/Oxygen/edit_voice_2.png
deleted file mode 100644
index f54d9287..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_accentuated.png b/TuxGuitar/share/skins/Oxygen/effect_accentuated.png
deleted file mode 100644
index 8740222c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_bend.png b/TuxGuitar/share/skins/Oxygen/effect_bend.png
deleted file mode 100644
index ed053565..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_dead.png b/TuxGuitar/share/skins/Oxygen/effect_dead.png
deleted file mode 100644
index 5c3e07c9..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_fade_in.png b/TuxGuitar/share/skins/Oxygen/effect_fade_in.png
deleted file mode 100644
index ebf9fd0e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_ghost.png b/TuxGuitar/share/skins/Oxygen/effect_ghost.png
deleted file mode 100644
index 3a9eaf86..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_grace.png b/TuxGuitar/share/skins/Oxygen/effect_grace.png
deleted file mode 100644
index 29d56953..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_hammer.png b/TuxGuitar/share/skins/Oxygen/effect_hammer.png
deleted file mode 100644
index d3eca5f9..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_harmonic.png b/TuxGuitar/share/skins/Oxygen/effect_harmonic.png
deleted file mode 100644
index 6fe19a92..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_heavy_accentuated.png b/TuxGuitar/share/skins/Oxygen/effect_heavy_accentuated.png
deleted file mode 100644
index 75ed1ef6..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_palm_mute.png b/TuxGuitar/share/skins/Oxygen/effect_palm_mute.png
deleted file mode 100644
index d4ef7551..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_popping.png b/TuxGuitar/share/skins/Oxygen/effect_popping.png
deleted file mode 100644
index 4964783c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_slapping.png b/TuxGuitar/share/skins/Oxygen/effect_slapping.png
deleted file mode 100644
index e49fd969..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_slide.png b/TuxGuitar/share/skins/Oxygen/effect_slide.png
deleted file mode 100644
index ea63a1b8..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_staccato.png b/TuxGuitar/share/skins/Oxygen/effect_staccato.png
deleted file mode 100644
index 524dbbec..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_tapping.png b/TuxGuitar/share/skins/Oxygen/effect_tapping.png
deleted file mode 100644
index dec85371..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_tremolo_bar.png b/TuxGuitar/share/skins/Oxygen/effect_tremolo_bar.png
deleted file mode 100644
index f3a39396..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_tremolo_picking.png b/TuxGuitar/share/skins/Oxygen/effect_tremolo_picking.png
deleted file mode 100644
index b72f5dac..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_trill.png b/TuxGuitar/share/skins/Oxygen/effect_trill.png
deleted file mode 100644
index 1ccc4d0c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/effect_vibrato.png b/TuxGuitar/share/skins/Oxygen/effect_vibrato.png
deleted file mode 100644
index 19f4860a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/firstfret.png b/TuxGuitar/share/skins/Oxygen/firstfret.png
deleted file mode 100644
index b2ceba83..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/firstfret.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/fret.png b/TuxGuitar/share/skins/Oxygen/fret.png
deleted file mode 100644
index c575c7a3..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/fret.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/fretboard.png b/TuxGuitar/share/skins/Oxygen/fretboard.png
deleted file mode 100644
index 83353670..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/fretboard.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/grace.png b/TuxGuitar/share/skins/Oxygen/grace.png
deleted file mode 100644
index 29d56953..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/grace.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon-16x16.png b/TuxGuitar/share/skins/Oxygen/icon-16x16.png
deleted file mode 100644
index c617291a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon-24x24.png b/TuxGuitar/share/skins/Oxygen/icon-24x24.png
deleted file mode 100644
index 30e43cc5..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon-32x32.png b/TuxGuitar/share/skins/Oxygen/icon-32x32.png
deleted file mode 100644
index cebffe09..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon-48x48.png b/TuxGuitar/share/skins/Oxygen/icon-48x48.png
deleted file mode 100644
index c6a172ba..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon-64x64.png b/TuxGuitar/share/skins/Oxygen/icon-64x64.png
deleted file mode 100644
index 83418061..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon-96x96.png b/TuxGuitar/share/skins/Oxygen/icon-96x96.png
deleted file mode 100644
index 296c49bc..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon.icns b/TuxGuitar/share/skins/Oxygen/icon.icns
deleted file mode 100644
index d05a1ce8..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon.icns and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon.ico b/TuxGuitar/share/skins/Oxygen/icon.ico
deleted file mode 100644
index f43d9cad..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon.ico and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/icon.png b/TuxGuitar/share/skins/Oxygen/icon.png
deleted file mode 100644
index 296c49bc..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/icon.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/layout_compact.png b/TuxGuitar/share/skins/Oxygen/layout_compact.png
deleted file mode 100644
index e29a92b9..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/layout_linear.png b/TuxGuitar/share/skins/Oxygen/layout_linear.png
deleted file mode 100644
index 89fcd60a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/layout_multitrack.png b/TuxGuitar/share/skins/Oxygen/layout_multitrack.png
deleted file mode 100644
index 204ce3a9..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/layout_page.png b/TuxGuitar/share/skins/Oxygen/layout_page.png
deleted file mode 100644
index 387c8de1..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/layout_page.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/layout_score.png b/TuxGuitar/share/skins/Oxygen/layout_score.png
deleted file mode 100644
index 19a5746b..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/layout_score.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/logo.png b/TuxGuitar/share/skins/Oxygen/logo.png
deleted file mode 100644
index f52b54bd..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/logo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_add.png b/TuxGuitar/share/skins/Oxygen/marker_add.png
deleted file mode 100644
index 62436bd2..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_add.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_first.png b/TuxGuitar/share/skins/Oxygen/marker_first.png
deleted file mode 100644
index cb66e6df..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_first.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_last.png b/TuxGuitar/share/skins/Oxygen/marker_last.png
deleted file mode 100644
index 3a6557b6..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_last.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_list.png b/TuxGuitar/share/skins/Oxygen/marker_list.png
deleted file mode 100644
index b37b97a0..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_list.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_next.png b/TuxGuitar/share/skins/Oxygen/marker_next.png
deleted file mode 100644
index e8bb6b23..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_next.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_previous.png b/TuxGuitar/share/skins/Oxygen/marker_previous.png
deleted file mode 100644
index 646ead33..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/marker_remove.png b/TuxGuitar/share/skins/Oxygen/marker_remove.png
deleted file mode 100644
index a661a31d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/mixer.png b/TuxGuitar/share/skins/Oxygen/mixer.png
deleted file mode 100644
index 99d35c35..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/mixer.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/new.png b/TuxGuitar/share/skins/Oxygen/new.png
deleted file mode 100644
index a7f3411d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/new.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/open.png b/TuxGuitar/share/skins/Oxygen/open.png
deleted file mode 100644
index 317a3577..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/open.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/openrepeat.png b/TuxGuitar/share/skins/Oxygen/openrepeat.png
deleted file mode 100644
index 1f36f923..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/option_language.png b/TuxGuitar/share/skins/Oxygen/option_language.png
deleted file mode 100644
index 5c5246e7..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/option_language.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/option_skin.png b/TuxGuitar/share/skins/Oxygen/option_skin.png
deleted file mode 100644
index eddffb6e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/option_skin.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/option_sound.png b/TuxGuitar/share/skins/Oxygen/option_sound.png
deleted file mode 100644
index 5bc5c237..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/option_sound.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/option_style.png b/TuxGuitar/share/skins/Oxygen/option_style.png
deleted file mode 100644
index 5abdf6cb..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/option_style.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/option_toolbars.png b/TuxGuitar/share/skins/Oxygen/option_toolbars.png
deleted file mode 100644
index f072ad07..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/option_view.png b/TuxGuitar/share/skins/Oxygen/option_view.png
deleted file mode 100644
index 0936ccdf..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/option_view.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/print-preview.png b/TuxGuitar/share/skins/Oxygen/print-preview.png
deleted file mode 100644
index 03a3edf9..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/print-preview.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/print.png b/TuxGuitar/share/skins/Oxygen/print.png
deleted file mode 100644
index 8eb1c674..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/print.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/repeat_alternative.png b/TuxGuitar/share/skins/Oxygen/repeat_alternative.png
deleted file mode 100644
index 5611647d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/save-as.png b/TuxGuitar/share/skins/Oxygen/save-as.png
deleted file mode 100644
index 0ecb79e8..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/save-as.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/save.png b/TuxGuitar/share/skins/Oxygen/save.png
deleted file mode 100644
index a81e70d4..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/save.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/settings.png b/TuxGuitar/share/skins/Oxygen/settings.png
deleted file mode 100644
index 45b8fae8..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/settings.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/skin-preview.png b/TuxGuitar/share/skins/Oxygen/skin-preview.png
deleted file mode 100644
index c4987787..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/skin.properties b/TuxGuitar/share/skins/Oxygen/skin.properties
deleted file mode 100644
index 2557cb10..00000000
--- a/TuxGuitar/share/skins/Oxygen/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=Oxygen
-author=The Chakra Project 
-description=http://www.oxygen-icons.org
-date=2011-8-19
-version=0.1
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar/share/skins/Oxygen/song_properties.png b/TuxGuitar/share/skins/Oxygen/song_properties.png
deleted file mode 100644
index 8f76c516..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/song_properties.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/splash.png b/TuxGuitar/share/skins/Oxygen/splash.png
deleted file mode 100644
index 87f71e9d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/splash.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/tempo.png b/TuxGuitar/share/skins/Oxygen/tempo.png
deleted file mode 100644
index ea62c52d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/tempo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/tempoicon.png b/TuxGuitar/share/skins/Oxygen/tempoicon.png
deleted file mode 100644
index 1c6cb4e5..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/tgdoc.icns b/TuxGuitar/share/skins/Oxygen/tgdoc.icns
deleted file mode 100644
index 2060a6ee..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/tgdoc.icns and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/tiednote.png b/TuxGuitar/share/skins/Oxygen/tiednote.png
deleted file mode 100644
index d87c292e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/tiednote.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/timesignature.png b/TuxGuitar/share/skins/Oxygen/timesignature.png
deleted file mode 100644
index 603f1a20..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/timesignature.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/track_add.png b/TuxGuitar/share/skins/Oxygen/track_add.png
deleted file mode 100644
index c1067018..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/track_add.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/track_remove.png b/TuxGuitar/share/skins/Oxygen/track_remove.png
deleted file mode 100644
index 90ba1096..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/track_remove.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport.png b/TuxGuitar/share/skins/Oxygen/transport.png
deleted file mode 100644
index cdfbf63f..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_first_1.png b/TuxGuitar/share/skins/Oxygen/transport_first_1.png
deleted file mode 100644
index dc159696..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_first_2.png b/TuxGuitar/share/skins/Oxygen/transport_first_2.png
deleted file mode 100644
index dc159696..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_first_1.png b/TuxGuitar/share/skins/Oxygen/transport_icon_first_1.png
deleted file mode 100644
index 120c1e02..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_first_2.png b/TuxGuitar/share/skins/Oxygen/transport_icon_first_2.png
deleted file mode 100644
index 120c1e02..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_last_1.png b/TuxGuitar/share/skins/Oxygen/transport_icon_last_1.png
deleted file mode 100644
index 73924323..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_last_2.png b/TuxGuitar/share/skins/Oxygen/transport_icon_last_2.png
deleted file mode 100644
index 73924323..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_next_1.png b/TuxGuitar/share/skins/Oxygen/transport_icon_next_1.png
deleted file mode 100644
index 0a33f97c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_next_2.png b/TuxGuitar/share/skins/Oxygen/transport_icon_next_2.png
deleted file mode 100644
index 0a33f97c..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_pause.png b/TuxGuitar/share/skins/Oxygen/transport_icon_pause.png
deleted file mode 100644
index d133bdc5..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_play_1.png b/TuxGuitar/share/skins/Oxygen/transport_icon_play_1.png
deleted file mode 100644
index 2820368e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_play_2.png b/TuxGuitar/share/skins/Oxygen/transport_icon_play_2.png
deleted file mode 100644
index 2820368e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_previous_1.png b/TuxGuitar/share/skins/Oxygen/transport_icon_previous_1.png
deleted file mode 100644
index 6f9d9b96..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_previous_2.png b/TuxGuitar/share/skins/Oxygen/transport_icon_previous_2.png
deleted file mode 100644
index 6f9d9b96..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_stop_1.png b/TuxGuitar/share/skins/Oxygen/transport_icon_stop_1.png
deleted file mode 100644
index 4ecbdf6e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_icon_stop_2.png b/TuxGuitar/share/skins/Oxygen/transport_icon_stop_2.png
deleted file mode 100644
index 4ecbdf6e..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_last_1.png b/TuxGuitar/share/skins/Oxygen/transport_last_1.png
deleted file mode 100644
index c8d2393a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_last_2.png b/TuxGuitar/share/skins/Oxygen/transport_last_2.png
deleted file mode 100644
index c8d2393a..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_metronome.png b/TuxGuitar/share/skins/Oxygen/transport_metronome.png
deleted file mode 100644
index beb32261..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_mode.png b/TuxGuitar/share/skins/Oxygen/transport_mode.png
deleted file mode 100644
index 1d094626..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_next_1.png b/TuxGuitar/share/skins/Oxygen/transport_next_1.png
deleted file mode 100644
index 670df9b0..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_next_2.png b/TuxGuitar/share/skins/Oxygen/transport_next_2.png
deleted file mode 100644
index 670df9b0..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_pause.png b/TuxGuitar/share/skins/Oxygen/transport_pause.png
deleted file mode 100644
index cb58bfdd..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_play_1.png b/TuxGuitar/share/skins/Oxygen/transport_play_1.png
deleted file mode 100644
index 23e3d295..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_play_2.png b/TuxGuitar/share/skins/Oxygen/transport_play_2.png
deleted file mode 100644
index 23e3d295..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_previous_1.png b/TuxGuitar/share/skins/Oxygen/transport_previous_1.png
deleted file mode 100644
index 29cc2f0d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_previous_2.png b/TuxGuitar/share/skins/Oxygen/transport_previous_2.png
deleted file mode 100644
index 29cc2f0d..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_stop_1.png b/TuxGuitar/share/skins/Oxygen/transport_stop_1.png
deleted file mode 100644
index ebf5f88f..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/Oxygen/transport_stop_2.png b/TuxGuitar/share/skins/Oxygen/transport_stop_2.png
deleted file mode 100644
index ebf5f88f..00000000
Binary files a/TuxGuitar/share/skins/Oxygen/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/1.png b/TuxGuitar/share/skins/blue_serious/1.png
deleted file mode 100644
index e5d1bf37..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/16.png b/TuxGuitar/share/skins/blue_serious/16.png
deleted file mode 100644
index c2ab703c..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/16.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/2.png b/TuxGuitar/share/skins/blue_serious/2.png
deleted file mode 100644
index f7fa1cfd..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/32.png b/TuxGuitar/share/skins/blue_serious/32.png
deleted file mode 100644
index a88e284b..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/32.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/4.png b/TuxGuitar/share/skins/blue_serious/4.png
deleted file mode 100644
index 603799d5..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/4.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/64.png b/TuxGuitar/share/skins/blue_serious/64.png
deleted file mode 100644
index f91b54f8..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/64.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/8.png b/TuxGuitar/share/skins/blue_serious/8.png
deleted file mode 100644
index 42a3efda..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/8.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/about_authors.png b/TuxGuitar/share/skins/blue_serious/about_authors.png
deleted file mode 100644
index 69f5b04e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/about_authors.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/about_description.png b/TuxGuitar/share/skins/blue_serious/about_description.png
deleted file mode 100644
index 59b02683..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/about_description.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/about_license.png b/TuxGuitar/share/skins/blue_serious/about_license.png
deleted file mode 100644
index c3262c5f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/about_license.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/browser_back.png b/TuxGuitar/share/skins/blue_serious/browser_back.png
deleted file mode 100644
index 8a36e093..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/browser_back.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/browser_file.png b/TuxGuitar/share/skins/blue_serious/browser_file.png
deleted file mode 100644
index 50882171..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/browser_file.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/browser_folder.png b/TuxGuitar/share/skins/blue_serious/browser_folder.png
deleted file mode 100644
index 1b19b3ca..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/browser_new.png b/TuxGuitar/share/skins/blue_serious/browser_new.png
deleted file mode 100644
index 72a6ea21..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/browser_new.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/browser_refresh.png b/TuxGuitar/share/skins/blue_serious/browser_refresh.png
deleted file mode 100644
index 42d08729..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/browser_root.png b/TuxGuitar/share/skins/blue_serious/browser_root.png
deleted file mode 100644
index db0d5a5f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/browser_root.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/chord.png b/TuxGuitar/share/skins/blue_serious/chord.png
deleted file mode 100644
index 5c23bb6a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/chord.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/closerepeat.png b/TuxGuitar/share/skins/blue_serious/closerepeat.png
deleted file mode 100644
index cd0810ac..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/division-type.png b/TuxGuitar/share/skins/blue_serious/division-type.png
deleted file mode 100644
index eb47b50d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/division-type.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dotted.png b/TuxGuitar/share/skins/blue_serious/dotted.png
deleted file mode 100644
index d963a7e5..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dotted.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/doubledotted.png b/TuxGuitar/share/skins/blue_serious/doubledotted.png
deleted file mode 100644
index 0ae90818..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_f.png b/TuxGuitar/share/skins/blue_serious/dynamic_f.png
deleted file mode 100644
index 042cf3db..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_ff.png b/TuxGuitar/share/skins/blue_serious/dynamic_ff.png
deleted file mode 100644
index dc16cd8f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_fff.png b/TuxGuitar/share/skins/blue_serious/dynamic_fff.png
deleted file mode 100644
index 94dedd52..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_mf.png b/TuxGuitar/share/skins/blue_serious/dynamic_mf.png
deleted file mode 100644
index 6a2d1082..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_mp.png b/TuxGuitar/share/skins/blue_serious/dynamic_mp.png
deleted file mode 100644
index acb00776..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_p.png b/TuxGuitar/share/skins/blue_serious/dynamic_p.png
deleted file mode 100644
index 8560e077..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_pp.png b/TuxGuitar/share/skins/blue_serious/dynamic_pp.png
deleted file mode 100644
index b5f3145f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/dynamic_ppp.png b/TuxGuitar/share/skins/blue_serious/dynamic_ppp.png
deleted file mode 100644
index 1c14f87e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_mode_edition.png b/TuxGuitar/share/skins/blue_serious/edit_mode_edition.png
deleted file mode 100644
index f230bd1d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_mode_edition_no_natural.png b/TuxGuitar/share/skins/blue_serious/edit_mode_edition_no_natural.png
deleted file mode 100644
index 277f7ba7..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_mode_selection.png b/TuxGuitar/share/skins/blue_serious/edit_mode_selection.png
deleted file mode 100644
index 9e56aa38..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_redo.png b/TuxGuitar/share/skins/blue_serious/edit_redo.png
deleted file mode 100644
index 5e1717e5..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_undo.png b/TuxGuitar/share/skins/blue_serious/edit_undo.png
deleted file mode 100644
index c439e9d8..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_voice_1.png b/TuxGuitar/share/skins/blue_serious/edit_voice_1.png
deleted file mode 100644
index 95957147..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/edit_voice_2.png b/TuxGuitar/share/skins/blue_serious/edit_voice_2.png
deleted file mode 100644
index f9a90d44..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_accentuated.png b/TuxGuitar/share/skins/blue_serious/effect_accentuated.png
deleted file mode 100644
index ccbac086..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_bend.png b/TuxGuitar/share/skins/blue_serious/effect_bend.png
deleted file mode 100644
index a49c9602..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_dead.png b/TuxGuitar/share/skins/blue_serious/effect_dead.png
deleted file mode 100644
index 68111440..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_fade_in.png b/TuxGuitar/share/skins/blue_serious/effect_fade_in.png
deleted file mode 100644
index 0b48773b..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_ghost.png b/TuxGuitar/share/skins/blue_serious/effect_ghost.png
deleted file mode 100644
index af04c4e8..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_grace.png b/TuxGuitar/share/skins/blue_serious/effect_grace.png
deleted file mode 100644
index 079f3452..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_hammer.png b/TuxGuitar/share/skins/blue_serious/effect_hammer.png
deleted file mode 100644
index 5eec73ab..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_harmonic.png b/TuxGuitar/share/skins/blue_serious/effect_harmonic.png
deleted file mode 100644
index 29239335..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_heavy_accentuated.png b/TuxGuitar/share/skins/blue_serious/effect_heavy_accentuated.png
deleted file mode 100644
index c62fac99..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_palm_mute.png b/TuxGuitar/share/skins/blue_serious/effect_palm_mute.png
deleted file mode 100644
index 77144368..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_popping.png b/TuxGuitar/share/skins/blue_serious/effect_popping.png
deleted file mode 100644
index 8012eef9..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_slapping.png b/TuxGuitar/share/skins/blue_serious/effect_slapping.png
deleted file mode 100644
index dc64d579..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_slide.png b/TuxGuitar/share/skins/blue_serious/effect_slide.png
deleted file mode 100644
index 731a67f3..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_staccato.png b/TuxGuitar/share/skins/blue_serious/effect_staccato.png
deleted file mode 100644
index f3adff74..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_tapping.png b/TuxGuitar/share/skins/blue_serious/effect_tapping.png
deleted file mode 100644
index c624cf1d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_tremolo_bar.png b/TuxGuitar/share/skins/blue_serious/effect_tremolo_bar.png
deleted file mode 100644
index ed7fd9d6..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_tremolo_picking.png b/TuxGuitar/share/skins/blue_serious/effect_tremolo_picking.png
deleted file mode 100644
index f3daa7d7..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_trill.png b/TuxGuitar/share/skins/blue_serious/effect_trill.png
deleted file mode 100644
index f9524f87..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/effect_vibrato.png b/TuxGuitar/share/skins/blue_serious/effect_vibrato.png
deleted file mode 100644
index ae5dcca7..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/firstfret.png b/TuxGuitar/share/skins/blue_serious/firstfret.png
deleted file mode 100644
index 2313352d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/firstfret.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/fret.png b/TuxGuitar/share/skins/blue_serious/fret.png
deleted file mode 100644
index 479d6a7b..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/fret.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/fretboard.png b/TuxGuitar/share/skins/blue_serious/fretboard.png
deleted file mode 100644
index 32996e9a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/fretboard.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/grace.png b/TuxGuitar/share/skins/blue_serious/grace.png
deleted file mode 100644
index 6c67a4cb..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/grace.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon-16x16.png b/TuxGuitar/share/skins/blue_serious/icon-16x16.png
deleted file mode 100644
index 536ed539..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon-24x24.png b/TuxGuitar/share/skins/blue_serious/icon-24x24.png
deleted file mode 100644
index 9465961a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon-32x32.png b/TuxGuitar/share/skins/blue_serious/icon-32x32.png
deleted file mode 100644
index 414c1a30..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon-48x48.png b/TuxGuitar/share/skins/blue_serious/icon-48x48.png
deleted file mode 100644
index 323124da..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon-64x64.png b/TuxGuitar/share/skins/blue_serious/icon-64x64.png
deleted file mode 100644
index 253a826d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon-96x96.png b/TuxGuitar/share/skins/blue_serious/icon-96x96.png
deleted file mode 100644
index a9734963..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon.icns b/TuxGuitar/share/skins/blue_serious/icon.icns
deleted file mode 100644
index 0a379706..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon.icns and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon.ico b/TuxGuitar/share/skins/blue_serious/icon.ico
deleted file mode 100644
index 3f978beb..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon.ico and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/icon.png b/TuxGuitar/share/skins/blue_serious/icon.png
deleted file mode 100644
index 253a826d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/icon.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/layout_compact.png b/TuxGuitar/share/skins/blue_serious/layout_compact.png
deleted file mode 100644
index d765101e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/layout_linear.png b/TuxGuitar/share/skins/blue_serious/layout_linear.png
deleted file mode 100644
index 3f98e43b..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/layout_multitrack.png b/TuxGuitar/share/skins/blue_serious/layout_multitrack.png
deleted file mode 100644
index 5d82d5ec..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/layout_page.png b/TuxGuitar/share/skins/blue_serious/layout_page.png
deleted file mode 100644
index a5641598..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/layout_page.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/layout_score.png b/TuxGuitar/share/skins/blue_serious/layout_score.png
deleted file mode 100644
index 356dc02b..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/layout_score.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/logo.png b/TuxGuitar/share/skins/blue_serious/logo.png
deleted file mode 100644
index 06e6deb8..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/logo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_add.png b/TuxGuitar/share/skins/blue_serious/marker_add.png
deleted file mode 100644
index cd747a59..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_add.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_first.png b/TuxGuitar/share/skins/blue_serious/marker_first.png
deleted file mode 100644
index f48dc2c6..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_first.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_last.png b/TuxGuitar/share/skins/blue_serious/marker_last.png
deleted file mode 100644
index 82890a60..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_last.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_list.png b/TuxGuitar/share/skins/blue_serious/marker_list.png
deleted file mode 100644
index 687ac512..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_list.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_next.png b/TuxGuitar/share/skins/blue_serious/marker_next.png
deleted file mode 100644
index 37af476a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_next.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_previous.png b/TuxGuitar/share/skins/blue_serious/marker_previous.png
deleted file mode 100644
index 967968ea..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/marker_remove.png b/TuxGuitar/share/skins/blue_serious/marker_remove.png
deleted file mode 100644
index 81db28f6..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/mixer.png b/TuxGuitar/share/skins/blue_serious/mixer.png
deleted file mode 100644
index 20f08042..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/mixer.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/new.png b/TuxGuitar/share/skins/blue_serious/new.png
deleted file mode 100644
index 0ae7d443..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/new.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/open.png b/TuxGuitar/share/skins/blue_serious/open.png
deleted file mode 100644
index 49aed35f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/open.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/openrepeat.png b/TuxGuitar/share/skins/blue_serious/openrepeat.png
deleted file mode 100644
index 680d64fc..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/option_language.png b/TuxGuitar/share/skins/blue_serious/option_language.png
deleted file mode 100644
index 2470001f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/option_language.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/option_skin.png b/TuxGuitar/share/skins/blue_serious/option_skin.png
deleted file mode 100644
index 7a19c688..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/option_skin.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/option_sound.png b/TuxGuitar/share/skins/blue_serious/option_sound.png
deleted file mode 100644
index c9033316..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/option_sound.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/option_style.png b/TuxGuitar/share/skins/blue_serious/option_style.png
deleted file mode 100644
index 45f6c7ae..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/option_style.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/option_toolbars.png b/TuxGuitar/share/skins/blue_serious/option_toolbars.png
deleted file mode 100644
index d8c71e5e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/option_view.png b/TuxGuitar/share/skins/blue_serious/option_view.png
deleted file mode 100644
index 9fbe7d4a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/option_view.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/print-preview.png b/TuxGuitar/share/skins/blue_serious/print-preview.png
deleted file mode 100644
index 39df1371..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/print-preview.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/print.png b/TuxGuitar/share/skins/blue_serious/print.png
deleted file mode 100644
index 08404f23..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/print.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/repeat_alternative.png b/TuxGuitar/share/skins/blue_serious/repeat_alternative.png
deleted file mode 100644
index bdceba2a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/save-as.png b/TuxGuitar/share/skins/blue_serious/save-as.png
deleted file mode 100644
index 66f2e736..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/save-as.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/save.png b/TuxGuitar/share/skins/blue_serious/save.png
deleted file mode 100644
index 45ab2fce..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/save.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/settings.png b/TuxGuitar/share/skins/blue_serious/settings.png
deleted file mode 100644
index 83af57d0..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/settings.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/skin-preview.png b/TuxGuitar/share/skins/blue_serious/skin-preview.png
deleted file mode 100644
index c8e13688..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/skin.properties b/TuxGuitar/share/skins/blue_serious/skin.properties
deleted file mode 100644
index ee57c234..00000000
--- a/TuxGuitar/share/skins/blue_serious/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=blue_serious
-author=licnep <licnep@users.sourceforge.net>
-description=A more serious theme, where blue dominates.
-date=2007-07-17
-version=0.1
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar/share/skins/blue_serious/skin.svg b/TuxGuitar/share/skins/blue_serious/skin.svg
deleted file mode 100644
index 78fe369d..00000000
--- a/TuxGuitar/share/skins/blue_serious/skin.svg
+++ /dev/null
@@ -1,8639 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="744.09448819"
-   height="1052.3622047"
-   id="svg4934"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="C:\Documents and Settings\Bruno Preziosi\Desktop"
-   sodipodi:docname="skin.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4936">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective1371" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient34716">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop34718" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop34720" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient23605">
-      <stop
-         style="stop-color:#0100ff;stop-opacity:1;"
-         offset="0"
-         id="stop23607" />
-      <stop
-         style="stop-color:#00a7ff;stop-opacity:1;"
-         offset="1"
-         id="stop23609" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14515">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop14517" />
-      <stop
-         id="stop14603"
-         offset="0.5"
-         style="stop-color:#4c4c4c;stop-opacity:1;" />
-      <stop
-         style="stop-color:#444444;stop-opacity:1;"
-         offset="1"
-         id="stop14519" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8897">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8899" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8901" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7257">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7259" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7261" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5204">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5206" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop5208" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4884">
-      <stop
-         style="stop-color:#e7e7e7;stop-opacity:1;"
-         offset="0"
-         id="stop4886" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4888" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient29570">
-      <stop
-         style="stop-color:#7f7f7f;stop-opacity:1;"
-         offset="0"
-         id="stop29572" />
-      <stop
-         id="stop29578"
-         offset="0.5"
-         style="stop-color:#999999;stop-opacity:0.68932039;" />
-      <stop
-         style="stop-color:#b3b3b3;stop-opacity:0;"
-         offset="1"
-         id="stop29574" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient29560">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop29562" />
-      <stop
-         style="stop-color:#fffa00;stop-opacity:0;"
-         offset="1"
-         id="stop29564" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient26619">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop26621" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop26623" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient24651">
-      <stop
-         style="stop-color:#838383;stop-opacity:1;"
-         offset="0"
-         id="stop24653" />
-      <stop
-         style="stop-color:#ececec;stop-opacity:1;"
-         offset="1"
-         id="stop24655" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient24639">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1;"
-         offset="0"
-         id="stop24641" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop24643" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient23660">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop23662" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop23664" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient22671">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop22673" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop22675" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21690">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop21692" />
-      <stop
-         style="stop-color:#c3c3c3;stop-opacity:1;"
-         offset="1"
-         id="stop21694" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20702">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop20704" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop20706" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19703">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop19705" />
-      <stop
-         style="stop-color:#d8a588;stop-opacity:0;"
-         offset="1"
-         id="stop19707" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient13756">
-      <stop
-         style="stop-color:#916f6f;stop-opacity:1;"
-         offset="0"
-         id="stop13758" />
-      <stop
-         style="stop-color:#372929;stop-opacity:1;"
-         offset="1"
-         id="stop13760" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12721">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12723" />
-      <stop
-         style="stop-color:#5c5c5c;stop-opacity:1;"
-         offset="1"
-         id="stop12725" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient12711">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop12713" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop12715" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11707">
-      <stop
-         style="stop-color:#ffcc00;stop-opacity:1;"
-         offset="0"
-         id="stop11709" />
-      <stop
-         style="stop-color:#e5b804;stop-opacity:1;"
-         offset="1"
-         id="stop11711" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11689">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop11691" />
-      <stop
-         style="stop-color:#e0a01c;stop-opacity:0;"
-         offset="1"
-         id="stop11693" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient56561">
-      <stop
-         id="stop56563"
-         offset="0"
-         style="stop-color:#9cffff;stop-opacity:1;" />
-      <stop
-         id="stop56565"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient48382">
-      <stop
-         style="stop-color:#34a7f6;stop-opacity:1;"
-         offset="0"
-         id="stop48384" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop48386" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4856">
-      <stop
-         style="stop-color:white;stop-opacity:0.84536082"
-         offset="0"
-         id="stop4858" />
-      <stop
-         style="stop-color:#6898f1;stop-opacity:0.46391752"
-         offset="1"
-         id="stop4860" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4791">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop4793" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4795" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient22002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.920046,0,0,1.086901,0,13.71543)"
-       x1="313.19742"
-       y1="886.34753"
-       x2="399.59286"
-       y2="886.34753" />
-    <linearGradient
-       id="linearGradient33795">
-      <stop
-         style="stop-color:#ff9e00;stop-opacity:1"
-         offset="0"
-         id="stop33801" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0.5"
-         id="stop33803" />
-      <stop
-         style="stop-color:#ffffa0;stop-opacity:1"
-         offset="1"
-         id="stop33799" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3974">
-      <stop
-         style="stop-color:#dd9600;stop-opacity:1"
-         offset="0"
-         id="stop3976" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3978" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11729">
-      <stop
-         style="stop-color:#806805;stop-opacity:1"
-         offset="0"
-         id="stop11731" />
-      <stop
-         style="stop-color:#e1e2ce;stop-opacity:1"
-         offset="0.44999999"
-         id="stop11735" />
-      <stop
-         style="stop-color:#b4a66d;stop-opacity:1"
-         offset="1"
-         id="stop11733" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9900">
-      <stop
-         style="stop-color:#ffd988;stop-opacity:1"
-         offset="0"
-         id="stop9902" />
-      <stop
-         style="stop-color:#97812c;stop-opacity:1"
-         offset="1"
-         id="stop9904" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9009">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop9011" />
-      <stop
-         style="stop-color:#d3bc5f;stop-opacity:1"
-         offset="1"
-         id="stop9013" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23057"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,982.7389,22.5298)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23061"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,643.9049,22.52983)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23063"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,530.9602,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-167.3496,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient3567"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4133997,0.4055754,-0.3422418,-0.3488223,10.276589,-74.784609)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24213"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24211"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24217"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24215"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       id="linearGradient32988">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop32990" />
-      <stop
-         style="stop-color:#cbcbcb;stop-opacity:1"
-         offset="0.5"
-         id="stop32994" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop32992" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)"
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643" />
-    <linearGradient
-       id="linearGradient6462">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop6464" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop6466" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       id="linearGradient9267">
-      <stop
-         style="stop-color:#ffd428;stop-opacity:1;"
-         offset="0"
-         id="stop9269" />
-      <stop
-         id="stop10163"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffd322;stop-opacity:1;"
-         offset="1"
-         id="stop9271" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9267"
-       id="linearGradient24251"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.105702,-0.132634,0.122908,0.142271,-123.5758,437.4912)"
-       x1="205.4043"
-       y1="464.48911"
-       x2="207.19127"
-       y2="498.23825" />
-    <linearGradient
-       id="linearGradient7463">
-      <stop
-         style="stop-color:lime;stop-opacity:1;"
-         offset="0"
-         id="stop7465" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop7467" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7463"
-       id="linearGradient24249"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.120379,0.139344,-0.171115,0.214715,20.77584,293.7269)"
-       x1="331.695"
-       y1="486.6479"
-       x2="399.73358"
-       y2="486.6479" />
-    <linearGradient
-       id="linearGradient19203">
-      <stop
-         style="stop-color:#a49e88;stop-opacity:1;"
-         offset="0"
-         id="stop19205" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop19207" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19203"
-       id="linearGradient24247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.463664,0.283515,-0.266017,0.432012,-24.98543,167.9069)"
-       x1="209.59592"
-       y1="469.32986"
-       x2="228.7281"
-       y2="494.3299" />
-    <linearGradient
-       id="linearGradient14138">
-      <stop
-         style="stop-color:#afc6e9;stop-opacity:1;"
-         offset="0"
-         id="stop14140" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop14142" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20139">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop20141" />
-      <stop
-         style="stop-color:#5696f6;stop-opacity:0"
-         offset="1"
-         id="stop20143" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21032">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop21034" />
-      <stop
-         style="stop-color:red;stop-opacity:0"
-         offset="1"
-         id="stop21036" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18353">
-      <stop
-         style="stop-color:yellow;stop-opacity:1"
-         offset="0"
-         id="stop18355" />
-      <stop
-         style="stop-color:yellow;stop-opacity:0"
-         offset="1"
-         id="stop18357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19246">
-      <stop
-         style="stop-color:#f95;stop-opacity:1"
-         offset="0"
-         id="stop19248" />
-      <stop
-         style="stop-color:#f95;stop-opacity:0"
-         offset="1"
-         id="stop19250" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4550"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <linearGradient
-       id="linearGradient5684">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop5686" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop5688" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4546"
-       gradientUnits="userSpaceOnUse"
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218" />
-    <linearGradient
-       id="linearGradient4644">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop4646" />
-      <stop
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1"
-         id="stop4648" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4644"
-       id="radialGradient4544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       id="linearGradient4672">
-      <stop
-         style="stop-color:#9b9b9b;stop-opacity:1"
-         offset="0"
-         id="stop4674" />
-      <stop
-         style="stop-color:#2f2f2f;stop-opacity:1"
-         offset="1"
-         id="stop4676" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218" />
-    <linearGradient
-       id="linearGradient7720">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop7722" />
-      <stop
-         style="stop-color:#81baff;stop-opacity:1;"
-         offset="1"
-         id="stop7724" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7720"
-       id="radialGradient4540"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       id="linearGradient5880">
-      <stop
-         style="stop-color:#6d91d4;stop-opacity:1"
-         offset="0"
-         id="stop5882" />
-      <stop
-         style="stop-color:black;stop-opacity:0.02061856"
-         offset="1"
-         id="stop5884" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6814">
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="0"
-         id="stop6816" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6820" />
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="1"
-         id="stop6818" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6798">
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="0"
-         id="stop6800" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6804" />
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="1"
-         id="stop6802" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6830">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop6832" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6836" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="1"
-         id="stop6834" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6846">
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="0"
-         id="stop6848" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6852" />
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="1"
-         id="stop6850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9201">
-      <stop
-         style="stop-color:#007d00;stop-opacity:1;"
-         offset="0"
-         id="stop9203" />
-      <stop
-         style="stop-color:#00d900;stop-opacity:0;"
-         offset="1"
-         id="stop9205" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient16401"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <linearGradient
-       id="linearGradient10979">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop10981" />
-      <stop
-         style="stop-color:#fff2d7;stop-opacity:1;"
-         offset="1"
-         id="stop10983" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient16399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient21760"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       id="linearGradient15469">
-      <stop
-         style="stop-color:#25a2e3;stop-opacity:1;"
-         offset="0"
-         id="stop15471" />
-      <stop
-         style="stop-color:#dfdfdf;stop-opacity:1;"
-         offset="1"
-         id="stop15473" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient3382"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21493"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       id="linearGradient9644">
-      <stop
-         style="stop-color:#f8e70a;stop-opacity:1;"
-         offset="0"
-         id="stop9646" />
-      <stop
-         style="stop-color:#ffa021;stop-opacity:0;"
-         offset="1"
-         id="stop9648" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21491"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       id="linearGradient1315">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop1317" />
-      <stop
-         style="stop-color:black;stop-opacity:0.73958325"
-         offset="1"
-         id="stop1319" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient22911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4134002,0.4055758,-0.3422416,-0.3488226,336.05906,-255.33691)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <marker
-       inkscape:stockid="TriangleInM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleInM"
-       style="overflow:visible">
-      <path
-         id="path4538"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.4)" />
-    </marker>
-    <linearGradient
-       id="linearGradient43975">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop43977" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop43979" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient40035">
-      <stop
-         style="stop-color:#3c3c3c;stop-opacity:1;"
-         offset="0"
-         id="stop40037" />
-      <stop
-         style="stop-color:#9a8d8d;stop-opacity:1;"
-         offset="1"
-         id="stop40039" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient34131">
-      <stop
-         style="stop-color:#006e0b;stop-opacity:1;"
-         offset="0"
-         id="stop34133" />
-      <stop
-         style="stop-color:#07ff00;stop-opacity:1;"
-         offset="1"
-         id="stop34135" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11686">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop11688" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop11690" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient30048">
-      <stop
-         style="stop-color:#007100;stop-opacity:1;"
-         offset="0"
-         id="stop30050" />
-      <stop
-         style="stop-color:#00d100;stop-opacity:0.70873785;"
-         offset="1"
-         id="stop30052" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient24170">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop24172" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop24174" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4552">
-      <stop
-         style="stop-color:#ffcd1d;stop-opacity:1"
-         offset="0"
-         id="stop4554" />
-      <stop
-         style="stop-color:#ffe691;stop-opacity:1"
-         offset="0.67500001"
-         id="stop6334" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4556" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3661">
-      <stop
-         style="stop-color:#ffd74f;stop-opacity:1"
-         offset="0"
-         id="stop3663" />
-      <stop
-         style="stop-color:#795d00;stop-opacity:0"
-         offset="1"
-         id="stop3665" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19023">
-      <stop
-         style="stop-color:#fff6f6;stop-opacity:1;"
-         offset="0"
-         id="stop19025" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop19027" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18995">
-      <stop
-         style="stop-color:#7887b6;stop-opacity:1;"
-         offset="0"
-         id="stop18997" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop18999" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18969">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop18971" />
-      <stop
-         id="stop18977"
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop18973" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18960">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.79611653;"
-         offset="0"
-         id="stop18962" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop18964" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient17829">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop17831" />
-      <stop
-         id="stop17837"
-         offset="0.5"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop17833" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16852">
-      <stop
-         style="stop-color:#d3bc5f;stop-opacity:1;"
-         offset="0"
-         id="stop16854" />
-      <stop
-         style="stop-color:#d38d5f;stop-opacity:1;"
-         offset="1"
-         id="stop16856" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14070">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop14072" />
-      <stop
-         style="stop-color:#8e8e8e;stop-opacity:1"
-         offset="1"
-         id="stop14074" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21068">
-      <stop
-         style="stop-color:#999;stop-opacity:1"
-         offset="0"
-         id="stop21070" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop21072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16226">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop16228" />
-      <stop
-         style="stop-color:#e85700;stop-opacity:1"
-         offset="1"
-         id="stop16230" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34131"
-       id="linearGradient43969"
-       gradientUnits="userSpaceOnUse"
-       x1="315.21429"
-       y1="601.46936"
-       x2="334.42856"
-       y2="601.46936" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16852"
-       id="linearGradient46199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(32.857143,-92.857143)"
-       x1="330.38367"
-       y1="341.9724"
-       x2="335.30689"
-       y2="341.9724" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16852"
-       id="linearGradient46291"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(32.857143,-92.857143)"
-       x1="330.38367"
-       y1="341.9724"
-       x2="335.30689"
-       y2="341.9724" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient30048"
-       id="linearGradient46308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-47.5,-58.214286)"
-       x1="394.7171"
-       y1="463.6958"
-       x2="387.64603"
-       y2="456.62473" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24170"
-       id="linearGradient46322"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9152246,0,39.62588)"
-       x1="327.79449"
-       y1="446.52319"
-       x2="310.87445"
-       y2="448.03842" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24170"
-       id="linearGradient46324"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9152246,0,39.62588)"
-       x1="333.21429"
-       y1="452.49219"
-       x2="334.64285"
-       y2="475.23166" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient46350"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1573476,0,0,0.1985639,254.36744,448.40529)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40035"
-       id="linearGradient46352"
-       gradientUnits="userSpaceOnUse"
-       x1="332.07446"
-       y1="565.65918"
-       x2="318.41772"
-       y2="569.03137" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34131"
-       id="linearGradient46354"
-       gradientUnits="userSpaceOnUse"
-       x1="315.21429"
-       y1="601.46936"
-       x2="334.42856"
-       y2="601.46936" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient46382"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1573476,0,0,0.1985639,254.36744,448.40529)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient40035"
-       id="linearGradient46384"
-       gradientUnits="userSpaceOnUse"
-       x1="332.07446"
-       y1="565.65918"
-       x2="318.41772"
-       y2="569.03137" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient43975"
-       id="linearGradient46386"
-       gradientUnits="userSpaceOnUse"
-       x1="332.5"
-       y1="642.36218"
-       x2="346.98233"
-       y2="656.62982"
-       gradientTransform="translate(31.071397,-471.8956)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56421"
-       gradientUnits="userSpaceOnUse"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56423"
-       gradientUnits="userSpaceOnUse"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="168.01244"
-       y1="765.50165"
-       x2="172.57751"
-       y2="783.052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56427"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56429"
-       gradientUnits="userSpaceOnUse"
-       x1="146.07144"
-       y1="773.9693"
-       x2="138.39285"
-       y2="763.61218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56431"
-       gradientUnits="userSpaceOnUse"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56433"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9553524,0,0,0.9553524,6.3805055,33.68767)"
-       x1="131.91823"
-       y1="757.63336"
-       x2="156.74184"
-       y2="786.12646" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56435"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9553524,0,0,0.9553524,6.3805055,33.68767)"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56437"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9095867,0,69.541934)"
-       x1="226.12527"
-       y1="767.38849"
-       x2="229.06473"
-       y2="779.35138" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56443"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56445"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56447"
-       gradientUnits="userSpaceOnUse"
-       x1="224.28571"
-       y1="767.7193"
-       x2="228.0826"
-       y2="779.06696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56449"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56453"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9095867,0,69.541934)"
-       x1="226.12527"
-       y1="767.38849"
-       x2="229.06473"
-       y2="779.35138" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56455"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56457"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56459"
-       gradientUnits="userSpaceOnUse"
-       x1="224.28571"
-       y1="767.7193"
-       x2="228.0826"
-       y2="779.06696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56511"
-       gradientUnits="userSpaceOnUse"
-       x1="175.71429"
-       y1="787.12646"
-       x2="171.60715"
-       y2="767.1731" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56515"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56527"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56533"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56549"
-       x1="218.45901"
-       y1="770.17187"
-       x2="237.88474"
-       y2="770.17187"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56551"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56553"
-       x1="162.91429"
-       y1="770.93361"
-       x2="180.3"
-       y2="770.93361"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56555"
-       x1="135.39285"
-       y1="770.755"
-       x2="153.53571"
-       y2="770.755"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56557"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56559"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56577"
-       gradientUnits="userSpaceOnUse"
-       x1="162.91429"
-       y1="770.93361"
-       x2="174.23909"
-       y2="780.53003" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56579"
-       gradientUnits="userSpaceOnUse"
-       x1="162.91429"
-       y1="770.93361"
-       x2="171.60715"
-       y2="767.1731" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56582"
-       gradientUnits="userSpaceOnUse"
-       x1="162.91429"
-       y1="770.93361"
-       x2="174.23909"
-       y2="780.53003"
-       gradientTransform="translate(-0.2550204,29.247583)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,6.8094052,110.6955)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56607"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56615"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56667"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(227.41176,-673.03754)"
-       x1="156.3483"
-       y1="774.46912"
-       x2="171.60715"
-       y2="768.18323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56669"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(227.41176,-673.03754)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="171.60715"
-       y2="768.18323" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56671"
-       gradientUnits="userSpaceOnUse"
-       x1="135.39285"
-       y1="770.755"
-       x2="153.53571"
-       y2="770.755" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56673"
-       gradientUnits="userSpaceOnUse"
-       x1="135.39285"
-       y1="770.755"
-       x2="153.53571"
-       y2="770.755" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56675"
-       gradientUnits="userSpaceOnUse"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56677"
-       gradientUnits="userSpaceOnUse"
-       x1="136.38519"
-       y1="765.59845"
-       x2="152.59634"
-       y2="778.37634" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9553524,0,0,0.9553524,6.3805055,33.68767)"
-       x1="156.07143"
-       y1="768.25507"
-       x2="141.96428"
-       y2="758.255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56681"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56683"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56687"
-       gradientUnits="userSpaceOnUse"
-       x1="220.6384"
-       y1="776.77808"
-       x2="234.15274"
-       y2="757.90942" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56689"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56691"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56693"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56695"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56697"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56699"
-       gradientUnits="userSpaceOnUse"
-       x1="220.0254"
-       y1="770.03125"
-       x2="238.19335"
-       y2="770.03125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56701"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7273249,0,0,1,101.56554,-0.7142858)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56703"
-       gradientUnits="userSpaceOnUse"
-       x1="220.6384"
-       y1="776.77808"
-       x2="234.15274"
-       y2="757.90942" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56705"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56707"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient56709"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5751169,0,0,1.008628,124.83388,-7.1545301)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient56711"
-       gradientUnits="userSpaceOnUse"
-       x1="218.45901"
-       y1="770.17187"
-       x2="224.24768"
-       y2="761.58398" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient3722"
-       x1="-484.87323"
-       y1="170.99902"
-       x2="-480.08008"
-       y2="156.60942"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(849.99998,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient3738"
-       x1="-482.34784"
-       y1="168.47871"
-       x2="-489.41891"
-       y2="163.93301"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(849.99998,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient56561"
-       id="linearGradient6854"
-       gradientUnits="userSpaceOnUse"
-       x1="-484.87323"
-       y1="170.99902"
-       x2="-480.08008"
-       y2="156.60942"
-       gradientTransform="translate(859.59643,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient6856"
-       gradientUnits="userSpaceOnUse"
-       x1="-482.34784"
-       y1="168.47871"
-       x2="-489.41891"
-       y2="163.93301"
-       gradientTransform="translate(859.59643,-63.999998)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient6883"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.955585e-2,-9.4442571e-2,9.3098111e-2,9.0849027e-2,220.18116,469.85854)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient6899"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(8.955585e-2,-9.4442571e-2,9.3098111e-2,9.0849027e-2,219.81213,516.8131)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34131"
-       id="linearGradient6901"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1321943,0,0,1.1321943,-46.203278,-70.99291)"
-       x1="339.28571"
-       y1="539.14789"
-       x2="341.78571"
-       y2="551.64789" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient8039"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7526038,0.6083978,-0.5733311,0.5393683,798.58831,284.04424)"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13756"
-       id="linearGradient13762"
-       x1="450.78058"
-       y1="666.98901"
-       x2="461.38718"
-       y2="681.48468"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13756"
-       id="linearGradient14783"
-       gradientUnits="userSpaceOnUse"
-       x1="450.78058"
-       y1="666.98901"
-       x2="461.38718"
-       y2="681.48468" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient29570"
-       id="radialGradient29636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.103689,5.2299076e-7,-1.9780151e-7,0.1370966,-46.037807,651.99982)"
-       cx="439.46976"
-       cy="757.58337"
-       fx="439.46976"
-       fy="757.58337"
-       r="62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21690"
-       id="linearGradient29638"
-       gradientUnits="userSpaceOnUse"
-       x1="595.5"
-       y1="696.36218"
-       x2="596.75"
-       y2="767.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11707"
-       id="linearGradient29640"
-       gradientUnits="userSpaceOnUse"
-       x1="634.88086"
-       y1="751.11469"
-       x2="634.88086"
-       y2="742.24536" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11689"
-       id="linearGradient29642"
-       gradientUnits="userSpaceOnUse"
-       x1="616.4325"
-       y1="739.86218"
-       x2="616.81653"
-       y2="768.41132" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11707"
-       id="linearGradient29644"
-       gradientUnits="userSpaceOnUse"
-       x1="634.88086"
-       y1="751.11469"
-       x2="634.88086"
-       y2="742.24536" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11689"
-       id="linearGradient29646"
-       gradientUnits="userSpaceOnUse"
-       x1="616.4325"
-       y1="739.86218"
-       x2="616.81653"
-       y2="768.41132" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12721"
-       id="linearGradient29648"
-       gradientUnits="userSpaceOnUse"
-       x1="575"
-       y1="712.7193"
-       x2="529.9032"
-       y2="696.14789" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient12711"
-       id="linearGradient29650"
-       gradientUnits="userSpaceOnUse"
-       x1="538.57141"
-       y1="699.14789"
-       x2="562.85712"
-       y2="719.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient13756"
-       id="linearGradient29652"
-       gradientUnits="userSpaceOnUse"
-       x1="450.78058"
-       y1="666.98901"
-       x2="461.38718"
-       y2="681.48468" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19703"
-       id="linearGradient29654"
-       gradientUnits="userSpaceOnUse"
-       x1="660.5"
-       y1="643.11218"
-       x2="647"
-       y2="681.86218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20702"
-       id="radialGradient29656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7877615,-0.3068366,0.2750567,1.6025984,-339.57925,-281.42543)"
-       cx="392"
-       cy="682.68359"
-       fx="392"
-       fy="682.68359"
-       r="11" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient22671"
-       id="radialGradient29658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4334045,-0.7857037,2.2183534,1.2236733,-1042.1562,234.44432)"
-       cx="474.38373"
-       cy="659.97424"
-       fx="474.38373"
-       fy="659.97424"
-       r="15.8" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23660"
-       id="linearGradient29660"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9699248,0,0,1,173.57519,6)"
-       x1="434.75"
-       y1="609.86218"
-       x2="434.75"
-       y2="641.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24639"
-       id="linearGradient29662"
-       gradientUnits="userSpaceOnUse"
-       x1="441.00461"
-       y1="648.47522"
-       x2="403.06418"
-       y2="645.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24639"
-       id="linearGradient29664"
-       gradientUnits="userSpaceOnUse"
-       x1="457.867"
-       y1="648.99261"
-       x2="407.80673"
-       y2="645.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24651"
-       id="linearGradient29666"
-       gradientUnits="userSpaceOnUse"
-       x1="434.68118"
-       y1="653.64905"
-       x2="408.33368"
-       y2="651.57947" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient26619"
-       id="linearGradient29668"
-       gradientUnits="userSpaceOnUse"
-       x1="590"
-       y1="636.34375"
-       x2="578"
-       y2="651.84375" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient24651"
-       id="linearGradient29670"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9488566,0,0,0.9664004,179.5499,26.675505)"
-       x1="434.68118"
-       y1="653.64905"
-       x2="408.33368"
-       y2="651.57947" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23660"
-       id="linearGradient29672"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8989058,0,0,0.863818,225.09145,95.352673)"
-       x1="419.85327"
-       y1="633.24628"
-       x2="434.31531"
-       y2="653.70087" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient29560"
-       id="linearGradient29674"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9721378,0,0,0.9641253,16.310943,23.529189)"
-       x1="607.40472"
-       y1="666.98901"
-       x2="588.66638"
-       y2="657.79657" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient29690"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029204,0.186021,-0.1860214,0.2029204,422.55483,563.24879)"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient29692"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029204,0.186021,-0.1860214,0.2029204,422.55483,563.24879)"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient29708"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029202,0.1860211,-0.1860211,0.2029202,415.50085,608.72154)"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient29710"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2029202,0.1860211,-0.1860211,0.2029202,415.50085,608.72154)"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient29749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient29751"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient29763"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient29765"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient30770"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.347396,5.8469281e-3,-6.45542e-3,0.3835499,278.79698,446.0576)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient30772"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6801604,0,0,0.6801604,143.23448,260.49617)"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4884"
-       id="linearGradient4986"
-       gradientUnits="userSpaceOnUse"
-       x1="468.45825"
-       y1="368.94348"
-       x2="460.32651"
-       y2="332.88104"
-       gradientTransform="translate(-50.622053,-134.67858)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8558"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0606601,-0.3535534)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8560"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1.0606601,-0.3535534)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8562"
-       gradientUnits="userSpaceOnUse"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(65.15738,0)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(65.15738,0)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8568"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,597.96234,0.3535534)"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8570"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,741.85857,-1.4142136)"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8572"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(213.29625,-1.4142136)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8574"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(213.29625,-1.4142136)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8576"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.7071068,0)"
-       x1="476.58997"
-       y1="953.36725"
-       x2="476.23642"
-       y2="936.50024" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8578"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(146.11366,-1.4142134)"
-       x1="279.66074"
-       y1="951.953"
-       x2="280.72137"
-       y2="935.68958" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8580"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(142.93168,-1.4142134)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8582"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(142.93168,-1.4142134)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5204"
-       id="linearGradient8584"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-887.26512,-4.4513212e-7)"
-       x1="476.58997"
-       y1="953.36725"
-       x2="476.23642"
-       y2="936.50024" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8586"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(250.41936,-1.767767)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8588"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(250.41936,-1.767767)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8590"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(298.50262,-1.767767)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8592"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(298.50262,-1.767767)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8594"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(104.75536,-1.4142136)"
-       x1="263.04373"
-       y1="931.80048"
-       x2="273.08966"
-       y2="933.0379" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient8596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(104.75536,-1.4142136)"
-       x1="267.63992"
-       y1="935.68958"
-       x2="261.62952"
-       y2="937.95734" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient8903"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9082"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9084"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9086"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9088"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9090"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8897"
-       id="linearGradient9092"
-       gradientUnits="userSpaceOnUse"
-       x1="155.7688"
-       y1="596.52466"
-       x2="178.85175"
-       y2="596.52466" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10632"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0002987,0,0,0.9606692,-0.1380491,15.912347)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10634"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2485904,0,0,0.9568426,-107.4476,25.962975)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0180271,0,0,0.9603807,-13.103176,33.000931)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10638"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0002987,0,0,0.9606692,0.2155043,67.177589)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10640"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2485904,0,0,0.9568426,-107.09405,77.228217)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient10642"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0180271,0,0,0.9603807,-12.749623,84.266173)"
-       x1="452.04479"
-       y1="409.07179"
-       x2="472.14378"
-       y2="409.07179" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient12422"
-       gradientUnits="userSpaceOnUse"
-       x1="448.76281"
-       y1="542.00787"
-       x2="465.87982"
-       y2="542.00787" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient12424"
-       gradientUnits="userSpaceOnUse"
-       x1="462.80139"
-       y1="548.90216"
-       x2="454.3161"
-       y2="539.00269" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient14671"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4620139,0,0,0.3894886,57.182807,0.9387358)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient14673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient14675"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient14677"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient14679"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4620139,0,0,0.3894886,57.182807,0.9387358)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14515"
-       id="linearGradient14681"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6887344,0,0,0.6887344,123.12631,180.07568)"
-       x1="504.69748"
-       y1="581.25232"
-       x2="504.69748"
-       y2="592.21246" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14515"
-       id="linearGradient14683"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6887344,0,0,0.6887344,123.12631,180.07568)"
-       x1="504.69748"
-       y1="581.25232"
-       x2="504.69748"
-       y2="592.21246" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14515"
-       id="linearGradient14685"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6887344,0,0,0.6887344,123.12631,180.07568)"
-       x1="504.69748"
-       y1="581.25232"
-       x2="504.69748"
-       y2="592.21246" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16699"
-       gradientUnits="userSpaceOnUse"
-       x1="168.57143"
-       y1="775.75507"
-       x2="168.57143"
-       y2="762.83539" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16701"
-       gradientUnits="userSpaceOnUse"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16703"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="168.01244"
-       y1="765.50165"
-       x2="172.57751"
-       y2="783.052" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient48382"
-       id="linearGradient16705"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9583614,0,0,0.8941799,7.0644256,81.447915)"
-       x1="175.71429"
-       y1="787.12646"
-       x2="175.53572"
-       y2="761.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient20674"
-       x1="550.44476"
-       y1="253.6601"
-       x2="617.09191"
-       y2="253.6601"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4884"
-       id="linearGradient20676"
-       x1="550.45654"
-       y1="279.77587"
-       x2="617.10101"
-       y2="279.77587"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23605"
-       id="linearGradient23611"
-       x1="671.5"
-       y1="273.36218"
-       x2="642"
-       y2="258.36218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.5,-1)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32738"
-       gradientUnits="userSpaceOnUse"
-       x1="657.81122"
-       y1="561.36737"
-       x2="667.31006"
-       y2="509.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32740"
-       gradientUnits="userSpaceOnUse"
-       x1="698.62152"
-       y1="559.50873"
-       x2="637.10321"
-       y2="525.56763" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32742"
-       gradientUnits="userSpaceOnUse"
-       x1="661.5"
-       y1="522.48663"
-       x2="668.9314"
-       y2="568.8941" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32744"
-       gradientUnits="userSpaceOnUse"
-       x1="657.81122"
-       y1="561.36737"
-       x2="667.31006"
-       y2="509.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32746"
-       gradientUnits="userSpaceOnUse"
-       x1="698.62152"
-       y1="559.50873"
-       x2="637.10321"
-       y2="525.56763" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32748"
-       gradientUnits="userSpaceOnUse"
-       x1="661.5"
-       y1="522.48663"
-       x2="668.9314"
-       y2="568.8941" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32750"
-       gradientUnits="userSpaceOnUse"
-       x1="657.81122"
-       y1="561.36737"
-       x2="667.31006"
-       y2="509.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32752"
-       gradientUnits="userSpaceOnUse"
-       x1="698.62152"
-       y1="559.50873"
-       x2="637.10321"
-       y2="525.56763" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient32754"
-       gradientUnits="userSpaceOnUse"
-       x1="661.5"
-       y1="522.48663"
-       x2="668.9314"
-       y2="568.8941" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4884"
-       id="linearGradient34698"
-       x1="631.90344"
-       y1="523.90344"
-       x2="698.16439"
-       y2="547.48794"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient34716"
-       id="linearGradient34722"
-       x1="692.96466"
-       y1="529.10315"
-       x2="636.39612"
-       y2="571.07245"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient34743"
-       x1="551.61316"
-       y1="604.48474"
-       x2="574.93854"
-       y2="619.33398"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-237.34822,100.04162)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient35720"
-       x1="560.02856"
-       y1="633.04785"
-       x2="530.33008"
-       y2="597.6925"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-237.34822,100.04162)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient23605"
-       id="linearGradient4519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.5,-1)"
-       x1="671.5"
-       y1="273.36218"
-       x2="642"
-       y2="258.36218" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="579.49621"
-     inkscape:cy="593.75733"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1280"
-     inkscape:window-height="931"
-     inkscape:window-x="0"
-     inkscape:window-y="33"
-     showgrid="false" />
-  <metadata
-     id="metadata4939">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <text
-       xml:space="preserve"
-       id="text22931"
-       style="font-size:27.52882576px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.39196366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931228)"
-       y="569.82336"
-       x="102.38081"><tspan
-         id="tspan22933"
-         style="stroke-width:0.39196366"
-         y="569.82336"
-         x="102.38081">Windows dialogs  icons</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text13940"
-       style="font-size:22.53170586px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.32081166px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931229)"
-       y="66.432938"
-       x="104.47573"><tspan
-         id="tspan13942"
-         style="stroke-width:0.32081166"
-         y="66.432938"
-         x="104.47573">TuxGuitar Player 0.8 Version</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text14708"
-       style="font-size:7.94642401px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.11314224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931229)"
-       y="79.741409"
-       x="104.01778"><tspan
-         id="tspan14710"
-         style="stroke-width:0.11314226"
-         y="79.741409"
-         x="104.01778">Buttons defaut</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text14712"
-       style="font-size:7.94658947px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.1131442px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931229)"
-       y="80.345016"
-       x="270.76242"><tspan
-         id="tspan14714"
-         style="stroke-width:0.1131442"
-         y="80.345016"
-         x="270.76242">Buttons is on</tspan></text>
-    <rect
-       id="rect2827"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="389.56476"
-       x="104.71769"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_accentuated.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect2837"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="389.56476"
-       x="153.22922"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_fade_in.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect6548"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="389.35748"
-       x="201.66434"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_ghost.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect6595"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.02417"
-       x="249.47281"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_grace.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect7500"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.02417"
-       x="297.9993"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_hammer.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect7533"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.66095"
-       x="346.74661"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_harmonic.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3143"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.66095"
-       x="395.84604"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_heavy_accentuated.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3182"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="388.66095"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_palm_mute.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <text
-       xml:space="preserve"
-       id="text17219"
-       style="font-size:23.18305969px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.33008549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.0069248,0.9931228)"
-       y="137.11647"
-       x="103.68752"><tspan
-         id="tspan17221"
-         style="stroke-width:0.33008549"
-         y="137.11647"
-         x="103.68752">Toolbar  icons</tspan></text>
-    <rect
-       id="rect34943"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.37198"
-       x="104.68711"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect37863"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.14096"
-       x="201.2482"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect37847"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.37198"
-       x="154.58469"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect49778"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="247.90994"
-       x="248.60471"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52722"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path49780"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 338.50001,696.12549 L 406.50001,696.12549" />
-      <path
-         id="path50667"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(-6.499994,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path50669"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 369.35853,695.26143 L 369.35853,634.48955" />
-      <path
-         id="path50671"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 338.50001,675.62549 L 406.50001,675.62549" />
-    </g>
-    <rect
-       id="rect50689"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.14096"
-       x="295.96121"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect52500"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="247.90994"
-       x="345.85873"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52715"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path50709"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 473.56682,634.97014 C 491.05994,635.4857 491.47546,647.90583 491.48512,663.18131 C 486.73449,647.1487 488.86877,643.70599 473.61907,643.74026 C 473.53193,630.54852 473.6402,648.16276 473.56682,634.97014 z " />
-      <path
-         id="path52546"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 441.00001,696.62549 L 509.00001,696.62549" />
-      <path
-         id="path52548"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(96.00001,7.763308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52550"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 471.85853,695.76143 L 471.85853,634.98955" />
-      <path
-         id="path52552"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 441.00001,676.12549 L 509.00001,676.12549" />
-    </g>
-    <g
-       id="g52707"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path52519"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 581.65647,634.49305 C 599.14959,634.96367 599.56511,646.30103 599.57477,660.24482 C 594.82414,645.6099 596.95842,642.46732 581.70872,642.4986 C 581.62158,630.4569 581.72985,646.53556 581.65647,634.49305 z " />
-      <path
-         id="path52570"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 549.00001,696.12549 L 617.00001,696.12549" />
-      <path
-         id="path52572"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(204,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52574"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 579.85853,695.26143 L 579.85853,634.48955" />
-      <path
-         id="path52576"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 549.00001,675.62549 L 617.00001,675.62549" />
-      <path
-         id="path52578"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 581.51919,644.69678 C 599.01231,645.1674 599.42783,656.50476 599.43749,670.44855 C 594.68686,655.81363 596.82114,652.67105 581.57144,652.70233 C 581.4843,640.66063 581.59257,656.73929 581.51919,644.69678 z " />
-    </g>
-    <rect
-       id="rect52589"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.14096"
-       x="393.67725"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52697"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path52593"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,634.99305 C 702.64959,635.46096 703.06511,646.7332 703.07477,660.59689 C 698.32414,646.04604 700.45842,642.92151 685.20872,642.95261 C 685.12158,630.98009 685.22985,646.96638 685.15647,634.99305 z " />
-      <path
-         id="path52597"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 652.50001,696.62549 L 720.50001,696.62549" />
-      <path
-         id="path52599"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(307.5,7.763308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52601"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 683.35853,695.76143 L 683.35853,634.98955" />
-      <path
-         id="path52603"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 652.50001,676.12549 L 720.50001,676.12549" />
-      <path
-         id="path52605"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,644.55268 C 702.64959,645.02059 703.06511,656.29283 703.07477,670.15652 C 698.32414,655.60567 700.45842,652.48114 685.20872,652.51224 C 685.12158,640.53972 685.22985,656.52601 685.15647,644.55268 z " />
-      <path
-         id="path52614"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,654.60879 C 702.64959,655.07671 703.06511,666.34894 703.07477,680.21263 C 698.32414,665.66178 700.45842,662.53726 685.20872,662.56836 C 685.12158,650.59583 685.22985,666.58212 685.15647,654.60879 z " />
-      <path
-         id="path52629"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 685.15647,664.55689 C 702.64959,665.02481 703.06511,676.29704 703.07477,690.16073 C 698.32414,675.60988 700.45842,672.48536 685.20872,672.51646 C 685.12158,660.54393 685.22985,676.53022 685.15647,664.55689 z " />
-    </g>
-    <rect
-       id="rect52728"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.03989"
-       x="104.41618"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52730"
-       style="display:inline"
-       transform="matrix(0.4620139,0,0,0.4620139,-47.017263,8.9897668)">
-      <path
-         id="path52732"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 338.50001,696.12549 L 406.50001,696.12549" />
-      <path
-         id="path52734"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(-6.499994,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52736"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 369.35853,695.26143 L 369.35853,634.48955" />
-      <path
-         id="path52738"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 338.50001,675.62549 L 406.50001,675.62549" />
-    </g>
-    <rect
-       id="rect52740"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-       y="137.10782"
-       x="319.00745"
-       height="4.6201973"
-       width="4.8512053" />
-    <rect
-       id="rect52758"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.50052"
-       x="154.8157"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52774"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <g
-         id="g52760"
-         style="display:inline"
-         transform="translate(-203,109.5)">
-        <path
-           id="path52762"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 338.50001,696.12549 L 406.50001,696.12549" />
-        <path
-           id="path52764"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="translate(-6.499994,7.263308)"
-           d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-        <path
-           id="path52766"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 369.35853,695.26143 L 369.35853,634.48955" />
-        <path
-           id="path52768"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 338.50001,675.62549 L 406.50001,675.62549" />
-      </g>
-      <rect
-         id="rect52770"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-         y="431.48001"
-         x="683.43604"
-         height="10.000011"
-         width="10.500011" />
-      <rect
-         id="rect52772"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-         y="420.75739"
-         x="694.15863"
-         height="10.00004"
-         width="10.50004" />
-    </g>
-    <rect
-       id="rect52783"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="297.80753"
-       x="203.09622"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g52910"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path52789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 240.00001,804.12549 L 308.00001,804.12549" />
-      <path
-         id="path52795"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 240.00001,783.62549 L 308.00001,783.62549" />
-      <path
-         id="path52791"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(0.571633,0,0,1,45.35674,115.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52793"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 260.01295,803.45836 L 260.01295,758.79263" />
-      <path
-         id="path52812"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.571633,0,0,1,62.29158,115.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52814"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 277.14348,803.45838 L 277.14348,758.79265" />
-      <path
-         id="path52826"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="matrix(0.571633,0,0,1,79.44058,115.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52828"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 294.49064,803.45838 L 294.49064,758.79265" />
-      <rect
-         id="rect52830"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         y="758.36218"
-         x="258.86331"
-         height="9.6007662"
-         width="36.69611" />
-      <text
-         xml:space="preserve"
-         id="text52858"
-         style="font-size:25.4596386px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         transform="scale(1.099156,0.909789)"
-         y="832.28827"
-         x="243.78136"><tspan
-           id="tspan52860"
-           style="font-family:Arial Black"
-           y="832.28827"
-           x="243.78136">3</tspan></text>
-    </g>
-    <rect
-       id="rect52923"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.26956"
-       x="249.2977"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\timesignature.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       id="g16732"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\timesignature.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(849.99998,-63.999998)">
-      <path
-         id="path52961"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.68045378;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -590.64703,394.71663 L -568.46504,371.86246" />
-      <text
-         xml:space="preserve"
-         id="text53848"
-         style="font-size:28.30521774px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-         transform="scale(1.1990521,0.8339921)"
-         y="479.10339"
-         x="-485.94577"><tspan
-           id="tspan53850"
-           y="479.10339"
-           x="-485.94577">4</tspan></text>
-      <text
-         xml:space="preserve"
-         id="text54737"
-         style="font-size:28.30520058px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-         transform="scale(1.1990521,0.8339921)"
-         y="459.57449"
-         x="-498.8335"><tspan
-           id="tspan54739"
-           y="459.57449"
-           x="-498.8335">4</tspan></text>
-    </g>
-    <rect
-       id="rect54748"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="298.73154"
-       x="297.34726"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g57494"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <g
-         id="g56568"
-         transform="translate(4.064981,5.555418)">
-        <g
-           id="g56560">
-          <rect
-             id="rect54762"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="460.12595"
-             ry="0"
-             height="72.622528"
-             width="10.422997" />
-          <rect
-             id="rect54764"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="473.64929"
-             height="72.622528"
-             width="2.5666234" />
-        </g>
-        <g
-           id="g56564"
-           transform="translate(0,-0.109804)">
-          <path
-             id="path55655"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-          <path
-             id="path55657"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-             transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        </g>
-      </g>
-      <g
-         id="g57487">
-        <path
-           id="path55661"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 440.47831,744.01169 L 515.5217,743.84996" />
-        <path
-           id="path55663"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,816.87437 L 515.5217,816.71263" />
-        <path
-           id="path55665"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,798.65871 L 515.52169,798.49697" />
-        <path
-           id="path55667"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,780.44305 L 515.52169,780.28131" />
-        <path
-           id="path55669"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,762.22737 L 515.5217,762.06564" />
-      </g>
-    </g>
-    <rect
-       id="rect61934"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="scale(-1,1)"
-       y="298.26956"
-       x="-388.11679"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g61936"
-       style="display:inline"
-       transform="matrix(-0.4620139,0,0,0.4620139,588.29285,-41.602207)">
-      <g
-         id="g61938"
-         transform="translate(4.064981,5.555418)">
-        <g
-           id="g61940">
-          <rect
-             id="rect61942"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="460.12595"
-             ry="0"
-             height="72.622528"
-             width="10.422997" />
-          <rect
-             id="rect61944"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             y="738.49548"
-             x="473.64929"
-             height="72.622528"
-             width="2.5666234" />
-        </g>
-        <g
-           id="g61946"
-           transform="translate(0,-0.109804)">
-          <path
-             id="path61948"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-          <path
-             id="path61950"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-             transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-             d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        </g>
-      </g>
-      <g
-         id="g61952">
-        <path
-           id="path61954"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 440.47831,744.01169 L 515.5217,743.84996" />
-        <path
-           id="path61956"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,816.87437 L 515.5217,816.71263" />
-        <path
-           id="path61958"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,798.65871 L 515.52169,798.49697" />
-        <path
-           id="path61960"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,780.44305 L 515.52169,780.28131" />
-        <path
-           id="path61962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 440.47831,762.22737 L 515.5217,762.06564" />
-      </g>
-    </g>
-    <rect
-       id="rect2795"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="297.34549"
-       x="395.29428"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g2826"
-       transform="matrix(0.4620139,0,0,0.4620139,97.171257,-41.140177)">
-      <path
-         id="path2799"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 656.00001,803.12549 L 724.00001,803.12549" />
-      <path
-         id="path2801"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(311,114.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path2803"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 686.85853,802.26143 L 686.85853,741.48955" />
-      <path
-         id="path2805"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 656.00001,782.62549 L 724.00001,782.62549" />
-    </g>
-    <rect
-       id="rect2811"
-       style="opacity:0;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="296.91403"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\chord.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       id="g2829"
-       style="display:inline"
-       transform="matrix(0.4620139,0,0,0.4620139,432.20283,-140.79809)">
-      <path
-         id="path2831"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 29.00003,909.12551 L 97.00003,909.12551" />
-      <path
-         id="path2833"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-         transform="translate(-316,220.2633)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path2835"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 29.00003,888.62551 L 97.00003,888.62551" />
-    </g>
-    <g
-       id="g16721"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\chord.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(849.99998,-63.999998)">
-      <text
-         xml:space="preserve"
-         id="text6554"
-         style="font-size:33.25069046px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-         transform="scale(0.9879705,1.012176)"
-         y="389.72214"
-         x="-392.5192"><tspan
-           id="tspan6556"
-           y="389.72214"
-           x="-392.5192">7</tspan></text>
-      <text
-         xml:space="preserve"
-         id="text6567"
-         style="font-size:31.83207703px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-         transform="scale(1.0055344,0.9944961)"
-         y="395.96545"
-         x="-405.44424"><tspan
-           id="tspan6569"
-           y="395.96545"
-           x="-405.44424">G</tspan></text>
-    </g>
-    <path
-       id="path6599"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 109.94912,280.07177 L 141.36612,280.07177" />
-    <path
-       id="path6601"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.84805799;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       d="M 124.04047,271.1779 C 124.04047,273.53817 121.7134,275.45154 118.84281,275.45154 C 115.97222,275.45154 113.64515,273.53817 113.64515,271.1779 C 113.64515,268.81764 115.97222,266.90426 118.84281,266.90426 C 121.7134,266.90426 124.04047,268.81764 124.04047,271.1779 z " />
-    <path
-       id="path6603"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.42819726;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 124.20621,270.06859 L 124.20621,251.30528" />
-    <path
-       id="path6605"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 109.94912,270.60047 L 141.36612,270.60047" />
-    <path
-       id="path6613"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.75689816;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 123.72752,273.79496 C 132.43241,281.53816 140.30826,273.79496 140.30826,273.79496 L 140.30826,273.79496" />
-    <g
-       id="g7524"
-       transform="matrix(0.4620139,0,0,0.4620139,-96.715983,-138.41685)">
-      <path
-         id="path7504"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 585.0017,844.15855 C 602.49482,844.62917 602.91034,855.96653 602.92,869.91032 C 598.16937,855.2754 600.30365,852.13282 585.05395,852.1641 C 584.96681,840.1224 585.07508,856.20106 585.0017,844.15855 z " />
-      <path
-         id="path7506"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 552.34524,905.79099 L 620.34524,905.79099" />
-      <path
-         id="path7508"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(207.3452,216.9288)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path7510"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 583.20376,904.92693 L 583.20376,844.15505" />
-      <path
-         id="path7512"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 552.34524,885.29099 L 620.34524,885.29099" />
-      <path
-         id="path7514"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 584.86442,854.36228 C 602.35754,854.8329 602.77306,866.17026 602.78272,880.11405 C 598.03209,865.47913 600.16637,862.33655 584.91667,862.36783 C 584.82953,850.32613 584.9378,866.40479 584.86442,854.36228 z " />
-      <path
-         id="path7522"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 584.74905,864.74215 C 602.24217,865.21277 602.65769,876.55013 602.66735,890.49392 C 597.91672,875.859 600.051,872.71642 584.8013,872.7477 C 584.71416,860.706 584.82243,876.78466 584.74905,864.74215 z " />
-    </g>
-    <text
-       xml:space="preserve"
-       id="text7535"
-       style="font-size:43.93042374px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       y="284.18216"
-       x="209.71799"><tspan
-         id="tspan7537"
-         y="284.18216"
-         x="209.71799">X</tspan></text>
-    <rect
-       id="rect3132"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="247.76437"
-       x="441.0032"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect3703"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="147.76259"
-       x="394.47055"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g7499"
-       transform="matrix(0.4373357,0,0,0.4683741,65.447487,-49.039827)">
-      <g
-         id="g7361"
-         style="display:inline"
-         transform="matrix(0.518198,0.328578,-0.328578,0.518198,562.3445,-50.07558)">
-        <path
-           id="path7363"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-        <path
-           id="path7365"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 798.11196,486.32746 L 798.11196,425.55558" />
-        <path
-           id="path7367"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-        <path
-           id="path7369"
-           style="fill:url(#radialGradient24225);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-           d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      </g>
-      <path
-         id="rect3745"
-         style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.945538,0.325513,0,1,0,0)"
-         d="M 822.72691,174.61087 L 889.276,169.13496 L 889.276,199.72689 L 823.4895,199.72689 L 822.72691,174.61087 z " />
-      <path
-         id="rect3739"
-         style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.945538,0.325513,0,1,0,0)"
-         d="M 800.22229,188.70871 L 866.00876,188.70871 L 866.00876,219.30063 L 800.49191,214.62408 L 800.22229,188.70871 z " />
-      <rect
-         id="rect3741"
-         style="opacity:1;color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.882353,-0.470588,0,1,0,0)"
-         y="907.16882"
-         x="927.44476"
-         height="30.591925"
-         width="26.003122" />
-      <path
-         id="rect3743"
-         style="color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.701289,-0.712877,0.945817,0.324701,0,0)"
-         d="M -198.67545,947.41547 L -177.04075,950.94075 L -171.02987,1011.6918 L -199.05916,1012.7404 L -198.67545,947.41547 z " />
-      <path
-         id="rect3753"
-         style="color:#000000;fill:url(#linearGradient24227);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 788.37444,442.41233 C 790.98554,441.49944 800.28366,439.76223 810.12708,450.22181 C 809.39758,451.00304 806.96255,454.45726 805.25704,455.95851 C 798.77005,448.84021 786.55315,444.31821 781.43076,448.7918 C 782.36313,447.56946 787.21848,443.63946 788.37444,442.41233 z " />
-      <g
-         id="g7353"
-         transform="matrix(0.996519,0,0,0.996519,3.974373,5.043832)">
-        <path
-           id="path4656"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-        <path
-           id="path4662"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 798.11196,486.32746 L 798.11196,425.55558" />
-        <path
-           id="path4666"
-           style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-        <path
-           id="path4660"
-           style="fill:url(#radialGradient24229);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-           d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      </g>
-    </g>
-    <rect
-       id="rect23627"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.17255"
-       x="104.5211"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23629"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="152.85513"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23631"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="200.99265"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23633"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="249.13016"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23635"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="297.26773"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23637"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="345.40518"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23639"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="393.54269"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect23685"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="343.36914"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <rect
-       id="rect4189"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.92548"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g4191"
-       transform="matrix(0.8455204,0,0,0.7937234,6.5663167,-153.69652)">
-      <path
-         id="path4193"
-         style="color:#000000;fill:url(#radialGradient4540);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4542);stroke-width:19.88428688;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.253681,-2.501311e-2,2.459378e-2,0.246667,229.9229,877.6432)"
-         d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-      <path
-         id="path4195"
-         style="color:#000000;fill:url(#radialGradient4544);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4546);stroke-width:24.22555733;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(7.590656e-2,-7.48444e-3,8.865423e-3,8.891693e-2,402.9419,934.5995)"
-         d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-      <path
-         id="path4198"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,281.3689,848.9056)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4200"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,302.3878,837.0276)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4202"
-         style="color:#000000;fill:#000000;fill-opacity:0.44495413;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,325.3773,845.8586)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4204"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,275.7409,869.832)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4206"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,332.8209,863.8999)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4208"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,326.1424,885.6138)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4210"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,287.9716,890.5937)"
-         d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-      <path
-         id="path4212"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4548);stroke-width:3.50856757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 451.50995,943.25668 C 435.78414,960.38604 437.18199,983.78233 452.90778,996.73372" />
-      <path
-         id="path4214"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4550);stroke-width:2.95746279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 468.42158,952.25773 C 454.79821,963.2013 456.00919,978.14862 469.63254,986.42309" />
-      <path
-         id="path4216"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4552);stroke-width:3.47961354;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 505.32732,943.2543 C 520.79326,960.38517 519.4185,983.78352 503.95255,996.73612" />
-      <path
-         id="path4218"
-         style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4554);stroke-width:2.96080017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 488.70524,951.88864 C 502.07067,963.06859 500.88263,978.33881 487.51722,986.79199" />
-      <path
-         id="path4220"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 465.49828,937.54255 C 475.04316,934.00456 478.02606,940.68448 481.42441,949.00956 C 475.30206,941.30677 475.6879,938.96409 467.47456,942.31203 C 464.4973,935.13979 468.46833,944.71828 465.49828,937.54255 z " />
-      <path
-         id="path4222"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(0.539089,-0.218317,0.243345,0.597197,109.4028,645.3595)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path4224"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.31586146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 479.31673,974.22578 L 464.52817,937.93298" />
-      <path
-         id="path4226"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 467.90731,943.66616 C 477.45219,940.12817 480.43507,946.80809 483.83344,955.13317 C 477.71109,947.43038 478.09693,945.08769 469.88359,948.43564 C 466.90632,941.2634 470.87734,950.8419 467.90731,943.66616 z " />
-      <path
-         id="path4228"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 470.37101,949.89018 C 479.91589,946.35219 482.89878,953.03211 486.29715,961.3572 C 480.1748,953.6544 480.56062,951.31171 472.34729,954.65967 C 469.37002,947.48741 473.34105,957.06591 470.37101,949.89018 z " />
-      <path
-         id="path4230"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 505.72899,950.50171 C 520.25906,957.10155 515.96029,967.3979 510.25127,979.88426 C 512.25344,965.10468 515.33826,963.04516 502.49058,957.68701 C 507.35452,946.87609 500.85315,961.30851 505.72899,950.50171 z " />
-      <path
-         id="path4232"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(0.841647,0.353197,-0.410015,0.895235,445.2498,255.6813)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path4234"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.58397031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 479.29983,1004.2686 L 504.21719,949.86355" />
-    </g>
-    <rect
-       id="rect4236"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.43713"
-       x="104.5211"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\tempoicon.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       id="rect4248"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.63367"
-       x="393.54269"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\edit_mode_selection.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       id="rect4250"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.63367"
-       x="441.68024"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g16749"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\tempoicon.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(849.99998,-63.999998)">
-      <path
-         id="path4256"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.84805679;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M -728.72109,529.74258 C -728.72109,532.10284 -731.04817,534.01621 -733.91875,534.01621 C -736.78934,534.01621 -739.11641,532.10284 -739.11641,529.74258 C -739.11641,527.38232 -736.78934,525.46895 -733.91875,525.46895 C -731.04817,525.46895 -728.72109,527.38232 -728.72109,529.74258 z " />
-      <path
-         id="path4258"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.74707758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M -728.6706,529.70396 L -728.6706,501.62649" />
-      <g
-         transform="translate(5.6568542,-1.4142136)"
-         id="g16745">
-        <path
-           d="M -729.88064,528.4216 L -719.96388,528.4216"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11852527;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4254" />
-        <path
-           d="M -729.88064,521.49842 L -719.96388,521.49842"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.11852527;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path4260" />
-      </g>
-    </g>
-    <g
-       id="g2988"
-       transform="matrix(0.5633612,0,0,0.5633612,94.016587,27.970368)">
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path4570"
-         d="M 48.485517,575.51074 C 47.057601,575.53345 40.824521,575.50157 39.272311,589.79823 L 35.150004,589.79823 L 35.150004,592.07556 L 39.134654,592.07556 C 38.761213,596.18447 35.172599,613.87811 32.848466,613.95576 C 30.453707,614.03577 33.091056,614.04051 33.113086,611.43574 C 33.135117,608.83094 29.615875,608.89369 29.548583,611.44041 C 29.479763,614.04493 29.820497,616.0356 34.173133,616.00346 C 38.572698,615.97098 41.807204,603.64647 43.628053,592.07556 L 47.598261,592.07556 L 47.598261,589.79823 L 44.047779,589.79823 C 45.171812,581.85589 47.016459,577.23072 49.112651,577.21692 C 51.182106,577.20312 51.941425,580.65289 50.411982,580.16323 C 48.247364,579.4702 48.029551,584.05353 50.349925,584.13071 C 52.709916,584.20789 52.77139,580.31354 52.266111,578.31047 C 51.75305,576.27654 49.913433,575.48802 48.485517,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2984"
-         d="M 62.485517,575.51074 C 61.057601,575.53345 54.824521,575.50157 53.272311,589.79823 L 49.150004,589.79823 L 49.150004,592.07556 L 53.134654,592.07556 C 52.761213,596.18447 49.172599,613.87811 46.848466,613.95576 C 44.453707,614.03577 47.091056,614.04051 47.113086,611.43574 C 47.135117,608.83094 43.615875,608.89369 43.548583,611.44041 C 43.479763,614.04493 43.820497,616.0356 48.173133,616.00346 C 52.572698,615.97098 55.807204,603.64647 57.628053,592.07556 L 61.598261,592.07556 L 61.598261,589.79823 L 58.047779,589.79823 C 59.171812,581.85589 61.016459,577.23072 63.112651,577.21692 C 65.182106,577.20312 65.941425,580.65289 64.411982,580.16323 C 62.247364,579.4702 62.029551,584.05353 64.349925,584.13071 C 66.709916,584.20789 66.77139,580.31354 66.266111,578.31047 C 65.75305,576.27654 63.913433,575.48802 62.485517,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2986"
-         d="M 76.485517,575.51074 C 75.057601,575.53345 68.824521,575.50157 67.272311,589.79823 L 63.150004,589.79823 L 63.150004,592.07556 L 67.134654,592.07556 C 66.761213,596.18447 63.172599,613.87811 60.848466,613.95576 C 58.453707,614.03577 61.091056,614.04051 61.113086,611.43574 C 61.135117,608.83094 57.615875,608.89369 57.548583,611.44041 C 57.479763,614.04493 57.820497,616.0356 62.173133,616.00346 C 66.572698,615.97098 69.807204,603.64647 71.628053,592.07556 L 75.598261,592.07556 L 75.598261,589.79823 L 72.047779,589.79823 C 73.171812,581.85589 75.016459,577.23072 77.112651,577.21692 C 79.182106,577.20312 79.941429,580.65289 78.411982,580.16323 C 76.247364,579.4702 76.029551,584.05353 78.349925,584.13071 C 80.709919,584.20789 80.771389,580.31354 80.266109,578.31047 C 79.753049,576.27654 77.913433,575.48802 76.485517,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <g
-       id="g3012"
-       transform="matrix(0.5633612,0,0,0.5633612,98.523477,27.970368)">
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2995"
-         d="M 136.48552,575.51074 C 135.0576,575.53345 128.82452,575.50157 127.27231,589.79823 L 123.15,589.79823 L 123.15,592.07556 L 127.13465,592.07556 C 126.76121,596.18447 123.1726,613.87811 120.84847,613.95576 C 118.45371,614.03577 121.09106,614.04051 121.11309,611.43574 C 121.13512,608.83094 117.61588,608.89369 117.54858,611.44041 C 117.47976,614.04493 117.8205,616.0356 122.17313,616.00346 C 126.5727,615.97098 129.8072,603.64647 131.62805,592.07556 L 135.59826,592.07556 L 135.59826,589.79823 L 132.04778,589.79823 C 133.17181,581.85589 135.01646,577.23072 137.11265,577.21692 C 139.18211,577.20312 139.94143,580.65289 138.41198,580.16323 C 136.24736,579.4702 136.02955,584.05353 138.34992,584.13071 C 140.70992,584.20789 140.77139,580.31354 140.26611,578.31047 C 139.75305,576.27654 137.91343,575.48802 136.48552,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccszzzcccczszzz"
-         id="path2997"
-         d="M 150.48552,575.51074 C 149.0576,575.53345 142.82452,575.50157 141.27231,589.79823 L 137.15,589.79823 L 137.15,592.07556 L 141.13465,592.07556 C 140.76121,596.18447 137.1726,613.87811 134.84847,613.95576 C 132.45371,614.03577 135.09106,614.04051 135.11309,611.43574 C 135.13512,608.83094 131.61588,608.89369 131.54858,611.44041 C 131.47976,614.04493 131.8205,616.0356 136.17313,616.00346 C 140.5727,615.97098 143.8072,603.64647 145.62805,592.07556 L 149.59826,592.07556 L 149.59826,589.79823 L 146.04778,589.79823 C 147.17181,581.85589 149.01646,577.23072 151.11265,577.21692 C 153.18211,577.20312 153.94142,580.65289 152.41198,580.16323 C 150.24736,579.4702 150.02955,584.05353 152.34992,584.13071 C 154.70992,584.20789 154.77139,580.31354 154.26611,578.31047 C 153.75305,576.27654 151.91343,575.48802 150.48552,575.51074 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 229.49687,352.191 C 228.69245,352.20379 225.18097,352.18583 224.30651,360.24001 L 221.98416,360.24001 L 221.98416,361.52298 L 224.22896,361.52298 C 224.01858,363.83778 221.9969,373.8057 220.68757,373.84944 C 219.33845,373.89451 220.82423,373.89719 220.83664,372.42975 C 220.84906,370.96232 218.86645,370.99766 218.82854,372.43239 C 218.78977,373.89968 218.98172,375.02114 221.43383,375.00303 C 223.91238,374.98474 225.73457,368.04158 226.76037,361.52298 L 228.99703,361.52298 L 228.99703,360.24001 L 226.99683,360.24001 C 227.63007,355.76561 228.66927,353.15997 229.85018,353.15219 C 231.01603,353.14442 231.4438,355.08789 230.58218,354.81203 C 229.36271,354.4216 229.24001,357.00368 230.54721,357.04715 C 231.87674,357.09064 231.91138,354.89671 231.62672,353.76825 C 231.33768,352.62241 230.30131,352.1782 229.49687,352.191 z "
-       id="path3005"
-       sodipodi:nodetypes="cccccszzzcccczszzz" />
-    <path
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 279.07269,352.191 C 278.26826,352.20379 274.75678,352.18583 273.88232,360.24001 L 271.55998,360.24001 L 271.55998,361.52298 L 273.80477,361.52298 C 273.59439,363.83778 271.57271,373.8057 270.26339,373.84944 C 268.91427,373.89451 270.40005,373.89719 270.41246,372.42975 C 270.42487,370.96232 268.44226,370.99766 268.40435,372.43239 C 268.36558,373.89968 268.55754,375.02114 271.00964,375.00303 C 273.4882,374.98474 275.31039,368.04158 276.33618,361.52298 L 278.57285,361.52298 L 278.57285,360.24001 L 276.57264,360.24001 C 277.20588,355.76561 278.24508,353.15997 279.426,353.15219 C 280.59185,353.14442 281.01961,355.08789 280.15799,354.81203 C 278.93853,354.4216 278.81582,357.00368 280.12303,357.04715 C 281.45256,357.09064 281.48719,354.89671 281.20254,353.76825 C 280.9135,352.62241 279.87713,352.1782 279.07269,352.191 z "
-       id="path3019"
-       sodipodi:nodetypes="cccccszzzcccczszzz" />
-    <text
-       xml:space="preserve"
-       style="font-size:16.14900208px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="343.08582"
-       y="342.56519"
-       id="text3036"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3038"
-         x="343.08582"
-         y="342.56519"
-         style="font-size:16.14901543px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">m</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.14931297px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="395.86255"
-       y="342.57013"
-       id="text3044"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3046"
-         x="395.86255"
-         y="342.57013"
-         style="font-size:16.14933777px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">mp</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.14957619px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="445.04129"
-       y="342.5744"
-       id="text3048"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3050"
-         x="445.04129"
-         y="342.5744"
-         style="font-size:16.14960098px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">ppp</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.14987183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="500.21811"
-       y="342.5791"
-       id="text3052"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3054"
-         x="500.21811"
-         y="342.5791"
-         style="font-size:16.14989853px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">pp</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:16.15017509px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       x="555.39612"
-       y="342.58392"
-       id="text3056"
-       sodipodi:linespacing="100%"
-       transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan3058"
-         x="555.39612"
-         y="342.58392"
-         style="font-size:16.1502018px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">p</tspan></text>
-    <path
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       d="M 134.6265,410.19998 L 118.81885,420.77364 L 118.81885,416.97306 L 129.21871,410.19998 L 118.81885,403.49058 L 118.81885,399.69 L 134.6265,410.19998 z "
-       id="text3060"
-       sodipodi:nodetypes="ccccccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:30.45602417px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       x="186.68878"
-       y="468.9649"
-       id="text3065"
-       transform="scale(1.1209993,0.8920612)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3067"
-         x="186.68878"
-         y="468.9649">()</tspan></text>
-    <path
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       d="M 165.0145,410.19998 L 180.82214,420.77364 L 180.82214,416.97306 L 170.4223,410.19998 L 180.82214,403.49058 L 180.82214,399.69 L 165.0145,410.19998 z "
-       id="path3069"
-       sodipodi:nodetypes="ccccccc" />
-    <g
-       id="g3104"
-       transform="matrix(0.5633612,0,0,0.5633612,94.016587,27.970368)">
-      <path
-         id="path3073"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 312.30593,647.99065 C 323.97335,648.37311 324.2505,657.58689 324.25694,668.9189 C 321.0884,657.02522 322.5119,654.47127 312.34078,654.4967 C 312.28266,644.71049 312.35487,657.77749 312.30593,647.99065 z " />
-      <path
-         id="path3077"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.8136487;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M 310.92742,694.2856 C 310.92742,698.0754 307.56802,701.14764 303.42398,701.14764 C 299.27995,701.14764 295.92055,698.0754 295.92055,694.2856 C 295.92055,690.49579 299.27995,687.42354 303.42398,687.42354 C 307.56802,687.42354 310.92742,690.49579 310.92742,694.2856 z " />
-      <path
-         id="path3075"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.83327127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 293.82309,681.8583 L 327.47426,657.4004" />
-      <path
-         id="path3079"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.65990877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 311.16655,693.08823 L 311.16655,648.00504" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:34.65638351px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       x="-414.60809"
-       y="337.56183"
-       id="text3110"
-       transform="matrix(0,-1.024355,0.976224,0,0,0)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3112"
-         x="-414.60809"
-         y="337.56183">)</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:15.52974701px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="331.20074"
-       y="380.70523"
-       id="text3114"
-       transform="scale(0.9278539,1.0777559)"><tspan
-         sodipodi:role="line"
-         id="tspan3116"
-         x="331.20074"
-         y="380.70523">HO</tspan></text>
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 367.82984,407.43075 L 375.7702,415.72262 L 367.82984,423.56851 L 359.48734,415.72262 L 367.82984,407.43075 z "
-       id="rect3126"
-       sodipodi:nodetypes="ccccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:14.66517448px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="401.82806"
-       y="361.38586"
-       id="text3133"
-       transform="scale(0.8879582,1.1261792)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3135"
-         x="401.82806"
-         y="361.38586"
-         style="font-size:14.66517448px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">NH</tspan></text>
-    <path
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       d="M 416.54259,399.29957 L 406.74589,420.03662 L 408.54392,420.03662 L 414.57313,408.35804 L 420.05098,420.03662 L 426.28028,420.03662 L 416.54259,399.29957 z "
-       id="path3141"
-       sodipodi:nodetypes="ccccccc" />
-    <text
-       xml:space="preserve"
-       style="font-size:21.2996788px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="570.43744"
-       y="328.33853"
-       id="text3143"
-       transform="scale(0.7835739,1.2762038)"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3145"
-         x="570.43744"
-         y="328.33853"
-         style="font-size:21.2996788px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P.M</tspan></text>
-    <rect
-       id="rect3147"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54208785;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.63367"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_left.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3149"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.29358"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_right.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3151"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.52423"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_up.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3153"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.52423"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_down.png"
-       inkscape:export-xdpi="35.083145"
-       inkscape:export-ydpi="35.083145" />
-    <rect
-       id="rect3155"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="342.13184"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_bend.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3157"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="342.13184"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3159"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="387.0224"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_vibrato.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3161"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="387.0224"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3163"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.26968"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slide.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3165"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.26968"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3167"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="294.5206"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3169"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="294.5206"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3171"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="148.96628"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_picking.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3173"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="148.96628"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3175"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.29816"
-       x="488.76514"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3177"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.29816"
-       x="536.90271"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <g
-       id="g4068"
-       transform="matrix(0.6801604,0,0,0.6801604,92.878547,36.861792)">
-      <path
-         sodipodi:nodetypes="cc"
-         id="path3179"
-         d="M 594.00003,497.36216 C 617.85953,497.555 627.69114,488.66969 628.00003,460.36216"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="matrix(0.749399,0,0,0.807087,168.8359,92.77775)"
-         d="M 622.22856,466.26925 L 611.6474,466.26925 L 601.06624,466.26925 L 606.35682,457.1057 L 611.6474,447.94215 L 616.93798,457.1057 L 622.22856,466.26925 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="1.5707963"
-         sodipodi:arg1="0.52359878"
-         sodipodi:r2="6.1090355"
-         sodipodi:r1="12.218071"
-         sodipodi:cy="460.16022"
-         sodipodi:cx="611.6474"
-         sodipodi:sides="3"
-         id="path4066"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="star" />
-    </g>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.44790959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 549.9004,372.99053 L 566.96245,356.41925"
-       id="path4072"
-       sodipodi:nodetypes="cc" />
-    <g
-       id="g5882"
-       transform="matrix(1.0269525,0,0,0.9790352,-142.70822,-105.10055)">
-      <path
-         sodipodi:nodetypes="cc"
-         id="path4074"
-         d="M 674.43107,471.32979 L 691.12154,488.11001"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.94400001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="469.35751"
-         x="672.41663"
-         height="6"
-         width="6"
-         id="rect4961"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="469.35751"
-         x="687.11115"
-         height="6"
-         width="6"
-         id="rect4963"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="483.72479"
-         x="687.11115"
-         height="6"
-         width="6"
-         id="rect4965"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         y="483.72479"
-         x="672.41663"
-         height="6"
-         width="6"
-         id="rect4967"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:23.50349617px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="485.84433"
-       y="333.74701"
-       id="text5893"
-       transform="scale(1.0327709,0.9682689)"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-       inkscape:export-xdpi="71.751251"
-       inkscape:export-ydpi="71.751251"><tspan
-         sodipodi:role="line"
-         id="tspan5895"
-         x="485.84433"
-         y="333.74701"
-         style="font-size:23.50349617px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:31.86540413px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="527.66418"
-       y="335.72772"
-       id="text5897"
-       transform="scale(1.0413973,0.9602483)"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-       inkscape:export-xdpi="61.67075"
-       inkscape:export-ydpi="61.67075"><tspan
-         sodipodi:role="line"
-         id="tspan5899"
-         x="527.66418"
-         y="335.72772"
-         style="font-size:31.86540413px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">s</tspan></text>
-    <g
-       id="g5911"
-       transform="matrix(0.9778313,0,0,1.3442636,-87.783773,-189.18239)">
-      <text
-         transform="scale(0.902157,1.108454)"
-         id="text5901"
-         y="312.95807"
-         x="662.24274"
-         style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-         xml:space="preserve"><tspan
-           y="312.95807"
-           x="662.24274"
-           id="tspan5903"
-           sodipodi:role="line">1</tspan></text>
-      <text
-         transform="scale(0.902157,1.108454)"
-         id="text5905"
-         y="312.87729"
-         x="682.92804"
-         style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-         xml:space="preserve"><tspan
-           y="312.87729"
-           x="682.92804"
-           id="tspan5907"
-           sodipodi:role="line">3</tspan></text>
-      <path
-         id="path5909"
-         d="M 605.35606,346.58166 L 615.29346,336.53376"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.20514083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <g
-       id="g5948"
-       transform="matrix(0.6801604,0,0,0.6801604,92.878547,36.861792)">
-      <g
-         transform="matrix(0.83334,0,0,1,120.4233,-6.810365)"
-         id="g5932">
-        <path
-           d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path5922" />
-        <path
-           d="M 683.05261,356.83776 L 683.05261,326.03045"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path5924" />
-      </g>
-      <path
-         transform="translate(0.645704,6.4635e-2)"
-         d="M 684.625 362.17465 A 2.0625 2.0625 0 1 1  680.5,362.17465 A 2.0625 2.0625 0 1 1  684.625 362.17465 z"
-         sodipodi:ry="2.0625"
-         sodipodi:rx="2.0625"
-         sodipodi:cy="362.17465"
-         sodipodi:cx="682.5625"
-         id="path5936"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.44400001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         sodipodi:type="arc" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:25.10733032px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="452.36047"
-       y="250.97691"
-       id="text5954"
-       transform="scale(1.1044258,0.9054479)"
-       sodipodi:linespacing="125%"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-       inkscape:export-xdpi="68.070755"
-       inkscape:export-ydpi="68.070755"><tspan
-         sodipodi:role="line"
-         id="tspan5956"
-         x="452.36047"
-         y="250.97691"
-         style="font-size:25.10733032px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">T</tspan></text>
-    <g
-       id="g6849"
-       transform="matrix(0.8038258,0,0,0.8952428,8.6184267,-25.377783)">
-      <path
-         sodipodi:nodetypes="ccc"
-         id="path5958"
-         d="M 667.00003,271.36215 L 683.00003,284.86215 L 698.00003,271.36215"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <text
-         sodipodi:linespacing="125%"
-         transform="scale(1.077771,0.927841)"
-         id="text6845"
-         y="293.27463"
-         x="627.5741"
-         style="font-size:17.07377625px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-         xml:space="preserve"><tspan
-           y="293.27463"
-           x="627.5741"
-           id="tspan6847"
-           sodipodi:role="line">X</tspan></text>
-    </g>
-    <g
-       id="g6860"
-       transform="matrix(0.6037383,0,0,0.7722113,145.67626,19.685128)">
-      <rect
-         transform="matrix(0.880153,-0.474689,0,1,0,0)"
-         y="507.96887"
-         x="671.18982"
-         height="5.25"
-         width="25.279688"
-         id="rect6854"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         transform="matrix(0.880153,-0.474689,0,1,0,0)"
-         y="515.96887"
-         x="671.18945"
-         height="5.25"
-         width="25.279675"
-         id="rect6856"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         transform="matrix(0.880153,-0.474689,0,1,0,0)"
-         y="523.96887"
-         x="671.18945"
-         height="5.25"
-         width="25.279675"
-         id="rect6858"
-         style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    </g>
-    <text
-       xml:space="preserve"
-       style="font-size:11.30146599px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="554.96161"
-       y="173.9628"
-       id="text6865"
-       sodipodi:linespacing="125%"
-       transform="matrix(0.9705969,0,3.6240001e-2,1.0302939,0,0)"><tspan
-         sodipodi:role="line"
-         id="tspan6867"
-         x="554.96161"
-         y="173.9628"
-         style="font-size:30.13725471px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Vivaldi">tr</tspan></text>
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 499.14904,409.23966 C 499.14904,409.23966 503.10919,403.91788 505.09545,406.7731 C 506.77868,409.19273 507.2044,410.42046 508.34068,410.09152 C 509.45783,409.76811 510.19933,405.92246 513.65472,405.9502 C 516.22932,405.97125 515.73893,410.62861 519.95582,411.5253 C 518.46198,412.69577 515.8624,412.79055 514.47433,412.04608 C 513.15991,411.34111 512.59281,408.68166 511.12865,409.3599 C 509.70073,410.02135 509.44825,412.4489 506.56495,412.39759 C 503.73012,412.34628 503.85063,410.76014 502.29959,409.20068 C 500.7248,407.61732 499.14904,409.23966 499.14904,409.23966 z "
-       id="path6878"
-       sodipodi:nodetypes="cszscszzzc" />
-    <g
-       id="g21770"
-       transform="matrix(0.6801604,0,0,0.6801604,92.878547,36.861792)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\edit_mode_selection.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51">
-      <text
-         sodipodi:linespacing="125%"
-         transform="matrix(0,-1.06756,0.936716,0,0,0)"
-         id="text21766"
-         y="508.78696"
-         x="-580.42908"
-         style="font-size:44.71162415px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-         xml:space="preserve"><tspan
-           y="508.78696"
-           x="-580.42908"
-           id="tspan21768"
-           sodipodi:role="line">)</tspan></text>
-      <g
-         transform="translate(2.828427,-2.65165)"
-         id="g21749">
-        <g
-           id="g16378"
-           transform="matrix(0.83334,0,0,1.26493,-81.035,178.0078)">
-          <path
-             id="path16380"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z " />
-          <path
-             id="path16382"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-             d="M 683.05261,356.83776 L 683.05261,326.03045" />
-        </g>
-        <g
-           id="g15477"
-           transform="matrix(0.289054,1.22178,-1.331968,1.944028e-2,1154.889,24.19248)"
-           style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-          <path
-             id="path12800"
-             d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-             style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:nodetypes="ccccccsccccsc" />
-          <path
-             transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-             style="fill:url(#linearGradient21760);fill-opacity:1;stroke-width:1.00046873"
-             d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-             id="rect14581"
-             sodipodi:nodetypes="ccccc" />
-        </g>
-        <path
-           sodipodi:type="arc"
-           style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path16432"
-           sodipodi:cx="449.8125"
-           sodipodi:cy="637.17468"
-           sodipodi:rx="4.3707523"
-           sodipodi:ry="4.0625"
-           d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-           transform="matrix(0.819316,0.899502,-0.550332,0.501274,431.3845,-87.32081)" />
-        <path
-           style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 484.50072,592.19035 L 477.27498,598.81948 L 478.13677,604.94037 L 479.88494,606.41213 L 478.88807,599.72546 L 484.41233,593.98021 L 484.50072,592.19035 z "
-           id="path16435"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 491.96404,614.17206 C 487.52149,616.98813 481.99224,615.61946 480.03711,615.85633 C 478.33,616.06315 476.50158,617.62409 476.50158,617.62409 L 476.3248,615.10502 L 478.79969,613.73501 C 478.79969,613.73501 480.86422,613.06577 485.56139,613.46984 C 489.14203,613.77787 492.60171,611.64036 493.64891,609.31558 L 495.85862,604.41003 C 495.35966,607.74069 493.83974,612.98308 491.96404,614.17206 z "
-           id="path17322"
-           sodipodi:nodetypes="cscccsscs" />
-      </g>
-      <text
-         inkscape:transform-center-x="11"
-         inkscape:transform-center-y="-10.103847"
-         transform="matrix(0.717341,-0.596996,0.540854,0.94392,0,0)"
-         sodipodi:linespacing="100%"
-         id="text21762"
-         y="709.63062"
-         x="105.70007"
-         style="font-size:14.4750843px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-         xml:space="preserve"><tspan
-           style="font-size:14.47510719px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook"
-           y="709.63062"
-           x="105.70007"
-           id="tspan21764"
-           sodipodi:role="line">pp</tspan></text>
-    </g>
-    <g
-       id="g3407"
-       transform="matrix(9.7000401e-2,8.1066758e-3,-1.1753914e-2,0.1240388,298.45948,558.24877)">
-      <g
-         id="g3296"
-         transform="matrix(3.608871,12.53273,-16.62977,0.199414,8930.251,-5616.342)"
-         style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path3298"
-           d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-           style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:nodetypes="ccccccsccccsc" />
-        <path
-           transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-           style="fill:url(#linearGradient3382);fill-opacity:1;stroke-width:1.00046873"
-           d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-           id="path3300"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path3302"
-         sodipodi:cx="449.8125"
-         sodipodi:cy="637.17468"
-         sodipodi:rx="4.3707523"
-         sodipodi:ry="4.0625"
-         d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-         transform="matrix(10.22925,9.226876,-6.870956,5.141948,-102.7821,-6760.219)" />
-      <path
-         style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:2.26335382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 560.37978,210.04348 L 470.16563,278.04351 L 480.92517,340.83013 L 502.75126,355.92709 L 490.30523,287.33683 L 559.27623,228.40344 L 560.37978,210.04348 z "
-         id="path3304"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.39503074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 653.56016,435.52659 C 598.09443,464.41316 529.06114,450.37367 504.65112,452.80343 C 483.33767,454.92494 460.50964,470.93669 460.50964,470.93669 L 458.30252,445.09667 L 489.2018,431.04344 C 489.2018,431.04344 514.97768,424.17853 573.62237,428.32339 C 618.32705,431.48308 661.52154,409.55702 674.59594,385.70998 L 702.18442,335.39003 C 695.95484,369.55514 676.97848,423.33032 653.56016,435.52659 z "
-         id="path3306"
-         sodipodi:nodetypes="cscccsscs" />
-    </g>
-    <g
-       id="g21483"
-       transform="matrix(0.6801604,0,0,0.6801604,97.639667,38.222112)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/option_skin.png"
-       inkscape:export-xdpi="54.250492"
-       inkscape:export-ydpi="54.250492">
-      <a
-         style="fill:url(#linearGradient21491);fill-opacity:1"
-         transform="matrix(1.0935538,0,0,0.9875559,-81.605798,-98.323313)"
-         id="a3635">
-        <path
-           style="fill:url(#linearGradient21493);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.40568686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 573.46809,989.25496 C 561.43446,918.49524 637.03499,915.96748 645.83589,919.79716 C 674.43146,931.00974 654.3464,985.51774 650.05535,987.75336 C 644.89956,990.4395 620.42002,988.48086 620.50756,989.43376 C 620.52581,989.44042 615.71426,1009.4048 598.77641,1009.9117 C 590.46857,1010.1603 574.46337,997.70295 573.46809,989.25496 z "
-           id="path3633"
-           sodipodi:nodetypes="ccscsc" />
-      </a>
-      <path
-         transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,425.79798,629.67088)"
-         d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-0.66417817"
-         sodipodi:arg1="-1.2924967"
-         sodipodi:r2="7.7217226"
-         sodipodi:r1="3.8608613"
-         sodipodi:cy="839.52301"
-         sodipodi:cx="566.39252"
-         sodipodi:sides="5"
-         id="path3644"
-         style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#d22d2d;stroke-width:35.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,443.91514,614.48309)"
-         d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-0.66417817"
-         sodipodi:arg1="-1.2924967"
-         sodipodi:r2="7.7217226"
-         sodipodi:r1="3.8608613"
-         sodipodi:cy="839.52301"
-         sodipodi:cx="566.39252"
-         sodipodi:sides="5"
-         id="path3646"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#00a100;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.272574,1.2309989e-2,-1.2858322e-2,0.2609503,464.35714,598.38051)"
-         d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="false"
-         sodipodi:arg2="-0.66417817"
-         sodipodi:arg1="-1.2924967"
-         sodipodi:r2="7.7217226"
-         sodipodi:r1="3.8608613"
-         sodipodi:cy="839.52301"
-         sodipodi:cx="566.39252"
-         sodipodi:sides="5"
-         id="path3648"
-         style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4bff;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="star" />
-      <path
-         transform="matrix(0.1668918,0.1065936,-0.1502726,0.1897914,624.05104,651.11923)"
-         d="M 559.81399 897.85938 A 44.686672 47.620178 0 1 1  470.44065,897.85938 A 44.686672 47.620178 0 1 1  559.81399 897.85938 z"
-         sodipodi:ry="47.620178"
-         sodipodi:rx="44.686672"
-         sodipodi:cy="897.85938"
-         sodipodi:cx="515.12732"
-         id="path4681"
-         style="fill:#ffffff;fill-opacity:0.96703342;fill-rule:nonzero;stroke:#090303;stroke-width:8.73597431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98360656"
-         sodipodi:type="arc" />
-    </g>
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 557.56346,455.06672 L 539.02909,455.06672"
-       id="path5612"
-       inkscape:connector-type="polyline" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 509.06904,455.06672 L 527.60341,455.06672"
-       id="path5617"
-       inkscape:connector-type="polyline" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 509.64684,499.7196 L 509.64684,518.25397"
-       id="path5619"
-       inkscape:connector-type="polyline" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 557.76819,500.87519 L 557.76819,482.34082"
-       id="path5621"
-       inkscape:connector-type="polyline" />
-    <g
-       id="g5456"
-       transform="matrix(0.6801604,0,0,0.6801604,92.397597,36.982022)">
-      <path
-         inkscape:connector-type="polyline"
-         id="path3479"
-         d="M 660.56485,524.48896 L 711.90839,524.46219"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.57923365px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-      <g
-         id="g5451">
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.78366613px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 658.18058,522.19705 L 658.18058,550.37123"
-           id="path3481"
-           inkscape:connector-type="polyline" />
-        <text
-           xml:space="preserve"
-           style="font-size:21.18201256px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           x="664.1015"
-           y="546.73944"
-           id="text3483"><tspan
-             sodipodi:role="line"
-             id="tspan3485"
-             x="664.1015"
-             y="546.73944">*</tspan></text>
-      </g>
-    </g>
-    <rect
-       id="rect3503"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="342.15051"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3505"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="387.04108"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3507"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="248.28836"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3509"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="294.53928"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3511"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="148.98497"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <rect
-       id="rect3513"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.31683"
-       x="584.80994"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-       inkscape:export-xdpi="35.083408"
-       inkscape:export-ydpi="35.083408" />
-    <g
-       id="g4645"
-       transform="matrix(2.1169218e-2,0,0,-2.1169218e-2,598.752,175.85533)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_treble.png"
-       inkscape:export-xdpi="112.41393"
-       inkscape:export-ydpi="112.41393">
-      <path
-         id="path4647"
-         d="M 297,1245 C 303,1248 304,1248 310,1248 C 318,1247 323,1244 334,1232 C 406,1158 466,1026 481,914 C 483,896 483,854 481,835 C 470,732 427,638 328,503 L 314,484 L 322,461 C 341,406 363,339 377,290 C 381,278 384,268 384,267 C 384,267 391,267 398,266 C 433,263 463,255 494,240 C 519,227 541,212 562,192 C 585,169 600,148 614,119 C 635,77 644,33 643,-11 C 642,-39 638,-60 629,-86 C 617,-124 595,-159 565,-189 C 539,-215 515,-231 483,-244 L 471,-249 L 471,-285 C 471,-336 468,-396 464,-432 C 460,-469 450,-504 434,-536 C 392,-621 318,-666 235,-658 C 141,-649 65,-585 46,-499 C 37,-460 41,-430 57,-405 C 78,-372 118,-353 157,-354 C 203,-356 240,-392 247,-442 C 252,-482 235,-519 203,-539 C 185,-550 160,-555 141,-552 C 138,-552 135,-551 135,-552 L 147,-564 C 169,-586 194,-600 226,-607 C 233,-608 239,-608 255,-608 C 273,-608 275,-608 285,-606 C 299,-602 311,-597 322,-591 C 372,-561 406,-499 415,-424 C 418,-396 421,-336 421,-292 C 421,-263 421,-261 419,-261 C 415,-263 394,-265 379,-266 C 360,-267 328,-267 313,-265 C 254,-258 200,-238 153,-205 C 83,-156 33,-83 12,1 C -15,106 4,218 70,336 C 98,385 125,425 192,514 L 230,565 L 223,584 C 175,711 159,784 154,890 C 152,936 154,975 160,1007 C 175,1091 214,1166 275,1226 C 287,1238 292,1242 297,1245 z M 376,1074 C 366,1091 368,1090 359,1084 C 331,1067 302,1041 281,1015 C 238,960 214,896 211,827 C 210,799 213,781 226,738 C 236,703 264,618 266,616 C 266,615 272,622 278,631 C 347,730 384,811 398,892 C 401,913 403,930 404,954 C 405,1009 399,1036 376,1074 z M 290,401 C 284,420 278,435 278,435 C 277,435 235,379 217,354 C 158,271 122,204 101,138 C 87,97 81,59 79,17 C 79,-6 80,-20 84,-37 C 107,-126 202,-199 314,-215 C 331,-217 379,-217 400,-215 C 421,-212 419,-213 418,-204 C 412,-109 404,-51 388,35 C 382,71 365,147 364,148 C 363,149 344,147 333,144 C 319,141 310,138 298,132 C 233,99 214,24 255,-37 C 262,-47 280,-65 291,-72 C 295,-75 304,-81 310,-84 C 319,-89 321,-91 323,-95 C 331,-108 326,-124 311,-131 C 303,-135 297,-134 281,-126 C 242,-107 213,-81 192,-49 C 153,11 148,88 180,153 C 208,209 258,247 322,261 C 328,263 333,264 333,264 C 334,265 306,356 290,401 z M 426,143 C 423,143 420,144 419,144 L 416,145 L 421,124 C 444,23 461,-87 467,-180 C 468,-190 468,-198 468,-198 C 469,-198 482,-192 489,-187 C 506,-177 522,-162 535,-145 C 566,-104 577,-53 565,-1 C 556,41 532,80 498,107 C 477,123 449,137 426,143 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g4687"
-       transform="matrix(2.5582031e-2,0,0,-2.5582031e-2,597.33302,216.29795)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_bass.png"
-       inkscape:export-xdpi="88.486824"
-       inkscape:export-ydpi="88.486824">
-      <path
-         id="path4689"
-         d="M 207,266 C 218,267 261,266 277,265 C 402,251 487,189 515,91 C 522,64 525,44 524,10 C 524,-33 519,-69 505,-107 C 454,-258 305,-383 33,-503 C 22,-508 12,-513 11,-514 C 5,-518 -1,-519 -7,-516 C -12,-514 -14,-512 -16,-507 C -19,-502 -18,-497 -16,-493 C -14,-489 -10,-486 12,-473 C 101,-420 166,-373 221,-325 C 238,-309 270,-277 284,-261 C 345,-190 377,-121 388,-41 C 390,-22 390,23 388,42 C 384,71 377,98 368,122 C 361,138 359,143 351,156 C 322,205 278,232 229,232 C 181,232 141,205 115,154 C 111,146 101,120 101,119 C 101,118 105,119 109,119 C 132,120 157,111 176,96 C 212,65 222,15 200,-30 C 185,-63 153,-84 118,-87 C 69,-90 21,-58 5,-12 C 0,3 -1,18 1,42 C 10,142 74,227 162,256 C 177,261 192,264 207,266 z M 596,172 C 612,177 631,172 644,160 C 653,150 658,137 658,124 C 658,97 636,75 609,75 C 581,75 559,97 559,124 C 559,147 574,166 596,172 z M 596,-77 C 612,-72 631,-77 644,-89 C 656,-102 661,-120 656,-136 C 651,-159 632,-174 609,-174 C 581,-174 559,-152 559,-125 C 559,-102 574,-83 596,-77 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g4729"
-       transform="matrix(2.3963563e-2,0,0,-2.3963563e-2,597.45916,268.7724)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_alto.png"
-       inkscape:export-xdpi="92.514755"
-       inkscape:export-ydpi="92.514755">
-      <path
-         id="path4731"
-         d="M 9,498 C 12,500 18,500 72,500 L 132,500 L 135,497 C 137,495 139,493 140,491 C 142,487 142,450 142,0 C 142,-450 142,-487 140,-491 C 139,-493 137,-495 135,-497 L 132,-499 L 71,-499 L 10,-499 L 7,-497 C 5,-495 3,-493 2,-491 C 0,-487 0,-450 0,1 L 1,490 L 3,493 C 5,495 7,497 9,498 z M 201,498 C 204,500 207,500 218,500 C 231,500 232,499 235,497 C 243,491 242,514 242,254 L 242,21 L 248,26 C 273,50 296,87 309,120 C 317,144 322,171 324,200 C 324,213 325,215 327,218 C 329,221 336,225 341,225 C 346,225 352,222 355,219 C 357,215 358,214 359,195 C 362,154 376,120 399,96 C 422,74 449,65 482,69 C 505,72 522,79 535,92 C 549,106 557,122 563,147 C 569,169 571,191 572,236 C 574,391 545,454 464,465 C 432,469 411,463 402,448 C 400,444 400,443 400,435 C 400,426 400,425 403,419 C 406,413 408,410 420,398 C 432,387 434,383 437,378 C 444,363 441,341 430,321 C 426,314 412,300 405,296 C 380,281 351,281 326,296 C 319,300 305,314 301,321 C 291,338 288,356 291,379 C 296,408 309,433 330,455 C 352,476 379,490 411,497 C 430,501 467,501 499,496 C 617,479 680,407 689,281 C 692,242 689,214 680,185 C 652,103 577,44 487,35 C 458,32 450,34 423,52 C 407,63 399,67 391,69 C 379,72 367,69 358,61 C 347,52 342,33 342,0 C 342,-33 347,-52 358,-61 C 367,-69 379,-72 391,-69 C 399,-67 407,-63 423,-52 C 450,-34 458,-32 487,-35 C 577,-44 652,-103 680,-185 C 689,-214 692,-242 689,-280 C 679,-418 607,-489 469,-499 C 436,-501 413,-499 390,-491 C 345,-476 308,-440 295,-397 C 287,-367 289,-343 301,-321 C 305,-314 319,-300 326,-296 C 351,-281 380,-281 405,-296 C 412,-300 426,-314 430,-321 C 441,-341 444,-363 437,-378 C 434,-383 432,-387 420,-398 C 408,-410 406,-413 403,-419 C 400,-425 400,-426 400,-434 C 400,-443 400,-444 402,-448 C 411,-463 432,-469 464,-465 C 513,-458 543,-432 558,-380 C 568,-346 573,-300 572,-236 C 571,-191 569,-169 563,-146 C 551,-98 526,-74 482,-69 C 449,-65 422,-74 399,-96 C 376,-120 362,-154 359,-195 C 358,-214 357,-215 355,-219 C 352,-222 346,-225 341,-225 C 336,-225 329,-221 327,-218 C 325,-215 324,-213 324,-200 C 322,-160 314,-130 298,-95 C 286,-71 266,-44 248,-26 L 242,-21 L 242,-254 C 242,-514 243,-491 235,-497 C 232,-499 231,-499 217,-499 C 203,-499 202,-499 199,-497 C 197,-495 195,-493 194,-491 C 192,-487 192,-450 192,1 L 193,490 L 195,493 C 197,495 199,497 201,498 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g3548"
-       transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,602.52128,370.85889)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_flat.png"
-       inkscape:export-xdpi="40.069347"
-       inkscape:export-ydpi="40.069347">
-      <path
-         id="path3550"
-         d="M -12,469 C -1,471 17,469 24,464 C 26,463 26,452 23,289 C 21,194 20,116 20,116 C 20,115 24,117 28,120 C 49,134 75,142 101,144 C 128,145 150,137 169,118 C 188,100 198,76 200,50 C 201,31 197,14 188,-4 C 174,-31 154,-50 94,-91 C 56,-117 46,-125 34,-139 C 28,-145 21,-152 19,-153 C 10,-159 0,-158 -8,-151 C -10,-148 -12,-145 -13,-142 C -14,-140 -16,-33 -19,136 C -22,287 -24,422 -25,437 L -25,463 L -21,465 C -19,466 -15,468 -12,469 z M 94,102 C 87,106 76,107 67,104 C 49,99 34,83 28,62 C 26,52 24,-34 26,-67 C 27,-81 27,-94 28,-97 L 29,-101 L 44,-88 C 65,-70 86,-49 96,-35 C 106,-21 116,-2 120,12 C 126,35 123,61 114,81 C 109,91 103,98 94,102 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g3590"
-       transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,601.62143,408.04533)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_natural.png"
-       inkscape:export-xdpi="40.012753"
-       inkscape:export-ydpi="40.012753">
-      <path
-         id="path3592"
-         d="M 7,380 C 15,382 33,380 40,375 C 41,374 41,359 40,288 C 39,240 39,201 39,201 C 39,200 64,204 95,209 C 127,215 152,218 153,218 C 158,217 162,213 165,208 L 167,204 L 170,-85 C 173,-317 174,-374 173,-374 C 172,-375 169,-376 166,-377 C 158,-380 142,-380 134,-377 C 131,-376 128,-375 127,-374 C 126,-373 126,-358 127,-287 C 128,-239 128,-200 128,-200 C 128,-199 103,-203 72,-208 C 40,-214 15,-217 14,-217 C 9,-216 5,-212 2,-207 L 0,-202 L -3,49 C -5,187 -6,317 -7,338 L -7,375 L -2,377 C 1,378 5,379 7,380 z M 132,100 C 132,111 132,114 131,114 C 127,114 38,99 38,98 C 37,98 35,-112 35,-113 C 36,-113 128,-98 129,-97 C 129,-97 132,54 132,100 z "
-         style="fill:currentColor" />
-    </g>
-    <g
-       id="g3632"
-       transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,598.54322,315.09834)"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_sharp.png"
-       inkscape:export-xdpi="32.806053"
-       inkscape:export-ydpi="32.806053">
-      <path
-         id="path3634"
-         d="M 191,373 C 198,377 209,374 213,365 C 215,361 215,358 215,288 C 215,247 215,214 216,214 C 216,214 225,218 236,222 C 259,231 262,232 268,227 C 275,222 275,221 275,181 C 275,147 275,144 273,141 C 272,139 270,137 269,136 C 267,135 255,129 241,124 L 216,113 L 215,32 C 215,-12 215,-49 216,-49 C 216,-49 225,-45 236,-41 C 259,-32 262,-31 268,-36 C 275,-41 275,-42 275,-82 C 275,-116 275,-119 273,-122 C 272,-124 270,-126 269,-127 C 267,-128 255,-134 241,-139 L 216,-150 L 215,-234 C 215,-310 214,-319 213,-322 C 206,-334 189,-334 182,-322 C 181,-319 180,-311 180,-241 L 180,-164 L 137,-181 L 95,-198 L 95,-279 C 95,-365 95,-363 90,-368 C 88,-371 81,-374 78,-374 C 74,-374 67,-371 65,-368 C 60,-363 60,-365 60,-287 C 60,-246 60,-213 59,-213 C 59,-213 50,-217 39,-221 C 16,-230 13,-231 7,-226 C 0,-221 0,-220 0,-180 C 0,-146 0,-143 2,-140 C 3,-138 5,-136 6,-135 C 8,-134 20,-128 34,-123 L 60,-112 L 60,-31 C 60,13 60,50 59,50 C 59,50 50,46 39,42 C 16,33 13,32 7,37 C 0,42 0,43 0,83 C 0,117 0,120 2,123 C 3,125 5,127 6,128 C 8,129 20,135 34,140 L 60,151 L 60,235 C 60,311 61,320 62,323 C 69,335 86,335 93,323 C 94,320 95,312 95,242 L 96,165 L 138,182 L 180,199 L 180,280 C 180,356 180,361 182,365 C 184,369 186,371 191,373 z M 180,18 L 180,99 L 137,82 L 95,65 L 95,-17 L 95,-98 L 98,-97 C 100,-96 119,-88 141,-80 L 180,-64 L 180,18 z "
-         style="fill:currentColor" />
-    </g>
-    <rect
-       id="rect46109"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="147.69514"
-       x="105.04722"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\fretboard.png"
-       inkscape:export-xdpi="51.581112"
-       inkscape:export-ydpi="51.581112" />
-    <g
-       id="g46111"
-       transform="translate(-239.97292,-93.208822)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\fretboard.png"
-       inkscape:export-xdpi="51.581112"
-       inkscape:export-ydpi="51.581112">
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#312e2e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 356.78571,244.32647 C 353.66319,246.47578 354.37107,249.39116 354.46428,252.18361 C 355.58661,255.37224 356.79093,258.66335 356.60714,260.21933 C 355.07725,264.44552 351.99862,268.67171 353.21428,272.8979 C 354.19924,277.32599 360.76555,278.9478 362.5,279.1479 C 366.65572,279.50067 368.87789,279.08001 371.42857,278.79076 C 375.1921,277.79337 376.7561,276.58639 377.57397,274.45274 C 377.83672,273.33968 378.09947,272.07293 377.85714,270.75504 C 375.54249,264.60725 374.45744,262.11719 374.53825,260.62877 C 374.60213,258.71015 377.07825,254.83744 376.65944,252.66703 C 376.62491,250.73727 376.19658,249.45385 374.15944,249.52671 C 372.7534,249.56886 373.7945,254.1656 370.71428,254.22187 C 367.89452,254.31348 366.7118,251.67669 365.89285,248.43361 L 363.71936,248.84306 C 363.10352,250.62227 362.21487,250.98212 360.89285,250.75504 C 358.55113,251.77339 358.11307,243.63749 356.78571,244.32647 z "
-         id="path46113"
-         sodipodi:nodetypes="cccccccccccccccc" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#d6d6d6;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 359.38895,267.92936 C 362.0294,270.76601 365.91542,269.08474 368.85913,269.19205 C 374.03586,269.61356 373.85893,272.66115 376.56155,272.34877 C 377.31917,272.09624 377.40333,271.33862 376.81408,270.07593 C 376.44181,268.23522 373.40705,263.38032 373.40482,260.60575 C 373.43341,258.94466 375.75999,256.44195 375.80393,253.28214 C 375.69313,252.48244 375.49215,251.17766 375.04632,250.88303 C 374.34436,251.14843 374.64966,254.43708 371.76332,255.55499 C 369.69466,256.98962 361.83777,251.59722 361.15672,252.52453 C 360.80311,253.38875 362.74642,257.29146 361.03045,260.85829 C 359.37516,264.13875 359.02812,266.329 359.38895,267.92936 z "
-         id="path46115"
-         sodipodi:nodetypes="ccccccccccc" />
-      <rect
-         style="fill:url(#linearGradient46199);fill-opacity:1;stroke:#d38d5f;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect46117"
-         width="4.7982244"
-         height="13.637059"
-         x="363.30331"
-         y="242.29672"
-         rx="0.2"
-         ry="0.2" />
-      <g
-         id="g46119"
-         transform="translate(0.911069,-92.225798)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46121"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46123">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46125"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46127"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46129"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46131"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46133"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46135"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         transform="translate(0.911069,-87.427573)"
-         id="g46137">
-        <rect
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46139"
-           width="6.4397225"
-           height="1.6414979"
-           x="361.76089"
-           y="348.91721"
-           rx="0.69999999"
-           ry="0.69999999" />
-        <g
-           id="g46141"
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46143"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46145"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46147"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46149"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46151"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46153"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <g
-         id="g46155"
-         transform="matrix(0.9818469,0.189675,-0.189675,0.9818469,73.746857,-146.26586)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46157"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46159">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46161"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46163"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46165"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46167"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46169"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46171"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         id="g46173"
-         transform="translate(-9.9084e-2,-86.669959)">
-        <rect
-           style="fill:#333333;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46175"
-           width="6.4397225"
-           height="1.1364216"
-           x="362.77106"
-           y="354.97812"
-           rx="0.2"
-           ry="0.13846155" />
-        <g
-           style="fill:#666666"
-           id="g46177"
-           transform="matrix(0.1606529,0,0,0.1606529,307.82015,299.98093)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46179"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46181"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46183"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46185"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46187"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46189"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46191"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(8.234675,-87.427573)" />
-      <path
-         transform="translate(10.633787,-85.280999)"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         sodipodi:ry="0.69447988"
-         sodipodi:rx="0.75761443"
-         sodipodi:cy="356.17767"
-         sodipodi:cx="364.9176"
-         id="path46193"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46195"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(5.583024,-89.069071)" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 372.01586,263.88874 L 373.65736,266.03532"
-         id="path46197" />
-    </g>
-    <rect
-       id="rect46201"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="-192.80984"
-       x="147.69516"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       transform="matrix(0,1,-1,0,0,0)" />
-    <g
-       id="g46203"
-       transform="matrix(0,1,-1,0,432.78378,-197.77037)">
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#312e2e;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 356.78571,244.32647 C 353.66319,246.47578 354.37107,249.39116 354.46428,252.18361 C 355.58661,255.37224 356.79093,258.66335 356.60714,260.21933 C 355.07725,264.44552 351.99862,268.67171 353.21428,272.8979 C 354.19924,277.32599 360.76555,278.9478 362.5,279.1479 C 366.65572,279.50067 368.87789,279.08001 371.42857,278.79076 C 375.1921,277.79337 376.7561,276.58639 377.57397,274.45274 C 377.83672,273.33968 378.09947,272.07293 377.85714,270.75504 C 375.54249,264.60725 374.45744,262.11719 374.53825,260.62877 C 374.60213,258.71015 377.07825,254.83744 376.65944,252.66703 C 376.62491,250.73727 376.19658,249.45385 374.15944,249.52671 C 372.7534,249.56886 373.7945,254.1656 370.71428,254.22187 C 367.89452,254.31348 366.7118,251.67669 365.89285,248.43361 L 363.71936,248.84306 C 363.10352,250.62227 362.21487,250.98212 360.89285,250.75504 C 358.55113,251.77339 358.11307,243.63749 356.78571,244.32647 z "
-         id="path46205"
-         sodipodi:nodetypes="cccccccccccccccc" />
-      <path
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#d6d6d6;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 359.38895,267.92936 C 362.0294,270.76601 365.91542,269.08474 368.85913,269.19205 C 374.03586,269.61356 373.85893,272.66115 376.56155,272.34877 C 377.31917,272.09624 377.40333,271.33862 376.81408,270.07593 C 376.44181,268.23522 373.40705,263.38032 373.40482,260.60575 C 373.43341,258.94466 375.75999,256.44195 375.80393,253.28214 C 375.69313,252.48244 375.49215,251.17766 375.04632,250.88303 C 374.34436,251.14843 374.64966,254.43708 371.76332,255.55499 C 369.69466,256.98962 361.83777,251.59722 361.15672,252.52453 C 360.80311,253.38875 362.74642,257.29146 361.03045,260.85829 C 359.37516,264.13875 359.02812,266.329 359.38895,267.92936 z "
-         id="path46207"
-         sodipodi:nodetypes="ccccccccccc" />
-      <rect
-         style="fill:url(#linearGradient46291);fill-opacity:1;stroke:#d38d5f;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect46209"
-         width="4.7982244"
-         height="13.637059"
-         x="363.30331"
-         y="242.29672"
-         rx="0.2"
-         ry="0.2" />
-      <g
-         id="g46211"
-         transform="translate(0.911069,-92.225798)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46213"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46215">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46217"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46219"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46221"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46223"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46225"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46227"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         transform="translate(0.911069,-87.427573)"
-         id="g46229">
-        <rect
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46231"
-           width="6.4397225"
-           height="1.6414979"
-           x="361.76089"
-           y="348.91721"
-           rx="0.69999999"
-           ry="0.69999999" />
-        <g
-           id="g46233"
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46235"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46237"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46239"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46241"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46243"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46245"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <g
-         id="g46247"
-         transform="matrix(0.9818469,0.189675,-0.189675,0.9818469,73.746857,-146.26586)">
-        <rect
-           ry="0.69999999"
-           rx="0.69999999"
-           y="348.91721"
-           x="361.76089"
-           height="1.6414979"
-           width="6.4397225"
-           id="rect46249"
-           style="fill:#e3dbdb;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none" />
-        <g
-           transform="matrix(0.1606529,0,0,0.1606529,306.81,294.42509)"
-           id="g46251">
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46253"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-9.8489873,-11.237947)" />
-          <path
-             transform="translate(-4.4194174,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46255"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46257"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(1.1364216,-11.237947)" />
-          <path
-             transform="translate(6.8185297,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46259"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46261"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(12.2481,-11.237947)" />
-          <path
-             transform="translate(17.803939,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46263"
-             style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         id="g46265"
-         transform="translate(-9.9084e-2,-86.669959)">
-        <rect
-           style="fill:#333333;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect46267"
-           width="6.4397225"
-           height="1.1364216"
-           x="362.77106"
-           y="354.97812"
-           rx="0.2"
-           ry="0.13846155" />
-        <g
-           style="fill:#666666"
-           id="g46269"
-           transform="matrix(0.1606529,0,0,0.1606529,307.82015,299.98093)">
-          <path
-             transform="translate(-9.8489873,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46271"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46273"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(-4.4194174,-11.237947)" />
-          <path
-             transform="translate(1.1364216,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46275"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46277"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(6.8185297,-11.237947)" />
-          <path
-             transform="translate(12.2481,-11.237947)"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             sodipodi:ry="1.9571706"
-             sodipodi:rx="2.1465743"
-             sodipodi:cy="355.54633"
-             sodipodi:cx="357.97281"
-             id="path46279"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             sodipodi:type="arc"
-             style="fill:#666666;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path46281"
-             sodipodi:cx="357.97281"
-             sodipodi:cy="355.54633"
-             sodipodi:rx="2.1465743"
-             sodipodi:ry="1.9571706"
-             d="M 360.11938 355.54633 A 2.1465743 1.9571706 0 1 1  355.82623,355.54633 A 2.1465743 1.9571706 0 1 1  360.11938 355.54633 z"
-             transform="translate(17.803939,-11.237947)" />
-        </g>
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46283"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(8.234675,-87.427573)" />
-      <path
-         transform="translate(10.633787,-85.280999)"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         sodipodi:ry="0.69447988"
-         sodipodi:rx="0.75761443"
-         sodipodi:cy="356.17767"
-         sodipodi:cx="364.9176"
-         id="path46285"
-         style="fill:#808080;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#4d4d4d;fill-opacity:1;stroke:#999999;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path46287"
-         sodipodi:cx="364.9176"
-         sodipodi:cy="356.17767"
-         sodipodi:rx="0.75761443"
-         sodipodi:ry="0.69447988"
-         d="M 365.67522 356.17767 A 0.75761443 0.69447988 0 1 1  364.15999,356.17767 A 0.75761443 0.69447988 0 1 1  365.67522 356.17767 z"
-         transform="translate(5.583024,-89.069071)" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 372.01586,263.88874 L 373.65736,266.03532"
-         id="path46289" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="199.33298"
-       y="147.69514"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect46298" />
-    <g
-       id="g46300"
-       transform="translate(-112.68645,-233.57666)">
-      <path
-         sodipodi:nodetypes="cccccc"
-         id="path46302"
-         d="M 319.5425,392.25851 L 326.77266,385.82994 L 347.57424,385.82994 L 347.57424,417.14467 L 319.5425,417.14467 L 319.5425,392.25851 z "
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path46304"
-         d="M 319.77466,392.18383 L 327.03272,392.53521 L 326.45668,386.17002 L 319.77466,392.18383 z "
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.46774149;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path46306"
-         d="M 340.16186,394.29247 L 340.16186,399.14094 L 335.34158,399.14094 L 335.34158,403.82028 L 340.16186,403.82028 L 340.16186,408.64056 L 344.8412,408.64056 L 344.8412,403.79209 L 349.66148,403.79209 L 349.66148,399.11275 L 344.8412,399.11275 L 344.8412,394.29247 L 340.16186,394.29247 z "
-         style="opacity:1;fill:url(#linearGradient46308);fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="247.90439"
-       y="147.69516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect46310" />
-    <g
-       id="g46312"
-       transform="translate(-64.273873,-282.45416)">
-      <path
-         id="path46314"
-         d="M 317.14286,466.38665 L 313.92857,441.8717 L 316.60714,437.29558 L 326.96429,436.80528 L 331.07143,440.72767 L 343.57143,440.07394 L 348.39286,464.91575 L 317.14286,466.38665 z "
-         style="opacity:0.8;fill:url(#linearGradient46322);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.47833687;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path46316"
-         d="M 318.39286,466.22321 L 317.5,442.19857 L 343.21429,441.05454 L 346.42857,464.91575 L 318.39286,466.22321 z "
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path46318"
-         d="M 319.10714,466.38665 L 320.53571,443.99633 L 347.32143,442.68887 L 345.89286,464.91575 L 319.10714,466.38665 z "
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path46320"
-         d="M 321.71428,446.93812 L 351.14285,445.46723 C 351.69685,445.46723 352.14285,445.87542 352.14285,446.38245 L 348.57142,464.32739 C 348.57142,464.83442 348.12542,465.24261 347.57142,465.24261 L 318.14285,466.71351 C 317.58885,466.71351 317.14285,466.30532 317.14285,465.79828 L 320.71428,447.85335 C 320.71428,447.34631 321.16028,446.93812 321.71428,446.93812 z "
-         style="opacity:0.78719991;fill:url(#linearGradient46324);fill-opacity:1;stroke:#000000;stroke-width:0.47833687;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="295.04727"
-       y="147.69516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect46326" />
-    <g
-       id="g46328"
-       transform="translate(-17.500033,-425.42856)">
-      <path
-         d="M 329.89237,582.19858 L 346.57124,582.19858 L 341.38263,594.53987 L 324.70377,594.53987 L 329.89237,582.19858 z "
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path46330" />
-      <path
-         d="M 325.36076,590.2392 C 320.8422,590.51315 316.91065,594.47845 316.23949,597.10206 C 315.58524,599.65962 316.99792,605.95711 317.27166,607.24633 C 317.32233,607.48495 335.3486,609.7667 337.50068,609.7667 C 337.32165,608.47808 337.11719,602.34738 337.12299,600.45896 C 337.14863,592.19968 342.92469,590.59289 342.92469,590.59289 L 325.36076,590.2392 z "
-         style="fill:url(#linearGradient46350);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path46332" />
-      <path
-         d="M 350.31616,596.3078 C 350.31616,601.59804 350.16747,603.31024 349.87749,606.18941 C 349.70035,606.42297 338.12735,609.61157 337.95243,609.71086 C 337.62091,607.25452 337.32158,604.09884 337.16024,601.47186 C 336.90347,597.29055 338.38209,591.07056 343.89828,590.59603 C 347.56257,590.27771 350.31616,591.01756 350.31616,596.3078 z "
-         style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path46334" />
-      <path
-         d="M 335.53485,576.99555 L 347.60259,577.30259 C 347.60259,577.30259 343.00827,581.4236 340.40363,590.46128 C 336.76593,590.45942 331.00119,590.04235 328.33589,590.15425 C 331.05325,580.93901 335.53485,576.99555 335.53485,576.99555 z "
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path46336" />
-      <path
-         d="M 323.04971,594.62001 C 323.04971,594.62001 332.88394,595.31498 333.04129,595.31498 C 333.19864,595.31498 334.85079,592.83294 334.85079,592.83294 L 325.25258,592.43581 L 323.04971,594.62001 z "
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path46338" />
-      <rect
-         width="13.617006"
-         height="2.6806109"
-         x="321.83487"
-         y="566.54987"
-         transform="matrix(0.993753,0.111602,0,1,0,0)"
-         style="fill:url(#linearGradient46352);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50156909;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect46340" />
-      <path
-         d="M 335.59969,580.34416 L 343.01028,580.42532"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path46342" />
-      <path
-         d="M 333.25408,583.54052 L 340.66467,583.62168"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path46344" />
-      <path
-         d="M 331.74,586.86786 L 339.1506,587.03017"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path46346" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path46348"
-         d="M 315.71428,591.6479 L 315.71428,611.29075 L 333.92857,600.57647 L 315.71428,591.6479 z "
-         style="fill:url(#linearGradient46354);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <rect
-       id="rect46356"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="147.69516"
-       x="343.61868"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045" />
-    <g
-       id="g46358"
-       transform="translate(31.071397,-425.42859)">
-      <path
-         id="path46360"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 329.89237,582.19858 L 346.57124,582.19858 L 341.38263,594.53987 L 324.70377,594.53987 L 329.89237,582.19858 z " />
-      <path
-         id="path46362"
-         style="fill:url(#linearGradient46382);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 325.36076,590.2392 C 320.8422,590.51315 316.91065,594.47845 316.23949,597.10206 C 315.58524,599.65962 316.99792,605.95711 317.27166,607.24633 C 317.32233,607.48495 335.3486,609.7667 337.50068,609.7667 C 337.32165,608.47808 337.11719,602.34738 337.12299,600.45896 C 337.14863,592.19968 342.92469,590.59289 342.92469,590.59289 L 325.36076,590.2392 z " />
-      <path
-         id="path46364"
-         style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 350.31616,596.3078 C 350.31616,601.59804 350.16747,603.31024 349.87749,606.18941 C 349.70035,606.42297 338.12735,609.61157 337.95243,609.71086 C 337.62091,607.25452 337.32158,604.09884 337.16024,601.47186 C 336.90347,597.29055 338.38209,591.07056 343.89828,590.59603 C 347.56257,590.27771 350.31616,591.01756 350.31616,596.3078 z " />
-      <path
-         id="path46366"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 335.53485,576.99555 L 347.60259,577.30259 C 347.60259,577.30259 343.00827,581.4236 340.40363,590.46128 C 336.76593,590.45942 331.00119,590.04235 328.33589,590.15425 C 331.05325,580.93901 335.53485,576.99555 335.53485,576.99555 z " />
-      <path
-         id="path46368"
-         style="fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 323.04971,594.62001 C 323.04971,594.62001 332.88394,595.31498 333.04129,595.31498 C 333.19864,595.31498 334.85079,592.83294 334.85079,592.83294 L 325.25258,592.43581 L 323.04971,594.62001 z " />
-      <rect
-         id="rect46370"
-         style="fill:url(#linearGradient46384);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50156909;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.993753,0.111602,0,1,0,0)"
-         y="566.54987"
-         x="321.83487"
-         height="2.6806109"
-         width="13.617006" />
-      <path
-         id="path46372"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 335.59969,580.34416 L 343.01028,580.42532" />
-      <path
-         id="path46374"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 333.25408,583.54052 L 340.66467,583.62168" />
-      <path
-         id="path46376"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.45059812px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 331.74,586.86786 L 339.1506,587.03017" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.82480014;fill:#e6e6e6;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path46378"
-       sodipodi:cx="326.40555"
-       sodipodi:cy="634.53784"
-       sodipodi:rx="9.4701805"
-       sodipodi:ry="7.7024131"
-       d="M 335.87573 634.53784 A 9.4701805 7.7024131 0 1 1  316.93537,634.53784 A 9.4701805 7.7024131 0 1 1  335.87573 634.53784 z"
-       transform="translate(31.071397,-471.8956)" />
-    <path
-       style="fill:url(#linearGradient46386);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 362.1489,169.58703 C 362.4574,174.46944 371.82691,179.35184 377.55372,184.23425 C 373.26295,178.67127 370.28614,169.16642 364.67428,167.56673 L 362.1489,169.58703 z "
-       id="path46380"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56373"
-       width="24.642857"
-       height="24.642857"
-       x="187.7767"
-       y="84.759689"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56375"
-       transform="translate(28.490947,-673.6739)"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_1.png">
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path56377"
-         d="M 163.21429,762.8979 L 163.21429,778.96933 C 169.18918,776.60095 175.46615,774.07658 180,770.75504 C 174.66202,767.10698 169.02779,764.64388 163.21429,762.8979 z "
-         style="fill:url(#linearGradient56421);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56423);stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56379"
-         d="M 171.79136,769.68303 C 168.72709,769.68303 165.85828,770.1268 163.49554,770.88459 L 163.49554,777.98214 C 169.16989,775.88352 175.12269,773.64741 179.45825,770.71693 C 177.21614,770.06809 174.60773,769.68302 171.79136,769.68303 z "
-         style="fill:url(#linearGradient56425);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56427);stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       y="84.759689"
-       x="160.50253"
-       height="24.642857"
-       width="24.642857"
-       id="rect56381"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56383"
-       transform="translate(28.490947,-673.6739)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <rect
-         y="762.005"
-         x="135.89285"
-         height="17.5"
-         width="17.142857"
-         id="rect56385"
-         style="opacity:1;fill:url(#linearGradient56429);fill-opacity:1;stroke:url(#linearGradient56431);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path56387"
-         d="M 150.86476,765.59848 C 142.86027,765.59848 136.3852,770.59601 136.3852,776.76416 C 136.3852,777.31124 136.43575,777.85021 136.53447,778.37632 L 152.59634,778.37632 L 152.59634,765.68805 C 152.03048,765.63628 151.44859,765.59848 150.86476,765.59848 z "
-         style="opacity:1;fill:url(#linearGradient56433);fill-opacity:1;stroke:url(#linearGradient56435);stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       y="84.402573"
-       x="214.91953"
-       height="24.642857"
-       width="24.642857"
-       id="rect56389"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56391"
-       transform="translate(-1.8136333,-673.16882)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         id="path56393"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         style="fill:url(#linearGradient56437);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56439);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56395"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         style="fill:url(#linearGradient56441);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56397"
-       width="24.642857"
-       height="24.642857"
-       x="243.20383"
-       y="84.402573"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56399"
-       transform="translate(28.490947,-673.6739)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         id="path56401"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         style="fill:url(#linearGradient56443);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56445);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56403"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         style="fill:url(#linearGradient56447);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56405"
-       width="24.642857"
-       height="24.642857"
-       x="-157.74002"
-       y="84.402573"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       transform="matrix(-1,0,0,1,374.47318,-673.16882)"
-       id="g56407"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56449);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56451);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         id="path56409" />
-      <path
-         style="fill:url(#linearGradient56453);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         id="path56411" />
-    </g>
-    <rect
-       y="84.402573"
-       x="-129.45572"
-       height="24.642857"
-       width="24.642857"
-       id="rect56413"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56415"
-       transform="matrix(-1,0,0,1,344.1686,-673.6739)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_1.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56455);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56457);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         id="path56417" />
-      <path
-         style="fill:url(#linearGradient56459);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         id="path56419" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56623"
-       width="24.642857"
-       height="24.642857"
-       x="386.69745"
-       y="85.396027"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <path
-       style="fill:url(#linearGradient56667);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56669);stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 390.62605,89.860362 L 390.62605,105.93179 C 396.60094,103.56341 402.87791,101.03904 407.41176,97.717502 C 402.07378,94.069442 396.43955,91.606342 390.62605,89.860362 z "
-       id="path56625"
-       sodipodi:nodetypes="cccc"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_play_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       y="85.396027"
-       x="331.13913"
-       height="24.642857"
-       width="24.642857"
-       id="rect56627"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <g
-       id="g56629"
-       transform="translate(199.12749,-673.03754)"
-       style="fill:url(#linearGradient56671)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_stop_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321">
-      <rect
-         y="762.005"
-         x="135.89285"
-         height="17.5"
-         width="17.142857"
-         id="rect56631"
-         style="opacity:1;fill:url(#linearGradient56673);fill-opacity:1;stroke:url(#linearGradient56675);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         id="path56633"
-         d="M 150.86476,765.59848 C 142.86027,765.59848 136.3852,770.59601 136.3852,776.76416 C 136.3852,777.31124 136.43575,777.85021 136.53447,778.37632 L 152.59634,778.37632 L 152.59634,765.68805 C 152.03048,765.63628 151.44859,765.59848 150.86476,765.59848 z "
-         style="opacity:1;fill:url(#linearGradient56677);fill-opacity:1;stroke:url(#linearGradient56679);stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56635"
-       width="24.642857"
-       height="24.642857"
-       x="-328.37662"
-       y="85.03891"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       transform="matrix(-1,0,0,1,545.10972,-672.53246)"
-       id="g56637"
-       style="fill:url(#linearGradient56681)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_previous_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56683);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56685);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         id="path56639" />
-      <path
-         style="fill:url(#linearGradient56687);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         id="path56641" />
-    </g>
-    <rect
-       y="85.03891"
-       x="-300.09232"
-       height="24.642857"
-       width="24.642857"
-       id="rect56643"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="scale(-1,1)"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304" />
-    <g
-       id="g56645"
-       transform="matrix(-1,0,0,1,514.80514,-673.03754)"
-       style="fill:url(#linearGradient56689)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_first_2.png"
-       inkscape:export-xdpi="132.44304"
-       inkscape:export-ydpi="132.44304">
-      <path
-         style="fill:url(#linearGradient56691);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56693);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         id="path56647" />
-      <path
-         style="fill:url(#linearGradient56695);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         id="path56649" />
-    </g>
-    <rect
-       y="85.03891"
-       x="414.34537"
-       height="24.642857"
-       width="24.642857"
-       id="rect56651"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <g
-       style="fill:url(#linearGradient56697)"
-       id="g56653"
-       transform="translate(197.61224,-672.53246)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_next_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321">
-      <path
-         id="path56655"
-         d="M 225.71875,761.8125 L 225.71875,764.9375 C 223.92957,763.86297 222.12721,762.94975 220.28125,762.1875 L 220.28125,778.25 C 222.09355,777.2623 223.93792,776.24471 225.71875,775.15625 L 225.71875,777.90625 C 230.06444,775.53788 234.63991,773.00904 237.9375,769.6875 C 234.05505,766.03946 229.94705,763.55848 225.71875,761.8125 z "
-         style="fill:url(#linearGradient56699);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56701);stroke-width:0.51170009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56657"
-         d="M 232.98708,769.15625 C 228.10674,769.15625 223.72025,770.07248 220.63839,771.51353 L 220.63839,776.7781 C 222.36821,775.95027 224.12864,775.09738 225.82843,774.1851 L 225.82843,776.48998 C 229.97633,774.50496 234.34356,772.38544 237.49107,769.60151 C 237.40259,769.5285 237.31136,769.46388 237.22262,769.39198 C 235.86564,769.2389 234.45375,769.15625 232.98708,769.15625 z "
-         style="fill:url(#linearGradient56703);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56659"
-       width="24.642857"
-       height="24.642857"
-       x="442.62967"
-       y="85.03891"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <g
-       style="fill:url(#linearGradient56705)"
-       transform="translate(227.91682,-673.03754)"
-       id="g56661"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_last_2.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321">
-      <path
-         id="path56663"
-         d="M 228,761.8125 L 228,765.8125 C 226.29186,764.39766 224.55769,763.24818 222.78125,762.3125 L 222.78125,764.90625 C 221.43999,763.89862 220.06869,763.03999 218.6875,762.3125 L 218.6875,778.53125 C 220.05005,777.58403 221.4374,776.59951 222.78125,775.5625 L 222.78125,778.53125 C 224.53493,777.31213 226.31217,776.04329 228,774.65625 L 228,778.03125 C 231.43626,775.64245 235.04875,773.1002 237.65625,769.75 C 234.58628,766.07047 231.34344,763.57354 228,761.8125 z "
-         style="fill:url(#linearGradient56707);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient56709);stroke-width:0.45697752;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path56665"
-         d="M 231.25598,768.78125 C 226.36683,768.78125 221.96919,770.19175 218.86607,772.43189 L 218.86607,777.28125 C 220.19014,776.45547 221.53831,775.59717 222.8442,774.69311 L 222.8442,777.28125 C 224.54835,776.21843 226.2754,775.11226 227.91556,773.90304 L 227.91556,776.84535 C 231.25478,774.76281 234.76525,772.54649 237.29911,769.6258 C 237.27089,769.59547 237.23625,769.57422 237.208,769.54407 C 235.3508,769.07203 233.3556,768.78125 231.25598,768.78125 z "
-         style="fill:url(#linearGradient56711);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       transform="scale(-1,1)"
-       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect56713"
-       width="24.642857"
-       height="24.642857"
-       x="-383.42987"
-       y="85.03891"
-       rx="3"
-       ry="3"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_pause.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       style="fill:url(#linearGradient3722);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3738);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect3714"
-       width="6.060915"
-       height="17.67767"
-       x="363.35898"
-       y="88.82135"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_pause.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       y="88.82135"
-       x="372.95541"
-       height="17.67767"
-       width="6.060915"
-       id="rect6852"
-       style="fill:url(#linearGradient6854);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6856);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\transport_pause.png"
-       inkscape:export-xdpi="132.44321"
-       inkscape:export-ydpi="132.44321" />
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="200.76157"
-       y="199.48087"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect6871" />
-    <g
-       id="g6873"
-       transform="translate(-111.78574,-276.14284)">
-      <rect
-         id="rect6875"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50002563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.6880851,-0.72563,0.7156989,0.698409,0,0)"
-         y="579.13556"
-         x="-139.53285"
-         height="8.1236973"
-         width="9.9346428" />
-      <path
-         id="path6877"
-         style="fill:url(#linearGradient6883);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 322.15549,498.51581 L 331.24526,507.386 L 345.19505,492.67507 L 345.18921,492.66938 C 348.9382,488.60428 349.98666,483.41283 347.51339,480.99931 C 345.04012,478.58579 339.96998,479.8527 336.11111,483.81057 L 336.10527,483.80488 L 322.15549,498.51581 z " />
-      <path
-         id="path6879"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.38604188;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 345.24279,485.51892 C 345.24279,486.79461 344.29483,487.82876 343.12545,487.82876 C 341.95607,487.82876 341.0081,486.79461 341.0081,485.51892 C 341.0081,484.24324 341.95607,483.20909 343.12545,483.20909 C 344.29483,483.20909 345.24279,484.24324 345.24279,485.51892 z " />
-      <path
-         id="path6881"
-         d="M 322.22677,504.05281 L 326.70179,508.17154"
-         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.6, 1.6;stroke-dashoffset:0;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="248.9758"
-       y="199.4809"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect6885" />
-    <g
-       id="g6887"
-       transform="translate(-63.202443,-323.09743)">
-      <rect
-         id="rect6889"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50002563;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.6880851,-0.72563,0.7156989,0.698409,0,0)"
-         y="611.17981"
-         x="-173.39938"
-         height="8.1236973"
-         width="9.9346428" />
-      <path
-         id="path6891"
-         style="fill:url(#linearGradient6899);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 321.78646,545.47037 L 330.87623,554.34056 L 344.82602,539.62963 L 344.82018,539.62394 C 348.56917,535.55884 349.61763,530.36739 347.14436,527.95387 C 344.67109,525.54035 339.60095,526.80726 335.74208,530.76513 L 335.73624,530.75944 L 321.78646,545.47037 z " />
-      <path
-         id="path6893"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.38604188;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 344.87376,532.47348 C 344.87376,533.74917 343.9258,534.78332 342.75642,534.78332 C 341.58704,534.78332 340.63907,533.74917 340.63907,532.47348 C 340.63907,531.1978 341.58704,530.16365 342.75642,530.16365 C 343.9258,530.16365 344.87376,531.1978 344.87376,532.47348 z " />
-      <path
-         id="path6895"
-         d="M 321.85774,551.00737 L 326.33276,555.1261"
-         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.6, 1.6;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path6897"
-         d="M 319.20536,530.05615 C 328.00186,533.54983 339.28994,534.71803 337.21846,548.35518 L 330.64224,550.92847 L 340.3636,561.22168 L 349.22719,545.21003 L 343.79467,546.35372 C 341.83779,536.76149 334.86363,530.51411 319.20536,530.05615 z "
-         style="opacity:0.82480014;fill:url(#linearGradient6901);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g29580"
-       transform="translate(-110.00002,83.999995)">
-      <path
-         transform="translate(158.5,4)"
-         d="M 503.5 755.86218 A 62 8.5 0 1 1  379.5,755.86218 A 62 8.5 0 1 1  503.5 755.86218 z"
-         sodipodi:ry="8.5"
-         sodipodi:rx="62"
-         sodipodi:cy="755.86218"
-         sodipodi:cx="441.5"
-         id="path29568"
-         style="opacity:1;fill:url(#radialGradient29636);fill-opacity:1;stroke:#ff6600;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path20696"
-         d="M 594.5,614.86218 C 552.40848,617.69466 561.64571,666.64838 554.5,676.36218 L 539.5,707.86218 L 580.5,759.36218 C 584.76589,759.73453 585.4146,760.70975 597,759.86218 C 607.4517,760.21727 615.73083,754.05466 625,750.86218 C 645.93916,739.72991 650.56211,719.35832 651.5,710.86218 C 646.92624,680.73098 638.84915,671.11644 635,656.86218 C 628.41474,635.94744 621.90069,614.96149 594.5,614.86218 z "
-         style="opacity:1;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csssc"
-         id="path21679"
-         d="M 636.98486,720.02026 C 636.98486,744.1619 618.95964,758.34702 596.75,758.34702 C 574.54036,758.34702 556.51515,738.7538 556.51515,714.61216 C 556.51515,690.47052 574.54036,670.87731 596.75,670.87731 C 618.95964,670.87731 636.98486,695.87862 636.98486,720.02026 z "
-         style="opacity:1;fill:url(#linearGradient29638);fill-opacity:1;stroke:#e6e6e6;stroke-width:1.63029492;stroke-linecap:round;stroke-miterlimit:4" />
-      <g
-         id="g11715">
-        <path
-           style="fill:url(#linearGradient29640);fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 621.78571,738.07647 C 601.4768,738.83145 597.50087,758.48065 602.14286,761.6479 C 603.92524,764.7448 612.14769,764.08596 621.42857,764.1479 C 632.20032,764.09863 642.79369,764.76381 643.21428,760.21933 C 644.26956,741.64371 627.94331,737.79123 621.78571,738.07647 z "
-           id="path9717"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           transform="matrix(0.9300312,0,0,1.1125113,46.341387,-82.861238)"
-           style="opacity:1;fill:url(#linearGradient29642);fill-opacity:1;stroke:#d4aa00;stroke-width:0;stroke-miterlimit:4"
-           d="M 637.14287,750.75507 C 637.14287,756.76792 628.98287,759.72178 618.92859,759.72178 C 608.8743,759.72178 600.7143,756.76792 600.7143,750.75507 C 600.7143,744.74221 608.8743,739.86221 618.92859,739.86221 C 628.98287,739.86221 637.14287,744.74221 637.14287,750.75507 z "
-           id="path10700"
-           sodipodi:nodetypes="csssc" />
-      </g>
-      <g
-         transform="translate(-50.5,0)"
-         id="g20684">
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path20686"
-           d="M 621.78571,738.07647 C 601.4768,738.83145 597.50087,758.48065 602.14286,761.6479 C 603.92524,764.7448 612.14769,764.08596 621.42857,764.1479 C 632.20032,764.09863 642.79369,764.76381 643.21428,760.21933 C 644.26956,741.64371 627.94331,737.79123 621.78571,738.07647 z "
-           style="fill:url(#linearGradient29644);fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="csssc"
-           id="path20688"
-           d="M 637.14287,750.75507 C 637.14287,756.76792 628.98287,759.72178 618.92859,759.72178 C 608.8743,759.72178 600.7143,756.76792 600.7143,750.75507 C 600.7143,744.74221 608.8743,739.86221 618.92859,739.86221 C 628.98287,739.86221 637.14287,744.74221 637.14287,750.75507 z "
-           style="opacity:1;fill:url(#linearGradient29646);fill-opacity:1;stroke:#d4aa00;stroke-width:0;stroke-miterlimit:4"
-           transform="matrix(0.9300312,0,0,1.1125113,46.341387,-82.861238)" />
-      </g>
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path11731"
-         d="M 587.5,719.1479 C 594.71083,712.39959 632.2891,710.86762 631.07143,703.07647 C 630.43514,700.13312 598.26051,705.27759 593.57143,697.00504 C 586.65564,692.01313 591.68263,668.84065 587.5,668.79076 C 582.61905,668.31457 572.7381,689.37796 567.5,693.07647 C 562.15456,695.41451 542.57403,691.61453 526.78571,703.07647 C 519.40952,709.86219 528.1022,727.36219 533.92857,736.29076 C 540.40541,746.90851 555.37198,758.40393 562.85714,754.50504 C 577.09461,747.71461 577.19406,729.71053 587.5,719.1479 z "
-         style="opacity:1;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path12719"
-         d="M 587.85714,693.79076 C 569.43249,693.87082 549.3787,697.64018 547.85714,703.07647 C 546.0789,712.01712 552.26025,716.18721 557.85714,722.36218 C 566.19665,734.93551 564.0273,742.73593 566.78571,746.29076 C 570.94368,749.66757 579.61904,725.67171 586.28571,718.29076 C 593.21644,712.1663 628.8104,710.01122 626.78571,705.21933 C 625.55648,701.93191 594.22137,709.76003 587.85714,693.79076 z "
-         style="opacity:1;fill:url(#linearGradient29648);fill-opacity:1;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <g
-         id="g13736"
-         transform="matrix(1.0602134,2.043068e-2,-1.8607258e-2,0.9655901,140.14006,26.920654)">
-        <rect
-           style="opacity:1;fill:#ffffff;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-           id="rect12733"
-           width="23.300003"
-           height="4.743"
-           x="797.07562"
-           y="105.04495"
-           transform="matrix(0.6199037,0.7846779,-0.7846779,0.6199037,0,0)"
-           rx="2"
-           ry="2" />
-        <g
-           id="g13718"
-           transform="matrix(0.1525646,0.2012171,-0.1780037,0.1640598,473.69043,481.42722)"
-           style="fill:#b3b3b3">
-          <path
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z"
-             sodipodi:ry="3.7123106"
-             sodipodi:rx="4.2426405"
-             sodipodi:cy="738.58356"
-             sodipodi:cx="458.91229"
-             id="path13704"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="translate(12.374369,0)"
-             sodipodi:type="arc"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path13706"
-             sodipodi:cx="458.91229"
-             sodipodi:cy="738.58356"
-             sodipodi:rx="4.2426405"
-             sodipodi:ry="3.7123106"
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z" />
-          <path
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z"
-             sodipodi:ry="3.7123106"
-             sodipodi:rx="4.2426405"
-             sodipodi:cy="738.58356"
-             sodipodi:cx="458.91229"
-             id="path13708"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc"
-             transform="translate(25.102291,-0.3535534)" />
-          <path
-             transform="translate(36.769553,-0.3535534)"
-             sodipodi:type="arc"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path13712"
-             sodipodi:cx="458.91229"
-             sodipodi:cy="738.58356"
-             sodipodi:rx="4.2426405"
-             sodipodi:ry="3.7123106"
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z" />
-          <path
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z"
-             sodipodi:ry="3.7123106"
-             sodipodi:rx="4.2426405"
-             sodipodi:cy="738.58356"
-             sodipodi:cx="458.91229"
-             id="path13714"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             sodipodi:type="arc"
-             transform="translate(49.143922,-0.3535534)" />
-          <path
-             transform="translate(61.871844,-0.7071068)"
-             sodipodi:type="arc"
-             style="opacity:1;fill:#b3b3b3;stroke:#cccccc;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
-             id="path13716"
-             sodipodi:cx="458.91229"
-             sodipodi:cy="738.58356"
-             sodipodi:rx="4.2426405"
-             sodipodi:ry="3.7123106"
-             d="M 463.15493 738.58356 A 4.2426405 3.7123106 0 1 1  454.66965,738.58356 A 4.2426405 3.7123106 0 1 1  463.15493 738.58356 z" />
-        </g>
-      </g>
-      <path
-         id="path11735"
-         d="M 585.45075,671.63811 C 580.80949,671.17901 571.41375,691.48149 566.43287,695.04715 C 561.34992,697.30119 542.72667,693.63772 527.71366,704.68793 C 520.69968,711.22989 528.97823,728.10558 534.51849,736.71343 C 536.96434,740.77861 540.69955,744.96297 544.7406,748.3125 C 547.43682,721.1535 555.12632,714.3442 560.99494,705.38087 C 569.15679,693.56381 577.98981,685.60747 587.26339,678.14564 C 587.15269,674.4087 586.83461,671.65484 585.45075,671.63811 z "
-         style="opacity:0.68999999;fill:url(#linearGradient29650);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <g
-         transform="translate(0,-0.5)"
-         id="g16761">
-        <g
-           id="g14799"
-           transform="translate(160.51324,6.0104076)">
-          <path
-             style="opacity:1;fill:url(#linearGradient29652);fill-opacity:1;fill-rule:evenodd;stroke:#483e37;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 481.18617,646.12934 L 487.19657,652.84685 L 429.92092,695.62681 L 424.26407,688.9093 L 481.18617,646.12934 z "
-             id="path13746" />
-          <g
-             transform="matrix(0.999936,-1.1314943e-2,1.1314943e-2,0.999936,-7.5687352,5.1956633)"
-             style="opacity:0.79999994"
-             id="g14773">
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 427.92536,685.74952 L 434.09846,692.73328"
-               id="path13766" />
-            <path
-               id="path14737"
-               d="M 434.42536,681.24952 L 440.59846,688.23328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 441.92536,675.74952 L 448.09846,682.73328"
-               id="path14739" />
-            <path
-               id="path14763"
-               d="M 450.67536,668.74952 L 456.84846,675.73328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 465.92536,658.24952 L 472.09846,665.23328"
-               id="path14765" />
-            <path
-               id="path14767"
-               d="M 469.67536,655.74952 L 475.84846,662.73328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 473.17536,652.99952 L 479.34846,659.98328"
-               id="path14769" />
-            <path
-               id="path14771"
-               d="M 476.67536,650.24952 L 482.84846,657.23328"
-               style="fill:#e9c6af;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-        </g>
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#502d16;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 583.00954,694.2126 L 591.14127,703.75854"
-           id="path14813" />
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 642.40651,652.4933 L 585.13086,695.98036"
-           id="path15784" />
-        <path
-           id="path16755"
-           d="M 643.82072,653.90751 L 586.54507,697.39457"
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <path
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 645.58849,655.32172 L 588.31284,698.80878"
-           id="path16757" />
-        <path
-           id="path16759"
-           d="M 646.64915,657.08949 L 589.3735,700.57655"
-           style="fill:none;fill-rule:evenodd;stroke:#e9c6af;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-      <g
-         id="g20680">
-        <path
-           style="fill:#d4ab6f;fill-opacity:1;fill-rule:evenodd;stroke:#deaa87;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 640.75,652.61218 L 647,659.61218 C 650.61861,657.21802 654.54024,656.73289 658.5,657.11218 C 668.26157,644.34434 672.64366,645.3023 677.75,644.61218 C 678.94606,641.73657 674.14673,641.17174 671.25,639.86218 C 668.59028,639.35871 646.03414,647.30344 643.25,648.86218 C 641.2211,650.36218 640.72443,651.36218 640.75,652.61218 z "
-           id="path16789"
-           sodipodi:nodetypes="ccccccc" />
-        <path
-           style="opacity:0.56999978;fill:url(#linearGradient29654);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 670.53125,639.875 C 665.85142,640.33869 645.86013,647.41368 643.25,648.875 C 641.2211,650.375 640.72443,651.375 640.75,652.625 L 644.03125,656.3125 C 644.56084,653.98048 645.91603,651.76579 648,650.375 C 666.38569,640.51108 671.1161,642.39764 677.65625,642.875 C 676.69517,641.42388 673.43462,640.86263 671.25,639.875 C 671.08377,639.84353 670.84324,639.84409 670.53125,639.875 z "
-           id="path17760" />
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path20698"
-         d="M 557,665.36218 C 527.34482,673.09896 530.01507,708.03337 534,708.36218 C 539.29883,707.83157 551.63196,693.22095 559.5,684.36218 C 567.28411,674.58187 569.13882,667.17332 557,665.36218 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path20700"
-         d="M 557.5,680.36218 C 551.729,689.36218 546.15502,698.36218 536.5,707.36218"
-         style="opacity:0.65959999;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient29656);stroke-width:1.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path21698"
-         d="M 616,668.86218 C 610.37322,671.44501 636.33333,685.19551 646.5,705.36218 C 651.5796,702.96354 656.16927,700.19747 656,693.86218 C 658.40083,684.11256 636.49233,664.46841 616,668.86218 z "
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path21700"
-         d="M 625.5,670.86218 C 638.79868,674.06424 652.41351,683.70961 654,693.36218"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient29658);stroke-width:3.0999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="csssc"
-         id="path22680"
-         d="M 627.49999,653.11218 C 627.49999,673.67418 613.05199,690.36218 595.24999,690.36218 C 577.448,690.36218 563,673.67418 563,653.11218 C 563,632.55018 577.448,615.86218 595.24999,615.86218 C 613.05199,615.86218 627,629.55018 627.49999,653.11218 z "
-         style="opacity:1;fill:url(#linearGradient29660);fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4" />
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient29662);fill-opacity:1;stroke:#ececec;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path24647"
-         sodipodi:cx="426.25"
-         sodipodi:cy="645.11218"
-         sodipodi:rx="14.25"
-         sodipodi:ry="14.25"
-         d="M 440.5 645.11218 A 14.25 14.25 0 1 1  412,645.11218 A 14.25 14.25 0 1 1  440.5 645.11218 z"
-         transform="matrix(0.8989058,0,0,0.863818,225.09145,95.352673)" />
-      <path
-         transform="matrix(0.9488566,0,0,0.9664004,179.5499,26.675505)"
-         d="M 440.5 645.11218 A 14.25 14.25 0 1 1  412,645.11218 A 14.25 14.25 0 1 1  440.5 645.11218 z"
-         sodipodi:ry="14.25"
-         sodipodi:rx="14.25"
-         sodipodi:cy="645.11218"
-         sodipodi:cx="426.25"
-         id="path23668"
-         style="opacity:1;fill:url(#linearGradient29664);fill-opacity:1;stroke:url(#linearGradient29666);stroke-width:0.62657404;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         id="path25630"
-         d="M 584,636.34375 C 579.45462,636.34375 575.42051,638.61872 572.96875,642.125 C 574.27536,641.94885 575.62359,641.875 577,641.875 C 586.22185,641.875 594.13713,645.98706 597.40625,651.84375 C 597.47588,651.27787 597.53125,650.71 597.53125,650.125 C 597.53125,642.52329 591.46373,636.34378 584,636.34375 z "
-         style="opacity:1;fill:url(#linearGradient29668);fill-opacity:1;stroke:url(#linearGradient29670);stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         id="path26629"
-         d="M 608.25,640.3125 C 601.17921,640.3125 595.43753,645.83021 595.4375,652.625 C 595.4375,655.41646 596.43095,657.96552 598.0625,660.03125 C 597.71257,658.95525 597.5,657.81393 597.5,656.625 C 597.49999,650.415 602.652,645.375 609,645.375 C 615.21911,645.375 620.2654,650.21418 620.46875,656.25 C 620.83739,655.10209 621.0625,653.88871 621.0625,652.625 C 621.0625,645.83021 615.32078,640.31248 608.25,640.3125 z "
-         style="fill:url(#linearGradient29672);fill-opacity:1;stroke:#ececec;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         transform="translate(159,5)"
-         d="M 450.5 645.86218 A 5.75 5.5 0 1 1  439,645.86218 A 5.75 5.5 0 1 1  450.5 645.86218 z"
-         sodipodi:ry="5.5"
-         sodipodi:rx="5.75"
-         sodipodi:cy="645.86218"
-         sodipodi:cx="444.75"
-         id="path27607"
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:nodetypes="csssc"
-         id="path27612"
-         d="M 595.38391,651.96296 C 595.38391,653.57375 594.00787,655.49849 590.96449,655.67527 C 587.74974,655.862 585.01473,653.39698 585.01473,650.37197 C 585.01473,647.34697 587.28157,644.41243 590.43416,645.06867 C 593.8311,645.77578 594.85358,649.29151 595.38391,651.96296 z "
-         style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path27615"
-         d="M 584,660.86218 L 598.5,674.86218 L 611.5,660.86218 C 602.9585,654.61053 593.87379,653.79099 584,660.86218 z "
-         style="fill:#f6c43e;fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccccccccc"
-         id="path28586"
-         d="M 598.52978,655.87446 C 594.54135,655.78487 589.71993,657.83674 585.41421,660.92844 L 598.06041,674.87499 L 610.08579,660.2467 C 606.36104,657.51331 602.51821,655.96403 598.52978,655.87446 z M 593.40589,658.27918 C 596.07686,658.20257 599.05726,659.15366 602.20917,663.11595 C 603.32559,665.69232 601.18947,670.65906 599.04159,673.23541 L 587.2176,659.09897 C 588.59482,658.74535 591.80331,658.32516 593.40589,658.27918 z "
-         style="opacity:0.76000001;fill:url(#linearGradient29674);fill-opacity:1;fill-rule:evenodd;stroke:#d4aa00;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       id="rect29676"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.0701"
-       x="104.5485"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g29678"
-       transform="translate(-207.12462,-513.41685)">
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29680"
-         style="fill:url(#radialGradient29690);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient29692);stroke-width:2.39153099;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         d="M 344.35143,743.67873 C 340.21628,748.18954 333.20733,748.49407 328.69652,744.35893 C 324.18571,740.22378 323.88118,733.21485 328.01634,728.70404 C 332.15149,724.19323 339.16043,723.88869 343.67125,728.02384 C 348.18206,732.15898 348.48659,739.16792 344.35143,743.67873 L 344.35143,743.67873 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29682"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.14639039;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 336.759,736.16388 L 335.60872,736.16388 L 336.18386,726.55584 L 336.759,736.16388 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29684"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.12551381;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 336.14185,736.77701 L 336.14185,735.60586 L 343.079,736.19144 L 336.14185,736.77701 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29686"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.354114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 337.21677,736.19141 C 337.21711,736.7621 336.75457,737.22489 336.18389,737.22489 C 335.61321,737.22489 335.15067,736.7621 335.151,736.19141 C 335.15067,735.62072 335.61321,735.15793 336.18389,735.15793 C 336.75457,735.15793 337.21711,735.62072 337.21677,736.19141 L 337.21677,736.19141 z " />
-      <path
-         inkscape:export-ydpi="51"
-         inkscape:export-xdpi="51"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\undo.png"
-         id="path29688"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.41645598;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         d="M 348.42952,738.63306 C 350.08245,729.37578 338.87704,717.35529 327.49667,726.29396 C 321.29287,731.16672 331.29558,732.08792 331.29558,732.08792 L 316.92219,742.0067 L 315.52061,724.65302 C 315.52061,724.65302 319.65768,729.86092 323.61398,723.6396 C 329.2821,714.72642 351.70848,716.2692 348.42952,738.63306 z " />
-    </g>
-    <rect
-       id="rect29694"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="199.0701"
-       x="152.63174"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\redo.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g29696"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\redo.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-159.20122,-559.05369)">
-      <path
-         id="path29698"
-         style="fill:url(#radialGradient29708);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient29710);stroke-width:2.39152908;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-         d="M 337.29761,789.15137 C 333.16246,793.66217 326.15353,793.9667 321.64272,789.83155 C 317.13191,785.69641 316.82738,778.68747 320.96253,774.17667 C 325.09768,769.66586 332.10661,769.36133 336.61742,773.49648 C 341.12822,777.63163 341.43275,784.64056 337.29761,789.15137 L 337.29761,789.15137 z " />
-      <path
-         id="path29700"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.14639021;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 329.70508,781.63644 L 328.5548,781.63644 L 329.12994,772.02841 L 329.70508,781.63644 z " />
-      <path
-         id="path29702"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.12551373;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 329.08793,782.24954 L 329.08793,781.07839 L 336.02508,781.66397 L 329.08793,782.24954 z " />
-      <path
-         id="path29704"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.35411379;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 330.16285,781.66407 C 330.16318,782.23476 329.70064,782.69755 329.12996,782.69755 C 328.55928,782.69755 328.09674,782.23476 328.09708,781.66407 C 328.09674,781.09338 328.55928,780.63059 329.12996,780.63059 C 329.70064,780.63059 330.16318,781.09338 330.16285,781.66407 L 330.16285,781.66407 z " />
-      <path
-         id="path29706"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.41645515;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-         d="M 316.46797,784.21365 C 314.81504,774.95637 326.02044,762.93589 337.40081,771.87455 C 343.60461,776.7473 333.6019,777.6685 333.6019,777.6685 L 347.97528,787.58728 L 349.37686,770.23361 C 349.37686,770.23361 345.23979,775.44151 341.28349,769.22019 C 335.61537,760.30701 313.18901,761.84979 316.46797,784.21365 z " />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="347.33295"
-       y="434.19516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect30754" />
-    <g
-       style="display:inline"
-       id="g30756"
-       transform="translate(-46.804983,-232.72995)">
-      <g
-         id="g30758"
-         transform="matrix(0.5668049,0,0,0.8603553,21.508226,389.93057)">
-        <path
-           id="path30760"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z " />
-        <path
-           id="path30762"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 683.05261,356.83776 L 683.05261,326.03045" />
-      </g>
-      <g
-         id="g30764">
-        <path
-           sodipodi:nodetypes="cccc"
-           id="path30766"
-           d="M 420.31951,679.88826 L 409.67858,694.61724 L 426.69205,688.54529 L 420.31951,679.88826 z "
-           style="fill:url(#radialGradient30770);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6801604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="path30768"
-           d="M 420.37963,679.64779 L 431.38127,669.66816 L 431.38127,683.91619 L 426.93252,688.42505 L 420.37963,679.64779 z "
-           style="fill:url(#linearGradient30772);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6801604px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      </g>
-    </g>
-    <path
-       id="path4972"
-       style="opacity:1;fill:#929292;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.96170586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 392.78269,198.7959 L 392.78269,199.07759 L 392.78269,240.39663 L 392.78269,240.67831 L 393.04677,240.67831 L 434.38342,240.67831 L 434.6475,240.67831 L 434.6475,240.39663 L 434.6475,199.07759 L 434.6475,198.7959 L 434.38342,198.7959 L 393.04677,198.7959 L 392.78269,198.7959 z M 393.31084,199.34166 L 434.10174,199.34166 L 434.10174,240.13255 L 393.31084,240.13255 L 393.31084,199.34166 z "
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       style="fill:url(#linearGradient4986);fill-opacity:1;stroke:#000000;stroke-width:0.50995189;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;display:inline"
-       id="rect4974"
-       width="31.809853"
-       height="36.052494"
-       x="398.04214"
-       y="201.03586"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <text
-       xml:space="preserve"
-       style="font-size:10.18971634px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Arial"
-       x="431.22424"
-       y="195.04681"
-       id="text4976"
-       transform="scale(0.9261728,1.0797122)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"><tspan
-         sodipodi:role="line"
-         id="tspan4978"
-         x="431.22424"
-         y="195.04681"
-         style="font-weight:bold;font-family:Book Antiqua">AUTH</tspan></text>
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 402.98695,216.58722 L 424.55371,216.58722"
-       id="path4980"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <path
-       id="path4982"
-       d="M 402.98695,220.82987 L 424.55371,220.82987"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-       d="M 402.98695,225.42606 L 424.55371,225.42606"
-       id="path4984"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\song_properties.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="104.37174"
-       y="481.91278"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8482"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_previous.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       id="rect8484"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="481.5592"
-       x="152.80856"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_next.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g8486"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_previous.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         id="path8488"
-         d="M 266.92706,936.40242 L 266.58501,962.20032"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8490"
-         d="M 260.2153,928.26495 L 266.93281,937.10378 L 273.65032,928.26495 L 260.2153,928.26495 z "
-         style="fill:url(#linearGradient8558);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8560);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path8492"
-         d="M 266.93281,946.64972 L 286.7318,933.56824 L 286.7318,958.67053 L 266.93281,946.64972 z "
-         style="fill:url(#linearGradient8562);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       style="display:inline"
-       id="g8494"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 331.03528,936.75597 L 331.37733,962.55387"
-         id="path8496" />
-      <path
-         style="fill:url(#linearGradient8564);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8566);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 324.31202,928.6185 L 331.02953,937.45733 L 337.74704,928.6185 L 324.31202,928.6185 z "
-         id="path8498" />
-      <path
-         style="fill:url(#linearGradient8568);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 331.02953,947.00327 L 311.23054,933.92179 L 311.23054,959.02408 L 331.02953,947.00327 z "
-         id="path8500"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       inkscape:export-ydpi="51"
-       inkscape:export-xdpi="51"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_last.png"
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="297.76541"
-       y="480.49854"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8502" />
-    <g
-       style="display:inline"
-       id="g8504"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_last.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path8506"
-         d="M 474.92576,945.2355 L 455.12677,932.15402 L 455.12677,957.25631 L 474.92576,945.2355 z "
-         style="fill:url(#linearGradient8570);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path8508"
-         d="M 479.17415,935.34176 L 479.5162,961.13966"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8510"
-         d="M 472.45089,927.20429 L 479.1684,936.04312 L 485.88591,927.20429 L 472.45089,927.20429 z "
-         style="fill:url(#linearGradient8572);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8574);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <rect
-         y="936.75024"
-         x="474.46863"
-         height="17.324116"
-         width="4.9497476"
-         id="rect8512"
-         style="opacity:1;fill:url(#linearGradient8576);fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
-    </g>
-    <rect
-       id="rect8514"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="480.49854"
-       x="-289.95554"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_first.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="scale(-1,1)" />
-    <g
-       style="display:inline"
-       id="g8516"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_first.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:url(#linearGradient8578);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 413.04647,945.2355 L 432.84546,932.15402 L 432.84546,957.25628 L 413.04647,945.2355 z "
-         id="path8518"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 408.79808,935.34176 L 408.45603,961.13968"
-         id="path8520" />
-      <path
-         style="fill:url(#linearGradient8580);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8582);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 402.08632,927.20429 L 408.80383,936.04312 L 415.52134,927.20429 L 402.08632,927.20429 z "
-         id="path8522" />
-      <rect
-         transform="scale(-1,1)"
-         style="opacity:1;fill:url(#linearGradient8584);fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="rect8524"
-         width="4.9497476"
-         height="17.324116"
-         x="-413.5036"
-         y="936.75024" />
-    </g>
-    <rect
-       transform="scale(-1,1)"
-       inkscape:export-ydpi="51"
-       inkscape:export-xdpi="51"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_add.png"
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="-387.88983"
-       y="480.49854"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8526" />
-    <g
-       style="display:inline"
-       id="g8528"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_add.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         id="path8530"
-         d="M 516.29726,934.9882 L 516.63931,960.7861"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8532"
-         d="M 509.574,926.85073 L 516.29151,935.68956 L 523.00902,926.85073 L 509.574,926.85073 z "
-         style="fill:url(#linearGradient8586);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8588);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path8534"
-         d="M 523.39422,945.83963 L 523.39422,950.6881 L 518.57394,950.6881 L 518.57394,955.36744 L 523.39422,955.36744 L 523.39422,960.18772 L 528.07356,960.18772 L 528.07356,955.33925 L 532.89384,955.33925 L 532.89384,950.65991 L 528.07356,950.65991 L 528.07356,945.83963 L 523.39422,945.83963 z "
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
-    </g>
-    <rect
-       id="rect8536"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="480.49854"
-       x="-435.97308"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="scale(-1,1)" />
-    <g
-       style="display:inline"
-       id="g8538"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 564.38052,934.9882 L 564.72257,960.7861"
-         id="path8540" />
-      <path
-         style="fill:url(#linearGradient8590);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8592);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 557.65726,926.85073 L 564.37477,935.68956 L 571.09228,926.85073 L 557.65726,926.85073 z "
-         id="path8542" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 571.47748,950.6881 L 566.6572,950.6881 L 566.6572,955.36744 L 571.47748,955.36744 L 576.15682,955.33925 L 580.9771,955.33925 L 580.9771,950.65991 L 576.15682,950.65991 L 571.47748,950.6881 z "
-         id="path8544" />
-    </g>
-    <rect
-       id="rect8546"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="480.85211"
-       x="-242.2258"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_list.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="scale(-1,1)" />
-    <g
-       style="display:inline"
-       id="g8548"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\marker_list.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-150.12562,-442.36532)">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.01149404px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 370.63326,935.34175 L 370.97531,961.13965"
-         id="path8550" />
-      <path
-         style="fill:url(#linearGradient8594);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8596);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 363.91,927.20428 L 370.62751,936.04311 L 377.34502,927.20428 L 363.91,927.20428 z "
-         id="path8552" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 358.63833,946.19318 L 358.63833,951.04165 L 353.81805,951.04165 L 353.81805,955.72099 L 358.63833,955.72099 L 358.63833,960.54127 L 363.31767,960.54127 L 363.31767,955.6928 L 368.13795,955.6928 L 368.13795,951.01346 L 363.31767,951.01346 L 363.31767,946.19318 L 358.63833,946.19318 z "
-         id="path8554" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 378.08377,950.68811 L 373.26349,950.68811 L 373.26349,955.36745 L 378.08377,955.36745 L 382.76311,955.33926 L 387.58339,955.33926 L 387.58339,950.65992 L 382.76311,950.65992 L 378.08377,950.68811 z "
-         id="path8556" />
-    </g>
-    <rect
-       id="rect8964"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="435.24377"
-       x="153.08762"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_page.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="201.67343"
-       y="435.24377"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect8966"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_linear.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g8968"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_linear.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-246.15952,-306.45138)">
-      <g
-         style="fill-opacity:1;stroke:url(#linearGradient9082)"
-         id="g8970"
-         transform="matrix(0.5415254,0,0,0.1703656,391.14724,651.90036)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9084);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path8972" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9086);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8974" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9088);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8976" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9090);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8978" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9092);stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path8980" />
-      </g>
-      <g
-         id="g8982"
-         transform="matrix(0.1244078,0,0,0.1397183,394.52898,645.2736)">
-        <rect
-           id="rect8984"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect8986"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g8988"
-         transform="matrix(0.1508028,0,0,0.1460898,467.77752,664.93465)">
-        <path
-           id="path8990"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path8992"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g8994"
-         transform="matrix(0.1508028,0,0,0.1460898,463.33954,662.15996)">
-        <path
-           id="path8996"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path8998"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-    </g>
-    <g
-       style="display:inline"
-       id="g9000"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_page.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-244.74532,-306.45138)">
-      <g
-         transform="matrix(0.5338832,0,0,0.1703656,342.00081,669.11726)"
-         id="g9002">
-        <path
-           id="path9004"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 111.87488,566.71352 L 173.41819,566.58088" />
-        <path
-           id="path9006"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,626.46842 L 173.41819,626.33578" />
-        <path
-           id="path9008"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,611.5297 L 173.41818,611.39706" />
-        <path
-           id="path9010"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,596.59099 L 173.41818,596.45834" />
-        <path
-           id="path9012"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,581.65225 L 173.41819,581.51962" />
-      </g>
-      <g
-         transform="matrix(0.1244078,0,0,0.1397183,344.52898,662.49057)"
-         id="g9014">
-        <rect
-           width="10.422997"
-           height="72.622528"
-           ry="0"
-           x="460.12595"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9016" />
-        <rect
-           width="2.5666234"
-           height="72.622528"
-           x="473.64929"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9018" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,417.77752,682.15163)"
-         id="g9020">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9022" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9024" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,413.33954,679.37694)"
-         id="g9026">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9028" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9030" />
-      </g>
-      <g
-         transform="matrix(0.5415254,0,0,0.1703656,341.14724,651.90036)"
-         id="g9032">
-        <path
-           id="path9034"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 111.87488,566.71352 L 173.41819,566.58088" />
-        <path
-           id="path9036"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,626.46842 L 173.41819,626.33578" />
-        <path
-           id="path9038"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,611.5297 L 173.41818,611.39706" />
-        <path
-           id="path9040"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,596.59099 L 173.41818,596.45834" />
-        <path
-           id="path9042"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,581.65225 L 173.41819,581.51962" />
-      </g>
-      <g
-         transform="matrix(0.1244078,0,0,0.1397183,344.52898,645.2736)"
-         id="g9044">
-        <rect
-           width="10.422997"
-           height="72.622528"
-           ry="0"
-           x="460.12595"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9046" />
-        <rect
-           width="2.5666234"
-           height="72.622528"
-           x="473.64929"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect9048" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,417.77752,664.93465)"
-         id="g9050">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9052" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9054" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,413.33954,662.15996)"
-         id="g9056">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9058" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9060" />
-      </g>
-      <rect
-         width="0.31930798"
-         height="10.146696"
-         x="434.70465"
-         y="748.70496"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="rect9062" />
-      <g
-         id="g9064"
-         transform="matrix(0.1508028,0,0,0.1460898,424.52752,664.93465)">
-        <path
-           id="path9066"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path9068"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,431.27752,667.43465)"
-         id="g9070">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path9072" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path9074" />
-      </g>
-      <g
-         id="g9076"
-         transform="matrix(-0.1244078,0,0,0.1397183,491.76721,662.2736)">
-        <rect
-           id="rect9078"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect9080"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="440.95456"
-       y="147.27452"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect10556"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_add.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g10558"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_add.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-2.2404833,-253.78593)">
-      <path
-         id="path10560"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.69704974px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 446.48376,404.46465 L 446.48376,438.99017" />
-      <path
-         id="path10562"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 452.22135,404.83883 L 452.22135,439.10134" />
-      <path
-         id="path10564"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 457.16922,404.83883 L 457.16922,439.10134" />
-      <path
-         id="path10566"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 462.1171,404.83883 L 462.1171,439.10134" />
-      <path
-         id="path10568"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 467.06498,404.83883 L 467.06498,439.10134" />
-      <path
-         id="path10570"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 472.01285,404.83883 L 472.01285,439.10134" />
-      <path
-         id="path10572"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 476.96073,404.83883 L 476.96073,439.10134" />
-      <path
-         id="path10574"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.90861,404.83883 L 481.90861,439.10134" />
-      <path
-         id="path10576"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 481.94255,404.62435 L 447.34974,404.62435" />
-      <path
-         id="path10578"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,413.17627 L 447.34974,413.17627" />
-      <path
-         id="path10580"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,421.7282 L 447.34974,421.7282" />
-      <path
-         id="path10582"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,430.28013 L 447.34974,430.28013" />
-      <path
-         id="path10584"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 481.94255,438.83205 L 447.34974,438.83205" />
-      <rect
-         y="404.64941"
-         x="452.19183"
-         height="8.4911966"
-         width="19.804905"
-         id="rect10586"
-         style="opacity:1;fill:url(#linearGradient10632);fill-opacity:1;stroke:#000000;stroke-width:0.29408514;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:url(#linearGradient10634);fill-opacity:1;stroke:#000000;stroke-width:0.32790762;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect10588"
-         width="24.720829"
-         height="8.4573736"
-         x="457.15851"
-         y="413.15164" />
-      <rect
-         y="421.62128"
-         x="447.24338"
-         height="8.4886465"
-         width="20.155907"
-         id="rect10590"
-         style="opacity:1;fill:url(#linearGradient10636);fill-opacity:1;stroke:#000000;stroke-width:0.29663515;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path10592"
-         d="M 469.30055,421.51995 L 469.30055,426.36842 L 464.48027,426.36842 L 464.48027,431.04776 L 469.30055,431.04776 L 469.30055,435.86804 L 473.97989,435.86804 L 473.97989,431.01957 L 478.80017,431.01957 L 478.80017,426.34023 L 473.97989,426.34023 L 473.97989,421.51995 L 469.30055,421.51995 z "
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
-    </g>
-    <rect
-       id="rect10594"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="198.53976"
-       x="441.30811"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51" />
-    <g
-       style="display:inline"
-       id="g10596"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\track_remove.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51"
-       transform="translate(-2.2404833,-253.78593)">
-      <path
-         d="M 446.83731,455.72989 L 446.83731,490.25541"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.69704974px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path10598" />
-      <path
-         d="M 452.5749,456.10407 L 452.5749,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10600" />
-      <path
-         d="M 457.52277,456.10407 L 457.52277,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10602" />
-      <path
-         d="M 462.47065,456.10407 L 462.47065,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10604" />
-      <path
-         d="M 467.41853,456.10407 L 467.41853,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10606" />
-      <path
-         d="M 472.3664,456.10407 L 472.3664,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10608" />
-      <path
-         d="M 477.31428,456.10407 L 477.31428,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10610" />
-      <path
-         d="M 482.26216,456.10407 L 482.26216,490.36658"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.22083248px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10612" />
-      <path
-         d="M 482.2961,455.88959 L 447.70329,455.88959"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path10614" />
-      <path
-         d="M 482.2961,464.44151 L 447.70329,464.44151"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10616" />
-      <path
-         d="M 482.2961,472.99344 L 447.70329,472.99344"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10618" />
-      <path
-         d="M 482.2961,481.54537 L 447.70329,481.54537"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10620" />
-      <path
-         d="M 482.2961,490.09729 L 447.70329,490.09729"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.2917217px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path10622" />
-      <rect
-         style="fill:url(#linearGradient10638);fill-opacity:1;stroke:#000000;stroke-width:0.29408514;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect10624"
-         width="19.804905"
-         height="8.4911966"
-         x="452.54538"
-         y="455.91464" />
-      <rect
-         y="464.41687"
-         x="457.51205"
-         height="8.4573736"
-         width="24.720829"
-         id="rect10626"
-         style="fill:url(#linearGradient10640);fill-opacity:1;stroke:#000000;stroke-width:0.32790762;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         style="fill:url(#linearGradient10642);fill-opacity:1;stroke:#000000;stroke-width:0.29663515;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect10628"
-         width="20.155907"
-         height="8.4886465"
-         x="447.59692"
-         y="472.88651" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.45102042;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-         d="M 468.6541,479.13366 L 463.83382,479.13366 L 463.83382,483.813 L 468.6541,483.813 L 473.33344,483.78481 L 478.15372,483.78481 L 478.15372,479.10547 L 473.33344,479.10547 L 468.6541,479.13366 z "
-         id="path10630" />
-    </g>
-    <rect
-       inkscape:export-ydpi="51"
-       inkscape:export-xdpi="51"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_multitrack.png"
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="249.15182"
-       y="435.07074"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect11028" />
-    <g
-       style="display:inline"
-       id="g11030"
-       transform="translate(-254.74712,-300.96752)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\layout_multitrack.png"
-       inkscape:export-xdpi="51"
-       inkscape:export-ydpi="51">
-      <g
-         id="g11032"
-         transform="matrix(0.4447275,0,0,0.1703656,464.02114,641.74351)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path11034" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11036" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11038" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11040" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11042" />
-      </g>
-      <g
-         id="g11044"
-         transform="matrix(0.1244078,0,0,0.1397183,456.595,635.11675)">
-        <rect
-           id="rect11046"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect11048"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g11050"
-         transform="matrix(0.1508028,0,0,0.1460898,529.84354,654.7778)">
-        <path
-           id="path11052"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11054"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g11056"
-         transform="matrix(0.1508028,0,0,0.1460898,525.40556,652.00311)">
-        <path
-           id="path11058"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11060"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,536.59354,654.7778)"
-         id="g11062">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11064" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11066" />
-      </g>
-      <text
-         id="text11068"
-         y="746.97223"
-         x="506.70752"
-         style="font-size:11px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           y="746.97223"
-           x="506.70752"
-           id="tspan11070"
-           sodipodi:role="line">1</tspan><tspan
-           id="tspan11072"
-           y="760.72223"
-           x="506.70752"
-           sodipodi:role="line">2</tspan><tspan
-           id="tspan11074"
-           y="774.47223"
-           x="506.70752"
-           sodipodi:role="line">3</tspan></text>
-      <g
-         transform="matrix(0.4447275,0,0,0.1703656,464.02114,655.24351)"
-         id="g11076">
-        <path
-           id="path11078"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 111.87488,566.71352 L 173.41819,566.58088" />
-        <path
-           id="path11080"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,626.46842 L 173.41819,626.33578" />
-        <path
-           id="path11082"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,611.5297 L 173.41818,611.39706" />
-        <path
-           id="path11084"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,596.59099 L 173.41818,596.45834" />
-        <path
-           id="path11086"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           d="M 111.87488,581.65225 L 173.41819,581.51962" />
-      </g>
-      <g
-         transform="matrix(0.1244078,0,0,0.1397183,456.595,648.61675)"
-         id="g11088">
-        <rect
-           width="10.422997"
-           height="72.622528"
-           ry="0"
-           x="460.12595"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect11090" />
-        <rect
-           width="2.5666234"
-           height="72.622528"
-           x="473.64929"
-           y="738.49548"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="rect11092" />
-      </g>
-      <g
-         id="g11094"
-         transform="matrix(0.4447275,0,0,0.1703656,464.02114,668.49351)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path11096" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11098" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11100" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11102" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path11104" />
-      </g>
-      <g
-         id="g11106"
-         transform="matrix(0.1244078,0,0,0.1397183,456.595,661.86675)">
-        <rect
-           id="rect11108"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect11110"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,529.84354,668.21283)"
-         id="g11112">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11114" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11116" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,525.40556,665.43814)"
-         id="g11118">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11120" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11122" />
-      </g>
-      <g
-         id="g11124"
-         transform="matrix(0.1508028,0,0,0.1460898,536.59354,668.21283)">
-        <path
-           id="path11126"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11128"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g11130"
-         transform="matrix(0.1508028,0,0,0.1460898,529.66676,681.47108)">
-        <path
-           id="path11132"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11134"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g11136"
-         transform="matrix(0.1508028,0,0,0.1460898,525.22878,678.69639)">
-        <path
-           id="path11138"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path11140"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         transform="matrix(0.1508028,0,0,0.1460898,536.41676,681.47108)"
-         id="g11142">
-        <path
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           id="path11144" />
-        <path
-           d="M -7.156011,622.3181 L -7.156011,572.4789"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           id="path11146" />
-      </g>
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="298.33298"
-       y="433.69519"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect12376" />
-    <g
-       style="display:inline"
-       id="g12378"
-       transform="matrix(0.5700447,0,0,0.2618828,237.50828,292.61349)">
-      <path
-         d="M 111.87488,566.71352 L 173.41819,566.58088"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         id="path12380" />
-      <path
-         d="M 111.87488,626.46842 L 173.41819,626.33578"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12382" />
-      <path
-         d="M 111.87488,611.5297 L 173.41818,611.39706"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12384" />
-      <path
-         d="M 111.87488,596.59099 L 173.41818,596.45834"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12386" />
-      <path
-         d="M 111.87488,581.65225 L 173.41819,581.51962"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         id="path12388" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12390"
-       transform="matrix(0.1912374,0,0,0.2147724,213.41104,282.42696)">
-      <rect
-         id="rect12392"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         y="738.49548"
-         x="460.12595"
-         ry="0"
-         height="72.622528"
-         width="10.422997" />
-      <rect
-         id="rect12394"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         y="738.49548"
-         x="473.64929"
-         height="72.622528"
-         width="2.5666234" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12396"
-       transform="matrix(0.2318113,0,0,0.2245665,326.00734,312.64956)">
-      <path
-         id="path12398"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-      <path
-         id="path12400"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M -7.156011,622.3181 L -7.156011,572.4789" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12402"
-       transform="matrix(0.2318113,0,0,0.2245665,319.18536,308.38436)">
-      <path
-         id="path12404"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-      <path
-         id="path12406"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M -7.156011,622.3181 L -7.156011,572.4789" />
-    </g>
-    <g
-       style="display:inline"
-       transform="matrix(0.2318113,0,0,0.2245665,336.38332,312.64956)"
-       id="g12408">
-      <path
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path12410" />
-      <path
-         d="M -7.156011,622.3181 L -7.156011,572.4789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path12412" />
-    </g>
-    <g
-       style="display:inline"
-       id="g12414"
-       transform="translate(-140.61944,-77.569368)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path12416"
-         d="M 440.58819,540.43464 C 448.06239,535.50357 447.97881,533.31371 454.73032,532.65647 C 460.92638,533.06006 463.18552,536.33993 469.22601,540.08109 C 465.1484,542.83292 461.92696,547.38979 455.08387,547.85926 C 448.23806,547.45201 446.00644,543.32344 440.58819,540.43464 z "
-         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="translate(-2.0606602,-1.75)"
-         d="M 465.62982 542.00787 A 8.3085051 7.2478447 0 1 1  449.01281,542.00787 A 8.3085051 7.2478447 0 1 1  465.62982 542.00787 z"
-         sodipodi:ry="7.2478447"
-         sodipodi:rx="8.3085051"
-         sodipodi:cy="542.00787"
-         sodipodi:cx="457.32132"
-         id="path12418"
-         style="fill:url(#linearGradient12422);fill-opacity:1;stroke:url(#linearGradient12424);stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         transform="translate(-1,-1.75)"
-         d="M 458.91229 542.00787 A 2.8284271 3.0052037 0 1 1  453.25544,542.00787 A 2.8284271 3.0052037 0 1 1  458.91229 542.00787 z"
-         sodipodi:ry="3.0052037"
-         sodipodi:rx="2.8284271"
-         sodipodi:cy="542.00787"
-         sodipodi:cx="456.08386"
-         id="path12420"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="344.33295"
-       y="199.69516"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect14627" />
-    <rect
-       id="rect14629"
-       style="fill:url(#linearGradient14671);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="203.6138"
-       x="348.25156"
-       height="33.496006"
-       width="33.496006" />
-    <g
-       style="display:inline"
-       id="g14631"
-       transform="matrix(0.4620139,0,0,0.3894886,57.644817,0.1596858)">
-      <path
-         id="path14633"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 646.25,601.61218 L 646.25,529.11218" />
-      <rect
-         id="rect14635"
-         style="fill:url(#linearGradient14673);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="535.61218"
-         x="639"
-         height="27"
-         width="14.5" />
-      <path
-         id="path14637"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 665.25,601.61218 L 665.25,529.11218" />
-      <rect
-         id="rect14639"
-         style="fill:url(#linearGradient14675);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="564.11218"
-         x="658"
-         height="27"
-         width="14.5" />
-      <path
-         id="path14641"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 684.25,601.61218 L 684.25,529.11218" />
-      <rect
-         id="rect14643"
-         style="fill:url(#linearGradient14677);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="546.11218"
-         x="677"
-         height="27"
-         width="14.5" />
-    </g>
-    <rect
-       id="rect14645"
-       style="fill:url(#linearGradient14679);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="203.6138"
-       x="348.25156"
-       height="33.496006"
-       width="33.496006" />
-    <path
-       id="path14647"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.27261233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 356.22131,235.25979 L 356.22131,207.02187" />
-    <path
-       id="path14649"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.27261233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 364.99957,235.25979 L 364.99957,207.02187" />
-    <path
-       id="path14651"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.27261233;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 373.77784,235.25979 L 373.77784,207.02187" />
-    <g
-       style="display:inline"
-       id="g14653"
-       transform="translate(-96.729733,-365.93933)">
-      <rect
-         y="578.69958"
-         x="467.31976"
-         height="10.957698"
-         width="6.6963706"
-         id="rect14655"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.34436721;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="580.40417"
-         x="468.41556"
-         height="7.5486355"
-         width="4.6265831"
-         id="rect14657"
-         style="opacity:1;fill:url(#linearGradient14681);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       style="display:inline"
-       transform="translate(-105.74534,-360.63603)"
-       id="g14659">
-      <rect
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.34436721;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect14661"
-         width="6.6963706"
-         height="10.957698"
-         x="467.31976"
-         y="578.69958" />
-      <rect
-         style="opacity:1;fill:url(#linearGradient14683);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect14663"
-         width="4.6265831"
-         height="7.5486355"
-         x="468.41556"
-         y="580.40417" />
-    </g>
-    <g
-       style="display:inline"
-       id="g14665"
-       transform="translate(-114.4074,-363.11091)">
-      <rect
-         y="578.69958"
-         x="467.31976"
-         height="10.957698"
-         width="6.6963706"
-         id="rect14667"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.34436721;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <rect
-         y="580.40417"
-         x="468.41556"
-         height="7.5486355"
-         width="4.6265831"
-         id="rect14669"
-         style="opacity:1;fill:url(#linearGradient14685);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       width="41.334045"
-       height="41.334045"
-       rx="0"
-       ry="0"
-       x="296.17447"
-       y="198.36298"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect16681" />
-    <g
-       id="g16707"
-       transform="translate(849.99998,-63.999998)">
-      <rect
-         y="269.53003"
-         x="-549.65851"
-         height="22.5"
-         width="33.5"
-         id="rect16683"
-         style="opacity:1;fill:#333333;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <rect
-         y="273.03003"
-         x="-546.15851"
-         height="9"
-         width="26"
-         id="rect16685"
-         style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <text
-         id="text16687"
-         y="280.08209"
-         x="-539.21191"
-         style="font-size:7.89853191px;font-style:normal;font-weight:normal;fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           y="280.08209"
-           x="-539.21191"
-           id="tspan16689"
-           sodipodi:role="line">1234</tspan></text>
-      <path
-         id="path16691"
-         d="M -546.15852,286.03003 L -520.65852,286.03003"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <g
-         transform="translate(-703.26566,-480.40358)"
-         id="g16693"
-         style="display:inline">
-        <path
-           style="fill:url(#linearGradient16699);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient16701);stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 163.21429,762.8979 L 163.21429,778.96933 C 169.18918,776.60095 175.46615,774.07658 180,770.75504 C 174.66202,767.10698 169.02779,764.64388 163.21429,762.8979 z "
-           id="path16695"
-           sodipodi:nodetypes="cccc" />
-        <path
-           style="fill:url(#linearGradient16703);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient16705);stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 171.79136,769.68303 C 168.72709,769.68303 165.85828,770.1268 163.49554,770.88459 L 163.49554,777.98214 C 169.16989,775.88352 175.12269,773.64741 179.45825,770.71693 C 177.21614,770.06809 174.60773,769.68302 171.79136,769.68303 z "
-           id="path16697" />
-      </g>
-    </g>
-    <rect
-       style="opacity:0;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect17763"
-       width="66.5"
-       height="60"
-       x="202.50003"
-       y="587.36218"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <g
-       id="g24597"
-       transform="translate(-438.00002,341.99999)">
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="5.250133"
-         height="5.3034863"
-         rx="1.6616579"
-         ry="1.6616576"
-         x="596.60822"
-         y="247.18004"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03204477;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17729" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="65.647148"
-         height="15.808088"
-         rx="3.6109443"
-         ry="3.6109436"
-         x="550.94476"
-         y="245.75606"
-         style="color:#000000;fill:url(#linearGradient20674);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17731" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="65.644463"
-         height="51.361164"
-         rx="0"
-         x="550.95654"
-         y="254.09529"
-         style="color:#000000;fill:url(#linearGradient20676);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17733" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         d="M 610.62428,248.50849 L 610.19569,248.93253 L 611.09722,249.83176 L 610.19569,250.72369 L 610.62428,251.15503 L 611.52581,250.25579 L 612.43473,251.15503 L 612.86333,250.72369 L 611.9618,249.83176 L 612.86333,248.93253 L 612.43473,248.50849 L 611.52581,249.40773 L 610.62428,248.50849 z "
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.2487205;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="path17735" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="3.0691075"
-         height="3.0364239"
-         x="603.8468"
-         y="248.31357"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.70561117;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17737" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="3.3248663"
-         height="0.33738044"
-         x="597.57086"
-         y="249.66309"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.70561117;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17739" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="10.912381"
-         height="9.4466524"
-         x="558.87445"
-         y="268.24072"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17741" />
-      <rect
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         width="10.912381"
-         height="9.4466524"
-         x="558.87445"
-         y="287.42447"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         id="rect17743" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         id="path18734"
-         d="M 559,271.36218 L 563.5,276.36218 L 569.5,266.86218"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         id="path20678"
-         d="M 576,272.36218 L 607.5,272.36218"
-         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#333333;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#333333;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 576,291.86218 L 607.5,291.86218"
-         id="path21649" />
-      <path
-         inkscape:export-ydpi="85"
-         inkscape:export-xdpi="85"
-         inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_view.png"
-         id="path21651"
-         d="M 576,276.86218 L 607.5,276.86218"
-         style="fill:#4d4d4d;fill-rule:evenodd;stroke:#333333;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g24582"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85"
-       transform="translate(-420.00002,341.99999)">
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path21665"
-         d="M 650,249.36218 L 631,267.86218 C 685.26159,262.68371 667.38995,281.08726 654.5,297.86218 C 691.93444,270.67633 683.07012,256.59391 650,249.36218 z "
-         style="fill:url(#linearGradient23611);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <text
-         id="text21661"
-         y="296.36218"
-         x="628.5"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         xml:space="preserve"><tspan
-           style="font-size:36px;font-weight:normal;font-family:Century"
-           y="296.36218"
-           x="628.5"
-           id="tspan21663"
-           sodipodi:role="line">Aa</tspan></text>
-    </g>
-    <rect
-       inkscape:export-ydpi="85"
-       inkscape:export-xdpi="85"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       y="587.36218"
-       x="202.50003"
-       height="60"
-       width="66.5"
-       id="rect24587"
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       inkscape:export-ydpi="85"
-       inkscape:export-xdpi="85"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\option_style.png"
-       id="g24589"
-       transform="translate(-420.00002,341.99999)">
-      <path
-         style="fill:url(#linearGradient4519);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 650,249.36218 L 631,267.86218 C 685.26159,262.68371 667.38995,281.08726 654.5,297.86218 C 691.93444,270.67633 683.07012,256.59391 650,249.36218 z "
-         id="path24591"
-         sodipodi:nodetypes="cccc" />
-      <text
-         xml:space="preserve"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="628.5"
-         y="296.36218"
-         id="text24593"><tspan
-           sodipodi:role="line"
-           id="tspan24595"
-           x="628.5"
-           y="296.36218"
-           style="font-size:36px;font-weight:normal;font-family:Century">Aa</tspan></text>
-    </g>
-    <rect
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect31683"
-       width="66.5"
-       height="60"
-       x="107.91422"
-       y="684.28351"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_authors.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <g
-       id="g32727"
-       transform="matrix(0.6116588,0,0,0.6116588,-276.80752,381.33365)"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_authors.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85">
-      <g
-         id="g32699">
-        <path
-           style="fill:url(#linearGradient32738);fill-opacity:1;stroke:url(#linearGradient32740);stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
-           d="M 660.78125,510 C 650.82801,510 642.75003,517.45241 642.75,526.625 C 642.75,531.03542 644.64187,535.0241 647.6875,538 C 642.01881,543.0774 636.5037,549.9304 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 687.01058,550.47601 680.87321,543.03088 674.21875,537.6875 C 677.07541,534.74701 678.81249,530.87939 678.8125,526.625 C 678.8125,517.45241 670.73449,510 660.78125,510 z "
-           id="path31685" />
-        <path
-           style="fill:url(#linearGradient32742);fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 659.71875,539.71875 C 653.11193,539.71875 647.00854,541.33674 641.96875,544.09375 C 638.51984,548.56832 635.48631,554.46212 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 688.34092,557.75226 686.47331,552.96151 684.15625,549 C 678.45679,543.34318 669.61983,539.71876 659.71875,539.71875 z "
-           id="path31710" />
-      </g>
-      <g
-         id="g32715"
-         transform="translate(43.84062,1.4142136)">
-        <path
-           style="fill:url(#linearGradient32744);fill-opacity:1;stroke:url(#linearGradient32746);stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
-           d="M 660.78125,510 C 650.82801,510 642.75003,517.45241 642.75,526.625 C 642.75,531.03542 644.64187,535.0241 647.6875,538 C 642.01881,543.0774 636.5037,549.9304 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 687.01058,550.47601 680.87321,543.03088 674.21875,537.6875 C 677.07541,534.74701 678.81249,530.87939 678.8125,526.625 C 678.8125,517.45241 670.73449,510 660.78125,510 z "
-           id="path32717" />
-        <path
-           style="fill:url(#linearGradient32748);fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 659.71875,539.71875 C 653.11193,539.71875 647.00854,541.33674 641.96875,544.09375 C 638.51984,548.56832 635.48631,554.46212 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 688.34092,557.75226 686.47331,552.96151 684.15625,549 C 678.45679,543.34318 669.61983,539.71876 659.71875,539.71875 z "
-           id="path32719" />
-      </g>
-      <g
-         transform="translate(22.627417,9.1923882)"
-         id="g32703">
-        <path
-           id="path32705"
-           d="M 660.78125,510 C 650.82801,510 642.75003,517.45241 642.75,526.625 C 642.75,531.03542 644.64187,535.0241 647.6875,538 C 642.01881,543.0774 636.5037,549.9304 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 687.01058,550.47601 680.87321,543.03088 674.21875,537.6875 C 677.07541,534.74701 678.81249,530.87939 678.8125,526.625 C 678.8125,517.45241 670.73449,510 660.78125,510 z "
-           style="fill:url(#linearGradient32750);fill-opacity:1;stroke:url(#linearGradient32752);stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
-        <path
-           id="path32707"
-           d="M 659.71875,539.71875 C 653.11193,539.71875 647.00854,541.33674 641.96875,544.09375 C 638.51984,548.56832 635.48631,554.46212 633.5625,563.03125 C 650.826,570.87338 668.46154,570.58075 689.4375,563.75 C 688.34092,557.75226 686.47331,552.96151 684.15625,549 C 678.45679,543.34318 669.61983,539.71876 659.71875,539.71875 z "
-           style="fill:url(#linearGradient32754);fill-opacity:1;stroke:#333333;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      </g>
-    </g>
-    <rect
-       inkscape:export-ydpi="85"
-       inkscape:export-xdpi="85"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_license.png"
-       y="676.3252"
-       x="205.0513"
-       height="60"
-       width="66.5"
-       id="rect32756"
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       id="g34724"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_license.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85"
-       transform="translate(-434.00002,159.99999)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path32758"
-         d="M 649.12402,524.15342 C 650.92972,539.70977 646.70505,555.26611 656.9022,570.82246 L 697.91439,570.11536 C 685.57145,554.79471 690.25808,539.47407 688.0149,524.15342 L 649.12402,524.15342 z "
-         style="fill:url(#linearGradient34698);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient34722);stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path34700"
-         d="M 655.48799,530.51738 L 667.5088,530.51738"
-         style="fill:#666666;fill-rule:evenodd;stroke:#999999;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         id="path34702"
-         d="M 656.19509,536.88134 L 683.06515,536.88134"
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 656.19509,541.12398 L 683.06515,541.12398"
-         id="path34706" />
-      <path
-         id="path34708"
-         d="M 656.19509,545.36662 L 683.06515,545.36662"
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 656.19509,549.60926 L 683.06515,549.60926"
-         id="path34710" />
-      <path
-         id="path34712"
-         d="M 657.6093,553.8519 L 684.47936,553.8519"
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:0.68351835px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 661.58554,561.63007 L 674.13916,561.63007"
-         id="path34714" />
-    </g>
-    <rect
-       style="opacity:0;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:0.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect34734"
-       width="66.5"
-       height="60"
-       x="288.56601"
-       y="675.0567"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_description.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <path
-       style="font-size:12px;font-style:normal;font-weight:normal;fill:url(#linearGradient34743);fill-opacity:1;stroke:url(#linearGradient35720);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       d="M 314.26497,681.62011 L 326.98372,681.62011 L 326.98372,690.27636 L 314.26497,690.27636 L 314.26497,681.62011 z M 314.26497,694.24511 L 326.98372,694.24511 L 326.98372,727.43261 L 314.26497,727.43261 L 314.26497,694.24511 z "
-       id="text34736"
-       inkscape:export-filename="C:\Programmi\tuxguitar-0.9.1-update1\share\files\about_description.png"
-       inkscape:export-xdpi="85"
-       inkscape:export-ydpi="85" />
-    <rect
-       id="rect6511"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="434.30661"
-       x="584.61633"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_1.png"
-       inkscape:export-xdpi="51.581074"
-       inkscape:export-ydpi="51.581074" />
-    <rect
-       id="rect6513"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="479.68161"
-       x="584.61633"
-       ry="0"
-       rx="0"
-       height="41.334045"
-       width="41.334045"
-       inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_2.png"
-       inkscape:export-xdpi="51.581074"
-       inkscape:export-ydpi="51.581074" />
-    <text
-       xml:space="preserve"
-       style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="779.29431"
-       y="358.28033"
-       id="text3736"
-       transform="scale(0.7694351,1.2996548)"
-       inkscape:label="#text3736"><tspan
-         sodipodi:role="line"
-         id="tspan3738"
-         x="779.29431"
-         y="358.28033">1</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       x="779.29431"
-       y="393.19342"
-       id="text3740"
-       transform="scale(0.7694351,1.2996548)"><tspan
-         sodipodi:role="line"
-         id="tspan3742"
-         x="779.29431"
-         y="393.19342">2</tspan></text>
-  </g>
-</svg>
diff --git a/TuxGuitar/share/skins/blue_serious/song_properties.png b/TuxGuitar/share/skins/blue_serious/song_properties.png
deleted file mode 100644
index dfdf04c1..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/song_properties.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/splash.png b/TuxGuitar/share/skins/blue_serious/splash.png
deleted file mode 100644
index 28885f3d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/splash.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/tempo.png b/TuxGuitar/share/skins/blue_serious/tempo.png
deleted file mode 100644
index a06586e8..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/tempo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/tempoicon.png b/TuxGuitar/share/skins/blue_serious/tempoicon.png
deleted file mode 100644
index 922047c4..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/tiednote.png b/TuxGuitar/share/skins/blue_serious/tiednote.png
deleted file mode 100644
index f1a76314..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/tiednote.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/timesignature.png b/TuxGuitar/share/skins/blue_serious/timesignature.png
deleted file mode 100644
index 657c7573..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/timesignature.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/track_add.png b/TuxGuitar/share/skins/blue_serious/track_add.png
deleted file mode 100644
index 68703b57..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/track_add.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/track_remove.png b/TuxGuitar/share/skins/blue_serious/track_remove.png
deleted file mode 100644
index 00f3b5a6..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/track_remove.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport.png b/TuxGuitar/share/skins/blue_serious/transport.png
deleted file mode 100644
index 84ba4ce4..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_first_1.png b/TuxGuitar/share/skins/blue_serious/transport_first_1.png
deleted file mode 100644
index 0df6449a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_first_2.png b/TuxGuitar/share/skins/blue_serious/transport_first_2.png
deleted file mode 100644
index bf6f597e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_first_1.png b/TuxGuitar/share/skins/blue_serious/transport_icon_first_1.png
deleted file mode 100644
index ec9f68bc..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_first_2.png b/TuxGuitar/share/skins/blue_serious/transport_icon_first_2.png
deleted file mode 100644
index 9b1c98e0..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_last_1.png b/TuxGuitar/share/skins/blue_serious/transport_icon_last_1.png
deleted file mode 100644
index 58308c97..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_last_2.png b/TuxGuitar/share/skins/blue_serious/transport_icon_last_2.png
deleted file mode 100644
index 6f995303..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_next_1.png b/TuxGuitar/share/skins/blue_serious/transport_icon_next_1.png
deleted file mode 100644
index 153ecf4e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_next_2.png b/TuxGuitar/share/skins/blue_serious/transport_icon_next_2.png
deleted file mode 100644
index af395e07..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_pause.png b/TuxGuitar/share/skins/blue_serious/transport_icon_pause.png
deleted file mode 100644
index 6d01ef3a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_play_1.png b/TuxGuitar/share/skins/blue_serious/transport_icon_play_1.png
deleted file mode 100644
index bae4b680..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_play_2.png b/TuxGuitar/share/skins/blue_serious/transport_icon_play_2.png
deleted file mode 100644
index 2a0fcd9d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_previous_1.png b/TuxGuitar/share/skins/blue_serious/transport_icon_previous_1.png
deleted file mode 100644
index 648de6b1..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_previous_2.png b/TuxGuitar/share/skins/blue_serious/transport_icon_previous_2.png
deleted file mode 100644
index 9dc2973e..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_stop_1.png b/TuxGuitar/share/skins/blue_serious/transport_icon_stop_1.png
deleted file mode 100644
index c9c7d9e8..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_icon_stop_2.png b/TuxGuitar/share/skins/blue_serious/transport_icon_stop_2.png
deleted file mode 100644
index 586d3df5..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_last_1.png b/TuxGuitar/share/skins/blue_serious/transport_last_1.png
deleted file mode 100644
index 415edb97..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_last_2.png b/TuxGuitar/share/skins/blue_serious/transport_last_2.png
deleted file mode 100644
index 3afb923a..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_metronome.png b/TuxGuitar/share/skins/blue_serious/transport_metronome.png
deleted file mode 100644
index be8f4119..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_mode.png b/TuxGuitar/share/skins/blue_serious/transport_mode.png
deleted file mode 100644
index b5720041..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_next_1.png b/TuxGuitar/share/skins/blue_serious/transport_next_1.png
deleted file mode 100644
index 7fcfe81f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_next_2.png b/TuxGuitar/share/skins/blue_serious/transport_next_2.png
deleted file mode 100644
index e687766b..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_pause.png b/TuxGuitar/share/skins/blue_serious/transport_pause.png
deleted file mode 100644
index da2f5427..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_play_1.png b/TuxGuitar/share/skins/blue_serious/transport_play_1.png
deleted file mode 100644
index e73beb0d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_play_2.png b/TuxGuitar/share/skins/blue_serious/transport_play_2.png
deleted file mode 100644
index 38573cc3..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_previous_1.png b/TuxGuitar/share/skins/blue_serious/transport_previous_1.png
deleted file mode 100644
index b89f4713..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_previous_2.png b/TuxGuitar/share/skins/blue_serious/transport_previous_2.png
deleted file mode 100644
index c3d41af4..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_stop_1.png b/TuxGuitar/share/skins/blue_serious/transport_stop_1.png
deleted file mode 100644
index a6c28e8f..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/transport_stop_2.png b/TuxGuitar/share/skins/blue_serious/transport_stop_2.png
deleted file mode 100644
index 0a2355ba..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/blue_serious/tupleto.png b/TuxGuitar/share/skins/blue_serious/tupleto.png
deleted file mode 100644
index eb47b50d..00000000
Binary files a/TuxGuitar/share/skins/blue_serious/tupleto.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/1.png b/TuxGuitar/share/skins/ersplus/1.png
deleted file mode 100644
index e5d1bf37..00000000
Binary files a/TuxGuitar/share/skins/ersplus/1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/16.png b/TuxGuitar/share/skins/ersplus/16.png
deleted file mode 100644
index c2ab703c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/16.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/2.png b/TuxGuitar/share/skins/ersplus/2.png
deleted file mode 100644
index f7fa1cfd..00000000
Binary files a/TuxGuitar/share/skins/ersplus/2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/32.png b/TuxGuitar/share/skins/ersplus/32.png
deleted file mode 100644
index a88e284b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/32.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/4.png b/TuxGuitar/share/skins/ersplus/4.png
deleted file mode 100644
index 603799d5..00000000
Binary files a/TuxGuitar/share/skins/ersplus/4.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/64.png b/TuxGuitar/share/skins/ersplus/64.png
deleted file mode 100644
index f91b54f8..00000000
Binary files a/TuxGuitar/share/skins/ersplus/64.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/8.png b/TuxGuitar/share/skins/ersplus/8.png
deleted file mode 100644
index 42a3efda..00000000
Binary files a/TuxGuitar/share/skins/ersplus/8.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/about_authors.png b/TuxGuitar/share/skins/ersplus/about_authors.png
deleted file mode 100644
index 7c1a345d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/about_authors.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/about_description.png b/TuxGuitar/share/skins/ersplus/about_description.png
deleted file mode 100644
index d3082947..00000000
Binary files a/TuxGuitar/share/skins/ersplus/about_description.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/about_license.png b/TuxGuitar/share/skins/ersplus/about_license.png
deleted file mode 100644
index dbdd97a2..00000000
Binary files a/TuxGuitar/share/skins/ersplus/about_license.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/browser_back.png b/TuxGuitar/share/skins/ersplus/browser_back.png
deleted file mode 100644
index 8a36e093..00000000
Binary files a/TuxGuitar/share/skins/ersplus/browser_back.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/browser_file.png b/TuxGuitar/share/skins/ersplus/browser_file.png
deleted file mode 100644
index 50882171..00000000
Binary files a/TuxGuitar/share/skins/ersplus/browser_file.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/browser_folder.png b/TuxGuitar/share/skins/ersplus/browser_folder.png
deleted file mode 100644
index 1b19b3ca..00000000
Binary files a/TuxGuitar/share/skins/ersplus/browser_folder.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/browser_new.png b/TuxGuitar/share/skins/ersplus/browser_new.png
deleted file mode 100644
index 72a6ea21..00000000
Binary files a/TuxGuitar/share/skins/ersplus/browser_new.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/browser_refresh.png b/TuxGuitar/share/skins/ersplus/browser_refresh.png
deleted file mode 100644
index 42d08729..00000000
Binary files a/TuxGuitar/share/skins/ersplus/browser_refresh.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/browser_root.png b/TuxGuitar/share/skins/ersplus/browser_root.png
deleted file mode 100644
index db0d5a5f..00000000
Binary files a/TuxGuitar/share/skins/ersplus/browser_root.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/chord.png b/TuxGuitar/share/skins/ersplus/chord.png
deleted file mode 100644
index 97fbd00b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/chord.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/closerepeat.png b/TuxGuitar/share/skins/ersplus/closerepeat.png
deleted file mode 100644
index cd0810ac..00000000
Binary files a/TuxGuitar/share/skins/ersplus/closerepeat.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/division-type.png b/TuxGuitar/share/skins/ersplus/division-type.png
deleted file mode 100644
index eb47b50d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/division-type.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dotted.png b/TuxGuitar/share/skins/ersplus/dotted.png
deleted file mode 100644
index d963a7e5..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dotted.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/doubledotted.png b/TuxGuitar/share/skins/ersplus/doubledotted.png
deleted file mode 100644
index 0ae90818..00000000
Binary files a/TuxGuitar/share/skins/ersplus/doubledotted.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_f.png b/TuxGuitar/share/skins/ersplus/dynamic_f.png
deleted file mode 100644
index 042cf3db..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_f.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_ff.png b/TuxGuitar/share/skins/ersplus/dynamic_ff.png
deleted file mode 100644
index dc16cd8f..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_ff.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_fff.png b/TuxGuitar/share/skins/ersplus/dynamic_fff.png
deleted file mode 100644
index 94dedd52..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_fff.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_mf.png b/TuxGuitar/share/skins/ersplus/dynamic_mf.png
deleted file mode 100644
index 6a2d1082..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_mf.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_mp.png b/TuxGuitar/share/skins/ersplus/dynamic_mp.png
deleted file mode 100644
index acb00776..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_mp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_p.png b/TuxGuitar/share/skins/ersplus/dynamic_p.png
deleted file mode 100644
index 8560e077..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_p.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_pp.png b/TuxGuitar/share/skins/ersplus/dynamic_pp.png
deleted file mode 100644
index b5f3145f..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_pp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/dynamic_ppp.png b/TuxGuitar/share/skins/ersplus/dynamic_ppp.png
deleted file mode 100644
index 1c14f87e..00000000
Binary files a/TuxGuitar/share/skins/ersplus/dynamic_ppp.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_mode_edition.png b/TuxGuitar/share/skins/ersplus/edit_mode_edition.png
deleted file mode 100644
index 4ad565ae..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_mode_edition.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_mode_edition_no_natural.png b/TuxGuitar/share/skins/ersplus/edit_mode_edition_no_natural.png
deleted file mode 100644
index 277f7ba7..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_mode_edition_no_natural.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_mode_selection.png b/TuxGuitar/share/skins/ersplus/edit_mode_selection.png
deleted file mode 100644
index 957b5ef2..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_mode_selection.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_redo.png b/TuxGuitar/share/skins/ersplus/edit_redo.png
deleted file mode 100644
index 117501f1..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_redo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_undo.png b/TuxGuitar/share/skins/ersplus/edit_undo.png
deleted file mode 100644
index ecc4266c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_undo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_voice_1.png b/TuxGuitar/share/skins/ersplus/edit_voice_1.png
deleted file mode 100644
index 95957147..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_voice_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/edit_voice_2.png b/TuxGuitar/share/skins/ersplus/edit_voice_2.png
deleted file mode 100644
index f9a90d44..00000000
Binary files a/TuxGuitar/share/skins/ersplus/edit_voice_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_accentuated.png b/TuxGuitar/share/skins/ersplus/effect_accentuated.png
deleted file mode 100644
index ccbac086..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_accentuated.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_bend.png b/TuxGuitar/share/skins/ersplus/effect_bend.png
deleted file mode 100644
index a49c9602..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_bend.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_dead.png b/TuxGuitar/share/skins/ersplus/effect_dead.png
deleted file mode 100644
index 68111440..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_dead.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_fade_in.png b/TuxGuitar/share/skins/ersplus/effect_fade_in.png
deleted file mode 100644
index 0b48773b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_fade_in.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_ghost.png b/TuxGuitar/share/skins/ersplus/effect_ghost.png
deleted file mode 100644
index af04c4e8..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_ghost.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_grace.png b/TuxGuitar/share/skins/ersplus/effect_grace.png
deleted file mode 100644
index 079f3452..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_grace.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_hammer.png b/TuxGuitar/share/skins/ersplus/effect_hammer.png
deleted file mode 100644
index 5eec73ab..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_hammer.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_harmonic.png b/TuxGuitar/share/skins/ersplus/effect_harmonic.png
deleted file mode 100644
index 29239335..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_harmonic.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_heavy_accentuated.png b/TuxGuitar/share/skins/ersplus/effect_heavy_accentuated.png
deleted file mode 100644
index c62fac99..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_heavy_accentuated.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_palm_mute.png b/TuxGuitar/share/skins/ersplus/effect_palm_mute.png
deleted file mode 100644
index 77144368..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_palm_mute.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_popping.png b/TuxGuitar/share/skins/ersplus/effect_popping.png
deleted file mode 100644
index 8012eef9..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_popping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_slapping.png b/TuxGuitar/share/skins/ersplus/effect_slapping.png
deleted file mode 100644
index dc64d579..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_slapping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_slide.png b/TuxGuitar/share/skins/ersplus/effect_slide.png
deleted file mode 100644
index 731a67f3..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_slide.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_staccato.png b/TuxGuitar/share/skins/ersplus/effect_staccato.png
deleted file mode 100644
index f3adff74..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_staccato.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_tapping.png b/TuxGuitar/share/skins/ersplus/effect_tapping.png
deleted file mode 100644
index c624cf1d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_tapping.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_tremolo_bar.png b/TuxGuitar/share/skins/ersplus/effect_tremolo_bar.png
deleted file mode 100644
index ed7fd9d6..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_tremolo_bar.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_tremolo_picking.png b/TuxGuitar/share/skins/ersplus/effect_tremolo_picking.png
deleted file mode 100644
index f3daa7d7..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_tremolo_picking.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_trill.png b/TuxGuitar/share/skins/ersplus/effect_trill.png
deleted file mode 100644
index f9524f87..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_trill.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/effect_vibrato.png b/TuxGuitar/share/skins/ersplus/effect_vibrato.png
deleted file mode 100644
index ae5dcca7..00000000
Binary files a/TuxGuitar/share/skins/ersplus/effect_vibrato.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/firstfret.png b/TuxGuitar/share/skins/ersplus/firstfret.png
deleted file mode 100644
index 2313352d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/firstfret.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/fret.png b/TuxGuitar/share/skins/ersplus/fret.png
deleted file mode 100644
index 479d6a7b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/fret.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/fretboard.png b/TuxGuitar/share/skins/ersplus/fretboard.png
deleted file mode 100644
index 703cc167..00000000
Binary files a/TuxGuitar/share/skins/ersplus/fretboard.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/grace.png b/TuxGuitar/share/skins/ersplus/grace.png
deleted file mode 100644
index 6c67a4cb..00000000
Binary files a/TuxGuitar/share/skins/ersplus/grace.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon-16x16.png b/TuxGuitar/share/skins/ersplus/icon-16x16.png
deleted file mode 100644
index 4ba40d81..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon-16x16.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon-24x24.png b/TuxGuitar/share/skins/ersplus/icon-24x24.png
deleted file mode 100644
index e86a3e3f..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon-24x24.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon-32x32.png b/TuxGuitar/share/skins/ersplus/icon-32x32.png
deleted file mode 100644
index ff0884f4..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon-32x32.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon-48x48.png b/TuxGuitar/share/skins/ersplus/icon-48x48.png
deleted file mode 100644
index 39267cf9..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon-48x48.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon-64x64.png b/TuxGuitar/share/skins/ersplus/icon-64x64.png
deleted file mode 100644
index 68352107..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon-64x64.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon-96x96.png b/TuxGuitar/share/skins/ersplus/icon-96x96.png
deleted file mode 100644
index 5941ec30..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon-96x96.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon.icns b/TuxGuitar/share/skins/ersplus/icon.icns
deleted file mode 100644
index 430239df..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon.icns and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon.ico b/TuxGuitar/share/skins/ersplus/icon.ico
deleted file mode 100644
index 5a7b85f0..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon.ico and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/icon.png b/TuxGuitar/share/skins/ersplus/icon.png
deleted file mode 100644
index 68352107..00000000
Binary files a/TuxGuitar/share/skins/ersplus/icon.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/layout_compact.png b/TuxGuitar/share/skins/ersplus/layout_compact.png
deleted file mode 100644
index d765101e..00000000
Binary files a/TuxGuitar/share/skins/ersplus/layout_compact.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/layout_linear.png b/TuxGuitar/share/skins/ersplus/layout_linear.png
deleted file mode 100644
index cce67ef6..00000000
Binary files a/TuxGuitar/share/skins/ersplus/layout_linear.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/layout_multitrack.png b/TuxGuitar/share/skins/ersplus/layout_multitrack.png
deleted file mode 100644
index ce963dc1..00000000
Binary files a/TuxGuitar/share/skins/ersplus/layout_multitrack.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/layout_page.png b/TuxGuitar/share/skins/ersplus/layout_page.png
deleted file mode 100644
index b7d11f79..00000000
Binary files a/TuxGuitar/share/skins/ersplus/layout_page.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/layout_score.png b/TuxGuitar/share/skins/ersplus/layout_score.png
deleted file mode 100644
index 6f4c454c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/layout_score.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/logo.png b/TuxGuitar/share/skins/ersplus/logo.png
deleted file mode 100644
index 06e6deb8..00000000
Binary files a/TuxGuitar/share/skins/ersplus/logo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_add.png b/TuxGuitar/share/skins/ersplus/marker_add.png
deleted file mode 100644
index 627c7a3c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_add.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_first.png b/TuxGuitar/share/skins/ersplus/marker_first.png
deleted file mode 100644
index 94383cbf..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_first.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_last.png b/TuxGuitar/share/skins/ersplus/marker_last.png
deleted file mode 100644
index 6d4f6624..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_last.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_list.png b/TuxGuitar/share/skins/ersplus/marker_list.png
deleted file mode 100644
index cd216eaf..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_list.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_next.png b/TuxGuitar/share/skins/ersplus/marker_next.png
deleted file mode 100644
index f501f5bc..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_next.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_previous.png b/TuxGuitar/share/skins/ersplus/marker_previous.png
deleted file mode 100644
index 46179024..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_previous.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/marker_remove.png b/TuxGuitar/share/skins/ersplus/marker_remove.png
deleted file mode 100644
index bb6b6f6c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/marker_remove.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/mixer.png b/TuxGuitar/share/skins/ersplus/mixer.png
deleted file mode 100644
index 8407d19a..00000000
Binary files a/TuxGuitar/share/skins/ersplus/mixer.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/new.png b/TuxGuitar/share/skins/ersplus/new.png
deleted file mode 100644
index 72a6ea21..00000000
Binary files a/TuxGuitar/share/skins/ersplus/new.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/open.png b/TuxGuitar/share/skins/ersplus/open.png
deleted file mode 100644
index 6bb147ad..00000000
Binary files a/TuxGuitar/share/skins/ersplus/open.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/openrepeat.png b/TuxGuitar/share/skins/ersplus/openrepeat.png
deleted file mode 100644
index 680d64fc..00000000
Binary files a/TuxGuitar/share/skins/ersplus/openrepeat.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/option_language.png b/TuxGuitar/share/skins/ersplus/option_language.png
deleted file mode 100644
index 88435ccb..00000000
Binary files a/TuxGuitar/share/skins/ersplus/option_language.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/option_skin.png b/TuxGuitar/share/skins/ersplus/option_skin.png
deleted file mode 100644
index 7a19c688..00000000
Binary files a/TuxGuitar/share/skins/ersplus/option_skin.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/option_sound.png b/TuxGuitar/share/skins/ersplus/option_sound.png
deleted file mode 100644
index c025de62..00000000
Binary files a/TuxGuitar/share/skins/ersplus/option_sound.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/option_style.png b/TuxGuitar/share/skins/ersplus/option_style.png
deleted file mode 100644
index 4f02fb5c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/option_style.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/option_toolbars.png b/TuxGuitar/share/skins/ersplus/option_toolbars.png
deleted file mode 100644
index ac2721d5..00000000
Binary files a/TuxGuitar/share/skins/ersplus/option_toolbars.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/option_view.png b/TuxGuitar/share/skins/ersplus/option_view.png
deleted file mode 100644
index 3bed1f1a..00000000
Binary files a/TuxGuitar/share/skins/ersplus/option_view.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/print-preview.png b/TuxGuitar/share/skins/ersplus/print-preview.png
deleted file mode 100644
index 37b2d65c..00000000
Binary files a/TuxGuitar/share/skins/ersplus/print-preview.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/print.png b/TuxGuitar/share/skins/ersplus/print.png
deleted file mode 100644
index 9eedd7cb..00000000
Binary files a/TuxGuitar/share/skins/ersplus/print.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/repeat_alternative.png b/TuxGuitar/share/skins/ersplus/repeat_alternative.png
deleted file mode 100644
index bdceba2a..00000000
Binary files a/TuxGuitar/share/skins/ersplus/repeat_alternative.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/save-as.png b/TuxGuitar/share/skins/ersplus/save-as.png
deleted file mode 100644
index bc4de636..00000000
Binary files a/TuxGuitar/share/skins/ersplus/save-as.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/save.png b/TuxGuitar/share/skins/ersplus/save.png
deleted file mode 100644
index 2655790f..00000000
Binary files a/TuxGuitar/share/skins/ersplus/save.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/settings.png b/TuxGuitar/share/skins/ersplus/settings.png
deleted file mode 100644
index f077d28b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/settings.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/skin-preview.png b/TuxGuitar/share/skins/ersplus/skin-preview.png
deleted file mode 100644
index a14bd93b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/skin-preview.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/skin.properties b/TuxGuitar/share/skins/ersplus/skin.properties
deleted file mode 100644
index 496578cd..00000000
--- a/TuxGuitar/share/skins/ersplus/skin.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-name=Ersplus
-author=Ersplus <ersplus@gmail.com> http://ersplus.free.fr
-description=Default tuxguitar theme.
-date=2007-01-29
-version=0.9
-preview=skin-preview.png
\ No newline at end of file
diff --git a/TuxGuitar/share/skins/ersplus/skin.svg b/TuxGuitar/share/skins/ersplus/skin.svg
deleted file mode 100644
index 8f9e43f8..00000000
--- a/TuxGuitar/share/skins/ersplus/skin.svg
+++ /dev/null
@@ -1,8660 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="210mm"
-   height="297mm"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="skin.svg"
-   sodipodi:docbase="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <metadata
-     id="metadata21859">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="931"
-     inkscape:window-width="1280"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="1"
-     inkscape:cx="402.19652"
-     inkscape:cy="712.44342"
-     inkscape:window-x="0"
-     inkscape:window-y="33"
-     inkscape:current-layer="svg2"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showgrid="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3751" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective1361" />
-    <marker
-       inkscape:stockid="CurveIn"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="CurveIn"
-       style="overflow:visible">
-      <path
-         id="path5615"
-         d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none;fill:none"
-         transform="scale(0.6)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Mstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mstart"
-       style="overflow:visible">
-      <path
-         id="path4606"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Sstart"
-       style="overflow:visible">
-      <path
-         id="path4600"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.3) translate(-2.3,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="TriangleInM"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="TriangleInM"
-       style="overflow:visible">
-      <path
-         id="path4538"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.4)" />
-    </marker>
-    <linearGradient
-       id="linearGradient9644">
-      <stop
-         style="stop-color:#f8e70a;stop-opacity:1;"
-         offset="0"
-         id="stop9646" />
-      <stop
-         style="stop-color:#ffa021;stop-opacity:0;"
-         offset="1"
-         id="stop9648" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient3382"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       id="linearGradient15469">
-      <stop
-         style="stop-color:#e40000;stop-opacity:1;"
-         offset="0"
-         id="stop15471" />
-      <stop
-         style="stop-color:#ffa700;stop-opacity:1;"
-         offset="1"
-         id="stop15473" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10979">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop10981" />
-      <stop
-         style="stop-color:yellow;stop-opacity:1;"
-         offset="1"
-         id="stop10983" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9201">
-      <stop
-         style="stop-color:#007d00;stop-opacity:1;"
-         offset="0"
-         id="stop9203" />
-      <stop
-         style="stop-color:#00d900;stop-opacity:0;"
-         offset="1"
-         id="stop9205" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16486">
-      <stop
-         style="stop-color:#008930;stop-opacity:1;"
-         offset="0"
-         id="stop16488" />
-      <stop
-         style="stop-color:black;stop-opacity:0.37113401;"
-         offset="1"
-         id="stop16490" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient10211">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop10213" />
-      <stop
-         style="stop-color:#1e9f9f;stop-opacity:1;"
-         offset="1"
-         id="stop10215" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6102">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6104" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6106" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5207">
-      <stop
-         id="stop5209"
-         offset="0"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         id="stop5211"
-         offset="1"
-         style="stop-color:#3764ff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5199">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5201" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5203" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5941">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop5943" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop5945" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14138">
-      <stop
-         style="stop-color:#afc6e9;stop-opacity:1;"
-         offset="0"
-         id="stop14140" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop14142" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9152">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop9154" />
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="1"
-         id="stop9156" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4809">
-      <stop
-         id="stop4811"
-         offset="0"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         id="stop4813"
-         offset="1"
-         style="stop-color:black;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6481">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop6483" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop6485" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9267">
-      <stop
-         style="stop-color:#ffd428;stop-opacity:1;"
-         offset="0"
-         id="stop9269" />
-      <stop
-         id="stop10163"
-         offset="0.5"
-         style="stop-color:white;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffd322;stop-opacity:1;"
-         offset="1"
-         id="stop9271" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9267"
-       id="linearGradient20340"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.105702,-0.132634,0.122908,0.142271,-123.5758,437.4912)"
-       x1="205.4043"
-       y1="464.48911"
-       x2="207.19127"
-       y2="498.23825" />
-    <linearGradient
-       id="linearGradient7463">
-      <stop
-         style="stop-color:lime;stop-opacity:1;"
-         offset="0"
-         id="stop7465" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop7467" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7463"
-       id="linearGradient20338"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.120379,0.139344,-0.171115,0.214715,20.77584,293.7269)"
-       x1="331.695"
-       y1="486.6479"
-       x2="399.73358"
-       y2="486.6479" />
-    <linearGradient
-       id="linearGradient19203">
-      <stop
-         style="stop-color:#a49e88;stop-opacity:1;"
-         offset="0"
-         id="stop19205" />
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="1"
-         id="stop19207" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19203"
-       id="linearGradient20336"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.463664,0.283515,-0.266017,0.432012,-24.98543,167.9069)"
-       x1="209.59592"
-       y1="469.32986"
-       x2="228.7281"
-       y2="494.3299" />
-    <linearGradient
-       id="linearGradient14711">
-      <stop
-         style="stop-color:#f4e3d7;stop-opacity:1"
-         offset="0"
-         id="stop14713" />
-      <stop
-         style="stop-color:#f4e3d7;stop-opacity:0"
-         offset="1"
-         id="stop14715" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12779">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop12781" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop12783" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7720">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop7722" />
-      <stop
-         style="stop-color:#81ed9e;stop-opacity:1"
-         offset="1"
-         id="stop7724" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5684">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop5686" />
-      <stop
-         style="stop-color:black;stop-opacity:0"
-         offset="1"
-         id="stop5688" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4672">
-      <stop
-         style="stop-color:#9b9b9b;stop-opacity:1"
-         offset="0"
-         id="stop4674" />
-      <stop
-         style="stop-color:#2f2f2f;stop-opacity:1"
-         offset="1"
-         id="stop4676" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4644">
-      <stop
-         style="stop-color:#f5f5f5;stop-opacity:1"
-         offset="0"
-         id="stop4646" />
-      <stop
-         style="stop-color:#9e9e9e;stop-opacity:1"
-         offset="1"
-         id="stop4648" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6846">
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="0"
-         id="stop6848" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6852" />
-      <stop
-         style="stop-color:aqua;stop-opacity:1"
-         offset="1"
-         id="stop6850" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6830">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop6832" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6836" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="1"
-         id="stop6834" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6814">
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="0"
-         id="stop6816" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6820" />
-      <stop
-         style="stop-color:blue;stop-opacity:1"
-         offset="1"
-         id="stop6818" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6798">
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="0"
-         id="stop6800" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0.5"
-         id="stop6804" />
-      <stop
-         style="stop-color:lime;stop-opacity:1"
-         offset="1"
-         id="stop6802" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11729">
-      <stop
-         style="stop-color:#806805;stop-opacity:1"
-         offset="0"
-         id="stop11731" />
-      <stop
-         style="stop-color:#e1e2ce;stop-opacity:1"
-         offset="0.44999999"
-         id="stop11735" />
-      <stop
-         style="stop-color:#b4a66d;stop-opacity:1"
-         offset="1"
-         id="stop11733" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9900">
-      <stop
-         style="stop-color:#ffd988;stop-opacity:1"
-         offset="0"
-         id="stop9902" />
-      <stop
-         style="stop-color:#97812c;stop-opacity:1"
-         offset="1"
-         id="stop9904" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient9009">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop9011" />
-      <stop
-         style="stop-color:#d3bc5f;stop-opacity:1"
-         offset="1"
-         id="stop9013" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3974">
-      <stop
-         style="stop-color:#dd9600;stop-opacity:1"
-         offset="0"
-         id="stop3976" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop3978" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4856">
-      <stop
-         style="stop-color:white;stop-opacity:0.84536082"
-         offset="0"
-         id="stop4858" />
-      <stop
-         style="stop-color:#6898f1;stop-opacity:0.46391752"
-         offset="1"
-         id="stop4860" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4791">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop4793" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4795" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient33795">
-      <stop
-         style="stop-color:#ff9e00;stop-opacity:1"
-         offset="0"
-         id="stop33801" />
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0.5"
-         id="stop33803" />
-      <stop
-         style="stop-color:#ffffa0;stop-opacity:1"
-         offset="1"
-         id="stop33799" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21032">
-      <stop
-         style="stop-color:red;stop-opacity:1"
-         offset="0"
-         id="stop21034" />
-      <stop
-         style="stop-color:red;stop-opacity:0"
-         offset="1"
-         id="stop21036" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient20139">
-      <stop
-         style="stop-color:#5696f6;stop-opacity:1"
-         offset="0"
-         id="stop20141" />
-      <stop
-         style="stop-color:#5696f6;stop-opacity:0"
-         offset="1"
-         id="stop20143" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient19246">
-      <stop
-         style="stop-color:#f95;stop-opacity:1"
-         offset="0"
-         id="stop19248" />
-      <stop
-         style="stop-color:#f95;stop-opacity:0"
-         offset="1"
-         id="stop19250" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient18353">
-      <stop
-         style="stop-color:yellow;stop-opacity:1"
-         offset="0"
-         id="stop18355" />
-      <stop
-         style="stop-color:yellow;stop-opacity:0"
-         offset="1"
-         id="stop18357" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6462">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop6464" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop6466" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5880">
-      <stop
-         style="stop-color:#6d91d4;stop-opacity:1"
-         offset="0"
-         id="stop5882" />
-      <stop
-         style="stop-color:black;stop-opacity:0.02061856"
-         offset="1"
-         id="stop5884" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient32988">
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="0"
-         id="stop32990" />
-      <stop
-         style="stop-color:#cbcbcb;stop-opacity:1"
-         offset="0.5"
-         id="stop32994" />
-      <stop
-         style="stop-color:black;stop-opacity:1"
-         offset="1"
-         id="stop32992" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11686">
-      <stop
-         style="stop-color:#ffc602;stop-opacity:1"
-         offset="0"
-         id="stop11688" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop11690" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4552">
-      <stop
-         style="stop-color:#ffcd1d;stop-opacity:1"
-         offset="0"
-         id="stop4554" />
-      <stop
-         style="stop-color:#ffe691;stop-opacity:1"
-         offset="0.67500001"
-         id="stop6334" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop4556" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3661">
-      <stop
-         style="stop-color:#ffd74f;stop-opacity:1"
-         offset="0"
-         id="stop3663" />
-      <stop
-         style="stop-color:#795d00;stop-opacity:0"
-         offset="1"
-         id="stop3665" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient21068">
-      <stop
-         style="stop-color:#999;stop-opacity:1"
-         offset="0"
-         id="stop21070" />
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="1"
-         id="stop21072" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient16226">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop16228" />
-      <stop
-         style="stop-color:#e85700;stop-opacity:1"
-         offset="1"
-         id="stop16230" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient14070">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop14072" />
-      <stop
-         style="stop-color:#8e8e8e;stop-opacity:1"
-         offset="1"
-         id="stop14074" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1315">
-      <stop
-         style="stop-color:white;stop-opacity:1"
-         offset="0"
-         id="stop1317" />
-      <stop
-         style="stop-color:black;stop-opacity:0.73958325"
-         offset="1"
-         id="stop1319" />
-    </linearGradient>
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14528"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.654622,1.623305,-1.369812,-1.396152,926.1889,-533.1723)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14544"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,758.4821,146.9962)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14557"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,984.3714,146.9961)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14565"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-168.9821,146.9962)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14573"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,532.5927,146.9962)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14577"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,645.5374,146.9961)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14698"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-167.3496,22.52986)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14700"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,530.9602,22.52986)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14702"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,643.9049,22.52983)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient14704"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,982.7389,22.5298)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient1673"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,23.07442,-120.0138)" />
-    <radialGradient
-       cx="400.31589"
-       cy="2.521359"
-       r="72.066078"
-       fx="400.31589"
-       fy="2.521359"
-       id="radialGradient1688"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,411.4735,-120.7104)" />
-    <linearGradient
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218"
-       id="linearGradient31977"
-       xlink:href="#linearGradient21068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)" />
-    <linearGradient
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311"
-       id="linearGradient31979"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)" />
-    <radialGradient
-       cx="552.50104"
-       cy="862.58081"
-       r="43.5"
-       fx="552.50104"
-       fy="862.58081"
-       id="radialGradient31999"
-       xlink:href="#linearGradient16226"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect" />
-    <radialGradient
-       cx="552.50104"
-       cy="862.58081"
-       r="43.5"
-       fx="552.50104"
-       fy="862.58081"
-       id="radialGradient32063"
-       xlink:href="#linearGradient16226"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect" />
-    <linearGradient
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218"
-       id="linearGradient32065"
-       xlink:href="#linearGradient21068"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)" />
-    <linearGradient
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311"
-       id="linearGradient32067"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)" />
-    <linearGradient
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218"
-       id="linearGradient34916"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)" />
-    <linearGradient
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218"
-       id="linearGradient34918"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)" />
-    <linearGradient
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218"
-       id="linearGradient34920"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)" />
-    <linearGradient
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218"
-       id="linearGradient34922"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)" />
-    <linearGradient
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218"
-       id="linearGradient34924"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)" />
-    <linearGradient
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847"
-       id="linearGradient42567"
-       xlink:href="#linearGradient11686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)" />
-    <linearGradient
-       x1="277.07773"
-       y1="733.53235"
-       x2="278.26602"
-       y2="793.7782"
-       id="linearGradient45285"
-       xlink:href="#linearGradient4552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640794,0,-0.129638,0.698173,95.93458,46.3081)" />
-    <linearGradient
-       x1="117.67873"
-       y1="688.06342"
-       x2="116.00877"
-       y2="771.71283"
-       id="linearGradient45290"
-       xlink:href="#linearGradient3661"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640077,0,0,0.78567,90.88485,-10.2088)" />
-    <linearGradient
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218"
-       id="linearGradient45308"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)" />
-    <radialGradient
-       cx="209.83412"
-       cy="683.00934"
-       r="42.25"
-       fx="209.83412"
-       fy="683.00934"
-       id="radialGradient6540"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218"
-       id="linearGradient6542"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="209.83412"
-       cy="683.00934"
-       r="42.25"
-       fx="209.83412"
-       fy="683.00934"
-       id="radialGradient6544"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218"
-       id="linearGradient6546"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218"
-       id="linearGradient5922"
-       xlink:href="#linearGradient14070"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)" />
-    <linearGradient
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321"
-       id="linearGradient5940"
-       xlink:href="#linearGradient5880"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643"
-       id="linearGradient4651"
-       xlink:href="#linearGradient32988"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)" />
-    <radialGradient
-       cx="360.55887"
-       cy="686.36542"
-       r="13.25"
-       fx="360.55887"
-       fy="686.36542"
-       id="radialGradient7371"
-       xlink:href="#linearGradient6462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)" />
-    <radialGradient
-       cx="360.55887"
-       cy="686.36542"
-       r="13.25"
-       fx="360.55887"
-       fy="686.36542"
-       id="radialGradient7497"
-       xlink:href="#linearGradient6462"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)" />
-    <linearGradient
-       x1="445.06726"
-       y1="987.36212"
-       x2="517.55859"
-       y2="987.36212"
-       id="linearGradient21090"
-       xlink:href="#linearGradient21032"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="341.58902"
-       y1="987.36212"
-       x2="414.08035"
-       y2="987.36212"
-       id="linearGradient21092"
-       xlink:href="#linearGradient20139"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212"
-       id="linearGradient21096"
-       xlink:href="#linearGradient19246"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105"
-       id="linearGradient21098"
-       xlink:href="#linearGradient18353"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105"
-       id="linearGradient21120"
-       xlink:href="#linearGradient18353"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(524.0663,-56)" />
-    <linearGradient
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212"
-       id="linearGradient22896"
-       xlink:href="#linearGradient19246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(523.8557,-56)" />
-    <linearGradient
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847"
-       id="linearGradient22916"
-       xlink:href="#linearGradient11686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)" />
-    <linearGradient
-       x1="236.75435"
-       y1="987.36212"
-       x2="309.24567"
-       y2="987.36212"
-       id="linearGradient22929"
-       xlink:href="#linearGradient11686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-56)" />
-    <linearGradient
-       x1="212.87547"
-       y1="991.43274"
-       x2="348.82919"
-       y2="991.43274"
-       id="linearGradient4813"
-       xlink:href="#linearGradient1315"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,19.86901)" />
-    <linearGradient
-       x1="212.15625"
-       y1="1068.7657"
-       x2="349.5625"
-       y2="1068.7657"
-       id="linearGradient4815"
-       xlink:href="#linearGradient33795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.701288,0,0,0.704615,92.93315,227.5991)" />
-    <linearGradient
-       x1="313.19742"
-       y1="886.34753"
-       x2="399.59286"
-       y2="886.34753"
-       id="linearGradient4817"
-       xlink:href="#linearGradient4791"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.920046,0,0,1.086901,0,13.71543)" />
-    <radialGradient
-       cx="964.30762"
-       cy="803.47638"
-       r="91.57444"
-       fx="964.30762"
-       fy="803.47638"
-       id="radialGradient12168"
-       xlink:href="#linearGradient4856"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.735963,-0.187801,0.156725,0.614181,134.2038,527.9897)" />
-    <radialGradient
-       cx="760.87744"
-       cy="895.59747"
-       r="39.191177"
-       fx="760.87744"
-       fy="895.59747"
-       id="radialGradient12897"
-       xlink:href="#linearGradient9009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)" />
-    <linearGradient
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151"
-       id="linearGradient12899"
-       xlink:href="#linearGradient9900"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="760.87744"
-       cy="895.59747"
-       r="39.191177"
-       fx="760.87744"
-       fy="895.59747"
-       id="radialGradient12901"
-       xlink:href="#linearGradient9009"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)" />
-    <linearGradient
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151"
-       id="linearGradient12903"
-       xlink:href="#linearGradient9900"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="594.95349"
-       y1="966.4024"
-       x2="737.51599"
-       y2="966.4024"
-       id="linearGradient12905"
-       xlink:href="#linearGradient11729"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="441.73926"
-       y1="882.7417"
-       x2="520.36261"
-       y2="882.7417"
-       id="linearGradient12907"
-       xlink:href="#linearGradient3974"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="276.34375"
-       y1="958.8125"
-       x2="357.34375"
-       y2="958.8125"
-       id="linearGradient12909"
-       xlink:href="#linearGradient3974"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="474.60648"
-       y1="964.74359"
-       x2="474.72397"
-       y2="939.47852"
-       id="linearGradient12911"
-       xlink:href="#linearGradient3974"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.678923,0,0,0.512431,92.02415,441.1433)" />
-    <linearGradient
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741"
-       id="linearGradient6961"
-       xlink:href="#linearGradient6814"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894"
-       id="linearGradient6964"
-       xlink:href="#linearGradient6798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186"
-       id="linearGradient6967"
-       xlink:href="#linearGradient6830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127"
-       id="linearGradient6970"
-       xlink:href="#linearGradient6846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127"
-       id="linearGradient8122"
-       xlink:href="#linearGradient6846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186"
-       id="linearGradient8124"
-       xlink:href="#linearGradient6830"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894"
-       id="linearGradient8126"
-       xlink:href="#linearGradient6798"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <linearGradient
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741"
-       id="linearGradient8128"
-       xlink:href="#linearGradient6814"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)" />
-    <radialGradient
-       cx="902.47498"
-       cy="488.31769"
-       r="114.14286"
-       fx="902.47498"
-       fy="488.31769"
-       id="radialGradient9889"
-       xlink:href="#linearGradient7720"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)" />
-    <linearGradient
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218"
-       id="linearGradient9891"
-       xlink:href="#linearGradient4672"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="902.47498"
-       cy="488.31769"
-       r="114.14286"
-       fx="902.47498"
-       fy="488.31769"
-       id="radialGradient9893"
-       xlink:href="#linearGradient4644"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)" />
-    <linearGradient
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218"
-       id="linearGradient9895"
-       xlink:href="#linearGradient4672"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9897"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9899"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9901"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)" />
-    <radialGradient
-       cx="410.888"
-       cy="988.72253"
-       r="29.571283"
-       fx="410.888"
-       fy="988.72253"
-       id="radialGradient9903"
-       xlink:href="#linearGradient5684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)" />
-    <linearGradient
-       x1="645.98792"
-       y1="748.92639"
-       x2="699.22064"
-       y2="748.92639"
-       id="linearGradient11879"
-       xlink:href="#linearGradient16226"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12789"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12791"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12793"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12795"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12797"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12799"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12801"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient12803"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13807"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13809"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13811"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13813"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13815"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13817"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="635.69843"
-       y1="751.26422"
-       x2="784.17004"
-       y2="751.26422"
-       id="linearGradient13819"
-       xlink:href="#linearGradient12779"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14719"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14721"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14738"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       x1="573.87781"
-       y1="850.04034"
-       x2="670.98364"
-       y2="850.04034"
-       id="linearGradient14740"
-       xlink:href="#linearGradient14711"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9009"
-       id="radialGradient21982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)"
-       cx="760.87744"
-       cy="895.59747"
-       fx="760.87744"
-       fy="895.59747"
-       r="39.191177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9900"
-       id="linearGradient21984"
-       gradientUnits="userSpaceOnUse"
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9009"
-       id="radialGradient21986"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.134715,0,774.947)"
-       cx="760.87744"
-       cy="895.59747"
-       fx="760.87744"
-       fy="895.59747"
-       r="39.191177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9900"
-       id="linearGradient21988"
-       gradientUnits="userSpaceOnUse"
-       x1="722.29547"
-       y1="892.55151"
-       x2="800.47473"
-       y2="892.55151" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11729"
-       id="linearGradient21990"
-       gradientUnits="userSpaceOnUse"
-       x1="594.95349"
-       y1="966.4024"
-       x2="737.51599"
-       y2="966.4024" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="linearGradient21992"
-       gradientUnits="userSpaceOnUse"
-       x1="441.73926"
-       y1="882.7417"
-       x2="520.36261"
-       y2="882.7417" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="linearGradient21994"
-       gradientUnits="userSpaceOnUse"
-       x1="276.34375"
-       y1="958.8125"
-       x2="357.34375"
-       y2="958.8125" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3974"
-       id="linearGradient21996"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.678923,0,0,0.512431,92.02415,441.1433)"
-       x1="474.60648"
-       y1="964.74359"
-       x2="474.72397"
-       y2="939.47852" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="linearGradient21998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,19.86901)"
-       x1="212.87547"
-       y1="991.43274"
-       x2="348.82919"
-       y2="991.43274" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient33795"
-       id="linearGradient22000"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.701288,0,0,0.704615,92.93315,227.5991)"
-       x1="212.15625"
-       y1="1068.7657"
-       x2="349.5625"
-       y2="1068.7657" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4791"
-       id="linearGradient22002"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.920046,0,0,1.086901,0,13.71543)"
-       x1="313.19742"
-       y1="886.34753"
-       x2="399.59286"
-       y2="886.34753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4856"
-       id="radialGradient22004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.735963,-0.187801,0.156725,0.614181,134.2038,527.9897)"
-       cx="964.30762"
-       cy="803.47638"
-       fx="964.30762"
-       fy="803.47638"
-       r="91.57444" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23057"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,982.7389,22.5298)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23061"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,643.9049,22.52983)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23063"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,530.9602,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23065"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-167.3496,22.52986)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23067"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.654622,1.623305,-1.369812,-1.396152,926.1889,-533.1723)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23069"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,984.3714,146.9961)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23071"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,758.4821,146.9962)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23073"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,645.5374,146.9961)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,532.5927,146.9962)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,-168.9821,146.9962)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient23079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient23081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23083"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3661"
-       id="linearGradient23087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640077,0,0,0.78567,90.88485,-10.2088)"
-       x1="117.67873"
-       y1="688.06342"
-       x2="116.00877"
-       y2="771.71283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4552"
-       id="linearGradient23089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640794,0,-0.129638,0.698173,95.93458,46.3081)"
-       x1="277.07773"
-       y1="733.53235"
-       x2="278.26602"
-       y2="793.7782" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient23091"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23093"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient23095"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient23097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23101"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23103"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23107"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23109"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient23111"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23113"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient23115"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23117"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient23119"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient23121"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient23123"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient23125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient23127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)"
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient23129"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient23145"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient23147"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient23149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient23151"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient23153"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient23155"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient23157"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient23159"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,23.07442,-120.0138)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient23621"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.615848,0.604192,-0.509843,-0.519646,411.4735,-120.7104)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient23731"
-       gradientUnits="userSpaceOnUse"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient23733"
-       gradientUnits="userSpaceOnUse"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient23735"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-56)"
-       x1="236.75435"
-       y1="987.36212"
-       x2="309.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20139"
-       id="linearGradient23737"
-       gradientUnits="userSpaceOnUse"
-       x1="341.58902"
-       y1="987.36212"
-       x2="414.08035"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21032"
-       id="linearGradient23739"
-       gradientUnits="userSpaceOnUse"
-       x1="445.06726"
-       y1="987.36212"
-       x2="517.55859"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient23741"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(524.0663,-56)"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient23743"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(523.8557,-56)"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7720"
-       id="radialGradient23745"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient23747"
-       gradientUnits="userSpaceOnUse"
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4644"
-       id="radialGradient23749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient23751"
-       gradientUnits="userSpaceOnUse"
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23755"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient23759"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient24181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient24183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24185"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3661"
-       id="linearGradient24187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640077,0,0,0.78567,90.88485,-10.2088)"
-       x1="117.67873"
-       y1="688.06342"
-       x2="116.00877"
-       y2="771.71283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4552"
-       id="linearGradient24189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.640794,0,-0.129638,0.698173,95.93458,46.3081)"
-       x1="277.07773"
-       y1="733.53235"
-       x2="278.26602"
-       y2="793.7782" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient24191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.340569,0,0,0.429779,304.0396,251.3565)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient16226"
-       id="radialGradient24195"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.721324e-7,0.784065,-0.912902,-2.004171e-7,955.8349,20.35169)"
-       spreadMethod="reflect"
-       cx="552.50104"
-       cy="862.58081"
-       fx="552.50104"
-       fy="862.58081"
-       r="43.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21068"
-       id="linearGradient24197"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.47215,0,0,0.445568,229.5723,-522.5639)"
-       x1="473.375"
-       y1="846.36218"
-       x2="473.375"
-       y2="841.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24199"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.649207,0,0,0.640504,94.81749,-719.1436)"
-       x1="541.75"
-       y1="894.12311"
-       x2="561.93182"
-       y2="894.12311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24201"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24203"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,301.3571,283.759)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,320.3571,312.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24207"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.517857,0,0,0.482143,339.3571,294.259)"
-       x1="670.5"
-       y1="520.86218"
-       x2="670"
-       y2="579.86218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24209"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.912791,-87.75002,51.1304)"
-       x1="673"
-       y1="520.36072"
-       x2="673"
-       y2="606.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24211"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24213"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="radialGradient24215"
-       gradientUnits="userSpaceOnUse"
-       cx="209.83412"
-       cy="683.00934"
-       fx="209.83412"
-       fy="683.00934"
-       r="42.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient24217"
-       gradientUnits="userSpaceOnUse"
-       x1="151.57851"
-       y1="675.11218"
-       x2="234.92149"
-       y2="675.11218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient24219"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.193838,-0.204415,0.201505,0.196637,22.84333,509.163)"
-       x1="474.62946"
-       y1="763.69867"
-       x2="474.62946"
-       y2="819.49847" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24225"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient32988"
-       id="linearGradient24227"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96906,0.184773,-0.740436,0.719541,-2,53.11273)"
-       x1="1029.5582"
-       y1="283.05643"
-       x2="1054.2062"
-       y2="283.05643" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6462"
-       id="radialGradient24229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.576792,-1.665212e-2,1.306653e-2,0.477328,144.86,366.3147)"
-       cx="360.55887"
-       cy="686.36542"
-       fx="360.55887"
-       fy="686.36542"
-       r="13.25" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient24231"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient24233"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient24235"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient24237"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient24239"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient24241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient24243"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient24245"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19203"
-       id="linearGradient24247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.463664,0.283515,-0.266017,0.432012,-24.98543,167.9069)"
-       x1="209.59592"
-       y1="469.32986"
-       x2="228.7281"
-       y2="494.3299" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7463"
-       id="linearGradient24249"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.120379,0.139344,-0.171115,0.214715,20.77584,293.7269)"
-       x1="331.695"
-       y1="486.6479"
-       x2="399.73358"
-       y2="486.6479" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9267"
-       id="linearGradient24251"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.105702,-0.132634,0.122908,0.142271,-123.5758,437.4912)"
-       x1="205.4043"
-       y1="464.48911"
-       x2="207.19127"
-       y2="498.23825" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient13239"
-       gradientUnits="userSpaceOnUse"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient13241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1104.701,0.426478)"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14138"
-       id="linearGradient14144"
-       x1="682.19747"
-       y1="742.489"
-       x2="749.28423"
-       y2="742.489"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient6081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient6085"
-       gradientUnits="userSpaceOnUse"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient6087"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,1104.701,0.426478)"
-       x1="514.1665"
-       y1="770.00311"
-       x2="552.85059"
-       y2="770.00311" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient6115"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14138"
-       id="linearGradient7977"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.999435,-3.359396e-2,2.090913e-2,0.999781,-74.89763,93.16569)"
-       x1="682.19747"
-       y1="742.489"
-       x2="749.28423"
-       y2="742.489" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient7982"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5941"
-       id="radialGradient9764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.238095,0,630.1944)"
-       cx="595.61743"
-       cy="827.13019"
-       fx="595.61743"
-       fy="827.13019"
-       r="10.991182" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient3109"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321"
-       gradientTransform="matrix(-0.326639,-0.315927,0.325985,-0.316561,303.7813,371.9517)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient3121"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.279302,0,0,0.352463,339.8541,-9.09588)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient3242"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient2953"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.326639,-0.315927,0.325985,-0.316561,303.7813,371.9517)"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient14070"
-       id="linearGradient2965"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.279302,0,0,0.352463,339.8541,-9.09588)"
-       x1="488.69626"
-       y1="733.36218"
-       x2="492.33502"
-       y2="805.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient2973"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.326639,-0.315927,0.325985,-0.316561,303.7813,371.9517)"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient2976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.394857,-0.381908,0.394066,-0.382674,272.3576,400.6259)"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient4526"
-       gradientUnits="userSpaceOnUse"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient4528"
-       gradientUnits="userSpaceOnUse"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11686"
-       id="linearGradient4530"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-56)"
-       x1="236.75435"
-       y1="987.36212"
-       x2="309.24567"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient20139"
-       id="linearGradient4532"
-       gradientUnits="userSpaceOnUse"
-       x1="341.58902"
-       y1="987.36212"
-       x2="414.08035"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient21032"
-       id="linearGradient4534"
-       gradientUnits="userSpaceOnUse"
-       x1="445.06726"
-       y1="987.36212"
-       x2="517.55859"
-       y2="987.36212" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient18353"
-       id="linearGradient4536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(524.0663,-56)"
-       x1="26.033255"
-       y1="986.64105"
-       x2="98.524582"
-       y2="986.64105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient19246"
-       id="linearGradient4538"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(523.8557,-56)"
-       x1="131.75435"
-       y1="987.36212"
-       x2="204.24567"
-       y2="987.36212" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7720"
-       id="radialGradient4540"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       x1="818"
-       y1="467.36218"
-       x2="1046.2856"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4644"
-       id="radialGradient4544"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.933322,5.373968e-3,-9.114388e-3,1.092136,63.44493,-62.25249)"
-       cx="902.47498"
-       cy="488.31769"
-       fx="902.47498"
-       fy="488.31769"
-       r="114.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4672"
-       id="linearGradient4546"
-       gradientUnits="userSpaceOnUse"
-       x1="811.92737"
-       y1="467.36218"
-       x2="1052.3584"
-       y2="467.36218" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4548"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.820084,0,0,1.263148,109.9248,-278.9086)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4550"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.840938,0,0,1.038796,100.9157,-57.20348)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4552"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.806533,0,0,1.26326,841.2684,-279.0187)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5684"
-       id="radialGradient4554"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.825015,0,0,1.061238,849.253,-79.37844)"
-       cx="410.888"
-       cy="988.72253"
-       fx="410.888"
-       fy="988.72253"
-       r="29.571283" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient4556"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient4558"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6846"
-       id="linearGradient4560"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="799.75488"
-       y1="262.69351"
-       x2="799.75488"
-       y2="277.6127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6830"
-       id="linearGradient4562"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="747.68823"
-       y1="248.6936"
-       x2="747.68823"
-       y2="264.22186" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6798"
-       id="linearGradient4564"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="767.5094"
-       y1="220.81253"
-       x2="767.5094"
-       y2="234.48894" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6814"
-       id="linearGradient4566"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.683105,0,0,1.080499,338.4319,-13.46473)"
-       x1="788.36353"
-       y1="235.01193"
-       x2="788.36353"
-       y2="249.49741" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5880"
-       id="linearGradient4568"
-       gradientUnits="userSpaceOnUse"
-       x1="-61.644386"
-       y1="436.44476"
-       x2="-21.973541"
-       y2="480.29321" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15286"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15288"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,719.1127,73.72802)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15290"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,757.1127,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15414"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15416"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.226661,-2.698342e-3,1.91067e-3,0.160496,490.7324,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15418"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15420"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15422"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,719.1127,73.72802)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15424"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15426"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15428"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,757.1127,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15430"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15440"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.226661,-2.698342e-3,1.91067e-3,0.160496,490.7324,83.30868)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15442"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.801363,-9.008779e-3,4.64053e-3,0.927917,-470.5065,3.379106)"
-       cx="587.05847"
-       cy="108.0611"
-       fx="587.05847"
-       fy="108.0611"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6102"
-       id="radialGradient15474"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.226661,-2.698342e-3,-1.91067e-3,0.160496,719.1127,73.72802)"
-       cx="587.5"
-       cy="14.114712"
-       fx="587.5"
-       fy="14.114712"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5207"
-       id="radialGradient15476"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.143979,-1.988754e-4,3.755429e-6,1.424122,-84.49733,-3.166083)"
-       cx="587.42114"
-       cy="2.7619145"
-       fx="587.42114"
-       fy="2.7619145"
-       r="55.500004" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3661"
-       id="radialGradient18282"
-       cx="590.40625"
-       cy="17.705935"
-       fx="590.40625"
-       fy="17.705935"
-       r="9.96875"
-       gradientTransform="matrix(1,0,0,0.862069,0,2.442198)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient10979"
-       id="radialGradient16399"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.510756,8.596396e-3,-9.491026e-3,0.563911,199.3096,272.8201)"
-       cx="392.69437"
-       cy="639.16309"
-       fx="392.69437"
-       fy="639.16309"
-       r="13.00695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9201"
-       id="linearGradient16401"
-       gradientUnits="userSpaceOnUse"
-       x1="413.24585"
-       y1="611.74628"
-       x2="422.28918"
-       y2="624.56256" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15469"
-       id="linearGradient21760"
-       gradientUnits="userSpaceOnUse"
-       x1="-30.495793"
-       y1="788.21506"
-       x2="-22.720188"
-       y2="788.21506" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient9650"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient18524"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20472"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695"
-       spreadMethod="repeat" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20484"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20486"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20502"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient20504"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21491"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="repeat"
-       x1="571.66913"
-       y1="964.30695"
-       x2="661.41479"
-       y2="964.30695" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient9644"
-       id="linearGradient21493"
-       gradientUnits="userSpaceOnUse"
-       x1="571.66912"
-       y1="964.30696"
-       x2="661.41478"
-       y2="964.30696" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient3567"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4133997,0.4055754,-0.3422418,-0.3488223,10.276589,-74.784609)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient17059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.153488,1.131656,-0.954938,-0.973301,869.7944,22.52976)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient21912"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4133997,0.4055754,-0.3422418,-0.3488223,-42.950333,-257.45813)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient21932"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4134002,0.4055758,-0.3422416,-0.3488226,336.05906,-255.33691)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient21936"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.3941246,0.3788101,-0.3262839,-0.3258024,186.88118,-258.82238)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1315"
-       id="radialGradient22911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4134002,0.4055758,-0.3422416,-0.3488226,336.05906,-255.33691)"
-       cx="400.31589"
-       cy="2.521359"
-       fx="400.31589"
-       fy="2.521359"
-       r="72.066078" />
-  </defs>
-  <g
-     id="g13090"
-     transform="matrix(0.4319372,0,0,0.4498758,-158.61068,263.50967)">
-    <path
-       id="path1949"
-       style="fill:#faf8e5"
-       d="M 502.36734,1001.8219 C 500.85685,1000.9055 500.86123,1000.8106 502.69092,994.79585 C 503.71105,991.44235 505.20419,987.4402 506.00902,985.90219 L 507.47234,983.10574 L 503.68786,983.52174 C 501.05428,983.81116 499.20561,983.64401 497.60893,982.97209 C 495.61939,982.13482 494.31862,982.12303 487.82076,982.8834 C 481.32764,983.64319 479.69511,983.62878 475.59419,982.77505 C 468.03486,981.2015 463.1967,978.13448 460.12905,972.97152 C 457.96582,969.33067 457.53667,967.85991 457.49787,963.95422 L 457.45153,959.28738 L 453.00545,957.48865 C 446.35308,954.7972 445.72547,953.67908 445.02719,943.27461 C 443.48518,920.29864 443.38115,922.07125 446.84919,912.22941 C 448.00077,908.96139 450.30546,906.22447 452.36101,905.68391 C 453.22638,905.45634 454.78574,903.89485 455.82625,902.21395 C 458.32624,898.17535 464.18039,893.5834 474.97955,887.19027 C 488.21393,879.35549 497.87259,875.95553 506.8954,875.95553 C 509.41974,875.95553 511.4851,875.6971 511.4851,875.38124 C 511.4851,874.32821 515.75088,873.44507 522.92287,873.01331 C 526.82748,872.77825 530.90958,872.60946 531.9942,872.63824 C 533.07881,872.66703 535.56357,872.65286 537.51588,872.60675 C 554.77417,872.19925 560.26575,872.70655 564.08563,875.06124 C 565.46668,875.91257 567.34164,876.60911 568.25223,876.60911 C 570.78588,876.60911 575.12155,878.30511 576.03208,879.65239 C 576.67917,880.60985 577.79766,880.85741 581.47646,880.85741 C 585.08239,880.85741 587.23175,881.31615 591.19437,882.93155 C 593.99274,884.07233 597.57153,885.18205 599.14723,885.39762 C 602.42492,885.84604 607.8241,888.86082 609.7808,891.33517 C 610.51164,892.25937 612.21052,893.47712 613.5561,894.0413 C 616.52659,895.28682 621.80359,899.8022 622.78292,901.93644 C 623.17528,902.79152 623.49631,904.3658 623.49631,905.43484 C 623.49631,906.82677 624.39227,908.12837 626.65243,910.01988 C 630.35369,913.11743 630.36981,913.1665 631.02782,923.34032 C 631.94435,937.5114 631.53853,942.78748 629.27415,946.14004 C 627.38417,948.93831 619.92581,954.36283 615.36557,956.25586 C 608.04525,959.29469 602.33714,960.26776 591.83128,960.26776 C 583.34799,960.26776 582.54402,960.37331 582.09495,961.54564 C 581.31967,963.56953 573.81862,968.80526 569.06833,970.63816 C 565.22744,972.12016 563.4829,972.34212 553.8573,972.57375 C 543.04819,972.83388 542.97837,972.84544 541.89523,974.55796 C 540.166,977.29206 535.95166,980.22502 530.53434,982.4646 C 524.63611,984.90311 520.4921,988.26051 514.67381,995.31473 C 512.33831,998.14636 509.79283,1000.9779 509.01721,1001.6069 C 507.3114,1002.9904 504.44639,1003.083 502.36734,1001.8219 z " />
-    <path
-       id="path1947"
-       style="fill:#ede3d4"
-       d="M 502.59942,1001.6069 C 501.4642,1000.5616 501.54276,999.87292 503.51273,993.60057 C 504.69819,989.82604 506.27613,985.78205 507.01925,984.61369 C 508.51473,982.26266 508.4069,982.20689 504.22677,983.16887 C 501.94662,983.69355 500.66128,983.61723 498.36009,982.82058 C 495.80822,981.93713 494.38751,981.90643 487.75947,982.59186 C 478.45722,983.55376 473.14726,982.78619 467.52056,979.66627 C 460.91983,976.00627 456.17912,967.16156 457.45754,960.89186 C 457.90458,958.69948 457.77502,958.307 456.60415,958.307 C 454.45161,958.307 448.7638,955.28804 447.11168,953.26854 C 445.59884,951.41933 445.52524,950.8019 444.08955,927.9154 C 443.72522,922.10748 444.25472,918.98703 446.36313,914.51695 C 446.95656,913.2588 447.88321,911.25455 448.42234,910.06307 C 448.96148,908.87158 450.62577,907.20804 452.12075,906.36633 C 453.68201,905.4873 455.60561,903.48845 456.64023,901.67005 C 457.63095,899.92881 459.63865,897.58078 461.10178,896.45221 C 466.08086,892.61164 482.67388,883.01312 488.60957,880.53985 C 495.22924,877.78161 504.78042,875.61577 508.04454,876.13278 C 509.47519,876.35938 510.92056,876.02766 512.36923,875.14022 C 513.9703,874.15942 516.58938,873.64206 522.28363,873.18177 C 526.53982,872.83771 531.08706,872.611 532.3886,872.67796 C 536.29603,872.87899 538.42386,872.81676 544.4243,872.32595 C 552.77135,871.64319 562.28224,873.44496 565.08111,876.23923 C 565.64494,876.80214 567.15102,877.2627 568.42796,877.2627 C 571.22267,877.2627 573.75055,878.25969 575.45592,880.03448 C 576.46313,881.08273 577.7304,881.36268 581.76641,881.42855 C 585.55298,881.49036 587.80342,881.94008 590.76064,883.22593 C 592.92987,884.16915 596.20001,885.149 598.02761,885.4034 C 601.88483,885.94028 606.64157,888.59642 609.70446,891.92364 C 610.88526,893.20636 612.29978,894.25587 612.84782,894.25587 C 614.12148,894.25587 620.69412,899.36117 621.83791,901.23892 C 622.31618,902.02409 622.7075,903.70544 622.7075,904.97524 C 622.7075,906.72534 623.35066,907.81686 625.36562,909.4864 C 630.22335,913.51136 630.69393,914.52199 630.53269,920.58343 C 630.4517,923.62805 630.85271,928.06696 631.42382,930.44765 C 632.34314,934.27981 632.29967,935.35713 631.04472,939.84238 C 628.5987,948.58458 621.38056,954.58667 609.03517,958.144 C 604.27733,959.51495 602.07359,959.74155 593.6084,959.73045 L 583.73241,959.7175 L 579.1309,963.87835 C 572.12007,970.21778 568.44139,971.45272 554.61609,972.10774 C 542.53023,972.68041 543.57398,972.34114 539.20652,977.11615 C 538.18406,978.23397 534.63442,980.3228 531.3184,981.75795 C 524.33664,984.77961 519.74483,988.48391 513.80297,995.88799 C 511.49516,998.76384 509.16747,1001.4844 508.63034,1001.9338 C 507.22346,1003.1107 504.04538,1002.9384 502.59942,1001.6069 z M 501.56044,959.87109 C 503.47283,959.263 503.11555,958.62347 499.06132,955.39771 C 495.74098,952.75579 494.95531,952.4355 492.15922,952.584 C 487.95953,952.80704 487.56157,954.65825 491.01312,957.91537 C 493.15172,959.93358 493.9894,960.26776 496.90929,960.26776 C 498.78117,960.26776 500.8742,960.08926 501.56044,959.87109 z M 459.42356,955.04183 C 459.42356,954.30276 449.38109,945.04037 448.16873,944.66122 C 447.11874,944.33284 448.14759,948.84909 449.68335,951.30979 C 451.25087,953.82139 459.42356,956.95285 459.42356,955.04183 z M 473.67402,945.86596 C 474.51318,945.49383 475.19978,944.94095 475.19978,944.63731 C 475.19978,943.94009 466.8754,938.69953 465.76789,938.69953 C 464.21615,938.69953 464.94657,941.11926 467.31661,943.83014 C 469.75975,946.6246 471.03921,947.03432 473.67402,945.86596 z M 508.9609,944.45106 C 510.6289,943.06903 509.99462,941.64343 506.11486,938.05431 C 502.07747,934.31935 500.44175,934.12735 500.44175,937.38839 C 500.44175,942.8535 505.66391,947.18285 508.9609,944.45106 z M 456.11376,934.36511 C 456.33529,933.07815 456.0194,932.9784 451.97391,933.05795 C 449.50797,933.10644 447.59359,933.44395 447.5928,933.83033 C 447.58982,935.27933 449.66364,936.13812 452.71511,935.95154 C 455.24754,935.79671 455.92146,935.48212 456.11376,934.36511 z M 498.32437,928.79793 C 499.272,928.38465 500.30813,927.7229 500.62687,927.32738 C 501.55509,926.17555 501.31835,921.17489 500.31118,920.65914 C 498.67372,919.82062 492.62748,927.40852 493.74224,928.90301 C 494.38316,929.76227 496.20925,929.72039 498.32437,928.79793 z M 464.43244,922.28911 C 468.72789,919.93167 472.04453,915.67952 472.04453,912.52989 C 472.04453,909.67747 467.99531,906.02037 464.83705,906.02037 C 461.06409,906.02037 461.43507,908.13633 465.31253,908.73239 C 466.16531,908.86348 467.40431,909.76976 468.06586,910.74635 C 469.83979,913.365 467.88475,914.77271 462.41777,914.81321 C 458.95573,914.83885 458.15331,915.07861 457.40897,916.3098 C 456.9215,917.11614 455.93298,918.31575 455.21227,918.97559 C 453.55631,920.49172 453.55499,921.61263 455.20735,923.12546 C 457.11736,924.87419 460.23765,924.5913 464.43244,922.28911 z M 546.33398,920.3992 C 546.02571,916.81858 543.76092,914.66188 539.46644,913.85936 C 535.6395,913.14421 533.24236,914.05609 533.8541,915.99432 C 534.12337,916.84751 533.78528,917.66255 532.95289,918.16687 C 531.71147,918.919 531.72336,919.06793 533.12742,920.35342 C 534.90773,921.98341 540.87367,923.66122 544.22077,923.47322 C 546.51745,923.34424 546.57975,923.25365 546.33398,920.3992 z M 487.398,919.13005 C 488.24588,917.99335 485.87244,913.0946 483.30887,910.69014 C 481.18895,908.70178 480.63665,908.47001 479.9685,909.28828 C 478.20128,911.45259 479.05213,914.06325 482.46332,916.94315 C 485.90654,919.85008 486.62382,920.16796 487.398,919.13005 z M 616.26958,911.49727 C 619.26849,908.48279 620.01618,905.39163 618.3804,902.77065 C 616.94985,900.47853 614.89026,900.22846 612.84736,902.09887 C 611.84268,903.0187 610.41784,903.40604 608.03878,903.40604 C 603.59749,903.40604 602.91745,904.49009 606.02926,906.60943 C 607.40088,907.54359 608.51991,908.49257 608.516,908.71827 C 608.51209,908.94398 609.04611,910.19395 609.70269,911.49601 C 611.24822,914.56084 613.22146,914.56123 616.26958,911.49727 z M 521.87474,912.12811 C 523.74883,910.72285 523.71062,908.27484 521.7829,906.24427 C 520.56799,904.96454 520.3403,903.98601 520.68931,901.54435 C 521.03428,899.13089 520.83908,898.26058 519.79113,897.53995 C 517.95483,896.27722 516.00335,897.38424 515.34192,900.06387 C 515.05837,901.21256 514.20849,902.71812 513.45328,903.40957 C 512.15648,904.59685 512.1545,904.82239 513.41753,907.46769 C 516.16689,913.22593 518.61301,914.57389 521.87474,912.12811 z M 580.53178,912.48266 C 583.91231,911.77736 587.9998,909.35616 587.9998,908.05901 C 587.9998,906.69715 585.39378,905.36678 582.72609,905.36678 C 580.49825,905.36678 578.98993,906.04263 575.28872,908.69936 C 572.7352,910.53229 570.64595,912.29696 570.64595,912.62087 C 570.64595,913.4377 576.33547,913.35816 580.53178,912.48266 z M 478.98613,905.26569 C 479.29632,902.26791 476.77524,899.46307 474.71031,900.50859 C 471.61248,902.07708 471.54223,903.24118 474.39806,905.68253 C 475.88832,906.9565 477.47702,907.89859 477.92853,907.77606 C 478.38003,907.65353 478.85595,906.52387 478.98613,905.26569 z M 571.46455,902.77901 C 572.96663,901.71521 574.78524,900.83287 575.5059,900.81826 C 576.22656,900.80365 577.71225,899.90937 578.80742,898.83095 C 581.18496,896.4898 582.6428,896.36014 584.31918,898.34076 C 585.35374,899.56309 585.69314,899.65236 586.32982,898.8696 C 587.22604,897.76773 585.87266,895.22938 583.40066,893.37578 C 581.46215,891.92219 578.47582,892.30432 573.55536,894.63557 C 569.13797,896.72846 567.17316,896.63997 565.12427,894.25587 C 563.13767,891.94422 560.6463,891.71907 558.1737,893.62775 C 555.71827,895.52317 555.97382,897.77836 558.85028,899.59822 C 560.1719,900.43437 562.39043,901.91868 563.78035,902.89669 C 567.00739,905.16736 568.11624,905.15038 571.46455,902.77901 z M 508.3618,900.0152 C 510.41904,898.75497 510.69629,898.18833 510.69629,895.24405 C 510.69629,893.40645 511.09838,891.56979 511.58984,891.1626 C 512.71432,890.2309 511.91341,888.37362 510.38716,888.37362 C 509.75606,888.37362 508.18508,889.1089 506.89609,890.00758 C 505.6071,890.90625 504.17576,891.64153 503.71535,891.64153 C 503.25493,891.64153 501.57056,890.90625 499.97229,890.00758 C 496.50671,888.05895 492.54489,887.79655 492.57095,889.51739 C 492.59448,891.07093 495.19968,895.71385 496.56988,896.64418 C 497.18094,897.05907 498.56468,897.50024 499.64487,897.62455 C 500.85647,897.76399 501.72243,898.35133 501.90536,899.15775 C 502.49713,901.7666 504.96728,902.09465 508.3618,900.0152 z M 473.10608,895.23625 C 474.66359,894.69704 476.7985,894.25587 477.85032,894.25587 C 479.17653,894.25587 481.11589,893.04484 484.1774,890.30494 C 491.36252,883.8746 491.78547,881.90169 485.17432,885.65458 C 472.84688,892.65237 468.88929,895.07077 468.88929,895.60598 C 468.88929,896.45451 469.82378,896.37257 473.10608,895.23625 z M 527.3017,880.1041 C 530.34358,878.43619 530.62263,878.40205 534.65808,879.20418 C 538.42126,879.95218 539.07737,879.91593 541.03793,878.85154 C 542.69116,877.954 544.83301,877.65594 549.83522,877.62731 C 553.47183,877.60652 556.44727,877.37569 556.44729,877.11437 C 556.44741,876.1672 552.81839,874.74068 549.34451,874.32236 C 547.15892,874.05917 543.82814,874.27028 540.69075,874.87082 C 537.39712,875.50129 535.1113,875.63483 534.23845,875.24777 C 532.1629,874.3274 528.59779,874.53426 526.60516,875.69069 C 525.45588,876.35768 524.07805,876.58095 522.77875,876.31076 C 520.15437,875.765 516.21797,876.48461 516.21797,877.51013 C 516.21797,877.94856 517.42549,878.66906 518.90135,879.11125 C 520.37721,879.55344 522.01802,880.3478 522.54759,880.87651 C 523.77946,882.10636 523.59561,882.13623 527.3017,880.1041 z " />
-    <path
-       id="path1945"
-       style="fill:#e5dac8"
-       d="M 502.76271,1001.725 C 501.90983,1000.8734 502.04684,999.62422 503.56917,994.37217 C 504.57781,990.89227 506.12854,986.80152 507.01523,985.28169 C 508.82224,982.18436 508.50572,981.36225 505.9436,982.49842 C 504.87476,982.97242 502.96023,983.09664 500.94597,982.8228 C 497.13262,982.30426 491.63571,982.21925 482.29908,982.53421 C 474.65809,982.79201 470.65178,981.69146 465.4461,977.90428 C 460.1932,974.08287 456.2939,965.40525 457.83238,960.96056 C 458.53393,958.93373 458.46304,958.85326 454.84601,957.57133 C 446.75407,954.70347 445.06172,952.06718 445.32447,942.73909 C 445.44761,938.36714 445.17847,935.23651 444.60428,934.36189 C 444.02567,933.48052 443.77346,930.45128 443.9206,926.14996 C 444.10499,920.75921 444.51302,918.71956 445.87255,916.3926 C 446.81791,914.77453 447.59271,913.02882 447.59433,912.51325 C 447.59947,910.88154 450.53647,907.50429 452.99813,906.29945 C 454.43471,905.59632 455.86028,904.07564 456.61223,902.44423 C 458.20884,898.98029 462.29963,895.74994 474.01657,888.70068 C 488.49953,879.98731 497.77487,876.60911 507.21577,876.60911 C 509.65761,876.60911 511.64317,876.25845 512.16796,875.73452 C 513.75586,874.14921 519.18855,873.30236 530.5983,872.86153 C 553.49284,871.97697 558.81209,872.42813 563.42745,875.64593 C 564.70287,876.53516 566.68896,877.2627 567.84096,877.2627 C 570.59321,877.2627 574.32368,878.89707 575.40992,880.57877 C 576.17134,881.75759 576.77295,881.87171 580.36337,881.51832 C 583.97559,881.16278 585.1217,881.38567 590.23331,883.43768 C 593.41405,884.71457 596.71161,885.75928 597.56123,885.75928 C 600.23225,885.75928 605.04399,888.20876 608.21561,891.18302 C 609.89538,892.75827 612.15715,894.43366 613.24176,894.90613 C 615.66809,895.96308 620.56527,899.96234 621.7967,901.89251 C 622.29763,902.67768 622.7075,904.32204 622.7075,905.54663 C 622.7075,907.28613 623.47844,908.44944 626.23191,910.8647 C 630.09409,914.25249 630.98578,916.54531 630.37465,921.51704 C 630.163,923.23878 630.54771,926.95058 631.22954,929.76548 C 632.3822,934.52409 632.37174,935.18954 631.08073,939.24243 C 628.55224,947.18009 623.89817,951.85202 614.62763,955.75868 C 607.69982,958.67804 602.18437,959.61417 591.91184,959.61417 L 582.74556,959.61417 L 580.24128,962.50353 C 577.03334,966.20471 569.43225,970.41196 564.30841,971.32246 C 562.11135,971.71285 556.45556,972.03225 551.73999,972.03225 L 543.16623,972.03225 L 541.57952,974.1564 C 539.17274,977.37845 536.11947,979.45491 529.79701,982.1693 C 523.12018,985.03585 519.29028,988.30252 512.61832,996.82165 C 508.6926,1001.8342 507.65127,1002.7506 505.88245,1002.7506 C 504.73168,1002.7506 503.32781,1002.2892 502.76271,1001.725 z M 556.77549,964.63703 C 557.80943,964.01063 558.22456,962.81457 558.30669,960.22534 C 558.40386,957.16186 558.64511,956.64632 560.0599,956.4788 C 561.33448,956.32789 561.98019,956.87461 562.95449,958.92974 C 564.35795,961.89008 566.17787,962.3385 569.028,960.42625 C 570.72212,959.2896 570.72512,959.25012 569.31259,956.66024 C 568.52747,955.22072 565.64592,952.14471 562.90915,949.82472 L 557.9332,945.60652 L 549.10496,944.71874 C 537.76299,943.57817 536.62445,943.58902 535.77561,944.84581 C 534.62123,946.55494 532.70363,946.04741 529.83917,943.27461 C 527.28261,940.79989 526.89947,940.65952 522.6642,940.64593 C 517.20386,940.62842 513.33281,939.25149 507.30268,935.1819 L 502.77366,932.12536 L 499.36916,933.77849 C 494.64982,936.07007 490.2072,936.01198 486.9713,933.61636 C 485.10991,932.23832 484.49927,931.21508 484.4361,929.36807 C 484.37083,927.46065 484.03734,926.93504 482.89238,926.93504 C 482.08913,926.93504 480.42632,926.50416 479.19724,925.97755 C 477.04962,925.05735 476.85289,925.10829 474.14823,927.28471 C 472.60036,928.53026 470.82186,929.54936 470.196,929.54936 C 468.74135,929.54936 467.97521,927.90294 468.54876,926.00949 C 468.91785,924.79104 468.68173,924.5441 467.19226,924.59086 C 464.33719,924.68051 464.42663,922.61572 467.33174,921.37098 C 470.53334,919.99919 473.02616,915.50359 472.68608,911.71483 C 472.47192,909.32896 472.64949,908.96149 474.01657,908.96149 C 475.25117,908.96149 475.80294,909.6624 476.55434,912.18521 C 477.26119,914.55839 478.50208,916.23968 481.2576,918.55768 C 485.94749,922.5029 487.39995,922.91536 489.8599,921.00055 C 492.28196,919.11522 492.26528,918.18363 489.79279,917.2502 C 487.82321,916.50666 487.1039,914.3076 488.58258,913.5504 C 489.03709,913.31765 489.148,911.05011 488.85753,907.92914 C 488.4283,903.31714 488.5875,902.31445 490.20259,899.45731 C 493.13758,894.26522 496.52824,895.46059 494.91453,901.11849 C 494.50443,902.55638 494.16042,905.74071 494.15008,908.19478 C 494.1328,912.29102 494.32522,912.81746 496.49769,914.6175 C 497.79923,915.69591 498.86412,917.0129 498.86412,917.54415 C 498.86412,918.07539 497.43112,920.47868 495.67967,922.88479 C 493.92823,925.29089 492.59711,927.84827 492.72163,928.56784 C 493.06289,930.53982 496.44097,930.55458 499.9184,928.59929 C 503.65355,926.49909 505.20418,926.50552 507.60075,928.63119 C 510.38426,931.10005 515.76951,933.54772 518.56263,933.61353 C 520.0333,933.64818 521.69796,933.11717 522.79454,932.26359 C 525.33233,930.28818 526.21315,930.48735 528.03669,933.44901 C 528.91461,934.87488 530.31835,936.34544 531.15609,936.71693 C 533.24274,937.64222 537.97669,937.56617 539.96837,936.57539 C 541.39272,935.86681 541.77041,935.95354 542.81471,937.22896 C 544.20239,938.92376 546.35098,939.13628 547.77043,937.71916 C 549.25123,936.24077 551.3519,936.53993 552.35977,938.37274 C 553.4006,940.26551 554.40041,940.37556 558.2977,939.02633 C 562.97547,937.4069 563.76533,937.65355 563.17488,940.54928 C 562.69985,942.8789 562.89264,943.22342 565.95336,945.51456 C 568.99619,947.7923 569.49699,947.94486 572.64653,947.55351 L 576.05078,947.13054 L 575.912,950.92143 C 575.80781,953.76765 576.16636,955.19582 577.35084,956.65239 C 578.82814,958.4691 578.94411,958.50276 579.17436,957.18166 C 579.56997,954.91177 577.88337,948.49881 576.07819,945.40908 C 569.83009,934.71486 549.32366,927.66812 536.58071,931.83631 C 535.60212,932.15642 534.72583,931.58172 533.26115,929.65926 C 532.16665,928.22269 530.46744,926.58088 529.48512,926.0108 C 526.81798,924.46292 522.42141,924.71473 519.05386,926.60824 C 515.31062,928.71299 514.01621,928.67344 513.70672,926.44485 C 513.4951,924.92091 512.85713,924.49022 509.51307,923.61369 C 506.21148,922.74827 505.56902,922.32241 505.56902,920.99935 C 505.56902,919.60863 505.92433,919.41882 508.52758,919.41882 C 510.9533,919.41882 511.48604,919.1851 511.48562,918.12103 C 511.48478,916.01527 507.74221,910.50111 503.55309,906.43358 C 498.25506,901.28931 498.45523,899.06905 503.94664,902.06838 L 506.26832,903.33645 L 507.71709,901.36255 C 509.80732,898.51467 511.08062,899.29511 511.14692,903.46478 C 511.19163,906.27744 511.77654,907.8196 514.0063,911.00381 C 515.54805,913.20549 517.14759,915.84732 517.56083,916.87454 C 518.24864,918.58421 518.79741,918.80952 524.04811,919.53795 C 529.91751,920.35221 532.35622,921.28926 536.09064,924.16521 C 538.00101,925.63643 538.95468,925.81719 545.55637,925.95933 C 550.43117,926.0643 554.62034,926.58131 558.02497,927.49816 C 560.84497,928.25758 563.23028,928.88271 563.32567,928.88735 C 563.42106,928.89199 562.63178,927.83681 561.57171,926.5425 C 559.01619,923.42232 558.51123,920.79484 559.15554,913.97049 C 559.45092,910.84201 559.4418,907.74085 559.13529,907.07902 C 558.82878,906.41718 556.09642,904.89031 553.0634,903.68595 C 547.83034,901.60801 547.47964,901.32694 546.19403,898.18038 C 544.53909,894.12987 542.24813,892.01088 537.24079,889.89916 C 533.55229,888.34365 533.43417,888.20611 533.92501,886.03824 C 534.39242,883.97384 534.20558,883.67866 531.63646,882.42269 C 530.09783,881.67051 528.83895,880.80984 528.83895,880.5101 C 528.83895,879.4466 531.96958,879.16487 535.11384,879.94541 C 537.86005,880.62715 538.66315,880.5765 540.89438,879.5809 C 542.88683,878.69185 544.48192,878.51787 547.79724,878.82801 C 560.24346,879.99235 564.36401,880.0456 563.89646,879.03606 C 563.64685,878.49709 561.2475,877.22976 558.56456,876.21976 C 552.87192,874.07676 544.83024,873.40902 539.52799,874.63907 C 536.79608,875.27283 535.53056,875.2644 533.3052,874.59766 C 530.88557,873.87271 530.08967,873.9184 527.35776,874.93913 C 525.41573,875.66473 523.42977,875.95659 522.18955,875.69868 C 520.07603,875.25916 514.64034,876.75895 514.64034,877.78163 C 514.64034,879.26845 521.24082,882.49137 524.28579,882.49137 C 525.29543,882.49137 526.9104,882.94922 527.87462,883.50879 C 529.32345,884.34963 529.62776,885.14768 529.62776,888.10639 C 529.62776,891.66316 529.66381,891.7167 535.14944,896.30721 C 538.18636,898.84859 540.67112,901.20182 540.67112,901.5366 C 540.67112,901.8714 542.23615,902.70116 544.14894,903.38052 C 546.06175,904.05988 547.84563,905.18709 548.11313,905.88543 C 548.80713,907.69714 551.4302,909.54457 552.07712,908.67728 C 552.79969,907.70857 555.64385,907.80275 555.72578,908.7981 C 555.76277,909.24743 555.75915,911.08564 555.71774,912.88298 C 555.67633,914.68035 556.14007,918.06264 556.74828,920.3992 C 557.3565,922.73576 557.69413,924.86808 557.49859,925.13768 C 557.01189,925.8087 551.57037,925.73926 550.24824,925.04515 C 549.46446,924.63368 549.32711,923.74327 549.7372,921.73214 C 550.22329,919.3482 550.0673,918.84794 548.56624,917.9768 C 547.29702,917.24021 546.9394,916.51707 547.22728,915.26929 C 547.8214,912.69418 541.92865,907.98112 538.11489,907.98112 C 535.49221,907.98112 535.32484,907.84519 534.83739,905.31945 C 534.27211,902.39044 530.5395,899.00827 525.81103,897.14056 C 523.19409,896.10689 523.1792,896.07502 523.4446,892.07407 L 523.71168,888.04781 L 519.16413,886.0462 C 516.66297,884.94531 513.27583,882.95983 511.63716,881.63401 C 508.24837,878.89223 506.44822,878.67965 499.4355,880.19309 C 492.20309,881.75394 485.03126,884.76581 476.48548,889.83113 C 465.72043,896.21186 461.66139,899.44726 459.398,903.45125 L 457.49484,906.81799 L 459.58528,908.21653 C 460.73504,908.98573 462.58885,910.1435 463.7049,910.78935 C 464.82093,911.43521 465.73404,912.41868 465.73404,912.97483 C 465.73404,913.80961 465.06025,913.90925 461.87212,913.54594 C 459.05462,913.22486 457.36009,913.38438 455.60639,914.13579 C 452.47339,915.47818 451.68326,914.46734 453.58203,911.54599 C 454.37066,910.33263 454.77383,909.1393 454.47795,908.89416 C 453.56901,908.14104 451.66601,909.92216 451.10058,912.05526 C 450.80561,913.16796 449.71525,915.40142 448.67754,917.0185 C 447.0742,919.51702 446.94989,920.11449 447.84998,920.99592 C 448.43254,921.5664 449.37769,923.06255 449.95031,924.3207 C 450.52292,925.57884 451.67123,927.55874 452.5021,928.72047 C 453.33296,929.88219 453.78939,931.13217 453.51636,931.4982 C 452.7191,932.56704 450.3905,932.26806 448.57053,930.86318 C 446.59126,929.33532 445.74577,930.05735 446.50881,932.62383 C 447.58669,936.24919 449.07621,937.39237 452.722,937.39237 C 457.71192,937.39237 459.81796,935.71584 459.81796,931.74356 C 459.81796,927.62529 461.49664,927.283 465.21338,930.64338 C 467.86798,933.04348 468.04257,933.09722 470.64793,932.31663 C 473.86513,931.35271 476.30831,931.2902 478.16853,932.12422 C 478.92187,932.46199 480.54022,932.91412 481.76485,933.12898 C 483.48407,933.43061 484.35799,934.22151 485.59995,936.59977 C 487.3628,939.9755 492.98856,945.23537 494.83626,945.23537 C 495.4772,945.23537 496.76097,944.64428 497.68907,943.92184 L 499.37656,942.60831 L 501.99574,945.3088 C 504.55326,947.9457 504.70477,948.00048 508.43008,947.6349 C 511.7061,947.31341 512.5699,947.48687 514.54268,948.86228 C 517.16792,950.69257 519.19286,950.88244 521.39168,949.50444 C 523.52432,948.16792 525.90902,948.27469 528.26824,949.81232 C 530.09296,951.00158 530.6491,951.05013 534.34679,950.34291 C 538.38677,949.57024 538.43385,949.57956 540.71815,951.60475 C 542.8264,953.47386 543.23526,953.58818 545.59213,952.96759 C 547.00712,952.59501 548.86368,952.24693 549.71783,952.19408 C 551.79559,952.06552 552.26265,954.23263 550.40337,955.37483 C 548.9973,956.23861 548.9978,956.2926 550.41984,957.16604 C 551.22983,957.66355 551.75637,958.63236 551.5963,959.33058 C 551.15187,961.26957 547.38497,961.31623 543.93679,959.42554 C 535.89274,955.01484 528.62582,953.8421 521.17418,955.75215 C 518.16576,956.52331 517.44814,956.4675 513.66523,955.16837 C 511.36477,954.37832 508.42455,953.72926 507.13139,953.72597 C 505.83824,953.72269 503.00538,952.9966 500.83615,952.11245 C 493.35822,949.06456 486.24246,950.55014 487.77022,954.84027 C 489.226,958.9283 490.39589,960.24174 492.87148,960.56762 C 494.21512,960.74455 502.41377,961.03611 511.0907,961.21565 C 519.76762,961.39512 530.23909,961.62297 534.36063,961.72185 L 541.85433,961.90172 L 542.10393,963.69907 L 542.35352,965.49643 L 548.85527,965.49643 C 552.98284,965.49643 555.87498,965.18264 556.77549,964.63703 z M 523.76768,912.16965 C 524.16102,911.48357 524.51523,908.86346 524.5548,906.34716 C 524.60682,903.03964 524.91327,901.77207 525.66087,901.77207 C 526.22963,901.77207 526.99313,902.21324 527.35754,902.75245 C 527.72195,903.29165 529.09175,905.28985 530.40156,907.1929 C 533.41463,911.57066 533.43551,912.5562 530.51517,912.5562 C 529.26786,912.5562 527.0785,912.7499 525.64991,912.98663 C 523.29375,913.37708 523.11891,913.30119 523.76768,912.16965 z M 464.47138,903.14338 C 463.2883,900.58885 473.64157,894.02336 477.11261,895.12699 C 479.31028,895.82573 478.45548,897.5562 475.39699,898.60016 C 473.77006,899.15547 471.72902,900.13094 470.86132,900.76785 C 469.99363,901.40477 468.31115,902.43782 467.1225,903.06355 C 465.15076,904.1015 464.91836,904.1085 464.47138,903.14338 z M 480.81758,901.91708 C 480.33086,901.5138 479.93265,899.92897 479.93265,898.39522 C 479.93265,896.06645 480.39954,895.21976 482.76403,893.26061 C 484.32129,891.97031 486.1808,891.00802 486.89624,891.12219 C 489.01213,891.4598 488.90742,893.59996 486.6808,895.52562 C 485.53982,896.5124 484.39918,898.37723 484.14604,899.66972 C 483.65499,902.17693 482.26438,903.11586 480.81758,901.91708 z M 513.98135,894.78348 C 511.17083,893.30905 511.18253,893.3312 512.30167,891.59857 C 513.63171,889.53941 516.14473,890.02951 517.44144,892.60091 C 518.83457,895.36357 518.83402,895.34382 517.531,895.75811 C 516.95163,895.94232 515.35429,895.50374 513.98135,894.78348 z M 497.84383,886.6568 C 496.07491,885.19112 503.02754,879.9589 505.64021,880.78961 C 507.58212,881.40704 506.85183,882.80179 503.45359,884.96583 C 500.19737,887.03944 498.81028,887.45755 497.84383,886.6568 z M 474.48179,959.72384 C 473.05735,957.51852 471.51436,956.83919 469.72852,957.63107 C 467.55018,958.59707 467.65821,958.86444 470.66412,959.94698 C 474.32118,961.26402 475.43455,961.19892 474.48179,959.72384 z M 482.32116,957.37473 C 481.87517,956.40285 481.51027,954.61837 481.51027,953.40929 C 481.51027,952.20023 480.97783,950.76982 480.32706,950.23061 C 479.00109,949.13195 478.77027,947.46456 479.86645,946.90322 C 480.26389,946.6997 481.50627,946.82212 482.62729,947.17526 C 484.65972,947.81551 485.27989,947.36077 483.98043,946.18306 C 483.60363,945.84157 482.69912,944.23266 481.97041,942.6077 C 480.88152,940.17963 480.12523,939.50384 477.72542,938.81456 C 476.11941,938.35328 473.18114,938.00384 471.19594,938.03802 C 469.21076,938.07221 466.6246,937.79715 465.44892,937.42678 C 462.84016,936.60497 462.14944,937.57867 462.9217,940.98942 C 463.78412,944.79841 466.4633,946.76332 471.34978,947.17057 L 475.57755,947.5229 L 476.19754,951.10709 C 476.69404,953.97739 477.39249,955.17914 479.70426,957.14075 C 482.94739,959.8926 483.49916,959.94194 482.32116,957.37473 z M 467.45175,954.19865 C 468.61342,953.40275 469.67831,952.35396 469.81819,951.86801 C 470.0842,950.94383 465.7941,949.68134 458.04314,948.40286 C 453.36955,947.63197 452.44312,946.098 456.26831,945.46412 C 457.7734,945.21471 458.63475,944.6714 458.63475,943.97142 C 458.63475,941.88783 456.74012,940.80594 452.55999,940.50252 C 447.81498,940.15809 447.59078,940.38151 447.59261,945.45222 C 447.59512,952.35462 451.86916,955.70973 460.60677,955.66817 C 464.304,955.65058 465.80181,955.32902 467.45175,954.19865 z M 612.41744,953.95782 C 616.6363,952.52634 623.3333,948.05148 624.75856,945.71161 L 626.0439,943.60141 L 622.83374,946.24645 C 621.06814,947.70123 616.50158,950.45086 612.68581,952.35675 C 606.16811,955.61221 606.0853,956.10632 612.41744,953.95782 z M 595.49351,953.07836 C 596.13188,952.22253 587.23166,952.22253 585.63337,953.07836 C 584.80415,953.52238 586.02925,953.71493 589.72807,953.72194 C 592.63092,953.72745 595.22537,953.43784 595.49351,953.07836 z M 605.60271,951.03122 C 609.25815,949.46127 614.13623,945.66527 615.64297,943.21813 C 617.2857,940.55012 620.34106,939.59833 620.34106,941.75459 C 620.34106,942.6838 620.61647,942.6345 622.16673,941.42779 C 623.17084,940.64619 624.90769,940.0067 626.02639,940.0067 C 628.76619,940.0067 629.50754,938.28947 626.99344,937.76664 C 624.50532,937.24921 624.53306,935.60778 627.04596,934.65912 C 628.24129,934.20785 629.01374,933.37676 629.00721,932.54897 C 628.98381,929.58157 628.11881,928.53193 625.04086,927.73599 C 620.78594,926.63569 621.00826,926.58233 616.12973,929.87507 C 611.14012,933.24278 609.70079,933.78225 603.97322,934.43135 C 600.54403,934.82 599.83196,934.72974 599.83196,933.90642 C 599.83196,932.6221 603.54215,930.20295 605.51188,930.20295 C 607.47057,930.20295 609.52147,929.28146 614.54595,926.14388 C 616.89442,924.67736 619.89229,923.44207 621.64526,923.21856 C 623.31411,923.00579 625.30071,922.56815 626.05994,922.24603 C 629.34695,920.85148 626.28478,912.13939 621.8379,910.23404 C 619.8377,909.37702 619.55225,908.89286 619.55225,906.35724 C 619.55225,904.76362 618.94409,902.48101 618.20078,901.28477 C 616.89986,899.19114 612.82934,896.8702 610.45839,896.8702 C 609.8309,896.8702 608.44526,895.72536 607.37918,894.32611 C 604.83014,890.9804 601.3155,888.97664 597.23139,888.5407 C 595.40786,888.34606 593.02847,887.67541 591.94386,887.05037 C 588.24615,884.91948 582.82648,883.76591 580.14784,884.5396 C 577.38927,885.3364 575.37882,884.92655 575.37882,883.56742 C 575.37882,882.59214 572.12545,880.53062 570.58632,880.53062 C 570.08914,880.53062 570.49082,881.07303 571.47891,881.73598 C 572.60821,882.49367 573.09299,883.33535 572.78416,884.00217 C 572.34157,884.95783 572.01826,884.96791 569.52271,884.10397 C 565.95385,882.86844 562.49386,882.88651 559.53063,884.15616 C 557.40084,885.06871 556.70583,885.06871 552.40679,884.15616 C 547.58536,883.13271 543.82637,882.8471 543.82637,883.5042 C 543.82637,883.70178 544.37332,884.73981 545.04182,885.81094 C 545.71031,886.88205 546.03385,888.05796 545.76077,888.42405 C 545.29159,889.05306 549.08516,892.78816 549.62708,892.23075 C 549.76739,892.08642 550.43594,890.79188 551.11274,889.35399 C 552.14081,887.16981 552.71336,886.73438 554.59252,886.70754 C 555.8296,886.68989 558.35877,886.44227 560.21291,886.1573 C 562.72715,885.77086 564.59059,885.93905 567.54387,886.81897 C 570.74566,887.77294 571.79706,887.84701 573.03615,887.20584 C 574.84679,886.26892 577.46893,886.16724 578.09723,887.00958 C 578.34203,887.33777 580.04907,887.80924 581.89065,888.05729 C 583.75399,888.30825 586.14767,889.21495 587.28791,890.10169 C 589.30979,891.67408 589.36933,891.6797 591.7946,890.52639 C 594.16772,889.3979 594.34885,889.40073 597.05591,890.60867 C 600.49829,892.1447 609.2977,898.88737 609.2977,899.9891 C 609.2977,901.38457 607.31957,900.86456 604.11522,898.62672 C 597.17373,893.77899 595.0541,893.27786 591.27723,895.59153 C 588.6737,897.18641 587.35249,896.85213 585.22073,894.05916 L 583.62489,891.96832 L 575.36059,891.8973 C 570.81523,891.85825 565.85627,891.49062 564.34066,891.08033 C 559.62393,889.80348 558.0635,890.09832 556.85506,892.4947 C 554.32312,897.51565 554.40544,897.93315 558.38573,900.25775 C 560.40328,901.43605 563.44876,903.93078 565.15348,905.8016 L 568.25298,909.20307 L 565.89981,913.78494 C 564.60557,916.30496 563.54665,919.13281 563.54665,920.06904 C 563.54665,922.17288 565.45168,925.38626 568.07907,927.71426 C 569.38371,928.87022 569.91926,929.93552 569.64021,930.81968 C 569.40659,931.55988 569.53732,932.00068 569.9307,931.79923 C 570.81806,931.34483 570.80322,926.27103 569.90321,922.40785 C 568.72618,917.35554 570.47334,915.945 579.32077,914.80467 C 582.78829,914.35774 585.49097,912.62851 589.7669,908.12099 C 590.52189,907.32512 592.00656,906.67395 593.06619,906.67395 C 595.23774,906.67395 596.08505,905.23585 595.86687,901.92052 C 595.65226,898.65936 595.80157,898.17737 597.0264,898.17737 C 598.84849,898.17737 600.62078,900.86894 600.62078,903.63614 C 600.62078,905.86711 601.16336,906.62864 604.91536,909.66382 C 609.94581,913.73319 611.18017,916.81698 609.02436,919.92932 C 607.82372,921.66269 607.82277,921.88482 609.01176,922.86999 C 610.20076,923.85515 610.16942,924.01191 608.59671,924.94515 C 607.66103,925.50038 605.63984,926.74537 604.10516,927.71179 C 600.48796,929.98961 591.32663,932.56732 590.19138,931.62667 C 588.6638,930.36097 590.2689,928.95283 595.93334,926.58928 C 599.0342,925.29542 601.42101,924.11231 601.23737,923.96014 C 601.05372,923.80798 597.20146,924.71369 592.6768,925.97282 C 582.66438,928.75912 575.07444,932.11502 574.75194,933.89833 C 574.61728,934.64296 575.88935,936.57911 577.77546,938.50025 C 581.24308,942.03225 582.71686,942.31582 585.30246,939.94855 C 586.57695,938.78169 586.5661,938.52183 585.10585,935.23735 C 583.39628,931.39208 583.50393,930.20295 585.5616,930.20295 C 587.00861,930.20295 589.1899,931.96177 591.39341,934.90528 L 592.71186,936.66648 L 601.00478,936.27737 C 608.37649,935.93148 609.2977,936.00809 609.2977,936.9671 C 609.2977,938.36496 609.96171,938.32224 612.84736,936.73878 C 617.8126,934.01417 620.26937,935.71498 616.28848,939.12108 C 611.34433,943.35136 601.04202,946.54254 592.32919,946.54254 C 588.14512,946.54254 584.05574,947.19828 584.05574,947.8692 C 584.05574,948.14953 585.38686,948.23114 587.01378,948.05056 C 591.11103,947.59577 598.76402,948.87297 601.28416,950.43213 C 603.79631,951.98635 603.48073,951.94257 605.60271,951.03122 z M 616.81841,921.08897 C 616.53542,920.7096 615.45838,920.3992 614.42497,920.3992 C 611.44435,920.3992 611.37549,919.29115 614.18207,916.49063 C 617.66014,913.02007 619.50962,913.01572 619.68372,916.4777 C 619.75602,917.91558 619.84477,919.6027 619.88092,920.22684 C 619.9546,921.49883 617.61532,922.15736 616.81841,921.08897 z M 569.54772,906.1343 C 569.03004,905.44028 570.41825,904.39215 575.61556,901.55297 C 579.52825,899.41554 581.68931,898.94172 581.68931,900.22128 C 581.68931,900.71283 583.01988,900.85208 585.6876,900.63969 C 590.07932,900.29004 591.57942,900.99497 592.43181,903.80897 C 593.07751,905.9406 592.3907,906.39887 589.93804,905.47296 C 586.61972,904.22021 578.36311,904.63012 571.30395,906.39804 C 570.58121,906.57903 569.79092,906.46035 569.54772,906.1343 z M 581.50405,923.56153 C 586.81394,921.13611 590.0665,918.81054 591.64013,916.3143 C 592.32974,915.22037 593.42283,914.51695 594.43313,914.51695 C 595.92886,914.51695 596.0543,914.8021 595.70101,917.39917 L 595.30892,920.2814 L 598.71568,920.5059 C 601.64235,920.69876 602.23896,920.51852 602.94923,919.22688 C 604.73535,915.97881 603.10979,912.64471 599.06286,911.25579 C 596.08051,910.23224 593.87287,910.88124 592.15883,913.28545 C 590.22097,916.0036 584.06871,919.10536 579.55384,919.64047 C 576.65692,919.98382 575.78859,920.35402 575.83896,921.22426 C 576.03384,924.59134 576.20686,925.62787 576.57398,925.62787 C 576.79748,925.62787 579.01601,924.69802 581.50405,923.56153 z " />
-    <path
-       id="path1943"
-       style="fill:#d8c9b6"
-       d="M 502.81458,1001.7768 C 502.03045,1000.9939 502.18949,999.61512 503.62508,994.75074 C 504.60741,991.42203 506.24395,987.12057 507.26183,985.19177 L 509.11252,981.68491 L 507.34076,982.1214 C 503.03335,983.18231 499.81742,983.2479 497.61208,982.31981 C 495.62594,981.48395 494.30333,981.46945 487.8557,982.21237 C 479.06505,983.22522 475.18705,982.73468 469.05881,979.83464 C 461.75571,976.3788 457.40865,969.30813 457.97066,961.79943 L 458.24034,958.19642 L 455.19336,957.32303 C 451.47661,956.25769 447.76885,953.47149 446.31102,950.64842 C 445.09475,948.29314 444.86028,940.18905 445.9665,938.74051 C 446.44206,938.11779 446.17902,936.98115 445.18619,935.36865 C 443.94127,933.34676 443.72791,931.78338 443.92209,926.10638 C 444.12834,920.07655 444.40312,918.92679 446.26795,916.29019 C 447.42968,914.64768 448.3802,912.63867 448.3802,911.82571 C 448.3802,910.90594 449.81962,909.22178 452.19098,907.36702 C 454.2869,905.72769 456.45947,903.43111 457.01892,902.26351 C 458.13527,899.9336 465.76824,893.73647 471.29239,890.67503 C 473.22452,889.60425 476.22523,887.7965 477.96062,886.65782 C 486.05832,881.34448 497.78317,877.31868 506.22006,876.95479 C 509.46836,876.81468 512.12797,876.34185 512.92495,875.76278 C 515.3304,874.01503 517.93585,873.65684 533.96622,872.87002 C 553.37193,871.91752 557.72557,872.38228 563.20686,875.99149 C 565.04108,877.19926 567.05269,877.91628 568.60687,877.91628 C 569.96914,877.91628 571.87265,878.37413 572.83687,878.93372 C 575.09769,880.24578 575.16593,881.48557 572.92257,880.4908 C 572.00549,880.08412 570.02904,879.87 568.53045,880.01496 C 566.49235,880.21211 565.61337,879.98068 565.04229,879.09652 C 562.78224,875.59753 549.61437,872.71564 541.77133,874.00349 C 539.21391,874.42342 536.76651,874.73569 536.33265,874.69743 C 535.89881,874.65915 534.05424,874.45601 532.2336,874.24599 C 530.08039,873.99761 528.1227,874.19509 526.63268,874.81099 C 525.3728,875.33175 523.25078,875.62513 521.91708,875.46294 C 519.16153,875.12784 513.85153,876.37919 513.85153,877.36366 C 513.85153,878.76454 518.49333,881.75816 521.80501,882.49308 C 523.72137,882.91836 525.82175,883.48845 526.47252,883.75997 C 528.30851,884.52598 529.60337,887.12893 529.61614,890.0794 C 529.62689,892.56281 530.13073,893.19178 536.29146,898.41258 C 539.95648,901.51846 543.4891,904.05961 544.14168,904.05961 C 544.79426,904.05961 546.4272,905.38312 547.77043,907.00074 C 550.13808,909.85208 551.89311,910.63508 552.8977,909.28828 C 554.08883,907.69141 554.68607,909.02474 555.16663,914.35356 C 555.45028,917.49892 555.89611,921.19514 556.15735,922.56737 L 556.63235,925.06233 L 553.5818,924.85491 L 550.53126,924.64749 L 550.53126,921.49867 C 550.53126,919.17999 550.16733,918.18065 549.15084,917.70809 C 548.27856,917.30256 547.77043,916.28506 547.77043,914.94391 C 547.77043,912.10231 542.93401,908.09714 538.83754,907.54633 C 536.26608,907.20058 535.84951,906.86739 535.09815,904.55536 C 534.19759,901.78433 531.89216,899.65508 526.99472,897.07126 C 523.99881,895.49066 523.97006,895.43567 524.23389,891.78999 L 524.50049,888.10595 L 519.76762,885.91095 C 517.16455,884.70372 513.52758,882.49802 511.68549,881.00943 L 508.33623,878.3029 L 503.00857,879.06432 C 492.87766,880.51222 487.19822,882.91993 471.42296,892.45457 C 462.71934,897.71509 461.48781,898.71063 459.35657,902.20882 C 456.52724,906.85283 456.81692,908.17316 461.05853,909.96611 C 465.4599,911.82658 465.22832,913.30651 460.61777,912.7829 C 458.26345,912.51552 456.67305,912.66025 455.86583,913.21533 C 454.22789,914.34167 453.33659,913.4563 454.52335,911.88176 C 455.7986,910.18981 455.73926,907.98112 454.41854,907.98112 C 452.9198,907.98112 450.74739,910.13592 450.74259,911.62728 C 450.74037,912.31792 449.86403,914.05944 448.79518,915.49732 C 446.90298,918.04284 446.13878,922.03079 447.45926,922.46888 C 447.82043,922.5887 449.07163,924.42939 450.23971,926.55931 C 452.70851,931.06107 452.03904,932.64038 448.7997,929.95637 C 447.66184,929.01357 446.56953,928.2422 446.37231,928.2422 C 445.30496,928.2422 446.22446,934.07596 447.58274,935.9218 C 449.00248,937.85115 449.49882,938.04595 452.9951,938.04595 C 455.67046,938.04595 457.46595,937.64083 458.88258,936.71754 C 460.72904,935.5141 460.87712,935.08372 460.4567,932.14246 C 459.88213,928.12274 460.96889,927.89758 464.6916,931.26509 C 467.04396,933.39299 467.57207,933.58178 469.87488,933.11787 C 473.6758,932.35218 476.79491,932.50891 480.32643,933.64305 C 482.84201,934.45092 483.9157,935.35308 485.62663,938.09652 C 489.7782,944.75349 495.27184,947.70745 498.15233,944.83167 C 499.10773,943.87784 499.40658,943.96476 501.20696,945.72008 C 504.05091,948.49285 506.0802,949.22531 508.99757,948.53206 C 511.01949,948.05159 511.95053,948.23519 514.35866,949.58923 C 517.33962,951.26537 518.50321,951.29046 522.98637,949.7752 C 525.14832,949.04448 525.6754,949.11266 527.76593,950.39327 C 529.86477,951.679 530.50556,951.76022 533.76949,951.15414 C 537.88877,950.38926 539.56641,950.71447 540.72079,952.50167 C 541.58403,953.83815 546.49206,954.26342 547.37602,953.07836 C 548.05574,952.16709 550.92566,952.25758 550.92566,953.19029 C 550.92566,953.61133 550.30919,954.52021 549.55572,955.21006 C 548.255,956.40096 548.255,956.50632 549.55572,957.29434 C 550.30919,957.75087 550.92566,958.60661 550.92566,959.19608 C 550.92566,960.99343 546.49353,960.502 542.57935,958.27066 C 538.09321,955.71326 533.98567,954.29498 532.46522,954.77838 C 531.8081,954.98732 530.03516,954.82046 528.52538,954.40766 C 526.28762,953.79572 525.34127,953.8451 523.40475,954.67485 C 520.37235,955.97411 516.47289,955.96685 513.45713,954.65622 C 512.15559,954.09061 509.67083,953.55353 507.93545,953.46277 C 506.20007,953.37199 502.92844,952.51309 500.66516,951.55408 C 496.01878,949.5853 491.41145,949.30367 488.78509,950.82788 C 486.70342,952.03597 486.55935,954.03401 488.29478,957.62774 C 489.97813,961.11356 492.10036,961.54773 507.93545,961.64584 C 514.87699,961.68878 525.17098,961.91106 530.81097,962.13962 L 541.06552,962.55529 L 541.31512,964.35265 C 541.54564,966.01262 541.84718,966.157 545.25918,966.24138 C 556.81674,966.52719 558.81378,965.69303 558.81378,960.57951 C 558.81378,956.33161 560.57254,955.63522 562.3581,959.17608 C 562.96167,960.37292 563.91972,961.66257 564.48708,962.04191 C 565.74508,962.88294 568.1781,962.18622 570.069,960.44344 C 571.40388,959.21313 571.4016,959.04203 570.01619,956.47809 C 569.21985,955.00431 566.04554,951.72474 562.96217,949.19014 C 557.66908,944.8391 557.14347,944.57554 553.54925,944.47007 C 547.75137,944.29996 544.56802,944.08204 540.61675,943.58481 C 537.82351,943.23332 536.72708,943.36796 535.74302,944.18334 C 533.99543,945.63132 533.8054,945.58024 529.9308,942.62103 C 526.79382,940.22517 526.14162,940.0067 522.12634,940.0067 C 516.65562,940.0067 513.86224,939.0434 508.18586,935.19928 C 505.7205,933.52971 503.27764,932.1637 502.75728,932.1637 C 502.23692,932.1637 500.57231,932.7981 499.05815,933.57348 C 497.43049,934.40697 494.90095,935.0081 492.87005,935.04404 C 488.43667,935.12249 485.53229,932.91913 484.89714,928.9955 C 484.50286,926.5598 484.23565,926.28145 482.29181,926.28145 C 481.10052,926.28145 479.68393,925.84028 479.14384,925.30107 C 477.636,923.7957 476.37541,924.1099 473.66648,926.66627 C 470.66992,929.49409 468.43216,929.31906 469.15762,926.3136 C 469.54278,924.71797 469.34237,924.37142 467.93515,924.19951 C 465.30608,923.87836 465.38994,922.54095 468.11232,921.37451 C 471.08158,920.10227 472.83334,916.97354 472.83334,912.94256 C 472.83334,908.02122 475.32574,908.20558 476.28926,913.19819 C 476.84037,916.05376 481.88853,921.13615 485.3557,922.3261 C 488.21011,923.30574 490.01938,922.61849 492.0103,919.79831 C 493.27666,918.00448 493.29907,917.738 492.2075,917.45291 C 491.53018,917.27601 490.40591,916.98149 489.70912,916.79841 C 488.74724,916.54567 488.5829,916.03426 489.02653,914.67426 C 489.34789,913.68906 489.5682,910.38304 489.51613,907.32753 C 489.4153,901.41074 491.00992,897.19699 493.34985,897.19699 C 494.28692,897.19699 494.44651,897.86052 494.13585,900.46491 C 493.92146,902.26226 493.74398,905.84633 493.74145,908.42952 C 493.7373,912.66558 493.9496,913.3101 495.90608,915.00112 C 498.4551,917.20429 498.61582,918.58114 496.60069,920.95188 C 493.98252,924.0321 491.64323,928.34412 492.07942,929.28594 C 492.70175,930.62968 497.2593,930.41105 500.2636,928.89333 C 503.49816,927.25932 505.67797,927.23261 506.69973,928.81449 C 507.13521,929.48872 509.2913,930.99727 511.49103,932.16684 C 516.57462,934.86975 521.18397,935.16245 523.37406,932.92147 C 525.12973,931.12501 525.9835,931.43908 527.75558,934.53329 C 529.41071,937.42325 531.95452,938.27175 537.56167,937.80421 C 541.31168,937.49153 542.14349,937.6298 543.31154,938.76011 L 544.67713,940.08159 L 547.5177,938.62698 C 550.26752,937.21884 550.39254,937.21119 551.43078,938.38766 C 552.02067,939.05607 552.50328,939.84085 552.50328,940.13162 C 552.50328,940.96792 555.20777,940.74963 558.35776,939.65911 C 561.78822,938.47149 562.93634,938.86304 562.2891,940.99976 C 561.29016,944.29754 567.46648,948.77398 572.46717,948.37654 L 574.98441,948.17649 L 574.75885,951.11761 C 574.51018,954.35988 576.79302,958.307 578.91687,958.307 C 580.32804,958.307 580.35047,957.95321 579.28434,952.50924 C 577.84881,945.17885 573.26887,939.4221 565.60906,935.32005 C 557.23095,930.83333 545.30278,928.93314 538.26914,930.96474 C 535.95922,931.63192 535.52835,931.57673 534.79898,930.52018 C 534.34097,929.85669 532.83986,928.2639 531.4632,926.98066 C 529.24628,924.91418 528.52496,924.64749 525.15271,924.64749 C 522.46734,924.64749 520.61194,925.08089 518.85704,926.11805 C 515.65111,928.0128 515.16107,927.97243 514.13925,925.7294 C 513.46953,924.25929 512.52535,923.71019 509.62785,923.10565 C 506.80796,922.51733 505.96343,922.04204 505.96343,921.04337 C 505.96343,919.96505 506.49692,919.74561 509.11866,919.74561 C 511.65676,919.74561 512.27391,919.51035 512.27391,918.54284 C 512.27391,916.59025 507.8593,909.88836 504.05551,906.0664 C 500.06304,902.05486 500.06078,900.73966 504.04986,902.78238 L 506.74424,904.16214 L 507.48839,902.54041 C 509.19033,898.8314 512.11166,899.78763 510.82983,903.63415 C 510.12389,905.75256 510.37241,906.50398 513.3956,911.39212 C 515.23666,914.36893 516.93323,917.42388 517.16574,918.18092 C 517.51412,919.31523 518.40456,919.63388 522.2277,919.99233 C 527.60798,920.49677 533.95702,922.77559 536.59182,925.14795 C 538.24711,926.63835 538.87062,926.77017 542.9023,926.48195 C 550.18403,925.96139 562.54474,928.77635 568.49917,932.31124 C 569.6572,932.99872 570.03369,932.97298 570.65633,932.1637 C 571.66257,930.85582 571.62885,927.09568 570.57433,923.02154 C 569.30842,918.13075 570.52148,916.92268 578.10144,915.5254 C 583.72464,914.48882 584.26532,914.22856 587.75706,910.87743 C 590.21438,908.51909 592.05805,907.32753 593.24976,907.32753 C 595.50629,907.32753 596.67672,905.55643 596.67672,902.14183 C 596.67672,900.68032 597.0498,899.48454 597.50578,899.48454 C 598.55778,899.48454 600.62078,903.52092 600.62078,905.57921 C 600.62078,906.57791 602.01722,908.29784 604.49481,910.3507 C 608.97082,914.05936 610.40318,917.65018 608.20819,919.65981 C 606.79179,920.95663 606.49242,923.01354 607.72008,923.01354 C 611.18117,923.01354 602.22704,928.6323 596.09465,930.30857 C 591.88863,931.45828 590.0189,931.39309 590.53321,930.11469 C 590.67084,929.77257 593.25278,928.38525 596.27085,927.03175 C 600.6541,925.06602 601.86658,924.18404 602.2967,922.64842 C 602.59285,921.59108 603.28558,919.8065 603.83611,918.68268 C 605.17826,915.94285 603.73823,913.04739 600.1092,911.18903 C 596.70436,909.44547 594.30179,909.89779 591.96616,912.72206 C 589.15961,916.1158 584.38933,918.60377 580.02234,918.95145 C 577.91814,919.11897 575.85517,919.59685 575.43795,920.01338 C 574.7397,920.71047 575.46594,925.26434 576.39859,926.03709 C 576.60149,926.20521 579.10149,925.27977 581.95415,923.98057 C 586.73704,921.80226 590.70089,918.85552 592.56929,916.08922 C 593.53718,914.65621 596.26839,915.36704 595.57198,916.87072 C 595.3082,917.44029 594.86561,918.65488 594.58847,919.56982 C 594.10447,921.16765 594.19375,921.21637 596.84902,920.80364 C 598.81033,920.49877 599.88973,920.64972 600.56432,921.32322 C 601.87643,922.63317 599.73451,923.66012 590.36624,926.21275 C 581.52394,928.62209 574.9136,931.59646 574.18726,933.49264 C 573.87258,934.31413 574.16538,935.41743 574.92828,936.28495 C 575.62196,937.07376 576.98326,938.66856 577.9534,939.82896 C 580.11777,942.41777 580.95752,942.72061 583.2737,941.74761 C 586.29306,940.4792 586.88781,939.09878 585.77169,935.94969 C 584.30548,931.81278 584.31174,931.25711 585.82755,930.99753 C 586.78316,930.83388 587.97888,931.7932 589.73224,934.13021 L 592.2595,937.49877 L 597.82056,936.99384 C 607.28317,936.13468 608.12319,936.20764 608.05185,937.88255 C 607.97361,939.71961 608.18729,939.71181 612.05855,937.73621 C 615.28734,936.08846 617.97463,935.61226 617.97463,936.68785 C 617.97463,937.70531 611.69185,941.8125 607.82745,943.32129 C 604.26125,944.71365 600.40018,945.34678 589.24187,946.36892 C 581.9538,947.03653 581.19262,948.50186 588.13126,948.50693 C 594.21263,948.51137 598.85807,949.49239 601.16872,951.26019 C 602.35379,952.16685 603.49695,952.46048 604.79266,952.19103 C 607.67631,951.59136 614.32339,946.92342 616.02779,944.30112 C 617.72057,941.69666 618.76344,941.30535 618.76344,943.27461 C 618.76344,945.07934 619.66186,944.91391 622.31309,942.62103 C 624.81259,940.45937 625.86274,940.1626 625.86274,941.61792 C 625.86274,945.60322 605.34178,956.24972 597.46553,956.35063 C 595.36239,956.37763 595.0061,956.53201 595.96991,956.99879 C 597.60396,957.79022 605.64612,956.73403 611.10141,955.01157 C 616.09108,953.43619 621.87648,950.00089 624.47162,947.07257 C 625.52638,945.88237 627.15887,943.19001 628.09936,941.08956 C 629.79889,937.29387 629.79969,937.26845 628.23045,936.92844 C 626.41664,936.53543 626.09053,935.43162 627.78821,935.43162 C 629.56611,935.43162 630.0125,934.27129 629.44369,931.12843 C 628.98313,928.58375 628.57156,928.10519 626.11094,927.25333 C 621.85136,925.77867 620.26428,926.04417 616.03691,928.93861 C 613.90244,930.40005 611.51801,931.87871 610.73815,932.22452 C 608.67458,933.13959 602.23055,934.04272 601.80791,933.47611 C 601.21239,932.67772 603.99667,931.06306 606.69425,930.6424 C 608.08234,930.42594 611.37255,928.93468 614.0058,927.32851 C 617.27468,925.33464 620.16478,924.17233 623.11591,923.66471 C 626.678,923.05199 627.52309,922.64118 627.92053,921.32912 C 628.54344,919.27275 627.6505,915.26396 626.13576,913.31647 C 624.33689,911.00366 625.73915,910.64746 627.88476,912.87221 C 630.12965,915.19987 631.04148,919.41437 630.03833,922.82611 C 629.52199,924.58222 629.60782,925.90403 630.33379,927.37699 C 630.89654,928.51876 631.5791,931.01904 631.85063,932.93317 C 632.26764,935.87303 631.96033,937.23838 629.87153,941.72626 C 627.87248,946.02131 626.59598,947.66818 623.20813,950.32298 C 618.52651,953.99162 611.33647,957.26604 605.60321,958.3404 C 603.51364,958.73202 597.71273,959.04079 592.71229,959.02653 L 583.62058,959.00072 L 579.22823,963.06967 C 571.83033,969.92281 564.99658,971.9884 549.61925,972.01932 L 543.18555,972.03225 L 540.39861,975.24648 C 538.23306,977.74401 536.19557,979.07108 531.26021,981.19855 C 523.73786,984.44114 518.42768,988.87454 512.16751,997.13845 C 508.6148,1001.8283 507.60273,1002.7272 505.8628,1002.738 C 504.72285,1002.7449 503.35114,1002.3124 502.81458,1001.7768 z M 475.06991,958.92451 C 472.92442,956.7124 472.16811,956.34175 470.49707,956.68324 C 467.64573,957.26592 466.88605,958.07498 468.07535,959.26235 C 469.15758,960.34279 472.86174,961.4195 475.82856,961.51603 C 477.58484,961.57315 477.56151,961.49348 475.06991,958.92451 z M 483.49897,959.12398 C 483.19839,958.49491 482.58834,956.3626 482.14331,954.38551 C 481.69828,952.40844 481.00679,950.26417 480.60669,949.62046 C 479.5281,947.88527 480.43651,947.21965 483.03916,947.83812 C 485.81041,948.49665 486.64737,947.99755 485.12279,946.59557 C 484.50471,946.0272 483.30543,944.09159 482.45775,942.29424 C 481.29078,939.81995 480.46178,938.97143 479.04414,938.8003 C 478.01436,938.676 476.79564,938.31878 476.33587,938.0065 C 475.87611,937.69421 473.52437,937.45827 471.10978,937.48216 C 468.6952,937.50606 465.95808,937.18792 465.02731,936.77518 C 462.73617,935.7592 461.78999,936.39993 461.78999,938.96737 C 461.78999,944.28176 464.90204,947.19687 471.24673,947.82561 C 473.57442,948.05629 474.84003,948.51235 474.94105,949.15687 C 475.68889,953.9278 476.35683,955.37307 478.88579,957.69244 C 481.81683,960.38056 484.49677,961.21218 483.49897,959.12398 z M 586.81658,956.99983 C 587.09417,956.62769 586.41485,956.34626 585.23896,956.34626 C 584.06307,956.34626 583.38375,956.62769 583.66133,956.99983 C 583.92947,957.35931 584.6394,957.65342 585.23896,957.65342 C 585.83851,957.65342 586.54845,957.35931 586.81658,956.99983 z M 468.46744,954.31785 C 470.00099,953.20218 471.25572,951.92005 471.25572,951.46865 C 471.25572,950.7288 462.36957,947.86417 459.9986,947.83969 C 459.46541,947.83419 458.51566,947.56051 457.88807,947.23152 C 456.93545,946.73216 457.02768,946.43693 458.44645,945.44417 C 460.00803,944.35149 460.05862,944.08835 459.06989,942.20153 C 458.15354,940.45285 457.48528,940.09862 454.56743,939.81489 C 452.68292,939.63163 450.45548,939.37924 449.61759,939.25402 C 446.49469,938.78729 446.01315,947.72184 448.93993,951.82709 C 450.88596,954.55668 455.72688,956.34514 461.17093,956.3458 C 465.08915,956.3462 466.04406,956.08083 468.46744,954.31785 z M 597.46553,953.75851 L 599.43756,953.26179 L 597.21698,952.51649 C 592.94558,951.08288 583.26693,951.91495 583.26693,953.71577 C 583.26693,954.49106 594.42392,954.52465 597.46553,953.75851 z M 564.8639,928.25204 C 560.63663,925.17674 559.24052,921.47717 559.98323,915.31869 C 561.07411,906.27312 560.74723,905.69722 552.8154,902.69037 C 548.37446,901.00688 547.92394,900.63924 547.01857,897.95993 C 545.95656,894.81709 541.26765,890.53312 537.12147,888.91757 C 535.18803,888.16421 534.79961,887.65531 534.99865,886.13631 C 535.17113,884.82001 534.61208,883.73212 533.08413,882.41069 C 530.35821,880.05321 531.0841,879.41893 535.21516,880.54859 C 537.73278,881.23704 538.73268,881.25996 539.75475,880.65271 C 543.04743,878.69636 544.75104,878.52202 549.64759,879.64029 C 552.3674,880.26144 556.63909,880.67743 559.43095,880.59303 C 564.05664,880.45319 569.38468,881.33782 570.91592,882.4999 C 571.28133,882.77721 569.30638,882.85287 566.52713,882.66802 C 562.80011,882.42014 560.83296,882.60659 559.03153,883.37844 C 556.84348,884.31595 556.1915,884.32499 552.77138,883.46523 C 548.23698,882.32537 544.12755,882.21242 543.38547,883.20727 C 543.09178,883.60103 543.32064,884.64954 543.89408,885.53732 C 544.77221,886.89684 544.75877,887.24256 543.80886,887.729 C 542.91669,888.18586 543.33636,888.78582 545.81734,890.60041 C 547.5423,891.86205 549.24622,892.90653 549.60383,892.92149 C 549.96144,892.93647 550.84885,891.77524 551.57585,890.34101 C 552.57268,888.37451 553.34518,887.73169 554.71763,887.72668 C 555.71859,887.72303 558.02586,887.41291 559.8449,887.03753 C 562.57327,886.47449 563.93274,886.5789 567.61088,887.63395 C 571.69568,888.80564 572.21745,888.82704 573.83362,887.88908 C 575.12179,887.1415 575.9488,887.04695 576.89902,887.53864 C 577.61475,887.90899 579.74965,888.42889 581.64328,888.69396 C 583.77833,888.99284 585.79062,889.80567 586.94044,890.83366 L 588.79465,892.49139 L 591.92875,891.32039 C 595.41276,890.01865 594.65655,889.76897 601.6068,894.51581 C 603.66756,895.92327 605.35364,897.37416 605.35364,897.74002 C 605.35364,898.10588 604.55498,897.82003 603.57882,897.10479 C 598.44322,893.34189 594.08456,892.6263 590.50607,894.95859 L 588.42505,896.31491 L 585.57671,893.54723 L 582.72837,890.77957 L 577.39692,891.19208 C 573.74616,891.47454 570.24959,891.27398 566.30525,890.55586 C 558.244,889.08819 556.91311,889.49424 555.22705,893.93572 C 553.90853,897.40897 553.91232,897.59328 555.32843,898.88983 C 556.1374,899.63048 557.81269,900.72903 559.0513,901.33106 C 561.39387,902.46967 566.70189,908.06927 566.70189,909.40191 C 566.70189,909.82221 565.77664,912.08237 564.64578,914.42449 C 562.10582,919.685 562.41899,922.67464 565.93497,926.73123 C 567.3163,928.32495 568.2687,929.77619 568.05143,929.95621 C 567.83415,930.13624 566.39977,929.36937 564.8639,928.25204 z M 615.34276,919.44804 C 613.94809,918.57235 613.96012,918.46448 615.66541,916.55337 C 617.85398,914.10063 618.76344,914.47347 618.76344,917.82344 C 618.76344,920.58441 617.84632,921.01999 615.34276,919.44804 z M 525.20491,910.86879 C 525.46825,910.30018 525.6837,908.511 525.6837,906.89283 C 525.6837,905.17038 526.01954,904.04344 526.49378,904.17441 C 527.63136,904.48862 532.0247,911.0059 531.43069,911.49808 C 531.16216,911.72057 529.54377,911.90262 527.83427,911.90262 C 525.32411,911.90262 524.81823,911.70371 525.20491,910.86879 z M 620.90697,909.22402 C 619.82118,908.70039 619.61247,908.053 619.99077,906.38216 C 620.31447,904.9525 620.03583,903.50565 619.16949,902.11752 C 618.44833,900.96204 618.0704,899.84089 618.32965,899.62609 C 619.34799,898.78233 621.37776,901.50609 621.96127,904.49938 C 622.29955,906.23461 622.82128,908.16902 623.1207,908.7981 C 623.73289,910.08429 622.98802,910.22761 620.90697,909.22402 z M 572.22357,904.82268 C 572.22357,904.1942 579.07339,900.13811 580.13475,900.13811 C 580.55591,900.13811 580.9005,900.44734 580.9005,900.82528 C 580.9005,901.24136 582.63791,901.45421 585.30454,901.36482 C 588.41099,901.26069 589.91812,901.49151 590.41973,902.14822 C 591.90383,904.09117 591.0904,904.38641 584.25324,904.38641 C 580.45692,904.38641 576.19721,904.59964 574.78721,904.86025 C 573.37721,905.12088 572.22357,905.10397 572.22357,904.82268 z M 465.73404,901.88669 C 465.73404,900.44296 471.55366,896.4098 474.37872,895.8957 C 478.94214,895.06522 478.52459,896.90137 473.77619,898.54526 C 472.18485,899.09618 470.16807,900.07735 469.29446,900.72566 C 466.79151,902.5831 465.73404,902.92794 465.73404,901.88669 z M 481.22589,900.9918 C 480.94845,900.76191 480.72146,899.58914 480.72146,898.38563 C 480.72146,895.60505 485.55277,890.83203 487.09165,892.09229 C 487.83022,892.69713 487.59348,893.3106 486.02572,894.85436 C 484.91728,895.94585 483.77549,897.72489 483.48844,898.8078 C 482.94238,900.86778 482.08041,901.69982 481.22589,900.9918 z M 611.91013,896.69508 C 609.8204,895.86029 608.25312,894.66854 607.64483,893.45177 C 606.41923,891.00015 601.24451,888.27622 597.51059,888.11722 C 595.92311,888.04959 593.57746,887.38518 592.29804,886.64072 C 588.62346,884.50256 584.31605,883.60152 580.02426,884.07325 C 576.99016,884.40674 576.16763,884.30067 576.16763,883.57595 C 576.16763,882.64002 579.40143,881.83735 583.16833,881.8383 C 584.30717,881.83858 587.40444,882.68765 590.05112,883.7251 C 592.69781,884.76255 596.35158,885.81972 598.17059,886.07435 C 600.78011,886.43964 602.69797,887.47468 607.2608,890.9801 C 610.4414,893.42362 613.7982,895.62129 614.72035,895.86379 C 615.64251,896.10629 616.39701,896.72605 616.39701,897.24104 C 616.39701,898.39197 616.05328,898.35015 611.91013,896.69508 z M 513.85793,893.738 C 512.22631,892.64329 512.20034,892.50576 513.4615,891.63853 C 514.64432,890.82516 514.94671,890.86421 515.90892,891.95451 C 517.1501,893.36094 517.35785,894.90945 516.30536,894.90945 C 515.91957,894.90945 514.81823,894.3823 513.85793,893.738 z M 498.86412,885.5185 C 498.86412,884.39757 502.50393,881.83778 504.09777,881.83778 C 505.8376,881.83778 505.33912,882.96156 503.00538,884.30045 C 499.32489,886.41196 498.86412,886.5475 498.86412,885.5185 z " />
-    <path
-       id="path1941"
-       style="fill:#c9b6a0"
-       d="M 503.27677,1001.7384 C 502.30579,1000.9339 502.30768,1000.2552 503.29075,996.71415 C 504.89423,990.93863 505.8141,988.49423 507.72071,984.9425 C 508.63672,983.23602 509.2234,981.70497 509.02443,981.54004 C 508.82546,981.37519 507.09913,981.68663 505.18814,982.2322 C 502.04725,983.12883 501.39149,983.12211 498.35865,982.16242 C 495.45408,981.24335 494.14122,981.20527 488.57911,981.87916 C 474.32079,983.60659 465.21988,980.22592 460.32233,971.38266 C 458.73189,968.51094 458.31591,966.69477 458.26303,962.39191 L 458.19674,956.99983 L 461.87467,956.99983 C 464.91158,956.99983 465.77424,957.28016 466.82426,958.60792 C 467.62889,959.62541 469.59783,960.5856 472.18542,961.22225 C 479.43375,963.00581 480.0764,962.2819 475.27005,957.7478 C 472.63669,955.2636 472.04477,954.99301 470.62267,955.62365 C 467.95106,956.80834 467.68383,956.45528 469.8093,954.5489 C 472.26911,952.34273 472.96244,950.83244 471.91417,949.96385 C 471.37883,949.5203 471.39902,949.16063 471.9758,948.86527 C 473.49692,948.08633 474.41097,949.17248 474.41097,951.75896 C 474.41097,955.6826 480.39111,961.66787 483.36626,960.72193 C 484.42666,960.38475 484.50008,960.00019 483.79161,958.49373 C 483.32066,957.49238 482.66613,955.20249 482.33709,953.40516 C 482.00806,951.60781 481.59867,949.71048 481.42736,949.18887 C 481.18841,948.46138 481.8048,948.28277 484.07391,948.42196 C 487.40073,948.62606 487.68768,948.20815 485.55977,946.25786 C 484.75007,945.51576 483.45977,943.51218 482.69243,941.80549 C 481.46072,939.06597 480.91695,938.61271 478.05132,937.937 C 476.26605,937.51604 472.83763,937.14777 470.43259,937.11859 C 465.132,937.05433 462.10716,935.60111 461.13229,932.65049 C 460.07513,929.45081 461.37452,929.09129 464.39745,931.74704 C 467.38589,934.37249 467.7721,934.45425 472.10504,933.37863 C 474.58524,932.76293 475.58536,932.81995 477.83745,933.70541 C 479.33786,934.29535 481.12262,934.77803 481.80358,934.77803 C 482.52462,934.77803 483.871,936.23055 485.0275,938.25609 C 488.66701,944.6305 494.23844,947.91345 498.03745,945.92216 C 498.8649,945.48846 500.01502,945.94477 502.18099,947.56614 C 505.37825,949.95949 506.30476,950.16755 509.40961,949.18946 C 510.99119,948.69123 511.94387,948.88503 514.22887,950.16984 C 517.60682,952.06919 519.21654,952.16001 522.42886,950.63244 C 524.71867,949.54357 524.93271,949.54712 527.31603,950.71363 C 529.26929,951.66965 530.69949,951.84681 533.92694,951.53251 C 537.62317,951.17256 538.23448,951.29824 539.89015,952.75849 C 541.90313,954.53387 544.22196,954.80373 547.34223,953.62578 C 549.98533,952.62796 550.77293,953.37344 548.89354,955.09412 C 547.43534,956.42919 547.43463,956.48717 548.86584,957.35427 C 550.43526,958.30518 550.11007,960.27547 548.38678,960.25691 C 547.83086,960.25089 544.72997,958.92739 541.49591,957.31577 C 536.92342,955.03713 534.85075,954.38551 532.17552,954.38551 C 530.28336,954.38551 528.04246,954.07833 527.19573,953.70287 C 526.04185,953.19118 525.22054,953.27304 523.91683,954.02966 C 521.74729,955.28876 515.69383,955.30497 513.06272,954.05874 C 511.97811,953.54501 509.90782,953.11426 508.46207,953.10153 C 507.01633,953.08879 503.32007,952.16436 500.24818,951.04723 C 495.47142,949.3101 494.20053,949.09723 491.46858,949.57666 C 489.23448,949.96872 487.918,950.66342 487.0892,951.88762 C 486.01074,953.48061 486.04585,953.92139 487.47976,956.78952 C 488.44838,958.727 489.82753,960.24822 491.05994,960.73846 C 492.31676,961.23846 498.92792,961.67276 508.78252,961.90282 C 517.4274,962.10465 528.05014,962.48106 532.3886,962.73935 C 539.88334,963.18548 540.26776,963.28025 540.09724,964.64009 C 539.86301,966.50784 541.50398,966.9068 549.42018,966.9068 C 558.06968,966.9068 559.60259,966.05268 559.60259,961.2331 C 559.60259,959.26431 559.90365,957.65342 560.2716,957.65342 C 560.63955,957.65342 561.57146,958.81255 562.34248,960.22926 C 563.11351,961.64596 564.2548,962.96745 564.87868,963.16581 C 566.18803,963.58207 569.88492,962.1419 571.40663,960.62265 C 573.07836,958.95366 570.25737,954.71505 564.01999,949.52402 C 559.02651,945.36822 558.20234,944.93963 554.15683,944.3948 C 551.72892,944.06783 548.85504,943.82117 547.77043,943.84665 C 546.6858,943.87215 544.10625,943.57627 542.03808,943.18916 C 538.91194,942.604 537.95215,942.66209 536.34696,943.53354 C 533.56768,945.04241 532.65552,944.85892 530.18574,942.29422 C 528.25304,940.28724 527.54613,940.0067 524.42175,940.0067 C 518.47966,940.0067 514.34856,938.76887 509.52079,935.54185 C 507.01007,933.86361 504.49857,932.21146 503.9397,931.87041 C 503.24704,931.44771 501.6785,931.81182 499.01227,933.01418 C 491.20602,936.53451 485.45433,934.35842 485.45433,927.88466 C 485.45433,925.75677 485.30214,925.62787 482.79007,925.62787 C 481.32473,925.62787 479.68393,925.18669 479.14384,924.64749 C 477.64292,923.14901 476.37736,923.45448 473.72797,925.95466 C 472.39475,927.21281 470.89167,928.2422 470.38781,928.2422 C 469.78134,928.2422 469.62312,927.46898 469.9197,925.95466 C 470.32906,923.86452 470.20182,923.66711 468.44529,923.66711 C 465.97666,923.66711 465.98051,922.77452 468.45316,921.84104 C 471.38771,920.73319 472.93267,918.24435 473.41356,913.85011 C 473.891,909.48753 474.4328,909.46369 475.90197,913.7406 C 477.73102,919.06512 485.77809,924.61891 489.36154,923.02987 C 490.18915,922.66288 491.66059,921.43836 492.63139,920.30871 C 494.33848,918.32232 494.34829,918.22562 492.92989,917.36626 C 492.12326,916.87755 491.07779,916.4777 490.60664,916.4777 C 489.16175,916.4777 489.63024,902.89478 491.17584,899.97473 C 492.53117,897.41415 494.13553,896.7031 494.1253,898.66756 C 494.12201,899.29663 493.74785,901.7084 493.29383,904.02706 C 492.22334,909.49386 492.95055,912.79446 495.82264,915.50483 L 498.14261,917.69415 L 494.47788,923.31009 C 491.4864,927.8943 490.99075,929.10336 491.77997,929.89128 C 493.11439,931.22351 495.98757,931.09873 499.65294,929.54936 C 503.82805,927.78453 504.4754,927.86825 508.00989,930.63024 C 511.29525,933.19755 516.36991,935.39403 519.06963,935.41726 C 519.98728,935.42516 521.72919,934.78566 522.94054,933.99616 L 525.143,932.5607 L 526.39936,934.06827 C 530.13167,938.54678 530.96261,938.90599 536.67264,938.50934 C 541.34639,938.18468 542.16004,938.29941 543.34987,939.45079 C 544.61094,940.67113 544.83639,940.69052 546.60426,939.73075 C 549.19383,938.32487 550.52018,938.43459 551.91583,940.1701 C 553.0919,941.63254 553.119,941.63437 556.83021,940.50199 C 561.01063,939.22643 562.01143,939.40434 561.40815,941.31582 C 560.53189,944.09223 567.23766,949.15687 571.79,949.15687 C 573.57656,949.15687 573.80119,949.42201 573.80119,951.53066 C 573.80119,955.34261 578.2306,960.1271 580.22772,958.4723 C 581.01617,957.81904 579.74265,950.96061 578.12942,947.17206 C 575.41159,940.78949 567.2324,934.58545 557.42195,931.46514 C 552.56188,929.91934 543.43066,929.42267 538.22426,930.42094 C 535.53659,930.93626 535.29471,930.84171 533.74946,928.67168 C 530.45942,924.0514 524.04832,922.66062 519.33892,925.54553 C 516.36681,927.36621 514.92218,927.30084 514.32171,925.31849 C 513.94967,924.09028 512.97057,923.49383 510.2459,922.83556 C 505.65782,921.72707 505.43852,920.7811 509.71027,920.52502 C 512.36552,920.36583 513.06272,920.07128 513.06272,919.10864 C 513.06272,917.006 510.24229,912.39607 506.07765,907.69172 C 503.86824,905.19601 502.23469,903.00976 502.44751,902.83342 C 502.66034,902.65708 503.25451,902.86084 503.7679,903.2862 C 505.29167,904.54876 507.22601,904.17202 508.18634,902.42566 C 509.6509,899.76232 510.85895,900.42709 510.28794,903.58212 C 509.84649,906.02122 510.23766,907.14674 513.39484,912.52146 C 515.38141,915.90336 517.00678,919.05935 517.00678,919.53479 C 517.00678,920.01021 517.27301,920.41819 517.59839,920.44141 C 527.76776,921.16709 532.22648,922.35683 536.00137,925.35196 C 537.81746,926.7929 538.83636,926.99073 545.46711,927.18978 C 553.74652,927.43832 561.4976,929.1746 566.24541,931.8442 C 571.15352,934.60394 572.78487,932.14646 571.3174,924.20368 C 570.14861,917.87755 570.49414,917.46879 578.21902,916.03944 C 583.11976,915.13263 584.06669,914.68158 587.73473,911.50678 C 589.97509,909.56766 592.50512,907.98112 593.35701,907.98112 C 595.38324,907.98112 596.35155,906.89655 597.00401,903.89622 C 597.82058,900.14136 599.83036,901.10796 599.83313,905.25684 C 599.83395,906.48448 600.99689,907.94606 603.76154,910.19403 C 608.37504,913.94531 609.49081,916.88469 607.40945,919.80412 C 606.62463,920.90493 606.28586,922.27899 606.56889,923.21337 C 606.97252,924.54583 606.47249,925.08194 603.20661,926.81838 C 601.09659,927.94026 597.83214,929.3078 595.95227,929.85735 C 591.92216,931.03549 591.94386,931.03344 591.94386,930.23494 C 591.94386,929.89306 594.25217,928.54375 597.07347,927.23647 C 600.90079,925.46305 602.31968,924.41786 602.66237,923.1196 C 602.91499,922.16258 603.62992,920.25815 604.25112,918.88752 C 605.24553,916.69348 605.23406,916.13966 604.15532,914.25609 C 603.47656,913.07092 601.56503,911.48104 599.86961,910.69152 C 597.24811,909.47072 596.50832,909.37988 594.71175,910.05812 C 593.55818,910.49363 592.13323,911.62083 591.54518,912.56303 C 589.93881,915.13689 584.60419,917.87384 579.51511,918.73514 L 574.98441,919.50194 L 575.16668,922.98825 C 575.26692,924.90572 575.54783,926.63936 575.79094,926.84077 C 576.03404,927.0422 578.43678,926.22243 581.13036,925.01907 C 586.3804,922.67357 591.65393,918.91779 592.38801,917.00139 C 593.082,915.1897 595.40078,915.47276 594.79052,917.29468 C 593.13387,922.24061 592.99134,921.89547 596.4883,921.40596 C 599.76088,920.94784 601.38793,921.69778 599.62608,922.85222 C 599.08855,923.20444 595.63155,924.3084 591.94386,925.30546 C 580.70621,928.34389 573.01238,932.08033 573.01238,934.49939 C 573.01238,935.88275 580.25503,942.62103 581.74193,942.62103 C 582.53229,942.62103 584.1693,941.91522 585.37971,941.05255 C 587.49152,939.54745 587.54329,939.36916 586.66035,936.64086 C 586.15427,935.0771 585.48689,933.25312 585.17729,932.5876 C 584.01672,930.09286 587.48748,931.81725 589.58754,934.77877 C 591.92375,938.07328 592.20719,938.12498 602.39561,937.11455 C 607.00198,936.65772 607.72008,936.72653 607.72008,937.62477 C 607.72008,938.6214 603.73512,939.85921 596.87393,940.9938 C 594.42869,941.39814 593.22565,942.63165 595.29631,942.61138 C 598.1812,942.5831 606.75913,940.42118 610.96324,938.66276 C 616.31219,936.42551 617.61574,936.56002 614.78454,939.05705 C 611.01406,942.38251 603.94276,944.60993 595.02109,945.28244 C 583.87768,946.12242 582.3366,946.42908 582.63975,947.74622 C 582.84251,948.62724 584.2407,948.90101 590.11117,949.20915 C 594.97449,949.46443 597.93441,949.94324 599.17416,950.6752 C 600.18673,951.27304 601.75082,952.20658 602.64993,952.74972 C 604.15712,953.6602 604.58008,953.57514 608.07035,951.6596 C 610.15246,950.51691 613.03205,948.57862 614.46944,947.35232 C 616.46131,945.65295 617.39276,945.26637 618.38588,945.72687 C 619.51623,946.251 619.34977,946.5675 617.12976,948.11527 C 612.16646,951.57566 602.78283,954.96608 597.34519,955.26373 C 594.59139,955.41444 593.22567,955.41843 594.31028,955.27261 C 598.76535,954.67367 599.83196,954.31538 599.83196,953.41789 C 599.83196,951.37459 586.20997,950.37843 583.9439,952.25601 C 583.57214,952.56404 583.2067,954.11172 583.13182,955.69529 C 582.8997,960.60337 577.54239,965.8419 569.06833,969.44693 C 566.01522,970.74581 563.93053,971.00939 554.16554,971.33129 C 544.06988,971.66403 542.71568,971.84455 541.93897,972.96087 C 539.67798,976.21059 535.31569,979.40118 530.56467,981.27987 C 524.02679,983.8652 519.19871,987.85948 512.74159,996.02509 C 507.51822,1002.6305 505.68729,1003.7356 503.27677,1001.7384 z M 599.83196,958.4476 C 599.83196,957.964 608.61176,956.31972 609.15899,956.70082 C 609.40871,956.87474 601.23353,958.96059 600.30217,958.96059 C 600.04356,958.96059 599.83196,958.72974 599.83196,958.4476 z M 463.07229,947.56727 C 461.24724,946.8993 460.77145,946.28054 460.63333,944.39536 C 460.53894,943.10723 459.82621,941.24968 459.04948,940.26748 C 457.68641,938.54378 457.68893,938.4502 459.12201,937.57844 C 460.51817,936.72914 460.63623,936.89454 461.10034,940.35018 C 461.4997,943.32372 462.09382,944.45249 464.21311,946.26421 C 466.98761,948.63601 466.74609,948.91188 463.07229,947.56727 z M 445.78521,940.66027 C 446.01212,939.94134 446.33385,939.35311 446.50017,939.35311 C 446.66649,939.35311 446.80258,939.94134 446.80258,940.66027 C 446.80258,941.37923 446.48084,941.96744 446.08761,941.96744 C 445.69438,941.96744 445.5583,941.37923 445.78521,940.66027 z M 630.18459,934.39783 C 630.19373,931.37224 630.42169,928.89654 630.69119,928.89627 C 631.49973,928.89547 632.22784,935.04197 631.68542,937.28918 C 630.7629,941.11095 630.16776,939.9644 630.18459,934.39783 z M 444.12369,933.63426 C 443.36579,931.56419 444.05563,919.79947 444.9798,919.03372 C 445.64486,918.48267 445.80636,918.88775 445.6121,920.61961 C 445.27187,923.6527 445.97371,925.78046 447.18713,925.39464 C 447.99092,925.13908 450.74663,928.68772 450.74663,929.97835 C 450.74663,930.70193 448.20461,928.61638 447.69484,927.47457 C 447.35182,926.70624 446.83234,926.51586 446.10092,926.8904 C 445.38,927.25957 445.02924,928.67622 445.05565,931.11203 C 445.09683,934.90899 444.84245,935.59742 444.12369,933.63426 z M 606.997,931.95322 C 607.17777,931.83746 609.1005,930.90327 611.26974,929.87726 C 613.87232,928.64626 614.83089,928.39906 614.08802,929.15045 C 612.82932,930.42361 609.09866,932.1637 607.62778,932.1637 C 607.10008,932.1637 606.81623,932.06899 606.997,931.95322 z M 626.78634,926.91216 C 623.02978,925.23868 622.9598,925.06125 625.73959,924.25833 C 628.67359,923.41087 629.41963,921.68364 628.76733,917.24833 C 628.44015,915.02356 628.51637,914.59721 629.04708,915.68382 C 629.44831,916.50534 629.69465,919.66559 629.59449,922.7066 C 629.49434,925.74763 629.41239,928.20114 629.41239,928.15888 C 629.41239,928.1166 628.23067,927.55558 626.78634,926.91216 z M 551.74093,924.35726 C 550.97946,923.95217 550.65903,922.88271 550.80324,921.2277 C 550.96527,919.36836 550.60216,918.39846 549.40914,917.50389 C 548.30552,916.67635 547.93969,915.81969 548.25102,914.79192 C 548.93549,912.53227 543.5123,907.94554 539.52035,907.40784 C 536.74416,907.03391 536.41272,906.75859 535.45189,904.02828 C 534.56884,901.51902 533.61902,900.58683 529.35663,898.0462 L 524.30743,895.03659 L 524.40396,891.29496 L 524.50049,887.55334 L 519.98485,885.51254 C 515.0566,883.28527 509.90747,879.59735 509.90747,878.29488 C 509.90747,877.84259 510.88363,877.06711 512.07671,876.5716 C 514.9868,875.36299 516.14002,875.06011 514.44314,875.95008 C 512.52355,876.95685 512.67138,877.37416 515.89301,880.04352 C 517.80143,881.62475 519.98942,882.64026 522.61038,883.16124 C 527.45351,884.1239 528.83895,885.66689 528.83895,890.09808 C 528.83895,893.26137 529.04784,893.62952 531.90759,895.5062 C 533.59533,896.61376 536.31935,898.97925 537.96095,900.76283 C 539.77192,902.73042 541.77223,904.15614 543.04746,904.38821 C 544.34489,904.62431 546.11788,905.90937 547.68043,907.74615 C 549.8228,910.2645 550.50886,910.65979 552.14629,910.31929 C 553.43467,910.05135 554.08756,910.19403 554.10078,910.74639 C 554.11171,911.20258 554.31622,913.48756 554.55526,915.82412 C 555.37328,923.82065 555.33183,924.60456 554.08091,924.79372 C 553.43014,924.89213 552.37715,924.69573 551.74093,924.35726 z M 560.3914,918.25924 C 560.3914,917.03983 560.78422,914.42148 561.26432,912.44072 C 562.511,907.2972 561.14878,905.37479 554.204,902.47702 C 549.40957,900.4765 548.74456,899.96006 547.87838,897.56462 C 546.67754,894.24365 542.96492,890.66367 538.97098,888.9754 C 536.42222,887.89805 535.93825,887.36482 535.93825,885.63406 C 535.93825,884.5014 535.35079,883.03681 534.63278,882.37943 C 533.59805,881.43208 533.55716,881.18628 534.43558,881.19421 C 535.04513,881.19971 536.06582,881.47773 536.70379,881.81204 C 537.4977,882.22805 538.6472,882.01865 540.34654,881.14845 C 543.36048,879.60506 547.26787,879.52928 552.2061,880.91842 C 554.29414,881.5058 556.97137,881.79579 558.34696,881.58355 C 560.67535,881.22433 560.71435,881.2531 559.20819,882.21888 C 558.14157,882.90282 556.7363,883.10887 554.86972,882.85503 C 543.48772,881.30715 540.8528,881.73673 542.30585,884.90337 C 543.01625,886.45154 542.93562,886.53337 541.07988,886.14747 C 538.54354,885.62002 538.32177,887.33183 540.78494,888.42409 C 541.71522,888.83661 544.0215,890.35422 545.90999,891.79655 C 549.79227,894.76161 550.95304,894.55317 552.52411,890.60888 C 553.28275,888.70428 553.77579,888.37362 555.85721,888.37362 L 558.29997,888.37362 L 556.68543,889.84417 C 555.79742,890.65299 554.82663,892.19707 554.52809,893.27549 C 552.96573,898.9194 552.84748,898.56846 557.18072,901.14789 C 559.40876,902.47415 562.31513,904.86407 563.63935,906.45879 L 566.04701,909.3583 L 564.00803,913.57847 C 562.88657,915.89955 561.96902,918.21934 561.96902,918.73354 C 561.96902,919.24776 561.61406,919.85025 561.18021,920.07241 C 560.71355,920.31138 560.3914,919.57088 560.3914,918.25924 z M 616.55591,918.9252 C 615.82066,918.19021 615.77981,917.77413 616.41118,917.45081 C 617.57896,916.85282 618.17587,917.42025 617.84715,918.81587 C 617.60667,919.83693 617.47876,919.84775 616.55591,918.9252 z M 456.26831,910.59545 C 456.26831,908.95045 457.67424,908.95045 460.21237,910.59545 L 462.18439,911.87355 L 459.22635,911.88808 C 456.78835,911.90006 456.26831,911.67281 456.26831,910.59545 z M 526.74106,910.23257 C 526.48214,909.67352 526.61692,908.57246 527.04058,907.78578 C 527.79278,906.38902 527.84069,906.40327 529.08226,908.39259 C 529.78152,909.513 530.13116,910.61407 529.85924,910.83938 C 528.94683,911.59536 527.21624,911.25858 526.74106,910.23257 z M 620.61326,908.27972 C 619.97447,906.90044 621.04068,906.15577 621.9495,907.34646 C 622.91516,908.61163 622.8958,909.28828 621.89393,909.28828 C 621.44646,909.28828 620.87017,908.83442 620.61326,908.27972 z M 457.90927,902.09887 C 459.0592,900.09822 459.42356,899.72744 459.42356,900.55785 C 459.42356,900.90853 458.87152,901.76635 458.19682,902.46414 C 457.04013,903.6604 457.02371,903.63954 457.90927,902.09887 z M 577.12065,902.33628 C 577.83074,901.74792 578.97171,901.44458 579.65611,901.66219 C 581.80038,902.34396 581.01406,903.40604 578.36502,903.40604 C 576.01714,903.40604 575.92507,903.3269 577.12065,902.33628 z M 586.42218,902.75245 C 586.42218,902.39297 587.13211,902.09887 587.9998,902.09887 C 588.86749,902.09887 589.57742,902.39297 589.57742,902.75245 C 589.57742,903.11192 588.86749,903.40604 587.9998,903.40604 C 587.13211,903.40604 586.42218,903.11192 586.42218,902.75245 z M 620.0441,902.40039 C 619.28292,900.75683 619.50747,900.33275 620.43735,901.65769 C 620.89777,902.31373 621.10831,902.98817 620.90522,903.15645 C 620.70213,903.32473 620.31462,902.9845 620.0441,902.40039 z M 482.42308,896.20281 C 482.88,895.11682 483.94702,893.92089 484.79425,893.54519 C 486.09538,892.96823 486.00494,893.27497 484.21206,895.51974 C 481.67689,898.6939 481.31724,898.83123 482.42308,896.20281 z M 473.62216,896.8702 C 475.16695,896.04303 476.21118,896.04303 475.59419,896.8702 C 475.32605,897.22967 474.50643,897.51928 473.7728,897.51378 C 472.6233,897.50514 472.60247,897.41621 473.62216,896.8702 z M 609.28188,894.56686 C 607.75761,893.04507 608.84524,892.7583 610.47654,894.25186 C 611.2642,894.973 611.54213,895.56303 611.09416,895.56303 C 610.6462,895.56303 609.83068,895.11475 609.28188,894.56686 z M 585.86689,892.59425 C 583.88302,890.01544 584.30544,889.68686 586.95409,891.74857 C 588.63823,893.05951 589.00224,893.09951 591.93892,892.29647 C 593.68133,891.82 595.30804,891.59679 595.55383,891.80044 C 595.79962,892.0041 594.93497,892.36468 593.63239,892.60173 C 592.32981,892.83878 590.8411,893.45499 590.32415,893.97109 C 588.88371,895.40916 587.76701,895.06422 585.86689,892.59425 z M 472.04453,891.05787 C 472.04453,890.73687 472.62719,890.28897 473.33933,890.06254 C 474.42195,889.71832 474.47075,889.81396 473.63715,890.6462 C 472.50116,891.78032 472.04453,891.89836 472.04453,891.05787 z M 566.70189,889.93096 C 559.27613,888.50881 558.87517,888.34901 561.01699,887.66522 C 562.29182,887.25822 564.22164,887.48798 567.554,888.44352 C 571.87046,889.68123 572.44329,889.71183 574.13228,888.79489 C 575.66468,887.96294 576.22196,887.93564 577.37771,888.63587 C 580.37058,890.44914 573.65893,891.26333 566.70189,889.93096 z M 592.97978,886.27762 C 591.84825,885.24201 591.92296,885.20449 594.02158,885.75452 C 595.26499,886.0804 597.5247,886.60329 599.04315,886.91646 C 601.73641,887.47196 601.7109,887.48475 598.00135,887.43956 C 595.47396,887.40877 593.78992,887.01911 592.97978,886.27762 z M 587.21099,883.79853 C 586.1913,883.25253 586.21212,883.16358 587.36164,883.15496 C 588.09526,883.14945 588.91489,883.43907 589.18301,883.79853 C 589.80001,884.6257 588.75577,884.6257 587.21099,883.79853 z M 577.21938,883.40485 C 577.58091,883.08216 578.11337,882.80691 578.40259,882.79318 C 578.69182,882.77944 579.91804,882.55046 581.12752,882.28434 C 582.3374,882.01812 583.93408,882.09392 584.67716,882.45284 C 585.76399,882.97779 585.48856,883.11083 583.26693,883.134 C 581.74847,883.14983 579.61868,883.34927 578.53406,883.57716 C 577.38375,883.81888 576.83594,883.74706 577.21938,883.40485 z M 492.15922,880.51822 C 494.7623,879.49163 498.31195,878.4894 500.04734,878.29103 L 503.20258,877.93039 L 499.65294,878.79739 C 497.70063,879.27424 494.37208,880.30046 492.25615,881.07788 C 486.6722,883.12949 486.59969,882.71079 492.15922,880.51822 z M 565.91308,878.56987 C 565.91308,877.7374 569.09129,877.7374 570.64595,878.56987 C 571.52606,879.04114 571.07142,879.206 568.87113,879.21345 C 567.2442,879.21895 565.91308,878.92933 565.91308,878.56987 z M 504.583,877.46576 C 505.34224,877.30136 506.58461,877.30136 507.34384,877.46576 C 508.10307,877.63014 507.48188,877.76465 505.96343,877.76465 C 504.44496,877.76465 503.82377,877.63014 504.583,877.46576 z M 557.96931,874.66165 C 555.65489,873.53972 547.30245,872.79877 542.38513,873.27916 C 539.54067,873.55707 537.77941,873.51499 538.18509,873.17886 C 538.56936,872.86046 541.54656,872.43311 544.80108,872.22916 C 549.26874,871.94919 551.81274,872.14356 555.18553,873.02257 C 557.64247,873.66288 559.83986,874.43769 560.06861,874.74437 C 560.60772,875.46713 559.54452,875.42524 557.96931,874.66165 z M 527.18832,873.13827 C 527.54127,872.84692 529.56565,872.70456 531.68695,872.82192 L 535.54384,873.03528 L 531.04521,873.35163 C 528.57097,873.52563 526.83536,873.42961 527.18832,873.13827 z " />
-    <path
-       id="path1987"
-       style="fill:#951313"
-       d="M 579.32288,945.23537 C 579.32288,944.87589 579.87627,944.58178 580.55264,944.58178 C 581.22902,944.58178 581.56304,944.87589 581.2949,945.23537 C 581.02677,945.59484 580.47337,945.88894 580.06513,945.88894 C 579.65688,945.88894 579.32288,945.59484 579.32288,945.23537 z " />
-    <path
-       id="path1985"
-       style="fill:#951313"
-       d="M 630.65789,937.66469 C 630.69574,936.9033 630.88264,936.74844 631.13446,937.26982 C 631.36232,937.74163 631.3343,938.30533 631.07218,938.52252 C 630.81006,938.7397 630.62364,938.35367 630.65789,937.66469 z " />
-    <path
-       id="path1983"
-       style="fill:#951313"
-       d="M 523.31007,937.07276 C 524.29532,936.08913 525.6837,936.29864 525.6837,937.43094 C 525.6837,937.76919 524.93032,938.04595 524.0095,938.04595 C 522.61626,938.04595 522.49887,937.88263 523.31007,937.07276 z " />
-    <path
-       id="path1981"
-       style="fill:#951313"
-       d="M 630.74939,931.18333 C 630.76546,930.10491 630.94225,929.74286 631.14224,930.37878 C 631.34224,931.0147 631.32909,931.89704 631.11303,932.33953 C 630.89694,932.78203 630.73331,932.26173 630.74939,931.18333 z " />
-    <path
-       id="path1979"
-       style="fill:#951313"
-       d="M 443.77187,930.85653 C 443.77187,929.95785 443.95092,929.59021 444.16974,930.03955 C 444.38857,930.4889 444.38857,931.22417 444.16974,931.67351 C 443.95092,932.12285 443.77187,931.7552 443.77187,930.85653 z " />
-    <path
-       id="path1977"
-       style="fill:#951313"
-       d="M 487.88057,930.66005 C 486.94971,928.63146 487.72551,925.62787 489.18033,925.62787 C 490.01372,925.62787 490.17289,925.96083 489.72704,926.77163 C 489.38112,927.40071 489.07691,928.87127 489.05103,930.03955 C 488.99519,932.56033 488.80001,932.66381 487.88057,930.66005 z " />
-    <path
-       id="path1975"
-       style="fill:#951313"
-       d="M 444.49842,925.9002 C 444.53627,925.13881 444.72318,924.98394 444.97499,925.50532 C 445.20285,925.97712 445.17483,926.54084 444.91272,926.75802 C 444.6506,926.9752 444.46417,926.58918 444.49842,925.9002 z " />
-    <path
-       id="path1973"
-       style="fill:#951313"
-       d="M 472.85843,922.015 C 472.90098,920.93725 475.15085,918.83364 475.73941,919.3213 C 476.04519,919.57464 475.5164,920.42734 474.56435,921.21618 C 473.6123,922.00501 472.84463,922.36448 472.85843,922.015 z " />
-    <path
-       id="path1971"
-       style="fill:#951313"
-       d="M 444.56068,920.3992 C 444.56068,919.50052 444.73973,919.13288 444.95855,919.58222 C 445.17738,920.03156 445.17738,920.76684 444.95855,921.21618 C 444.73973,921.66551 444.56068,921.29788 444.56068,920.3992 z " />
-    <path
-       id="path1969"
-       style="fill:#951313"
-       d="M 550.98795,914.78928 C 551.02579,914.02789 551.2127,913.87302 551.46451,914.3944 C 551.69238,914.8662 551.66436,915.42993 551.40224,915.64711 C 551.14012,915.86429 550.9537,915.47827 550.98795,914.78928 z " />
-    <path
-       id="path1967"
-       style="fill:#951313"
-       d="M 529.43056,872.87995 C 530.40671,872.72417 532.00406,872.72417 532.98021,872.87995 C 533.95637,873.03573 533.15769,873.16319 531.20538,873.16319 C 529.25308,873.16319 528.4544,873.03573 529.43056,872.87995 z " />
-    <path
-       id="path1965"
-       style="fill:#951313"
-       d="M 540.47391,872.90835 C 541.01623,872.72704 541.90364,872.72704 542.44595,872.90835 C 542.98825,873.08966 542.54455,873.23801 541.45993,873.23801 C 540.37531,873.23801 539.93161,873.08966 540.47391,872.90835 z " />
-    <path
-       id="path1963"
-       style="fill:#951313"
-       d="M 553.1442,872.89473 C 553.71363,872.70594 554.39397,872.72915 554.65609,872.94633 C 554.91821,873.16351 554.45231,873.31798 553.62078,873.2896 C 552.70185,873.25824 552.51494,873.10337 553.1442,872.89473 z " />
-    <path
-       id="path1937"
-       style="fill:#951313"
-       d="M 545.99559,872.22636 C 546.97175,872.07057 548.56909,872.07057 549.54525,872.22636 C 550.5214,872.38215 549.72273,872.50961 547.77043,872.50961 C 545.81812,872.50961 545.01944,872.38215 545.99559,872.22636 z " />
-    <path
-       id="path3961"
-       style="fill:url(#radialGradient22004);fill-opacity:1;stroke:#000000;stroke-width:3.67062211;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(1.244123,0,0,0.954503,-693.7876,116.3065)"
-       d="M 1081.5879,860.56061 C 1081.5879,902.77296 1040.5886,936.99283 990.01345,936.99283 C 939.43827,936.99283 898.43899,902.77296 898.43899,860.56061 C 898.43899,818.34826 939.43827,784.12839 990.01345,784.12839 C 1040.5886,784.12839 1081.5879,818.34826 1081.5879,860.56061 L 1081.5879,860.56061 z " />
-    <text
-       xml:space="preserve"
-       id="text6648"
-       style="font-size:68.54483795px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(0.630603,1.585784)"
-       y="615.23743"
-       x="713.86377"><tspan
-         id="tspan6650"
-         style="fill:#808080;font-family:Arial Black"
-         y="615.23743"
-         x="713.86377">Authors</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text6644"
-       style="font-size:68.54482269px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.88828206;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.3853211;font-family:Bitstream Vera Sans"
-       transform="scale(0.630603,1.585784)"
-       y="612.98938"
-       x="707.52148"><tspan
-         id="tspan6646"
-         style="fill:#ffffff;stroke:#000000;stroke-width:1.88828206;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.3853211;font-family:Arial Black"
-         y="612.98938"
-         x="707.52148">Authors</tspan></text>
-  </g>
-  <text
-     xml:space="preserve"
-     id="text22931"
-     style="font-size:27.52882576px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.39196366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931228)"
-     y="544.15887"
-     x="24.405096"><tspan
-       id="tspan22933"
-       style="stroke-width:0.39196366"
-       y="544.15887"
-       x="24.405096">Windows dialogs  icons</tspan></text>
-  <g
-     id="g12170"
-     transform="matrix(0.4319372,0,0,0.4498758,18.231026,171.00785)">
-    <rect
-       id="rect23834"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.03204477;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="875.74768"
-       x="126.0412"
-       ry="3.6935918"
-       rx="3.8469896"
-       height="11.788779"
-       width="12.154853" />
-    <rect
-       id="rect22941"
-       style="color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="872.5824"
-       x="20.323393"
-       ry="8.0265341"
-       rx="8.3598824"
-       height="35.138783"
-       width="151.98308" />
-    <rect
-       id="rect22945"
-       style="color:#000000;fill:#f8faee;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.00652599;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="891.11914"
-       x="20.350714"
-       rx="0"
-       height="114.16743"
-       width="151.97687" />
-    <path
-       id="rect23842"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.56422842;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 158.49055,878.70062 L 157.49829,879.64318 L 159.58546,881.64203 L 157.49829,883.62464 L 158.49055,884.58344 L 160.57772,882.58458 L 162.682,884.58344 L 163.67427,883.62464 L 161.58709,881.64203 L 163.67427,879.64318 L 162.682,878.70062 L 160.57772,880.69948 L 158.49055,878.70062 z " />
-    <rect
-       id="rect23847"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.60069585;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="878.26733"
-       x="142.79971"
-       height="6.7494717"
-       width="7.1054482" />
-    <rect
-       id="rect24736"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.60069585;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="881.26709"
-       x="128.26984"
-       height="0.74994129"
-       width="7.6975689" />
-    <rect
-       id="rect24738"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="922.56213"
-       x="38.681862"
-       height="20.998356"
-       width="25.263815" />
-    <rect
-       id="rect24740"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="965.20441"
-       x="38.681862"
-       height="20.998356"
-       width="25.263815" />
-    <path
-       id="path24753"
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.89635372;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 40.809598,911.37143 C 41.671713,912.1272 50.069084,939.85801 52.909465,934.84078 C 55.749848,929.8236 62.671602,907.39677 65.284628,901.91556 C 65.284628,901.91556 85.426303,899.02152 85.300786,899.09789 C 83.258501,901.01303 63.116189,930.65337 58.376025,938.85439 C 53.746942,946.86326 51.343507,956.45969 46.494131,945.8154 C 41.64475,935.17112 31.623529,922.50006 30.793189,922.56258 L 40.809598,911.37143 z " />
-  </g>
-  <g
-     id="g4797"
-     transform="matrix(0.4319372,0,0,0.4498758,18.911187,161.30876)">
-    <path
-       id="path32874"
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 222.9139,971.83763 C 224.31188,984.37252 231.43303,979.98107 235.52407,980.16963 C 248.05036,979.31895 302.15353,957.8916 314.34608,969.18834 C 328.07467,981.9082 309.77123,985.26097 314.15627,994.98106 C 318.83077,1005.3427 362.97638,979.65533 372.0669,986.77687 C 380.11625,993.08276 365.01248,1003.6742 374.14148,1007.1155 L 421.92941,1025.1302 C 419.64367,1024.2843 371.28014,1026.1402 359.90159,1021.5514 C 348.52305,1016.9625 367.90754,1007.4422 356.01446,1002.2013 C 343.72668,996.78628 307.04833,1029.1082 293.08722,1016.9041 C 280.13756,1005.5841 303.85281,995.89804 292.168,985.22764 C 279.945,974.06569 232.7771,1005.5371 211.71999,1000.9753 C 190.66289,996.41333 221.50788,959.23051 222.9139,971.83763 z " />
-    <g
-       id="g31971"
-       style="stroke:#000000;stroke-width:5.69030762;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.647295,-0.271121,0.269841,0.650366,-46.38199,391.29)">
-      <path
-         id="rect31968"
-         style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030762;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 217.03863,1016.6698 C 225.90296,1002.2057 241.91515,1002.0683 250.20732,1016.6698 C 258.49949,1031.2712 240.83356,1054.7056 249.84679,1078.6808 C 210.77979,1064.0771 208.1743,1031.1339 217.03863,1016.6698 z " />
-      <path
-         id="path31966"
-         style="color:#000000;fill:#ffd42a;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030762;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 220.174,985.51775 C 220.75236,998.84302 225.21669,1008.8408 225.21669,1008.8408 C 225.21669,1008.8408 241.10352,1008.8408 241.10352,1008.8408 C 241.10352,1008.8408 245.77889,998.84302 246.35725,985.51775 L 220.174,985.51775 z " />
-      <path
-         id="path31065"
-         style="color:#000000;fill:#f4eed7;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030762;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 220.05246,985.21867 L 246.47869,985.21867 C 247.88454,957.15577 249.63979,907.26755 245.36077,886.16681 C 239.30506,856.30492 227.195,856.30489 221.13932,886.16681 C 216.86029,907.26758 218.6466,957.15578 220.05246,985.21867 z " />
-    </g>
-    <g
-       id="g35698"
-       transform="translate(0,4.724942)">
-      <path
-         id="path31976"
-         style="color:#000000;fill:url(#linearGradient21998);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.701288,0,0,0.704615,92.93315,213.5991)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-      <path
-         id="path33846"
-         style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.69030905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.701288,0,0,0.704615,92.93315,229.1006)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-      <path
-         id="rect31978"
-         style="color:#000000;fill:url(#linearGradient22000);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 243.11836,912.92949 L 243.11836,1003.3844 L 243.71007,1003.3844 C 245.06363,1012.8683 265.22012,1020.4053 289.8855,1020.4053 C 314.55089,1020.4053 334.72928,1012.8683 336.08285,1003.3844 L 336.67456,1003.3844 L 336.67456,912.92949 L 336.12668,912.92949 C 335.11525,922.53769 314.78034,930.21461 289.8855,930.21461 C 264.99067,930.21454 244.67767,922.53769 243.66624,912.92949 L 243.11836,912.92949 z " />
-    </g>
-    <g
-       id="g33816"
-       style="stroke:#000000;stroke-width:5.24876118;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.277598,-0.646844,0.807082,0.211518,-689.7975,708.6869)">
-      <path
-         id="path33812"
-         style="opacity:1;color:#000000;fill:#f6cc00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.24876118;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="translate(-321.2316,177.7409)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-      <path
-         id="path32868"
-         style="color:#000000;fill:#f6cc00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.60145378;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.844693,0,0,0.748403,-277.6133,427.1824)"
-         d="M 346.82919,991.43274 C 346.82919,1005.5699 317.29034,1017.0303 280.85233,1017.0303 C 244.41432,1017.0303 214.87547,1005.5699 214.87547,991.43274 C 214.87547,977.29559 244.41432,965.83516 280.85233,965.83516 C 317.29034,965.83516 346.82919,977.29559 346.82919,991.43274 L 346.82919,991.43274 z " />
-    </g>
-    <text
-       xml:space="preserve"
-       id="text34758"
-       style="font-size:154.30929565px;font-style:normal;font-weight:normal;fill:url(#linearGradient22002);fill-opacity:1;stroke:#000000;stroke-width:4.33082438;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(0.979674,1.020748)"
-       y="1001.9447"
-       x="282.5267"><tspan
-         id="tspan34760"
-         style="fill:url(#linearGradient22002);fill-opacity:1;stroke:#000000;stroke-width:4.33082438;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Benguiat Bk BT"
-         y="1001.9447"
-         x="282.5267">a</tspan></text>
-  </g>
-  <g
-     id="g12864"
-     transform="matrix(0.4010001,0,0,0.4010001,-84.566987,294.76916)">
-    <g
-       id="g4195"
-       transform="matrix(0.55729,0.197335,-0.177243,0.494042,299.7619,400.7691)">
-      <path
-         id="path4211"
-         style="fill:#f8fcf7"
-         d="M 812.02557,795.05377 L 812.02557,663.55377 L 904.02557,663.55377 L 996.02557,663.55377 L 996.02557,795.05377 L 996.02557,926.55377 L 904.02557,926.55377 L 812.02557,926.55377 L 812.02557,795.05377 z " />
-      <path
-         id="path4209"
-         style="fill:#e6e9e5"
-         d="M 818.76986,923.74306 C 815.86924,923.5031 814.6967,922.81848 813.61986,920.7361 C 812.08668,917.77125 811.73311,910.85255 813.07249,910.02477 C 813.53829,909.73689 813.93352,886.53599 813.95076,858.46721 C 813.96801,830.39844 814.16052,807.12273 814.37856,806.74342 C 814.5966,806.36411 814.4355,803.57877 814.02057,800.55377 C 813.60564,797.52877 813.64889,792.62704 814.11667,789.66104 C 814.58445,786.69504 814.73639,783.89489 814.45432,783.43849 C 814.17225,782.98209 813.96997,763.80882 814.00481,740.83122 C 814.05619,706.94586 814.34802,698.12469 815.54965,694.13559 C 816.78569,690.03223 816.81075,688.95534 815.70088,687.63559 C 813.92889,685.52852 812.02557,678.65459 812.02557,674.36206 C 812.02557,671.93526 812.79631,670.17864 814.60726,668.47808 C 816.8961,666.32876 818.08454,666.05685 825.08442,666.08093 C 829.93962,666.09763 833.45076,666.57896 834.20273,667.33093 C 835.11058,668.23878 842.9334,668.55377 864.57193,668.55377 C 889.2864,668.55377 894.20598,668.31048 896.92557,666.95377 C 901.01336,664.91451 906.03778,664.91451 910.12557,666.95377 C 914.82578,669.29854 969.29818,669.30084 976.02557,666.95655 C 982.43317,664.7237 990.43993,665.82304 993.76285,669.3919 C 995.93757,671.72759 996.17587,672.69489 995.70754,677.28575 C 995.41398,680.16334 994.18283,684.28091 992.97166,686.4359 C 990.84075,690.22735 990.82218,690.50861 992.39755,695.13206 C 994.72541,701.96398 994.87506,783.01381 992.56145,783.90163 C 991.27765,784.39427 991.27689,784.80771 992.55529,787.25862 C 994.25071,790.50902 994.48778,799.20787 992.98841,803.15151 C 992.2722,805.0353 992.2722,806.2004 992.98841,806.91661 C 993.67662,807.60482 994.0336,824.96097 994.04943,858.50377 C 994.06255,886.30627 994.49044,910.85338 995.0003,913.05289 C 995.58009,915.55408 995.57116,917.40818 994.97645,918.00289 C 994.45346,918.52588 994.02557,919.7552 994.02557,920.73472 C 994.02557,921.7516 993.05297,922.75977 991.75855,923.08465 C 989.41751,923.67221 825.45678,924.29627 818.76986,923.74306 z M 909.85832,915.42244 C 915.08662,914.51197 917.01563,913.63037 919.73944,910.90657 C 924.55269,906.09332 922.66182,903.55593 917.23508,907.54593 C 910.35223,912.60651 898.77188,910.58014 892.46459,903.2115 C 887.91572,897.89717 886.81111,893.69314 888.25215,887.1795 C 889.80829,880.14556 892.1041,877.19646 897.99733,874.66127 C 900.76286,873.47157 903.02557,872.223 903.02557,871.88668 C 903.02557,871.55036 900.83708,871.53438 898.16227,871.85117 C 895.09898,872.21397 892.87461,872.00281 892.15245,871.28065 C 891.29044,870.41864 890.28954,870.55734 888.11888,871.83958 C 886.30127,872.91327 884.17491,873.3337 882.37869,872.97457 C 880.80947,872.66082 871.87557,872.32529 862.52557,872.22894 C 846.25063,872.06124 845.52557,871.96847 845.52557,870.05377 C 845.52557,868.16751 846.23644,868.04623 858.02557,867.92117 C 864.90057,867.84825 873.90057,867.73446 878.02557,867.66832 C 882.15057,867.60217 887.02062,867.83019 888.84791,868.17503 C 891.34528,868.64632 892.12287,868.4608 891.97943,867.42789 C 891.54765,864.31866 892.10279,863.42564 894.27557,863.73422 C 895.72153,863.93958 896.63976,864.85781 896.84512,866.30377 C 897.06959,867.88427 897.84174,868.55377 899.44013,868.55377 C 900.69164,868.55377 902.53008,869.45377 903.52557,870.55377 C 904.52106,871.65377 906.60211,872.55377 908.15014,872.55377 C 909.69817,872.55377 912.54441,873.44102 914.47513,874.52544 C 917.83708,876.41373 918.02637,876.42078 918.95151,874.69215 C 919.84176,873.02871 921.50959,872.90882 940.22154,873.16306 L 960.52557,873.43894 L 960.52557,875.74635 L 960.52557,878.05377 L 941.27557,878.32536 C 930.68807,878.47474 922.02557,878.7431 922.02557,878.92172 C 922.02557,879.10035 922.81307,880.77813 923.77557,882.65013 C 924.86001,884.7593 925.56281,888.49606 925.62349,892.47544 C 925.71051,898.18301 925.97244,898.98997 927.97895,899.73223 C 929.2206,900.19154 939.18904,900.26822 950.13103,899.90262 L 970.02557,899.23788 L 970.02557,875.39583 L 970.02557,851.55377 L 956.77557,851.40196 C 949.48807,851.31847 935.20057,851.13465 925.02557,850.99348 C 914.85057,850.85232 901.19403,850.68832 894.6777,850.62905 C 883.75097,850.52967 882.7895,850.36706 882.31107,848.53753 C 881.67541,846.10676 879.19376,845.88413 879.38668,848.27518 C 879.49753,849.64906 878.31426,850.15779 873.52557,850.79507 C 866.02649,851.79305 863.02557,851.14703 863.02557,848.53472 C 863.02557,847.4452 862.55584,846.55377 861.98173,846.55377 C 861.40762,846.55377 861.07012,847.34127 861.23173,848.30377 C 861.4279,849.47208 860.77768,850.15999 859.27557,850.37332 C 857.56409,850.61639 857.02557,850.19754 857.02557,848.62332 C 857.02557,847.48507 856.52742,846.55377 855.91858,846.55377 C 855.30974,846.55377 855.04957,847.17394 855.34044,847.93191 C 855.6313,848.68989 855.36445,849.81489 854.74743,850.43191 C 853.22383,851.95551 844.33794,851.86821 843.38125,850.32025 C 841.95731,848.01627 842.17292,837.7112 843.65698,837.14172 C 844.4097,836.85287 845.02557,835.9344 845.02557,835.10067 C 845.02557,833.77098 849.82326,833.59243 884.08676,833.64696 C 916.89638,833.69917 923.2353,833.93675 923.69375,835.13144 C 924.5009,837.23485 926.02557,836.85714 926.02557,834.55377 C 926.02557,832.6234 926.73062,832.54976 946.27557,832.43862 C 957.41307,832.37528 967.31307,832.40357 968.27557,832.50147 C 969.85747,832.66239 970.02557,831.49193 970.02557,820.31663 C 970.02557,812.53066 970.43989,807.53945 971.14471,806.83463 C 971.97023,806.00911 971.96221,804.44805 971.11416,800.88463 C 970.28643,797.40662 970.2559,794.53037 971.00514,790.61389 C 971.70588,786.95096 971.71586,784.84406 971.03569,784.16389 C 970.38783,783.51603 970.02557,768.20022 970.02557,741.45728 L 970.02557,699.76079 L 937.77557,699.18079 C 899.85803,698.49886 902.69407,698.52013 897.02557,698.87518 C 894.55057,699.0302 880.04768,699.2463 864.79693,699.3554 L 837.06828,699.55377 L 836.63591,741.80377 C 836.3981,765.04127 836.13674,785.40377 836.05511,787.05377 C 835.8379,791.44425 835.82245,801.66537 836.02866,804.55377 C 836.12682,805.92877 836.40014,827.86627 836.63603,853.30377 L 837.06493,899.55377 L 845.29525,899.66963 C 849.82193,899.73336 860.05057,899.84586 868.02557,899.91963 C 876.00057,899.99341 883.12848,900.4428 883.86538,900.91829 C 884.76619,901.49955 885.00498,902.84998 884.59416,905.03983 C 884.09157,907.7189 884.49015,908.83959 886.8404,911.35554 C 889.52681,914.23136 892.12064,915.07542 902.44366,916.43303 C 902.94861,916.49944 906.2852,916.04467 909.85832,915.42244 z M 880.02521,883.05333 C 878.97148,881.78367 879.28076,881.45273 882.03604,880.90168 C 884.003,880.50828 885.48349,879.51867 885.77548,878.40211 C 886.25882,876.55383 890.02557,875.73379 890.02557,877.47685 C 890.02557,878.88101 884.05016,884.55377 882.57109,884.55377 C 881.85574,884.55377 880.7101,883.87857 880.02521,883.05333 z M 846.53715,882.1859 C 842.85458,879.49313 845.80252,878.56718 857.66057,878.69203 C 866.58713,878.78602 869.31033,879.13227 869.73031,880.22671 C 870.0286,881.00404 870.10456,881.78297 869.89911,881.95768 C 869.69366,882.13239 864.76203,882.55418 858.93993,882.89498 C 850.91682,883.36462 847.9144,883.19297 846.53715,882.1859 z M 948.02557,881.55377 C 948.02557,880.99821 950.69224,880.55377 954.02557,880.55377 C 957.3589,880.55377 960.02557,880.99821 960.02557,881.55377 C 960.02557,882.10933 957.3589,882.55377 954.02557,882.55377 C 950.69224,882.55377 948.02557,882.10933 948.02557,881.55377 z M 938.27536,870.97064 C 938.98301,870.263 958.14089,870.33576 958.85394,871.0488 C 959.13167,871.32653 954.4839,871.55377 948.52557,871.55377 C 942.56724,871.55377 937.95464,871.29136 938.27536,870.97064 z M 903.27557,868.89149 C 901.45673,868.15757 901.74589,865.77382 903.78621,864.68187 C 905.75143,863.63012 910.74407,864.28927 911.62644,865.71698 C 913.21564,868.28836 907.32776,870.52658 903.27557,868.89149 z M 915.75458,868.94944 C 915.35362,868.54849 915.02557,867.17044 915.02557,865.8871 C 915.02557,863.73193 915.43616,863.55377 920.40313,863.55377 C 925.80996,863.55377 929.44904,865.59358 927.43319,867.49433 C 926.19145,868.66517 916.65813,869.85299 915.75458,868.94944 z M 840.33171,821.90916 C 839.09692,818.69137 842.54292,817.75283 855.66867,817.73206 C 862.56115,817.72115 868.4611,817.45157 868.77968,817.133 C 869.09825,816.81442 865.7964,816.50974 861.44224,816.45593 C 840.4543,816.19653 840.52557,816.20462 840.52557,814.0833 C 840.52557,812.99955 841.56398,811.59513 842.83315,810.96239 C 844.69801,810.03265 844.8419,809.69727 843.58315,809.21424 C 842.72648,808.8855 842.02557,807.79242 842.02557,806.78515 C 842.02557,805.77789 841.51582,804.44402 840.89279,803.82099 C 840.26976,803.19796 840.03063,801.98296 840.3614,801.12099 C 840.85721,799.82893 842.94347,799.54819 852.24419,799.52197 C 862.38206,799.49339 863.32881,799.34134 861.58444,798.02197 C 860.51682,797.21446 858.71682,796.51509 857.58444,796.46782 C 856.07507,796.4048 856.31419,796.14637 858.48039,795.49952 C 862.00614,794.4467 944.33339,794.50794 946.0432,795.56466 C 946.87396,796.0781 946.60053,796.73807 945.13047,797.76774 C 943.35903,799.00851 938.36777,799.16362 913.12878,798.76223 C 896.68219,798.50068 882.12454,798.5631 880.77845,798.90094 C 878.89547,799.37354 878.31148,800.20264 878.24628,802.49589 C 878.16738,805.27097 878.36361,805.43616 881.09107,804.89067 C 882.77262,804.55436 884.64201,804.82048 885.47928,805.51536 C 886.28156,806.18118 887.39966,806.4406 887.96396,806.09185 C 889.33804,805.24262 943.37973,804.44203 948.77557,805.19096 C 953.00293,805.77772 954.34029,807.58483 951.77557,809.24475 C 951.08807,809.68971 933.89309,810.05377 913.56451,810.05377 L 876.60345,810.05377 L 876.56451,813.00397 C 876.53445,815.28097 875.95511,816.11392 874.02557,816.65429 C 871.21073,817.44258 872.81242,817.8206 878.02557,817.59833 C 879.95057,817.51625 882.40858,818.09896 883.48782,818.89322 C 885.15713,820.12175 885.25082,820.57743 884.11538,821.94556 C 882.96694,823.32934 879.86281,823.55377 861.87174,823.55377 C 843.3914,823.55377 840.8895,823.36275 840.33171,821.90916 z M 854.02557,810.55377 C 854.02557,810.00377 852.78807,809.56066 851.27557,809.56908 C 849.13263,809.58102 848.8567,809.79839 850.02557,810.55377 C 851.9821,811.81818 854.02557,811.81818 854.02557,810.55377 z M 856.52557,791.72682 C 852.67476,791.30715 851.03481,789.79685 853.03393,788.51122 C 853.86591,787.97618 863.0946,787.58488 873.90201,787.62642 C 891.76669,787.69509 896.86138,787.05625 894.80987,785.00473 C 894.48956,784.68443 883.94456,784.20743 871.37653,783.94473 C 858.8085,783.68203 847.96307,783.27572 847.27557,783.04182 C 846.58807,782.80791 846.02557,781.70242 846.02557,780.58515 C 846.02557,778.64513 846.62374,778.55377 859.32557,778.55377 C 868.33668,778.55377 873.01254,778.94074 873.82557,779.75377 C 874.7589,780.6871 875.02551,780.29821 875.02531,778.00377 L 875.02505,775.05377 L 904.57548,775.31211 C 922.95033,775.47274 934.83514,775.19087 936.00126,774.56678 C 937.04556,774.00789 938.82384,773.91352 940.0141,774.35382 C 941.18972,774.78871 945.16073,774.81341 948.83858,774.4087 C 955.94161,773.62709 960.27163,774.16563 958.02889,775.55172 C 957.03695,776.16477 957.11872,777.03413 958.4122,779.62696 C 959.39079,781.58859 959.69081,783.28853 959.15329,783.82605 C 958.65657,784.32277 949.53713,784.80221 938.88786,784.89148 C 913.85021,785.10134 912.73124,786.86151 937.19539,787.55377 C 946.91379,787.82877 955.20879,788.39877 955.62872,788.82044 C 958.31796,791.52078 952.90453,791.86901 906.81914,791.9602 C 880.80768,792.01166 858.17557,791.90664 856.52557,791.72682 z M 866.02557,774.55377 C 866.02557,774.00377 867.12401,773.55377 868.46655,773.55377 C 869.80909,773.55377 871.18565,774.00377 871.52557,774.55377 C 871.88615,775.13719 870.86929,775.55377 869.08459,775.55377 C 867.40213,775.55377 866.02557,775.10377 866.02557,774.55377 z M 917.02557,769.58057 C 914.45538,769.18206 913.60043,768.58905 913.80734,767.34838 C 914.04757,765.90794 913.2449,765.68798 908.3625,765.85632 C 903.19781,766.0344 902.51381,765.81394 901.39171,763.6096 C 900.70742,762.26531 900.32025,760.88599 900.53133,760.54444 C 900.74242,760.2029 912.97748,759.95277 927.72035,759.98861 L 954.52557,760.05377 L 954.84199,762.80377 C 955.03867,764.5131 954.66025,765.61951 953.84199,765.72748 C 952.46218,765.90956 946.82686,766.16326 938.71655,766.40841 C 936.03752,766.48939 934.16236,766.96608 934.48286,767.48467 C 934.7993,767.99667 934.48835,768.77882 933.79188,769.22278 C 932.32607,770.15717 922.14545,770.37442 917.02557,769.58057 z M 845.40973,768.11248 C 844.17762,764.90167 846.1041,764.55377 865.11597,764.55377 C 881.29347,764.55377 884.17557,764.78109 884.68049,766.0969 C 885.00618,766.94562 885.00641,767.90626 884.68102,768.23166 C 884.35562,768.55705 875.51277,768.99252 865.03025,769.19935 C 848.9836,769.51598 845.88238,769.34419 845.40973,768.11248 z M 881.58444,754.02197 C 880.51682,753.21446 878.1402,752.55377 876.30306,752.55377 C 874.18346,752.55377 872.74158,751.97727 872.35744,750.97623 C 870.95146,747.31231 873.52429,747.04493 907.315,747.34325 L 940.10442,747.63272 L 941.22551,750.09325 C 942.29574,752.44215 942.75514,752.55377 951.35275,752.55377 C 956.30614,752.55377 960.11765,752.79503 959.82277,753.0899 C 959.5279,753.38477 951.80877,753.64325 942.66915,753.6643 C 933.52952,753.68534 925.79422,754.11908 925.47959,754.62817 C 925.15764,755.14909 915.86121,755.53986 904.21655,755.52197 C 887.6086,755.49644 883.14252,755.20044 881.58444,754.02197 z M 845.40557,744.10166 C 844.16283,740.86313 846.05881,740.49396 863.09368,740.6576 C 879.93202,740.81935 884.31419,741.65972 882.61933,744.40207 C 882.12502,745.20188 876.41629,745.55377 863.93517,745.55377 C 849.14564,745.55377 845.86412,745.29661 845.40557,744.10166 z M 905.79685,744.99171 C 905.5613,744.75617 901.2542,744.43907 896.22551,744.28704 C 886.89946,744.0051 884.49179,743.10836 885.56335,740.3159 C 886.071,738.99299 888.09852,738.7682 898.34614,738.89869 C 909.83964,739.04504 910.54223,739.17027 910.82135,741.12239 C 911.0206,742.51586 910.3188,743.55477 908.67112,744.3055 C 907.32582,744.91846 906.03239,745.22726 905.79685,744.99171 z M 923.67449,743.86936 C 923.31758,743.51245 923.02557,742.45348 923.02557,741.51609 C 923.02557,740.09182 924.46878,739.69884 931.80782,739.12472 C 941.04308,738.40225 946.02557,739.38716 946.02557,741.93518 C 946.02557,742.90125 944.4825,743.53811 941.27557,743.89561 C 934.51396,744.64937 924.43948,744.63434 923.67449,743.86936 z M 914.02557,741.61279 C 914.02557,740.54525 914.4796,739.3912 915.03452,739.04824 C 916.80198,737.95589 920.02557,739.61766 920.02557,741.62116 C 920.02557,743.10184 919.32403,743.55377 917.02557,743.55377 C 914.72264,743.55377 914.02557,743.10277 914.02557,741.61279 z M 846.56414,732.20563 C 845.43742,731.38175 844.9463,730.20272 845.32201,729.22365 C 846.17564,726.99912 861.88511,727.02416 862.73978,729.25141 C 863.60409,731.50375 862.02154,732.25477 854.97662,732.93548 C 850.19545,733.39746 847.92463,733.20045 846.56414,732.20563 z M 945.77557,732.8062 C 938.43061,732.48723 938.02557,732.34828 938.02557,730.14763 C 938.02557,728.14331 938.66035,727.73861 942.66514,727.18969 C 948.54575,726.38367 958.37702,726.36767 960.44378,727.16076 C 962.0542,727.77873 962.63915,731.08585 961.27557,731.86341 C 959.73797,732.74021 953.28884,733.13248 945.77557,732.8062 z M 891.52557,720.55377 C 891.16011,719.96244 885.056,719.55377 876.589,719.55377 C 865.08136,719.55377 862.02607,719.2593 861.02557,718.05377 C 860.04392,716.87096 860.03904,716.24247 861.00246,715.08162 C 861.67444,714.27193 862.29204,711.90943 862.37491,709.83162 L 862.52557,706.05377 L 904.52557,706.05377 L 946.52557,706.05377 L 946.52557,712.55377 L 946.52557,719.05377 L 921.63305,719.24629 C 905.72437,719.36933 896.35888,719.82046 895.68305,720.49629 C 894.34928,721.83006 892.3316,721.85796 891.52557,720.55377 z M 910.21259,906.72782 C 911.8699,906.62047 914.26168,905.1167 916.45392,902.80377 C 920.46051,898.57658 920.96917,896.55377 918.02557,896.55377 C 916.91446,896.55377 916.02557,895.8871 916.02557,895.05377 C 916.02557,894.22877 915.57557,893.55377 915.02557,893.55377 C 914.47557,893.55377 914.02557,894.22877 914.02557,895.05377 C 914.02557,895.87877 914.47557,896.55377 915.02557,896.55377 C 915.57557,896.55377 916.02557,897.17702 916.02557,897.93876 C 916.02557,899.82471 911.22081,902.84267 909.35695,902.12744 C 908.49696,901.79743 907.1325,902.4351 906.17898,903.61264 C 904.10456,906.17445 902.07209,905.47971 899.75183,901.41571 C 898.05352,898.44107 898.05352,898.25343 899.75183,897.00279 C 901.43618,895.76244 901.43738,895.66242 899.77557,895.0182 C 898.81307,894.64508 898.02557,893.71294 898.02557,892.94678 C 898.02557,892.18063 897.54525,891.55377 896.95818,891.55377 C 896.34587,891.55377 896.16143,892.40646 896.52557,893.55377 C 897.02062,895.11353 896.70527,895.55377 895.09296,895.55377 C 892.05485,895.55377 892.56,897.4956 896.92174,902.58372 C 900.95677,907.29072 901.05409,907.32107 910.21259,906.72782 z M 922.02557,888.99475 C 922.02557,888.13729 921.57557,887.71385 921.02557,888.05377 C 920.47557,888.39369 920.02557,889.09525 920.02557,889.61279 C 920.02557,890.13033 920.47557,890.55377 921.02557,890.55377 C 921.57557,890.55377 922.02557,889.85221 922.02557,888.99475 z M 848.02557,839.99475 C 848.02557,839.13729 847.57557,838.71385 847.02557,839.05377 C 846.47557,839.39369 846.02557,840.09525 846.02557,840.61279 C 846.02557,841.13033 846.47557,841.55377 847.02557,841.55377 C 847.57557,841.55377 848.02557,840.85221 848.02557,839.99475 z M 945.02557,838.99475 C 945.02557,838.20221 944.3927,837.55377 943.61919,837.55377 C 942.70779,837.55377 942.39585,838.25372 942.73288,839.54252 C 943.30198,841.71877 945.02557,841.30697 945.02557,838.99475 z M 970.02557,839.55377 C 970.02557,838.44266 969.3589,837.55377 968.52557,837.55377 C 967.69224,837.55377 967.02557,838.44266 967.02557,839.55377 C 967.02557,840.66488 967.69224,841.55377 968.52557,841.55377 C 969.3589,841.55377 970.02557,840.66488 970.02557,839.55377 z M 893.26833,690.40246 C 891.31864,686.32857 890.89496,684.14229 891.24266,679.94952 C 891.48447,677.03362 891.30954,674.87826 890.85394,675.15984 C 890.39834,675.44142 890.02557,676.49015 890.02557,677.49034 C 890.02557,678.49054 889.35057,679.86908 888.52557,680.55377 C 886.82953,681.96136 886.50987,686.11701 888.02557,687.05377 C 888.57557,687.39369 889.02557,688.41584 889.02557,689.32522 C 889.02557,690.79903 893.58631,695.42592 895.12962,695.51781 C 895.46184,695.53759 894.62426,693.23568 893.26833,690.40246 z M 915.61735,693.30377 C 916.92287,692.06627 917.99879,690.29283 918.00829,689.36279 C 918.0178,688.43275 918.47557,687.39369 919.02557,687.05377 C 919.57557,686.71385 920.02557,685.11229 920.02557,683.49475 C 920.02557,681.87721 919.57557,680.55377 919.02557,680.55377 C 918.47557,680.55377 918.02557,679.90533 918.02557,679.11279 C 918.02557,678.32025 917.50468,677.34988 916.86805,676.95641 C 916.06332,676.45907 915.89561,676.94879 916.31777,678.56315 C 916.82888,680.51763 914.82068,692.22746 913.84053,693.008 C 913.6673,693.14594 912.62557,693.76149 911.52557,694.37588 C 909.6626,695.41642 909.65294,695.49504 911.38462,695.52336 C 912.4071,695.54009 914.31183,694.54127 915.61735,693.30377 z M 895.52557,672.55377 C 895.86549,672.00377 895.6936,671.55377 895.1436,671.55377 C 894.5936,671.55377 893.86549,672.00377 893.52557,672.55377 C 893.18565,673.10377 893.35754,673.55377 893.90754,673.55377 C 894.45754,673.55377 895.18565,673.10377 895.52557,672.55377 z " />
-      <path
-         id="path4207"
-         style="fill:#d7d9d5"
-         d="M 900.92189,923.55556 C 899.99848,923.0158 884.3034,922.65348 863.92189,922.70142 C 844.45392,922.74722 826.95057,922.77684 825.02557,922.76726 C 818.03454,922.73246 815.02017,921.99107 813.5946,919.95579 C 811.97756,917.64714 811.77627,911.70133 813.25204,909.83706 C 813.78178,909.16788 814.09866,906.46788 813.95623,903.83706 C 813.8138,901.20625 813.77114,878.46627 813.86142,853.30377 C 814.00468,813.37673 814.21649,807.55377 815.52557,807.55377 C 817.44738,807.55377 817.42887,806.09892 815.469,803.10778 C 813.41255,799.96923 813.41311,791.48783 815.47005,787.3646 C 816.94979,784.3984 816.95684,783.97668 815.54391,782.94352 C 814.16282,781.93365 814.01766,777.01168 814.29003,740.4276 C 814.56801,703.08888 814.7777,698.58763 816.44007,694.27424 C 818.06355,690.06175 818.1088,689.29059 816.82148,687.77424 C 811.7735,681.82817 810.63732,673.20659 814.43192,669.64175 C 817.51928,666.74132 826.75462,665.75483 832.52557,667.70903 C 835.39212,668.67973 844.31806,669.16016 864.02557,669.4045 C 879.15057,669.59202 891.91118,670.11043 892.38247,670.55651 C 892.85377,671.0026 892.06627,672.13622 890.63247,673.07568 C 889.06003,674.10599 888.02557,675.70677 888.02557,677.10976 C 888.02557,678.38905 887.57557,679.71385 887.02557,680.05377 C 885.72591,680.857 885.72591,687.25054 887.02557,688.05377 C 887.57557,688.39369 888.02557,689.49349 888.02557,690.49778 C 888.02557,691.50206 889.17851,693.07918 890.58766,694.00249 C 896.06556,697.59175 893.53207,698.03279 864.443,698.55377 L 836.52557,699.05377 L 836.27193,740.55377 C 836.04935,776.97151 835.82536,782.19681 834.44289,783.22181 C 833.1462,784.1832 833.0805,784.78789 834.07152,786.63964 C 835.62812,789.54816 835.62769,800.56019 834.07087,803.46913 C 833.08504,805.31117 833.15317,806.03728 834.44587,807.4657 C 835.83697,809.00285 836.02557,814.66778 836.02557,854.91375 L 836.02557,900.61626 L 859.01072,900.51681 C 871.65254,900.46212 882.49296,900.7246 883.10052,901.10009 C 883.75736,901.50604 883.95963,903.09171 883.59947,905.01154 C 883.09043,907.72498 883.51581,908.79382 886.26483,911.70863 C 889.01449,914.62412 890.61325,915.3555 896.29471,916.29695 C 901.12234,917.09691 904.97302,917.11808 909.77151,916.37102 C 915.57133,915.46807 917.02037,914.79427 920.37359,911.44104 C 924.19257,907.62206 924.22953,907.514 922.57862,904.99439 C 921.65513,903.58497 921.06236,901.94341 921.26134,901.34647 C 921.50706,900.60929 929.46689,900.22786 946.07434,900.15745 L 970.52557,900.05377 L 970.79376,875.62403 C 970.95693,860.76025 970.6854,850.96157 970.10033,850.59997 C 969.57144,850.2731 955.27576,850.04653 938.33214,850.09647 C 921.38853,850.14641 906.96565,849.99758 906.28131,849.76574 C 905.59697,849.53389 905.29585,848.92547 905.61215,848.41369 C 905.93721,847.88772 914.08636,847.53444 924.3564,847.60109 C 959.92426,847.83193 970.02557,847.58755 970.02557,846.49621 C 970.02557,845.85614 967.7557,845.50431 964.27557,845.60496 C 954.76159,845.88013 943.5877,844.74017 943.15782,843.45052 C 942.87465,842.601 944.08232,842.41278 947.40974,842.78782 C 949.96583,843.07593 952.30162,842.91613 952.60039,842.43271 C 952.89916,841.94929 952.32955,841.54688 951.33459,841.53846 C 950.33963,841.53004 948.85057,841.08004 948.02557,840.53846 C 946.69224,839.66318 946.69224,839.44436 948.02557,838.56908 C 950.06348,837.23128 964.7347,837.27412 965.56669,838.6203 C 966.53293,840.18372 965.48784,840.8398 960.757,841.63972 C 957.26656,842.22991 957.75138,842.3288 963.52557,842.20448 L 970.52557,842.05377 L 970.82147,839.05377 L 971.11736,836.05377 L 961.91109,836.05377 C 955.43831,836.05377 952.57923,835.68262 952.28186,834.80377 C 951.96296,833.8613 954.21666,833.55377 961.44224,833.55377 L 971.02557,833.55377 L 971.02557,821.17621 C 971.02557,812.01876 971.376,808.50783 972.37257,807.68075 C 973.50096,806.74427 973.49204,805.66952 972.31761,801.05831 C 971.10595,796.30091 971.11315,794.77835 972.37066,789.84093 C 973.61449,784.95725 973.623,783.97755 972.42926,783.09093 C 971.28045,782.23767 970.98787,774.69531 970.77921,740.55377 L 970.52557,699.05377 L 942.52557,698.55377 C 918.34804,698.12203 914.56589,697.84899 914.82094,696.55377 C 914.98339,695.72877 915.99589,694.43638 917.07094,693.6818 C 918.14599,692.92721 919.02557,691.72618 919.02557,691.01284 C 919.02557,690.29949 919.81307,688.32938 920.77557,686.63481 C 922.44224,683.70049 922.44224,683.40705 920.77557,680.47273 C 919.81307,678.77816 919.02557,676.80491 919.02557,676.08774 C 919.02557,675.37057 917.88623,674.03727 916.4937,673.12485 C 915.10118,672.21243 914.22774,671.03568 914.55272,670.50984 C 914.90558,669.9389 926.49966,669.54791 943.33459,669.53922 C 966.44872,669.52728 972.33596,669.23984 976.02557,667.94307 C 981.52911,666.00877 989.40264,666.68968 993.01139,669.41203 C 996.60718,672.1246 996.47591,679.40714 992.72529,685.2839 C 989.50792,690.32511 989.35657,692.94425 992.02931,697.32794 C 993.93739,700.45749 994.02557,702.38744 994.02557,741.02124 C 994.02557,780.86093 993.99567,781.46131 991.93978,782.90131 C 989.95312,784.29282 989.93323,784.48321 991.52143,786.90711 C 993.71561,790.25585 993.78829,799.31849 991.65525,803.59427 C 990.09487,806.72213 990.11371,806.92721 992.08854,808.31043 C 994.13146,809.74134 994.15139,810.27807 993.98599,859.40515 C 993.89406,886.71189 994.14595,909.86068 994.54574,910.8469 C 994.94554,911.83312 995.00789,912.90479 994.68429,913.22838 C 994.3607,913.55198 994.50119,914.57395 994.99649,915.49943 C 995.64002,916.70188 995.27322,917.9567 993.7113,919.8961 C 991.73261,922.353 990.90987,922.60721 985.02557,922.57979 C 975.63499,922.53603 976.5721,922.53831 939.87992,922.46985 C 916.93109,922.42703 906.02337,922.74832 905.5709,923.48042 C 904.76521,924.78406 903.07044,924.81145 900.92189,923.55556 z M 905.45263,897.78846 C 904.86251,897.38438 904.08913,896.26627 903.73401,895.30377 C 903.37889,894.34127 902.39922,893.55377 901.55696,893.55377 C 900.71469,893.55377 900.02557,892.95377 900.02557,892.22044 C 900.02557,890.14499 901.20914,889.46123 902.68356,890.68489 C 903.67682,891.50922 904.41538,891.47515 905.52557,890.55377 C 906.72229,889.56058 907.32885,889.56058 908.52557,890.55377 C 909.74668,891.5672 910.02557,891.51689 910.02557,890.2832 C 910.02557,888.56231 907.3793,887.14075 904.77557,887.46294 C 902.07196,887.79749 902.70815,885.85025 905.5342,885.14096 C 908.92177,884.29073 914.02557,886.99862 914.02557,889.64617 C 914.02557,892.00671 909.33128,898.56112 907.65688,898.53846 C 907.03466,898.53004 906.04275,898.19254 905.45263,897.78846 z M 891.02557,882.74086 C 891.02557,881.55949 896.20383,876.96083 898.41555,876.17803 C 899.52821,875.78423 898.65121,877.16343 896.28319,879.53144 C 892.28657,883.52807 891.02557,884.29782 891.02557,882.74086 z M 848.27557,881.91327 C 845.66859,880.8159 847.18418,879.55377 851.1089,879.55377 C 853.92781,879.55377 855.06514,879.94084 854.78178,880.80377 C 854.34799,882.12487 850.38412,882.80082 848.27557,881.91327 z M 858.52557,880.55377 C 858.86549,880.00377 859.34205,879.55377 859.58459,879.55377 C 859.82713,879.55377 860.02557,880.00377 860.02557,880.55377 C 860.02557,881.10377 859.54901,881.55377 858.96655,881.55377 C 858.38409,881.55377 858.18565,881.10377 858.52557,880.55377 z M 863.02557,880.49475 C 863.02557,879.91229 863.47557,879.71385 864.02557,880.05377 C 864.57557,880.39369 865.02557,880.87025 865.02557,881.11279 C 865.02557,881.35533 864.57557,881.55377 864.02557,881.55377 C 863.47557,881.55377 863.02557,881.07721 863.02557,880.49475 z M 917.4667,879.10351 C 915.59193,877.70282 915.60249,877.67262 917.77557,878.22014 C 919.01307,878.53193 920.02557,879.18455 920.02557,879.6704 C 920.02557,880.86044 919.73093,880.79517 917.4667,879.10351 z M 920.02557,875.63783 C 920.02557,874.22093 922.25125,874.06879 939.77557,874.28781 C 956.58573,874.49789 959.57441,874.76303 959.85367,876.06899 C 960.14102,877.41281 957.6886,877.58045 940.10367,877.41901 C 922.45886,877.25702 920.02557,877.04115 920.02557,875.63783 z M 846.55662,870.60402 C 845.79205,869.36691 848.17706,868.23269 850.51998,868.7192 C 851.40616,868.90321 852.12143,869.50377 852.10948,870.05377 C 852.07932,871.44177 847.36321,871.90911 846.55662,870.60402 z M 855.02557,870.05377 C 855.02557,868.8871 856.3589,868.55377 861.02557,868.55377 C 865.69224,868.55377 867.02557,868.8871 867.02557,870.05377 C 867.02557,871.22044 865.69224,871.55377 861.02557,871.55377 C 856.3589,871.55377 855.02557,871.22044 855.02557,870.05377 z M 870.56827,870.62287 C 869.55158,868.97781 871.72946,868.50912 879.46264,868.70877 C 884.97602,868.85111 887.02557,869.26306 887.02557,870.2289 C 887.02557,871.2175 885.01005,871.55377 879.08459,871.55377 C 874.71705,871.55377 870.88471,871.13486 870.56827,870.62287 z M 904.69224,867.8871 C 904.32557,867.52044 904.02557,866.62044 904.02557,865.8871 C 904.02557,864.25385 909.60587,864.06567 910.59467,865.66557 C 911.80485,867.62369 906.44583,869.6407 904.69224,867.8871 z M 893.02557,866.05377 C 893.02557,865.1371 893.50932,864.54835 894.10057,864.74544 C 894.69182,864.94252 895.17557,865.53127 895.17557,866.05377 C 895.17557,866.57627 894.69182,867.16502 894.10057,867.3621 C 893.50932,867.55919 893.02557,866.97044 893.02557,866.05377 z M 916.02557,866.05377 C 916.02557,864.75746 916.95005,864.50351 920.77557,864.74898 C 923.38807,864.91661 925.52557,865.50377 925.52557,866.05377 C 925.52557,866.60377 923.38807,867.19093 920.77557,867.35856 C 916.95005,867.60403 916.02557,867.35008 916.02557,866.05377 z M 844.73929,849.93416 C 843.05892,848.25378 844.34391,847.55377 849.1089,847.55377 C 852.72813,847.55377 854.07385,847.9138 853.78118,848.80377 C 853.33382,850.16419 845.89882,851.09369 844.73929,849.93416 z M 864.57824,849.63899 C 863.67637,848.17973 864.76152,846.59922 866.83459,846.35263 C 867.76463,846.24201 863.16182,845.90451 856.60613,845.60263 C 848.3674,845.22326 844.55887,844.66777 844.27279,843.80377 C 843.95764,842.85196 846.80106,842.53327 856.19224,842.46782 C 864.35258,842.41095 867.59713,842.1024 865.78154,841.5559 C 864.27233,841.10162 860.67233,840.85414 857.78154,841.00595 C 851.67147,841.32683 850.02557,840.88319 850.02557,838.9154 C 850.02557,838.13198 849.35057,837.23198 848.52557,836.9154 C 845.33784,835.69215 847.26597,834.55377 852.52557,834.55377 C 857.08541,834.55377 858.03077,834.85291 858.05598,836.30377 C 858.08494,837.97044 858.13493,837.97044 859.10567,836.30377 C 859.9678,834.82358 861.65137,834.55377 870.02557,834.55377 C 877.96424,834.55377 880.09955,834.86354 880.80099,836.11696 C 881.59431,837.53454 881.79664,837.53454 882.97313,836.11696 C 884.56226,834.20217 892.65777,833.95617 893.27962,835.80377 C 893.61062,836.78724 894.0431,836.77087 895.30791,835.72701 C 896.19208,834.99729 897.91751,834.54729 899.1422,834.72701 C 901.81787,835.11965 902.93338,837.55377 900.43764,837.55377 C 899.47262,837.55377 897.88608,838.27502 896.912,839.15655 C 895.58252,840.35971 892.73921,840.80701 885.50819,840.95054 C 877.14891,841.11647 875.7485,840.90458 874.91532,839.34776 C 873.57194,836.83764 871.73087,837.12675 870.36965,840.06157 C 869.22885,842.5212 869.27459,842.55498 873.86965,842.64641 C 879.19159,842.7523 900.71272,842.73841 903.13963,842.62752 C 904.34659,842.57237 904.72493,841.60792 904.63963,838.80377 L 904.52557,835.05377 L 912.43718,834.7588 C 922.625,834.37896 923.60731,834.73629 921.44541,838.03576 C 919.96388,840.29687 919.13563,840.55377 913.32723,840.55377 C 908.58859,840.55377 906.97455,840.88803 907.29136,841.80377 C 907.55501,842.56586 909.02184,842.92209 911.04932,842.71641 C 912.87835,842.53087 916.43375,842.70523 918.9502,843.10389 C 923.45896,843.81818 923.48193,843.84099 920.52793,844.671 C 918.87923,845.13424 911.00423,845.49588 903.02793,845.47463 C 874.85957,845.39958 874.28355,845.43427 876.45257,847.07524 C 877.51242,847.87707 878.18742,848.71215 877.95257,848.93099 C 876.78337,850.02046 865.1932,850.63402 864.57824,849.63899 z M 883.02557,848.55377 C 883.02557,848.00377 883.70057,847.55377 884.52557,847.55377 C 885.35057,847.55377 886.02557,848.00377 886.02557,848.55377 C 886.02557,849.10377 885.35057,849.55377 884.52557,849.55377 C 883.70057,849.55377 883.02557,849.10377 883.02557,848.55377 z M 888.02557,848.57282 C 888.02557,847.31634 892.55684,846.15992 894.52333,846.91454 C 897.42655,848.02861 895.98314,849.55377 892.02557,849.55377 C 889.82557,849.55377 888.02557,849.11234 888.02557,848.57282 z M 900.02557,848.55377 C 900.02557,848.00377 900.70057,847.55377 901.52557,847.55377 C 902.35057,847.55377 903.02557,848.00377 903.02557,848.55377 C 903.02557,849.10377 902.35057,849.55377 901.52557,849.55377 C 900.70057,849.55377 900.02557,849.10377 900.02557,848.55377 z M 930.52557,844.59381 C 927.64304,844.10655 926.9857,843.70829 928.17261,843.16823 C 929.07848,842.75605 930.42848,842.50249 931.17261,842.60477 C 933.79195,842.9648 935.13705,842.54317 934.52557,841.55377 C 934.18565,841.00377 931.68409,840.55377 928.96655,840.55377 C 926.24901,840.55377 924.02557,840.14217 924.02557,839.6391 C 924.02557,838.69328 936.17934,837.70193 939.27557,838.3952 C 941.70903,838.94006 941.46097,840.20119 938.77557,840.93711 C 937.02724,841.41624 936.83284,841.75176 937.90369,842.44194 C 938.66165,842.93046 938.97259,843.83047 938.59467,844.44197 C 937.85937,845.63171 936.78518,845.65192 930.52557,844.59381 z M 929.77557,835.73735 C 928.26307,835.56332 927.02557,835.00082 927.02557,834.48735 C 927.02557,833.9654 931.91239,833.55377 938.1089,833.55377 C 946.53277,833.55377 949.09152,833.85371 948.77249,834.80377 C 948.37079,836.00004 936.9405,836.56176 929.77557,835.73735 z M 841.42616,821.39292 C 841.09569,820.8582 841.13275,820.11315 841.50852,819.73724 C 841.8843,819.36133 851.04186,818.99741 861.85866,818.92852 C 880.46356,818.81003 884.87492,819.37048 883.45253,821.67195 C 882.69502,822.89763 842.18992,822.6287 841.42616,821.39292 z M 841.52557,814.55377 C 840.38952,812.7156 842.10769,811.55377 845.96214,811.55377 C 849.60645,811.55377 852.74532,813.50068 851.35023,814.89578 C 850.30548,815.94052 842.20843,815.65866 841.52557,814.55377 z M 854.21594,813.80377 C 854.51133,812.26996 855.84671,812.05377 865.02557,812.05377 C 874.20443,812.05377 875.53981,812.26996 875.8352,813.80377 C 876.1399,815.38593 875.10315,815.55377 865.02557,815.55377 C 854.94799,815.55377 853.91125,815.38593 854.21594,813.80377 z M 858.7069,808.90177 C 858.3483,808.54317 854.93882,808.34075 851.13027,808.45196 C 844.49847,808.6456 840.95297,807.28633 844.51976,805.91762 C 845.88804,805.39257 845.79332,805.12087 843.91211,804.17469 C 842.68638,803.55818 841.49797,802.49127 841.27121,801.80377 C 840.95151,800.83453 844.93701,800.55377 859.01556,800.55377 C 875.76753,800.55377 877.14651,800.68916 876.83995,802.30377 C 876.60436,803.5446 875.20098,804.22829 872.01663,804.65358 L 867.52557,805.25338 L 873.02557,805.55438 C 876.05057,805.71992 879.69198,805.76824 881.11759,805.66176 C 882.54321,805.55527 884.23245,806.09812 884.87147,806.86809 C 885.83857,808.03338 885.00234,808.37581 879.88276,808.91091 C 871.91902,809.74328 859.54308,809.73794 858.7069,808.90177 z M 857.02557,805.55377 C 857.02557,805.00377 856.32401,804.55377 855.46655,804.55377 C 854.60909,804.55377 854.18565,805.00377 854.52557,805.55377 C 854.86549,806.10377 855.56705,806.55377 856.08459,806.55377 C 856.60213,806.55377 857.02557,806.10377 857.02557,805.55377 z M 866.2946,804.89783 C 865.61757,804.62391 864.26757,804.60724 863.2946,804.86078 C 862.32163,805.11432 862.87557,805.33844 864.52557,805.35882 C 866.17557,805.3792 866.97163,805.17176 866.2946,804.89783 z M 895.27557,808.83361 C 894.03807,808.60319 893.02557,807.81569 893.02557,807.0836 C 893.02557,806.05108 894.85826,805.84331 901.19637,806.15728 C 909.30011,806.55871 910.95689,806.95578 909.714,808.19867 C 908.94444,808.96824 898.47195,809.42877 895.27557,808.83361 z M 918.52557,808.55377 C 917.23689,806.46865 919.35227,805.55377 925.46214,805.55377 C 931.4006,805.55377 935.11748,807.12853 933.35023,808.89578 C 932.29232,809.95369 919.20415,809.65174 918.52557,808.55377 z M 936.02919,808.72044 C 935.4772,808.5371 935.02557,807.82218 935.02557,807.13171 C 935.02557,806.27357 936.88066,805.85885 940.88815,805.8211 C 947.45796,805.75922 950.52739,806.90991 948.04617,808.50457 C 946.69715,809.37157 938.43644,809.51996 936.02919,808.72044 z M 912.52557,807.55377 C 912.86549,807.00377 913.79205,806.55377 914.58459,806.55377 C 915.37713,806.55377 916.02557,807.00377 916.02557,807.55377 C 916.02557,808.10377 915.09901,808.55377 913.96655,808.55377 C 912.83409,808.55377 912.18565,808.10377 912.52557,807.55377 z M 865.52557,796.55377 C 868.30484,795.35948 871.78746,795.35948 872.52557,796.55377 C 872.90689,797.17076 871.30169,797.52685 868.33459,797.48348 C 864.72734,797.43076 864.02537,797.19843 865.52557,796.55377 z M 877.83807,796.87066 C 878.55994,796.58179 879.42245,796.61731 879.75474,796.9496 C 880.08703,797.2819 879.4964,797.51824 878.44224,797.47482 C 877.27729,797.42684 877.04034,797.18988 877.83807,796.87066 z M 933.83807,796.87066 C 934.55995,796.58179 935.42244,796.61731 935.75474,796.9496 C 936.08703,797.2819 935.4964,797.51824 934.44224,797.47482 C 933.27729,797.42684 933.04034,797.18988 933.83807,796.87066 z M 939.83807,796.87066 C 940.55995,796.58179 941.42244,796.61731 941.75474,796.9496 C 942.08703,797.2819 941.4964,797.51824 940.44224,797.47482 C 939.27729,797.42684 939.04034,797.18988 939.83807,796.87066 z M 860.83807,789.87066 C 861.55994,789.58179 862.42245,789.61731 862.75474,789.9496 C 863.08703,790.2819 862.4964,790.51824 861.44224,790.47482 C 860.27729,790.42684 860.04034,790.18988 860.83807,789.87066 z M 869.9117,789.39971 C 872.21686,788.73687 873.63746,788.76566 874.3617,789.4899 C 875.11353,790.24173 874.12034,790.52732 870.97557,790.46358 L 866.52557,790.37339 L 869.9117,789.39971 z M 903.87898,789.76635 C 895.95309,789.50288 895.2737,789.32091 895.72811,787.58324 C 896.54444,784.46159 902.23003,782.43671 909.26242,782.76309 C 914.92161,783.02574 915.69952,783.32983 917.32946,785.91655 C 920.09154,790.3 920.07503,790.30472 903.87898,789.76635 z M 930.02557,789.67079 C 930.02557,788.62777 935.55648,788.75135 936.62333,789.8182 C 937.0279,790.22276 935.7089,790.55377 933.69224,790.55377 C 931.67557,790.55377 930.02557,790.15643 930.02557,789.67079 z M 933.83807,782.87066 C 934.55995,782.58179 935.42244,782.61731 935.75474,782.9496 C 936.08703,783.2819 935.4964,783.51824 934.44224,783.47482 C 933.27729,783.42684 933.04034,783.18988 933.83807,782.87066 z M 847.02557,781.03388 C 847.02557,779.89525 849.4235,779.63181 859.52557,779.66061 C 869.29632,779.68846 872.02557,779.98916 872.02557,781.03782 C 872.02557,782.0867 869.29828,782.38632 859.52557,782.41109 C 849.42536,782.43669 847.02557,782.17229 847.02557,781.03388 z M 878.27557,779.54441 C 875.79651,778.52393 875.33591,777.02785 877.27557,776.29631 C 879.01877,775.63886 893.74114,776.936 894.63053,777.8254 C 895.03114,778.226 895.09932,778.81335 894.78205,779.13062 C 893.74748,780.16519 880.58518,780.49514 878.27557,779.54441 z M 899.02557,779.54823 C 895.48796,777.20289 901.24613,776.61013 927.72385,776.59397 C 953.45124,776.57827 957.89176,777.02091 955.54542,779.36726 C 954.42222,780.49045 900.70621,780.66245 899.02557,779.54823 z M 846.48445,767.48724 C 845.33782,765.63195 847.01075,765.05377 853.52557,765.05377 C 860.11236,765.05377 862.51856,765.9979 859.99661,767.59283 C 857.96358,768.87856 847.2928,768.79517 846.48445,767.48724 z M 863.48445,767.48724 C 863.12192,766.90065 863.12972,766.11629 863.50179,765.74422 C 864.19684,765.04916 883.11365,765.30851 883.82803,766.02289 C 884.04683,766.24169 883.92922,766.90065 883.56669,767.48724 C 882.68693,768.91072 864.36421,768.91072 863.48445,767.48724 z M 903.45348,764.25408 C 902.66813,763.81425 902.02535,762.91425 902.02508,762.25408 C 902.02472,761.34658 908.05461,761.10906 926.74308,761.28043 C 951.90312,761.51115 955.17937,761.79997 953.35305,763.62629 C 952.13656,764.84278 905.55116,765.42887 903.45348,764.25408 z M 877.52557,751.71886 C 872.9868,750.96419 871.67305,747.91647 876.02557,748.23906 C 877.40057,748.34098 888.53522,748.49183 900.76923,748.57429 C 914.74081,748.66847 923.24883,749.10599 923.64734,749.7508 C 924.61774,751.32094 922.66052,752.06477 917.87117,751.94601 C 904.13402,751.60534 896.66245,751.61344 889.52557,751.97673 C 885.12557,752.2007 879.72557,752.08466 877.52557,751.71886 z M 926.10255,751.14652 C 924.40707,749.10359 925.91052,748.55377 933.19224,748.55377 C 939.04248,748.55377 940.02557,748.80641 940.02557,750.30982 C 940.02557,751.78401 938.99323,752.09456 933.59387,752.24458 C 929.40214,752.36105 926.79314,751.97863 926.10255,751.14652 z M 846.72144,743.91631 C 844.74686,741.94173 847.12953,741.51825 858.77557,741.77389 C 866.63612,741.94644 871.43104,742.43726 871.27906,743.05377 C 870.99879,744.19071 847.81029,745.00516 846.72144,743.91631 z M 873.55509,743.60153 C 873.19413,743.0175 873.56432,742.28427 874.37771,741.97213 C 876.54804,741.1393 881.52557,741.89252 881.52557,743.05377 C 881.52557,744.42747 874.36949,744.91926 873.55509,743.60153 z M 905.64527,743.84014 C 905.25278,743.44764 901.18794,743.06138 896.61229,742.98178 C 892.03665,742.90218 887.77544,742.51722 887.14295,742.12631 C 884.50555,740.49631 887.61401,739.82182 898.49885,739.66221 C 907.50927,739.5301 910.02557,739.78361 910.02557,740.82349 C 910.02557,742.19728 908.10936,744.55377 906.99224,744.55377 C 906.6439,744.55377 906.03777,744.23264 905.64527,743.84014 z M 924.50714,742.52395 C 924.11812,741.8945 924.24872,740.93062 924.79737,740.38197 C 926.25349,738.92584 930.52557,739.79977 930.52557,741.55377 C 930.52557,743.36786 925.52673,744.17368 924.50714,742.52395 z M 934.14745,742.65026 C 931.96183,741.26591 933.82969,739.55377 937.52557,739.55377 C 941.55275,739.55377 942.85782,741.038 940.11932,742.5036 C 937.74911,743.77209 935.98694,743.81537 934.14745,742.65026 z M 915.71942,741.91429 C 914.92049,741.11536 915.82361,739.55377 917.08459,739.55377 C 917.60213,739.55377 918.02557,740.22877 918.02557,741.05377 C 918.02557,742.60018 916.84561,743.04047 915.71942,741.91429 z M 847.14746,731.65026 C 844.85065,730.19549 846.90679,728.55377 851.02557,728.55377 C 855.14436,728.55377 857.20049,730.19549 854.90369,731.65026 C 854.14572,732.13035 852.40057,732.52314 851.02557,732.52314 C 849.65057,732.52314 847.90542,732.13035 847.14746,731.65026 z M 857.71942,730.91429 C 856.67683,729.8717 857.99736,728.55377 860.08459,728.55377 C 861.15213,728.55377 862.02557,729.22877 862.02557,730.05377 C 862.02557,731.53702 858.95563,732.1505 857.71942,730.91429 z M 939.02557,730.12573 C 939.02557,728.41347 946.80187,727.2491 955.0162,727.73139 C 959.29521,727.98263 960.58025,728.43994 960.83953,729.80377 C 961.14015,731.38511 960.10499,731.55377 950.09889,731.55377 C 941.17059,731.55377 939.02557,731.27714 939.02557,730.12573 z M 891.6853,719.88016 C 891.31481,719.50968 884.71811,719.08828 877.02596,718.94371 C 869.33381,718.79914 862.55625,718.38175 861.96473,718.01617 C 861.3732,717.65058 861.21006,716.60949 861.6022,715.70262 C 861.99433,714.79575 862.58753,712.25377 862.9204,710.05377 L 863.52563,706.05377 L 872.5256,706.27652 C 877.47558,706.39904 885.12557,706.45336 889.52557,706.39723 C 893.92557,706.3411 898.20057,706.33183 899.02557,706.37664 C 899.85057,706.42145 904.35057,706.47628 909.02557,706.4985 C 913.70057,706.52072 918.42557,706.54786 919.52557,706.55881 C 920.62557,706.56976 924.52614,706.55632 928.1935,706.52895 C 931.86086,706.50157 935.12737,706.90946 935.4524,707.43538 C 935.80688,708.00894 937.23747,707.79591 939.0273,706.90302 C 940.66846,706.0843 942.91445,705.70111 944.0184,706.05149 C 945.73082,706.595 946.02557,707.55974 946.02557,712.62116 C 946.02557,715.88409 945.68807,718.59217 945.27557,718.6391 C 944.86307,718.68604 940.47557,718.68014 935.52557,718.62599 C 930.57557,718.57184 925.51307,718.53344 924.27557,718.54065 C 919.37747,718.56921 917.95686,718.54873 916.27557,718.42532 C 911.25252,718.05665 895.02557,719.07595 895.02557,719.76015 C 895.02557,720.72693 892.61855,720.81342 891.6853,719.88016 z M 883.68785,711.30377 C 883.41044,710.61627 883.18347,711.17877 883.18347,712.55377 C 883.18347,713.92877 883.41044,714.49127 883.68785,713.80377 C 883.96526,713.11627 883.96526,711.99127 883.68785,711.30377 z M 937.02557,713.05377 C 937.02557,712.22877 936.57557,711.55377 936.02557,711.55377 C 935.47557,711.55377 935.02557,712.22877 935.02557,713.05377 C 935.02557,713.87877 935.47557,714.55377 936.02557,714.55377 C 936.57557,714.55377 937.02557,713.87877 937.02557,713.05377 z M 917.02557,712.05377 C 917.02557,711.22877 916.57557,710.55377 916.02557,710.55377 C 915.47557,710.55377 915.02557,711.22877 915.02557,712.05377 C 915.02557,712.87877 915.47557,713.55377 916.02557,713.55377 C 916.57557,713.55377 917.02557,712.87877 917.02557,712.05377 z M 898.2373,694.73348 C 896.10209,693.64278 894.74182,692.08215 894.35813,690.28296 C 894.03314,688.75901 893.37537,687.26996 892.89641,686.97394 C 892.41745,686.67793 892.02557,684.24496 892.02557,681.56733 C 892.02557,677.49899 892.45858,676.35833 894.66043,674.62635 C 896.1096,673.48643 898.3971,672.55377 899.74376,672.55377 C 902.76709,672.55377 902.30933,670.19215 899.19724,669.73422 C 895.85386,669.24226 896.61523,667.75699 900.86321,666.48427 C 904.11791,665.50914 905.21917,665.60932 908.11321,667.14383 C 910.9812,668.66452 911.20651,669.01041 909.52557,669.31202 C 905.21143,670.08609 904.71656,670.47651 906.03539,672.0656 C 906.71468,672.88409 908.22786,673.56808 909.39801,673.58557 C 914.19308,673.65725 917.40532,680.10717 914.94005,684.71356 C 914.26979,685.96596 913.67733,688.09003 913.62348,689.43371 C 913.55334,691.18376 912.39093,692.52779 909.52557,694.17189 C 904.79551,696.88592 902.65907,696.99221 898.2373,694.73348 z " />
-      <path
-         id="path4205"
-         style="fill:#e7d4c9"
-         d="M 900.92189,923.55556 C 899.99848,923.0158 884.3034,922.65348 863.92189,922.70142 C 844.45392,922.74722 826.95057,922.77684 825.02557,922.76726 C 818.03454,922.73246 815.02017,921.99107 813.5946,919.95579 C 811.97756,917.64714 811.77627,911.70133 813.25204,909.83706 C 813.78178,909.16788 814.09866,906.46788 813.95623,903.83706 C 813.8138,901.20625 813.77114,878.46627 813.86142,853.30377 C 814.00468,813.37673 814.21649,807.55377 815.52557,807.55377 C 817.44738,807.55377 817.42887,806.09892 815.469,803.10778 C 813.41255,799.96923 813.41311,791.48783 815.47005,787.3646 C 816.94979,784.3984 816.95684,783.97668 815.54391,782.94352 C 814.16282,781.93365 814.01766,777.01168 814.29003,740.4276 C 814.56801,703.08888 814.7777,698.58763 816.44007,694.27424 C 818.06355,690.06175 818.1088,689.29059 816.82148,687.77424 C 811.7735,681.82817 810.63732,673.20659 814.43192,669.64175 C 817.51928,666.74132 826.75462,665.75483 832.52557,667.70903 C 835.39212,668.67973 844.31806,669.16016 864.02557,669.4045 C 879.15057,669.59202 891.91118,670.11043 892.38247,670.55651 C 892.85377,671.0026 892.06627,672.13622 890.63247,673.07568 C 889.06003,674.10599 888.02557,675.70677 888.02557,677.10976 C 888.02557,678.38905 887.57557,679.71385 887.02557,680.05377 C 885.72591,680.857 885.72591,687.25054 887.02557,688.05377 C 887.57557,688.39369 888.02557,689.49349 888.02557,690.49778 C 888.02557,691.50206 889.17851,693.07918 890.58766,694.00249 C 896.06556,697.59175 893.53207,698.03279 864.443,698.55377 L 836.52557,699.05377 L 836.27193,740.55377 C 836.04935,776.97151 835.82536,782.19681 834.44289,783.22181 C 833.1462,784.1832 833.0805,784.78789 834.07152,786.63964 C 835.62812,789.54816 835.62769,800.56019 834.07087,803.46913 C 833.08504,805.31117 833.15317,806.03728 834.44587,807.4657 C 835.83697,809.00285 836.02557,814.66778 836.02557,854.91375 L 836.02557,900.61626 L 859.01072,900.51681 C 871.65254,900.46212 882.49296,900.7246 883.10052,901.10009 C 883.75736,901.50604 883.95963,903.09171 883.59947,905.01154 C 883.09043,907.72498 883.51581,908.79382 886.26483,911.70863 C 889.01449,914.62412 890.61325,915.3555 896.29471,916.29695 C 901.12234,917.09691 904.97302,917.11808 909.77151,916.37102 C 915.46454,915.4847 917.04379,914.77043 920.12244,911.68945 C 923.12215,908.68747 923.67502,907.50793 923.29435,904.92219 C 923.04079,903.19982 923.32286,901.48807 923.92116,901.1183 C 924.51947,900.74852 935.25022,900.35773 947.76728,900.24988 L 970.52557,900.05377 L 970.7279,854.63715 C 970.89319,817.53686 971.18317,808.9676 972.31154,807.83923 C 973.48661,806.66416 973.48552,805.64391 972.30425,801.00585 C 971.10812,796.30944 971.11732,794.76196 972.37066,789.84093 C 973.61449,784.95725 973.623,783.97755 972.42926,783.09093 C 971.28045,782.23767 970.98787,774.69531 970.77921,740.55377 L 970.52557,699.05377 L 942.52557,698.55377 C 918.34804,698.12203 914.56589,697.84899 914.82094,696.55377 C 914.98339,695.72877 915.99589,694.43638 917.07094,693.6818 C 918.14599,692.92721 919.02557,691.72618 919.02557,691.01284 C 919.02557,690.29949 919.81307,688.32938 920.77557,686.63481 C 922.44224,683.70049 922.44224,683.40705 920.77557,680.47273 C 919.81307,678.77816 919.02557,676.80491 919.02557,676.08774 C 919.02557,675.37057 917.88623,674.03727 916.4937,673.12485 C 915.10118,672.21243 914.22774,671.03568 914.55272,670.50984 C 914.90558,669.9389 926.49966,669.54791 943.33459,669.53922 C 966.44872,669.52728 972.33596,669.23984 976.02557,667.94307 C 981.52911,666.00877 989.40264,666.68968 993.01139,669.41203 C 996.60718,672.1246 996.47591,679.40714 992.72529,685.2839 C 989.50792,690.32511 989.35657,692.94425 992.02931,697.32794 C 993.93739,700.45749 994.02557,702.38744 994.02557,741.02124 C 994.02557,780.86093 993.99567,781.46131 991.93978,782.90131 C 989.95312,784.29282 989.93323,784.48321 991.52143,786.90711 C 993.71561,790.25585 993.78829,799.31849 991.65525,803.59427 C 990.09487,806.72213 990.11371,806.92721 992.08854,808.31043 C 994.13146,809.74134 994.15139,810.27807 993.98599,859.40515 C 993.89406,886.71189 994.14595,909.86068 994.54574,910.8469 C 994.94554,911.83312 995.00789,912.90479 994.68429,913.22838 C 994.3607,913.55198 994.50119,914.57395 994.99649,915.49943 C 995.64002,916.70188 995.27322,917.9567 993.7113,919.8961 C 991.73261,922.353 990.90987,922.60721 985.02557,922.57979 C 975.63499,922.53603 976.5721,922.53831 939.87992,922.46985 C 916.93109,922.42703 906.02337,922.74832 905.5709,923.48042 C 904.76521,924.78406 903.07044,924.81145 900.92189,923.55556 z M 937.21861,876.37406 C 936.28744,876.00021 940.10127,875.66271 945.69378,875.62406 C 951.2863,875.5854 956.5738,875.28063 957.44378,874.94678 C 958.31377,874.61294 959.02557,874.80805 959.02557,875.38037 C 959.02557,876.57296 939.88634,877.44509 937.21861,876.37406 z M 921.02557,875.55377 C 921.02557,875.00377 921.47557,874.55377 922.02557,874.55377 C 922.57557,874.55377 923.02557,875.00377 923.02557,875.55377 C 923.02557,876.10377 922.57557,876.55377 922.02557,876.55377 C 921.47557,876.55377 921.02557,876.10377 921.02557,875.55377 z M 925.02557,875.55377 C 925.02557,875.00377 925.47557,874.55377 926.02557,874.55377 C 926.57557,874.55377 927.02557,875.00377 927.02557,875.55377 C 927.02557,876.10377 926.57557,876.55377 926.02557,876.55377 C 925.47557,876.55377 925.02557,876.10377 925.02557,875.55377 z M 852.77557,835.89149 C 853.46307,835.61408 854.58807,835.61408 855.27557,835.89149 C 855.96307,836.1689 855.40057,836.39588 854.02557,836.39588 C 852.65057,836.39588 852.08807,836.1689 852.77557,835.89149 z M 843.83807,820.87066 C 844.55994,820.58179 845.42245,820.61731 845.75474,820.9496 C 846.08703,821.2819 845.4964,821.51824 844.44224,821.47482 C 843.27729,821.42684 843.04034,821.18988 843.83807,820.87066 z M 848.02557,820.55377 C 848.02557,820.00377 848.67401,819.55377 849.46655,819.55377 C 850.25909,819.55377 851.18565,820.00377 851.52557,820.55377 C 851.86549,821.10377 851.21705,821.55377 850.08459,821.55377 C 848.95213,821.55377 848.02557,821.10377 848.02557,820.55377 z M 875.82557,820.35377 C 876.7589,819.42044 877.29224,819.42044 878.22557,820.35377 C 879.1589,821.2871 878.89224,821.55377 877.02557,821.55377 C 875.1589,821.55377 874.89224,821.2871 875.82557,820.35377 z M 860.77557,814.88578 C 859.81307,814.62252 859.02557,813.99012 859.02557,813.48045 C 859.02557,812.22524 870.74699,812.294 871.52557,813.55377 C 871.88097,814.12882 870.94992,814.55957 869.33459,814.56742 C 867.78963,814.57493 865.62557,814.75734 864.52557,814.97276 C 863.42557,815.18819 861.73807,815.14905 860.77557,814.88578 z M 842.02557,813.55377 C 842.02557,813.00377 843.82557,812.55377 846.02557,812.55377 C 848.22557,812.55377 850.02557,813.00377 850.02557,813.55377 C 850.02557,814.10377 848.22557,814.55377 846.02557,814.55377 C 843.82557,814.55377 842.02557,814.10377 842.02557,813.55377 z M 858.59553,807.66696 C 858.29174,807.17542 862.0541,806.79539 867.03651,806.81435 C 871.98049,806.83316 876.02557,807.23222 876.02557,807.70116 C 876.02557,808.83651 859.29806,808.80369 858.59553,807.66696 z M 920.02557,807.55377 C 920.02557,807.00377 920.70057,806.55377 921.52557,806.55377 C 922.35057,806.55377 923.02557,807.00377 923.02557,807.55377 C 923.02557,808.10377 922.35057,808.55377 921.52557,808.55377 C 920.70057,808.55377 920.02557,808.10377 920.02557,807.55377 z M 928.52557,807.55377 C 926.61721,806.73372 926.62867,806.69112 928.77557,806.62406 C 930.01307,806.5854 931.02557,807.00377 931.02557,807.55377 C 931.02557,808.10377 930.91307,808.52214 930.77557,808.48348 C 930.63807,808.44483 929.62557,808.02646 928.52557,807.55377 z M 850.77557,806.89149 C 851.46307,806.61408 852.58807,806.61408 853.27557,806.89149 C 853.96307,807.1689 853.40057,807.39588 852.02557,807.39588 C 850.65057,807.39588 850.08807,807.1689 850.77557,806.89149 z M 843.52557,802.55377 C 843.17366,801.98437 844.03486,801.55377 845.52557,801.55377 C 847.01628,801.55377 847.87748,801.98437 847.52557,802.55377 C 847.18565,803.10377 846.28565,803.55377 845.52557,803.55377 C 844.76549,803.55377 843.86549,803.10377 843.52557,802.55377 z M 853.52557,802.55377 C 853.12709,801.90902 857.03486,801.55377 864.52557,801.55377 C 872.01628,801.55377 875.92405,801.90902 875.52557,802.55377 C 875.17776,803.11654 870.36819,803.55377 864.52557,803.55377 C 858.68295,803.55377 853.87338,803.11654 853.52557,802.55377 z M 899.73469,786.44465 C 901.77322,784.40613 911.02557,784.59112 911.02557,786.6704 C 911.02557,787.15625 908.23557,787.55377 904.82557,787.55377 C 900.28559,787.55377 898.92253,787.25681 899.73469,786.44465 z M 849.2946,780.86078 C 850.26757,780.60724 851.61757,780.62391 852.2946,780.89783 C 852.97163,781.17176 852.17557,781.3792 850.52557,781.35882 C 848.87557,781.33844 848.32163,781.11432 849.2946,780.86078 z M 867.83807,780.87066 C 868.55994,780.58179 869.42245,780.61731 869.75474,780.9496 C 870.08703,781.2819 869.4964,781.51824 868.44224,781.47482 C 867.27729,781.42684 867.04034,781.18988 867.83807,780.87066 z M 903.52557,778.55377 C 903.18565,778.00377 903.38409,777.55377 903.96655,777.55377 C 904.54901,777.55377 905.02557,778.00377 905.02557,778.55377 C 905.02557,779.10377 904.82713,779.55377 904.58459,779.55377 C 904.34205,779.55377 903.86549,779.10377 903.52557,778.55377 z M 937.52557,778.55377 C 937.14339,777.9354 938.74278,777.59181 941.71655,777.65345 C 945.61871,777.73433 946.05413,777.90411 944.02557,778.55377 C 940.4391,779.70236 938.23544,779.70236 937.52557,778.55377 z M 878.77557,777.89149 C 879.46307,777.61408 880.58807,777.61408 881.27557,777.89149 C 881.96307,778.1689 881.40057,778.39588 880.02557,778.39588 C 878.65057,778.39588 878.08807,778.1689 878.77557,777.89149 z M 849.52557,766.55377 C 850.30668,765.28991 853.06989,765.28991 855.02557,766.55377 C 856.13905,767.27336 855.54407,767.52709 852.71655,767.53846 C 850.42858,767.54766 849.15433,767.15444 849.52557,766.55377 z M 867.77557,766.89149 C 868.46307,766.61408 869.58807,766.61408 870.27557,766.89149 C 870.96307,767.1689 870.40057,767.39588 869.02557,767.39588 C 867.65057,767.39588 867.08807,767.1689 867.77557,766.89149 z M 931.2946,762.86078 C 932.26757,762.60724 933.61757,762.62391 934.2946,762.89783 C 934.97163,763.17176 934.17557,763.3792 932.52557,763.35882 C 930.87557,763.33844 930.32163,763.11432 931.2946,762.86078 z M 945.83807,762.87066 C 946.55995,762.58178 947.42244,762.61731 947.75474,762.9496 C 948.08703,763.28189 947.4964,763.51824 946.44224,763.47482 C 945.27729,763.42684 945.04034,763.18988 945.83807,762.87066 z M 874.02557,749.55377 C 874.02557,749.00377 874.67401,748.55377 875.46655,748.55377 C 876.25909,748.55377 877.18565,749.00377 877.52557,749.55377 C 877.86549,750.10377 877.21705,750.55377 876.08459,750.55377 C 874.95213,750.55377 874.02557,750.10377 874.02557,749.55377 z M 882.2946,749.86078 C 883.26757,749.60724 884.61757,749.62391 885.2946,749.89783 C 885.97163,750.17176 885.17557,750.3792 883.52557,750.35882 C 881.87557,750.33844 881.32163,750.11432 882.2946,749.86078 z M 930.83807,749.87066 C 931.55995,749.58178 932.42244,749.61731 932.75474,749.9496 C 933.08703,750.28189 932.4964,750.51824 931.44224,750.47482 C 930.27729,750.42684 930.04034,750.18988 930.83807,749.87066 z M 893.52557,741.55377 C 893.86549,741.00377 894.56705,740.55377 895.08459,740.55377 C 895.60213,740.55377 896.02557,741.00377 896.02557,741.55377 C 896.02557,742.10377 895.32401,742.55377 894.46655,742.55377 C 893.60909,742.55377 893.18565,742.10377 893.52557,741.55377 z M 906.02557,741.55377 C 906.02557,741.00377 906.70057,740.55377 907.52557,740.55377 C 908.35057,740.55377 909.02557,741.00377 909.02557,741.55377 C 909.02557,742.10377 908.35057,742.55377 907.52557,742.55377 C 906.70057,742.55377 906.02557,742.10377 906.02557,741.55377 z M 926.83807,741.87066 C 927.55995,741.58178 928.42244,741.61731 928.75474,741.9496 C 929.08703,742.28189 928.4964,742.51824 927.44224,742.47482 C 926.27729,742.42684 926.04034,742.18988 926.83807,741.87066 z M 936.2946,740.86078 C 937.26757,740.60724 938.61757,740.62391 939.2946,740.89783 C 939.97163,741.17176 939.17557,741.3792 937.52557,741.35882 C 935.87557,741.33844 935.32163,741.11432 936.2946,740.86078 z M 848.02557,730.55377 C 848.02557,730.00377 849.37557,729.55377 851.02557,729.55377 C 852.67557,729.55377 854.02557,730.00377 854.02557,730.55377 C 854.02557,731.10377 852.67557,731.55377 851.02557,731.55377 C 849.37557,731.55377 848.02557,731.10377 848.02557,730.55377 z M 946.26074,730.88924 C 945.01508,730.62609 944.25414,729.99295 944.56976,729.48228 C 945.34438,728.22891 958.74636,728.29297 959.52557,729.55377 C 959.86889,730.10927 959.11724,730.55866 957.83459,730.56478 C 956.56463,730.57083 953.95057,730.75396 952.02557,730.97174 C 950.10057,731.18952 947.5064,731.1524 946.26074,730.88924 z M 891.6853,719.88016 C 891.31481,719.50968 884.71811,719.08828 877.02596,718.94371 C 869.33381,718.79914 862.55625,718.38175 861.96473,718.01617 C 861.3732,717.65058 861.21006,716.60949 861.6022,715.70262 C 861.99433,714.79575 862.58753,712.25377 862.9204,710.05377 L 863.52563,706.05377 L 872.5256,706.27652 C 877.47558,706.39904 885.12557,706.45336 889.52557,706.39723 C 893.92557,706.3411 898.20057,706.33183 899.02557,706.37664 C 899.85057,706.42145 904.35057,706.47628 909.02557,706.4985 C 913.70057,706.52072 918.42557,706.54786 919.52557,706.55881 C 920.62557,706.56976 924.52614,706.55632 928.1935,706.52895 C 931.86086,706.50157 935.12737,706.90946 935.4524,707.43538 C 935.80688,708.00894 937.23747,707.79591 939.0273,706.90302 C 940.66846,706.0843 942.91445,705.70111 944.0184,706.05149 C 945.73082,706.595 946.02557,707.55974 946.02557,712.62116 C 946.02557,715.88409 945.68807,718.59217 945.27557,718.6391 C 944.86307,718.68604 940.47557,718.68014 935.52557,718.62599 C 930.57557,718.57184 925.51307,718.53344 924.27557,718.54065 C 919.37747,718.56921 917.95686,718.54873 916.27557,718.42532 C 911.25252,718.05665 895.02557,719.07595 895.02557,719.76015 C 895.02557,720.72693 892.61855,720.81342 891.6853,719.88016 z M 883.68785,711.30377 C 883.41044,710.61627 883.18347,711.17877 883.18347,712.55377 C 883.18347,713.92877 883.41044,714.49127 883.68785,713.80377 C 883.96526,713.11627 883.96526,711.99127 883.68785,711.30377 z M 937.02557,713.05377 C 937.02557,712.22877 936.57557,711.55377 936.02557,711.55377 C 935.47557,711.55377 935.02557,712.22877 935.02557,713.05377 C 935.02557,713.87877 935.47557,714.55377 936.02557,714.55377 C 936.57557,714.55377 937.02557,713.87877 937.02557,713.05377 z M 917.02557,712.05377 C 917.02557,711.22877 916.57557,710.55377 916.02557,710.55377 C 915.47557,710.55377 915.02557,711.22877 915.02557,712.05377 C 915.02557,712.87877 915.47557,713.55377 916.02557,713.55377 C 916.57557,713.55377 917.02557,712.87877 917.02557,712.05377 z M 898.2373,694.73348 C 896.10209,693.64278 894.74182,692.08215 894.35813,690.28296 C 894.03314,688.75901 893.37537,687.26996 892.89641,686.97394 C 892.41745,686.67793 892.02557,684.24496 892.02557,681.56733 C 892.02557,677.49899 892.45858,676.35833 894.66043,674.62635 C 896.1096,673.48643 898.3971,672.55377 899.74376,672.55377 C 902.76709,672.55377 902.30933,670.19215 899.19724,669.73422 C 895.85386,669.24226 896.61523,667.75699 900.86321,666.48427 C 904.11791,665.50914 905.21917,665.60932 908.11321,667.14383 C 910.9812,668.66452 911.20651,669.01041 909.52557,669.31202 C 905.21143,670.08609 904.71656,670.47651 906.03539,672.0656 C 906.71468,672.88409 908.22786,673.56808 909.39801,673.58557 C 914.19308,673.65725 917.40532,680.10717 914.94005,684.71356 C 914.26979,685.96596 913.67733,688.09003 913.62348,689.43371 C 913.55334,691.18376 912.39093,692.52779 909.52557,694.17189 C 904.79551,696.88592 902.65907,696.99221 898.2373,694.73348 z " />
-      <path
-         id="path4203"
-         style="fill:#dec6b7"
-         d="M 900.15318,922.69278 C 899.39836,922.1932 884.34447,921.7118 866.70009,921.623 C 845.18008,921.5147 834.18561,921.10156 833.3017,920.36798 C 832.57698,919.76651 831.4877,917.30335 830.8811,914.8943 C 829.98732,911.34478 829.51719,910.7308 828.40187,911.65643 C 826.70192,913.06727 826.63293,915.9522 828.23771,918.52186 C 829.82031,921.056 828.77123,921.97128 824.42525,921.84809 C 820.04052,921.7238 819.2617,921.00657 820.81342,918.52186 C 822.42038,915.94872 822.34862,913.06677 820.64235,911.65069 C 819.14459,910.40766 818.02557,912.02997 818.02557,915.44443 C 818.02557,916.39432 817.37839,918.04502 816.5874,919.11264 C 815.1666,921.03032 815.13194,921.03043 813.71796,919.12208 C 812.24489,917.13397 812.11816,912.831 813.46835,910.64636 C 813.88861,909.96635 814.16433,886.96972 814.08105,859.54273 C 813.93132,810.23236 813.9525,809.66325 815.9776,808.57944 C 818.44233,807.26036 818.56751,805.81009 816.42134,803.43859 C 814.07142,800.84196 814.16876,790.81282 816.58356,786.72488 C 818.44953,783.56605 818.44749,783.53759 816.2432,781.99365 L 814.02557,780.44036 L 814.02557,741.95723 C 814.02557,706.39719 814.16722,703.19228 815.89037,699.76393 C 818.69117,694.19151 819.38268,689.09503 817.5449,687.56981 C 816.70927,686.8763 816.02557,685.72112 816.02557,685.00275 C 816.02557,684.28438 815.3061,682.97715 814.42674,682.0978 C 812.29366,679.96471 811.40131,673.01088 813.01167,671.07052 C 814.39457,669.40423 821.15022,667.26343 825.02557,667.26343 C 826.40057,667.26343 829.55057,667.83166 832.02557,668.52615 C 837.21218,669.98154 839.75413,670.1103 869.52557,670.42564 C 889.84121,670.64083 891.35331,670.77884 889.27557,672.22819 C 888.03807,673.09143 887.02557,674.65866 887.02557,675.71092 C 887.02557,676.76319 886.34789,678.6584 885.51962,679.9225 C 884.1651,681.98977 884.19768,682.80187 885.84367,687.9991 C 886.85016,691.17712 888.42784,694.19939 889.34961,694.71524 C 893.6814,697.13943 889.83886,697.55377 863.02557,697.55377 C 837.03404,697.55377 835.02398,697.42824 835.00333,695.80377 C 834.9911,694.84127 834.14735,692.96926 833.12833,691.64376 L 831.27557,689.23374 L 831.27557,692.07513 C 831.27557,693.6379 832.11764,696.2974 833.14683,697.98515 C 834.89311,700.84882 835.01834,703.73969 835.02183,741.26859 C 835.02552,780.90315 834.99573,781.49937 832.95749,782.59021 C 830.95519,783.6618 830.94524,783.78221 832.64472,786.37539 C 835.0069,789.97976 835.04731,800.34545 832.71307,803.90795 C 830.59776,807.13633 830.60343,807.21012 833.01552,807.84089 C 834.96123,808.34971 835.01125,809.3916 835.26552,854.70752 L 835.52557,901.05377 L 859.02557,901.19343 L 882.52557,901.3331 L 882.52557,905.19343 C 882.52557,910.21153 886.85581,914.90444 892.52974,916.03548 C 901.32344,917.78843 903.87995,917.96001 908.52557,917.10905 C 910.17557,916.80682 913.21307,916.284 915.27557,915.94724 C 917.33807,915.61049 919.02557,914.90882 919.02557,914.38799 C 919.02557,913.86716 920.41913,912.16821 922.12237,910.61254 C 924.82094,908.14778 925.06979,907.50491 924.05752,905.61347 C 921.76528,901.33038 922.47136,901.20047 946.64893,901.45682 C 965.69299,901.65875 969.86505,901.45211 970.85622,900.25783 C 971.73604,899.19771 971.95664,892.47893 971.68769,874.93432 C 971.48634,861.80002 971.06472,849.25804 970.75075,847.06325 C 970.43679,844.86847 970.5954,842.5721 971.10322,841.96021 C 971.61104,841.34832 971.9198,838.19405 971.78935,834.95073 C 971.6589,831.7074 971.65869,824.39914 971.78887,818.71015 C 972.00392,809.31273 972.20852,808.31869 974.02557,807.84352 C 976.44582,807.21061 976.4523,807.13468 974.3589,803.93975 C 973.28379,802.29891 972.69224,799.32248 972.69224,795.55377 C 972.69224,791.78506 973.28379,788.80863 974.3589,787.16779 C 976.52581,783.86068 976.46056,782.90078 974.02557,782.26402 C 972.06701,781.75184 972.02557,780.90001 972.02557,741.14739 C 972.02557,718.8209 972.40334,700.55377 972.86505,700.55377 C 974.07425,700.55377 976.34132,695.52482 976.58419,692.30377 C 976.88074,688.37066 975.55453,688.90709 973.19591,693.67427 L 971.15725,697.79477 L 943.86756,697.61709 C 928.85824,697.51937 916.34111,697.19095 916.05172,696.88728 C 915.76234,696.58361 916.53807,695.65445 917.77557,694.82249 C 919.01307,693.99052 920.02557,692.70498 920.02557,691.96573 C 920.02557,691.22647 920.80088,688.99579 921.74848,687.00865 C 923.37902,683.58937 923.37902,683.23474 921.74848,680.39368 C 920.80088,678.74259 920.02557,676.58305 920.02557,675.5947 C 920.02557,674.60636 919.01307,673.09143 917.77557,672.22819 C 915.70008,670.78041 917.30949,670.6446 938.52557,670.47718 C 951.17557,670.37735 963.58269,670.38918 966.09695,670.50346 C 968.61121,670.61774 973.0189,669.94241 975.89181,669.00273 C 981.97825,667.01196 989.19113,667.57698 992.91702,670.33639 C 995.99195,672.61371 996.54923,677.26954 994.14231,680.57311 C 993.13276,681.95875 991.98817,684.09625 991.59878,685.32311 C 991.20939,686.54997 990.47112,687.55377 989.95818,687.55377 C 988.70034,687.55377 988.76219,696.27296 990.02557,697.05377 C 992.17513,698.38227 991.04943,700.63207 988.38046,700.34162 C 985.42462,700.01995 983.95741,702.20665 986.47966,703.17453 C 987.39236,703.52476 988.95996,703.01813 990.06895,702.01451 C 991.15183,701.03452 992.37257,700.56773 992.7817,700.9772 C 993.68697,701.88325 994.0589,748.77045 993.31158,767.77662 C 992.82922,780.04434 992.57337,781.56252 990.89879,782.09401 C 988.59871,782.82403 988.512,784.84033 990.64095,788.08953 C 992.86234,791.47978 992.73175,799.54971 990.3914,803.51161 C 988.53234,806.65875 988.53388,806.67428 990.87945,808.44355 L 993.23243,810.21841 L 993.09316,856.60482 C 993.01655,882.11734 992.6954,904.02108 992.37949,905.27978 C 992.06357,906.53849 992.45067,908.57756 993.23971,909.81106 C 994.94956,912.48405 994.95738,916.29528 993.25866,919.05377 C 992.04152,921.03025 992.00939,921.03094 990.52631,919.11264 C 989.7009,918.04502 989.02557,915.70908 989.02557,913.92166 C 989.02557,908.04867 985.92453,908.92619 984.58944,915.17698 C 984.09043,917.51328 984.31329,918.4502 985.47396,918.89559 C 988.48448,920.05084 986.97178,921.26806 982.52557,921.26806 C 978.12805,921.26806 976.2514,919.44856 979.40196,918.23958 C 981.72914,917.34655 979.48722,909.55377 976.90313,909.55377 C 976.42047,909.55377 976.02557,910.92612 976.02557,912.60343 C 976.02557,916.57906 973.43792,921.51228 971.24989,921.70804 C 970.30151,921.79289 955.35057,921.94153 938.02557,922.03836 C 920.70057,922.13518 905.40057,922.52641 904.02557,922.90776 C 902.65057,923.2891 900.90799,923.19237 900.15318,922.69278 z M 980.52557,701.55377 C 980.52557,700.55632 979.70868,700.14475 978.08734,700.32533 C 975.11542,700.65633 974.61838,701.08591 975.51979,702.54443 C 976.50844,704.14409 980.52557,703.34909 980.52557,701.55377 z M 822.48287,701.62287 C 822.7993,701.11087 822.59683,700.40683 822.03293,700.05832 C 820.60732,699.17724 816.86839,700.49043 817.57007,701.62577 C 818.31356,702.82877 821.73883,702.82675 822.48287,701.62287 z M 831.77557,701.30377 C 831.5464,700.61627 830.5339,700.05377 829.52557,700.05377 C 828.51724,700.05377 827.50474,700.61627 827.27557,701.30377 C 827.01168,702.09544 827.83668,702.55377 829.52557,702.55377 C 831.21446,702.55377 832.03946,702.09544 831.77557,701.30377 z M 937.21861,876.37406 C 936.28744,876.00021 940.10127,875.66271 945.69378,875.62406 C 951.2863,875.5854 956.5738,875.28063 957.44378,874.94678 C 958.31377,874.61294 959.02557,874.80805 959.02557,875.38037 C 959.02557,876.57296 939.88634,877.44509 937.21861,876.37406 z M 921.02557,875.55377 C 921.02557,875.00377 921.47557,874.55377 922.02557,874.55377 C 922.57557,874.55377 923.02557,875.00377 923.02557,875.55377 C 923.02557,876.10377 922.57557,876.55377 922.02557,876.55377 C 921.47557,876.55377 921.02557,876.10377 921.02557,875.55377 z M 925.02557,875.55377 C 925.02557,875.00377 925.47557,874.55377 926.02557,874.55377 C 926.57557,874.55377 927.02557,875.00377 927.02557,875.55377 C 927.02557,876.10377 926.57557,876.55377 926.02557,876.55377 C 925.47557,876.55377 925.02557,876.10377 925.02557,875.55377 z M 852.77557,835.89149 C 853.46307,835.61408 854.58807,835.61408 855.27557,835.89149 C 855.96307,836.1689 855.40057,836.39588 854.02557,836.39588 C 852.65057,836.39588 852.08807,836.1689 852.77557,835.89149 z M 843.83807,820.87066 C 844.55994,820.58179 845.42245,820.61731 845.75474,820.9496 C 846.08703,821.2819 845.4964,821.51824 844.44224,821.47482 C 843.27729,821.42684 843.04034,821.18988 843.83807,820.87066 z M 848.02557,820.55377 C 848.02557,820.00377 848.67401,819.55377 849.46655,819.55377 C 850.25909,819.55377 851.18565,820.00377 851.52557,820.55377 C 851.86549,821.10377 851.21705,821.55377 850.08459,821.55377 C 848.95213,821.55377 848.02557,821.10377 848.02557,820.55377 z M 875.82557,820.35377 C 876.7589,819.42044 877.29224,819.42044 878.22557,820.35377 C 879.1589,821.2871 878.89224,821.55377 877.02557,821.55377 C 875.1589,821.55377 874.89224,821.2871 875.82557,820.35377 z M 860.77557,814.88578 C 859.81307,814.62252 859.02557,813.99012 859.02557,813.48045 C 859.02557,812.22524 870.74699,812.294 871.52557,813.55377 C 871.88097,814.12882 870.94992,814.55957 869.33459,814.56742 C 867.78963,814.57493 865.62557,814.75734 864.52557,814.97276 C 863.42557,815.18819 861.73807,815.14905 860.77557,814.88578 z M 842.02557,813.55377 C 842.02557,813.00377 843.82557,812.55377 846.02557,812.55377 C 848.22557,812.55377 850.02557,813.00377 850.02557,813.55377 C 850.02557,814.10377 848.22557,814.55377 846.02557,814.55377 C 843.82557,814.55377 842.02557,814.10377 842.02557,813.55377 z M 858.59553,807.66696 C 858.29174,807.17542 862.0541,806.79539 867.03651,806.81435 C 871.98049,806.83316 876.02557,807.23222 876.02557,807.70116 C 876.02557,808.83651 859.29806,808.80369 858.59553,807.66696 z M 920.02557,807.55377 C 920.02557,807.00377 920.70057,806.55377 921.52557,806.55377 C 922.35057,806.55377 923.02557,807.00377 923.02557,807.55377 C 923.02557,808.10377 922.35057,808.55377 921.52557,808.55377 C 920.70057,808.55377 920.02557,808.10377 920.02557,807.55377 z M 928.52557,807.55377 C 926.61721,806.73372 926.62867,806.69112 928.77557,806.62406 C 930.01307,806.5854 931.02557,807.00377 931.02557,807.55377 C 931.02557,808.10377 930.91307,808.52214 930.77557,808.48348 C 930.63807,808.44483 929.62557,808.02646 928.52557,807.55377 z M 850.77557,806.89149 C 851.46307,806.61408 852.58807,806.61408 853.27557,806.89149 C 853.96307,807.1689 853.40057,807.39588 852.02557,807.39588 C 850.65057,807.39588 850.08807,807.1689 850.77557,806.89149 z M 843.52557,802.55377 C 843.17366,801.98437 844.03486,801.55377 845.52557,801.55377 C 847.01628,801.55377 847.87748,801.98437 847.52557,802.55377 C 847.18565,803.10377 846.28565,803.55377 845.52557,803.55377 C 844.76549,803.55377 843.86549,803.10377 843.52557,802.55377 z M 853.52557,802.55377 C 853.12709,801.90902 857.03486,801.55377 864.52557,801.55377 C 872.01628,801.55377 875.92405,801.90902 875.52557,802.55377 C 875.17776,803.11654 870.36819,803.55377 864.52557,803.55377 C 858.68295,803.55377 853.87338,803.11654 853.52557,802.55377 z M 899.73469,786.44465 C 901.77322,784.40613 911.02557,784.59112 911.02557,786.6704 C 911.02557,787.15625 908.23557,787.55377 904.82557,787.55377 C 900.28559,787.55377 898.92253,787.25681 899.73469,786.44465 z M 849.2946,780.86078 C 850.26757,780.60724 851.61757,780.62391 852.2946,780.89783 C 852.97163,781.17176 852.17557,781.3792 850.52557,781.35882 C 848.87557,781.33844 848.32163,781.11432 849.2946,780.86078 z M 867.83807,780.87066 C 868.55994,780.58179 869.42245,780.61731 869.75474,780.9496 C 870.08703,781.2819 869.4964,781.51824 868.44224,781.47482 C 867.27729,781.42684 867.04034,781.18988 867.83807,780.87066 z M 903.52557,778.55377 C 903.18565,778.00377 903.38409,777.55377 903.96655,777.55377 C 904.54901,777.55377 905.02557,778.00377 905.02557,778.55377 C 905.02557,779.10377 904.82713,779.55377 904.58459,779.55377 C 904.34205,779.55377 903.86549,779.10377 903.52557,778.55377 z M 937.52557,778.55377 C 937.14339,777.9354 938.74278,777.59181 941.71655,777.65345 C 945.61871,777.73433 946.05413,777.90411 944.02557,778.55377 C 940.4391,779.70236 938.23544,779.70236 937.52557,778.55377 z M 878.77557,777.89149 C 879.46307,777.61408 880.58807,777.61408 881.27557,777.89149 C 881.96307,778.1689 881.40057,778.39588 880.02557,778.39588 C 878.65057,778.39588 878.08807,778.1689 878.77557,777.89149 z M 849.52557,766.55377 C 850.30668,765.28991 853.06989,765.28991 855.02557,766.55377 C 856.13905,767.27336 855.54407,767.52709 852.71655,767.53846 C 850.42858,767.54766 849.15433,767.15444 849.52557,766.55377 z M 867.77557,766.89149 C 868.46307,766.61408 869.58807,766.61408 870.27557,766.89149 C 870.96307,767.1689 870.40057,767.39588 869.02557,767.39588 C 867.65057,767.39588 867.08807,767.1689 867.77557,766.89149 z M 931.2946,762.86078 C 932.26757,762.60724 933.61757,762.62391 934.2946,762.89783 C 934.97163,763.17176 934.17557,763.3792 932.52557,763.35882 C 930.87557,763.33844 930.32163,763.11432 931.2946,762.86078 z M 945.83807,762.87066 C 946.55995,762.58178 947.42244,762.61731 947.75474,762.9496 C 948.08703,763.28189 947.4964,763.51824 946.44224,763.47482 C 945.27729,763.42684 945.04034,763.18988 945.83807,762.87066 z M 874.02557,749.55377 C 874.02557,749.00377 874.67401,748.55377 875.46655,748.55377 C 876.25909,748.55377 877.18565,749.00377 877.52557,749.55377 C 877.86549,750.10377 877.21705,750.55377 876.08459,750.55377 C 874.95213,750.55377 874.02557,750.10377 874.02557,749.55377 z M 882.2946,749.86078 C 883.26757,749.60724 884.61757,749.62391 885.2946,749.89783 C 885.97163,750.17176 885.17557,750.3792 883.52557,750.35882 C 881.87557,750.33844 881.32163,750.11432 882.2946,749.86078 z M 930.83807,749.87066 C 931.55995,749.58178 932.42244,749.61731 932.75474,749.9496 C 933.08703,750.28189 932.4964,750.51824 931.44224,750.47482 C 930.27729,750.42684 930.04034,750.18988 930.83807,749.87066 z M 893.52557,741.55377 C 893.86549,741.00377 894.56705,740.55377 895.08459,740.55377 C 895.60213,740.55377 896.02557,741.00377 896.02557,741.55377 C 896.02557,742.10377 895.32401,742.55377 894.46655,742.55377 C 893.60909,742.55377 893.18565,742.10377 893.52557,741.55377 z M 906.02557,741.55377 C 906.02557,741.00377 906.70057,740.55377 907.52557,740.55377 C 908.35057,740.55377 909.02557,741.00377 909.02557,741.55377 C 909.02557,742.10377 908.35057,742.55377 907.52557,742.55377 C 906.70057,742.55377 906.02557,742.10377 906.02557,741.55377 z M 926.83807,741.87066 C 927.55995,741.58178 928.42244,741.61731 928.75474,741.9496 C 929.08703,742.28189 928.4964,742.51824 927.44224,742.47482 C 926.27729,742.42684 926.04034,742.18988 926.83807,741.87066 z M 936.2946,740.86078 C 937.26757,740.60724 938.61757,740.62391 939.2946,740.89783 C 939.97163,741.17176 939.17557,741.3792 937.52557,741.35882 C 935.87557,741.33844 935.32163,741.11432 936.2946,740.86078 z M 848.02557,730.55377 C 848.02557,730.00377 849.37557,729.55377 851.02557,729.55377 C 852.67557,729.55377 854.02557,730.00377 854.02557,730.55377 C 854.02557,731.10377 852.67557,731.55377 851.02557,731.55377 C 849.37557,731.55377 848.02557,731.10377 848.02557,730.55377 z M 946.26074,730.88924 C 945.01508,730.62609 944.25414,729.99295 944.56976,729.48228 C 945.34438,728.22891 958.74636,728.29297 959.52557,729.55377 C 959.86889,730.10927 959.11724,730.55866 957.83459,730.56478 C 956.56463,730.57083 953.95057,730.75396 952.02557,730.97174 C 950.10057,731.18952 947.5064,731.1524 946.26074,730.88924 z M 888.02557,718.67213 L 884.52557,718.05377 L 884.52557,712.55377 L 884.52557,707.05377 L 888.34536,706.73924 C 890.48127,706.56337 892.86731,707.0042 893.75798,707.73924 C 895.01438,708.77612 895.43968,708.78975 895.77153,707.80377 C 896.24984,706.38263 900.84081,706.15051 902.88258,707.44424 C 903.73153,707.98215 903.98816,709.09628 903.56804,710.41998 C 903.19868,711.58372 903.26302,713.1024 903.71102,713.79482 C 904.2306,714.59786 904.70664,713.60524 905.02557,711.05377 C 905.52557,707.05377 905.52557,707.05377 910.02557,707.05377 C 914.50373,707.05377 914.52708,707.07197 914.83594,710.80377 C 915.14191,714.50068 916.26602,715.59176 917.57942,713.46664 C 917.94896,712.86871 917.75051,711.87871 917.13844,711.26664 C 915.29382,709.42202 915.87683,707.62921 918.53856,706.96115 C 921.84548,706.13117 923.99038,708.02311 924.16748,711.92621 C 924.29453,714.72642 924.37303,714.6351 924.91748,711.05377 C 925.52314,707.06978 925.54359,707.05377 930.02557,707.05377 L 934.52557,707.05377 L 934.83307,711.30377 C 935.19701,716.33392 937.02557,717.06154 937.02557,712.17621 C 937.02557,708.11303 938.92351,706.29676 942.7151,706.73151 C 945.416,707.04121 945.52557,707.26819 945.52557,712.55377 L 945.52557,718.05377 L 936.03841,718.22939 C 930.82048,718.32598 926.01824,717.96265 925.36677,717.42198 C 924.57816,716.76749 923.51245,716.85727 922.17802,717.69063 C 920.63333,718.65531 919.59171,718.67712 917.63537,717.78575 C 916.10355,717.08781 914.86737,717.00073 914.51792,717.56615 C 914.19943,718.08147 909.68315,718.40201 904.48175,718.27844 C 899.28034,718.15487 895.02486,718.39127 895.02511,718.80377 C 895.02562,719.63318 893.27935,719.60033 888.02557,718.67213 z M 896.02557,712.55377 C 896.02557,710.90377 895.57557,709.55377 895.02557,709.55377 C 894.47557,709.55377 894.02557,710.90377 894.02557,712.55377 C 894.02557,714.20377 894.47557,715.55377 895.02557,715.55377 C 895.57557,715.55377 896.02557,714.20377 896.02557,712.55377 z M 862.39094,717.33593 C 862.08403,716.83935 862.31336,715.22272 862.90056,713.74341 C 863.48776,712.26411 863.8686,710.15377 863.74688,709.05377 C 863.55837,707.35022 864.11847,707.05377 867.52557,707.05377 L 871.52557,707.05377 L 871.52557,712.55377 L 871.52557,718.05377 L 867.23726,718.14629 C 864.87869,718.19717 862.69784,717.83251 862.39094,717.33593 z M 873.45333,717.22612 C 873.14867,716.43217 873.04028,713.8186 873.21248,711.41817 L 873.52557,707.05377 L 878.02557,707.05377 L 882.52557,707.05377 L 882.52557,712.55377 L 882.52557,718.05377 L 878.26642,718.36172 C 875.26066,718.57904 873.84426,718.24485 873.45333,717.22612 z M 899.22022,694.41863 C 896.32701,693.09227 895.02557,691.87323 895.02557,690.48953 C 895.02557,689.38616 894.30012,687.37622 893.41345,686.023 C 890.20038,681.11922 893.92244,673.55377 899.54808,673.55377 C 900.6907,673.55377 902.11252,673.06682 902.70767,672.47167 C 903.44501,671.73433 904.3849,671.70775 905.65767,672.38825 C 906.68502,672.93753 908.99379,673.93144 910.78829,674.59694 C 914.39204,675.93342 915.67294,678.8825 914.57802,683.32225 C 914.20751,684.82458 913.65787,687.2756 913.35658,688.76895 C 912.85653,691.2475 909.49545,694.04727 904.97022,695.75474 C 904.11478,696.07752 901.52728,695.47627 899.22022,694.41863 z M 901.52121,668.54671 C 900.76649,667.32555 903.50997,666.11708 904.97768,667.02417 C 905.55402,667.38037 906.02557,668.09525 906.02557,668.61279 C 906.02557,669.87393 902.30777,669.81939 901.52121,668.54671 z " />
-      <path
-         id="path4201"
-         style="fill:#d9b6a7"
-         d="M 891.52557,921.4949 C 886.02557,921.04221 870.99197,920.71013 858.11756,920.75695 C 831.67968,920.8531 832.03147,920.95614 832.01925,913.11264 C 832.01382,909.63005 831.57637,908.8053 828.93821,907.30377 C 824.94173,905.02914 823.56294,905.0966 819.98508,907.74183 C 817.76813,909.38089 817.02557,910.74036 817.02557,913.16004 C 817.02557,918.11524 816.15361,919.69266 814.03984,918.5614 C 812.03696,917.4895 811.9235,911.42113 813.89405,910.76428 C 814.71611,910.49026 815.02557,896.60829 815.02557,860.00562 C 815.02557,810.64759 815.0662,809.60239 817.02557,808.55377 C 819.46021,807.25079 819.55601,805.79739 817.36672,803.37825 C 814.71223,800.44506 814.96742,790.47628 817.79489,786.65191 L 820.04294,783.61126 L 817.53426,781.9675 L 815.02557,780.32375 L 815.02557,741.5747 L 815.02557,702.82565 L 818.77557,702.93971 C 821.89692,703.03465 822.52557,702.71849 822.52557,701.05377 C 822.52557,699.62284 821.88537,699.07636 820.27557,699.13317 C 818.08156,699.2106 817.15881,697.20749 818.89436,696.13486 C 820.11355,695.38136 819.54126,687.66946 818.16395,686.29215 C 817.53784,685.66604 817.02557,684.52103 817.02557,683.74769 C 817.02557,682.97435 815.91507,681.46809 814.5578,680.40046 C 810.9166,677.53629 811.29108,671.98495 815.26409,669.93043 C 819.50975,667.73491 827.68823,667.37852 831.94338,669.2036 C 835.89051,670.89657 848.9025,671.99151 860.02557,671.56667 C 861.12557,671.52465 863.48807,671.50928 865.27557,671.5325 C 867.06307,671.55572 870.4944,671.56166 872.90074,671.54569 C 875.30709,671.52972 877.91366,672.04593 878.69313,672.69283 C 879.76657,673.58371 880.39113,673.58821 881.26795,672.71139 C 881.90464,672.0747 883.44932,671.55377 884.70057,671.55377 C 886.7273,671.55377 886.90815,671.90844 886.35775,674.80377 C 886.01795,676.59127 885.20866,679.17877 884.55934,680.55377 C 883.32971,683.15759 883.57284,686.3732 885.12264,688.00377 C 885.61925,688.52627 886.02557,690.18345 886.02557,691.68638 C 886.02557,693.61135 886.69058,694.66058 888.27557,695.23638 C 890.99186,696.22316 864.90633,697.19631 847.8501,696.74449 L 836.17464,696.4352 L 834.3501,691.99824 C 833.34661,689.5579 831.96307,687.55958 831.27557,687.55752 C 829.69545,687.55278 829.58274,694.71093 831.13844,696.26664 C 832.48213,697.61033 831.45122,699.64567 829.74355,699.0206 C 827.80957,698.3127 825.89665,700.05424 826.59869,701.88372 C 827.29444,703.69681 831.52364,704.17493 832.52557,702.55377 C 834.6718,699.0811 835.02557,704.53269 835.02557,741.07852 L 835.02557,780.60327 L 832.52557,781.55377 C 829.58188,782.67296 829.36897,784.17076 831.77557,786.83002 C 834.31797,789.63934 834.25156,801.54159 831.67761,804.38577 C 829.76235,806.5021 830.15614,808.55377 832.4776,808.55377 C 833.2113,808.55377 834.08474,809.26557 834.41858,810.13556 C 834.75243,811.00554 835.02557,831.8824 835.02557,856.52857 C 835.02557,898.27899 835.1451,901.38646 836.77557,902.02299 C 837.73807,902.39875 848.2955,902.57932 860.23653,902.42427 C 872.17756,902.26922 882.22652,902.42139 882.56755,902.76242 C 882.90858,903.10345 882.64057,904.40464 881.97196,905.65394 C 880.90785,907.64225 881.07068,908.19582 883.27817,910.09463 C 884.6652,911.2877 886.28131,913.16311 886.86953,914.26221 C 887.68031,915.77717 889.70327,916.53918 895.2323,917.41231 C 904.27783,918.84076 903.25714,918.84627 911.07524,917.32676 C 916.46363,916.27947 918.29854,915.37724 921.42421,912.23813 C 924.69288,908.9554 925.14005,907.97773 924.6259,905.23813 L 924.02827,902.05377 L 944.56915,902.40714 C 955.86663,902.60149 966.6955,902.46307 968.6333,902.09954 L 972.15658,901.43857 L 972.01793,872.24617 C 971.75895,817.71954 971.92227,809.5218 973.27557,809.11832 C 973.96307,808.91334 975.42557,808.4095 976.52557,807.99866 C 982.65488,805.70944 984.65095,805.80051 989.35988,808.58417 L 993.19418,810.85081 L 992.89797,862.7623 C 992.64343,907.36923 992.80677,914.80051 994.05879,915.5743 C 995.28438,916.33176 995.19991,916.7058 993.52703,917.92904 C 990.97987,919.79157 990.06154,918.48228 990.04088,912.95876 C 990.02328,908.2501 988.03583,905.90582 983.25002,904.94866 C 980.61231,904.42112 979.59813,904.82736 976.95542,907.47007 C 974.51084,909.91465 973.92102,911.22654 974.32244,913.32642 C 974.84482,916.05909 973.62034,919.473 971.66147,920.74529 C 971.07588,921.12563 957.08075,921.40995 940.56117,921.37711 C 924.04159,921.34428 908.50057,921.54254 906.02557,921.8177 C 903.55057,922.09286 897.02557,921.9476 891.52557,921.4949 z M 984.52557,897.55377 C 984.18565,897.00377 983.28565,896.55377 982.52557,896.55377 C 981.76549,896.55377 980.86549,897.00377 980.52557,897.55377 C 980.17366,898.12317 981.03486,898.55377 982.52557,898.55377 C 984.01628,898.55377 984.87748,898.12317 984.52557,897.55377 z M 823.02557,804.55377 C 823.02557,804.00377 822.57557,803.55377 822.02557,803.55377 C 821.47557,803.55377 821.02557,804.00377 821.02557,804.55377 C 821.02557,805.10377 821.47557,805.55377 822.02557,805.55377 C 822.57557,805.55377 823.02557,805.10377 823.02557,804.55377 z M 828.02557,804.55377 C 828.02557,804.00377 827.57557,803.55377 827.02557,803.55377 C 826.47557,803.55377 826.02557,804.00377 826.02557,804.55377 C 826.02557,805.10377 826.47557,805.55377 827.02557,805.55377 C 827.57557,805.55377 828.02557,805.10377 828.02557,804.55377 z M 823.02557,786.05377 C 823.02557,785.22877 822.57557,784.55377 822.02557,784.55377 C 821.47557,784.55377 821.02557,785.22877 821.02557,786.05377 C 821.02557,786.87877 821.47557,787.55377 822.02557,787.55377 C 822.57557,787.55377 823.02557,786.87877 823.02557,786.05377 z M 828.02557,785.55377 C 828.02557,785.00377 827.57557,784.55377 827.02557,784.55377 C 826.47557,784.55377 826.02557,785.00377 826.02557,785.55377 C 826.02557,786.10377 826.47557,786.55377 827.02557,786.55377 C 827.57557,786.55377 828.02557,786.10377 828.02557,785.55377 z M 871.75474,693.9496 C 871.42245,693.61731 870.55994,693.58178 869.83807,693.87066 C 869.04034,694.18988 869.27729,694.42684 870.44224,694.47482 C 871.4964,694.51824 872.08703,694.28189 871.75474,693.9496 z M 881.02557,693.55377 C 881.02557,693.00377 880.37713,692.55377 879.58459,692.55377 C 878.79205,692.55377 877.86549,693.00377 877.52557,693.55377 C 877.18565,694.10377 877.83409,694.55377 878.96655,694.55377 C 880.09901,694.55377 881.02557,694.10377 881.02557,693.55377 z M 827.80306,682.99707 C 831.71149,680.2595 829.61487,674.55377 824.70051,674.55377 C 820.42048,674.55377 818.1819,681.38055 821.77557,683.47367 C 824.19062,684.88031 825.23191,684.79797 827.80306,682.99707 z M 821.48237,909.48386 C 821.16621,908.97231 822.58409,908.55377 824.63322,908.55377 C 826.68235,908.55377 828.05962,908.85305 827.69384,909.21884 C 826.61265,910.30002 822.10563,910.49232 821.48237,909.48386 z M 843.49858,813.59744 C 843.82365,813.07146 844.75021,812.89461 845.55759,813.20443 C 847.62471,813.99766 847.38112,814.55377 844.96655,814.55377 C 843.83409,814.55377 843.1735,814.12342 843.49858,813.59744 z M 861.77557,813.89149 C 862.46307,813.61408 863.58807,813.61408 864.27557,813.89149 C 864.96307,814.1689 864.40057,814.39588 863.02557,814.39588 C 861.65057,814.39588 861.08807,814.1689 861.77557,813.89149 z M 986.67374,804.07929 C 985.97085,802.2476 977.02557,801.87388 977.02557,803.67621 C 977.02557,804.43646 976.52626,804.38427 975.47824,803.51449 C 974.24106,802.48772 974.19094,802.06229 975.22824,801.39204 C 976.27594,800.71507 976.25298,800.37828 975.1089,799.64175 C 973.04579,798.31356 973.30257,792.53788 975.47888,791.31996 C 976.91881,790.51413 977.00129,790.1568 975.90391,789.47858 C 974.79578,788.79372 974.78119,788.39815 975.82557,787.35377 C 976.73615,786.44319 977.31458,786.39044 977.81721,787.17215 C 978.77298,788.65859 985.94389,788.30397 986.92165,786.72191 C 987.53567,785.72841 987.96022,785.7701 988.9124,786.91741 C 989.85257,788.05024 989.85485,788.54124 988.92264,789.11739 C 988.03211,789.66776 988.12307,790.15189 989.27531,790.99443 C 991.79303,792.83544 991.98946,799.55377 989.52557,799.55377 C 987.78022,799.55377 987.58025,800.70845 989.06795,802.19615 C 989.79113,802.91933 989.67378,803.60084 988.68473,804.42168 C 987.56397,805.35183 987.13396,805.27862 986.67374,804.07929 z M 981.00542,784.48326 C 980.1915,784.06358 977.78613,782.962 975.66015,782.0353 L 971.79473,780.3504 L 972.07499,742.70208 C 972.22913,721.99551 972.5339,704.27413 972.75225,703.32124 C 973.11267,701.74836 973.36095,701.72741 975.44651,703.09392 C 977.93212,704.72256 980.54863,704.23903 981.41101,701.99171 C 982.01394,700.42051 978.54281,698.11607 977.0049,699.06654 C 976.46627,699.39944 976.02557,698.97025 976.02557,698.11279 C 976.02557,697.25533 976.43807,696.55377 976.94224,696.55377 C 977.4464,696.55377 977.8589,694.54647 977.8589,692.09312 C 977.8589,686.36521 978.4301,685.55377 982.46214,685.55377 C 984.28734,685.55377 986.33677,684.88373 987.01643,684.06478 C 987.6961,683.24584 988.6512,682.82239 989.13888,683.1238 C 990.4803,683.95284 990.20053,686.55377 988.76993,686.55377 C 987.10109,686.55377 987.2849,694.95638 988.99892,697.02165 C 989.69826,697.86432 990.10286,698.59127 989.89801,698.6371 C 989.69317,698.68294 988.51329,698.83272 987.27606,698.96995 C 984.38513,699.29061 983.63236,700.08669 984.37935,702.03332 C 985.23609,704.26595 987.97847,705.06428 990.14447,703.71159 C 991.16415,703.07479 992.22954,702.55377 992.512,702.55377 C 992.79446,702.55377 993.02557,720.11789 993.02557,741.58515 C 993.02557,777.85481 992.90175,780.66045 991.27557,781.23715 C 990.31307,781.57849 988.85057,782.40091 988.02557,783.06474 C 985.93455,784.74727 982.76106,785.38853 981.00542,784.48326 z M 946.52557,729.55377 C 946.86549,729.00377 948.44049,728.55377 950.02557,728.55377 C 951.61065,728.55377 953.18565,729.00377 953.52557,729.55377 C 953.89938,730.1586 952.51628,730.55377 950.02557,730.55377 C 947.53486,730.55377 946.15176,730.1586 946.52557,729.55377 z M 888.52557,718.68599 C 885.63568,718.05805 885.52557,717.83262 885.52557,712.54395 L 885.52557,707.05377 L 888.90273,706.73093 C 890.76016,706.55336 892.63895,706.77836 893.07781,707.23093 C 893.51667,707.68349 894.00136,710.52657 894.1549,713.54889 C 894.45938,719.54218 894.076,719.89204 888.52557,718.68599 z M 865.19519,717.81593 C 862.52687,717.49475 862.00703,717.08097 862.58021,715.73442 C 862.97367,714.81006 863.57997,712.47877 863.92755,710.55377 C 864.48304,707.4772 864.92039,707.05377 867.54253,707.05377 C 870.48611,707.05377 870.52557,707.12543 870.52557,712.47044 C 870.52557,718.24497 870.33632,718.43476 865.19519,717.81593 z M 874.21452,717.69171 C 873.34672,717.14137 873.00863,715.20256 873.21452,711.95702 C 873.5157,707.20944 873.63082,707.04367 876.84089,706.73554 C 878.66432,706.56051 880.71941,706.88472 881.40776,707.45599 C 882.69194,708.52177 882.8208,715.45805 881.59331,717.44416 C 880.79254,718.73983 876.11471,718.89676 874.21452,717.69171 z M 896.69224,717.8871 C 895.60729,716.80216 895.93301,707.72901 897.0824,707.01864 C 897.66367,706.65941 899.17943,706.62655 900.45078,706.94564 C 902.35294,707.42305 902.8574,708.36943 903.29923,712.2893 C 903.64387,715.347 903.42244,717.31607 902.68086,717.78798 C 901.23019,718.71111 897.57672,718.77159 896.69224,717.8871 z M 906.27557,717.89149 C 904.92935,717.34828 904.46487,707.63901 905.77557,707.43975 C 910.26475,706.75727 912.60932,706.79335 913.53201,707.55912 C 914.76642,708.58358 914.86731,715.38279 913.67669,717.30925 C 912.91695,718.53854 908.70107,718.8702 906.27557,717.89149 z M 917.09256,717.13449 C 916.16592,716.01795 916.2707,715.51597 917.58378,714.78113 C 918.97053,714.00507 919.05147,713.47068 918.06223,711.62227 C 916.02252,707.81103 918.35158,705.20545 921.82737,707.41011 C 922.54336,707.86426 923.31464,710.10021 923.54133,712.3789 C 923.87046,715.6872 923.57104,716.72666 922.05528,717.53787 C 919.507,718.90167 918.49063,718.81906 917.09256,717.13449 z M 926.30879,717.35433 C 925.19157,715.96468 925.28039,709.56851 926.44304,707.68731 C 927.25586,706.37213 931.92076,706.20084 933.83662,707.41583 C 934.70442,707.96617 935.04251,709.90498 934.83662,713.15052 C 934.5298,717.9871 934.47682,718.05786 930.93998,718.35433 C 928.86348,718.5284 926.91432,718.10752 926.30879,717.35433 z M 937.53079,717.21928 C 937.32884,716.57825 937.24505,714.26429 937.34459,712.07716 C 937.49658,708.73764 937.95657,707.94908 940.21582,707.15513 C 944.33267,705.70837 945.74086,707.47732 945.0763,713.26084 C 944.54713,717.86617 944.39587,718.06025 941.21176,718.21928 C 939.38917,718.31031 937.73273,717.86032 937.53079,717.21928 z M 924.52557,696.60678 C 918.73795,696.2067 917.1478,695.82772 918.77557,695.23638 C 920.01307,694.78682 921.03212,693.66182 921.04012,692.73638 C 921.04813,691.81095 921.73951,689.08729 922.57653,686.68381 C 923.88348,682.93095 923.90208,682.01305 922.70824,680.18381 C 921.24276,677.93836 919.96555,671.61286 920.94876,671.4699 C 925.76053,670.77024 933.97541,671.17246 935.68301,672.19132 C 937.46387,673.25389 937.93207,673.23982 938.36534,672.11072 C 939.06695,670.28236 953.29376,670.70153 955.60371,672.61862 C 956.97415,673.75598 957.36363,673.70107 958.17204,672.25653 C 959.38067,670.09682 963.64001,670.04239 964.83148,672.17144 C 965.64522,673.6255 965.97892,673.63689 968.13117,672.28398 C 974.04814,668.56457 986.80887,667.83899 992.70274,670.88683 C 994.87564,672.01048 995.58339,673.08367 995.55857,675.21723 C 995.54042,676.77733 995.15642,678.05377 994.70523,678.05377 C 994.25404,678.05377 993.44418,678.84127 992.90554,679.80377 C 992.3669,680.76627 991.27355,681.55377 990.47588,681.55377 C 989.67821,681.55377 989.01126,680.76627 988.99377,679.80377 C 988.94991,677.39053 986.94957,674.98181 984.28771,674.13697 C 982.5054,673.57129 981.16596,674.3081 977.6179,677.80597 C 974.60024,680.78094 973.44178,682.60917 974.00099,683.514 C 974.50018,684.3217 975.54236,684.56944 976.65112,684.14397 C 978.17808,683.55802 978.11247,683.83237 976.25204,685.8127 C 975.02748,687.11618 974.02557,688.72227 974.02557,689.38179 C 974.02557,690.0413 973.60842,691.3623 973.09857,692.31734 C 972.58872,693.27238 971.93135,694.83213 971.63774,695.78347 C 971.15335,697.35302 969.31804,697.49681 951.81475,697.33648 C 941.2057,697.23931 928.92557,696.91094 924.52557,696.60678 z M 898.24455,693.36076 C 895.71688,691.79892 895.21509,691.03034 896.05912,690.01334 C 896.89008,689.0121 896.65603,688.42637 895.09014,687.58832 C 893.43185,686.70084 893.02557,685.51144 893.02557,681.54427 C 893.02557,677.03477 893.29462,676.466 896.1185,675.00571 C 897.81961,674.12604 899.46571,673.66057 899.77649,673.97136 C 900.08727,674.28214 900.9608,674.02249 901.71765,673.39436 C 902.71427,672.56724 903.70481,672.54817 905.30966,673.32524 C 906.52841,673.91535 908.77837,674.6706 910.30958,675.00356 C 914.18669,675.84664 915.82745,679.67665 914.10975,683.87426 C 913.39416,685.62299 912.84903,688.02523 912.89837,689.21258 C 912.96274,690.7618 911.8552,691.96187 908.97603,693.46258 C 904.10923,695.99929 902.48989,695.98393 898.24455,693.36076 z " />
-      <path
-         id="path4199"
-         style="fill:#d2a89a"
-         d="M 901.02557,921.55858 C 900.20057,921.02278 896.40457,920.5775 892.59002,920.56908 C 886.85168,920.55641 885.25369,920.17726 883.33273,918.37261 C 881.11952,916.29341 880.94947,916.27558 879.69486,917.99136 C 878.56335,919.53879 878.08481,919.60771 876.28335,918.48269 C 874.67574,917.47871 873.86025,917.44608 872.78013,918.34251 C 871.70524,919.23458 870.62179,919.22763 868.19893,918.3131 C 865.76472,917.39429 864.30463,917.38742 861.93042,918.28358 C 859.55222,919.18125 858.38697,919.17413 856.89991,918.25282 C 855.63541,917.46941 854.71514,917.40041 854.24506,918.05377 C 853.8479,918.60577 849.04693,919.05377 843.52863,919.05377 L 833.5317,919.05377 L 833.52863,913.88433 C 833.52458,907.03982 830.53861,903.55377 824.68,903.55377 C 822.35874,903.55377 819.91379,904.24994 818.84818,905.21431 C 817.839,906.1276 816.69535,906.55688 816.30673,906.16826 C 815.35191,905.21344 815.03993,812.14857 815.98642,810.61712 C 817.33154,808.44067 825.10004,807.3147 829.7632,808.6203 L 834.00576,809.80815 L 834.26567,855.92171 L 834.52557,902.03528 L 839.77557,902.8708 C 842.66307,903.33034 845.02557,904.12199 845.02557,904.63004 C 845.02557,905.13809 845.70057,905.55377 846.52557,905.55377 C 847.35057,905.55377 848.02557,905.10377 848.02557,904.55377 C 848.02557,903.98234 851.02557,903.55377 855.02557,903.55377 C 858.87557,903.55377 862.02557,903.95129 862.02557,904.43714 C 862.02557,905.99321 866.46433,906.60393 867.52557,905.19387 C 868.07557,904.46309 871.24148,903.5587 874.56093,903.1841 L 880.59629,902.50302 L 880.82049,905.7784 C 880.9636,907.86917 881.9454,909.79069 883.53513,911.09133 C 884.90487,912.212 886.02557,913.64794 886.02557,914.28232 C 886.02557,916.28931 887.77917,916.9297 896.02557,917.93418 C 897.40057,918.10167 899.57833,918.5777 900.86504,918.99202 C 902.25812,919.4406 906.30343,919.01748 910.86504,917.94608 C 917.09809,916.4821 919.15937,915.48596 921.92685,912.6003 C 923.79756,910.64971 925.61984,907.70377 925.97637,906.05377 C 926.61999,903.0751 926.6669,903.05635 932.57509,903.41638 C 935.84785,903.61582 938.75057,904.11767 939.02557,904.5316 C 939.30057,904.94554 940.54029,905.60089 941.7805,905.98794 C 943.37461,906.48544 944.21186,906.23188 944.63748,905.12272 C 945.09833,903.92178 946.75291,903.55377 951.69158,903.55377 C 955.51107,903.55377 957.90409,903.94131 957.55658,904.5036 C 956.77181,905.77338 960.49364,907.69512 962.35459,906.98101 C 963.16523,906.66994 964.04782,905.57669 964.31589,904.55159 C 964.66448,903.21857 965.90295,902.59747 968.66443,902.37076 L 972.52557,902.05377 L 972.5248,876.05377 C 972.52438,861.75377 972.45951,848.47877 972.38064,846.55377 C 972.30177,844.62877 972.43561,835.51627 972.67805,826.30377 L 973.11886,809.55377 L 981.32222,809.56908 C 985.83406,809.5775 990.08457,809.9394 990.76778,810.37329 C 991.73434,810.98712 991.95625,821.61693 991.76778,858.27508 C 991.63457,884.18718 991.19083,905.72252 990.7817,906.13141 C 990.37257,906.5403 989.24757,906.18804 988.2817,905.34861 C 986.10485,903.45674 982.10975,902.45749 979.47619,903.14618 C 976.28599,903.98044 972.52877,910.34864 972.50244,914.96617 C 972.48251,918.46042 972.106,919.15316 969.78272,919.97022 C 967.69676,920.70381 966.66517,920.53758 965.22711,919.23616 C 963.03891,917.25587 960.13129,917.09285 956.50101,918.74691 C 954.36512,919.72009 953.71681,919.674 952.98447,918.49691 C 952.23675,917.29511 951.73749,917.27018 949.99904,918.34787 C 948.33685,919.37828 947.23082,919.39584 944.57108,918.43407 C 941.92293,917.47648 940.58755,917.49256 938.12723,918.51166 C 935.64922,919.53809 934.72164,919.54642 933.52467,918.55302 C 932.37874,917.60199 931.69472,917.58346 930.62122,918.47438 C 929.81832,919.14073 928.09967,919.35949 926.60824,918.98516 C 925.05912,918.59636 923.3881,918.83793 922.49405,919.57993 C 921.61102,920.31278 917.79161,920.88106 913.25703,920.95429 C 909.00473,921.02297 904.85057,921.40622 904.02557,921.80596 C 903.20057,922.2057 901.85057,922.09438 901.02557,921.55858 z M 963.70267,912.95285 C 964.45117,911.0023 962.48423,909.62107 959.91487,910.29297 C 958.03782,910.78383 957.41623,912.61109 958.69224,913.8871 C 959.94639,915.14126 963.08766,914.55553 963.70267,912.95285 z M 848.19984,911.32803 C 847.64984,910.77803 846.66258,910.66008 846.00594,911.0659 C 845.09886,911.62651 845.12652,911.99813 846.12106,912.61279 C 847.827,913.66711 849.50305,912.63125 848.19984,911.32803 z M 868.02557,912.05377 C 868.02557,911.05377 867.02557,910.55377 865.02557,910.55377 C 863.02557,910.55377 862.02557,911.05377 862.02557,912.05377 C 862.02557,913.05377 863.02557,913.55377 865.02557,913.55377 C 867.02557,913.55377 868.02557,913.05377 868.02557,912.05377 z M 944.78178,911.80377 C 945.04938,910.98884 944.13961,910.55377 942.16792,910.55377 C 939.11657,910.55377 937.50129,911.69615 938.76533,912.9602 C 939.84978,914.04465 944.32865,913.18376 944.78178,911.80377 z M 952.52557,905.55377 C 952.18565,905.00377 951.48409,904.55377 950.96655,904.55377 C 950.44901,904.55377 950.02557,905.00377 950.02557,905.55377 C 950.02557,906.10377 950.72713,906.55377 951.58459,906.55377 C 952.44205,906.55377 952.86549,906.10377 952.52557,905.55377 z M 985.67557,897.55377 C 985.17093,895.03056 985.38946,894.55377 987.05057,894.55377 C 988.1979,894.55377 989.02557,893.88032 989.02557,892.94678 C 989.02557,891.86639 988.48665,891.5466 987.38095,891.97089 C 986.44422,892.33035 984.90244,891.84733 983.79896,890.84869 C 981.95194,889.17716 981.81532,889.17808 980.86936,890.86841 C 980.21756,892.03311 979.2164,892.43172 977.95135,892.03021 C 976.49735,891.56873 976.02557,891.89925 976.02557,893.37939 C 976.02557,894.45761 976.72909,895.60976 977.58895,895.93972 C 978.44881,896.26968 978.87225,896.99282 978.52994,897.54671 C 977.41139,899.35655 979.07546,900.55377 982.70959,900.55377 C 986.13846,900.55377 986.2525,900.43842 985.67557,897.55377 z M 828.02557,898.61279 C 828.02557,898.09525 827.57557,897.39369 827.02557,897.05377 C 826.47557,896.71385 826.02557,895.75697 826.02557,894.92737 C 826.02557,893.84444 826.62501,893.60925 828.1508,894.09352 C 829.58094,894.54742 830.05224,894.40593 829.59178,893.6609 C 829.21545,893.05198 828.30724,892.55377 827.57354,892.55377 C 826.83984,892.55377 825.96958,891.85025 825.63962,890.99039 C 824.79714,888.79493 823.02557,890.19331 823.02557,893.05377 C 823.02557,894.36385 822.57557,895.71385 822.02557,896.05377 C 819.64775,897.52335 821.09805,899.55377 824.52557,899.55377 C 826.45057,899.55377 828.02557,899.13033 828.02557,898.61279 z M 821.02557,893.55377 C 821.02557,893.00377 820.57557,892.55377 820.02557,892.55377 C 819.47557,892.55377 819.02557,893.00377 819.02557,893.55377 C 819.02557,894.10377 819.47557,894.55377 820.02557,894.55377 C 820.57557,894.55377 821.02557,894.10377 821.02557,893.55377 z M 983.55102,880.87099 C 982.85431,879.16035 982.76588,879.17107 982.04337,881.05377 C 981.11127,883.48257 981.86575,885.11359 983.27122,883.70812 C 983.83217,883.14717 983.95808,881.87046 983.55102,880.87099 z M 989.71856,880.8228 C 989.46502,879.84983 989.2409,880.40377 989.22052,882.05377 C 989.20014,883.70377 989.40758,884.49983 989.68151,883.8228 C 989.95543,883.14577 989.9721,881.79577 989.71856,880.8228 z M 982.70868,863.36627 C 982.38946,862.56854 982.1525,862.80549 982.10452,863.97044 C 982.0611,865.0246 982.29744,865.61523 982.62974,865.28294 C 982.96203,864.95064 982.99755,864.08815 982.70868,863.36627 z M 982.68785,824.30377 C 982.41044,823.61627 982.18346,824.17877 982.18346,825.55377 C 982.18346,826.92877 982.41044,827.49127 982.68785,826.80377 C 982.96526,826.11627 982.96526,824.99127 982.68785,824.30377 z M 812.62334,917.8182 C 811.41957,916.61444 812.07638,915.55377 814.02557,915.55377 C 815.12557,915.55377 816.02557,915.95563 816.02557,916.44678 C 816.02557,917.57082 813.42445,918.61932 812.62334,917.8182 z M 826.13074,799.80377 C 825.2591,798.26953 824.86133,798.22253 822.90447,799.42252 C 820.94478,800.62425 820.51091,800.57042 819.34899,798.98139 C 817.66093,796.67284 817.70789,793.55672 819.46568,791.23803 C 820.64243,789.6858 821.14212,789.60961 822.90892,790.71299 C 824.53977,791.73148 825.234,791.74534 826.20061,790.77873 C 828.0201,788.95924 828.65656,789.24868 830.00744,792.51 C 830.99184,794.88656 830.96776,796.06308 829.88465,798.51 C 828.34158,801.99604 827.53428,802.27427 826.13074,799.80377 z M 978.02557,796.22275 C 978.02557,795.49069 979.13523,794.29786 980.49148,793.57201 C 982.44261,792.5278 983.26524,792.50779 984.43204,793.47615 C 985.2431,794.14926 985.66029,795.3421 985.35914,796.12688 C 984.64381,797.99101 978.02557,798.07753 978.02557,796.22275 z M 822.02557,781.64017 C 815.01337,780.64555 814.84725,780.39363 815.46259,771.68743 C 815.76125,767.46188 816.06239,752.19742 816.1318,737.76639 C 816.20121,723.33536 816.65571,711.28236 817.14179,710.98194 C 817.62787,710.68153 818.02557,709.11229 818.02557,707.49475 C 818.02557,705.05944 818.43702,704.55377 820.41858,704.55377 C 821.73474,704.55377 823.09412,703.81752 823.43943,702.91765 C 824.01291,701.4232 824.23629,701.43449 826.01928,703.04808 C 827.39818,704.29596 828.86007,704.63687 830.99843,704.2092 L 834.02557,703.60377 L 834.02557,741.97036 L 834.02557,780.33695 L 831.61847,780.9411 C 830.29457,781.27338 828.60707,781.71022 827.86847,781.91185 C 827.12987,782.11349 824.50057,781.99123 822.02557,781.64017 z M 824.70868,726.36627 C 824.38946,725.56854 824.1525,725.80549 824.10452,726.97044 C 824.0611,728.0246 824.29745,728.61523 824.62974,728.28294 C 824.96203,727.95065 824.99756,727.08814 824.70868,726.36627 z M 826.02557,708.61279 C 826.02557,707.54525 825.57557,706.39369 825.02557,706.05377 C 824.45841,705.70325 824.02557,706.54339 824.02557,707.99475 C 824.02557,709.40221 824.47557,710.55377 825.02557,710.55377 C 825.57557,710.55377 826.02557,709.68033 826.02557,708.61279 z M 974.77557,780.86686 C 973.16465,780.44366 973.02557,778.3069 973.02557,753.98045 C 973.02557,737.02933 973.38413,727.55377 974.02557,727.55377 C 974.57557,727.55377 975.02557,728.22877 975.02557,729.05377 C 975.02557,729.87877 975.47557,730.55377 976.02557,730.55377 C 976.57557,730.55377 977.02557,729.18404 977.02557,727.50993 C 977.02557,725.16577 976.62331,724.53364 975.27557,724.75993 C 973.83834,725.00125 973.46975,724.17198 973.21328,720.12004 C 972.80121,713.61018 973.62074,710.46119 975.53576,711.19606 C 976.65851,711.62689 977.02557,711.00224 977.02557,708.66076 C 977.02557,706.6347 977.52257,705.55377 978.45414,705.55377 C 979.23986,705.55377 980.56116,704.87532 981.39038,704.0461 C 982.2196,703.21688 983.14916,702.94473 983.45607,703.44131 C 983.76298,703.9379 983.34167,704.60223 982.51983,704.9176 C 981.63813,705.25594 981.02557,706.76376 981.02557,708.59571 C 981.02557,711.01234 981.41341,711.62687 982.77557,711.36854 C 983.83105,711.16838 984.65115,709.94867 984.84199,708.29522 C 985.06525,706.36092 985.72771,705.55377 987.09199,705.55377 C 988.64605,705.55377 989.02557,706.26174 989.02557,709.16076 C 989.02557,711.95613 989.36309,712.63823 990.52557,712.19214 C 992.75041,711.33839 992.67028,722.36186 990.43978,723.99284 C 989.41496,724.74221 988.99478,726.1962 989.25197,728.10308 L 989.64994,731.05377 L 990.77437,728.55377 C 991.72239,726.44598 991.90874,727.34808 991.96218,734.30377 C 992.01231,740.82746 991.7258,742.55377 990.59296,742.55377 C 988.89298,742.55377 987.73041,745.62103 988.58565,747.84975 C 988.91864,748.7175 989.82885,749.18275 990.60833,748.88364 C 991.57129,748.51412 992.05713,749.0953 992.12402,750.69678 C 992.36321,756.42348 991.80716,780.09532 991.42434,780.48298 C 990.8195,781.09546 976.8701,781.4171 974.77557,780.86686 z M 975.68785,764.30377 C 975.41044,763.61627 975.18346,764.17877 975.18346,765.55377 C 975.18346,766.92877 975.41044,767.49127 975.68785,766.80377 C 975.96526,766.11627 975.96526,764.99127 975.68785,764.30377 z M 984.02557,764.49475 C 984.02557,762.40846 982.55442,761.88905 981.49597,763.60166 C 980.58888,765.06937 981.79735,767.81285 983.01851,767.05814 C 983.57239,766.71582 984.02557,765.56229 984.02557,764.49475 z M 991.02557,765.05377 C 991.02557,763.67877 990.57557,762.55377 990.02557,762.55377 C 989.47557,762.55377 989.02557,763.67877 989.02557,765.05377 C 989.02557,766.42877 989.47557,767.55377 990.02557,767.55377 C 990.57557,767.55377 991.02557,766.42877 991.02557,765.05377 z M 977.02557,745.99475 C 977.02557,744.65221 976.57557,743.55377 976.02557,743.55377 C 975.47557,743.55377 975.02557,744.93033 975.02557,746.61279 C 975.02557,748.39749 975.44215,749.41435 976.02557,749.05377 C 976.57557,748.71385 977.02557,747.33729 977.02557,745.99475 z M 984.02557,746.05377 C 984.02557,744.49821 983.4589,743.55377 982.52557,743.55377 C 981.59224,743.55377 981.02557,744.49821 981.02557,746.05377 C 981.02557,747.60933 981.59224,748.55377 982.52557,748.55377 C 983.4589,748.55377 984.02557,747.60933 984.02557,746.05377 z M 989.70868,736.36627 C 989.38946,735.56854 989.1525,735.80549 989.10452,736.97044 C 989.0611,738.0246 989.29744,738.61523 989.62974,738.28294 C 989.96203,737.95065 989.99755,737.08814 989.70868,736.36627 z M 984.02557,727.55377 C 984.02557,725.55377 983.52557,724.55377 982.52557,724.55377 C 981.52557,724.55377 981.02557,725.55377 981.02557,727.55377 C 981.02557,729.55377 981.52557,730.55377 982.52557,730.55377 C 983.52557,730.55377 984.02557,729.55377 984.02557,727.55377 z M 976.70868,717.36627 C 976.38946,716.56854 976.1525,716.80549 976.10452,717.97044 C 976.0611,719.0246 976.29744,719.61523 976.62974,719.28294 C 976.96203,718.95065 976.99755,718.08814 976.70868,717.36627 z M 891.02557,718.55377 C 890.20057,718.02061 888.51307,717.5775 887.27557,717.56908 C 885.24085,717.55524 885.02557,717.06988 885.02557,712.49627 L 885.02557,707.43877 L 889.27557,707.74627 L 893.52557,708.05377 L 893.82547,713.80377 C 894.1291,719.62517 893.73032,720.30171 891.02557,718.55377 z M 863.02557,715.90029 C 863.02557,715.22462 863.50192,714.37741 864.08412,714.01759 C 864.67554,713.65206 864.87341,712.13748 864.53251,710.58536 C 863.85632,707.50667 865.81318,706.0342 869.16645,707.09848 C 870.644,707.56744 871.02557,708.69006 871.02557,712.56817 L 871.02557,717.4478 L 867.02557,717.28829 C 864.61615,717.19221 863.02557,716.64028 863.02557,715.90029 z M 874.02557,712.55377 L 874.02557,707.55377 L 878.02557,707.55377 L 882.02557,707.55377 L 882.02557,712.55377 L 882.02557,717.55377 L 878.02557,717.55377 L 874.02557,717.55377 L 874.02557,712.55377 z M 896.59369,716.36764 C 896.36372,715.64501 896.25431,713.47877 896.35056,711.55377 C 896.50974,708.37044 896.797,708.05377 899.52557,708.05377 C 902.17042,708.05377 902.53719,708.40892 902.62373,711.05377 C 902.67772,712.70377 902.90272,714.72877 903.12373,715.55377 C 903.64963,717.51685 897.21465,718.31887 896.59369,716.36764 z M 905.92942,717.12429 C 905.69321,716.88807 905.66352,714.63807 905.86345,712.12429 L 906.22696,707.55377 L 910.12626,707.55377 L 914.02557,707.55377 L 914.02557,712.55377 L 914.02557,717.55377 L 910.19224,717.55377 C 908.0839,717.55377 906.16564,717.3605 905.92942,717.12429 z M 917.02557,716.1371 C 917.02557,715.35794 917.58807,714.51673 918.27557,714.26776 C 919.27557,713.90561 919.27557,713.39166 918.27557,711.69799 C 916.36266,708.45816 916.76375,707.39067 919.76373,707.73735 C 922.06701,708.00351 922.59694,708.64354 923.10036,711.76714 C 923.43521,713.84485 923.24221,715.93713 922.6622,716.51714 C 921.11767,718.06167 917.02557,717.78576 917.02557,716.1371 z M 926.02557,712.55377 L 926.02557,707.55377 L 930.02557,707.55377 L 934.02557,707.55377 L 934.02557,712.55377 L 934.02557,717.55377 L 930.02557,717.55377 L 926.02557,717.55377 L 926.02557,712.55377 z M 937.54515,712.9393 C 937.9763,707.64829 937.88281,707.81776 940.52557,707.5364 C 944.696,707.09238 945.02557,707.45984 945.02557,712.55377 L 945.02557,717.55377 L 941.09735,717.55377 L 937.16914,717.55377 L 937.54515,712.9393 z M 973.02557,705.05377 C 973.02557,704.22877 973.47557,703.55377 974.02557,703.55377 C 974.57557,703.55377 975.02557,704.22877 975.02557,705.05377 C 975.02557,705.87877 974.57557,706.55377 974.02557,706.55377 C 973.47557,706.55377 973.02557,705.87877 973.02557,705.05377 z M 822.48856,698.6014 C 820.79421,697.91468 820.51838,697.07496 820.84885,693.60961 C 821.22222,689.69453 821.35289,689.54002 823.01701,691.04602 C 824.61522,692.49239 824.93872,692.49776 826.33529,691.1012 C 828.58537,688.85111 829.33169,689.19794 828.59092,692.14942 C 828.22243,693.61761 828.43973,695.34788 829.0912,696.13285 C 830.00926,697.23905 829.70044,697.72689 827.56916,698.5372 C 826.09858,699.09631 824.81217,699.52525 824.71047,699.49038 C 824.60878,699.45552 823.60891,699.05548 822.48856,698.6014 z M 980.77557,698.86444 C 978.90086,698.37453 978.67384,697.63393 979.63256,695.13556 C 980.48784,692.90673 984.74342,693.15805 986.0031,695.51178 C 986.84486,697.08463 986.66801,697.67476 985.10402,698.51178 C 984.03319,699.08488 983.01497,699.50157 982.84131,699.43777 C 982.66765,699.37397 981.73807,699.11597 980.77557,698.86444 z M 961.02557,695.55377 C 961.02557,695.00377 961.47557,694.55377 962.02557,694.55377 C 962.57557,694.55377 963.02557,695.00377 963.02557,695.55377 C 963.02557,696.10377 962.57557,696.55377 962.02557,696.55377 C 961.47557,696.55377 961.02557,696.10377 961.02557,695.55377 z M 899.29828,693.73348 C 896.08534,692.06124 894.89478,689.58243 897.27557,689.52209 C 897.96307,689.50467 897.28807,688.56713 895.77557,687.43868 C 890.51399,683.51311 892.86334,674.55377 899.15431,674.55377 C 900.5135,674.55377 902.16557,674.01377 902.82557,673.35377 C 903.7589,672.42044 904.29224,672.42044 905.22557,673.35377 C 905.88557,674.01377 907.34807,674.56808 908.47557,674.58557 C 913.3377,674.661 915.989,680.14286 913.49156,684.95668 C 912.68527,686.51082 912.02557,688.64208 912.02557,689.69283 C 912.02557,690.78991 911.00256,691.99222 909.62271,692.51684 C 908.30114,693.0193 906.92458,693.90816 906.56369,694.49209 C 905.64846,695.97297 903.08727,695.70555 899.29828,693.73348 z M 940.38703,692.61107 L 939.79849,689.66837 L 936.16203,691.97825 L 932.52557,694.28813 L 928.27557,691.37291 C 924.37964,688.70055 922.40328,684.55377 925.02557,684.55377 C 926.54431,684.55377 926.22011,681.96011 924.52557,680.55377 C 922.02159,678.47565 922.80196,677.02943 927.82337,674.44207 L 932.62117,671.96993 L 937.54835,674.86482 C 941.37898,677.11545 942.81493,677.51287 944.00055,676.65057 C 944.83931,676.04055 946.91795,674.8193 948.61975,673.9367 C 951.5908,672.39581 951.87852,672.43585 955.84988,674.94286 C 960.5714,677.92343 961.75652,678.07184 964.4667,676.02197 C 967.01522,674.09436 969.40862,674.11317 968.66349,676.05494 C 968.34666,676.88059 969.19852,679.19339 970.5565,681.19449 C 973.54488,685.5981 973.62299,686.58478 971.03682,687.26108 C 969.943,687.54712 969.31352,688.21067 969.63797,688.73563 C 969.96241,689.2606 970.85735,689.44856 971.62672,689.15333 C 973.13366,688.57506 973.38238,689.46037 972.41858,691.97198 C 971.57777,694.16309 970.245,693.95852 966.43668,691.05377 C 962.20858,687.82884 960.63315,687.9045 956.02557,691.55377 C 951.53473,695.11058 951.5469,695.10901 948.29844,692.55377 C 944.85218,689.84294 943.02557,690.01615 943.02557,693.05377 C 943.02557,696.51883 941.1041,696.19644 940.38703,692.61107 z M 962.44378,684.94678 C 965.23031,683.87749 964.25904,681.55377 961.02557,681.55377 C 957.97586,681.55377 956.7584,683.87579 959.27557,684.89149 C 959.96307,685.1689 960.60127,685.4314 960.69378,685.47482 C 960.7863,685.51824 961.5738,685.28062 962.44378,684.94678 z M 944.05666,683.05377 C 944.01016,681.55798 939.76116,681.84699 939.24992,683.38071 C 938.94093,684.3077 939.60335,684.60911 941.44768,684.38071 C 942.89972,684.20089 944.07376,683.60377 944.05666,683.05377 z M 835.30111,692.37329 C 833.70982,690.43761 833.46011,685.37968 834.83189,682.86951 C 836.79863,679.27066 836.2899,676.60477 833.4288,675.51698 C 832.00058,674.97397 830.5981,673.63511 830.31217,672.54173 C 830.02625,671.44835 829.16979,670.55377 828.40894,670.55377 C 827.64809,670.55377 827.02557,670.14286 827.02557,669.64063 C 827.02557,668.6951 831.16819,669.77096 836.52557,672.10785 C 842.18624,674.57703 843.99638,674.79342 844.65405,673.07955 C 845.22002,671.60465 845.4224,671.60292 847.03153,673.05916 C 848.81752,674.67547 853.44605,674.30048 854.59177,672.44666 C 854.89279,671.9596 856.54823,672.28981 858.27053,673.18044 C 860.75878,674.46717 861.79023,674.55732 863.29214,673.61937 C 864.74983,672.70902 865.51498,672.71505 866.63636,673.64572 C 867.77411,674.58997 868.9355,674.57358 871.9752,673.57039 C 875.50629,672.40503 876.18616,672.4899 879.44277,674.5026 C 882.44289,676.35677 883.02557,676.45967 883.02557,675.13533 C 883.02557,674.26547 883.47557,673.55377 884.02557,673.55377 C 885.93194,673.55377 885.03124,678.43639 882.842,679.9698 C 880.85047,681.36472 880.78044,681.72723 882.04582,684.0916 C 883.71966,687.21921 882.73786,689.21985 878.23438,691.85822 C 875.23969,693.61267 875.03652,693.60574 870.90213,691.60822 C 865.82506,689.15524 866.02557,689.17804 866.02557,691.05377 C 866.02557,692.75892 864.87861,693.00655 863.47557,691.60432 C 862.8759,691.00499 861.30393,691.24664 859.21283,692.25961 C 856.16152,693.73771 855.6263,693.7338 852.43105,692.21009 C 849.3845,690.75729 848.89196,690.73837 848.3868,692.0548 C 847.72328,693.78391 844.02557,694.10808 844.02557,692.43714 C 844.02557,691.82299 843.23807,691.56857 842.27557,691.87176 C 841.31307,692.17495 839.59414,692.70872 838.45571,693.05792 C 837.24499,693.42929 835.93561,693.14512 835.30111,692.37329 z M 867.7964,682.74127 C 868.25747,681.35806 864.41808,681.10965 863.57836,682.46836 C 862.981,683.4349 864.87731,684.54557 866.46307,684.15794 C 866.9787,684.03189 867.5787,683.3944 867.7964,682.74127 z M 812.52557,678.55377 C 812.18565,678.00377 812.38409,677.55377 812.96655,677.55377 C 813.54901,677.55377 814.02557,678.00377 814.02557,678.55377 C 814.02557,679.10377 813.82713,679.55377 813.58459,679.55377 C 813.34205,679.55377 812.86549,679.10377 812.52557,678.55377 z M 812.4791,673.86923 C 812.51846,671.59539 813.02279,671.12792 815.77557,670.81368 C 818.42942,670.51073 819.02557,670.79028 819.02557,672.33771 C 819.02557,673.39799 817.90361,674.74394 816.47852,675.39325 C 812.85342,677.04496 812.42695,676.88245 812.4791,673.86923 z M 941.02557,674.05377 C 941.02557,673.22877 941.47557,672.55377 942.02557,672.55377 C 942.57557,672.55377 943.02557,673.22877 943.02557,674.05377 C 943.02557,674.87877 942.57557,675.55377 942.02557,675.55377 C 941.47557,675.55377 941.02557,674.87877 941.02557,674.05377 z M 971.52557,672.55377 C 971.86549,672.00377 972.34205,671.55377 972.58459,671.55377 C 972.82713,671.55377 973.02557,672.00377 973.02557,672.55377 C 973.02557,673.10377 972.54901,673.55377 971.96655,673.55377 C 971.38409,673.55377 971.18565,673.10377 971.52557,672.55377 z M 821.02557,669.55377 C 821.02557,669.00377 821.47557,668.55377 822.02557,668.55377 C 822.57557,668.55377 823.02557,669.00377 823.02557,669.55377 C 823.02557,670.10377 822.57557,670.55377 822.02557,670.55377 C 821.47557,670.55377 821.02557,670.10377 821.02557,669.55377 z " />
-      <path
-         id="path4197"
-         style="fill:#cda394"
-         d="M 885.65451,919.03985 C 884.75859,918.14394 884.02557,917.06529 884.02557,916.64286 C 884.02557,914.82206 879.41445,913.77528 877.02557,915.05377 C 872.38042,917.53978 867.60267,912.80948 871.49556,909.57868 C 874.44114,907.13406 878.97724,907.73976 882.6043,911.06202 C 884.486,912.78559 886.02557,914.71775 886.02557,915.35572 C 886.02557,915.99369 887.26307,916.78134 888.77557,917.10605 C 890.28807,917.43077 892.42557,918.08389 893.52557,918.55743 C 895.31699,919.32862 895.2473,919.42547 892.85736,919.48609 C 891.38984,919.52331 889.53536,919.80465 888.7363,920.11128 C 887.93723,920.41791 886.55043,919.93577 885.65451,919.03985 z M 897.02557,919.55377 C 897.02557,919.00377 897.67401,918.55377 898.46655,918.55377 C 899.25909,918.55377 900.18565,919.00377 900.52557,919.55377 C 900.86549,920.10377 900.21705,920.55377 899.08459,920.55377 C 897.95213,920.55377 897.02557,920.10377 897.02557,919.55377 z M 907.02557,919.55377 C 907.02557,919.00377 907.50213,918.55377 908.08459,918.55377 C 908.66705,918.55377 908.86549,919.00377 908.52557,919.55377 C 908.18565,920.10377 907.70909,920.55377 907.46655,920.55377 C 907.22401,920.55377 907.02557,920.10377 907.02557,919.55377 z M 911.39191,919.33309 C 911.14543,918.93671 912.19968,918.34307 913.73467,918.01388 C 918.40749,917.01177 921.02557,915.66496 921.02557,914.26327 C 921.02557,912.39487 925.91525,909.00811 929.68835,908.26313 C 931.96091,907.81443 933.22752,908.09469 934.18835,909.25884 C 935.30638,910.61344 935.30213,910.95416 934.16242,911.33744 C 933.01155,911.72448 933.01155,911.92712 934.16242,912.63866 C 935.29602,913.33952 935.26769,913.7394 933.9942,915.01326 C 932.70267,916.30518 931.94531,916.34999 929.15852,915.29943 C 926.03496,914.12191 925.71275,914.21787 923.2679,917.05377 C 921.12048,919.54467 919.93137,920.05377 916.26081,920.05377 C 913.82939,920.05377 911.63838,919.72946 911.39191,919.33309 z M 834.98582,918.41076 C 834.96396,918.21441 834.79937,915.66345 834.62006,912.74194 C 834.36757,908.62809 833.79757,907.08237 832.09263,905.88819 C 830.85115,905.01862 830.13147,903.72019 830.44218,902.91048 C 830.74521,902.1208 830.45497,900.61296 829.79721,899.55972 C 828.42176,897.35726 829.24156,896.03894 831.45776,896.88937 C 832.2929,897.20985 833.49073,899.51544 834.1196,902.01291 C 835.19482,906.28299 838.02557,908.48677 838.02557,905.05377 C 838.02557,903.17159 840.62822,903.07592 841.34044,904.93191 C 841.6313,905.68989 841.41524,906.7641 840.86029,907.31905 C 840.18164,907.9977 840.20723,908.54801 840.93844,908.99992 C 842.31117,909.84832 842.36232,914.22761 841.00926,915.06385 C 840.45029,915.40931 840.20549,916.03587 840.46527,916.4562 C 840.72505,916.87653 840.39489,917.24184 839.73158,917.26799 C 839.06827,917.29415 837.73807,917.6423 836.77557,918.04165 C 835.81307,918.441 835.00768,918.6071 834.98582,918.41076 z M 852.77557,915.47367 C 849.21591,913.40036 851.246,907.55377 855.52557,907.55377 C 860.08975,907.55377 861.56171,912.36441 857.80306,914.99707 C 855.21844,916.80741 855.08687,916.81988 852.77557,915.47367 z M 969.11849,915.6112 C 968.35299,915.13809 968.10093,914.24085 968.53584,913.53716 C 969.10947,912.609 969.54219,912.72554 970.25562,914.00036 C 971.41247,916.06753 970.93994,916.73691 969.11849,915.6112 z M 947.62839,913.66739 C 946.006,911.87466 946.05112,911.67883 948.53723,909.72326 C 949.97602,908.5915 951.7647,907.90017 952.51207,908.18697 C 954.15381,908.81696 955.35859,911.55377 953.99419,911.55377 C 953.46145,911.55377 953.02557,912.45377 953.02557,913.55377 C 953.02557,916.13498 949.92068,916.20034 947.62839,913.66739 z M 966.02557,912.70876 C 966.02557,911.5077 969.4585,908.55377 970.85431,908.55377 C 972.81707,908.55377 972.15892,910.70614 970.02557,911.26402 C 968.92557,911.55168 968.02557,912.18455 968.02557,912.6704 C 968.02557,913.15625 967.57557,913.55377 967.02557,913.55377 C 966.47557,913.55377 966.02557,913.17351 966.02557,912.70876 z M 972.31428,904.86374 C 971.9522,903.92018 972.1869,902.99999 972.84566,902.78041 C 973.49461,902.56409 974.02557,901.8047 974.02557,901.09288 C 974.02557,900.38106 974.70057,899.23846 975.52557,898.55377 C 976.47146,897.76875 977.02557,897.70172 977.02557,898.37231 C 977.02557,898.95719 976.54489,899.73281 975.9574,900.0959 C 975.3699,900.459 975.13078,901.38555 975.42601,902.15492 C 976.08443,903.87074 975.14585,906.55377 973.8872,906.55377 C 973.37878,906.55377 972.67096,905.79326 972.31428,904.86374 z M 816.02557,901.60572 C 816.02557,898.81957 816.52382,897.2998 817.5687,896.89885 C 819.83061,896.03087 820.14794,896.81438 819.26181,901.07933 C 818.13927,906.48218 816.02557,906.82598 816.02557,901.60572 z M 988.94906,904.80377 C 988.79362,903.28008 988.22028,900.7426 987.56481,898.67742 C 986.82331,896.34114 987.95186,895.88006 989.82557,897.75377 C 991.27356,899.20176 991.43643,905.55377 990.02557,905.55377 C 989.47557,905.55377 988.99114,905.21627 988.94906,904.80377 z M 832.18347,891.55377 C 832.18347,890.17877 832.41044,889.61627 832.68785,890.30377 C 832.96526,890.99127 832.96526,892.11627 832.68785,892.80377 C 832.41044,893.49127 832.18347,892.92877 832.18347,891.55377 z M 820.11655,890.1634 C 819.43609,889.34349 818.23724,888.91905 817.45246,889.2202 C 816.60743,889.54447 816.02557,889.15608 816.02557,888.26775 C 816.02557,887.44275 816.70057,886.50873 817.52557,886.19214 C 818.40711,885.85386 819.02557,884.35374 819.02557,882.55377 C 819.02557,880.7538 818.40711,879.25368 817.52557,878.9154 C 816.42705,878.49385 816.02557,876.76252 816.02557,872.44678 C 816.02557,869.20563 816.42679,866.55377 816.91716,866.55377 C 818.6953,866.55377 819.25052,861.19143 817.59753,859.98273 C 815.81334,858.67809 815.30141,847.55377 817.02557,847.55377 C 817.57557,847.55377 818.02557,846.23033 818.02557,844.61279 C 818.02557,842.99525 817.57557,841.39369 817.02557,841.05377 C 816.47557,840.71385 816.02557,837.76229 816.02557,834.49475 C 816.02557,831.20076 816.47112,828.55377 817.02557,828.55377 C 817.57557,828.55377 818.02557,826.97877 818.02557,825.05377 C 818.02557,823.12877 817.57557,821.55377 817.02557,821.55377 C 816.47557,821.55377 816.02557,819.12691 816.02557,816.16076 C 816.02557,809.91263 816.49526,809.55377 824.6731,809.55377 C 832.43892,809.55377 834.02557,810.64859 834.02557,816.00717 C 834.02557,821.06392 833.2058,823.78319 831.92079,822.98901 C 831.42842,822.68471 831.02557,823.53915 831.02557,824.88776 C 831.02557,826.23638 831.66021,827.58333 832.43589,827.88098 C 833.50416,828.29092 833.7695,830.07521 833.52994,835.23797 C 833.11879,844.09859 833.1823,843.76867 832.02557,843.05377 C 830.53787,842.13432 830.81511,845.48616 832.35405,847.02511 C 834.13828,848.80933 833.54567,857.83036 831.43237,861.05567 C 829.77283,863.58844 830.19431,867.18555 832.01851,866.05814 C 833.16334,865.35059 833.27194,866.09684 833.02958,873.00557 C 832.93404,875.72906 832.26449,878.42906 831.5417,879.00557 C 828.94056,881.08026 828.80184,884.27838 831.23516,886.07248 C 832.78856,887.2178 833.1176,887.91744 832.25771,888.24677 C 831.56039,888.51383 830.30315,889.41904 829.46385,890.25835 C 828.09584,891.62636 827.75538,891.61923 826.17555,890.1895 C 824.59384,888.75807 824.25651,888.7514 822.88351,890.1244 C 821.52958,891.47833 821.21157,891.48282 820.11655,890.1634 z M 826.63256,883.97198 C 826.29872,883.102 826.02557,881.527 826.02557,880.47198 C 826.02557,879.22044 825.33048,878.55377 824.02557,878.55377 C 822.49616,878.55377 822.02557,879.22044 822.02557,881.3871 C 822.02557,884.7272 822.67499,885.55377 825.29922,885.55377 C 826.6577,885.55377 827.05753,885.07944 826.63256,883.97198 z M 825.84199,863.02268 C 825.66796,861.63058 825.07557,860.49159 824.52557,860.49159 C 823.97557,860.49159 823.38318,861.63058 823.20915,863.02268 C 822.98363,864.82658 823.36184,865.55377 824.52557,865.55377 C 825.6893,865.55377 826.06751,864.82658 825.84199,863.02268 z M 825.84512,844.3821 C 825.37404,841.1806 823.02557,840.83772 823.02557,843.97044 C 823.02557,845.65094 823.5741,846.55377 824.59512,846.55377 C 825.63746,846.55377 826.05733,845.82431 825.84512,844.3821 z M 825.84512,825.3821 C 825.37404,822.1806 823.02557,821.83772 823.02557,824.97044 C 823.02557,826.65094 823.5741,827.55377 824.59512,827.55377 C 825.63746,827.55377 826.05733,826.82431 825.84512,825.3821 z M 973.02557,889.05377 C 973.02557,887.67877 973.47557,886.55377 974.02557,886.55377 C 974.57557,886.55377 975.02557,887.67877 975.02557,889.05377 C 975.02557,890.42877 974.57557,891.55377 974.02557,891.55377 C 973.47557,891.55377 973.02557,890.42877 973.02557,889.05377 z M 979.38058,889.071 C 979.73533,888.14656 980.02557,887.202 980.02557,886.97198 C 980.02557,885.74294 984.90438,886.79557 985.41858,888.13556 C 986.36617,890.60494 986.15124,890.90296 984.44437,889.48638 C 983.15086,888.41286 982.48768,888.4086 980.79938,889.46295 C 978.99224,890.59153 978.81581,890.54279 979.38058,889.071 z M 979.02642,881.05377 C 978.89928,880.50377 978.861,879.35105 978.94136,878.49217 C 979.02171,877.63329 978.43216,875.38329 977.63126,873.49217 C 976.44192,870.68389 976.04923,870.37681 975.48844,871.8165 C 975.1092,872.79012 975.3827,874.27916 976.09939,875.14272 C 977.1677,876.42996 977.15174,876.85776 976.00901,877.564 C 973.70215,878.98972 973.02557,877.70248 973.02557,871.88776 C 973.02557,867.66009 973.34462,866.46222 974.36625,866.85426 C 975.10363,867.13722 976.32925,866.98412 977.08986,866.51404 C 977.91782,866.00233 978.74127,866.09377 979.14184,866.7419 C 979.52712,867.3653 980.91679,867.5469 982.41824,867.17007 C 984.60333,866.62164 985.02557,865.95195 985.02557,863.03472 C 985.02557,859.87949 984.76055,859.55377 982.19335,859.55377 C 979.85273,859.55377 979.18292,858.97309 978.3344,856.20837 C 976.95592,851.71687 979.01783,847.55377 982.62087,847.55377 C 984.87444,847.55377 985.11789,847.19705 984.83893,844.30377 C 984.59992,841.82489 984.05103,841.05377 982.52557,841.05377 C 981.42557,841.05377 980.46498,841.72877 980.39092,842.55377 C 980.31686,843.37877 980.20436,844.84127 980.14092,845.80377 C 979.95128,848.68085 978.02159,847.78386 977.36776,844.51471 C 976.67066,841.02924 974.69226,841.06733 974.1806,844.57607 C 973.97877,845.96014 974.53023,847.44961 975.50965,848.16578 C 976.85196,849.14731 976.96288,849.80239 976.06943,851.47181 C 975.26521,852.97451 975.25653,854.1168 976.03821,855.57738 C 976.88037,857.15099 976.76642,857.95578 975.52577,859.19643 C 974.64828,860.07392 973.70029,860.56182 973.41913,860.28066 C 972.73659,859.59813 972.75906,828.48695 973.44258,827.80343 C 973.73664,827.50936 974.63171,827.81193 975.43162,828.4758 C 976.23152,829.13966 978.6049,829.54128 980.70578,829.3683 C 984.0365,829.09404 984.56608,828.70167 984.84199,826.30377 C 985.01602,824.79127 985.77363,823.55377 986.52557,823.55377 C 987.27751,823.55377 988.03512,824.79127 988.20915,826.30377 C 988.42491,828.17896 989.03892,828.97025 990.1393,828.79123 C 991.35362,828.59366 991.6375,829.13299 991.28628,830.97031 C 991.0036,832.44903 990.30849,833.21583 989.5237,832.91468 C 987.62529,832.18619 986.65132,834.39791 988.10121,836.14491 C 989.10179,837.35053 989.51209,837.39139 990.17199,836.3511 C 990.72838,835.474 990.9999,835.43217 991.01026,836.22198 C 991.01868,836.8645 991.28497,838.06619 991.60202,838.89241 C 991.99707,839.92189 991.44636,840.49834 989.85202,840.7242 C 988.11742,840.96993 987.60134,841.60363 987.82342,843.21518 C 987.98724,844.40396 987.64974,845.66801 987.07342,846.0242 C 985.19551,847.18481 985.96676,848.41416 988.77557,848.73735 C 991.3498,849.03355 991.54516,849.39711 991.83205,854.42556 L 992.13854,859.79735 L 989.03911,859.34245 C 986.50347,858.9703 986.06183,859.17552 986.61122,860.47066 C 986.98057,861.34137 987.50942,863.10324 987.78645,864.38592 C 988.06347,865.6686 988.9056,866.95424 989.65785,867.2429 C 991.75826,868.04891 991.27991,870.55377 989.02557,870.55377 C 987.53513,870.55377 987.02557,871.22044 987.02557,873.1704 C 987.02557,875.2947 987.40188,875.68863 989.02557,875.26402 C 990.30994,874.92815 991.02557,875.23334 991.02557,876.11694 C 991.02557,877.02709 989.92538,877.45246 987.77557,877.3735 C 983.28269,877.20847 980.23721,878.33208 979.70585,880.35076 C 979.4593,881.28741 979.15355,881.60377 979.02642,881.05377 z M 990.02557,854.05377 C 990.02557,853.22877 989.57557,852.55377 989.02557,852.55377 C 988.47557,852.55377 988.02557,853.22877 988.02557,854.05377 C 988.02557,854.87877 988.47557,855.55377 989.02557,855.55377 C 989.57557,855.55377 990.02557,854.87877 990.02557,854.05377 z M 977.25274,834.96182 C 976.92055,833.22404 976.50241,832.78222 975.98394,833.62114 C 975.1364,834.99247 975.79418,837.55377 976.99389,837.55377 C 977.40877,837.55377 977.52526,836.38739 977.25274,834.96182 z M 978.02557,824.99475 C 978.02557,824.13729 978.48291,823.71839 979.04188,824.06385 C 979.60085,824.40931 979.7993,825.11087 979.48286,825.62287 C 978.62563,827.00991 978.02557,826.75128 978.02557,824.99475 z M 973.02557,817.05377 C 973.02557,811.22044 973.2307,810.55377 975.02557,810.55377 C 977.14409,810.55377 977.57918,812.13091 976.10365,814.46168 C 975.56734,815.30884 975.62626,816.77804 976.25159,818.15048 C 977.05393,819.91143 976.93495,820.78725 975.72963,821.99257 C 974.87097,822.85123 973.91128,823.55377 973.597,823.55377 C 973.28271,823.55377 973.02557,820.62877 973.02557,817.05377 z M 989.70003,821.89489 C 989.33764,821.53251 986.80944,821.31501 984.0818,821.41155 C 979.18455,821.58488 979.11443,821.54435 978.48247,818.17572 C 978.11046,816.19274 978.34081,813.83326 979.03261,812.54062 C 980.07422,810.59435 980.74073,810.40072 984.37414,810.98886 C 986.65743,811.35845 989.08807,811.71175 989.77557,811.77398 C 990.46307,811.8362 991.01868,812.8246 991.01026,813.97044 C 990.99794,815.64557 990.81255,815.76536 990.06405,814.5818 C 989.26288,813.31494 989.04364,813.34311 988.49075,814.78391 C 987.61237,817.07294 988.97258,819.24548 990.13526,817.41053 C 990.71785,816.49107 990.99988,817.10129 991.01026,819.30377 C 991.02602,822.6489 990.83392,823.02879 989.70003,821.89489 z M 823.71307,796.90794 C 822.33923,795.53409 823.05183,793.41218 824.77557,793.74414 C 825.73807,793.9295 826.52557,794.7125 826.52557,795.48413 C 826.52557,797.06299 824.76128,797.95614 823.71307,796.90794 z M 982.02557,795.55377 C 982.02557,795.00377 982.50213,794.55377 983.08459,794.55377 C 983.66705,794.55377 983.86549,795.00377 983.52557,795.55377 C 983.18565,796.10377 982.70909,796.55377 982.46655,796.55377 C 982.22401,796.55377 982.02557,796.10377 982.02557,795.55377 z M 817.27557,779.91124 C 815.75113,779.27203 815.53543,768.55377 817.04701,768.55377 C 817.6088,768.55377 818.5802,767.4306 819.20567,766.05783 C 820.14944,763.98648 820.02577,763.21147 818.47862,761.50189 C 816.94289,759.80493 816.82681,759.10168 817.81996,757.5114 C 819.38522,755.00502 819.3403,754.55377 817.52557,754.55377 C 815.61943,754.55377 815.54341,750.67602 817.43532,749.95003 C 819.80902,749.03915 820.34492,744.56413 818.34495,742.35419 C 816.66496,740.49782 816.66229,740.33658 818.29638,739.42209 C 820.41849,738.2345 820.59177,734.55377 818.52557,734.55377 C 816.81003,734.55377 816.49372,732.0005 818.08725,731.01565 C 818.67118,730.65476 819.65151,729.1657 820.26578,727.70663 L 821.38262,725.05377 L 821.80212,727.52109 C 822.03285,728.87812 821.72752,730.15312 821.1236,730.35443 C 818.64133,731.18185 820.26981,732.12365 823.52557,731.74356 C 826.7702,731.36477 827.02557,731.08326 827.02557,727.88535 C 827.02557,725.84025 827.43272,724.68737 828.02557,725.05377 C 828.57557,725.39369 829.02557,726.77025 829.02557,728.11279 C 829.02557,730.29143 829.97111,731.03605 832.27557,730.67219 C 832.68807,730.60706 833.02557,733.21164 833.02557,736.46015 C 833.02557,741.91278 832.86885,742.32555 830.98559,741.83307 C 829.13211,741.34837 829.0864,741.14403 830.48559,739.59794 C 832.33344,737.55609 832.53534,734.21752 830.77557,734.80294 C 830.08807,735.03164 829.30057,736.53164 829.02557,738.13627 C 828.64118,740.37921 827.77413,741.27499 825.27557,742.01057 C 822.46051,742.83932 822.02557,743.40809 822.02557,746.26057 C 822.02557,749.10665 822.365,749.55377 824.52557,749.55377 C 826.62553,749.55377 827.02557,749.08317 827.02557,746.61279 C 827.02557,744.99525 827.42842,743.42283 827.92079,743.11853 C 829.24525,742.29997 830.11706,745.34106 829.38925,748.2409 C 828.81286,750.53741 828.94124,750.66927 830.79018,749.67975 C 833.25448,748.36089 834.02557,749.77105 834.02557,755.5966 C 834.02557,758.20366 833.36168,760.09437 832.00121,761.36184 C 830.42125,762.83379 830.17199,763.77535 830.86576,765.6508 C 831.35466,766.97243 832.15313,767.94127 832.64012,767.80377 C 833.12712,767.66627 833.52557,770.36627 833.52557,773.80377 L 833.52557,780.05377 L 826.02557,780.24458 C 821.90057,780.34952 817.96307,780.19952 817.27557,779.91124 z M 826.03922,767.30377 C 826.04674,766.61627 826.33456,765.00174 826.67883,763.71592 C 827.22123,761.69012 826.98583,761.42317 824.91517,761.71592 C 823.17527,761.96191 822.60646,762.59754 822.82308,764.05377 C 823.30973,767.32529 823.90243,768.55377 824.99419,768.55377 C 825.56145,768.55377 826.03171,767.99127 826.03922,767.30377 z M 832.02557,755.61279 C 832.02557,755.09525 831.57557,754.39369 831.02557,754.05377 C 830.47557,753.71385 830.02557,754.13729 830.02557,754.99475 C 830.02557,755.85221 830.47557,756.55377 831.02557,756.55377 C 831.57557,756.55377 832.02557,756.13033 832.02557,755.61279 z M 973.66505,779.85992 C 972.69168,778.88655 972.90211,769.74811 973.91226,769.1238 C 974.39994,768.82239 975.3218,769.20577 975.96082,769.97575 C 976.75617,770.93409 976.79192,771.58014 976.07413,772.02376 C 974.5385,772.97283 974.79524,776.11772 976.52557,777.55377 C 977.79564,778.60783 978.02557,778.38659 978.02557,776.11047 C 978.02557,768.68099 983.70226,767.03954 987.00525,773.51393 C 988.11642,775.69202 989.02557,777.89202 989.02557,778.40282 C 989.02557,778.91362 986.1385,779.33155 982.60986,779.33155 C 979.08122,779.33155 975.76899,779.59431 975.24934,779.91547 C 974.72969,780.23663 974.01676,780.21163 973.66505,779.85992 z M 974.18346,758.55377 C 974.18346,757.17877 974.41044,756.61627 974.68785,757.30377 C 974.96526,757.99127 974.96526,759.11627 974.68785,759.80377 C 974.41044,760.49127 974.18346,759.92877 974.18346,758.55377 z M 979.17379,757.97973 C 978.16645,755.76887 978.23207,754.88756 979.55424,752.86967 C 982.66738,748.11842 988.39339,751.74665 986.46876,757.251 C 985.07919,761.22512 980.84519,761.64807 979.17379,757.97973 z M 990.69224,755.8871 C 989.65487,754.84973 989.9084,751.55377 991.02557,751.55377 C 991.57557,751.55377 992.02557,752.67877 992.02557,754.05377 C 992.02557,756.67183 991.79458,756.98944 990.69224,755.8871 z M 974.10452,752.97044 C 974.1525,751.80549 974.38946,751.56854 974.70868,752.36627 C 974.99755,753.08814 974.96203,753.95065 974.62974,754.28294 C 974.29744,754.61523 974.0611,754.0246 974.10452,752.97044 z M 974.10452,739.97044 C 974.1525,738.80549 974.38946,738.56854 974.70868,739.36627 C 974.99755,740.08814 974.96203,740.95065 974.62974,741.28294 C 974.29744,741.61523 974.0611,741.0246 974.10452,739.97044 z M 979.51953,739.5471 C 977.73887,737.57948 977.72322,737.28862 979.26169,734.75308 C 981.35993,731.295 984.03247,731.31172 985.98723,734.79514 C 988.82655,739.8549 983.40377,743.83914 979.51953,739.5471 z M 817.69224,722.8871 C 816.5416,721.73647 816.964,720.55377 818.52557,720.55377 C 819.35057,720.55377 820.02557,721.22877 820.02557,722.05377 C 820.02557,723.61534 818.84287,724.03774 817.69224,722.8871 z M 822.30723,722.88618 C 821.63714,722.6233 820.79956,720.86596 820.44594,718.98099 C 820.0803,717.03197 819.20402,715.55377 818.41428,715.55377 C 816.75111,715.55377 816.57807,713.94837 818.13737,712.98467 C 818.74887,712.60675 819.64197,712.91769 820.12206,713.67566 C 820.75416,714.67361 820.99917,714.70895 821.01026,713.80377 C 821.01941,713.05701 822.36661,712.55377 824.35659,712.55377 C 826.86159,712.55377 828.01044,713.15699 828.98947,714.98631 C 829.70549,716.32421 830.02945,718.10129 829.70937,718.93538 C 829.31181,719.97142 829.58654,720.27573 830.5765,719.89585 C 832.22655,719.26267 832.53063,715.98395 831.02557,715.05377 C 829.53189,714.13063 829.81886,712.8871 831.52557,712.8871 C 832.57195,712.8871 833.07093,714.04636 833.17557,716.72044 C 833.25807,718.82877 833.37057,721.1137 833.42557,721.79806 C 833.5261,723.04894 824.87917,723.89519 822.30723,722.88618 z M 980.22557,721.35377 C 977.41075,718.53895 979.88072,712.98564 983.62035,713.72119 C 986.42033,714.27192 987.58081,717.03973 986.24291,719.97611 C 984.99752,722.70945 982.21769,723.34589 980.22557,721.35377 z M 888.27557,717.83037 C 885.09658,717.43587 885.02557,717.31793 885.02557,712.43291 L 885.02557,707.43877 L 889.11045,707.74627 L 893.19534,708.05377 L 893.47288,713.30377 C 893.6538,716.72587 893.36312,718.49805 892.638,718.39373 C 892.02616,718.30571 890.06307,718.0522 888.27557,717.83037 z M 863.02557,716.17621 C 863.02557,715.41856 863.69111,714.24631 864.50456,713.57121 C 865.57897,712.67952 865.71575,711.84338 865.00456,710.51451 C 863.53757,707.77341 863.72459,707.55377 867.52557,707.55377 L 871.02557,707.55377 L 871.02557,712.55377 C 871.02557,716.8871 870.7589,717.55377 869.02557,717.55377 C 867.92557,717.55377 867.02557,717.01377 867.02557,716.35377 C 867.02557,715.42044 866.7589,715.42044 865.82557,716.35377 C 864.22999,717.94935 863.02557,717.87298 863.02557,716.17621 z M 874.02557,712.55377 L 874.02557,707.55377 L 878.02557,707.55377 L 882.02557,707.55377 L 882.02557,712.55377 L 882.02557,717.55377 L 878.02557,717.55377 L 874.02557,717.55377 L 874.02557,712.55377 z M 896.94865,717.05377 C 896.90634,716.77877 896.83711,714.64127 896.7948,712.30377 C 896.72212,708.28799 896.87366,708.05377 899.54452,708.05377 C 902.22191,708.05377 902.38174,708.3046 902.57133,712.80377 C 902.76562,717.41465 902.68733,717.55377 899.89852,717.55377 C 898.3184,717.55377 896.99095,717.32877 896.94865,717.05377 z M 906.02557,712.55377 L 906.02557,707.55377 L 910.02557,707.55377 L 914.02557,707.55377 L 914.02557,712.55377 L 914.02557,717.55377 L 910.02557,717.55377 L 906.02557,717.55377 L 906.02557,712.55377 z M 917.74996,716.94483 C 917.36864,716.56351 917.72283,715.75703 918.53705,715.15265 C 919.83814,714.18686 919.8406,713.71524 918.55738,711.25862 C 917.27657,708.80661 917.27707,708.39449 918.56145,707.90163 C 921.7002,706.69718 923.15398,708.36226 922.83351,712.79462 C 922.58758,716.19615 922.11456,717.1126 920.48442,717.34595 C 919.36179,717.50665 918.13128,717.32615 917.74996,716.94483 z M 926.02557,712.55377 L 926.02557,707.55377 L 930.02557,707.55377 L 934.02557,707.55377 L 934.02557,712.55377 L 934.02557,717.55377 L 930.02557,717.55377 L 926.02557,717.55377 L 926.02557,712.55377 z M 937.55817,713.80377 C 938.53981,707.89718 938.78355,707.55377 941.99419,707.55377 C 944.96518,707.55377 945.02557,707.65338 945.02557,712.55377 L 945.02557,717.55377 L 940.98026,717.55377 L 936.93494,717.55377 L 937.55817,713.80377 z M 827.55679,709.26064 C 827.12873,708.27442 827.05908,707.18692 827.40203,706.84398 C 828.41752,705.82848 829.23612,707.25492 828.76873,709.2255 C 828.35438,710.97244 828.30047,710.97401 827.55679,709.26064 z M 822.34847,696.95285 C 821.73911,695.36488 823.47226,693.59851 825.66858,693.56908 C 827.02981,693.55085 828.26812,696.3523 827.4698,697.64401 C 826.54107,699.14672 823.00733,698.66982 822.34847,696.95285 z M 980.52557,696.55377 C 980.86549,696.00377 982.01705,695.55377 983.08459,695.55377 C 984.15213,695.55377 985.02557,696.00377 985.02557,696.55377 C 985.02557,697.10377 983.87401,697.55377 982.46655,697.55377 C 981.01519,697.55377 980.17505,697.12093 980.52557,696.55377 z M 899.24873,693.42173 C 896.61437,691.7348 896.20116,691.04712 897.14123,689.91441 C 897.78437,689.13947 898.13395,688.40381 897.91807,688.2796 C 897.7022,688.1554 896.62557,687.55819 895.52557,686.95249 C 892.61759,685.35125 892.29106,679.28828 894.9686,676.61074 C 896.09993,675.47941 898.06057,674.55377 899.32557,674.55377 C 900.59057,674.55377 902.11252,674.06682 902.70767,673.47167 C 903.40623,672.77311 904.45183,672.71562 905.65767,673.30947 C 906.68502,673.81542 908.87557,674.879 910.52557,675.67299 C 912.95899,676.84397 913.58497,677.83207 913.8401,680.90498 C 914.01555,683.01824 913.5734,685.39367 912.84015,686.27718 C 912.1172,687.14829 911.65708,688.63659 911.81767,689.58451 C 912.01263,690.73534 910.75635,692.01339 908.03682,693.43089 C 903.08687,696.01095 903.29246,696.01116 899.24873,693.42173 z M 949.02557,691.55648 L 946.52557,689.60366 L 950.69563,689.82872 C 954.59539,690.03918 954.7636,690.16721 953.29065,691.80377 C 952.42437,692.76627 951.67284,693.54376 951.62058,693.53153 C 951.56833,693.5193 950.40057,692.63053 949.02557,691.55648 z M 835.02557,691.1704 C 835.02557,690.40955 836.03807,689.45242 837.27557,689.04345 L 839.52557,688.29987 L 837.36012,687.86835 C 834.62267,687.32284 833.70435,685.06525 835.58501,683.50444 C 836.37732,682.84688 837.02557,681.67486 837.02557,680.89994 C 837.02557,680.12502 837.71398,679.22683 838.55537,678.90396 C 839.52084,678.53347 839.86488,677.62283 839.48798,676.43534 C 838.69366,673.93264 840.41993,674.04613 844.05787,676.73577 L 847.0092,678.91778 L 849.26738,676.86074 C 853.49982,673.0053 855.50855,672.44914 858.96794,674.17491 C 861.99924,675.68712 862.74137,678.46599 859.90057,677.66708 C 855.73889,676.4967 854.02557,676.42966 854.02557,677.43719 C 854.02557,678.05131 855.06057,678.55377 856.32557,678.55377 C 859.13528,678.55377 861.02557,680.29918 861.02557,682.89353 C 861.02557,685.29528 858.28394,687.47972 855.21655,687.52197 C 853.89167,687.54021 853.17903,687.99306 853.54453,688.58445 C 853.91398,689.18223 855.61883,689.3455 857.60355,688.97316 C 861.82614,688.181 862.16082,689.84089 858.1163,691.51619 C 854.36834,693.06864 850.57996,691.36579 851.33745,688.46915 C 851.61265,687.41679 851.43006,686.30376 850.93169,685.99575 C 850.43332,685.68774 850.02557,684.33729 850.02557,682.99475 C 850.02557,680.88639 849.56323,680.55377 846.63256,680.55377 C 843.27793,680.55377 841.90981,681.8773 842.75621,684.30377 C 842.99603,684.99127 843.85629,685.55377 844.66792,685.55377 C 845.47955,685.55377 845.90279,685.94342 845.60845,686.41966 C 845.31412,686.8959 843.82506,687.11467 842.29944,686.90581 C 840.14477,686.61083 839.95068,686.71158 841.42993,687.35715 C 843.25101,688.15189 843.23183,688.2837 840.99137,690.371 C 838.35794,692.82442 835.02557,693.27095 835.02557,691.1704 z M 872.13777,691.28903 C 869.79287,690.07597 869.12272,687.62474 871.37557,688.50114 C 872.00807,688.74719 873.98807,688.97219 875.77557,689.00114 C 879.50624,689.06155 879.69121,689.32799 877.27557,691.16172 C 875.11413,692.80249 875.06567,692.80369 872.13777,691.28903 z M 930.62214,691.71002 C 930.33534,691.24597 931.65878,690.38809 933.56312,689.80363 C 937.2716,688.66546 938.28902,689.80723 935.09131,691.51859 C 932.74558,692.77399 931.31751,692.83516 930.62214,691.71002 z M 969.52557,691.55377 C 969.18565,691.00377 969.63565,690.55377 970.52557,690.55377 C 971.41549,690.55377 971.86549,691.00377 971.52557,691.55377 C 971.18565,692.10377 970.73565,692.55377 970.52557,692.55377 C 970.31549,692.55377 969.86549,692.10377 969.52557,691.55377 z M 949.18018,685.94951 C 947.99514,685.11948 947.02557,683.8164 947.02557,683.05377 C 947.02557,682.29114 947.99514,680.98806 949.18018,680.15803 C 951.97908,678.19761 955.02557,679.7068 955.02557,683.05377 C 955.02557,686.40074 951.97908,687.90993 949.18018,685.94951 z M 871.27557,685.91473 C 868.25483,684.63967 871.52582,678.55377 875.23187,678.55377 C 877.47003,678.55377 879.23065,681.08005 878.85233,683.74873 C 878.60189,685.51543 877.82493,686.09915 875.52557,686.24806 C 873.87557,686.35492 871.96307,686.20493 871.27557,685.91473 z M 929.03614,685.06651 C 927.5932,683.32787 928.32687,680.75912 930.50512,679.92324 C 933.05568,678.9445 937.02557,680.4359 937.02557,682.37282 C 937.02557,686.25019 931.55051,688.09614 929.03614,685.06651 z M 968.56828,685.62287 C 968.25184,685.11087 968.45029,684.40931 969.00926,684.06385 C 970.20263,683.3263 972.02557,684.26242 972.02557,685.61279 C 972.02557,686.82959 969.31895,686.83748 968.56828,685.62287 z M 928.02557,676.59743 C 928.02557,674.49224 932.0965,673.34051 935.1163,674.59135 C 936.7164,675.25413 938.02557,676.19182 938.02557,676.67509 C 938.02557,677.9172 936.33653,677.76491 934.012,676.31322 C 932.42957,675.32498 931.61881,675.3267 930.02557,676.3217 C 928.91769,677.01358 928.02557,677.13657 928.02557,676.59743 z M 812.58472,673.96547 C 813.00487,670.13796 814.02557,669.72825 814.02557,673.3871 C 814.02557,675.12877 813.63745,676.55377 813.16308,676.55377 C 812.68872,676.55377 812.42845,675.38903 812.58472,673.96547 z M 871.58439,674.8871 C 873.58922,673.42113 875.04581,673.24057 877.44378,674.16076 C 880.40473,675.29698 879.03703,676.22044 874.39326,676.22044 C 870.28794,676.22044 869.96839,676.06875 871.58439,674.8871 z M 948.84944,674.96458 C 950.19595,674.02145 951.81092,673.67088 952.82195,674.10223 C 954.26037,674.71592 954.1364,674.94779 952.02557,675.59174 C 947.69948,676.91149 946.42822,676.66047 948.84944,674.96458 z " />
-    </g>
-    <g
-       id="g9933"
-       transform="translate(-126.2218,-1.22947)">
-      <rect
-         id="rect9935"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-0.985935,0.167129,0.16871,0.985666,0,0)"
-         y="1029.7926"
-         x="-565.01947"
-         height="116.82966"
-         width="2.5678744" />
-      <rect
-         id="rect9937"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.981474,0.191593,-0.19145,0.981502,0,0)"
-         y="763.79895"
-         x="890.80157"
-         height="117.90984"
-         width="2.8053782" />
-      <g
-         id="g9939"
-         transform="matrix(0.571057,0,0,0.646281,293.2046,457.7222)">
-        <path
-           id="path9941"
-           style="opacity:1;color:#000000;fill:url(#radialGradient21982);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 800.06862,895.59747 C 800.06862,898.51334 782.52213,900.87711 760.87744,900.87711 C 739.23275,900.87711 721.68626,898.51334 721.68626,895.59747 C 721.68626,892.6816 739.23275,890.31783 760.87744,890.31783 C 782.52213,890.31783 800.06862,892.6816 800.06862,895.59747 z " />
-        <path
-           id="path9943"
-           style="color:#000000;fill:url(#linearGradient21984);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           transform="translate(-2.027946e-7,12.18378)"
-           d="M 799.86556,884.22593 C 793.36754,893.23219 782.51097,900.87711 760.87744,900.87711 C 739.24391,900.87711 727.66931,891.94233 721.68626,883.81981 C 756.92502,889.9117 765.34483,889.4341 799.86556,884.22593 z " />
-      </g>
-      <rect
-         id="rect9945"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.999488,-3.199729e-2,-6.823932e-2,0.997669,0,0)"
-         y="948.75696"
-         x="793.65533"
-         height="119.00449"
-         width="2.421216" />
-    </g>
-    <g
-       id="g9925">
-      <rect
-         id="rect8100"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-0.985935,0.167129,0.16871,0.985666,0,0)"
-         y="1029.7926"
-         x="-565.01947"
-         height="116.82966"
-         width="2.5678744" />
-      <rect
-         id="rect8102"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.981474,0.191593,-0.19145,0.981502,0,0)"
-         y="763.79895"
-         x="890.80157"
-         height="117.90984"
-         width="2.8053782" />
-      <g
-         id="g9911"
-         transform="matrix(0.571057,0,0,0.646281,293.2046,457.7222)">
-        <path
-           id="path8109"
-           style="opacity:1;color:#000000;fill:url(#radialGradient21986);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           d="M 800.06862,895.59747 C 800.06862,898.51334 782.52213,900.87711 760.87744,900.87711 C 739.23275,900.87711 721.68626,898.51334 721.68626,895.59747 C 721.68626,892.6816 739.23275,890.31783 760.87744,890.31783 C 782.52213,890.31783 800.06862,892.6816 800.06862,895.59747 z " />
-        <path
-           id="path8111"
-           style="color:#000000;fill:url(#linearGradient21988);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           transform="translate(-2.027946e-7,12.18378)"
-           d="M 799.86556,884.22593 C 793.36754,893.23219 782.51097,900.87711 760.87744,900.87711 C 739.24391,900.87711 727.66931,891.94233 721.68626,883.81981 C 756.92502,889.9117 765.34483,889.4341 799.86556,884.22593 z " />
-      </g>
-      <rect
-         id="rect8098"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.24311924;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0.999488,-3.199729e-2,-6.823932e-2,0.997669,0,0)"
-         y="948.75696"
-         x="793.65533"
-         height="119.00449"
-         width="2.421216" />
-    </g>
-    <path
-       id="path7172"
-       style="color:#000000;fill:url(#linearGradient21990);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 666.98477,874.01151 C 661.91215,874.01154 657.79726,877.03628 657.79727,880.76151 C 657.7973,883.28322 659.69239,885.47812 662.48477,886.63651 L 662.48477,915.10526 L 596.45352,915.10526 L 596.73477,922.57401 L 662.23477,928.01151 L 662.48477,928.01151 L 662.48477,1033.7303 C 659.87852,1037.3812 648.16738,1048.352 634.76602,1050.9491 C 622.71362,1053.2844 649.18306,1058.8524 667.45352,1058.7928 C 685.7232,1058.7333 709.07681,1053.1347 697.79727,1050.9491 C 688.57051,1049.161 675.86195,1038.2246 671.48477,1034.2616 L 671.48477,927.98026 L 736.01602,921.69901 L 736.01602,915.10526 L 671.48477,915.10526 L 671.48477,886.63651 C 674.27963,885.47864 676.17228,883.28453 676.17227,880.76151 C 676.1723,877.03631 672.05742,874.0115 666.98477,874.01151 z " />
-    <path
-       id="path11769"
-       style="color:#000000;fill:url(#linearGradient21992);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(-0.134374,0.335517,-0.340315,-0.132479,1032.981,877.1416)"
-       d="M 507.72468,916.81576 L 484.07619,918.83319 L 460.36885,919.96576 L 451.14238,898.09813 L 442.73927,875.90109 L 460.68548,860.36872 L 479.19942,845.51763 L 499.51726,857.78573 L 519.36261,870.80429 L 513.97352,893.91875 L 507.72468,916.81576 z " />
-    <g
-       id="g4054"
-       style="stroke:#000000;stroke-width:2.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.649307,0.410145,-0.289594,0.919597,699.6512,1.482277)">
-      <g
-         id="g3996"
-         style="stroke:#000000;stroke-width:4.76802254;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.576811,0,0,0.686329,128.7083,280.1342)">
-        <path
-           id="rect3032"
-           style="fill:url(#linearGradient21994);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.76802254;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 276.84375,911.0625 L 276.84375,989.28125 L 277.09375,989.28125 C 276.92316,989.86231 276.84375,990.46384 276.84375,991.0625 C 276.84375,999.6226 294.76374,1006.5625 316.84375,1006.5625 C 338.92375,1006.5625 356.84374,999.62261 356.84375,991.0625 C 356.84375,990.46304 356.73354,989.86305 356.5625,989.28125 L 356.84375,989.28125 L 356.84375,911.0625 L 276.84375,911.0625 z " />
-        <path
-           id="path3034"
-           style="fill:#f2d8a1;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.74592447;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="matrix(1.009334,0,0,1,-3.743411,21.52787)"
-           d="M 357.2452,887.52399 C 357.25372,896.09086 339.50823,903.03745 317.61511,903.03745 C 295.72199,903.03745 277.9765,896.09086 277.98502,887.52399 C 277.9765,878.95712 295.72199,872.01053 317.61511,872.01053 C 339.50823,872.01053 357.25372,878.95712 357.2452,887.52399 L 357.2452,887.52399 z " />
-      </g>
-      <path
-         id="rect3932"
-         style="fill:url(#linearGradient21996);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 334.9799,922.80826 C 330.15845,922.80826 326.25154,927.12009 326.25154,932.42554 C 326.25154,937.731 330.15845,942.02679 334.9799,942.02678 C 335.41809,942.02678 335.83965,941.98324 336.26058,941.91458 L 465.5309,941.91458 L 465.5309,922.92046 L 336.26058,922.92046 C 335.83965,922.8518 335.41809,922.80826 334.9799,922.80826 z " />
-      <path
-         id="path3934"
-         style="color:#000000;fill:#dd9600;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:9.71709728;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(0,0.24316,-0.391992,0,813.2404,855.1861)"
-         d="M 357.2452,887.52399 C 357.25372,896.09086 339.50823,903.03745 317.61511,903.03745 C 295.72199,903.03745 277.9765,896.09086 277.98502,887.52399 C 277.9765,878.95712 295.72199,872.01053 317.61511,872.01053 C 339.50823,872.01053 357.25372,878.95712 357.2452,887.52399 L 357.2452,887.52399 z " />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     id="layer1" />
-  <rect
-     id="rect19117"
-     style="fill:#ddddd3;fill-opacity:1;stroke:black;stroke-width:1.29999995;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     y="809.36218"
-     x="295"
-     ry="10.456966"
-     rx="10.456965"
-     height="19"
-     width="0" />
-  <text
-     xml:space="preserve"
-     id="text13940"
-     style="font-size:22.53170586px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.32081166px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931229)"
-     y="40.768425"
-     x="26.500059"><tspan
-       id="tspan13942"
-       style="stroke-width:0.32081166"
-       y="40.768425"
-       x="26.500059">TuxGuitar Player 0.8 Version</tspan></text>
-  <text
-     xml:space="preserve"
-     id="text14708"
-     style="font-size:7.94642258px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.11314224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931229)"
-     y="54.076897"
-     x="26.042126"><tspan
-       id="tspan14710"
-       style="stroke-width:0.11314224"
-       y="54.076897"
-       x="26.042126">Buttons defaut</tspan></text>
-  <text
-     xml:space="preserve"
-     id="text14712"
-     style="font-size:7.94658804px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.11314419px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931229)"
-     y="54.680504"
-     x="192.78673"><tspan
-       id="tspan14714"
-       style="stroke-width:0.11314419"
-       y="54.680504"
-       x="192.78673">Buttons is on</tspan></text>
-  <g
-     id="g14668"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11961"
-       style="fill:url(#radialGradient23057);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="423.20502"
-       x="468.68112"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11963"
-       style="fill:#d4aa00;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 486.4644,431.15917 L 486.4644,473.09596 L 486.4644,515.03274 L 507.773,494.07524 L 508.08182,493.77025 L 508.08182,506.6236 L 529.39041,489.87067 L 550.67971,473.09596 L 529.39041,456.32124 L 508.08182,439.56831 L 508.08182,452.42167 L 507.773,452.11667 L 486.4644,431.15917 z " />
-  </g>
-  <g
-     id="g14680"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11977"
-       style="fill:url(#radialGradient23061);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="423.20511"
-       x="129.84697"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11979"
-       style="fill:#d4aa00;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 211.84556,431.15928 L 211.84556,473.09605 L 211.84556,515.03284 L 190.53697,494.07534 L 190.22814,493.77035 L 190.22814,506.6237 L 168.91955,489.87077 L 147.63025,473.09605 L 168.91955,456.32135 L 190.22814,439.56842 L 190.22814,452.42178 L 190.53697,452.11678 L 211.84556,431.15928 z " />
-  </g>
-  <g
-     id="g14672"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11983"
-       style="fill:url(#radialGradient23063);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="423.20508"
-       x="16.902269"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11985"
-       style="fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 107.04162,430.81066 L 90.746186,446.99717 L 90.746186,431.15923 L 69.44012,452.11673 L 69.135125,452.42172 L 69.135125,439.56837 L 47.829059,456.3213 L 26.544777,473.09601 L 47.829059,489.87073 L 69.135125,506.62366 L 69.135125,493.7703 L 69.44012,494.0753 L 90.746186,515.0328 L 90.746186,499.19485 L 107.04162,515.38136 L 107.04162,473.09601 L 107.04162,430.81066 z " />
-  </g>
-  <g
-     id="g14656"
-     transform="matrix(0.2437635,0,0,0.2437635,21.28266,-45.301701)">
-    <rect
-       id="rect11989"
-       style="fill:url(#radialGradient23065);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="scale(-1,1)"
-       y="423.20508"
-       x="-681.40753"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path11991"
-       style="fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 591.26818,430.81066 L 607.56361,446.99717 L 607.56361,431.15923 L 628.86968,452.11673 L 629.17467,452.42172 L 629.17467,439.56837 L 650.48074,456.3213 L 671.76502,473.09601 L 650.48074,489.87073 L 629.17467,506.62366 L 629.17467,493.7703 L 628.86968,494.0753 L 607.56361,515.0328 L 607.56361,499.19485 L 591.26818,515.38136 L 591.26818,473.09601 L 591.26818,430.81066 z " />
-  </g>
-  <g
-     id="g14488"
-     style="fill-rule:evenodd;display:inline"
-     transform="matrix(0.1699352,0,0,0.1699352,278.84004,51.405169)">
-    <rect
-       id="rect14490"
-       style="fill:url(#radialGradient23067);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="41.576488"
-       x="188.79814"
-       ry="31.803694"
-       rx="31.803694"
-       height="143.13216"
-       width="143.13216" />
-    <path
-       id="path14492"
-       style="opacity:1;fill:#56ff00;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.62562513;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="matrix(0.648516,0,0,0.694809,486.9305,19.37587)"
-       d="M -418.05177,221.55162 L -418.05177,134.95318 L -418.05177,48.354749 L -343.05532,91.653969 L -268.05888,134.95319 L -343.05532,178.25241 L -418.05177,221.55162 z " />
-  </g>
-  <g
-     id="g14664"
-     transform="matrix(0.2437635,0,0,0.2437635,223.81,-75.031711)">
-    <rect
-       id="rect14496"
-       style="fill:url(#radialGradient23069);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67133"
-       x="470.31363"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14498"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 488.0969,555.62547 L 488.0969,597.56226 L 488.0969,639.49904 L 509.4055,618.54154 L 509.71432,618.23655 L 509.71432,631.0899 L 531.02291,614.33697 L 552.31221,597.56226 L 531.02291,580.78754 L 509.71432,564.03461 L 509.71432,576.88797 L 509.4055,576.58297 L 488.0969,555.62547 z " />
-  </g>
-  <g
-     id="g14688"
-     transform="matrix(0.2437635,0,0,0.2437635,223.81,-75.031711)">
-    <rect
-       id="rect14502"
-       style="fill:url(#radialGradient23071);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67133"
-       x="244.42415"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <g
-       id="g14504"
-       style="fill:#2a7fff;fill-opacity:0.75;fill-rule:evenodd"
-       transform="matrix(0.697131,0,0,0.697131,114.7389,494.0779)">
-      <rect
-         id="rect14506"
-         style="opacity:1;fill:#2a7fff;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.43374991;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="86.419327"
-         x="214.01666"
-         ry="31.803694"
-         rx="31.803694"
-         height="124.04787"
-         width="38.168575" />
-      <rect
-         id="rect14508"
-         style="opacity:1;fill:#2a7fff;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.43374991;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="86.419327"
-         x="263.00107"
-         ry="31.803694"
-         rx="31.803694"
-         height="124.04787"
-         width="38.168575" />
-    </g>
-  </g>
-  <g
-     id="g14684"
-     transform="matrix(0.2437635,0,0,0.2437635,194.95323,-74.069821)">
-    <rect
-       id="rect14512"
-       style="fill:url(#radialGradient23073);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67139"
-       x="131.47948"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14514"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.3790741;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 213.47806,555.62558 L 213.47806,597.56235 L 213.47806,639.49914 L 192.16947,618.54164 L 191.86064,618.23665 L 191.86064,631.09 L 170.55205,614.33707 L 149.26275,597.56235 L 170.55205,580.78765 L 191.86064,564.03472 L 191.86064,576.88808 L 192.16947,576.58308 L 213.47806,555.62558 z " />
-  </g>
-  <g
-     id="g14676"
-     transform="matrix(0.2437635,0,0,0.2437635,195.43418,-74.550761)">
-    <rect
-       id="rect14518"
-       style="fill:url(#radialGradient23075);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="547.67139"
-       x="18.534769"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14520"
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 108.67412,555.27696 L 92.378686,571.46347 L 92.378686,555.62553 L 71.07262,576.58303 L 70.767625,576.88802 L 70.767625,564.03467 L 49.461559,580.7876 L 28.177277,597.56231 L 49.461559,614.33703 L 70.767625,631.08996 L 70.767625,618.2366 L 71.07262,618.5416 L 92.378686,639.4991 L 92.378686,623.66115 L 108.67412,639.84766 L 108.67412,597.56231 L 108.67412,555.27696 z " />
-  </g>
-  <g
-     id="g14660"
-     transform="matrix(0.2437635,0,0,0.2437635,223.81,-75.031711)">
-    <rect
-       id="rect14524"
-       style="fill:url(#radialGradient23077);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="scale(-1,1)"
-       y="547.67139"
-       x="-683.04004"
-       ry="22.171343"
-       rx="22.171343"
-       height="99.78186"
-       width="99.78186" />
-    <path
-       id="path14526"
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.37930822;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 592.90068,555.27696 L 609.19611,571.46347 L 609.19611,555.62553 L 630.50218,576.58303 L 630.80717,576.88802 L 630.80717,564.03467 L 652.11324,580.7876 L 673.39752,597.56231 L 652.11324,614.33703 L 630.80717,631.08996 L 630.80717,618.2366 L 630.50218,618.5416 L 609.19611,639.4991 L 609.19611,623.66115 L 592.90068,639.84766 L 592.90068,597.56231 L 592.90068,555.27696 z " />
-  </g>
-  <g
-     id="g3617"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/transport_stop_1.png"
-     inkscape:export-xdpi="93.671768"
-     inkscape:export-ydpi="93.671768"
-     transform="matrix(0.6801604,0,0,0.6801604,-12.570086,11.373789)">
-    <rect
-       width="35.760925"
-       height="35.760925"
-       rx="7.9460096"
-       ry="7.9460096"
-       x="-173.95715"
-       y="68.81382"
-       transform="scale(-1,1)"
-       style="fill:url(#radialGradient3567);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74953651;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect1657" />
-    <rect
-       width="26.976021"
-       height="30.992802"
-       rx="22.477581"
-       ry="7.9460096"
-       x="142.58868"
-       y="71.306572"
-       style="fill:#722a2d;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.02269864;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect1692" />
-  </g>
-  <rect
-     id="rect32996"
-     style="fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:black;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     y="525.36218"
-     x="687.5"
-     height="0"
-     width="2" />
-  <rect
-     id="rect2827"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="364.07678"
-     x="26.202015"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_accentuated.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect2837"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="364.07678"
-     x="74.713554"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_fade_in.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect6548"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.86951"
-     x="123.14871"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_ghost.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect6595"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="362.53619"
-     x="170.95718"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_grace.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect7500"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="362.53619"
-     x="219.48363"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_hammer.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect7533"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.17297"
-     x="268.23099"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_harmonic.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3143"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.17297"
-     x="317.33041"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_heavy_accentuated.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3182"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="363.17297"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_palm_mute.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <text
-     xml:space="preserve"
-     id="text17219"
-     style="font-size:23.18305969px;font-style:normal;font-weight:normal;fill:#b6b200;fill-opacity:1;stroke:#000000;stroke-width:0.33008549px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-     transform="scale(1.0069248,0.9931228)"
-     y="111.45198"
-     x="25.711828"><tspan
-       id="tspan17221"
-       style="stroke-width:0.33008549"
-       y="111.45198"
-       x="25.711828">Toolbar  icons</tspan></text>
-  <rect
-     id="rect4097"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.2746"
-     x="264.20929"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect14867"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.48258"
-     x="26.252657"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect15996"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.25077"
-     x="74.015976"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g32002"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path17175"
-       style="fill:url(#radialGradient24181);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 145.47587,425.69429 C 133.63167,425.69429 124.02417,438.17757 124.02415,453.55736 C 124.02415,468.93714 133.63253,481.2776 145.47587,481.42044 C 158.43256,481.58056 162.04794,467.44225 166.22497,467.54379 C 170.40896,467.64549 173.39835,473.20864 179.66248,473.20863 C 181.97807,473.20861 184.16425,472.36905 186.07384,470.92513 C 182.71696,470.14458 180.23335,467.46246 180.23335,464.27224 C 180.23335,461.8528 181.65978,459.7477 183.8123,458.51958 L 178.63051,458.51958 L 178.63051,447.93644 L 192.59499,447.93644 C 192.7307,436.89206 186.65471,434.38915 181.26532,434.38915 C 175.08106,434.38916 172.09783,439.6069 167.08128,439.74659 C 162.07174,439.88606 160.32745,425.69429 145.47587,425.69429 z " />
-    <g
-       id="g31944">
-      <rect
-         id="rect17179"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-178.47929"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect17181"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-177.67867"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <g
-       id="g31940">
-      <rect
-         id="rect17185"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-165.349"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect17187"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-164.54837"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <rect
-       id="rect17189"
-       style="fill:#50211b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-205.54079"
-       x="447.94327"
-       height="26.741035"
-       width="10.568314" />
-    <path
-       id="path17191"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.2851,232.6176)"
-       d="M 462.5,843.48718 C 462.5,845.075 461.21282,846.36218 459.625,846.36218 C 458.03718,846.36218 456.75,845.075 456.75,843.48718 C 456.75,841.89936 458.03718,840.61218 459.625,840.61218 C 461.21282,840.61218 462.5,841.89936 462.5,843.48718 z " />
-    <path
-       id="path17193"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.5079,232.6176)"
-       d="M 489.75,843.98718 C 489.75,845.575 488.46282,846.86218 486.875,846.86218 C 485.28718,846.86218 484,845.575 484,843.98718 C 484,842.39936 485.28718,841.11218 486.875,841.11218 C 488.46282,841.11218 489.75,842.39936 489.75,843.98718 L 489.75,843.98718 z " />
-    <rect
-       id="rect17197"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-154.30049"
-       x="444.74075"
-       ry="4.4671021"
-       rx="4.4671021"
-       height="3.0423932"
-       width="16.172722" />
-    <g
-       id="g17199"
-       transform="matrix(0,0.414685,-0.450725,0,527.3259,253.3075)">
-      <rect
-         id="rect17201"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="831.05066"
-         x="466.6709"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17203"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="471.80353"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17205"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="476.93613"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17207"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="482.06876"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17209"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="487.20135"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect17211"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="492.33401"
-         height="1.7859424"
-         width="3.2650242" />
-    </g>
-    <rect
-       id="rect17195"
-       style="fill:url(#linearGradient24183);fill-opacity:1;stroke:url(#linearGradient24185);stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-147.45714"
-       x="446.52585"
-       height="2.0050554"
-       width="13.102184" />
-  </g>
-  <rect
-     id="rect22848"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.2508"
-     x="121.7793"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect26806"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.25077"
-     x="169.5426"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect26904"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.25077"
-     x="217.30595"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect2675"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="74.221016"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g45292"
-     transform="matrix(0.4620139,0,0,0.4620139,114.26669,-118.59787)">
-    <path
-       id="rect2755"
-       style="fill:url(#linearGradient24187);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;marker-start:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 138.73058,531.2239 C 133.41154,531.2239 129.12943,536.48003 129.12943,543.00896 L 128.99617,587.91492 C 128.99617,594.44385 128.69562,599.14377 129.68196,599.88538 L 179.81549,599.69998 C 185.13453,599.69998 189.41664,594.44383 189.41664,587.91492 L 189.41664,551.89685 C 189.41664,545.36793 185.13453,540.11179 179.81549,540.11179 L 163.71357,540.11179 C 162.66613,534.99411 158.91569,531.2239 154.41245,531.2239 L 138.73058,531.2239 z " />
-    <rect
-       id="rect5447"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.74023503;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="matrix(1,0,-7.419016e-2,0.997244,0,0)"
-       y="544.21033"
-       x="176.32399"
-       height="54.450268"
-       width="46.882996" />
-    <rect
-       id="rect4560"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.74563318;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(1,0,-0.181321,0.983424,0,0)"
-       y="554.75165"
-       x="242.48486"
-       height="55.214611"
-       width="46.882996" />
-    <path
-       id="rect2762"
-       style="fill:url(#linearGradient24189);fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 152.00486,552.73763 L 193.00752,552.73763 C 198.33252,552.73763 201.84799,556.89227 200.88974,562.05297 L 195.6123,590.47494 C 194.65405,595.63564 193.79374,599.79028 189.34611,599.79028 L 129.79758,599.97568 C 134.8901,598.97255 136.08684,585.60303 137.3379,580.01541 L 140.66326,562.05297 C 141.62151,556.89227 146.67986,552.73763 152.00486,552.73763 z " />
-  </g>
-  <rect
-     id="rect14372"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="121.90878"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g43463"
-     transform="matrix(0.4620139,0,0,0.4620139,18.988746,-66.628171)">
-    <rect
-       id="rect11694"
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.00020504;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.688085,-0.72563,0.715699,0.698409,0,0)"
-       y="574.77551"
-       x="-255.44737"
-       height="17.583229"
-       width="21.502913" />
-    <path
-       id="path11681"
-       style="fill:url(#linearGradient24191);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 243.56035,571.18984 L 263.2346,590.38882 L 293.42803,558.54794 L 293.4154,558.53561 C 301.52985,549.73696 303.79917,538.50041 298.44593,533.27648 C 293.09269,528.05257 282.1187,530.79473 273.76641,539.36129 L 273.75378,539.34896 L 243.56035,571.18984 z " />
-    <g
-       id="g13472"
-       style="stroke:none;stroke-width:10.65287209;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.193838,-0.204415,0.201505,0.196637,23.43035,509.7359)">
-      <rect
-         id="rect13468"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="772.02551"
-         x="349.14398"
-         height="13.878055"
-         width="13.878055" />
-      <rect
-         id="rect13470"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="746.92316"
-         x="349.14398"
-         height="13.878055"
-         width="13.878055" />
-    </g>
-    <path
-       id="path16173"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.60036874;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.833248,0,0,0.833248,129.3815,-26.35132)"
-       d="M 197,683.36218 C 197,686.67589 194.53757,689.36218 191.5,689.36218 C 188.46243,689.36218 186,686.67589 186,683.36218 C 186,680.04847 188.46243,677.36218 191.5,677.36218 C 194.53757,677.36218 197,680.04847 197,683.36218 z " />
-  </g>
-  <rect
-     id="rect18957"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="169.59654"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g27239"
-     style="stroke:#000000;stroke-width:4.48613548;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     transform="matrix(0.4119487,0,0,0.4119487,84.557559,-38.340731)">
-    <path
-       id="path18941"
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 360.92803,523.51862 L 360.92803,541.25088 L 360.92803,558.98314 L 351.90518,550.12162 L 351.77441,549.99266 L 351.77441,555.42748 L 342.75156,548.34378 L 333.73689,541.25088 L 342.75156,534.15798 L 351.77441,527.07428 L 351.77441,532.50911 L 351.90518,532.38015 L 360.92803,523.51862 z " />
-    <path
-       id="path18943"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 381.93992,524.38097 L 381.93992,542.11324 L 381.93992,559.8455 L 390.96277,550.98397 L 391.09354,550.85501 L 391.09354,556.28983 L 400.11638,549.20614 L 409.13106,542.11324 L 400.11638,535.02033 L 391.09354,527.93663 L 391.09354,533.37145 L 390.96277,533.2425 L 381.93992,524.38097 z " />
-    <rect
-       id="rect18947"
-       style="fill:#5696f6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="571.25983"
-       x="382.67221"
-       ry="14.159336"
-       rx="14.159328"
-       height="36.565613"
-       width="11.267021" />
-    <rect
-       id="rect18949"
-       style="fill:#5696f6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="571.25983"
-       x="397.13196"
-       ry="14.159336"
-       rx="14.159328"
-       height="36.565613"
-       width="11.267021" />
-    <path
-       id="path18951"
-       style="fill:#ffdd55;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.48613548;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 360.92806,571.81035 L 360.92806,589.54262 L 360.92806,607.27489 L 351.90521,598.41336 L 351.77444,598.2844 L 351.77444,603.71922 L 342.7516,596.63553 L 333.73692,589.54262 L 342.7516,582.44972 L 351.77444,575.36601 L 351.77444,580.80084 L 351.90521,580.67188 L 360.92806,571.81035 z " />
-    <path
-       id="path18953"
-       style="fill:#54fb00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:11.65600395;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       transform="matrix(0.37892,0,0,0.390929,505.6404,512.6397)"
-       d="M -418.05177,221.55162 L -418.05177,134.95318 L -418.05177,48.354749 L -343.05532,91.653969 L -268.05888,134.95319 L -343.05532,178.25241 L -418.05177,221.55162 z " />
-  </g>
-  <rect
-     id="rect22612"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="174.02025"
-     x="217.2843"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g46196"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-118.59787)">
-    <path
-       id="rect19917"
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.90116501;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 467.50855,540.94367 L 503.60891,540.94367 L 492.37849,567.65561 L 456.27815,567.65561 L 467.50855,540.94367 z " />
-    <path
-       id="path19910"
-       style="fill:url(#linearGradient24193);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.90116501;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 457.70016,558.34707 C 447.92002,558.94002 439.41043,567.52267 437.95776,573.2013 C 436.54168,578.73699 439.59933,592.36751 440.19183,595.15793 C 440.30149,595.67442 479.31823,600.61312 483.97626,600.61312 C 483.58877,597.82398 483.14623,584.55447 483.15878,580.4671 C 483.21427,562.59041 495.7162,559.11261 495.7162,559.11261 L 457.70016,558.34707 z " />
-    <path
-       id="path19914"
-       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.90116501;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 511.71457,571.48217 C 511.71457,582.93257 511.39274,586.63852 510.76509,592.8703 C 510.38168,593.37582 485.33265,600.27736 484.95405,600.49226 C 484.23649,595.17567 483.5886,588.3454 483.23941,582.65947 C 482.68363,573.60927 485.88401,560.14651 497.82346,559.11941 C 505.75458,558.43043 511.71457,560.03179 511.71457,571.48217 z " />
-    <path
-       id="path19922"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 479.72135,529.68203 L 505.84121,530.3466 C 505.84121,530.3466 495.8971,539.26626 490.25951,558.82776 C 482.38594,558.82373 469.90852,557.92101 464.13966,558.1632 C 470.0212,538.21741 479.72135,529.68203 479.72135,529.68203 z " />
-    <path
-       id="path21721"
-       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.93912643;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 452.69804,567.82906 C 452.69804,567.82906 473.98361,569.33328 474.32419,569.33328 C 474.66476,569.33328 478.24075,563.96106 478.24075,563.96106 L 457.46601,563.1015 L 452.69804,567.82906 z " />
-    <rect
-       id="rect21723"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.87049818;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.993753,0.111602,0,1,0,0)"
-       y="534.75836"
-       x="448.51889"
-       height="5.8020134"
-       width="29.473152" />
-    <path
-       id="path22677"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97529125px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 479.86168,536.92989 L 495.90144,537.10555" />
-    <path
-       id="path22679"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97529125px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 474.78476,543.84821 L 490.82452,544.02386" />
-    <path
-       id="path22681"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.97529125px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 471.50763,551.05002 L 487.5474,551.40133" />
-  </g>
-  <rect
-     id="rect23611"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.91042"
-     x="26.171482"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g7666"
-     transform="matrix(0.4620139,0,0,0.4620139,114.26669,-118.59787)">
-    <path
-       id="rect26292"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.91859531;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 47.833889,531.14138 L 26.403966,550.01861 L 26.403966,599.84603 L 93.939784,599.84603 L 93.939784,531.14138 L 47.833889,531.14138 z " />
-    <path
-       id="rect24514"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 78.23077,548.38599 L 78.23077,558.60577 L 68.01099,558.60577 L 68.01099,568.14423 L 78.23077,568.14423 L 78.23077,578.36401 L 87.76923,578.36401 L 87.76923,568.14423 L 97.98901,568.14423 L 97.98901,558.60577 L 87.76923,558.60577 L 87.76923,548.38599 L 78.23077,548.38599 z " />
-    <path
-       id="path26307"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 47.234451,548.9744 L 26.127061,549.11157 L 46.937686,531.35609 L 47.234451,548.9744 z " />
-  </g>
-  <g
-     id="g32023"
-     style="display:inline"
-     transform="matrix(0,-0.4620139,0.4620139,0,-162.63077,218.93502)">
-    <path
-       id="path32025"
-       style="fill:url(#radialGradient24195);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 145.47587,425.69429 C 133.63167,425.69429 124.02417,438.17757 124.02415,453.55736 C 124.02415,468.93714 133.63253,481.2776 145.47587,481.42044 C 158.43256,481.58056 162.04794,467.44225 166.22497,467.54379 C 170.40896,467.64549 173.39835,473.20864 179.66248,473.20863 C 181.97807,473.20861 184.16425,472.36905 186.07384,470.92513 C 182.71696,470.14458 180.23335,467.46246 180.23335,464.27224 C 180.23335,461.8528 181.65978,459.7477 183.8123,458.51958 L 178.63051,458.51958 L 178.63051,447.93644 L 192.59499,447.93644 C 192.7307,436.89206 186.65471,434.38915 181.26532,434.38915 C 175.08106,434.38916 172.09783,439.6069 167.08128,439.74659 C 162.07174,439.88606 160.32745,425.69429 145.47587,425.69429 z " />
-    <g
-       id="g32027">
-      <rect
-         id="rect32029"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-178.47929"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect32031"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-177.67867"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <g
-       id="g32033">
-      <rect
-         id="rect32035"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-165.349"
-         x="445.22119"
-         height="7.0455441"
-         width="15.051844" />
-      <rect
-         id="rect32037"
-         style="fill:#ececec;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-164.54837"
-         x="446.82245"
-         height="5.444284"
-         width="11.849324" />
-    </g>
-    <rect
-       id="rect32039"
-       style="fill:#50211b;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-205.54079"
-       x="447.94327"
-       height="26.741035"
-       width="10.568314" />
-    <path
-       id="path32041"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.2851,232.6176)"
-       d="M 462.5,843.48718 C 462.5,845.075 461.21282,846.36218 459.625,846.36218 C 458.03718,846.36218 456.75,845.075 456.75,843.48718 C 456.75,841.89936 458.03718,840.61218 459.625,840.61218 C 461.21282,840.61218 462.5,841.89936 462.5,843.48718 z " />
-    <path
-       id="path32043"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,0.46582,-0.445568,0,522.5079,232.6176)"
-       d="M 489.75,843.98718 C 489.75,845.575 488.46282,846.86218 486.875,846.86218 C 485.28718,846.86218 484,845.575 484,843.98718 C 484,842.39936 485.28718,841.11218 486.875,841.11218 C 488.46282,841.11218 489.75,842.39936 489.75,843.98718 L 489.75,843.98718 z " />
-    <rect
-       id="rect32045"
-       style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-154.30049"
-       x="444.74075"
-       ry="4.4671021"
-       rx="4.4671021"
-       height="3.0423932"
-       width="16.172722" />
-    <g
-       id="g32047"
-       transform="matrix(0,0.414685,-0.450725,0,527.3259,253.3075)">
-      <rect
-         id="rect32049"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="831.05066"
-         x="466.6709"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32051"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="471.80353"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32053"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="476.93613"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32055"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="482.06876"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32057"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="487.20135"
-         height="1.7859424"
-         width="3.2650242" />
-      <rect
-         id="rect32059"
-         style="fill:#e6e6e6;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="831.05066"
-         x="492.33401"
-         height="1.7859424"
-         width="3.2650242" />
-    </g>
-    <rect
-       id="rect32061"
-       style="fill:url(#linearGradient24197);fill-opacity:1;stroke:url(#linearGradient24199);stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0,1,-1,0,0,0)"
-       y="-147.45714"
-       x="446.52585"
-       height="2.0050554"
-       width="13.102184" />
-  </g>
-  <rect
-     id="rect32069"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.91042"
-     x="265.26404"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g34880"
-     transform="matrix(0.4620139,0,0,0.4267007,18.65561,-46.663401)">
-    <rect
-       id="rect33907"
-       style="fill:url(#linearGradient24201);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="526.11218"
-       x="542.25"
-       height="78.5"
-       width="72.5" />
-    <g
-       id="g33899"
-       transform="matrix(1,0,0,0.912791,-86.75002,49.30465)">
-      <path
-         id="path33885"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 646.25,601.61218 L 646.25,529.11218" />
-      <rect
-         id="rect32093"
-         style="fill:url(#linearGradient24203);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="535.61218"
-         x="639"
-         height="27"
-         width="14.5" />
-      <path
-         id="path33887"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 665.25,601.61218 L 665.25,529.11218" />
-      <rect
-         id="rect33889"
-         style="fill:url(#linearGradient24205);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="564.11218"
-         x="658"
-         height="27"
-         width="14.5" />
-      <path
-         id="path33893"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 684.25,601.61218 L 684.25,529.11218" />
-      <rect
-         id="rect33895"
-         style="fill:url(#linearGradient24207);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         y="546.11218"
-         x="677"
-         height="27"
-         width="14.5" />
-    </g>
-    <rect
-       id="rect34810"
-       style="fill:url(#linearGradient24209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="526.11218"
-       x="542.25"
-       height="78.5"
-       width="72.5" />
-    <path
-       id="path34814"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.86620283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 559.49998,600.27658 L 559.49998,534.09924" />
-    <rect
-       id="rect34816"
-       style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="540.03241"
-       x="552.25"
-       height="24.645357"
-       width="14.5" />
-    <path
-       id="path34818"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.86620283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 578.49998,600.27658 L 578.49998,534.09924" />
-    <rect
-       id="rect34820"
-       style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="566.04694"
-       x="571.25"
-       height="24.645357"
-       width="14.5" />
-    <path
-       id="path34822"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.86620283;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 597.49998,600.27658 L 597.49998,534.09924" />
-    <rect
-       id="rect34824"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="549.6167"
-       x="590.25"
-       height="24.645357"
-       width="14.5" />
-  </g>
-  <rect
-     id="rect34943"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.88399"
-     x="26.171482"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect37863"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.65297"
-     x="122.73254"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect37847"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.88399"
-     x="76.069054"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect49778"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.42195"
-     x="170.08907"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52722"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path49780"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 338.50001,696.12549 L 406.50001,696.12549" />
-    <path
-       id="path50667"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(-6.499994,7.263308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path50669"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 369.35853,695.26143 L 369.35853,634.48955" />
-    <path
-       id="path50671"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 338.50001,675.62549 L 406.50001,675.62549" />
-  </g>
-  <rect
-     id="rect50689"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.65297"
-     x="217.44554"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect52500"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.42195"
-     x="267.34311"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52715"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path50709"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 473.56682,634.97014 C 491.05994,635.4857 491.47546,647.90583 491.48512,663.18131 C 486.73449,647.1487 488.86877,643.70599 473.61907,643.74026 C 473.53193,630.54852 473.6402,648.16276 473.56682,634.97014 z " />
-    <path
-       id="path52546"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 441.00001,696.62549 L 509.00001,696.62549" />
-    <path
-       id="path52548"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(96.00001,7.763308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52550"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 471.85853,695.76143 L 471.85853,634.98955" />
-    <path
-       id="path52552"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 441.00001,676.12549 L 509.00001,676.12549" />
-  </g>
-  <g
-     id="g52707"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path52519"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 581.65647,634.49305 C 599.14959,634.96367 599.56511,646.30103 599.57477,660.24482 C 594.82414,645.6099 596.95842,642.46732 581.70872,642.4986 C 581.62158,630.4569 581.72985,646.53556 581.65647,634.49305 z " />
-    <path
-       id="path52570"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 549.00001,696.12549 L 617.00001,696.12549" />
-    <path
-       id="path52572"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(204,7.263308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52574"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 579.85853,695.26143 L 579.85853,634.48955" />
-    <path
-       id="path52576"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 549.00001,675.62549 L 617.00001,675.62549" />
-    <path
-       id="path52578"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 581.51919,644.69678 C 599.01231,645.1674 599.42783,656.50476 599.43749,670.44855 C 594.68686,655.81363 596.82114,652.67105 581.57144,652.70233 C 581.4843,640.66063 581.59257,656.73929 581.51919,644.69678 z " />
-  </g>
-  <rect
-     id="rect52589"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.65297"
-     x="315.16162"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52697"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path52593"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,634.99305 C 702.64959,635.46096 703.06511,646.7332 703.07477,660.59689 C 698.32414,646.04604 700.45842,642.92151 685.20872,642.95261 C 685.12158,630.98009 685.22985,646.96638 685.15647,634.99305 z " />
-    <path
-       id="path52597"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 652.50001,696.62549 L 720.50001,696.62549" />
-    <path
-       id="path52599"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(307.5,7.763308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52601"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 683.35853,695.76143 L 683.35853,634.98955" />
-    <path
-       id="path52603"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 652.50001,676.12549 L 720.50001,676.12549" />
-    <path
-       id="path52605"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,644.55268 C 702.64959,645.02059 703.06511,656.29283 703.07477,670.15652 C 698.32414,655.60567 700.45842,652.48114 685.20872,652.51224 C 685.12158,640.53972 685.22985,656.52601 685.15647,644.55268 z " />
-    <path
-       id="path52614"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,654.60879 C 702.64959,655.07671 703.06511,666.34894 703.07477,680.21263 C 698.32414,665.66178 700.45842,662.53726 685.20872,662.56836 C 685.12158,650.59583 685.22985,666.58212 685.15647,654.60879 z " />
-    <path
-       id="path52629"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 685.15647,664.55689 C 702.64959,665.02481 703.06511,676.29704 703.07477,690.16073 C 698.32414,675.60988 700.45842,672.48536 685.20872,672.51646 C 685.12158,660.54393 685.22985,676.53022 685.15647,664.55689 z " />
-  </g>
-  <rect
-     id="rect52728"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="272.55188"
-     x="25.900524"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52730"
-     style="display:inline"
-     transform="matrix(0.4620139,0,0,0.4620139,-125.53291,-16.498231)">
-    <path
-       id="path52732"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 338.50001,696.12549 L 406.50001,696.12549" />
-    <path
-       id="path52734"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(-6.499994,7.263308)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52736"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 369.35853,695.26143 L 369.35853,634.48955" />
-    <path
-       id="path52738"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 338.50001,675.62549 L 406.50001,675.62549" />
-  </g>
-  <rect
-     id="rect52740"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-     transform="matrix(0.7071068,0.7071068,-0.7071068,0.7071068,0,0)"
-     y="174.604"
-     x="245.46577"
-     height="4.6201973"
-     width="4.8512053" />
-  <rect
-     id="rect52758"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="273.01251"
-     x="76.300064"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52774"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <g
-       id="g52760"
-       style="display:inline"
-       transform="translate(-203,109.5)">
-      <path
-         id="path52762"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 338.50001,696.12549 L 406.50001,696.12549" />
-      <path
-         id="path52764"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="translate(-6.499994,7.263308)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-      <path
-         id="path52766"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 369.35853,695.26143 L 369.35853,634.48955" />
-      <path
-         id="path52768"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 338.50001,675.62549 L 406.50001,675.62549" />
-    </g>
-    <rect
-       id="rect52770"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-       y="431.48001"
-       x="683.43604"
-       height="10.000011"
-       width="10.500011" />
-    <rect
-       id="rect52772"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.707107,0.707107,-0.707107,0.707107,0,0)"
-       y="420.75739"
-       x="694.15863"
-       height="10.00004"
-       width="10.50004" />
-  </g>
-  <rect
-     id="rect52783"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="272.31952"
-     x="124.58059"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g52910"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path52789"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 240.00001,804.12549 L 308.00001,804.12549" />
-    <path
-       id="path52795"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 240.00001,783.62549 L 308.00001,783.62549" />
-    <path
-       id="path52791"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.571633,0,0,1,45.35674,115.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52793"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 260.01295,803.45836 L 260.01295,758.79263" />
-    <path
-       id="path52812"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.571633,0,0,1,62.29158,115.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52814"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 277.14348,803.45838 L 277.14348,758.79265" />
-    <path
-       id="path52826"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="matrix(0.571633,0,0,1,79.44058,115.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path52828"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.46516585;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 294.49064,803.45838 L 294.49064,758.79265" />
-    <rect
-       id="rect52830"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       y="758.36218"
-       x="258.86331"
-       height="9.6007662"
-       width="36.69611" />
-    <text
-       xml:space="preserve"
-       id="text52858"
-       style="font-size:25.4596386px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       transform="scale(1.099156,0.909789)"
-       y="832.28827"
-       x="243.78136"><tspan
-         id="tspan52860"
-         style="font-family:Arial Black"
-         y="832.28827"
-         x="243.78136">3</tspan></text>
-  </g>
-  <rect
-     id="rect52923"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="272.78156"
-     x="170.78207"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g54741"
-     transform="matrix(0.4620139,0,0,0.4620139,19.579651,-67.321181)">
-    <path
-       id="path52961"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 339,814.86218 L 405,746.86218" />
-    <text
-       xml:space="preserve"
-       id="text53848"
-       style="font-size:61.26486969px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-       transform="scale(1.199052,0.833992)"
-       y="979.46033"
-       x="305.48175"><tspan
-         id="tspan53850"
-         y="979.46033"
-         x="305.48175">4</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text54737"
-       style="font-size:61.26483154px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-       transform="scale(1.199052,0.833992)"
-       y="937.19122"
-       x="277.58707"><tspan
-         id="tspan54739"
-         y="937.19122"
-         x="277.58707">4</tspan></text>
-  </g>
-  <rect
-     id="rect54748"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="273.24353"
-     x="218.8316"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g57494"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <g
-       id="g56568"
-       transform="translate(4.064981,5.555418)">
-      <g
-         id="g56560">
-        <rect
-           id="rect54762"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect54764"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g56564"
-         transform="translate(0,-0.109804)">
-        <path
-           id="path55655"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        <path
-           id="path55657"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-           transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-      </g>
-    </g>
-    <g
-       id="g57487">
-      <path
-         id="path55661"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 440.47831,744.01169 L 515.5217,743.84996" />
-      <path
-         id="path55663"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,816.87437 L 515.5217,816.71263" />
-      <path
-         id="path55665"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,798.65871 L 515.52169,798.49697" />
-      <path
-         id="path55667"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,780.44305 L 515.52169,780.28131" />
-      <path
-         id="path55669"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,762.22737 L 515.5217,762.06564" />
-    </g>
-  </g>
-  <rect
-     id="rect61934"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     transform="scale(-1,1)"
-     y="272.78156"
-     x="-309.60117"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g61936"
-     style="display:inline"
-     transform="matrix(-0.4620139,0,0,0.4620139,509.7772,-67.090201)">
-    <g
-       id="g61938"
-       transform="translate(4.064981,5.555418)">
-      <g
-         id="g61940">
-        <rect
-           id="rect61942"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect61944"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g61946"
-         transform="translate(0,-0.109804)">
-        <path
-           id="path61948"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           transform="matrix(0.762121,0,0,0.762121,113.6812,182.3594)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-        <path
-           id="path61950"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-           transform="matrix(0.762121,0,0,0.762121,113.6813,197.2904)"
-           d="M 488.31813,767.7149 C 488.31813,769.80064 486.6273,771.49146 484.54156,771.49146 C 482.45583,771.49146 480.765,769.80064 480.765,767.7149 C 480.765,765.62916 482.45583,763.93833 484.54156,763.93833 C 486.6273,763.93833 488.31813,765.62916 488.31813,767.7149 z " />
-      </g>
-    </g>
-    <g
-       id="g61952">
-      <path
-         id="path61954"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 440.47831,744.01169 L 515.5217,743.84996" />
-      <path
-         id="path61956"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,816.87437 L 515.5217,816.71263" />
-      <path
-         id="path61958"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,798.65871 L 515.52169,798.49697" />
-      <path
-         id="path61960"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,780.44305 L 515.52169,780.28131" />
-      <path
-         id="path61962"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.95981914px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 440.47831,762.22737 L 515.5217,762.06564" />
-    </g>
-  </g>
-  <rect
-     id="rect2795"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="271.85748"
-     x="316.77866"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g2826"
-     transform="matrix(0.4620139,0,0,0.4620139,18.65561,-66.628171)">
-    <path
-       id="path2799"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 656.00001,803.12549 L 724.00001,803.12549" />
-    <path
-       id="path2801"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(311,114.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path2803"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 686.85853,802.26143 L 686.85853,741.48955" />
-    <path
-       id="path2805"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 656.00001,782.62549 L 724.00001,782.62549" />
-  </g>
-  <rect
-     id="rect2811"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="271.42603"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g2829"
-     style="display:inline"
-     transform="matrix(0.4620139,0,0,0.4620139,353.68718,-166.28609)">
-    <path
-       id="path2831"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 29.00003,909.12551 L 97.00003,909.12551" />
-    <path
-       id="path2833"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1;display:inline"
-       transform="translate(-316,220.2633)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path2835"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 29.00003,888.62551 L 97.00003,888.62551" />
-  </g>
-  <g
-     id="g6505"
-     transform="matrix(0.354114,0,0,0.354114,-33.453263,-158.43119)">
-    <path
-       id="path3732"
-       style="fill:url(#radialGradient24211);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24213);stroke-width:8.68754482;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-       transform="matrix(0.573037,0.525314,-0.525315,0.573037,481.5014,517.0748)"
-       d="M 233.5,675.11218 C 233.5,697.34164 215.47946,715.36218 193.25,715.36218 C 171.02054,715.36218 153,697.34164 153,675.11218 C 153,652.88272 171.02054,634.86218 193.25,634.86218 C 215.47946,634.86218 233.5,652.88272 233.5,675.11218 L 233.5,675.11218 z " />
-    <path
-       id="path3764"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(3.327811e-2,0,0,0.320967,240.7223,764.1587)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path3766"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0,3.388209e-2,-0.231743,0,411.6397,1008.641)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path3768"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="translate(0.978643,0.558407)"
-       d="M 239.53242,1004.8976 C 239.53336,1006.5092 238.22718,1007.8161 236.61561,1007.8161 C 235.00403,1007.8161 233.69785,1006.5092 233.69879,1004.8976 C 233.69785,1003.286 235.00403,1001.9791 236.61561,1001.9791 C 238.22718,1001.9791 239.53336,1003.286 239.53242,1004.8976 L 239.53242,1004.8976 z " />
-    <path
-       id="path4655"
-       style="fill:#ff9955;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 272.1753,1012.3511 C 276.84309,986.20902 245.19958,952.26377 213.06198,977.50611 C 195.54275,991.26653 223.78991,993.86796 223.78991,993.86796 L 183.20018,1021.8781 L 179.24219,972.87219 C 179.24219,972.87219 190.92506,987.57904 202.09746,970.01034 C 218.10395,944.83997 281.43491,949.19669 272.1753,1012.3511 z " />
-  </g>
-  <g
-     id="g3157"
-     transform="matrix(0.4620139,0,0,0.4620139,-30.982179,-213.54269)">
-    <path
-       id="path4657"
-       style="fill:url(#radialGradient24215);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient24217);stroke-width:8.68754482;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline"
-       transform="matrix(0.439208,0.402631,-0.402631,0.439208,452.0883,515.4839)"
-       d="M 233.5,675.11218 C 233.5,697.34164 215.47946,715.36218 193.25,715.36218 C 171.02054,715.36218 153,697.34164 153,675.11218 C 153,652.88272 171.02054,634.86218 193.25,634.86218 C 215.47946,634.86218 233.5,652.88272 233.5,675.11218 L 233.5,675.11218 z " />
-    <path
-       id="path4659"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(2.550624e-2,0,0,0.246007,267.5415,704.8631)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path4661"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0,2.596917e-2,-0.177621,0,398.5423,892.248)"
-       d="M -45.194263,751.54019 L -142.80574,751.54019 L -94,667.00617 L -45.194263,751.54019 z " />
-    <path
-       id="path4663"
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.766457,0,0,0.766457,83.78826,119.5963)"
-       d="M 239.53242,1004.8976 C 239.53336,1006.5092 238.22718,1007.8161 236.61561,1007.8161 C 235.00403,1007.8161 233.69785,1006.5092 233.69879,1004.8976 C 233.69785,1003.286 235.00403,1001.9791 236.61561,1001.9791 C 238.22718,1001.9791 239.53336,1003.286 239.53242,1004.8976 L 239.53242,1004.8976 z " />
-    <path
-       id="path6522"
-       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:3.06582808;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
-       d="M 237.73786,895.32552 C 234.1602,875.28872 258.41359,849.27115 283.04568,868.61832 C 296.47341,879.16509 274.82318,881.15897 274.82318,881.15897 L 305.93346,902.62755 L 308.96709,865.06662 C 308.96709,865.06662 300.01267,876.33878 291.44951,862.87313 C 279.18122,843.58112 230.64077,846.92036 237.73786,895.32552 z " />
-  </g>
-  <g
-     id="g6581"
-     transform="matrix(0.4620139,0,0,0.4620139,209.47582,-116.03325)">
-    <text
-       xml:space="preserve"
-       id="text6554"
-       style="font-size:83.65219116px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline;font-family:Bitstream Vera Sans Mono"
-       transform="scale(0.849987,1.176489)"
-       y="781.05951"
-       x="441.81683"><tspan
-         id="tspan6556"
-         y="781.05951"
-         x="441.81683">7</tspan></text>
-    <text
-       xml:space="preserve"
-       id="text6567"
-       style="font-size:85.42720032px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       transform="scale(0.865098,1.155939)"
-       y="794.94482"
-       x="392.89487"><tspan
-         id="tspan6569"
-         y="794.94482"
-         x="392.89487">A</tspan></text>
-  </g>
-  <path
-     id="path6599"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 31.433469,254.58377 L 62.850463,254.58377" />
-  <path
-     id="path6601"
-     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.84805799;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-     d="M 45.524822,245.6899 C 45.524822,248.05017 43.197748,249.96354 40.327159,249.96354 C 37.456571,249.96354 35.129496,248.05017 35.129496,245.6899 C 35.129496,243.32964 37.456571,241.41626 40.327159,241.41626 C 43.197748,241.41626 45.524822,243.32964 45.524822,245.6899 z " />
-  <path
-     id="path6603"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.42819726;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     d="M 45.690556,244.58059 L 45.690556,225.81728" />
-  <path
-     id="path6605"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.84805834;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     d="M 31.433469,245.11247 L 62.850463,245.11247" />
-  <path
-     id="path6613"
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.75689816;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 45.211872,248.30696 C 53.916759,256.05016 61.792607,248.30696 61.792607,248.30696 L 61.792607,248.30696" />
-  <g
-     id="g7524"
-     transform="matrix(0.4620139,0,0,0.4620139,-175.23163,-163.90485)">
-    <path
-       id="path7504"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 585.0017,844.15855 C 602.49482,844.62917 602.91034,855.96653 602.92,869.91032 C 598.16937,855.2754 600.30365,852.13282 585.05395,852.1641 C 584.96681,840.1224 585.07508,856.20106 585.0017,844.15855 z " />
-    <path
-       id="path7506"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 552.34524,905.79099 L 620.34524,905.79099" />
-    <path
-       id="path7508"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="translate(207.3452,216.9288)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path7510"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 583.20376,904.92693 L 583.20376,844.15505" />
-    <path
-       id="path7512"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 552.34524,885.29099 L 620.34524,885.29099" />
-    <path
-       id="path7514"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 584.86442,854.36228 C 602.35754,854.8329 602.77306,866.17026 602.78272,880.11405 C 598.03209,865.47913 600.16637,862.33655 584.91667,862.36783 C 584.82953,850.32613 584.9378,866.40479 584.86442,854.36228 z " />
-    <path
-       id="path7522"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 584.74905,864.74215 C 602.24217,865.21277 602.65769,876.55013 602.66735,890.49392 C 597.91672,875.859 600.051,872.71642 584.8013,872.7477 C 584.71416,860.706 584.82243,876.78466 584.74905,864.74215 z " />
-  </g>
-  <text
-     xml:space="preserve"
-     id="text7535"
-     style="font-size:43.93042374px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-     y="258.69415"
-     x="131.20235"><tspan
-       id="tspan7537"
-       y="258.69415"
-       x="131.20235">X</tspan></text>
-  <rect
-     id="rect3132"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.27638"
-     x="362.48758"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g22906"
-     transform="matrix(0.4620139,0,0,0.4620139,-128.59214,-40.755341)">
-    <g
-       id="g3134"
-       style="display:inline"
-       transform="translate(420,-56)">
-      <rect
-         id="rect3136"
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.00020504;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.688085,-0.72563,0.715699,0.698409,0,0)"
-         y="574.77551"
-         x="-255.44737"
-         height="17.583229"
-         width="21.502913" />
-      <path
-         id="path3138"
-         style="fill:url(#linearGradient24219);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 243.56035,571.18984 L 263.2346,590.38882 L 293.42803,558.54794 L 293.4154,558.53561 C 301.52985,549.73696 303.79917,538.50041 298.44593,533.27648 C 293.09269,528.05257 282.1187,530.79473 273.76641,539.36129 L 273.75378,539.34896 L 243.56035,571.18984 z " />
-      <g
-         id="g3140"
-         style="stroke:none;stroke-width:10.65287209;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.193838,-0.204415,0.201505,0.196637,23.43035,509.7359)">
-        <rect
-           id="rect3142"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           y="772.02551"
-           x="349.14398"
-           height="13.878055"
-           width="13.878055" />
-        <rect
-           id="rect3144"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10.65287209;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           y="746.92316"
-           x="349.14398"
-           height="13.878055"
-           width="13.878055" />
-      </g>
-      <path
-         id="path3146"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.60036874;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.833248,0,0,0.833248,129.3815,-26.35132)"
-         d="M 197,683.36218 C 197,686.67589 194.53757,689.36218 191.5,689.36218 C 188.46243,689.36218 186,686.67589 186,683.36218 C 186,680.04847 188.46243,677.36218 191.5,677.36218 C 194.53757,677.36218 197,680.04847 197,683.36218 z " />
-    </g>
-    <path
-       id="path3155"
-       style="opacity:0.77999998;fill:#54fb00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.06582808;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 654.67947,481.30948 C 671.50634,485.47105 691.20183,476.90604 703.07467,498.55094 C 710.65078,512.36265 691.10137,509.32277 691.10137,509.32277 L 710.70966,541.63785 L 728.84064,508.60311 C 728.84064,508.60311 713.68537,511.93526 713.75245,499.43667 C 713.85441,480.43967 677.04539,468.19461 654.67947,481.30948 z " />
-  </g>
-  <g
-     id="g2984"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,2.4823692)">
-    <path
-       d="M 473.91549,228.39543 L 503.52151,228.39543 L 494.31141,250.30197 L 464.70541,250.30197 L 473.91549,228.39543 z "
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.19935703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4077" />
-    <path
-       d="M 465.8716,242.66801 C 457.85088,243.15429 450.87214,250.19294 449.6808,254.85001 C 448.51947,259.38984 451.02706,270.56827 451.51297,272.8567 C 451.6029,273.28028 483.60065,277.33052 487.42071,277.33052 C 487.10293,275.04314 486.74,264.16077 486.75029,260.80871 C 486.7958,246.14798 497.04867,243.29583 497.04867,243.29583 L 465.8716,242.66801 z "
-       style="fill:url(#linearGradient2965);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.19935703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4079" />
-    <path
-       d="M 510.16898,253.44014 C 510.16898,262.83065 509.90505,265.86991 509.39031,270.98061 C 509.07588,271.39519 488.53309,277.05516 488.2226,277.2314 C 487.63413,272.87125 487.10279,267.26973 486.81642,262.60668 C 486.36062,255.18458 488.98526,244.14373 498.77684,243.30141 C 505.28118,242.73637 510.16898,244.04965 510.16898,253.44014 z "
-       style="fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.19935703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="path4081" />
-    <path
-       d="M 483.93125,219.15972 L 505.35222,219.70474 C 505.35222,219.70474 497.19703,227.01978 492.57362,243.06222 C 486.11649,243.05892 475.88372,242.31859 471.15266,242.51721 C 475.97613,226.15961 483.93125,219.15972 483.93125,219.15972 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.64020598;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="path4083" />
-    <path
-       d="M 461.76935,250.44422 C 461.76935,250.44422 479.22571,251.67783 479.50502,251.67783 C 479.78432,251.67783 482.717,247.27206 482.717,247.27206 L 465.67958,246.56713 L 461.76935,250.44422 z "
-       style="fill:#00ff00;fill-rule:evenodd;stroke:#000000;stroke-width:0.7701804;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4085" />
-    <rect
-       width="24.171026"
-       height="4.7582488"
-       x="458.91107"
-       y="213.1582"
-       transform="matrix(0.993753,0.111602,0,1,0,0)"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.35410452;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4087" />
-    <path
-       d="M 484.04633,225.10371 L 497.20059,225.24777"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79983926px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path4089" />
-    <path
-       d="M 479.88274,230.77745 L 493.03699,230.9215"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79983926px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path4091" />
-    <path
-       d="M 477.19515,236.68367 L 490.34942,236.97178"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.79983926px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="path4093" />
-    <g
-       transform="matrix(0.870386,0,0,0.870386,65.82635,34.20091)"
-       id="g2980">
-      <rect
-         id="rect5886"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.87870872;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="-160.10472"
-         x="518.27454"
-         height="9.4662237"
-         width="33.064384"
-         transform="matrix(0.718795,0.695222,-0.7174,0.696661,0,0)" />
-      <path
-         id="rect5888"
-         style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.89792925;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 481.88591,246.17093 L 487.69785,248.42527 L 480.23833,255.66914 L 477.45311,250.64427 L 481.88591,246.17093 z " />
-    </g>
-    <path
-       d="M 454.79288,222.68432 C 462.78239,214.92578 475.74896,214.91317 483.75449,222.65618 C 491.76003,230.3992 491.77304,242.96569 483.78352,250.72423 C 475.79401,258.48277 462.82745,258.49537 454.8219,250.75237 C 446.81637,243.00936 446.80337,230.44285 454.79288,222.68432 L 454.79288,222.68432 z "
-       style="opacity:0.77999998;color:#000000;fill:url(#linearGradient2976);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.74589944;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path4100" />
-  </g>
-  <rect
-     id="rect3703"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.2746"
-     x="315.95493"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g7499"
-     transform="matrix(0.4373357,0,0,0.4683741,-13.068161,-74.527821)">
-    <g
-       id="g7361"
-       style="display:inline"
-       transform="matrix(0.518198,0.328578,-0.328578,0.518198,562.3445,-50.07558)">
-      <path
-         id="path7363"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-      <path
-         id="path7365"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 798.11196,486.32746 L 798.11196,425.55558" />
-      <path
-         id="path7367"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-      <path
-         id="path7369"
-         style="fill:url(#radialGradient24225);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    </g>
-    <path
-       id="rect3745"
-       style="color:#000000;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.945538,0.325513,0,1,0,0)"
-       d="M 822.72691,174.61087 L 889.276,169.13496 L 889.276,199.72689 L 823.4895,199.72689 L 822.72691,174.61087 z " />
-    <path
-       id="rect3739"
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.945538,0.325513,0,1,0,0)"
-       d="M 800.22229,188.70871 L 866.00876,188.70871 L 866.00876,219.30063 L 800.49191,214.62408 L 800.22229,188.70871 z " />
-    <rect
-       id="rect3741"
-       style="opacity:1;color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.882353,-0.470588,0,1,0,0)"
-       y="907.16882"
-       x="927.44476"
-       height="30.591925"
-       width="26.003122" />
-    <path
-       id="rect3743"
-       style="color:#000000;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.701289,-0.712877,0.945817,0.324701,0,0)"
-       d="M -198.67545,947.41547 L -177.04075,950.94075 L -171.02987,1011.6918 L -199.05916,1012.7404 L -198.67545,947.41547 z " />
-    <path
-       id="rect3753"
-       style="color:#000000;fill:url(#linearGradient24227);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 788.37444,442.41233 C 790.98554,441.49944 800.28366,439.76223 810.12708,450.22181 C 809.39758,451.00304 806.96255,454.45726 805.25704,455.95851 C 798.77005,448.84021 786.55315,444.31821 781.43076,448.7918 C 782.36313,447.56946 787.21848,443.63946 788.37444,442.41233 z " />
-    <g
-       id="g7353"
-       transform="matrix(0.996519,0,0,0.996519,3.974373,5.043832)">
-      <path
-         id="path4656"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.9099,425.55908 C 817.40302,426.0297 817.81854,437.36706 817.8282,451.31085 C 813.07757,436.67593 815.21185,433.53335 799.96215,433.56463 C 799.87501,421.52293 799.98328,437.60159 799.9099,425.55908 z " />
-      <path
-         id="path4662"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.78143692;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 798.11196,486.32746 L 798.11196,425.55558" />
-      <path
-         id="path4666"
-         style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         d="M 799.77262,435.76281 C 817.26574,436.23343 817.68126,447.57079 817.69092,461.51458 C 812.94029,446.87966 815.07457,443.73708 799.82487,443.76836 C 799.73773,431.72666 799.846,447.80532 799.77262,435.76281 z " />
-      <path
-         id="path4660"
-         style="fill:url(#radialGradient24229);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         transform="matrix(1.090643,0,0,1.062011,390.5269,-245.3025)"
-         d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    </g>
-  </g>
-  <path
-     id="rect3184"
-     style="fill:#929292;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.96170586;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     d="M 314.45226,173.63294 L 314.45226,173.91463 L 314.45226,215.23367 L 314.45226,215.51535 L 314.71634,215.51535 L 356.05299,215.51535 L 356.31707,215.51535 L 356.31707,215.23367 L 356.31707,173.91463 L 356.31707,173.63294 L 356.05299,173.63294 L 314.71634,173.63294 L 314.45226,173.63294 z M 314.98041,174.1787 L 355.77131,174.1787 L 355.77131,214.96959 L 314.98041,214.96959 L 314.98041,174.1787 z " />
-  <rect
-     id="rect3190"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.40111"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect3192"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="122.69855"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g8022"
-     transform="matrix(0.5633612,0,0,0.5633612,16.18383,2.0513492)">
-    <g
-       id="g6989"
-       transform="translate(-211.5918,-4.873514)">
-      <path
-         id="path4086"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.01236534px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 833.34122,225.07216 L 833.34122,286.35703" />
-      <path
-         id="path4088"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 843.52579,225.73634 L 843.52579,286.55437" />
-      <path
-         id="path4090"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 852.30857,225.73634 L 852.30857,286.55437" />
-      <path
-         id="path4092"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 861.09135,225.73634 L 861.09135,286.55437" />
-      <path
-         id="path4094"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 869.87413,225.73634 L 869.87413,286.55437" />
-      <path
-         id="path4096"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 878.6569,225.73634 L 878.6569,286.55437" />
-      <path
-         id="path4098"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 887.43968,225.73634 L 887.43968,286.55437" />
-      <path
-         id="path4101"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.22246,225.73634 L 896.22246,286.55437" />
-      <rect
-         id="rect4115"
-         style="color:#000000;fill:url(#linearGradient24231);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83745855;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="270.90326"
-         x="870.24017"
-         height="15.065637"
-         width="25.749367" />
-      <rect
-         id="rect3198"
-         style="color:#000000;fill:url(#linearGradient24233);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85693413;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="255.7885"
-         x="834.93457"
-         height="15.699371"
-         width="25.872597" />
-      <rect
-         id="rect3194"
-         style="color:#000000;fill:url(#linearGradient24235);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77284241;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="225.60927"
-         x="843.66455"
-         height="15.549897"
-         width="35.031761" />
-      <rect
-         id="rect3196"
-         style="color:#000000;fill:url(#linearGradient24237);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83925015;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="240.99434"
-         x="852.5072"
-         height="14.594875"
-         width="43.547024" />
-      <path
-         id="path6856"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 896.28272,225.35563 L 834.8784,225.35563" />
-      <path
-         id="path6858"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,240.53581 L 834.8784,240.53581" />
-      <path
-         id="path6860"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,255.71599 L 834.8784,255.71599" />
-      <path
-         id="path6862"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,270.89618 L 834.8784,270.89618" />
-      <path
-         id="path6864"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,286.07636 L 834.8784,286.07636" />
-      <rect
-         id="rect6880"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.53349"
-         x="843.96301"
-         height="2.1720431"
-         width="8.6314974" />
-      <rect
-         id="rect6882"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.22321"
-         x="857.89111"
-         height="2.7926269"
-         width="7.2583046" />
-      <rect
-         id="rect6884"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.34735"
-         x="852.98682"
-         height="3.1029184"
-         width="13.928099" />
-      <rect
-         id="rect6886"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="871.03455"
-         height="2.7926269"
-         width="2.7463856" />
-      <rect
-         id="rect6888"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="886.11169"
-         height="2.7926269"
-         width="9.2200089" />
-      <g
-         id="g6896"
-         transform="matrix(0.665193,0,0,1.080499,302.4562,-1.363347)">
-        <rect
-           id="rect6890"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect6892"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect6894"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-      <g
-         id="g6901"
-         style="display:inline"
-         transform="matrix(-0.665193,0,0,1.080499,1428.48,13.68581)">
-        <rect
-           id="rect6903"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect6905"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect6907"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-    </g>
-    <path
-       id="rect7021"
-       style="opacity:1;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 663.20513,248.15279 L 663.20513,258.18327 L 653.17465,258.18327 L 653.17465,266.32173 L 663.20513,266.32173 L 663.20513,276.35221 L 671.34359,276.35221 L 671.34359,266.32173 L 681.37407,266.32173 L 681.37407,258.18327 L 671.34359,258.18327 L 671.34359,248.15279 L 663.20513,248.15279 z " />
-  </g>
-  <g
-     id="g8088"
-     transform="matrix(0.5633612,0,0,0.5633612,16.18383,2.0513492)">
-    <g
-       id="g7916"
-       style="display:inline"
-       transform="translate(-211.5918,85.12649)">
-      <path
-         id="path7918"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.01236534px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 833.34122,225.07216 L 833.34122,286.35703" />
-      <path
-         id="path7920"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 843.52579,225.73634 L 843.52579,286.55437" />
-      <path
-         id="path7922"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 852.30857,225.73634 L 852.30857,286.55437" />
-      <path
-         id="path7924"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 861.09135,225.73634 L 861.09135,286.55437" />
-      <path
-         id="path7926"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 869.87413,225.73634 L 869.87413,286.55437" />
-      <path
-         id="path7928"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 878.6569,225.73634 L 878.6569,286.55437" />
-      <path
-         id="path7930"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 887.43968,225.73634 L 887.43968,286.55437" />
-      <path
-         id="path7932"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.22246,225.73634 L 896.22246,286.55437" />
-      <rect
-         id="rect7934"
-         style="color:#000000;fill:url(#linearGradient24239);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83745855;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="270.90326"
-         x="870.24017"
-         height="15.065637"
-         width="25.749367" />
-      <rect
-         id="rect7936"
-         style="color:#000000;fill:url(#linearGradient24241);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85693413;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="255.7885"
-         x="834.93457"
-         height="15.699371"
-         width="25.872597" />
-      <rect
-         id="rect7938"
-         style="color:#000000;fill:url(#linearGradient24243);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77284241;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="225.60927"
-         x="843.66455"
-         height="15.549897"
-         width="35.031761" />
-      <rect
-         id="rect7940"
-         style="color:#000000;fill:url(#linearGradient24245);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83925015;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="240.99434"
-         x="852.5072"
-         height="14.594875"
-         width="43.547024" />
-      <path
-         id="path7942"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 896.28272,225.35563 L 834.8784,225.35563" />
-      <path
-         id="path7944"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,240.53581 L 834.8784,240.53581" />
-      <path
-         id="path7946"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,255.71599 L 834.8784,255.71599" />
-      <path
-         id="path7948"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,270.89618 L 834.8784,270.89618" />
-      <path
-         id="path7950"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,286.07636 L 834.8784,286.07636" />
-      <rect
-         id="rect7952"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.53349"
-         x="843.96301"
-         height="2.1720431"
-         width="8.6314974" />
-      <rect
-         id="rect7954"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.22321"
-         x="857.89111"
-         height="2.7926269"
-         width="7.2583046" />
-      <rect
-         id="rect7956"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.34735"
-         x="852.98682"
-         height="3.1029184"
-         width="13.928099" />
-      <rect
-         id="rect7958"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="871.03455"
-         height="2.7926269"
-         width="2.7463856" />
-      <rect
-         id="rect7960"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="886.11169"
-         height="2.7926269"
-         width="9.2200089" />
-      <g
-         id="g7962"
-         transform="matrix(0.665193,0,0,1.080499,302.4562,-1.363347)">
-        <rect
-           id="rect7964"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect7966"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect7968"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-      <g
-         id="g7970"
-         style="display:inline"
-         transform="matrix(-0.665193,0,0,1.080499,1428.48,13.68581)">
-        <rect
-           id="rect7972"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect7974"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect7976"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-    </g>
-    <rect
-       id="rect7913"
-       style="color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4.24493694;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       y="347.35495"
-       x="653.5304"
-       height="8.7881775"
-       width="27.46998" />
-  </g>
-  <g
-     id="g20319"
-     transform="matrix(0.4655032,0,0,0.4314278,354.03978,-4.4490608)">
-    <g
-       id="g20300">
-      <path
-         style="fill:url(#linearGradient24247);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -75.575296,431.90521 C -73.937648,432.42571 -29.496247,420.64933 -29.496247,420.64933 C -34.637534,448.2407 -15.25247,459.98469 -8.1305811,479.65236 L -58.396477,498.5955 C -69.087342,473.32972 -80.466399,465.44724 -75.575296,431.90521 z "
-         id="path10175"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -71.027778,449.99442 C -70.009501,447.53999 -68.398618,441.37472 -66.969552,437.93014 C -65.946608,435.46446 -65.237025,431.67221 -63.993519,434.66952 C -63.084799,436.85988 -62.911325,441.30405 -62.911325,443.47319 C -62.911325,444.79542 -62.636319,446.10316 -62.370228,447.38592"
-         id="path19269" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -58.853099,439.23438 C -58.853099,440.64638 -59.715197,444.76223 -57.500357,445.42956 C -57.025146,445.57274 -55.050818,440.65767 -54.794872,439.88651"
-         id="path19271" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -49.925001,429.45254 C -48.979735,429.73734 -50.352286,444.55483 -50.736646,446.40774 C -50.826829,446.84249 -50.917011,445.53824 -51.007194,445.10349"
-         id="path19273" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -50.736646,438.58226 C -51.021829,439.95706 -48.592058,437.30188 -47.760613,436.29983"
-         id="path19275" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -43.972935,438.58226 C -45.10834,444.05576 -35.210389,422.24755 -41.808548,424.23555 C -43.159642,424.64263 -43.033905,437.5076 -43.702387,443.14712 C -43.767419,443.69575 -43.882752,442.06025 -43.972935,441.51682"
-         id="path19277" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.66676152;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -39.914709,437.93014 C -40.051984,439.08824 -38.611318,432.0897 -37.750321,437.27802 C -37.588459,438.25339 -37.479773,446.95305 -37.479773,443.14712"
-         id="path19279" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.18195009;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M -60.782843,484.92628 C -54.577716,469.84232 -40.969952,454.28974 -30.680157,448.6469"
-         id="path20180" />
-      <g
-         id="g20290"
-         transform="matrix(1,-0.116962,0.135948,0.984099,-62.09387,4.364348)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           id="rect9275"
-           d="M -49.982767,486.1569 L -39.137026,471.65336 L -34.873557,476.58849 L -46.697446,486.95336 L -49.982767,486.1569 z "
-           style="color:#000000;fill:#241f1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.00000095;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           sodipodi:nodetypes="ccccccccc"
-           id="rect4009"
-           d="M -2.7603501,424.87027 L 1.0377747,429.26675 C 1.5585103,429.86953 0.97082956,431.61824 -0.27989515,433.18765 L -14.302519,453.07614 C -15.553233,454.64553 -32.240422,475.73483 -32.76115,475.13207 L -39.414996,467.42998 C -39.935728,466.82721 -23.123949,445.88214 -21.873234,444.31274 L -5.957931,426.6151 C -4.7072063,425.04569 -3.2810857,424.2675 -2.7603501,424.87027 z "
-           style="color:#000000;fill:url(#linearGradient24249);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-        <path
-           sodipodi:nodetypes="czcczzc"
-           id="path8380"
-           d="M -52.721673,489.88632 C -52.721673,489.88632 -47.18516,478.65824 -45.320698,475.65775 C -43.451737,472.65001 -40.499168,469.76234 -40.499168,469.76234 L -36.773772,474.21779 C -36.773772,474.21779 -37.426884,475.05544 -38.182951,478.38207 C -38.930141,481.66963 -42.073061,481.41261 -44.158348,482.0615 C -46.243634,482.71038 -52.25841,489.68578 -52.721673,489.88632 z "
-           style="fill:url(#linearGradient24251);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.8796891;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        <rect
-           transform="matrix(0.66655,-0.74546,0.663245,0.748402,0,0)"
-           y="281.93237"
-           x="-345.08524"
-           height="14.299413"
-           width="2.7105966"
-           id="rect8378"
-           style="color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.65272236;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-      </g>
-    </g>
-    <path
-       id="path20317"
-       d="M -69.85298,443.99975 C -70.332761,443.63992 -66.057745,443.13276 -62.012339,440.43582 C -61.570288,440.14112 -61.061958,439.96063 -60.586768,439.72304"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-  <rect
-     id="rect23627"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.68457"
-     x="26.005444"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23629"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="74.339523"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23631"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="122.47703"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23633"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="170.61453"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23635"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="218.75206"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23637"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="266.88956"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23639"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="315.02707"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect23685"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="317.88116"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g9766"
-     transform="matrix(0.6801604,0,0,0.6801604,-159.07802,125.64074)">
-    <path
-       sodipodi:nodetypes="cscscssc"
-       id="path12302"
-       d="M 690.29712,806.33899 C 696.73115,809.91842 713.17167,819.01654 707.91834,831.53579 C 703.26078,842.63527 700.72452,845.85918 700.72452,845.85918 C 700.72452,845.85918 699.44562,841.814 697.414,840.56405 C 695.42042,839.33751 693.67845,839.19193 693.67845,839.19193 C 694.47719,836.67574 698.83819,830.56582 698.32224,826.59934 C 697.59598,821.01469 684.02284,817.86365 683.7315,812.80058 C 683.44016,807.7375 684.69006,805.11665 690.29712,806.33899 z "
-       style="fill:#ffda5c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       inkscape:transform-center-y="-1.3957057"
-       inkscape:transform-center-x="-2.2680218"
-       transform="matrix(-0.972446,-0.834234,0.747504,-1.033058,657.2054,2164.879)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path5951"
-       style="fill:url(#radialGradient6081);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csssssz"
-       id="path12291"
-       d="M 688.00688,782.73476 C 681.28413,779.25117 636.10673,778.4231 623.43682,783.90136 C 610.7669,789.37962 601.34418,795.50064 598.80599,803.20934 C 596.26779,810.91805 591.53198,823.47835 597.77932,831.12638 C 604.02665,838.7744 614.16395,843.81797 625.80657,844.09786 C 637.44919,844.37775 687.99759,843.58515 690.71721,840.07417 C 693.43684,836.56318 694.54874,786.12462 688.00688,782.73476 z "
-       style="fill:#ff7f2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="czzzz"
-       id="rect12289"
-       d="M 626.64537,790.62125 C 632.05743,782.1495 680.48654,782.60978 684.9113,788.66276 C 689.23278,794.57446 689.9078,830.0134 685.86504,834.26646 C 681.77401,838.57032 631.7887,841.09821 627.59911,836.22495 C 623.21793,831.12883 621.35549,798.90174 626.64537,790.62125 z "
-       style="fill:url(#linearGradient7977);fill-opacity:1;stroke:#000000;stroke-width:1.29999948;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path12298"
-       d="M 644.62512,816.02125 C 653.16596,828.20399 670.13139,826.24078 675.81727,813.32745 C 666.29419,818.61805 649.49978,817.30747 644.62512,816.02125 z "
-       style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <g
-       transform="matrix(1.045493,-5.786072e-2,-0.131469,1.028004,178.2572,93.9675)"
-       id="g13235"
-       style="stroke:#000000;stroke-width:1.25842619;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         style="fill:url(#linearGradient6085);fill-opacity:1;stroke:#000000;stroke-width:1.25842619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 514.6665,745.65582 C 514.6665,745.65582 532.11281,743.73672 541.53383,745.65582 C 550.95484,747.57491 552.35056,753.3322 552.35056,753.3322 L 552.35056,795.20338 C 552.35056,795.20338 550.60591,789.70778 541.1849,787.87592 C 531.76388,786.04405 514.6665,787.87592 514.6665,787.87592 L 514.6665,745.65582 z "
-         id="rect12334"
-         sodipodi:nodetypes="czcczcc" />
-      <path
-         style="fill:url(#linearGradient6087);fill-opacity:1;stroke:#000000;stroke-width:1.25842619;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 590.03462,746.0823 C 590.03462,746.0823 572.58831,744.1632 563.16729,746.0823 C 553.74628,748.00139 552.35056,753.75868 552.35056,753.75868 L 552.35056,795.62986 C 552.35056,795.62986 554.09521,790.13426 563.51622,788.3024 C 572.93724,786.47053 590.03462,788.3024 590.03462,788.3024 L 590.03462,746.0823 z "
-         id="path13231"
-         sodipodi:nodetypes="czcczcc" />
-    </g>
-    <path
-       sodipodi:nodetypes="csssccczc"
-       id="path12332"
-       d="M 695.41019,838.62042 C 700.14569,841.15924 700.88837,843.47237 700.32054,848.50081 C 699.91686,852.0756 697.61441,855.10314 694.13438,856.67894 C 691.47288,857.8841 687.41491,857.32238 684.23254,856.09748 C 682.29552,855.35192 683.08837,852.66442 684.31205,852.58794 C 683.36498,851.99335 683.02181,849.44083 684.83359,849.02147 C 683.26668,848.4213 684.19241,845.40115 685.54978,845.44861 C 684.52439,844.51298 684.51889,841.35152 686.74802,841.75345 C 688.85054,842.13256 695.53607,841.79196 695.41019,838.62042 z "
-       style="fill:#f4d7d7;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssscccsc"
-       id="path12327"
-       d="M 616.47306,842.59642 C 609.11971,841.85248 608.289,842.5384 606.36072,847.21702 C 604.54093,851.63234 602.80301,855.13257 605.57704,857.75909 C 608.26763,860.30661 611.06,861.66953 615.97938,862.18413 C 619.3229,862.53389 619.44445,859.85288 618.55719,858.94771 C 619.41319,858.74371 621.21149,857.26159 620.00408,855.5157 C 621.66781,855.41218 621.94956,852.3917 620.74187,851.47597 C 622.117,850.9917 625.27655,846.97293 615.7578,846.89124 C 614.59263,846.88124 615.68265,844.97239 616.47306,842.59642 z "
-       style="fill:#f4d7d7;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cscscssc"
-       id="path12300"
-       d="M 601.98808,811.38003 C 593.42745,816.90941 572.79691,830.36838 583.46745,841.45089 C 594.13798,852.53338 603.50388,855.77314 603.50388,855.77314 C 603.50388,855.77314 603.63238,852.67913 606.26744,847.43369 C 608.15568,843.6749 611.44568,842.47821 611.44568,842.47821 C 609.43579,840.29378 595.22475,838.91411 596.36391,833.59398 C 597.52277,828.18182 616.19414,825.80432 613.95955,815.54536 C 612.86556,810.52288 610.0553,808.40088 601.98808,811.38003 z "
-       style="fill:#ffda5c;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       transform="matrix(0.64065,-7.819027e-2,8.137048e-2,0.615612,182.9143,353.6568)"
-       d="M 632.25471 802.35638 A 5.2338967 5.40836 0 1 1  621.78692,802.35638 A 5.2338967 5.40836 0 1 1  632.25471 802.35638 z"
-       sodipodi:ry="5.40836"
-       sodipodi:rx="5.2338967"
-       sodipodi:cy="802.35638"
-       sodipodi:cx="627.02081"
-       id="path12294"
-       style="fill:#000000;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.745485,-9.468581e-2,9.468581e-2,0.745485,107.8102,266.4833)"
-       d="M 630.39072 795.33301 A 2.2205544 2.2822363 0 1 1  625.94961,795.33301 A 2.2205544 2.2822363 0 1 1  630.39072 795.33301 z"
-       sodipodi:ry="2.2822363"
-       sodipodi:rx="2.2205544"
-       sodipodi:cy="795.33301"
-       sodipodi:cx="628.17017"
-       id="path13247"
-       style="fill:#ffffff;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.64065,-7.819027e-2,8.137048e-2,0.615612,203.1678,353.6921)"
-       d="M 632.25471 802.35638 A 5.2338967 5.40836 0 1 1  621.78692,802.35638 A 5.2338967 5.40836 0 1 1  632.25471 802.35638 z"
-       sodipodi:ry="5.40836"
-       sodipodi:rx="5.2338967"
-       sodipodi:cy="802.35638"
-       sodipodi:cx="627.02081"
-       id="path4998"
-       style="fill:#000000;stroke:#000000;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.738859,-9.589021e-2,9.384422e-2,0.754968,132.7997,259.5372)"
-       d="M 630.39072 795.33301 A 2.2205544 2.2822363 0 1 1  625.94961,795.33301 A 2.2205544 2.2822363 0 1 1  630.39072 795.33301 z"
-       sodipodi:ry="2.2822363"
-       sodipodi:rx="2.2205544"
-       sodipodi:cy="795.33301"
-       sodipodi:cx="628.17017"
-       id="path5000"
-       style="fill:#ffffff;stroke:none;stroke-width:1.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(-0.117288,-1.501864,1.255807,-0.260356,-349.076,1925.719)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path5027"
-       style="fill:url(#radialGradient7982);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(1.133228,-0.787475,0.869641,1.065272,-780.3416,382.5937)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path6113"
-       style="fill:url(#radialGradient6115);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <g
-       style="opacity:0.67000002"
-       transform="translate(-2.351629e-6,-2.093557)"
-       id="g5050">
-      <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.3220526;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
-         d="M 634.41022,795.67887 C 634.41022,801.40692 632.13944,806.95204 640.51512,817.50771 C 625.71185,808.81231 615.76813,815.5429 609.09378,815.5429 C 595.11911,815.5429 583.77735,806.64381 583.77735,795.67887 C 583.77735,784.71392 595.11911,775.81484 609.09378,775.81484 C 623.06845,775.81484 634.41022,784.71392 634.41022,795.67887 z "
-         id="path4026"
-         sodipodi:nodetypes="ccsssc" />
-      <text
-         xml:space="preserve"
-         style="font-size:43.05487061px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="534.76764"
-         y="902.87823"
-         id="text4029"
-         transform="scale(1.11482,0.897006)"><tspan
-           sodipodi:role="line"
-           id="tspan4031"
-           x="534.76764"
-           y="902.87823">?</tspan></text>
-    </g>
-    <path
-       transform="matrix(1.202308,-0.907638,0.895676,0.917932,-862.0372,601.6811)"
-       d="M 606.60861 827.13019 A 10.991182 2.6169484 0 1 1  584.62625,827.13019 A 10.991182 2.6169484 0 1 1  606.60861 827.13019 z"
-       sodipodi:ry="2.6169484"
-       sodipodi:rx="10.991182"
-       sodipodi:cy="827.13019"
-       sodipodi:cx="595.61743"
-       id="path9762"
-       style="fill:url(#radialGradient9764);fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="arc" />
-  </g>
-  <rect
-     id="rect4131"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="455.34137"
-     x="26.202015"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4133"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="455.34137"
-     x="74.713554"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4135"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="455.13403"
-     x="123.14871"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4137"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="453.80078"
-     x="170.95718"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4139"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="453.80078"
-     x="219.48363"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4141"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.4375"
-     x="268.23099"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4143"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.4375"
-     x="317.33041"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g4145"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4147"
-       style="fill:url(#linearGradient4526);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 28.033255,951.24411 L 38.230475,967.49704 L 28.033255,967.49704 L 45.156086,994.76755 L 62.278917,1022.038 L 79.401751,994.76755 L 96.524582,967.49704 L 86.327363,967.49704 L 96.524582,951.24411 L 62.278917,951.24411 L 28.033255,951.24411 z " />
-    <path
-       id="path4149"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 68.907579,979.062 L 53.232542,988.3243 L 37.557505,997.5866 L 53.232542,1006.8488 L 68.907579,1016.1261 L 68.907579,1003.9374 L 88.442449,1003.9374 L 88.442449,991.2508 L 68.907579,991.2508 L 68.907579,979.062 z " />
-  </g>
-  <g
-     id="g4151"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4153"
-       style="fill:url(#linearGradient4528);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 133.75435,951.96518 L 143.95157,968.21811 L 133.75435,968.21811 L 150.87718,995.48862 L 168.00001,1022.7591 L 185.12284,995.48862 L 202.24567,968.21811 L 192.04845,968.21811 L 202.24567,951.96518 L 168.00001,951.96518 L 133.75435,951.96518 z " />
-    <path
-       id="path4155"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 162.09241,979.062 L 177.76744,988.3243 L 193.44248,997.5866 L 177.76744,1006.8488 L 162.09241,1016.1261 L 162.09241,1003.9374 L 142.55754,1003.9374 L 142.55754,991.2508 L 162.09241,991.2508 L 162.09241,979.062 z " />
-  </g>
-  <g
-     id="g4157"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,46.449199)">
-    <path
-       id="path4159"
-       style="fill:url(#linearGradient4530);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 238.75435,895.9652 L 248.95157,912.21813 L 238.75435,912.21813 L 255.87718,939.48864 L 273.00001,966.7591 L 290.12284,939.48864 L 307.24567,912.21813 L 297.04845,912.21813 L 307.24567,895.9652 L 273.00001,895.9652 L 238.75435,895.9652 z " />
-    <path
-       id="path4161"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 245.46663,926.60502 L 245.46663,936.8248 L 235.24685,936.8248 L 235.24685,946.3632 L 245.46663,946.3632 L 245.46663,956.5831 L 255.00509,956.5831 L 255.00509,946.3632 L 265.22487,946.3632 L 265.22487,936.8248 L 255.00509,936.8248 L 255.00509,926.60502 L 245.46663,926.60502 z " />
-    <rect
-       id="rect4163"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4.23082352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       y="937.00116"
-       x="285.13812"
-       height="9.1857538"
-       width="27.285976" />
-  </g>
-  <g
-     id="g4165"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4167"
-       style="fill:url(#linearGradient4532);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 343.58903,951.96517 L 353.78625,968.2181 L 343.58903,968.2181 L 360.71186,995.48861 L 377.8347,1022.7591 L 394.95753,995.48861 L 412.08036,968.2181 L 401.88314,968.2181 L 412.08036,951.96517 L 377.8347,951.96517 L 343.58903,951.96517 z " />
-    <path
-       id="path4169"
-       style="opacity:1;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.43875265;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 351.24094,977.84406 L 351.24094,1017.3441 L 362.80344,1017.3441 L 362.80344,1003.0629 L 369.20969,1006.8441 L 384.89719,1016.1254 L 384.89719,1003.9379 L 404.42844,1003.9379 L 404.42844,991.25031 L 384.89719,991.25031 L 384.89719,979.06281 L 369.20969,988.31281 L 362.80344,992.12531 L 362.80344,977.84406 L 351.24094,977.84406 z " />
-  </g>
-  <g
-     id="g4171"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,20.576369)">
-    <path
-       id="path4173"
-       style="fill:url(#linearGradient4534);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 447.06727,951.96518 L 457.26449,968.21811 L 447.06727,968.21811 L 464.1901,995.48862 L 481.31293,1022.7591 L 498.43576,995.48862 L 515.55859,968.21811 L 505.36137,968.21811 L 515.55859,951.96518 L 481.31293,951.96518 L 447.06727,951.96518 z " />
-    <path
-       id="path4175"
-       style="opacity:1;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.43875265;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 507.90668,977.84406 L 507.90668,1017.3441 L 496.34418,1017.3441 L 496.34418,1003.0629 L 489.93793,1006.8441 L 474.25043,1016.1254 L 474.25043,1003.9379 L 454.71918,1003.9379 L 454.71918,991.25031 L 474.25043,991.25031 L 474.25043,979.06281 L 489.93793,988.31281 L 496.34418,992.12531 L 496.34418,977.84406 L 507.90668,977.84406 z " />
-  </g>
-  <g
-     id="g4177"
-     transform="matrix(0.4620139,0,0,0.4620139,17.888983,46.449199)">
-    <path
-       id="path4179"
-       style="fill:url(#linearGradient4536);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 552.09953,895.24411 L 562.29675,911.49704 L 552.09953,911.49704 L 569.22236,938.76755 L 586.34519,966.038 L 603.46802,938.76755 L 620.59085,911.49704 L 610.39363,911.49704 L 620.59085,895.24411 L 586.34519,895.24411 L 552.09953,895.24411 z " />
-    <path
-       id="path4181"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 596.42552,926.94358 L 596.42552,938.53032 L 584.10133,938.53032 L 584.10133,949.34454 L 596.42552,949.34454 L 596.42552,960.93142 L 607.9281,960.93142 L 607.9281,949.34454 L 620.25229,949.34454 L 620.25229,938.53032 L 607.9281,938.53032 L 607.9281,926.94358 L 596.42552,926.94358 z " />
-  </g>
-  <g
-     id="g4183"
-     transform="matrix(0.4620139,0,0,0.4620139,18.349914,45.009029)">
-    <path
-       id="path4185"
-       style="fill:url(#linearGradient4538);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 657.61003,895.96518 L 667.80725,912.21811 L 657.61003,912.21811 L 674.73286,939.48862 L 691.85569,966.7591 L 708.97852,939.48862 L 726.10135,912.21811 L 715.90413,912.21811 L 726.10135,895.96518 L 691.85569,895.96518 L 657.61003,895.96518 z " />
-    <rect
-       id="rect4187"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:4.21595383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="939.37506"
-       x="689.06104"
-       height="11.648645"
-       width="35.517338" />
-  </g>
-  <rect
-     id="rect4189"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.4375"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <g
-     id="g4191"
-     transform="matrix(0.8455204,0,0,0.7937234,-71.949331,-179.18452)">
-    <path
-       id="path4193"
-       style="color:#000000;fill:url(#radialGradient4540);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4542);stroke-width:19.88428688;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.253681,-2.501311e-2,2.459378e-2,0.246667,229.9229,877.6432)"
-       d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-    <path
-       id="path4195"
-       style="color:#000000;fill:url(#radialGradient4544);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4546);stroke-width:24.22555733;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(7.590656e-2,-7.48444e-3,8.865423e-3,8.891693e-2,402.9419,934.5995)"
-       d="M 1044.2857,467.36218 C 1044.3227,533.26967 994.10381,586.71913 932.14286,586.71913 C 870.18191,586.71913 819.96301,533.26967 820.00002,467.36218 C 819.96301,401.45469 870.18191,348.00523 932.14286,348.00523 C 994.10381,348.00523 1044.3227,401.45469 1044.2857,467.36218 L 1044.2857,467.36218 z " />
-    <path
-       id="path4198"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,281.3689,848.9056)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4200"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,302.3878,837.0276)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4202"
-       style="color:#000000;fill:#000000;fill-opacity:0.44495413;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,325.3773,845.8586)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4204"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,275.7409,869.832)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4206"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,332.8209,863.8999)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4208"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,326.1424,885.6138)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4210"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:15;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       transform="matrix(0.368913,-3.637513e-2,2.971842e-2,0.298064,287.9716,890.5937)"
-       d="M 441.43666,400.56125 C 441.43666,402.65335 439.85375,404.34932 437.90112,404.34932 C 435.9485,404.34932 434.36559,402.65335 434.36559,400.56125 C 434.36559,398.46915 435.9485,396.77318 437.90112,396.77318 C 439.85375,396.77318 441.43666,398.46915 441.43666,400.56125 z " />
-    <path
-       id="path4212"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4548);stroke-width:3.50856757;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 451.50995,943.25668 C 435.78414,960.38604 437.18199,983.78233 452.90778,996.73372" />
-    <path
-       id="path4214"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4550);stroke-width:2.95746279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 468.42158,952.25773 C 454.79821,963.2013 456.00919,978.14862 469.63254,986.42309" />
-    <path
-       id="path4216"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4552);stroke-width:3.47961354;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 505.32732,943.2543 C 520.79326,960.38517 519.4185,983.78352 503.95255,996.73612" />
-    <path
-       id="path4218"
-       style="fill:none;fill-rule:evenodd;stroke:url(#radialGradient4554);stroke-width:2.96080017;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 488.70524,951.88864 C 502.07067,963.06859 500.88263,978.33881 487.51722,986.79199" />
-    <path
-       id="path4220"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 465.49828,937.54255 C 475.04316,934.00456 478.02606,940.68448 481.42441,949.00956 C 475.30206,941.30677 475.6879,938.96409 467.47456,942.31203 C 464.4973,935.13979 468.46833,944.71828 465.49828,937.54255 z " />
-    <path
-       id="path4222"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.539089,-0.218317,0.243345,0.597197,109.4028,645.3595)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path4224"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.31586146;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 479.31673,974.22578 L 464.52817,937.93298" />
-    <path
-       id="path4226"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 467.90731,943.66616 C 477.45219,940.12817 480.43507,946.80809 483.83344,955.13317 C 477.71109,947.43038 478.09693,945.08769 469.88359,948.43564 C 466.90632,941.2634 470.87734,950.8419 467.90731,943.66616 z " />
-    <path
-       id="path4228"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 470.37101,949.89018 C 479.91589,946.35219 482.89878,953.03211 486.29715,961.3572 C 480.1748,953.6544 480.56062,951.31171 472.34729,954.65967 C 469.37002,947.48741 473.34105,957.06591 470.37101,949.89018 z " />
-    <path
-       id="path4230"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 505.72899,950.50171 C 520.25906,957.10155 515.96029,967.3979 510.25127,979.88426 C 512.25344,965.10468 515.33826,963.04516 502.49058,957.68701 C 507.35452,946.87609 500.85315,961.30851 505.72899,950.50171 z " />
-    <path
-       id="path4232"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       transform="matrix(0.841647,0.353197,-0.410015,0.895235,445.2498,255.6813)"
-       d="M 375.5,689.61218 C 375.5,694.72081 370.4632,698.86218 364.25,698.86218 C 358.0368,698.86218 353,694.72081 353,689.61218 C 353,684.50355 358.0368,680.36218 364.25,680.36218 C 370.4632,680.36218 375.5,684.50355 375.5,689.61218 z " />
-    <path
-       id="path4234"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.58397031;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 479.29983,1004.2686 L 504.21719,949.86355" />
-  </g>
-  <rect
-     id="rect4236"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="408.94916"
-     x="26.005444"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4238"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="74.339523"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4240"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="122.47703"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4242"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="170.61453"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4244"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="218.75206"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4246"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="266.88956"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4248"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="315.02707"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045" />
-  <rect
-     id="rect4250"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;opacity:1"
-     y="409.14569"
-     x="363.16461"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/blue_serious/layout_compact.png"
-     inkscape:export-xdpi="51.581036"
-     inkscape:export-ydpi="51.581036" />
-  <g
-     id="g4252"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,93.746929)">
-    <path
-       id="path4254"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.76050973;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 46.333943,612.72709 L 63.936792,612.72709" />
-    <path
-       id="path4256"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       d="M 40.861277,617.58222 C 40.861277,621.77182 36.730582,625.16817 31.635118,625.16817 C 26.539654,625.16817 22.408959,621.77182 22.408959,617.58222 C 22.408959,613.39261 26.539654,609.99626 31.635118,609.99626 C 36.730582,609.99626 40.861277,613.39261 40.861277,617.58222 z " />
-    <path
-       id="path4258"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 40.950899,616.25852 L 40.950899,566.41932" />
-    <path
-       id="path4260"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.76050973;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 46.333943,600.43803 L 63.936792,600.43803" />
-    <text
-       transform="scale(0.978716,1.021747)"
-       id="text4262"
-       y="613.46783"
-       x="50.292049"
-       style="font-size:83.26845551px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       xml:space="preserve"><tspan
-         y="613.46783"
-         x="50.292049"
-         id="tspan4264"
-         sodipodi:role="line">?</tspan></text>
-  </g>
-  <g
-     id="g4266"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,93.746929)">
-    <g
-       id="g4268">
-      <g
-         id="g4270"
-         transform="matrix(1.022343,0,0,0.225964,-3.639687,485.0216)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4272" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4274" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4276" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4278" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4280" />
-      </g>
-      <g
-         id="g4282"
-         transform="matrix(0.165008,0,0,0.185315,34.80966,476.2322)">
-        <rect
-           id="rect4284"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4286"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g4288"
-         transform="matrix(0.200017,0,0,0.193766,131.9627,502.3096)">
-        <path
-           id="path4290"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4292"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4294"
-         transform="matrix(0.200017,0,0,0.193766,126.0764,498.6294)">
-        <path
-           id="path4296"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4298"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4300"
-         transform="matrix(1.022343,0,0,0.225964,-3.639687,462.1859)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4302" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4304" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4306" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4308" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4310" />
-      </g>
-      <g
-         id="g4312"
-         transform="matrix(0.165008,0,0,0.185315,34.80966,453.3966)">
-        <rect
-           id="rect4314"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4316"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g4318"
-         transform="matrix(0.200017,0,0,0.193766,131.9627,479.474)">
-        <path
-           id="path4320"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4322"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4324"
-         transform="matrix(0.200017,0,0,0.193766,126.0764,475.7938)">
-        <path
-           id="path4326"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4328"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4330"
-         transform="matrix(1.022343,0,0,0.225964,-3.639687,439.3503)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4332" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4334" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4336" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4338" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4340" />
-      </g>
-      <g
-         id="g4342"
-         transform="matrix(0.165008,0,0,0.185315,34.80966,430.5609)">
-        <rect
-           id="rect4344"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4346"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-      <g
-         id="g4348"
-         transform="matrix(0.200017,0,0,0.193766,131.9627,456.6383)">
-        <path
-           id="path4350"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4352"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4354"
-         transform="matrix(0.200017,0,0,0.193766,126.0764,452.9581)">
-        <path
-           id="path4356"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4358"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-    </g>
-    <g
-       inkscape:transform-center-y="-249.13318"
-       inkscape:transform-center-x="-414.5246"
-       id="g4360"
-       transform="matrix(0.326639,0.315927,-0.325985,0.316561,52.01311,186.7728)">
-      <rect
-         id="rect4362"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.56066203;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="499.875"
-         x="797.08252"
-         height="17.941612"
-         width="62.664028" />
-      <path
-         id="path4364"
-         style="opacity:1;color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70223784;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 786.26355,503.58129 L 797.00751,498.99201 L 797.00751,518.69962 L 786.493,515.52242 L 786.26355,503.58129 z " />
-      <path
-         id="path4366"
-         style="opacity:0.77999998;color:#000000;fill:url(#linearGradient4556);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-1,0,0,-1,715.286,971.8034)"
-         d="M 1.0197296,463.97751 C 1.0197298,484.25205 -15.416035,500.68782 -35.690579,500.68782 C -55.965122,500.68782 -72.400887,484.25205 -72.400887,463.97751 C -72.400887,443.70297 -55.965122,427.2672 -35.690579,427.2672 C -15.416035,427.2672 1.0197298,443.70297 1.0197296,463.97751 L 1.0197296,463.97751 z " />
-    </g>
-  </g>
-  <g
-     id="g4368"
-     transform="matrix(0.5633612,0,0,0.5633612,-32.215099,93.570219)">
-    <g
-       transform="matrix(1.090844,0,0,1.73063,158.8704,-417.9589)"
-       id="g4370">
-      <g
-         id="g4372"
-         transform="matrix(0.957878,0,0,0.55144,3.319204,256.4117)">
-        <path
-           d="M 111.87488,566.71352 L 173.41819,566.58088"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           id="path4374" />
-        <path
-           d="M 111.87488,626.46842 L 173.41819,626.33578"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4376" />
-        <path
-           d="M 111.87488,611.5297 L 173.41818,611.39706"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4378" />
-        <path
-           d="M 111.87488,596.59099 L 173.41818,596.45834"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4380" />
-        <path
-           d="M 111.87488,581.65225 L 173.41819,581.51962"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-           id="path4382" />
-      </g>
-      <g
-         id="g4384"
-         transform="matrix(0.427741,0,0,0.452238,-86.33369,234.9625)">
-        <rect
-           id="rect4386"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="460.12595"
-           ry="0"
-           height="72.622528"
-           width="10.422997" />
-        <rect
-           id="rect4388"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           y="738.49548"
-           x="473.64929"
-           height="72.622528"
-           width="2.5666234" />
-      </g>
-    </g>
-    <g
-       transform="matrix(0.635101,0,0,0.818349,307.0637,112.2701)"
-       id="g4390">
-      <path
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path4392" />
-      <path
-         d="M -7.156011,622.3181 L -7.156011,572.4789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path4394" />
-    </g>
-    <g
-       transform="matrix(0.635101,0,0,0.818349,328.2121,96.72718)"
-       id="g4396">
-      <path
-         d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path4398" />
-      <path
-         d="M -7.156011,622.3181 L -7.156011,572.4789"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path4400" />
-    </g>
-    <g
-       inkscape:transform-center-y="-249.13318"
-       inkscape:transform-center-x="-414.52458"
-       id="g4402"
-       transform="matrix(0.326639,0.315927,-0.325985,0.316561,221.3609,188.6469)">
-      <rect
-         id="rect4404"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.56066203;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="499.875"
-         x="797.08252"
-         height="17.941612"
-         width="62.664028" />
-      <path
-         id="path4406"
-         style="opacity:1;color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70223784;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 786.26355,503.58129 L 797.00751,498.99201 L 797.00751,518.69962 L 786.493,515.52242 L 786.26355,503.58129 z " />
-      <path
-         id="path4408"
-         style="opacity:0.77999998;color:#000000;fill:url(#linearGradient4558);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-1,0,0,-1,715.286,971.8034)"
-         d="M 1.0197296,463.97751 C 1.0197298,484.25205 -15.416035,500.68782 -35.690579,500.68782 C -55.965122,500.68782 -72.400887,484.25205 -72.400887,463.97751 C -72.400887,443.70297 -55.965122,427.2672 -35.690579,427.2672 C -15.416035,427.2672 1.0197298,443.70297 1.0197296,463.97751 L 1.0197296,463.97751 z " />
-    </g>
-  </g>
-  <g
-     id="g4410"
-     transform="matrix(0.5633612,0,0,0.5633612,63.747173,93.040039)">
-    <g
-       id="g4412"
-       style="display:inline"
-       transform="translate(-636.6883,341.6475)">
-      <path
-         id="path4414"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.01236534px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 833.34122,225.07216 L 833.34122,286.35703" />
-      <path
-         id="path4416"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 843.52579,225.73634 L 843.52579,286.55437" />
-      <path
-         id="path4418"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 852.30857,225.73634 L 852.30857,286.55437" />
-      <path
-         id="path4420"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 861.09135,225.73634 L 861.09135,286.55437" />
-      <path
-         id="path4422"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 869.87413,225.73634 L 869.87413,286.55437" />
-      <path
-         id="path4424"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 878.6569,225.73634 L 878.6569,286.55437" />
-      <path
-         id="path4426"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 887.43968,225.73634 L 887.43968,286.55437" />
-      <path
-         id="path4428"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.39199093px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.22246,225.73634 L 896.22246,286.55437" />
-      <rect
-         id="rect4430"
-         style="color:#000000;fill:url(#linearGradient4560);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83745855;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="270.90326"
-         x="870.24017"
-         height="15.065637"
-         width="25.749367" />
-      <rect
-         id="rect4432"
-         style="color:#000000;fill:url(#linearGradient4562);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85693413;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="255.7885"
-         x="834.93457"
-         height="15.699371"
-         width="25.872597" />
-      <rect
-         id="rect4434"
-         style="color:#000000;fill:url(#linearGradient4564);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77284241;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="225.60927"
-         x="843.66455"
-         height="15.549897"
-         width="35.031761" />
-      <rect
-         id="rect4436"
-         style="color:#000000;fill:url(#linearGradient4566);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.83925015;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="240.99434"
-         x="852.5072"
-         height="14.594875"
-         width="43.547024" />
-      <path
-         id="path4438"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 896.28272,225.35563 L 834.8784,225.35563" />
-      <path
-         id="path4440"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,240.53581 L 834.8784,240.53581" />
-      <path
-         id="path4442"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,255.71599 L 834.8784,255.71599" />
-      <path
-         id="path4444"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,270.89618 L 834.8784,270.89618" />
-      <path
-         id="path4446"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.51782358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-         d="M 896.28272,286.07636 L 834.8784,286.07636" />
-      <rect
-         id="rect4448"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.53349"
-         x="843.96301"
-         height="2.1720431"
-         width="8.6314974" />
-      <rect
-         id="rect4450"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="231.22321"
-         x="857.89111"
-         height="2.7926269"
-         width="7.2583046" />
-      <rect
-         id="rect4452"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.34735"
-         x="852.98682"
-         height="3.1029184"
-         width="13.928099" />
-      <rect
-         id="rect4454"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="871.03455"
-         height="2.7926269"
-         width="2.7463856" />
-      <rect
-         id="rect4456"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.85912412;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="247.50249"
-         x="886.11169"
-         height="2.7926269"
-         width="9.2200089" />
-      <g
-         id="g4458"
-         transform="matrix(0.665193,0,0,1.080499,302.4562,-1.363347)">
-        <rect
-           id="rect4460"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect4462"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect4464"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-      <g
-         id="g4466"
-         style="display:inline"
-         transform="matrix(-0.665193,0,0,1.080499,1428.48,13.68581)">
-        <rect
-           id="rect4468"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97684985;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.52336"
-           x="801.20557"
-           height="3.4692454"
-           width="15.243404" />
-        <rect
-           id="rect4470"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="823.90393"
-           height="2.5845714"
-           width="4.3076191" />
-        <rect
-           id="rect4472"
-           style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-           y="243.9657"
-           x="834.81653"
-           height="2.5845714"
-           width="3.7332697" />
-      </g>
-    </g>
-    <g
-       inkscape:transform-center-y="-249.13318"
-       inkscape:transform-center-x="-414.52458"
-       id="g4474"
-       transform="matrix(0.326639,0.315927,-0.325985,0.316561,137.3191,188.96)">
-      <rect
-         id="rect4476"
-         style="color:#000000;fill:#ff9955;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.56066203;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         y="499.875"
-         x="797.08252"
-         height="17.941612"
-         width="62.664028" />
-      <path
-         id="path4478"
-         style="opacity:1;color:#000000;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.70223784;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 786.26355,503.58129 L 797.00751,498.99201 L 797.00751,518.69962 L 786.493,515.52242 L 786.26355,503.58129 z " />
-      <path
-         id="path4480"
-         style="opacity:0.77999998;color:#000000;fill:url(#linearGradient4568);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         transform="matrix(-1,0,0,-1,715.286,971.8034)"
-         d="M 1.0197296,463.97751 C 1.0197298,484.25205 -15.416035,500.68782 -35.690579,500.68782 C -55.965122,500.68782 -72.400887,484.25205 -72.400887,463.97751 C -72.400887,443.70297 -55.965122,427.2672 -35.690579,427.2672 C -15.416035,427.2672 1.0197298,443.70297 1.0197296,463.97751 L 1.0197296,463.97751 z " />
-    </g>
-  </g>
-  <g
-     id="g4482"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,93.746929)">
-    <g
-       id="g4484">
-      <g
-         id="g4486"
-         transform="matrix(1.090844,0,0,1.73063,245.4128,-416.8902)">
-        <g
-           transform="matrix(0.957878,0,0,0.55144,3.319204,256.4117)"
-           id="g4488">
-          <path
-             id="path4490"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 111.87488,566.71352 L 173.41819,566.58088" />
-          <path
-             id="path4492"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,626.46842 L 173.41819,626.33578" />
-          <path
-             id="path4494"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,611.5297 L 173.41818,611.39706" />
-          <path
-             id="path4496"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,596.59099 L 173.41818,596.45834" />
-          <path
-             id="path4498"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.78715056px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline"
-             d="M 111.87488,581.65225 L 173.41819,581.51962" />
-        </g>
-        <g
-           transform="matrix(0.427741,0,0,0.452238,-86.33369,234.9625)"
-           id="g4500">
-          <rect
-             width="10.422997"
-             height="72.622528"
-             ry="0"
-             x="460.12595"
-             y="738.49548"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4.46921062;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             id="rect4502" />
-          <rect
-             width="2.5666234"
-             height="72.622528"
-             x="473.64929"
-             y="738.49548"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.40641475;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-             id="rect4504" />
-        </g>
-      </g>
-      <g
-         id="g4506"
-         transform="matrix(0.635101,0,0,0.818349,393.6061,113.3388)">
-        <path
-           id="path4508"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4510"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-      <g
-         id="g4512"
-         transform="matrix(0.635101,0,0,0.818349,414.7545,97.79592)">
-        <path
-           id="path4514"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.28041196;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M -7.2456331,623.6418 C -7.2456331,627.8314 -11.376328,631.22775 -16.471792,631.22775 C -21.567256,631.22775 -25.697951,627.8314 -25.697951,623.6418 C -25.697951,619.45219 -21.567256,616.05584 -16.471792,616.05584 C -11.376328,616.05584 -7.2456331,619.45219 -7.2456331,623.6418 z " />
-        <path
-           id="path4516"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.10116768;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M -7.156011,622.3181 L -7.156011,572.4789" />
-      </g>
-    </g>
-    <path
-       sodipodi:nodetypes="czczczc"
-       id="path4518"
-       d="M 411.78985,624.6666 C 411.78985,624.6666 400.16655,624.17722 392.02482,616.70732 C 383.88308,609.23742 377.16967,600.9919 377.16967,600.9919 C 377.16967,600.9919 381.93058,591.7906 389.99449,583.72289 C 398.05841,575.65517 410.05022,571.58486 410.05022,571.58486 C 410.05022,571.58486 415.66282,582.34945 415.74064,597.88706 C 415.81847,613.42468 411.78985,624.6666 411.78985,624.6666 z "
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.9000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       transform="matrix(2.115244,0,0,1.423109,-586.4825,-238.9625)"
-       d="M 478.70496 588.40106 A 7.5287805 18.194553 0 1 1  463.6474,588.40106 A 7.5287805 18.194553 0 1 1  478.70496 588.40106 z"
-       sodipodi:ry="18.194553"
-       sodipodi:rx="7.5287805"
-       sodipodi:cy="588.40106"
-       sodipodi:cx="471.17618"
-       id="path4520"
-       style="fill:#3771c8;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(1.163385,0,0,0.936892,-135.6486,46.23215)"
-       d="M 478.70496 588.40106 A 7.5287805 18.194553 0 1 1  463.6474,588.40106 A 7.5287805 18.194553 0 1 1  478.70496 588.40106 z"
-       sodipodi:ry="18.194553"
-       sodipodi:rx="7.5287805"
-       sodipodi:cy="588.40106"
-       sodipodi:cx="471.17618"
-       id="path4522"
-       style="fill:#000000;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.474681,0,0,0.282167,191.8461,422.9515)"
-       d="M 478.70496 588.40106 A 7.5287805 18.194553 0 1 1  463.6474,588.40106 A 7.5287805 18.194553 0 1 1  478.70496 588.40106 z"
-       sodipodi:ry="18.194553"
-       sodipodi:rx="7.5287805"
-       sodipodi:cy="588.40106"
-       sodipodi:cx="471.17618"
-       id="path4524"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     id="g2988"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,2.4823692)">
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path4570"
-       d="M 48.485517,575.51074 C 47.057601,575.53345 40.824521,575.50157 39.272311,589.79823 L 35.150004,589.79823 L 35.150004,592.07556 L 39.134654,592.07556 C 38.761213,596.18447 35.172599,613.87811 32.848466,613.95576 C 30.453707,614.03577 33.091056,614.04051 33.113086,611.43574 C 33.135117,608.83094 29.615875,608.89369 29.548583,611.44041 C 29.479763,614.04493 29.820497,616.0356 34.173133,616.00346 C 38.572698,615.97098 41.807204,603.64647 43.628053,592.07556 L 47.598261,592.07556 L 47.598261,589.79823 L 44.047779,589.79823 C 45.171812,581.85589 47.016459,577.23072 49.112651,577.21692 C 51.182106,577.20312 51.941425,580.65289 50.411982,580.16323 C 48.247364,579.4702 48.029551,584.05353 50.349925,584.13071 C 52.709916,584.20789 52.77139,580.31354 52.266111,578.31047 C 51.75305,576.27654 49.913433,575.48802 48.485517,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2984"
-       d="M 62.485517,575.51074 C 61.057601,575.53345 54.824521,575.50157 53.272311,589.79823 L 49.150004,589.79823 L 49.150004,592.07556 L 53.134654,592.07556 C 52.761213,596.18447 49.172599,613.87811 46.848466,613.95576 C 44.453707,614.03577 47.091056,614.04051 47.113086,611.43574 C 47.135117,608.83094 43.615875,608.89369 43.548583,611.44041 C 43.479763,614.04493 43.820497,616.0356 48.173133,616.00346 C 52.572698,615.97098 55.807204,603.64647 57.628053,592.07556 L 61.598261,592.07556 L 61.598261,589.79823 L 58.047779,589.79823 C 59.171812,581.85589 61.016459,577.23072 63.112651,577.21692 C 65.182106,577.20312 65.941425,580.65289 64.411982,580.16323 C 62.247364,579.4702 62.029551,584.05353 64.349925,584.13071 C 66.709916,584.20789 66.77139,580.31354 66.266111,578.31047 C 65.75305,576.27654 63.913433,575.48802 62.485517,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2986"
-       d="M 76.485517,575.51074 C 75.057601,575.53345 68.824521,575.50157 67.272311,589.79823 L 63.150004,589.79823 L 63.150004,592.07556 L 67.134654,592.07556 C 66.761213,596.18447 63.172599,613.87811 60.848466,613.95576 C 58.453707,614.03577 61.091056,614.04051 61.113086,611.43574 C 61.135117,608.83094 57.615875,608.89369 57.548583,611.44041 C 57.479763,614.04493 57.820497,616.0356 62.173133,616.00346 C 66.572698,615.97098 69.807204,603.64647 71.628053,592.07556 L 75.598261,592.07556 L 75.598261,589.79823 L 72.047779,589.79823 C 73.171812,581.85589 75.016459,577.23072 77.112651,577.21692 C 79.182106,577.20312 79.941429,580.65289 78.411982,580.16323 C 76.247364,579.4702 76.029551,584.05353 78.349925,584.13071 C 80.709919,584.20789 80.771389,580.31354 80.266109,578.31047 C 79.753049,576.27654 77.913433,575.48802 76.485517,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <g
-     id="g3012"
-     transform="matrix(0.5633612,0,0,0.5633612,20.007825,2.4823692)">
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2995"
-       d="M 136.48552,575.51074 C 135.0576,575.53345 128.82452,575.50157 127.27231,589.79823 L 123.15,589.79823 L 123.15,592.07556 L 127.13465,592.07556 C 126.76121,596.18447 123.1726,613.87811 120.84847,613.95576 C 118.45371,614.03577 121.09106,614.04051 121.11309,611.43574 C 121.13512,608.83094 117.61588,608.89369 117.54858,611.44041 C 117.47976,614.04493 117.8205,616.0356 122.17313,616.00346 C 126.5727,615.97098 129.8072,603.64647 131.62805,592.07556 L 135.59826,592.07556 L 135.59826,589.79823 L 132.04778,589.79823 C 133.17181,581.85589 135.01646,577.23072 137.11265,577.21692 C 139.18211,577.20312 139.94143,580.65289 138.41198,580.16323 C 136.24736,579.4702 136.02955,584.05353 138.34992,584.13071 C 140.70992,584.20789 140.77139,580.31354 140.26611,578.31047 C 139.75305,576.27654 137.91343,575.48802 136.48552,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccszzzcccczszzz"
-       id="path2997"
-       d="M 150.48552,575.51074 C 149.0576,575.53345 142.82452,575.50157 141.27231,589.79823 L 137.15,589.79823 L 137.15,592.07556 L 141.13465,592.07556 C 140.76121,596.18447 137.1726,613.87811 134.84847,613.95576 C 132.45371,614.03577 135.09106,614.04051 135.11309,611.43574 C 135.13512,608.83094 131.61588,608.89369 131.54858,611.44041 C 131.47976,614.04493 131.8205,616.0356 136.17313,616.00346 C 140.5727,615.97098 143.8072,603.64647 145.62805,592.07556 L 149.59826,592.07556 L 149.59826,589.79823 L 146.04778,589.79823 C 147.17181,581.85589 149.01646,577.23072 151.11265,577.21692 C 153.18211,577.20312 153.94142,580.65289 152.41198,580.16323 C 150.24736,579.4702 150.02955,584.05353 152.34992,584.13071 C 154.70992,584.20789 154.77139,580.31354 154.26611,578.31047 C 153.75305,576.27654 151.91343,575.48802 150.48552,575.51074 z "
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <path
-     style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 150.98122,326.703 C 150.1768,326.71579 146.66532,326.69783 145.79086,334.75201 L 143.46851,334.75201 L 143.46851,336.03498 L 145.71331,336.03498 C 145.50293,338.34978 143.48125,348.3177 142.17192,348.36144 C 140.8228,348.40651 142.30858,348.40919 142.32099,346.94175 C 142.33341,345.47432 140.3508,345.50966 140.31289,346.94439 C 140.27412,348.41168 140.46607,349.53314 142.91818,349.51503 C 145.39673,349.49674 147.21892,342.55358 148.24472,336.03498 L 150.48138,336.03498 L 150.48138,334.75201 L 148.48118,334.75201 C 149.11442,330.27761 150.15362,327.67197 151.33453,327.66419 C 152.50038,327.65642 152.92815,329.59989 152.06653,329.32403 C 150.84706,328.9336 150.72436,331.51568 152.03156,331.55915 C 153.36109,331.60264 153.39573,329.40871 153.11107,328.28025 C 152.82203,327.13441 151.78566,326.6902 150.98122,326.703 z "
-     id="path3005"
-     sodipodi:nodetypes="cccccszzzcccczszzz" />
-  <path
-     style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 200.55704,326.703 C 199.75261,326.71579 196.24113,326.69783 195.36667,334.75201 L 193.04433,334.75201 L 193.04433,336.03498 L 195.28912,336.03498 C 195.07874,338.34978 193.05706,348.3177 191.74774,348.36144 C 190.39862,348.40651 191.8844,348.40919 191.89681,346.94175 C 191.90922,345.47432 189.92661,345.50966 189.8887,346.94439 C 189.84993,348.41168 190.04189,349.53314 192.49399,349.51503 C 194.97255,349.49674 196.79474,342.55358 197.82053,336.03498 L 200.0572,336.03498 L 200.0572,334.75201 L 198.05699,334.75201 C 198.69023,330.27761 199.72943,327.67197 200.91035,327.66419 C 202.0762,327.65642 202.50396,329.59989 201.64234,329.32403 C 200.42288,328.9336 200.30017,331.51568 201.60738,331.55915 C 202.93691,331.60264 202.97154,329.40871 202.68689,328.28025 C 202.39785,327.13441 201.36148,326.6902 200.55704,326.703 z "
-     id="path3019"
-     sodipodi:nodetypes="cccccszzzcccczszzz" />
-  <text
-     xml:space="preserve"
-     style="font-size:16.14900208px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="254.68269"
-     y="318.62085"
-     id="text3036"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3038"
-       x="254.68269"
-       y="318.62085"
-       style="font-size:16.14901543px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">m</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.14931297px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="307.45944"
-     y="318.62579"
-     id="text3044"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3046"
-       x="307.45944"
-       y="318.62579"
-       style="font-size:16.14933777px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">mp</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.14957619px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="356.63824"
-     y="318.63007"
-     id="text3048"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3050"
-       x="356.63824"
-       y="318.63007"
-       style="font-size:16.14960098px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">ppp</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.14987183px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="411.81506"
-     y="318.63477"
-     id="text3052"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3054"
-       x="411.81506"
-       y="318.63477"
-       style="font-size:16.14989853px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">pp</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:16.15017509px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-     x="466.99307"
-     y="318.63959"
-     id="text3056"
-     sodipodi:linespacing="100%"
-     transform="matrix(0.9394376,0,-0.1893359,1.0644666,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan3058"
-       x="466.99307"
-       y="318.63959"
-       style="font-size:16.1502018px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook">p</tspan></text>
-  <path
-     style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     d="M 56.110843,384.71198 L 40.303198,395.28564 L 40.303198,391.48506 L 50.703054,384.71198 L 40.303198,378.00258 L 40.303198,374.202 L 56.110843,384.71198 z "
-     id="text3060"
-     sodipodi:nodetypes="ccccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:30.45602417px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-     x="116.64803"
-     y="440.39285"
-     id="text3065"
-     transform="scale(1.1209993,0.8920612)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3067"
-       x="116.64803"
-       y="440.39285">()</tspan></text>
-  <path
-     style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     d="M 86.498845,384.71198 L 102.30649,395.28564 L 102.30649,391.48506 L 91.906645,384.71198 L 102.30649,378.00258 L 102.30649,374.202 L 86.498845,384.71198 z "
-     id="path3069"
-     sodipodi:nodetypes="ccccccc" />
-  <g
-     id="g3104"
-     transform="matrix(0.5633612,0,0,0.5633612,15.500932,2.4823692)">
-    <path
-       id="path3073"
-       style="fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 312.30593,647.99065 C 323.97335,648.37311 324.2505,657.58689 324.25694,668.9189 C 321.0884,657.02522 322.5119,654.47127 312.34078,654.4967 C 312.28266,644.71049 312.35487,657.77749 312.30593,647.99065 z " />
-    <path
-       id="path3077"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.8136487;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-       d="M 310.92742,694.2856 C 310.92742,698.0754 307.56802,701.14764 303.42398,701.14764 C 299.27995,701.14764 295.92055,698.0754 295.92055,694.2856 C 295.92055,690.49579 299.27995,687.42354 303.42398,687.42354 C 307.56802,687.42354 310.92742,690.49579 310.92742,694.2856 z " />
-    <path
-       id="path3075"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.83327127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 293.82309,681.8583 L 327.47426,657.4004" />
-    <path
-       id="path3079"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.65990877;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 311.16655,693.08823 L 311.16655,648.00504" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:34.65638351px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-     x="-389.72617"
-     y="257.13391"
-     id="text3110"
-     transform="matrix(0,-1.024355,0.976224,0,0,0)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3112"
-       x="-389.72617"
-       y="257.13391">)</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:15.52974701px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="246.58002"
-     y="357.05609"
-     id="text3114"
-     transform="scale(0.9278539,1.0777559)"><tspan
-       sodipodi:role="line"
-       id="tspan3116"
-       x="246.58002"
-       y="357.05609">HO</tspan></text>
-  <path
-     style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-     d="M 289.31419,381.94275 L 297.25455,390.23462 L 289.31419,398.08051 L 280.97169,390.23462 L 289.31419,381.94275 z "
-     id="rect3126"
-     sodipodi:nodetypes="ccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:14.66517448px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="313.40533"
-     y="338.75354"
-     id="text3133"
-     transform="scale(0.8879582,1.1261792)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3135"
-       x="313.40533"
-       y="338.75354"
-       style="font-size:14.66517448px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">NH</tspan></text>
-  <path
-     style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     d="M 338.02694,373.81157 L 328.23024,394.54862 L 330.02827,394.54862 L 336.05748,382.87004 L 341.53533,394.54862 L 347.76463,394.54862 L 338.02694,373.81157 z "
-     id="path3141"
-     sodipodi:nodetypes="ccccccc" />
-  <text
-     xml:space="preserve"
-     style="font-size:21.2996788px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="470.23547"
-     y="308.36682"
-     id="text3143"
-     transform="scale(0.7835739,1.2762038)"
-     sodipodi:linespacing="125%"><tspan
-       sodipodi:role="line"
-       id="tspan3145"
-       x="470.23547"
-       y="308.36682"
-       style="font-size:21.2996788px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P.M</tspan></text>
-  <rect
-     id="rect3147"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54208785;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="409.14569"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_left.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3149"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="408.8056"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_right.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3151"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.03625"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_up.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3153"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.03625"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/button_down.png"
-     inkscape:export-xdpi="35.083145"
-     inkscape:export-ydpi="35.083145" />
-  <rect
-     id="rect3155"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="316.64386"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_bend.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3157"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="316.64386"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3159"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="361.53442"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_vibrato.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3161"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="361.53442"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3163"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.78169"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slide.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3165"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.78169"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3167"
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="269.03259"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3169"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="269.03259"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3171"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="123.47828"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_picking.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3173"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="123.47828"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3175"
-     style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.81017"
-     x="410.24951"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3177"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.81017"
-     x="458.38705"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <g
-     id="g4068"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <path
-       sodipodi:nodetypes="cc"
-       id="path3179"
-       d="M 594.00003,497.36216 C 617.85953,497.555 627.69114,488.66969 628.00003,460.36216"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       transform="matrix(0.749399,0,0,0.807087,168.8359,92.77775)"
-       d="M 622.22856,466.26925 L 611.6474,466.26925 L 601.06624,466.26925 L 606.35682,457.1057 L 611.6474,447.94215 L 616.93798,457.1057 L 622.22856,466.26925 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="1.5707963"
-       sodipodi:arg1="0.52359878"
-       sodipodi:r2="6.1090355"
-       sodipodi:r1="12.218071"
-       sodipodi:cy="460.16022"
-       sodipodi:cx="611.6474"
-       sodipodi:sides="3"
-       id="path4066"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3.70000005;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="star" />
-  </g>
-  <path
-     style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.44790959;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 471.38475,347.50253 L 488.4468,330.93125"
-     id="path4072"
-     sodipodi:nodetypes="cc" />
-  <g
-     id="g5882"
-     transform="matrix(1.0269525,0,0,0.9790352,-221.22387,-130.58855)">
-    <path
-       sodipodi:nodetypes="cc"
-       id="path4074"
-       d="M 674.43107,471.32979 L 691.12154,488.11001"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.94400001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <rect
-       y="469.35751"
-       x="672.41663"
-       height="6"
-       width="6"
-       id="rect4961"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       y="469.35751"
-       x="687.11115"
-       height="6"
-       width="6"
-       id="rect4963"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       y="483.72479"
-       x="687.11115"
-       height="6"
-       width="6"
-       id="rect4965"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       y="483.72479"
-       x="672.41663"
-       height="6"
-       width="6"
-       id="rect4967"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:23.50349617px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="409.8201"
-     y="307.42377"
-     id="text5893"
-     transform="scale(1.0327709,0.9682689)"
-     sodipodi:linespacing="125%"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_popping.png"
-     inkscape:export-xdpi="71.751251"
-     inkscape:export-ydpi="71.751251"><tspan
-       sodipodi:role="line"
-       id="tspan5895"
-       x="409.8201"
-       y="307.42377"
-       style="font-size:23.50349617px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">P</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:31.86540413px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="452.26965"
-     y="309.18457"
-     id="text5897"
-     transform="scale(1.0413973,0.9602483)"
-     sodipodi:linespacing="125%"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-     inkscape:export-xdpi="61.67075"
-     inkscape:export-ydpi="61.67075"><tspan
-       sodipodi:role="line"
-       id="tspan5899"
-       x="452.26965"
-       y="309.18457"
-       style="font-size:31.86540413px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">s</tspan></text>
-  <g
-     id="g5911"
-     transform="matrix(0.9778313,0,0,1.3442636,-166.29942,-214.67039)">
-    <text
-       transform="scale(0.902157,1.108454)"
-       id="text5901"
-       y="312.95807"
-       x="662.24274"
-       style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       xml:space="preserve"><tspan
-         y="312.95807"
-         x="662.24274"
-         id="tspan5903"
-         sodipodi:role="line">1</tspan></text>
-    <text
-       transform="scale(0.902157,1.108454)"
-       id="text5905"
-       y="312.87729"
-       x="682.92804"
-       style="font-size:13.23942089px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-       xml:space="preserve"><tspan
-         y="312.87729"
-         x="682.92804"
-         id="tspan5907"
-         sodipodi:role="line">3</tspan></text>
-    <path
-       id="path5909"
-       d="M 605.35606,346.58166 L 615.29346,336.53376"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.20514083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-  <g
-     id="g5948"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <g
-       transform="matrix(0.83334,0,0,1,120.4233,-6.810365)"
-       id="g5932">
-      <path
-         d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path5922" />
-      <path
-         d="M 683.05261,356.83776 L 683.05261,326.03045"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path5924" />
-    </g>
-    <path
-       transform="translate(0.645704,6.4635e-2)"
-       d="M 684.625 362.17465 A 2.0625 2.0625 0 1 1  680.5,362.17465 A 2.0625 2.0625 0 1 1  684.625 362.17465 z"
-       sodipodi:ry="2.0625"
-       sodipodi:rx="2.0625"
-       sodipodi:cy="362.17465"
-       sodipodi:cx="682.5625"
-       id="path5936"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.44400001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:25.10733032px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="381.26865"
-     y="222.82732"
-     id="text5954"
-     transform="scale(1.1044258,0.9054479)"
-     sodipodi:linespacing="125%"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tapping.png"
-     inkscape:export-xdpi="68.070755"
-     inkscape:export-ydpi="68.070755"><tspan
-       sodipodi:role="line"
-       id="tspan5956"
-       x="381.26865"
-       y="222.82732"
-       style="font-size:25.10733032px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Times New Roman">T</tspan></text>
-  <g
-     id="g6849"
-     transform="matrix(0.8038258,0,0,0.8952428,-69.897219,-50.865781)">
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path5958"
-       d="M 667.00003,271.36215 L 683.00003,284.86215 L 698.00003,271.36215"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <text
-       sodipodi:linespacing="125%"
-       transform="scale(1.077771,0.927841)"
-       id="text6845"
-       y="293.27463"
-       x="627.5741"
-       style="font-size:17.07377625px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       xml:space="preserve"><tspan
-         y="293.27463"
-         x="627.5741"
-         id="tspan6847"
-         sodipodi:role="line">X</tspan></text>
-  </g>
-  <g
-     id="g6860"
-     transform="matrix(0.6037383,0,0,0.7722113,67.160612,-5.8028708)">
-    <rect
-       transform="matrix(0.880153,-0.474689,0,1,0,0)"
-       y="507.96887"
-       x="671.18982"
-       height="5.25"
-       width="25.279688"
-       id="rect6854"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       transform="matrix(0.880153,-0.474689,0,1,0,0)"
-       y="515.96887"
-       x="671.18945"
-       height="5.25"
-       width="25.279675"
-       id="rect6856"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <rect
-       transform="matrix(0.880153,-0.474689,0,1,0,0)"
-       y="523.96887"
-       x="671.18945"
-       height="5.25"
-       width="25.279675"
-       id="rect6858"
-       style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:11.30146599px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="474.99112"
-     y="149.22421"
-     id="text6865"
-     sodipodi:linespacing="125%"
-     transform="matrix(0.9705969,0,3.6240004e-2,1.0302939,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan6867"
-       x="474.99112"
-       y="149.22421"
-       style="font-size:30.13724899px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Vivaldi">tr</tspan></text>
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 420.63339,383.75166 C 420.63339,383.75166 424.59354,378.42988 426.5798,381.2851 C 428.26303,383.70473 428.68875,384.93246 429.82503,384.60352 C 430.94218,384.28011 431.68368,380.43446 435.13907,380.4622 C 437.71367,380.48325 437.22328,385.14061 441.44017,386.0373 C 439.94633,387.20777 437.34675,387.30255 435.95868,386.55808 C 434.64426,385.85311 434.07716,383.19366 432.613,383.8719 C 431.18508,384.53335 430.9326,386.9609 428.0493,386.90959 C 425.21447,386.85828 425.33498,385.27214 423.78394,383.71268 C 422.20915,382.12932 420.63339,383.75166 420.63339,383.75166 z "
-     id="path6878"
-     sodipodi:nodetypes="cszscszzzc" />
-  <g
-     id="g16418"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <g
-       style="stroke:#000000;stroke-width:1.60443127;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(1.052881,0,0,1.752712,-2.969829,-445.0024)"
-       id="g8293">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60443127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 380.60127,591.32856 L 394.60485,591.32856 L 394.60485,591.32856"
-         id="path7402" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60443127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 387.60306,591.68211 L 387.60306,618.11023"
-         id="path7404" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.60443127;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 380.58984,618.11023 L 394.61628,618.11023"
-         id="path7406" />
-    </g>
-    <g
-       transform="matrix(0.83334,0,0,1.26493,-176.5805,177.5719)"
-       id="g11878">
-      <path
-         d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path11880" />
-      <path
-         d="M 683.05261,356.83776 L 683.05261,326.03045"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path11882" />
-    </g>
-    <g
-       transform="translate(2.386486,-12.72792)"
-       id="g11890">
-      <path
-         style="fill:url(#radialGradient16399);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 407.38189,616.60763 L 391.73716,638.26278 L 416.75106,629.33555 L 407.38189,616.60763 z "
-         id="path8312"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:url(#linearGradient16401);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 407.47028,616.25408 L 423.64535,601.58161 L 423.64535,622.52965 L 417.10461,629.15877 L 407.47028,616.25408 z "
-         id="path8314"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-  </g>
-  <g
-     id="g21770"
-     transform="matrix(0.6801604,0,0,0.6801604,14.362893,11.373789)">
-    <text
-       sodipodi:linespacing="125%"
-       transform="matrix(0,-1.06756,0.936716,0,0,0)"
-       id="text21766"
-       y="508.78696"
-       x="-580.42908"
-       style="font-size:44.71162415px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial"
-       xml:space="preserve"><tspan
-         y="508.78696"
-         x="-580.42908"
-         id="tspan21768"
-         sodipodi:role="line">)</tspan></text>
-    <g
-       transform="translate(2.828427,-2.65165)"
-       id="g21749">
-      <g
-         id="g16378"
-         transform="matrix(0.83334,0,0,1.26493,-81.035,178.0078)">
-        <path
-           id="path16380"
-           style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-           d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z " />
-        <path
-           id="path16382"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-           d="M 683.05261,356.83776 L 683.05261,326.03045" />
-      </g>
-      <g
-         id="g15477"
-         transform="matrix(0.289054,1.22178,-1.331968,1.944028e-2,1154.889,24.19248)"
-         style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-        <path
-           id="path12800"
-           d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-           style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           sodipodi:nodetypes="ccccccsccccsc" />
-        <path
-           transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-           style="fill:url(#linearGradient21760);fill-opacity:1;stroke-width:1.00046873"
-           d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-           id="rect14581"
-           sodipodi:nodetypes="ccccc" />
-      </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path16432"
-         sodipodi:cx="449.8125"
-         sodipodi:cy="637.17468"
-         sodipodi:rx="4.3707523"
-         sodipodi:ry="4.0625"
-         d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-         transform="matrix(0.819316,0.899502,-0.550332,0.501274,431.3845,-87.32081)" />
-      <path
-         style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:0.2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 484.50072,592.19035 L 477.27498,598.81948 L 478.13677,604.94037 L 479.88494,606.41213 L 478.88807,599.72546 L 484.41233,593.98021 L 484.50072,592.19035 z "
-         id="path16435"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 491.96404,614.17206 C 487.52149,616.98813 481.99224,615.61946 480.03711,615.85633 C 478.33,616.06315 476.50158,617.62409 476.50158,617.62409 L 476.3248,615.10502 L 478.79969,613.73501 C 478.79969,613.73501 480.86422,613.06577 485.56139,613.46984 C 489.14203,613.77787 492.60171,611.64036 493.64891,609.31558 L 495.85862,604.41003 C 495.35966,607.74069 493.83974,612.98308 491.96404,614.17206 z "
-         id="path17322"
-         sodipodi:nodetypes="cscccsscs" />
-    </g>
-    <text
-       inkscape:transform-center-x="11"
-       inkscape:transform-center-y="-10.103847"
-       transform="matrix(0.717341,-0.596996,0.540854,0.94392,0,0)"
-       sodipodi:linespacing="100%"
-       id="text21762"
-       y="709.63062"
-       x="105.70007"
-       style="font-size:14.4750843px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Book Antiqua"
-       xml:space="preserve"><tspan
-         style="font-size:14.47510719px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Century Schoolbook"
-         y="709.63062"
-         x="105.70007"
-         id="tspan21764"
-         sodipodi:role="line">pp</tspan></text>
-  </g>
-  <g
-     id="g3407"
-     transform="matrix(9.7000401e-2,8.1066758e-3,-1.1753914e-2,0.1240388,219.94383,532.76077)">
-    <g
-       id="g3296"
-       transform="matrix(3.608871,12.53273,-16.62977,0.199414,8930.251,-5616.342)"
-       style="stroke:#000000;stroke-width:1.00000024;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         id="path3298"
-         d="M 465.23106,595.7336 L 469.25,601.1875 L 469.09375,605.9375 L 465.65625,609.15625 L 460.65058,608.73406 L 455.28461,602.10158 C 455.28461,607.26321 459.09018,613.67006 463.85601,614.20682 L 469.22834,614.81189 L 479.5625,626.8125 L 483.71875,623.0625 L 474.22873,610.90263 L 473.66914,604.8712 C 473.19295,599.73852 470.29389,597.28414 465.23106,595.7336 z "
-         style="fill:#999999;stroke:#000000;stroke-width:0.60881829;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:nodetypes="ccccccsccccsc" />
-      <path
-         transform="matrix(0.742775,-0.669541,0.636786,0.77104,0,0)"
-         style="fill:url(#linearGradient3382);fill-opacity:1;stroke-width:1.00046873"
-         d="M -30.319248,775.35716 C -29.236086,771.94908 -25.270866,771.78557 -23.146393,774.91204 L -22.971837,801.60352 L -30.244144,801.60352 L -30.319248,775.35716 z "
-         id="path3300"
-         sodipodi:nodetypes="ccccc" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="fill:#cccccc;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3302"
-       sodipodi:cx="449.8125"
-       sodipodi:cy="637.17468"
-       sodipodi:rx="4.3707523"
-       sodipodi:ry="4.0625"
-       d="M 454.18325 637.17468 A 4.3707523 4.0625 0 1 1  445.44175,637.17468 A 4.3707523 4.0625 0 1 1  454.18325 637.17468 z"
-       transform="matrix(10.22925,9.226876,-6.870956,5.141948,-102.7821,-6760.219)" />
-    <path
-       style="fill:#e6e6e6;fill-rule:evenodd;stroke:#000000;stroke-width:2.26335382;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 560.37978,210.04348 L 470.16563,278.04351 L 480.92517,340.83013 L 502.75126,355.92709 L 490.30523,287.33683 L 559.27623,228.40344 L 560.37978,210.04348 z "
-       id="path3304"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="fill:#e6e6e6;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.39503074;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 653.56016,435.52659 C 598.09443,464.41316 529.06114,450.37367 504.65112,452.80343 C 483.33767,454.92494 460.50964,470.93669 460.50964,470.93669 L 458.30252,445.09667 L 489.2018,431.04344 C 489.2018,431.04344 514.97768,424.17853 573.62237,428.32339 C 618.32705,431.48308 661.52154,409.55702 674.59594,385.70998 L 702.18442,335.39003 C 695.95484,369.55514 676.97848,423.33032 653.56016,435.52659 z "
-       id="path3306"
-       sodipodi:nodetypes="cscccsscs" />
-  </g>
-  <g
-     id="g21483"
-     transform="matrix(0.6801604,0,0,0.6801604,19.124016,12.734109)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/option_skin.png"
-     inkscape:export-xdpi="54.250492"
-     inkscape:export-ydpi="54.250492">
-    <a
-       style="fill:url(#linearGradient21491);fill-opacity:1"
-       transform="matrix(1.0935538,0,0,0.9875559,-81.605798,-98.323313)"
-       id="a3635">
-      <path
-         style="fill:url(#linearGradient21493);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.40568686;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 573.46809,989.25496 C 561.43446,918.49524 637.03499,915.96748 645.83589,919.79716 C 674.43146,931.00974 654.3464,985.51774 650.05535,987.75336 C 644.89956,990.4395 620.42002,988.48086 620.50756,989.43376 C 620.52581,989.44042 615.71426,1009.4048 598.77641,1009.9117 C 590.46857,1010.1603 574.46337,997.70295 573.46809,989.25496 z "
-         id="path3633"
-         sodipodi:nodetypes="ccscsc" />
-    </a>
-    <path
-       transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,425.79798,629.67088)"
-       d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.66417817"
-       sodipodi:arg1="-1.2924967"
-       sodipodi:r2="7.7217226"
-       sodipodi:r1="3.8608613"
-       sodipodi:cy="839.52301"
-       sodipodi:cx="566.39252"
-       sodipodi:sides="5"
-       id="path3644"
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#d22d2d;stroke-width:35.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(0.2599889,1.1741624e-2,-1.2264639e-2,0.2489019,443.91514,614.48309)"
-       d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.66417817"
-       sodipodi:arg1="-1.2924967"
-       sodipodi:r2="7.7217226"
-       sodipodi:r1="3.8608613"
-       sodipodi:cy="839.52301"
-       sodipodi:cx="566.39252"
-       sodipodi:sides="5"
-       id="path3646"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:#00a100;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(0.272574,1.2309989e-2,-1.2858322e-2,0.2609503,464.35714,598.38051)"
-       d="M 567.45318,835.8107 L 572.47278,834.76325 L 570.2509,839.38459 L 572.79823,843.83484 L 567.71647,843.14977 L 564.2712,846.94763 L 563.35238,841.90289 L 558.67576,839.79985 L 563.18966,837.3671 L 563.74462,832.26948 L 567.45318,835.8107 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="-0.66417817"
-       sodipodi:arg1="-1.2924967"
-       sodipodi:r2="7.7217226"
-       sodipodi:r1="3.8608613"
-       sodipodi:cy="839.52301"
-       sodipodi:cx="566.39252"
-       sodipodi:sides="5"
-       id="path3648"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#4b4bff;stroke-width:35.29906464;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(0.1668918,0.1065936,-0.1502726,0.1897914,624.05104,651.11923)"
-       d="M 559.81399 897.85938 A 44.686672 47.620178 0 1 1  470.44065,897.85938 A 44.686672 47.620178 0 1 1  559.81399 897.85938 z"
-       sodipodi:ry="47.620178"
-       sodipodi:rx="44.686672"
-       sodipodi:cy="897.85938"
-       sodipodi:cx="515.12732"
-       id="path4681"
-       style="fill:#ffffff;fill-opacity:0.96703342;fill-rule:nonzero;stroke:#090303;stroke-width:8.73597431;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.98360656"
-       sodipodi:type="arc" />
-  </g>
-  <g
-     style="display:inline"
-     id="g17053"
-     transform="matrix(0.2445295,0,0,0.2430948,131.58122,35.384719)">
-    <rect
-       ry="29.257792"
-       rx="29.086124"
-       y="423.20496"
-       x="355.73645"
-       height="99.78186"
-       width="99.78186"
-       id="rect17055"
-       style="fill:url(#radialGradient17059);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.09139299;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-    <path
-       transform="matrix(0.452101,0,0,0.484373,563.5737,407.7282)"
-       d="M -418.05177,221.55162 L -418.05177,134.95318 L -418.05177,48.354749 L -343.05532,91.653969 L -268.05888,134.95319 L -343.05532,178.25241 L -418.05177,221.55162 z "
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="false"
-       sodipodi:arg2="3.1415927"
-       sodipodi:arg1="2.0943951"
-       sodipodi:r2="49.997631"
-       sodipodi:r1="99.995262"
-       sodipodi:cy="134.95319"
-       sodipodi:cx="-368.05414"
-       sodipodi:sides="3"
-       id="path17057"
-       style="fill:#008033;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.62562513;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       sodipodi:type="star" />
-  </g>
-  <g
-     id="g21908"
-     transform="matrix(0.6801604,0,0,0.6801604,124.49954,136.41977)">
-    <rect
-       width="35.760925"
-       height="35.760925"
-       rx="7.9460096"
-       ry="7.9460096"
-       x="-227.18408"
-       y="-113.8597"
-       transform="scale(-1,1)"
-       style="fill:url(#radialGradient21912);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74953651;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect19956" />
-    <rect
-       width="26.976021"
-       height="30.992802"
-       rx="22.477581"
-       ry="7.9460096"
-       x="195.81561"
-       y="-111.36695"
-       style="fill:#f95557;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.02269864;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       id="rect19958" />
-  </g>
-  <g
-     id="g22907"
-     transform="matrix(0.6801604,0,0,0.6801604,5.2249174,134.01503)">
-    <rect
-       id="rect21916"
-       style="fill:url(#radialGradient22911);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74953711;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       y="-111.7384"
-       x="151.82515"
-       ry="7.9460163"
-       rx="7.9460163"
-       height="35.760952"
-       width="35.760952" />
-    <path
-       id="path21918"
-       style="fill:#008033;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.60806185;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       d="M 158.57577,-78.824867 L 158.57577,-93.857923 L 158.57577,-108.89098 L 170.72736,-101.37445 L 182.87895,-93.857921 L 170.72736,-86.341393 L 158.57577,-78.824867 z " />
-  </g>
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 479.04781,429.57872 L 460.51344,429.57872"
-     id="path5612"
-     inkscape:connector-type="polyline" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 430.55339,429.57872 L 449.08776,429.57872"
-     id="path5617"
-     inkscape:connector-type="polyline" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 431.13119,474.2316 L 431.13119,492.76597"
-     id="path5619"
-     inkscape:connector-type="polyline" />
-  <path
-     style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:6.46152401;stroke-linecap:butt;stroke-linejoin:miter;marker-start:url(#TriangleInM);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 479.25254,475.38719 L 479.25254,456.85282"
-     id="path5621"
-     inkscape:connector-type="polyline" />
-  <g
-     id="g5456"
-     transform="matrix(0.6801604,0,0,0.6801604,13.881947,11.494019)">
-    <path
-       inkscape:connector-type="polyline"
-       id="path3479"
-       d="M 660.56485,524.48896 L 711.90839,524.46219"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.57923365px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
-    <g
-       id="g5451">
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.78366613px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 658.18058,522.19705 L 658.18058,550.37123"
-         id="path3481"
-         inkscape:connector-type="polyline" />
-      <text
-         xml:space="preserve"
-         style="font-size:21.18201256px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="664.1015"
-         y="546.73944"
-         id="text3483"><tspan
-           sodipodi:role="line"
-           id="tspan3485"
-           x="664.1015"
-           y="546.73944">*</tspan></text>
-    </g>
-  </g>
-  <rect
-     id="rect3499"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54178809999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="408.77814"
-     x="505"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_1.png"
-     inkscape:export-xdpi="51.581074"
-     inkscape:export-ydpi="51.581074" />
-  <rect
-     id="rect3501"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.54178809999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="454.15314"
-     x="505"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/ersplus/edit_voice_2.png"
-     inkscape:export-xdpi="51.581074"
-     inkscape:export-ydpi="51.581074" />
-  <rect
-     id="rect3503"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="316.66254"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_dead.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3505"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="361.5531"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/repeat_alternative.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3507"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="222.80037"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_staccato.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3509"
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="269.05127"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_slapping.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3511"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="123.49697"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_trill.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <rect
-     id="rect3513"
-     style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#929292;stroke-width:0.5417881;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-     y="173.82884"
-     x="506.29428"
-     ry="0"
-     rx="0"
-     height="41.334045"
-     width="41.334045"
-     inkscape:export-filename="/home/julian/temp/TuxGuitar/share/files/effect_tremolo_bar.png"
-     inkscape:export-xdpi="35.083408"
-     inkscape:export-ydpi="35.083408" />
-  <g
-     id="g4645"
-     transform="matrix(2.1169218e-2,0,0,-2.1169218e-2,520.23635,150.36733)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_treble.png"
-     inkscape:export-xdpi="112.41393"
-     inkscape:export-ydpi="112.41393">
-    <path
-       id="path4647"
-       d="M 297,1245 C 303,1248 304,1248 310,1248 C 318,1247 323,1244 334,1232 C 406,1158 466,1026 481,914 C 483,896 483,854 481,835 C 470,732 427,638 328,503 L 314,484 L 322,461 C 341,406 363,339 377,290 C 381,278 384,268 384,267 C 384,267 391,267 398,266 C 433,263 463,255 494,240 C 519,227 541,212 562,192 C 585,169 600,148 614,119 C 635,77 644,33 643,-11 C 642,-39 638,-60 629,-86 C 617,-124 595,-159 565,-189 C 539,-215 515,-231 483,-244 L 471,-249 L 471,-285 C 471,-336 468,-396 464,-432 C 460,-469 450,-504 434,-536 C 392,-621 318,-666 235,-658 C 141,-649 65,-585 46,-499 C 37,-460 41,-430 57,-405 C 78,-372 118,-353 157,-354 C 203,-356 240,-392 247,-442 C 252,-482 235,-519 203,-539 C 185,-550 160,-555 141,-552 C 138,-552 135,-551 135,-552 L 147,-564 C 169,-586 194,-600 226,-607 C 233,-608 239,-608 255,-608 C 273,-608 275,-608 285,-606 C 299,-602 311,-597 322,-591 C 372,-561 406,-499 415,-424 C 418,-396 421,-336 421,-292 C 421,-263 421,-261 419,-261 C 415,-263 394,-265 379,-266 C 360,-267 328,-267 313,-265 C 254,-258 200,-238 153,-205 C 83,-156 33,-83 12,1 C -15,106 4,218 70,336 C 98,385 125,425 192,514 L 230,565 L 223,584 C 175,711 159,784 154,890 C 152,936 154,975 160,1007 C 175,1091 214,1166 275,1226 C 287,1238 292,1242 297,1245 z M 376,1074 C 366,1091 368,1090 359,1084 C 331,1067 302,1041 281,1015 C 238,960 214,896 211,827 C 210,799 213,781 226,738 C 236,703 264,618 266,616 C 266,615 272,622 278,631 C 347,730 384,811 398,892 C 401,913 403,930 404,954 C 405,1009 399,1036 376,1074 z M 290,401 C 284,420 278,435 278,435 C 277,435 235,379 217,354 C 158,271 122,204 101,138 C 87,97 81,59 79,17 C 79,-6 80,-20 84,-37 C 107,-126 202,-199 314,-215 C 331,-217 379,-217 400,-215 C 421,-212 419,-213 418,-204 C 412,-109 404,-51 388,35 C 382,71 365,147 364,148 C 363,149 344,147 333,144 C 319,141 310,138 298,132 C 233,99 214,24 255,-37 C 262,-47 280,-65 291,-72 C 295,-75 304,-81 310,-84 C 319,-89 321,-91 323,-95 C 331,-108 326,-124 311,-131 C 303,-135 297,-134 281,-126 C 242,-107 213,-81 192,-49 C 153,11 148,88 180,153 C 208,209 258,247 322,261 C 328,263 333,264 333,264 C 334,265 306,356 290,401 z M 426,143 C 423,143 420,144 419,144 L 416,145 L 421,124 C 444,23 461,-87 467,-180 C 468,-190 468,-198 468,-198 C 469,-198 482,-192 489,-187 C 506,-177 522,-162 535,-145 C 566,-104 577,-53 565,-1 C 556,41 532,80 498,107 C 477,123 449,137 426,143 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g4687"
-     transform="matrix(2.5582031e-2,0,0,-2.5582031e-2,518.81737,190.80995)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_bass.png"
-     inkscape:export-xdpi="88.486824"
-     inkscape:export-ydpi="88.486824">
-    <path
-       id="path4689"
-       d="M 207,266 C 218,267 261,266 277,265 C 402,251 487,189 515,91 C 522,64 525,44 524,10 C 524,-33 519,-69 505,-107 C 454,-258 305,-383 33,-503 C 22,-508 12,-513 11,-514 C 5,-518 -1,-519 -7,-516 C -12,-514 -14,-512 -16,-507 C -19,-502 -18,-497 -16,-493 C -14,-489 -10,-486 12,-473 C 101,-420 166,-373 221,-325 C 238,-309 270,-277 284,-261 C 345,-190 377,-121 388,-41 C 390,-22 390,23 388,42 C 384,71 377,98 368,122 C 361,138 359,143 351,156 C 322,205 278,232 229,232 C 181,232 141,205 115,154 C 111,146 101,120 101,119 C 101,118 105,119 109,119 C 132,120 157,111 176,96 C 212,65 222,15 200,-30 C 185,-63 153,-84 118,-87 C 69,-90 21,-58 5,-12 C 0,3 -1,18 1,42 C 10,142 74,227 162,256 C 177,261 192,264 207,266 z M 596,172 C 612,177 631,172 644,160 C 653,150 658,137 658,124 C 658,97 636,75 609,75 C 581,75 559,97 559,124 C 559,147 574,166 596,172 z M 596,-77 C 612,-72 631,-77 644,-89 C 656,-102 661,-120 656,-136 C 651,-159 632,-174 609,-174 C 581,-174 559,-152 559,-125 C 559,-102 574,-83 596,-77 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g4729"
-     transform="matrix(2.3963563e-2,0,0,-2.3963563e-2,518.94351,243.2844)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/clef_alto.png"
-     inkscape:export-xdpi="92.514755"
-     inkscape:export-ydpi="92.514755">
-    <path
-       id="path4731"
-       d="M 9,498 C 12,500 18,500 72,500 L 132,500 L 135,497 C 137,495 139,493 140,491 C 142,487 142,450 142,0 C 142,-450 142,-487 140,-491 C 139,-493 137,-495 135,-497 L 132,-499 L 71,-499 L 10,-499 L 7,-497 C 5,-495 3,-493 2,-491 C 0,-487 0,-450 0,1 L 1,490 L 3,493 C 5,495 7,497 9,498 z M 201,498 C 204,500 207,500 218,500 C 231,500 232,499 235,497 C 243,491 242,514 242,254 L 242,21 L 248,26 C 273,50 296,87 309,120 C 317,144 322,171 324,200 C 324,213 325,215 327,218 C 329,221 336,225 341,225 C 346,225 352,222 355,219 C 357,215 358,214 359,195 C 362,154 376,120 399,96 C 422,74 449,65 482,69 C 505,72 522,79 535,92 C 549,106 557,122 563,147 C 569,169 571,191 572,236 C 574,391 545,454 464,465 C 432,469 411,463 402,448 C 400,444 400,443 400,435 C 400,426 400,425 403,419 C 406,413 408,410 420,398 C 432,387 434,383 437,378 C 444,363 441,341 430,321 C 426,314 412,300 405,296 C 380,281 351,281 326,296 C 319,300 305,314 301,321 C 291,338 288,356 291,379 C 296,408 309,433 330,455 C 352,476 379,490 411,497 C 430,501 467,501 499,496 C 617,479 680,407 689,281 C 692,242 689,214 680,185 C 652,103 577,44 487,35 C 458,32 450,34 423,52 C 407,63 399,67 391,69 C 379,72 367,69 358,61 C 347,52 342,33 342,0 C 342,-33 347,-52 358,-61 C 367,-69 379,-72 391,-69 C 399,-67 407,-63 423,-52 C 450,-34 458,-32 487,-35 C 577,-44 652,-103 680,-185 C 689,-214 692,-242 689,-280 C 679,-418 607,-489 469,-499 C 436,-501 413,-499 390,-491 C 345,-476 308,-440 295,-397 C 287,-367 289,-343 301,-321 C 305,-314 319,-300 326,-296 C 351,-281 380,-281 405,-296 C 412,-300 426,-314 430,-321 C 441,-341 444,-363 437,-378 C 434,-383 432,-387 420,-398 C 408,-410 406,-413 403,-419 C 400,-425 400,-426 400,-434 C 400,-443 400,-444 402,-448 C 411,-463 432,-469 464,-465 C 513,-458 543,-432 558,-380 C 568,-346 573,-300 572,-236 C 571,-191 569,-169 563,-146 C 551,-98 526,-74 482,-69 C 449,-65 422,-74 399,-96 C 376,-120 362,-154 359,-195 C 358,-214 357,-215 355,-219 C 352,-222 346,-225 341,-225 C 336,-225 329,-221 327,-218 C 325,-215 324,-213 324,-200 C 322,-160 314,-130 298,-95 C 286,-71 266,-44 248,-26 L 242,-21 L 242,-254 C 242,-514 243,-491 235,-497 C 232,-499 231,-499 217,-499 C 203,-499 202,-499 199,-497 C 197,-495 195,-493 194,-491 C 192,-487 192,-450 192,1 L 193,490 L 195,493 C 197,495 199,497 201,498 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g3548"
-     transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,524.00563,345.37089)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_flat.png"
-     inkscape:export-xdpi="40.069347"
-     inkscape:export-ydpi="40.069347">
-    <path
-       id="path3550"
-       d="M -12,469 C -1,471 17,469 24,464 C 26,463 26,452 23,289 C 21,194 20,116 20,116 C 20,115 24,117 28,120 C 49,134 75,142 101,144 C 128,145 150,137 169,118 C 188,100 198,76 200,50 C 201,31 197,14 188,-4 C 174,-31 154,-50 94,-91 C 56,-117 46,-125 34,-139 C 28,-145 21,-152 19,-153 C 10,-159 0,-158 -8,-151 C -10,-148 -12,-145 -13,-142 C -14,-140 -16,-33 -19,136 C -22,287 -24,422 -25,437 L -25,463 L -21,465 C -19,466 -15,468 -12,469 z M 94,102 C 87,106 76,107 67,104 C 49,99 34,83 28,62 C 26,52 24,-34 26,-67 C 27,-81 27,-94 28,-97 L 29,-101 L 44,-88 C 65,-70 86,-49 96,-35 C 106,-21 116,-2 120,12 C 126,35 123,61 114,81 C 109,91 103,98 94,102 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g3590"
-     transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,523.10578,382.55733)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_natural.png"
-     inkscape:export-xdpi="40.012753"
-     inkscape:export-ydpi="40.012753">
-    <path
-       id="path3592"
-       d="M 7,380 C 15,382 33,380 40,375 C 41,374 41,359 40,288 C 39,240 39,201 39,201 C 39,200 64,204 95,209 C 127,215 152,218 153,218 C 158,217 162,213 165,208 L 167,204 L 170,-85 C 173,-317 174,-374 173,-374 C 172,-375 169,-376 166,-377 C 158,-380 142,-380 134,-377 C 131,-376 128,-375 127,-374 C 126,-373 126,-358 127,-287 C 128,-239 128,-200 128,-200 C 128,-199 103,-203 72,-208 C 40,-214 15,-217 14,-217 C 9,-216 5,-212 2,-207 L 0,-202 L -3,49 C -5,187 -6,317 -7,338 L -7,375 L -2,377 C 1,378 5,379 7,380 z M 132,100 C 132,111 132,114 131,114 C 127,114 38,99 38,98 C 37,98 35,-112 35,-113 C 36,-113 128,-98 129,-97 C 129,-97 132,54 132,100 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g3632"
-     transform="matrix(4.9880005e-2,0,0,-4.9880005e-2,520.02757,289.61034)"
-     inkscape:export-filename="/home/julian/usr/workspace/TuxGuitar/share/skins/default/key_sharp.png"
-     inkscape:export-xdpi="32.806053"
-     inkscape:export-ydpi="32.806053">
-    <path
-       id="path3634"
-       d="M 191,373 C 198,377 209,374 213,365 C 215,361 215,358 215,288 C 215,247 215,214 216,214 C 216,214 225,218 236,222 C 259,231 262,232 268,227 C 275,222 275,221 275,181 C 275,147 275,144 273,141 C 272,139 270,137 269,136 C 267,135 255,129 241,124 L 216,113 L 215,32 C 215,-12 215,-49 216,-49 C 216,-49 225,-45 236,-41 C 259,-32 262,-31 268,-36 C 275,-41 275,-42 275,-82 C 275,-116 275,-119 273,-122 C 272,-124 270,-126 269,-127 C 267,-128 255,-134 241,-139 L 216,-150 L 215,-234 C 215,-310 214,-319 213,-322 C 206,-334 189,-334 182,-322 C 181,-319 180,-311 180,-241 L 180,-164 L 137,-181 L 95,-198 L 95,-279 C 95,-365 95,-363 90,-368 C 88,-371 81,-374 78,-374 C 74,-374 67,-371 65,-368 C 60,-363 60,-365 60,-287 C 60,-246 60,-213 59,-213 C 59,-213 50,-217 39,-221 C 16,-230 13,-231 7,-226 C 0,-221 0,-220 0,-180 C 0,-146 0,-143 2,-140 C 3,-138 5,-136 6,-135 C 8,-134 20,-128 34,-123 L 60,-112 L 60,-31 C 60,13 60,50 59,50 C 59,50 50,46 39,42 C 16,33 13,32 7,37 C 0,42 0,43 0,83 C 0,117 0,120 2,123 C 3,125 5,127 6,128 C 8,129 20,135 34,140 L 60,151 L 60,235 C 60,311 61,320 62,323 C 69,335 86,335 93,323 C 94,320 95,312 95,242 L 96,165 L 138,182 L 180,199 L 180,280 C 180,356 180,361 182,365 C 184,369 186,371 191,373 z M 180,18 L 180,99 L 137,82 L 95,65 L 95,-17 L 95,-98 L 98,-97 C 100,-96 119,-88 141,-80 L 180,-64 L 180,18 z "
-       style="fill:currentColor" />
-  </g>
-  <g
-     id="g4514"
-     transform="translate(0.7071068,2.4748737)">
-    <g
-       transform="matrix(0.5668049,0,0,0.8603553,-3.5065048,130.39104)"
-       id="g3515">
-      <path
-         d="M 682.97838,357.60834 C 682.97838,361.07849 679.55702,363.89161 675.33657,363.89161 C 671.11611,363.89161 667.69476,361.07849 667.69476,357.60834 C 667.69476,354.1382 671.11611,351.32508 675.33657,351.32508 C 679.55702,351.32508 682.97838,354.1382 682.97838,357.60834 z "
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.71708798;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:16;stroke-opacity:1"
-         id="path3517" />
-      <path
-         d="M 683.05261,356.83776 L 683.05261,326.03045"
-         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.21898484;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         id="path3519" />
-    </g>
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path3541"
-       d="M 387.957,426.78352 L 398.26464,437.35718 L 398.26464,433.5566 L 391.48325,426.78352 L 398.26464,420.07412 L 398.26464,416.27354 L 387.957,426.78352 z "
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path3543"
-       d="M 378.09836,426.89402 L 367.79072,416.32036 L 367.79072,420.12094 L 374.57211,426.89402 L 367.79072,433.60342 L 367.79072,437.404 L 378.09836,426.89402 z "
-       style="font-size:61.60151672px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="675.8205"
-     y="338.63779"
-     id="text3736"
-     transform="scale(0.7694351,1.2996548)"
-     inkscape:label="#text3736"><tspan
-       sodipodi:role="line"
-       id="tspan3738"
-       x="675.8205"
-       y="338.63779">1</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-size:22px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black"
-     x="675.8205"
-     y="373.55087"
-     id="text3740"
-     transform="scale(0.7694351,1.2996548)"><tspan
-       sodipodi:role="line"
-       id="tspan3742"
-       x="675.8205"
-       y="373.55087">2</tspan></text>
-</svg>
diff --git a/TuxGuitar/share/skins/ersplus/song_properties.png b/TuxGuitar/share/skins/ersplus/song_properties.png
deleted file mode 100644
index bbb0e9c8..00000000
Binary files a/TuxGuitar/share/skins/ersplus/song_properties.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/splash.png b/TuxGuitar/share/skins/ersplus/splash.png
deleted file mode 100644
index 4f0383a2..00000000
Binary files a/TuxGuitar/share/skins/ersplus/splash.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/tempo.png b/TuxGuitar/share/skins/ersplus/tempo.png
deleted file mode 100644
index a06586e8..00000000
Binary files a/TuxGuitar/share/skins/ersplus/tempo.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/tempoicon.png b/TuxGuitar/share/skins/ersplus/tempoicon.png
deleted file mode 100644
index 922047c4..00000000
Binary files a/TuxGuitar/share/skins/ersplus/tempoicon.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/tiednote.png b/TuxGuitar/share/skins/ersplus/tiednote.png
deleted file mode 100644
index f1a76314..00000000
Binary files a/TuxGuitar/share/skins/ersplus/tiednote.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/timesignature.png b/TuxGuitar/share/skins/ersplus/timesignature.png
deleted file mode 100644
index c047cdf5..00000000
Binary files a/TuxGuitar/share/skins/ersplus/timesignature.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/track_add.png b/TuxGuitar/share/skins/ersplus/track_add.png
deleted file mode 100644
index 5fae2a91..00000000
Binary files a/TuxGuitar/share/skins/ersplus/track_add.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/track_remove.png b/TuxGuitar/share/skins/ersplus/track_remove.png
deleted file mode 100644
index b7c4a74e..00000000
Binary files a/TuxGuitar/share/skins/ersplus/track_remove.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport.png b/TuxGuitar/share/skins/ersplus/transport.png
deleted file mode 100644
index 7dd06499..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_first_1.png b/TuxGuitar/share/skins/ersplus/transport_first_1.png
deleted file mode 100644
index 0611b440..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_first_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_first_2.png b/TuxGuitar/share/skins/ersplus/transport_first_2.png
deleted file mode 100644
index 4b952866..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_first_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_first_1.png b/TuxGuitar/share/skins/ersplus/transport_icon_first_1.png
deleted file mode 100644
index 0ba109b5..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_first_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_first_2.png b/TuxGuitar/share/skins/ersplus/transport_icon_first_2.png
deleted file mode 100644
index aaf03e67..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_first_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_last_1.png b/TuxGuitar/share/skins/ersplus/transport_icon_last_1.png
deleted file mode 100644
index 2e038f67..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_last_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_last_2.png b/TuxGuitar/share/skins/ersplus/transport_icon_last_2.png
deleted file mode 100644
index 70070647..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_last_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_next_1.png b/TuxGuitar/share/skins/ersplus/transport_icon_next_1.png
deleted file mode 100644
index 2ce4d78a..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_next_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_next_2.png b/TuxGuitar/share/skins/ersplus/transport_icon_next_2.png
deleted file mode 100644
index 31cef808..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_next_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_pause.png b/TuxGuitar/share/skins/ersplus/transport_icon_pause.png
deleted file mode 100644
index 841e0d62..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_pause.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_play_1.png b/TuxGuitar/share/skins/ersplus/transport_icon_play_1.png
deleted file mode 100644
index 2d744dba..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_play_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_play_2.png b/TuxGuitar/share/skins/ersplus/transport_icon_play_2.png
deleted file mode 100644
index f2b8ad32..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_play_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_previous_1.png b/TuxGuitar/share/skins/ersplus/transport_icon_previous_1.png
deleted file mode 100644
index 7e37f199..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_previous_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_previous_2.png b/TuxGuitar/share/skins/ersplus/transport_icon_previous_2.png
deleted file mode 100644
index 65fa720b..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_previous_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_stop_1.png b/TuxGuitar/share/skins/ersplus/transport_icon_stop_1.png
deleted file mode 100644
index 60351a8d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_stop_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_icon_stop_2.png b/TuxGuitar/share/skins/ersplus/transport_icon_stop_2.png
deleted file mode 100644
index 61b7be2e..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_icon_stop_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_last_1.png b/TuxGuitar/share/skins/ersplus/transport_last_1.png
deleted file mode 100644
index 4df5a1cc..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_last_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_last_2.png b/TuxGuitar/share/skins/ersplus/transport_last_2.png
deleted file mode 100644
index 4408e75d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_last_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_metronome.png b/TuxGuitar/share/skins/ersplus/transport_metronome.png
deleted file mode 100644
index be8f4119..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_metronome.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_mode.png b/TuxGuitar/share/skins/ersplus/transport_mode.png
deleted file mode 100644
index b5720041..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_mode.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_next_1.png b/TuxGuitar/share/skins/ersplus/transport_next_1.png
deleted file mode 100644
index 76d960b9..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_next_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_next_2.png b/TuxGuitar/share/skins/ersplus/transport_next_2.png
deleted file mode 100644
index 35fc6c2a..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_next_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_pause.png b/TuxGuitar/share/skins/ersplus/transport_pause.png
deleted file mode 100644
index 55d0affb..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_pause.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_play_1.png b/TuxGuitar/share/skins/ersplus/transport_play_1.png
deleted file mode 100644
index a1975f3d..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_play_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_play_2.png b/TuxGuitar/share/skins/ersplus/transport_play_2.png
deleted file mode 100644
index 5dd58430..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_play_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_previous_1.png b/TuxGuitar/share/skins/ersplus/transport_previous_1.png
deleted file mode 100644
index 5fe8efb7..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_previous_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_previous_2.png b/TuxGuitar/share/skins/ersplus/transport_previous_2.png
deleted file mode 100644
index 0a2008a0..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_previous_2.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_stop_1.png b/TuxGuitar/share/skins/ersplus/transport_stop_1.png
deleted file mode 100644
index bf0010f4..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_stop_1.png and /dev/null differ
diff --git a/TuxGuitar/share/skins/ersplus/transport_stop_2.png b/TuxGuitar/share/skins/ersplus/transport_stop_2.png
deleted file mode 100644
index 9ab8e3bc..00000000
Binary files a/TuxGuitar/share/skins/ersplus/transport_stop_2.png and /dev/null differ
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/TGMain.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/TGMain.java
new file mode 100644
index 00000000..7c3f1d30
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/TGMain.java
@@ -0,0 +1,20 @@
+package org.herac.tuxguitar.app;
+
+//import java.util.Map.Entry;
+
+public class TGMain {
+
+	public static void main(String[] args){
+
+
+//		for (Entry<Object, Object> entry : System.getProperties().entrySet())
+//		{
+//
+//			//System.out.println("property: " + entry.getKey().toString() + " = " + entry.getValue().toString());
+//		}
+
+		TuxGuitar.instance().displayGUI(args);
+		System.exit(0);
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/TuxGuitar.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/TuxGuitar.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/TuxGuitar.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/TuxGuitar.java
index 0313060a..b1bb3b8a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/TuxGuitar.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/TuxGuitar.java
@@ -1,14 +1,12 @@
 /*
  * Created on 25-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app;
 
 import java.net.URL;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseTrackAdapter;
@@ -54,11 +52,12 @@
 import org.herac.tuxguitar.app.system.keybindings.KeyBindingActionManager;
 import org.herac.tuxguitar.app.system.language.LanguageManager;
 import org.herac.tuxguitar.app.system.plugins.TGPluginManager;
-import org.herac.tuxguitar.app.table.TGTableViewer;
+import org.herac.tuxguitar.app.system.tuning.TuningTemplateManager;
 import org.herac.tuxguitar.app.tools.browser.dialog.TGBrowserDialog;
 import org.herac.tuxguitar.app.tools.scale.ScaleManager;
 import org.herac.tuxguitar.app.tools.template.TGTemplate;
 import org.herac.tuxguitar.app.tools.template.TGTemplateManager;
+import org.herac.tuxguitar.app.tracktable.TrackTableViewer;
 import org.herac.tuxguitar.app.transport.TGTransport;
 import org.herac.tuxguitar.app.transport.TGTransportListener;
 import org.herac.tuxguitar.app.undo.UndoableManager;
@@ -78,84 +77,86 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TuxGuitar {
-	
+
 	public static final String APPLICATION_NAME = "TuxGuitar";
-	
+
 	public static final int MARGIN_WIDTH = 5;
-	
+
 	private static TuxGuitar instance;
-	
+
 	private boolean initialized;
-	
-	private TGLock lock;
-	
+
+	private final TGLock lock;
+
 	private Display display;
-	
+
 	private Shell shell;
-	
+
+	private Clipboard clipBoard;
+
 	private MidiPlayer player;
-	
+
 	private TGSongManager songManager;
-	
+
 	private TGConfigManager configManager;
-	
+
 	private LanguageManager languageManager;
-	
+
 	private KeyBindingActionManager keyBindingManager;
-	
+
+	private TuningTemplateManager tuningTemplateManager;
+
 	private IconManager iconManager;
-	
+
 	private EditorCache editorCache;
-	
+
 	private TablatureEditor tablatureEditor;
-	
-	private TGTableViewer table;
-	
+
+	private TrackTableViewer table;
+
 	private TGChannelManagerDialog channelManager;
-	
+
 	private TGTransport songTransport;
-	
+
 	private FretBoardEditor fretBoardEditor;
-	
+
 	private PianoEditor pianoEditor;
-	
+
 	private MatrixEditor matrixEditor;
-	
+
 	private LyricEditor lyricEditor;
-	
+
 	private TGEditorManager editorManager;
-	
+
 	private TGBrowserDialog browser;
-	
+
 	private UndoableManager undoableManager;
-	
+
 	private ScaleManager scaleManager;
-	
+
 	private ActionManager actionManager;
-	
+
 	private ItemManager itemManager;
-	
+
 	private CustomChordManager customChordManager;
-	
+
 	private FileHistory fileHistory;
-	
+
 	private TGTemplateManager templateManager;
-	
+
 	private TGPluginManager pluginManager;
-	
+
 	protected Sash sash;
-	
+
 	protected Composite sashComposite;
-	
+
 	public TuxGuitar() {
 		this.lock = new TGLock();
 		this.initialized = false;
 	}
-	
+
 	public static TuxGuitar instance() {
 		if (instance == null) {
 			synchronized (TuxGuitar.class) {
@@ -164,24 +165,28 @@ public static TuxGuitar instance() {
 		}
 		return instance;
 	}
-	
+
 	private void initSynchronizer(){
 		TGSynchronizer.instance().setController(new TGSynchronizer.TGSynchronizerController() {
+			@Override
 			public void execute(final TGSynchronizer.TGSynchronizerTask task) {
 				final Display display = getDisplay();
 				if(display != null && !display.isDisposed()){
 					display.syncExec(new Runnable() {
+						@Override
 						public void run() {
 							task.run();
 						}
 					});
 				}
 			}
-			
+
+			@Override
 			public void executeLater(final TGSynchronizer.TGSynchronizerTask task) {
 				final Display display = getDisplay();
 				if(display != null && !display.isDisposed()){
 					display.asyncExec(new Runnable() {
+						@Override
 						public void run() {
 							task.run();
 						}
@@ -190,41 +195,41 @@ public void run() {
 			}
 		});
 	}
-	
+
 	public void displayGUI(String[] args) {
 		//checkeo los argumentos
 		ArgumentParser argumentParser = new ArgumentParser(args);
 		if(argumentParser.processAndExit()){
 			return;
 		}
-		
+
 		// Priority 1 ----------------------------------------------//
 		TGFileUtils.loadLibraries();
 		TGFileUtils.loadClasspath();
-		
+
 		// Priority 2 ----------------------------------------------//
 		Display.setAppName(APPLICATION_NAME);
-		
+
 		this.display = new Display();
 		this.initSynchronizer();
-		
+
 		TGSplash.instance().init();
-		
+
 		this.shell = new Shell(getDisplay());
 		this.shell.setLayout(getShellLayout());
 		this.shell.setImage(getIconManager().getAppIcon());
-		
+
 		this.createComposites(getShell());
-		
+
 		// Priority 3 ----------------------------------------------//
 		this.getPluginManager().openPlugins();
 		this.restoreControlsConfig();
 		this.restorePlayerConfig();
 		this.updateCache(true);
 		this.showTitle();
-		
+
 		TGSplash.instance().finish();
-		
+
 		// Priority 4 ----------------------------------------------//
 		this.shell.addShellListener(getAction(DisposeAction.NAME));
 		this.shell.open();
@@ -237,22 +242,24 @@ public void displayGUI(String[] args) {
 		}
 		getDisplay().dispose();
 	}
-	
+
 	private FormLayout getShellLayout(){
 		FormLayout layout = new FormLayout();
 		layout.marginWidth = MARGIN_WIDTH;
 		layout.marginHeight = MARGIN_WIDTH;
 		return layout;
 	}
-	
+
 	private void startSong(final ArgumentParser parser){
 		final URL url = parser.getURL();
 		if(url != null){
 			ActionLock.lock();
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 					new Thread(new Runnable() {
+						@Override
 						public void run() {
 							if(!TuxGuitar.isDisposed()){
 								FileActionUtils.open(url);
@@ -267,7 +274,7 @@ public void run() {
 			getAction(NewFileAction.NAME).process(new ActionData());
 		}
 	}
-	
+
 	public void createComposites(Composite composite) {
 		FormData data = new FormData();
 		data.left = new FormAttachment(0,0);
@@ -277,7 +284,7 @@ public void createComposites(Composite composite) {
 		this.sashComposite = new Composite(composite,SWT.NONE);
 		this.sashComposite.setLayout(new FormLayout());
 		this.sashComposite.setLayoutData(data);
-		
+
 		data = new FormData();
 		data.left = new FormAttachment(0,0);
 		data.right = new FormAttachment(100,0);
@@ -285,7 +292,7 @@ public void createComposites(Composite composite) {
 		data.height = MARGIN_WIDTH;
 		this.sash = new Sash(this.sashComposite, SWT.HORIZONTAL);
 		this.sash.setLayoutData(data);
-		
+
 		data = new FormData();
 		data.left = new FormAttachment(0,0);
 		data.right = new FormAttachment(100,0);
@@ -293,7 +300,7 @@ public void createComposites(Composite composite) {
 		data.bottom = new FormAttachment(this.sash, 0);
 		getTablatureEditor().showTablature(this.sashComposite);
 		getTablatureEditor().getTablature().setLayoutData(data);
-		
+
 		data = new FormData();
 		data.left = new FormAttachment(0,0);
 		data.right = new FormAttachment(100,0);
@@ -301,24 +308,26 @@ public void createComposites(Composite composite) {
 		data.bottom = new FormAttachment(100,0);
 		getTable().init(this.sashComposite);
 		getTable().getComposite().setLayoutData(data);
-		
+
 		data = new FormData();
 		data.left = new FormAttachment(0,0);
 		data.right = new FormAttachment(100,0);
 		data.top = new FormAttachment(this.sashComposite,0);
 		data.bottom = new FormAttachment(100,0);
-		
+
 		Composite footer = new Composite(composite,SWT.NONE);
 		footer.setLayout(new FormLayout());
 		footer.setLayoutData(data);
 		getFretBoardEditor().showFretBoard(footer);
-		
+
 		this.sash.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(MouseEvent e) {
 				TuxGuitar.this.sashComposite.layout(true,true);
 			}
 		});
 		this.sash.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent event) {
 				int maximumHeight = (TuxGuitar.this.sashComposite.getBounds().height - TuxGuitar.this.sash.getBounds().height);
 				int height = (maximumHeight - event.y);
@@ -328,11 +337,13 @@ public void widgetSelected(SelectionEvent event) {
 			}
 		});
 		this.sash.addMouseTrackListener(new MouseTrackAdapter() {
+			@Override
 			public void mouseEnter(MouseEvent e) {
 				TuxGuitar.this.sash.setCursor( getDisplay().getSystemCursor( SWT.CURSOR_SIZENS ) );
 			}
 		});
 		this.sashComposite.addListener(SWT.Resize, new Listener() {
+			@Override
 			public void handleEvent(Event arg0) {
 				FormData data = ((FormData) TuxGuitar.this.sash.getLayoutData());
 				int height = -data.bottom.offset;
@@ -343,10 +354,10 @@ public void handleEvent(Event arg0) {
 			}
 		});
 	}
-	
+
 	public void restoreControlsConfig(){
 		final TGConfigManager config = getConfig();
-		
+
 		//---Main Shell---
 		boolean maximized = config.getBooleanConfigValue(TGConfigKeys.MAXIMIZED);
 		getShell().setMaximized(maximized);
@@ -367,6 +378,7 @@ public void restoreControlsConfig(){
 		//---Instruments---
 		if(config.getBooleanConfigValue(TGConfigKeys.SHOW_INSTRUMENTS)){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					getChannelManager().show();
 				}
@@ -375,6 +387,7 @@ public void run() {
 		//---Transport---
 		if(config.getBooleanConfigValue(TGConfigKeys.SHOW_TRANSPORT)){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					getTransport().show();
 				}
@@ -383,6 +396,7 @@ public void run() {
 		//---Matrix---
 		if(config.getBooleanConfigValue(TGConfigKeys.SHOW_MATRIX)){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					getMatrixEditor().show();
 				}
@@ -391,6 +405,7 @@ public void run() {
 		//---Piano---
 		if(config.getBooleanConfigValue(TGConfigKeys.SHOW_PIANO)){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					getPianoEditor().show();
 				}
@@ -399,13 +414,14 @@ public void run() {
 		//---Markers---
 		if(config.getBooleanConfigValue(TGConfigKeys.SHOW_MARKERS)){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					MarkerList.instance().show();
 				}
 			}).start();
 		}
 	}
-	
+
 	public void setTableHeight(int value){
 		int offset = ((FormData) getTable().getComposite().getLayoutData()).top.offset;
 		int sashHeight = this.sash.getBounds().height;
@@ -416,7 +432,7 @@ public void setTableHeight(int value){
 		((FormData) TuxGuitar.this.sash.getLayoutData()).bottom = new FormAttachment(100, -height);
 		this.sashComposite.layout(true,true);
 	}
-	
+
 	public void updateShellFooter(int offset,int minimumWith,int minimumHeight){
 		FormData data = ((FormData)this.sashComposite.getLayoutData());
 		data.bottom.offset = -offset;
@@ -424,42 +440,49 @@ public void updateShellFooter(int offset,int minimumWith,int minimumHeight){
 		getShell().layout(true,true);
 		getShell().redraw();
 	}
-	
-	public TGTableViewer getTable(){
+
+	public Clipboard getClipBoard(){
+		if(this.clipBoard == null){
+			this.clipBoard = new Clipboard(display);
+		}
+		return this.clipBoard;
+	}
+
+	public TrackTableViewer getTable(){
 		if(this.table == null){
-			this.table = new TGTableViewer();
+			this.table = new TrackTableViewer();
 		}
 		return this.table;
 	}
-	
+
 	public TablatureEditor getTablatureEditor(){
 		if(this.tablatureEditor == null){
 			this.tablatureEditor = new TablatureEditor();
 		}
 		return this.tablatureEditor;
 	}
-	
+
 	public FretBoardEditor getFretBoardEditor(){
 		if(this.fretBoardEditor == null){
 			this.fretBoardEditor = new FretBoardEditor();
 		}
 		return this.fretBoardEditor;
 	}
-	
+
 	public PianoEditor getPianoEditor(){
 		if(this.pianoEditor == null){
 			this.pianoEditor = new PianoEditor();
 		}
 		return this.pianoEditor;
 	}
-	
+
 	public MatrixEditor getMatrixEditor(){
 		if(this.matrixEditor == null){
 			this.matrixEditor = new MatrixEditor();
 		}
 		return this.matrixEditor;
 	}
-	
+
 	public TGSongManager getSongManager(){
 		if(this.songManager == null){
 			this.songManager = new TGSongManager(new TGFactoryImpl());
@@ -467,74 +490,75 @@ public TGSongManager getSongManager(){
 		}
 		return this.songManager;
 	}
-	
+
 	public TGChannelManagerDialog getChannelManager(){
 		if( this.channelManager == null ){
 			this.channelManager = new TGChannelManagerDialog();
 		}
 		return this.channelManager;
 	}
-	
+
 	public TGTransport getTransport(){
 		if(this.songTransport == null){
 			this.songTransport = new TGTransport();
 		}
 		return this.songTransport;
 	}
-	
+
 	public EditorCache getEditorCache(){
 		if(this.editorCache == null){
 			this.editorCache = new EditorCache();
 		}
 		return this.editorCache;
 	}
-	
+
 	public TGEditorManager getEditorManager(){
 		if(this.editorManager == null){
 			this.editorManager = new TGEditorManager();
 		}
 		return this.editorManager;
 	}
-	
+
 	public LyricEditor getLyricEditor(){
 		if(this.lyricEditor == null){
 			this.lyricEditor = new LyricEditor();
 		}
 		return this.lyricEditor;
 	}
-	
+
 	public TGBrowserDialog getBrowser(){
 		if(this.browser == null){
 			this.browser = new TGBrowserDialog();
 		}
 		return this.browser;
 	}
-	
+
 	public UndoableManager getUndoableManager(){
 		if(this.undoableManager == null){
 			this.undoableManager = new UndoableManager();
 		}
 		return this.undoableManager;
 	}
-	
+
 	public ScaleManager getScaleManager(){
 		if(this.scaleManager == null){
 			this.scaleManager = new ScaleManager();
 		}
 		return this.scaleManager;
 	}
-	
+
 	public TGPluginManager getPluginManager(){
 		if(this.pluginManager == null){
 			this.pluginManager = new TGPluginManager();
 		}
 		return this.pluginManager;
 	}
-	
+
 	public IconManager getIconManager(){
 		if(this.iconManager == null){
 			this.iconManager = new IconManager();
 			this.iconManager.addLoader( new IconLoader() {
+				@Override
 				public void loadIcons() {
 					getShell().setImage(getIconManager().getAppIcon());
 					getShell().layout(true);
@@ -543,28 +567,28 @@ public void loadIcons() {
 		}
 		return this.iconManager;
 	}
-	
+
 	public CustomChordManager getCustomChordManager(){
 		if(this.customChordManager == null){
 			this.customChordManager = new CustomChordManager();
 		}
 		return this.customChordManager;
 	}
-	
+
 	public ItemManager getItemManager() {
 		if(this.itemManager == null){
 			this.itemManager = new ItemManager();
 		}
 		return this.itemManager;
 	}
-	
+
 	public ActionManager getActionManager() {
 		if(this.actionManager == null){
 			this.actionManager = new ActionManager();
 		}
 		return this.actionManager;
 	}
-	
+
 	public LanguageManager getLanguageManager() {
 		if(this.languageManager == null){
 			this.languageManager = new LanguageManager();
@@ -572,7 +596,7 @@ public LanguageManager getLanguageManager() {
 		}
 		return this.languageManager;
 	}
-	
+
 	public TGConfigManager getConfig(){
 		if(this.configManager == null){
 			this.configManager = new TGConfigManagerImpl();
@@ -580,28 +604,35 @@ public TGConfigManager getConfig(){
 		}
 		return this.configManager;
 	}
-	
+
 	public KeyBindingActionManager getkeyBindingManager(){
 		if(this.keyBindingManager == null){
 			this.keyBindingManager = new KeyBindingActionManager();
 		}
 		return this.keyBindingManager;
 	}
-	
+
+	public TuningTemplateManager getTuningTemplateManager(){
+		if(this.tuningTemplateManager == null){
+			this.tuningTemplateManager = new TuningTemplateManager();
+		}
+		return this.tuningTemplateManager;
+	}
+
 	public FileHistory getFileHistory(){
 		if(this.fileHistory == null){
 			this.fileHistory = new FileHistory();
 		}
 		return this.fileHistory;
 	}
-	
+
 	public TGTemplateManager getTemplateManager(){
 		if( this.templateManager == null ){
 			this.templateManager = new TGTemplateManager();
 		}
 		return this.templateManager;
 	}
-	
+
 	public MidiPlayer getPlayer(){
 		if(this.player == null){
 			this.player = new MidiPlayer();
@@ -615,17 +646,18 @@ public MidiPlayer getPlayer(){
 		}
 		return this.player;
 	}
-	
+
 	public void restorePlayerConfig(){
 		//check midi sequencer
 		getPlayer().openSequencer(getConfig().getStringConfigValue(TGConfigKeys.MIDI_SEQUENCER), true);
-		
+
 		//check midi port
 		getPlayer().openOutputPort(getConfig().getStringConfigValue(TGConfigKeys.MIDI_PORT), true);
 	}
-	
+
 	public void showTitle(){
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				if(!isDisposed()){
 					getShell().setText(WindowTitleUtil.parseTitle());
@@ -633,13 +665,14 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void updateCache(final boolean updateItems){
 		if(!this.isLocked()){
 			this.lock();
 			this.getEditorCache().updateEditMode();
 			this.unlock();
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					if(!isDisposed() && !isLocked()){
 						if(updateItems){
@@ -653,7 +686,7 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 	protected void redraw(){
 		if(!isDisposed() && !this.isLocked()){
 			this.lock();
@@ -661,7 +694,7 @@ protected void redraw(){
 			this.unlock();
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!isDisposed() && !this.isLocked()){
 			this.lock();
@@ -670,7 +703,7 @@ public void redrawPlayingMode(){
 			this.unlock();
 		}
 	}
-	
+
 	public void showExternalBeat( TGBeat beat ){
 		if(!isDisposed() && !this.isLocked()){
 			this.lock();
@@ -679,7 +712,7 @@ public void showExternalBeat( TGBeat beat ){
 			this.unlock();
 		}
 	}
-	
+
 	public void hideExternalBeat(){
 		if(!isDisposed() && !this.isLocked()){
 			this.lock();
@@ -688,67 +721,67 @@ public void hideExternalBeat(){
 			this.unlock();
 		}
 	}
-	
+
 	public Display getDisplay(){
 		return this.display;
 	}
-	
+
 	public Shell getShell(){
 		return this.shell;
 	}
-	
+
 	public Action getAction(String name) {
 		return this.getActionManager().getAction(name);
 	}
-	
+
 	public static String getProperty(String key) {
 		return TuxGuitar.instance().getLanguageManager().getProperty(key);
 	}
-	
+
 	public static String getProperty(String key,String[] arguments) {
 		return  TuxGuitar.instance().getLanguageManager().getProperty(key,arguments);
 	}
-	
+
 	public static boolean isDisposed(){
 		return (TuxGuitar.instance().getDisplay().isDisposed() || TuxGuitar.instance().getShell().isDisposed());
 	}
-	
+
 	public void loadLanguage(){
 		this.lock();
-		
+
 		getLanguageManager().setLanguage(getConfig().getStringConfigValue(TGConfigKeys.LANGUAGE));
-		
+
 		this.unlock();
 	}
-	
+
 	public void loadToolBars(){
 		this.lock();
-		
+
 		getItemManager().createCoolbar();
-		
+
 		this.unlock();
 	}
-	
+
 	public void loadStyles(){
 		this.lock();
-		
+
 		getTablatureEditor().getTablature().reloadStyles();
-		
+
 		this.unlock();
 	}
-	
+
 	public void loadSkin(){
 		this.lock();
-		
+
 		getIconManager().reloadIcons();
-		
+
 		this.unlock();
 	}
-	
+
 	public void newSong(){
 		this.newSong(TuxGuitar.instance().getTemplateManager().getDefatulTemplate());
 	}
-	
+
 	public void newSong(TGTemplate tgTemplate){
 		TGSong tgSong = null;
 		if( tgTemplate != null ){
@@ -759,10 +792,10 @@ public void newSong(TGTemplate tgTemplate){
 		}
 		TuxGuitar.instance().fireNewSong(tgSong,null);
 	}
-	
+
 	public void fireNewSong(TGSong song,URL url){
 		this.lock();
-		
+
 		TuxGuitar.instance().getSongManager().setSong(song);
 		getFileHistory().reset(url);
 		getPlayer().reset();
@@ -770,41 +803,42 @@ public void fireNewSong(TGSong song,URL url){
 		getEditorCache().reset();
 		getUndoableManager().discardAllEdits();
 		getEditorManager().doUpdate( TGUpdateListener.SONG_LOADED );
-		
+
 		this.unlock();
-		
+
 		updateCache(true);
 		showTitle();
 	}
-	
+
 	public void fireSaveSong(URL url){
 		this.lock();
-		
+
 		getFileHistory().reset(url);
 		getEditorCache().reset();
 		getUndoableManager().discardAllEdits();
 		getEditorManager().doUpdate( TGUpdateListener.SONG_SAVED );
-		
+
 		this.unlock();
-		
+
 		updateCache(true);
 		showTitle();
 	}
-	
+
 	public void fireUpdate(){
 		this.lock();
 		this.getEditorCache().reset();
 		this.getEditorManager().doUpdate( TGUpdateListener.SONG_UPDATED );
 		this.unlock();
 	}
-	
+
 	public void loadCursor(int style){
 		this.loadCursor(getShell(),style);
 	}
-	
+
 	public void loadCursor(final Control control,final int style){
 		try {
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					if(!control.isDisposed()){
 						control.setCursor(getDisplay().getSystemCursor(style));
@@ -815,9 +849,10 @@ public void run() throws Throwable {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void playBeat( final TGBeat beat ){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!isDisposed() && !getPlayer().isRunning() ){
 					getPlayer().playBeat(beat);
@@ -825,23 +860,23 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public boolean isInitialized() {
 		return this.initialized;
 	}
-	
+
 	public void setInitialized(boolean initialized) {
 		this.initialized = initialized;
 	}
-	
+
 	public void lock(){
 		this.lock.lock();
 	}
-	
+
 	public void unlock(){
 		this.lock.unlock();
 	}
-	
+
 	public boolean isLocked(){
 		return this.lock.isLocked();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/Action.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/Action.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/Action.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/Action.java
index 6472b527..1bf9c220 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/Action.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/Action.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions;
 
@@ -14,54 +11,53 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window 
- * Preferences - Java - Code Style - Code Templates
  */
 public abstract class Action extends ActionAdapter {
-	
+
 	protected static final int AUTO_LOCK = 0x01;
-	
+
 	protected static final int AUTO_UNLOCK = 0x02;
-	
+
 	protected static final int AUTO_UPDATE = 0x04;
-	
+
 	protected static final int KEY_BINDING_AVAILABLE = 0x08;
-	
+
 	protected static final int DISABLE_ON_PLAYING = 0x10;
-	
-	private String name;
-	
-	private int flags;
-	
+
+	private final String name;
+
+	private final int flags;
+
 	public Action(String name, int flags) {
 		this.name = name;
 		this.flags = flags;
 	}
-	
+
 	protected abstract int execute(ActionData actionData);
-	
+
+	@Override
 	public synchronized void process(final ActionData actionData) {
 		if (!ActionLock.isLocked() && !TuxGuitar.instance().isLocked()) {
 			final int flags = getFlags();
-			
+
 			if ((flags & DISABLE_ON_PLAYING) != 0 && TuxGuitar.instance().getPlayer().isRunning()) {
 				TuxGuitar.instance().updateCache(((flags & AUTO_UPDATE) != 0));
 				return;
 			}
-			
+
 			if ((flags & AUTO_LOCK) != 0) {
 				ActionLock.lock();
 			}
-			
+
 			try {
 				TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() throws Throwable {
 						if (!TuxGuitar.isDisposed()) {
 							int result = execute(actionData);
-							
+
 							TuxGuitar.instance().updateCache((((flags | result) & AUTO_UPDATE) != 0));
-							
+
 							if (((flags | result) & AUTO_UNLOCK) != 0) {
 								ActionLock.unlock();
 							}
@@ -73,35 +69,35 @@ public void run() throws Throwable {
 			}
 		}
 	}
-	
+
 	protected int getFlags() {
 		return this.flags;
 	}
-	
+
 	public TGSongManager getSongManager() {
 		return TuxGuitar.instance().getSongManager();
 	}
-	
+
 	public TablatureEditor getEditor() {
 		return TuxGuitar.instance().getTablatureEditor();
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public boolean isKeyBindingAvailable() {
 		return ((getFlags() & KEY_BINDING_AVAILABLE) != 0);
 	}
-	
+
 	public synchronized void updateTablature() {
 		TuxGuitar.instance().fireUpdate();
 	}
-	
+
 	public void fireUpdate(int number) {
 		this.getEditor().getTablature().updateMeasure(number);
 	}
-	
+
 	public void addUndoableEdit(UndoableEdit anEdit) {
 		TuxGuitar.instance().getUndoableManager().addEdit(anEdit);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionAdapter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionAdapter.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionAdapter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionAdapter.java
index 2e0eaf46..fcbeb285 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionAdapter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionAdapter.java
@@ -15,19 +15,20 @@
 import org.eclipse.swt.widgets.ToolItem;
 
 public abstract class ActionAdapter implements SelectionListener,MouseListener,MenuListener,ShellListener{
-	
+
 	public static final String PROPERTY_TYPED_EVENT = "typedEvent";
-	
+
 	public abstract void process(ActionData actionData);
-	
+
 	public synchronized void processEvent(TypedEvent e) {
 		Object widgetData = (e.widget != null ? e.widget.getData() : null);
-		
+
 		ActionData actionData = (widgetData instanceof ActionData ? (ActionData)widgetData : new ActionData());
 		actionData.put(PROPERTY_TYPED_EVENT, e);
 		this.process(actionData);
 	}
-	
+
+	@Override
 	public void widgetSelected(SelectionEvent e) {
 		if(e.widget != null && (e.widget.getStyle() & SWT.RADIO) != 0){
 			if(e.widget instanceof Button && !((Button)e.widget).getSelection() ){
@@ -42,50 +43,61 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		processEvent(e);
 	}
-	
+
+	@Override
 	public void mouseUp(MouseEvent e) {
 		processEvent(e);
 	}
-	
+
+	@Override
 	public void menuShown(MenuEvent e) {
 		processEvent(e);
 	}
-	
+
+	@Override
 	public void shellClosed(ShellEvent e) {
 		e.doit = false;
 		processEvent(e);
 	}
-	
+
+	@Override
 	public void widgetDefaultSelected(SelectionEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void mouseDoubleClick(MouseEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void mouseDown(MouseEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void menuHidden(MenuEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void shellActivated(ShellEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void shellDeactivated(ShellEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void shellDeiconified(ShellEvent e) {
 		//Override me
 	}
-	
+
+	@Override
 	public void shellIconified(ShellEvent e) {
 		//Override me
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionData.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionData.java
similarity index 77%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionData.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionData.java
index ebc38ee5..148be8ae 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionData.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionData.java
@@ -4,17 +4,17 @@
 import java.util.Map;
 
 public class ActionData {
-	
-	private Map data;
-	
+
+	private Map<String, Object> data;
+
 	public ActionData(){
-		this.data = new HashMap();
+		this.data = new HashMap<String, Object>();
 	}
-	
+
 	public void put(String key, Object value){
 		this.data.put(key, value);
 	}
-	
+
 	public Object get(String key){
 		return this.data.get(key);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionLock.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionLock.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionLock.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionLock.java
index e286c05f..1c8952c4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionLock.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionLock.java
@@ -1,21 +1,21 @@
 package org.herac.tuxguitar.app.actions;
 
 public class ActionLock {
-	
+
 	private static boolean working;
-	
+
 	public synchronized static boolean isLocked(){
 		return working;
 	}
-	
+
 	public synchronized static void lock(){
 		working = true;
 	}
-	
+
 	public synchronized static void unlock(){
 		working = false;
 	}
-	
+
 	public synchronized static void waitFor(){
 		try {
 			while(isLocked()){
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionManager.java
new file mode 100644
index 00000000..bb4dbd1a
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/ActionManager.java
@@ -0,0 +1,376 @@
+/*
+ * Created on 18-dic-2005
+ */
+package org.herac.tuxguitar.app.actions;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.herac.tuxguitar.app.actions.caret.GoDownAction;
+import org.herac.tuxguitar.app.actions.caret.GoLeftAction;
+import org.herac.tuxguitar.app.actions.caret.GoRightAction;
+import org.herac.tuxguitar.app.actions.caret.GoUpAction;
+import org.herac.tuxguitar.app.actions.composition.ChangeClefAction;
+import org.herac.tuxguitar.app.actions.composition.ChangeInfoAction;
+import org.herac.tuxguitar.app.actions.composition.ChangeKeySignatureAction;
+import org.herac.tuxguitar.app.actions.composition.ChangeTempoAction;
+import org.herac.tuxguitar.app.actions.composition.ChangeTimeSignatureAction;
+import org.herac.tuxguitar.app.actions.composition.ChangeTripletFeelAction;
+import org.herac.tuxguitar.app.actions.duration.ChangeDivisionTypeAction;
+import org.herac.tuxguitar.app.actions.duration.ChangeDottedDurationAction;
+import org.herac.tuxguitar.app.actions.duration.ChangeDoubleDottedDurationAction;
+import org.herac.tuxguitar.app.actions.duration.DecrementDurationAction;
+import org.herac.tuxguitar.app.actions.duration.IncrementDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetEighthDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetHalfDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetQuarterDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetSixteenthDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetSixtyFourthDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetThirtySecondDurationAction;
+import org.herac.tuxguitar.app.actions.duration.SetWholeDurationAction;
+import org.herac.tuxguitar.app.actions.edit.RedoAction;
+import org.herac.tuxguitar.app.actions.edit.SetMouseModeEditionAction;
+import org.herac.tuxguitar.app.actions.edit.SetMouseModeSelectionAction;
+import org.herac.tuxguitar.app.actions.edit.SetNaturalKeyAction;
+import org.herac.tuxguitar.app.actions.edit.SetVoice1Action;
+import org.herac.tuxguitar.app.actions.edit.SetVoice2Action;
+import org.herac.tuxguitar.app.actions.edit.UndoAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeAccentuatedNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeBendNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeDeadNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeFadeInAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeGhostNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeGraceNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeHammerNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeHarmonicNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeHeavyAccentuatedNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeLetRingAction;
+import org.herac.tuxguitar.app.actions.effects.ChangePalmMuteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangePoppingAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeSlappingAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeSlideNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeStaccatoAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeTappingAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeTremoloBarAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeTremoloPickingAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeTrillNoteAction;
+import org.herac.tuxguitar.app.actions.effects.ChangeVibratoNoteAction;
+import org.herac.tuxguitar.app.actions.file.ExitAction;
+import org.herac.tuxguitar.app.actions.file.ExportSongAction;
+import org.herac.tuxguitar.app.actions.file.ImportSongAction;
+import org.herac.tuxguitar.app.actions.file.NewFileAction;
+import org.herac.tuxguitar.app.actions.file.OpenFileAction;
+import org.herac.tuxguitar.app.actions.file.OpenURLAction;
+import org.herac.tuxguitar.app.actions.file.PrintAction;
+import org.herac.tuxguitar.app.actions.file.PrintPreviewAction;
+import org.herac.tuxguitar.app.actions.file.SaveAsFileAction;
+import org.herac.tuxguitar.app.actions.file.SaveFileAction;
+import org.herac.tuxguitar.app.actions.help.ShowAboutAction;
+import org.herac.tuxguitar.app.actions.help.ShowDocAction;
+import org.herac.tuxguitar.app.actions.insert.DoubleBarAction;
+import org.herac.tuxguitar.app.actions.insert.InsertChordAction;
+import org.herac.tuxguitar.app.actions.insert.InsertTextAction;
+import org.herac.tuxguitar.app.actions.insert.RepeatAlternativeAction;
+import org.herac.tuxguitar.app.actions.insert.RepeatCloseAction;
+import org.herac.tuxguitar.app.actions.insert.RepeatOpenAction;
+import org.herac.tuxguitar.app.actions.layout.SetChordDiagramEnabledAction;
+import org.herac.tuxguitar.app.actions.layout.SetChordNameEnabledAction;
+import org.herac.tuxguitar.app.actions.layout.SetCompactViewAction;
+import org.herac.tuxguitar.app.actions.layout.SetLinearLayoutAction;
+import org.herac.tuxguitar.app.actions.layout.SetMultitrackViewAction;
+import org.herac.tuxguitar.app.actions.layout.SetPageLayoutAction;
+import org.herac.tuxguitar.app.actions.layout.SetScoreEnabledAction;
+import org.herac.tuxguitar.app.actions.layout.SetTablatureEnabledAction;
+import org.herac.tuxguitar.app.actions.marker.AddMarkerAction;
+import org.herac.tuxguitar.app.actions.marker.GoFirstMarkerAction;
+import org.herac.tuxguitar.app.actions.marker.GoLastMarkerAction;
+import org.herac.tuxguitar.app.actions.marker.GoNextMarkerAction;
+import org.herac.tuxguitar.app.actions.marker.GoPreviousMarkerAction;
+import org.herac.tuxguitar.app.actions.marker.ListMarkersAction;
+import org.herac.tuxguitar.app.actions.measure.AddMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.CleanMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.CopyMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.GoFirstMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.GoLastMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.GoNextMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.GoPreviousMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.PasteMeasureAction;
+import org.herac.tuxguitar.app.actions.measure.RemoveMeasureAction;
+import org.herac.tuxguitar.app.actions.note.ChangeNoteAction;
+import org.herac.tuxguitar.app.actions.note.ChangeTiedNoteAction;
+import org.herac.tuxguitar.app.actions.note.ChangeVelocityAction;
+import org.herac.tuxguitar.app.actions.note.CleanBeatAction;
+import org.herac.tuxguitar.app.actions.note.DecrementNoteSemitoneAction;
+import org.herac.tuxguitar.app.actions.note.DeleteNoteOrRestAction;
+import org.herac.tuxguitar.app.actions.note.IncrementNoteSemitoneAction;
+import org.herac.tuxguitar.app.actions.note.InsertRestBeatAction;
+import org.herac.tuxguitar.app.actions.note.MoveBeatsCustomAction;
+import org.herac.tuxguitar.app.actions.note.MoveBeatsLeftAction;
+import org.herac.tuxguitar.app.actions.note.MoveBeatsRightAction;
+import org.herac.tuxguitar.app.actions.note.RemoveUnusedVoiceAction;
+import org.herac.tuxguitar.app.actions.note.SetNoteFretNumberAction;
+import org.herac.tuxguitar.app.actions.note.SetStrokeDownAction;
+import org.herac.tuxguitar.app.actions.note.SetStrokeUpAction;
+import org.herac.tuxguitar.app.actions.note.SetVoiceAutoAction;
+import org.herac.tuxguitar.app.actions.note.SetVoiceDownAction;
+import org.herac.tuxguitar.app.actions.note.SetVoiceUpAction;
+import org.herac.tuxguitar.app.actions.note.ShiftNoteDownAction;
+import org.herac.tuxguitar.app.actions.note.ShiftNoteUpAction;
+import org.herac.tuxguitar.app.actions.settings.EditConfigAction;
+import org.herac.tuxguitar.app.actions.settings.EditKeyBindingsAction;
+import org.herac.tuxguitar.app.actions.settings.EditPluginsAction;
+import org.herac.tuxguitar.app.actions.system.DisposeAction;
+import org.herac.tuxguitar.app.actions.tools.ScaleAction;
+import org.herac.tuxguitar.app.actions.tools.TGBrowserAction;
+import org.herac.tuxguitar.app.actions.tools.TransposeAction;
+import org.herac.tuxguitar.app.actions.track.AddTrackAction;
+import org.herac.tuxguitar.app.actions.track.ChangeTrackMuteAction;
+import org.herac.tuxguitar.app.actions.track.ChangeTrackSoloAction;
+import org.herac.tuxguitar.app.actions.track.CloneTrackAction;
+import org.herac.tuxguitar.app.actions.track.EditLyricsAction;
+import org.herac.tuxguitar.app.actions.track.GoFirstTrackAction;
+import org.herac.tuxguitar.app.actions.track.GoLastTrackAction;
+import org.herac.tuxguitar.app.actions.track.GoNextTrackAction;
+import org.herac.tuxguitar.app.actions.track.GoPreviousTrackAction;
+import org.herac.tuxguitar.app.actions.track.GoToTrackAction;
+import org.herac.tuxguitar.app.actions.track.MoveTrackDownAction;
+import org.herac.tuxguitar.app.actions.track.MoveTrackUpAction;
+import org.herac.tuxguitar.app.actions.track.RemoveTrackAction;
+import org.herac.tuxguitar.app.actions.track.TrackPropertiesAction;
+import org.herac.tuxguitar.app.actions.transport.TransportCountDownAction;
+import org.herac.tuxguitar.app.actions.transport.TransportMetronomeAction;
+import org.herac.tuxguitar.app.actions.transport.TransportModeAction;
+import org.herac.tuxguitar.app.actions.transport.TransportPlayAction;
+import org.herac.tuxguitar.app.actions.transport.TransportSetLoopEHeaderAction;
+import org.herac.tuxguitar.app.actions.transport.TransportSetLoopSHeaderAction;
+import org.herac.tuxguitar.app.actions.transport.TransportStopAction;
+import org.herac.tuxguitar.app.actions.view.ShowFretBoardAction;
+import org.herac.tuxguitar.app.actions.view.ShowInstrumentsAction;
+import org.herac.tuxguitar.app.actions.view.ShowMatrixAction;
+import org.herac.tuxguitar.app.actions.view.ShowPianoAction;
+import org.herac.tuxguitar.app.actions.view.ShowToolbarsAction;
+import org.herac.tuxguitar.app.actions.view.ShowTransportAction;
+
+/**
+ * @author julian
+ */
+public class ActionManager {
+
+	private final Map<String, Action> actions;
+
+	public ActionManager(){
+		this.actions = new HashMap<String, Action>();
+		this.init();
+	}
+
+	public void init(){
+		//file actions
+		addAction(new NewFileAction());
+		addAction(new OpenFileAction());
+		addAction(new SaveFileAction());
+		addAction(new SaveAsFileAction());
+		addAction(new ImportSongAction());
+		addAction(new ExportSongAction());
+		addAction(new PrintAction());
+		addAction(new PrintPreviewAction());
+		addAction(new OpenURLAction());
+		addAction(new ExitAction());
+
+		//edit actions
+		addAction(new UndoAction());
+		addAction(new RedoAction());
+		addAction(new SetMouseModeSelectionAction());
+		addAction(new SetMouseModeEditionAction());
+		addAction(new SetNaturalKeyAction());
+		addAction(new SetVoice1Action());
+		addAction(new SetVoice2Action());
+
+		//layout actions
+		addAction(new SetPageLayoutAction());
+		addAction(new SetLinearLayoutAction());
+		addAction(new SetMultitrackViewAction());
+		addAction(new SetScoreEnabledAction());
+		addAction(new SetTablatureEnabledAction());
+		addAction(new SetCompactViewAction());
+		addAction(new SetChordNameEnabledAction());
+		addAction(new SetChordDiagramEnabledAction());
+
+		//view actions
+		addAction(new ShowToolbarsAction());
+		addAction(new ShowFretBoardAction());
+		addAction(new ShowPianoAction());
+		addAction(new ShowInstrumentsAction());
+		addAction(new ShowTransportAction());
+		addAction(new ShowMatrixAction());
+
+		//composition actions
+		addAction(new ChangeTimeSignatureAction());
+		addAction(new ChangeTempoAction());
+		addAction(new ChangeClefAction());
+		addAction(new ChangeKeySignatureAction());
+		addAction(new ChangeTripletFeelAction());
+		addAction(new ChangeInfoAction());
+
+		//track actions
+		addAction(new AddTrackAction());
+		addAction(new RemoveTrackAction());
+		addAction(new CloneTrackAction());
+		addAction(new GoFirstTrackAction());
+		addAction(new GoLastTrackAction());
+		addAction(new GoNextTrackAction());
+		addAction(new GoToTrackAction());
+		addAction(new GoPreviousTrackAction());
+		addAction(new MoveTrackUpAction());
+		addAction(new MoveTrackDownAction());
+		addAction(new ChangeTrackMuteAction());
+		addAction(new ChangeTrackSoloAction());
+		addAction(new EditLyricsAction());
+		addAction(new TrackPropertiesAction());
+
+		//measure actions
+		addAction(new AddMeasureAction());
+		addAction(new RemoveMeasureAction());
+		addAction(new CopyMeasureAction());
+		addAction(new PasteMeasureAction());
+		addAction(new GoFirstMeasureAction());
+		addAction(new GoLastMeasureAction());
+		addAction(new GoNextMeasureAction());
+		addAction(new GoPreviousMeasureAction());
+		addAction(new CleanMeasureAction());
+
+		//note actions
+		addAction(new ChangeNoteAction());
+		addAction(new InsertRestBeatAction());
+		addAction(new DeleteNoteOrRestAction());
+		addAction(new RemoveUnusedVoiceAction());
+		addAction(new CleanBeatAction());
+		addAction(new ChangeTiedNoteAction());
+		addAction(new ChangeVelocityAction());
+		addAction(new ShiftNoteUpAction());
+		addAction(new ShiftNoteDownAction());
+		addAction(new IncrementNoteSemitoneAction());
+		addAction(new DecrementNoteSemitoneAction());
+		addAction(new SetStrokeUpAction());
+		addAction(new SetStrokeDownAction());
+		addAction(new MoveBeatsRightAction());
+		addAction(new MoveBeatsLeftAction());
+		addAction(new MoveBeatsCustomAction());
+		for( int i = 0 ; i < 10 ; i ++ ){
+			addAction(new SetNoteFretNumberAction(i));
+		}
+
+		//duration actions
+		addAction(new SetWholeDurationAction());
+		addAction(new SetHalfDurationAction());
+		addAction(new SetQuarterDurationAction());
+		addAction(new SetEighthDurationAction());
+		addAction(new SetSixteenthDurationAction());
+		addAction(new SetThirtySecondDurationAction());
+		addAction(new SetSixtyFourthDurationAction());
+		addAction(new ChangeDottedDurationAction());
+		addAction(new ChangeDoubleDottedDurationAction());
+		addAction(new ChangeDivisionTypeAction());
+		addAction(new IncrementDurationAction());
+		addAction(new DecrementDurationAction());
+
+		//insert actions
+		addAction(new RepeatOpenAction());
+		addAction(new RepeatCloseAction());
+		addAction(new RepeatAlternativeAction());
+		addAction(new DoubleBarAction());
+		addAction(new InsertChordAction());
+		addAction(new InsertTextAction());
+
+		//note effects action
+		addAction(new ChangeVibratoNoteAction());
+		addAction(new ChangeBendNoteAction());
+		addAction(new ChangeDeadNoteAction());
+		addAction(new ChangeSlideNoteAction());
+		addAction(new ChangeHammerNoteAction());
+		addAction(new ChangeGhostNoteAction());
+		addAction(new ChangeAccentuatedNoteAction());
+		addAction(new ChangeHeavyAccentuatedNoteAction());
+		addAction(new ChangeHarmonicNoteAction());
+		addAction(new ChangeGraceNoteAction());
+		addAction(new ChangeTrillNoteAction());
+		addAction(new ChangeTremoloPickingAction());
+		addAction(new ChangePalmMuteAction());
+		addAction(new ChangeLetRingAction());
+		addAction(new ChangeStaccatoAction());
+		addAction(new ChangeTappingAction());
+		addAction(new ChangeSlappingAction());
+		addAction(new ChangePoppingAction());
+		addAction(new ChangeTremoloBarAction());
+		addAction(new ChangeFadeInAction());
+		addAction(new SetVoiceAutoAction());
+		addAction(new SetVoiceUpAction());
+		addAction(new SetVoiceDownAction());
+
+		//marker actions
+		addAction(new AddMarkerAction());
+		addAction(new ListMarkersAction());
+		addAction(new GoPreviousMarkerAction());
+		addAction(new GoNextMarkerAction());
+		addAction(new GoFirstMarkerAction());
+		addAction(new GoLastMarkerAction());
+
+		//player actions
+		addAction(new TransportPlayAction());
+		addAction(new TransportStopAction());
+		addAction(new TransportMetronomeAction());
+		addAction(new TransportCountDownAction());
+		addAction(new TransportModeAction());
+		addAction(new TransportSetLoopSHeaderAction());
+		addAction(new TransportSetLoopEHeaderAction());
+
+		//setting actions
+		addAction(new EditPluginsAction());
+		addAction(new EditConfigAction());
+		addAction(new EditKeyBindingsAction());
+
+		//caret actions
+		addAction(new GoRightAction());
+		addAction(new GoLeftAction());
+		addAction(new GoUpAction());
+		addAction(new GoDownAction());
+
+		//help actions
+		addAction(new ShowDocAction());
+		addAction(new ShowAboutAction());
+
+		//tools
+		addAction(new TransposeAction() );
+		addAction(new ScaleAction());
+		addAction(new TGBrowserAction());
+
+		//exit
+		addAction(new DisposeAction());
+	}
+
+	public void addAction(Action action){
+		this.actions.put(action.getName(),action);
+	}
+
+	public void removeAction(String name){
+		this.actions.remove(name);
+	}
+
+	public Action getAction(String name){
+		return this.actions.get(name);
+	}
+
+	public List<String> getAvailableKeyBindingActions(){
+		List<String> availableKeyBindingActions = new ArrayList<String>();
+		Iterator<String> it = this.actions.keySet().iterator();
+		while(it.hasNext()){
+			String actionName = it.next();
+			if(getAction(actionName).isKeyBindingAvailable()){
+				availableKeyBindingActions.add(actionName);
+			}
+		}
+		return availableKeyBindingActions;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoDownAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoDownAction.java
new file mode 100644
index 00000000..bb341a90
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoDownAction.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.caret;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class GoDownAction extends Action{
+
+	public static final String NAME = "action.caret.go-down";
+
+	public GoDownAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getCaret().moveDown();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoLeftAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoLeftAction.java
new file mode 100644
index 00000000..dadd97d1
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoLeftAction.java
@@ -0,0 +1,31 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.caret;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class GoLeftAction extends Action{
+
+	public static final String NAME = "action.caret.go-left";
+
+	public GoLeftAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(TuxGuitar.instance().getPlayer().isRunning()){
+			TuxGuitar.instance().getTransport().gotoPrevious();
+		}
+		else{
+			getEditor().getTablature().getCaret().moveLeft();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoRightAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoRightAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoRightAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoRightAction.java
index 6388a913..3da0f268 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoRightAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoRightAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.caret;
 
@@ -14,18 +11,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GoRightAction extends Action{
-	
+
 	public static final String NAME = "action.caret.go-right";
-	
+
 	public GoRightAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			TuxGuitar.instance().getTransport().gotoNext();
@@ -34,16 +29,16 @@ protected int execute(ActionData actionData){
 			Caret caret = getEditor().getTablature().getCaret();
 			if(!caret.moveRight()){
 				int number = (getSongManager().getSong().countMeasureHeaders() + 1);
-				
+
 				//comienza el undoable
 				UndoableAddMeasure undoable = UndoableAddMeasure.startUndo(number);
-				
+
 				getSongManager().addNewMeasure(number);
 				fireUpdate(number);
 				caret.moveRight();
-				
+
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoUpAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoUpAction.java
new file mode 100644
index 00000000..71987429
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/caret/GoUpAction.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.caret;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class GoUpAction extends Action{
+
+	public static final String NAME = "action.caret.go-up";
+
+	public GoUpAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getCaret().moveUp();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeClefAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeClefAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeClefAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeClefAction.java
index 22ea7101..ec00042e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeClefAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeClefAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.composition;
 
@@ -31,55 +28,53 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeClefAction extends Action{
-	
+
 	public static final String NAME = "action.composition.change-clef";
-	
+
 	public ChangeClefAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("composition.clef"));
-			
+
 			//-------clef-------------------------------------
 			Group clef = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			clef.setLayout(new GridLayout(2,false));
 			clef.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			clef.setText(TuxGuitar.getProperty("composition.clef"));
-			
+
 			Label numeratorLabel = new Label(clef, SWT.NULL);
 			numeratorLabel.setText(TuxGuitar.getProperty("composition.clef") + ":");
-			
+
 			final Combo clefs = new Combo(clef, SWT.DROP_DOWN | SWT.READ_ONLY);
-			
+
 			clefs.add(TuxGuitar.getProperty("composition.clef.treble"));
 			clefs.add(TuxGuitar.getProperty("composition.clef.bass"));
 			clefs.add(TuxGuitar.getProperty("composition.clef.tenor"));
 			clefs.add(TuxGuitar.getProperty("composition.clef.alto"));
 			clefs.select(measure.getClef() - 1);
 			clefs.setLayoutData(getComboData());
-			
+
 			//--------------------To End Checkbox-------------------------------
 			Group check = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			check.setLayout(new GridLayout());
 			check.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			check.setText(TuxGuitar.getProperty("options"));
-			
+
 			final Button toEnd = new Button(check, SWT.CHECK);
 			toEnd.setText(TuxGuitar.getProperty("composition.clef.to-the-end"));
 			toEnd.setSelection(true);
@@ -87,18 +82,20 @@ public void showDialog(Shell shell) {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					final boolean toEndValue = toEnd.getSelection();
 					final int clef = (clefs.getSelectionIndex() + 1);
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -113,48 +110,49 @@ public void run() throws Throwable {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getComboData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 150;
 		return data;
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void setClef(int clef,boolean toEnd){
 		//comienza el undoable
 		UndoableChangeClef undoable = UndoableChangeClef.startUndo();
-		
+
 		TGMeasure measure = getEditor().getTablature().getCaret().getMeasure();
 		TGTrack track = getEditor().getTablature().getCaret().getTrack();
 		getSongManager().getTrackManager().changeClef(track,measure.getStart(),clef,toEnd);
-		
+
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		//actualizo la tablatura
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo(clef,toEnd));
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeInfoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeInfoAction.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeInfoAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeInfoAction.java
index 72c191b0..81e22062 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeInfoAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeInfoAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.composition;
 
@@ -29,45 +26,43 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeInfoAction extends Action{
-	
+
 	public static final String NAME = "action.composition.change-info";
-	
+
 	private static final int GROUP_WIDTH  = 450;
 	private static final int GROUP_HEIGHT = SWT.DEFAULT;
-	
+
 	public ChangeInfoAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGSong song = getSongManager().getSong();
 		if (song != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			dialog.setText(TuxGuitar.getProperty("composition.properties"));
-			
+
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(makeGroupLayout(5));
 			group.setLayoutData(new GridData(GROUP_WIDTH,GROUP_HEIGHT));
 			group.setText(TuxGuitar.getProperty("composition.properties"));
-			
+
 			//-------NAME------------------------------------
 			Label nameLabel = new Label(group, SWT.NULL);
-			nameLabel.setLayoutData(makeLabelData()); 
+			nameLabel.setLayoutData(makeLabelData());
 			nameLabel.setText(TuxGuitar.getProperty("composition.name") + ":");
-			
+
 			final Text nameText = new Text(group, SWT.BORDER);
 			nameText.setLayoutData(makeTextData());
 			nameText.setText(song.getName());
@@ -75,7 +70,7 @@ public void showDialog(Shell shell) {
 			Label artistLabel = new Label(group, SWT.NULL);
 			artistLabel.setLayoutData(makeLabelData());
 			artistLabel.setText(TuxGuitar.getProperty("composition.artist") + ":");
-			
+
 			final Text artistText = new Text(group, SWT.BORDER);
 			artistText.setLayoutData(makeTextData());
 			artistText.setText(song.getArtist());
@@ -83,7 +78,7 @@ public void showDialog(Shell shell) {
 			Label albumLabel = new Label(group, SWT.NULL);
 			albumLabel.setLayoutData(makeLabelData());
 			albumLabel.setText(TuxGuitar.getProperty("composition.album") + ":");
-			
+
 			final Text albumText = new Text(group, SWT.BORDER);
 			albumText.setLayoutData(makeTextData());
 			albumText.setText(song.getAlbum());
@@ -91,7 +86,7 @@ public void showDialog(Shell shell) {
 			Label authorLabel = new Label(group, SWT.NULL);
 			authorLabel.setLayoutData(makeLabelData());
 			authorLabel.setText(TuxGuitar.getProperty("composition.author") + ":");
-			
+
 			final Text authorText = new Text(group, SWT.BORDER);
 			authorText.setLayoutData(makeTextData());
 			authorText.setText(song.getAuthor());
@@ -99,7 +94,7 @@ public void showDialog(Shell shell) {
 			Label dateLabel = new Label(group, SWT.NULL);
 			dateLabel.setLayoutData(makeLabelData());
 			dateLabel.setText(TuxGuitar.getProperty("composition.date") + ":");
-			
+
 			final Text dateText = new Text(group, SWT.BORDER);
 			dateText.setLayoutData(makeTextData());
 			dateText.setText(song.getDate());
@@ -107,7 +102,7 @@ public void showDialog(Shell shell) {
 			Label copyrightLabel = new Label(group, SWT.NULL);
 			copyrightLabel.setLayoutData(makeLabelData());
 			copyrightLabel.setText(TuxGuitar.getProperty("composition.copyright") + ":");
-			
+
 			final Text copyrightText = new Text(group, SWT.BORDER);
 			copyrightText.setLayoutData(makeTextData());
 			copyrightText.setText(song.getCopyright());
@@ -115,7 +110,7 @@ public void showDialog(Shell shell) {
 			Label writerLabel = new Label(group, SWT.NULL);
 			writerLabel.setLayoutData(makeLabelData());
 			writerLabel.setText(TuxGuitar.getProperty("composition.writer") + ":");
-			
+
 			final Text writerText = new Text(group, SWT.BORDER);
 			writerText.setLayoutData(makeTextData());
 			writerText.setText(song.getWriter());
@@ -123,29 +118,30 @@ public void showDialog(Shell shell) {
 			Label transcriberLabel = new Label(group, SWT.NULL);
 			transcriberLabel.setLayoutData(makeLabelData());
 			transcriberLabel.setText(TuxGuitar.getProperty("composition.transcriber") + ":");
-			
+
 			final Text transcriberText = new Text(group, SWT.BORDER);
 			transcriberText.setLayoutData(makeTextData());
 			transcriberText.setText(song.getTranscriber());
-			
+
 			//-------COMMENTS------------------------------------
 			Label commentsLabel = new Label(group, SWT.NULL);
 			commentsLabel.setLayoutData(makeLabelData());
 			commentsLabel.setText(TuxGuitar.getProperty("composition.comments") + ":");
-			
+
 			final Text commentsText = new Text(group, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
 			commentsText.setLayoutData(makeTextAreaData());
 			commentsText.setText(song.getComments());
-			
+
 			//------------------BUTTONS--------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					final String name = nameText.getText();
 					final String artist = artistText.getText();
@@ -156,10 +152,11 @@ public void widgetSelected(SelectionEvent arg0) {
 					final String writer = writerText.getText();
 					final String transcriber = transcriberText.getText();
 					final String comments = commentsText.getText();
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -174,22 +171,23 @@ public void run() throws Throwable {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridLayout makeGroupLayout(int spacing){
 		GridLayout layout = new GridLayout(2,false);
 		layout.marginTop = spacing;
@@ -200,36 +198,36 @@ private GridLayout makeGroupLayout(int spacing){
 		layout.horizontalSpacing = spacing;
 		return layout;
 	}
-	
+
 	private GridData makeTextAreaData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumHeight = 100;
 		return data;
 	}
-	
+
 	private GridData makeTextData(){
 		return new GridData(SWT.FILL, SWT.FILL, true, true);
 	}
-	
+
 	private GridData makeLabelData(){
 		return new GridData(SWT.RIGHT,SWT.CENTER,false,true);
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void setProperties(String name,String artist,String album,String author,String date,String copyright,String writer,String transcriber,String comments){
 		//comienza el undoable
 		UndoableChangeInfo undoable = UndoableChangeInfo.startUndo();
-		
+
 		getSongManager().setProperties(name,artist,album,author,date,copyright,writer,transcriber,comments);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		TuxGuitar.instance().showTitle();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeKeySignatureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeKeySignatureAction.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeKeySignatureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeKeySignatureAction.java
index 6866b297..74fb039a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeKeySignatureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeKeySignatureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.composition;
 
@@ -31,42 +28,40 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeKeySignatureAction extends Action{
-	
+
 	public static final String NAME = "action.composition.change-key-signature";
-	
+
 	public ChangeKeySignatureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("composition.keysignature"));
-			
+
 			//-------key Signature-------------------------------------
 			Group keySignature = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			keySignature.setLayout(new GridLayout(2,false));
 			keySignature.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			keySignature.setText(TuxGuitar.getProperty("composition.keysignature"));
-			
+
 			Label numeratorLabel = new Label(keySignature, SWT.NULL);
 			numeratorLabel.setText(TuxGuitar.getProperty("composition.keysignature") + ":");
-			
+
 			final Combo keySignatures = new Combo(keySignature, SWT.DROP_DOWN | SWT.READ_ONLY);
-			
+
 			keySignatures.add(TuxGuitar.getProperty("composition.keysignature.natural"));
 			keySignatures.add(TuxGuitar.getProperty("composition.keysignature.sharp-1"));
 			keySignatures.add(TuxGuitar.getProperty("composition.keysignature.sharp-2"));
@@ -89,7 +84,7 @@ public void showDialog(Shell shell) {
 			check.setLayout(new GridLayout());
 			check.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			check.setText(TuxGuitar.getProperty("options"));
-			
+
 			final Button toEnd = new Button(check, SWT.CHECK);
 			toEnd.setText(TuxGuitar.getProperty("composition.keysignature.to-the-end"));
 			toEnd.setSelection(true);
@@ -97,18 +92,20 @@ public void showDialog(Shell shell) {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					final boolean toEndValue = toEnd.getSelection();
 					final int keySignature = keySignatures.getSelectionIndex();
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -123,50 +120,51 @@ public void run() throws Throwable {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData getComboData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 150;
 		return data;
 	}
-	
+
 	protected void setKeySignature(int keySignature,boolean toEnd){
 		//comienza el undoable
 		UndoableChangeKeySignature undoable = UndoableChangeKeySignature.startUndo();
-		
+
 		TGMeasure measure = getEditor().getTablature().getCaret().getMeasure();
 		TGTrack track = getEditor().getTablature().getCaret().getTrack();
 		getSongManager().getTrackManager().changeKeySignature(track,measure.getStart(),keySignature,toEnd);
-		
+
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		//actualizo la tablatura
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo(keySignature,toEnd));
-		
+
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTempoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTempoAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTempoAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTempoAction.java
index e5365b89..67cb92e5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTempoAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTempoAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.composition;
 
@@ -32,85 +29,85 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTempoAction extends Action{
-	
+
 	public static final String NAME = "action.composition.change-tempo";
-	
+
 	private static final int MIN_TEMPO = 30;
 	private static final int MAX_TEMPO = 320;
-	
+
 	protected static final int[] DEFAULT_PERCENTS = new int[]{25,50,75,100,125,150,175,200};
-	
+
 	public ChangeTempoAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("composition.tempo"));
-			
+
 			//-----------------TEMPO------------------------
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout(2,false));
 			group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			group.setText(TuxGuitar.getProperty("composition.tempo"));
-			
+
 			TGTempo currentTempo = measure.getTempo();
 			Label tempoLabel = new Label(group, SWT.NULL);
 			tempoLabel.setText(TuxGuitar.getProperty("composition.tempo"));
-			
+
 			final Spinner tempo = new Spinner(group, SWT.BORDER);
 			tempo.setLayoutData(getSpinnerData());
 			tempo.setMinimum(MIN_TEMPO);
 			tempo.setMaximum(MAX_TEMPO);
 			tempo.setSelection(currentTempo.getValue());
-			
+
 			//------------------OPTIONS--------------------------
 			Group options = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			options.setLayout(new GridLayout());
 			options.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			options.setText(TuxGuitar.getProperty("options"));
-			
+
 			final Button applyToAllMeasures = new Button(options, SWT.RADIO);
 			applyToAllMeasures.setText(TuxGuitar.getProperty("composition.tempo.start-to-end"));
-			
+
 			final Button applyToEnd = new Button(options, SWT.RADIO);
 			applyToEnd.setText(TuxGuitar.getProperty("composition.tempo.position-to-end"));
-			
+
 			final Button applyToNext = new Button(options, SWT.RADIO);
 			applyToNext.setText(TuxGuitar.getProperty("composition.tempo.position-to-next"));
-			
+
 			applyToAllMeasures.setSelection(true);
 			//------------------BUTTONS--------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					final int tempoValue = tempo.getSelection();
 					final boolean applyToEndValue = applyToEnd.getSelection();
 					final boolean applyToAllMeasuresValue = applyToAllMeasures.getSelection();
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -125,58 +122,60 @@ public void run() throws Throwable {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 150;
 		return data;
 	}
-	
+
 	protected void setTempo(int tempoValue,boolean applyToAllMeasures,boolean applyToEnd){
 		if(tempoValue >= MIN_TEMPO && MAX_TEMPO <= 320){
 			TGTempo tempo = getSongManager().getFactory().newTempo();
 			tempo.setValue(tempoValue);
-			
+
 			long start = (applyToAllMeasures ? TGDuration.QUARTER_TIME : getEditor().getTablature().getCaret().getMeasure().getStart());
 			boolean toEnd = (applyToAllMeasures || applyToEnd);
-			
+
 			//comienza el undoable
 			UndoableChangeTempo undoable = UndoableChangeTempo.startUndo();
-			
+
 			getSongManager().changeTempos(start,tempo,toEnd);
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			//actualizo la tablatura
 			updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
 	}
-	
+
+	@Override
 	public TGSongManager getSongManager(){
 		return super.getSongManager();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTimeSignatureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTimeSignatureAction.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTimeSignatureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTimeSignatureAction.java
index 6f44a0ee..8090c767 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTimeSignatureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTimeSignatureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.composition;
 
@@ -32,37 +29,35 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTimeSignatureAction extends Action{
-	
+
 	public static final String NAME = "action.composition.change-time-signature";
-	
+
 	public ChangeTimeSignatureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("composition.timesignature"));
-			
+
 			//-------------TIME SIGNATURE-----------------------------------------------
 			Group timeSignature = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			timeSignature.setLayout(new GridLayout(2,false));
 			timeSignature.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			timeSignature.setText(TuxGuitar.getProperty("composition.timesignature"));
-			
+
 			TGTimeSignature currentTimeSignature = measure.getTimeSignature();
 			//numerator
 			Label numeratorLabel = new Label(timeSignature, SWT.NULL);
@@ -82,13 +77,13 @@ public void showDialog(Shell shell) {
 			}
 			denominator.setText(Integer.toString(currentTimeSignature.getDenominator().getValue()));
 			denominator.setLayoutData(getComboData());
-			
+
 			//--------------------To End Checkbox-------------------------------
 			Group check = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			check.setLayout(new GridLayout());
 			check.setText(TuxGuitar.getProperty("options"));
 			check.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-			
+
 			final Button toEnd = new Button(check, SWT.CHECK);
 			toEnd.setText(TuxGuitar.getProperty("composition.timesignature.to-the-end"));
 			toEnd.setSelection(true);
@@ -96,19 +91,21 @@ public void showDialog(Shell shell) {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOk = new Button(buttons, SWT.PUSH);
 			buttonOk.setText(TuxGuitar.getProperty("ok"));
 			buttonOk.setLayoutData(getButtonData());
 			buttonOk.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					final boolean toEndValue = toEnd.getSelection();
 					final int numeratorValue = Integer.parseInt(numerator.getText());
 					final int denominatorValue = Integer.parseInt(denominator.getText());
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -126,53 +123,55 @@ public void run() throws Throwable {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOk );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData getComboData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 150;
 		return data;
 	}
-	
+
 	protected void setTimeSignature(TGTimeSignature timeSignature,boolean toEnd){
 		//comienza el undoable
 		UndoableChangeTimeSignature undoable = UndoableChangeTimeSignature.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGMeasureImpl measure = caret.getMeasure();
-		
+
 		getSongManager().changeTimeSignature(measure.getStart(),timeSignature,toEnd);
-		
+
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		//actualizo la tablatura
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo(timeSignature,measure.getStart(),toEnd));
 	}
-	
+
+	@Override
 	public TGSongManager getSongManager(){
 		return super.getSongManager();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTripletFeelAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTripletFeelAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTripletFeelAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTripletFeelAction.java
index f62ba706..91e9bfae 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/composition/ChangeTripletFeelAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/composition/ChangeTripletFeelAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.composition;
 
@@ -29,57 +26,55 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTripletFeelAction extends Action{
-	
+
 	public static final String NAME = "action.composition.change-triplet-feel";
-	
+
 	public ChangeTripletFeelAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("composition.tripletfeel"));
 			dialog.setMinimumSize(300,0);
-			
+
 			//-------------TIME SIGNATURE-----------------------------------------------
 			Group tripletFeel = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			tripletFeel.setLayout(new GridLayout());
 			tripletFeel.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			tripletFeel.setText(TuxGuitar.getProperty("composition.tripletfeel"));
-			
+
 			//none
 			final Button tripletFeelNone = new Button(tripletFeel, SWT.RADIO);
 			tripletFeelNone.setText(TuxGuitar.getProperty("composition.tripletfeel.none"));
 			tripletFeelNone.setSelection(measure.getTripletFeel() == TGMeasureHeader.TRIPLET_FEEL_NONE);
-			
+
 			final Button tripletFeelEighth = new Button(tripletFeel, SWT.RADIO);
 			tripletFeelEighth.setText(TuxGuitar.getProperty("composition.tripletfeel.eighth"));
 			tripletFeelEighth.setSelection(measure.getTripletFeel() == TGMeasureHeader.TRIPLET_FEEL_EIGHTH);
-			
+
 			final Button tripletFeelSixteenth = new Button(tripletFeel, SWT.RADIO);
 			tripletFeelSixteenth.setText(TuxGuitar.getProperty("composition.tripletfeel.sixteenth"));
 			tripletFeelSixteenth.setSelection(measure.getTripletFeel() == TGMeasureHeader.TRIPLET_FEEL_SIXTEENTH);
-			
+
 			//--------------------To End Checkbox-------------------------------
 			Group check = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			check.setLayout(new GridLayout());
 			check.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			check.setText(TuxGuitar.getProperty("options"));
-			
+
 			final Button toEnd = new Button(check, SWT.CHECK);
 			toEnd.setText(TuxGuitar.getProperty("composition.tripletfeel.to-the-end"));
 			toEnd.setSelection(true);
@@ -87,18 +82,20 @@ public void showDialog(Shell shell) {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOk = new Button(buttons, SWT.PUSH);
 			buttonOk.setText(TuxGuitar.getProperty("ok"));
 			buttonOk.setLayoutData(getButtonData());
 			buttonOk.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					final boolean toEndValue = toEnd.getSelection();
 					final int tripletFeel = getSelectedTripletFeel(tripletFeelNone, tripletFeelEighth, tripletFeelSixteenth);
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -113,29 +110,30 @@ public void run() throws Throwable {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOk );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected int getSelectedTripletFeel(Button tripletFeelNone,Button tripletFeelEighth, Button tripletFeelSixteenth){
 		if(tripletFeelNone.getSelection()){
 			return TGMeasureHeader.TRIPLET_FEEL_NONE;
@@ -146,21 +144,21 @@ protected int getSelectedTripletFeel(Button tripletFeelNone,Button tripletFeelEi
 		}
 		return TGMeasureHeader.TRIPLET_FEEL_NONE;
 	}
-	
+
 	protected void setTripletFeel(int tripletFeel,boolean toEnd){
 		//comienza el undoable
 		UndoableChangeTripletFeel undoable = UndoableChangeTripletFeel.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGMeasureImpl measure = caret.getMeasure();
-		
+
 		getSongManager().changeTripletFeel(measure.getStart(),tripletFeel,toEnd);
-		
+
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		//actualizo la tablatura
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo(tripletFeel,toEnd));
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDivisionTypeAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDivisionTypeAction.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDivisionTypeAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDivisionTypeAction.java
index 70879af8..b4fd85e0 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDivisionTypeAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDivisionTypeAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -16,32 +13,30 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeDivisionTypeAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.change-division-type";
-	
+
 	public static final String PROPERTY_DIVISION_TYPE = "divisionType";
-	
+
 	public ChangeDivisionTypeAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Object propertyDivisionType = actionData.get(PROPERTY_DIVISION_TYPE);
-		
+
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		TGDivisionType divisionType = defaultDivisionType();
 		if( propertyDivisionType instanceof TGDivisionType){
 			divisionType = (TGDivisionType)propertyDivisionType;
 		}
-		
-		
+
+
 		TGDivisionType newDivisionType = null;
 		TGDivisionType oldDivisionType = getSelectedDuration().getDivision();
 		if( oldDivisionType.isEqual(TGDivisionType.NORMAL)){
@@ -53,40 +48,40 @@ protected int execute(ActionData actionData){
 				newDivisionType = divisionType;
 			}
 		}
-		
+
 		setDivisionType(newDivisionType);
 		setDurations();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
 	private TGDivisionType noTuplet(){
 		TGDivisionType divisionType = getSongManager().getFactory().newDivisionType();
 		TGDivisionType.NORMAL.copy(divisionType);
 		return divisionType;
 	}
-	
+
 	private TGDivisionType defaultDivisionType(){
 		TGDivisionType divisionType = getSongManager().getFactory().newDivisionType();
 		TGDivisionType.TRIPLET.copy(divisionType);
 		return divisionType;
 	}
-	
+
 	private void setDivisionType(TGDivisionType divisionType){
 		getSelectedDuration().getDivision().setEnters(divisionType.getEnters());
 		getSelectedDuration().getDivision().setTimes(divisionType.getTimes());
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDottedDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDottedDurationAction.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDottedDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDottedDurationAction.java
index be0f221c..2038d8d8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDottedDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDottedDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -15,40 +12,38 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeDottedDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.change-dotted";
-	
+
 	public ChangeDottedDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		getSelectedDuration().setDotted(!getSelectedDuration().isDotted());
 		getSelectedDuration().setDoubleDotted(false);
-		
+
 		setDurations();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDoubleDottedDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDoubleDottedDurationAction.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDoubleDottedDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDoubleDottedDurationAction.java
index edba337f..293d1377 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/ChangeDoubleDottedDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/ChangeDoubleDottedDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -15,40 +12,38 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeDoubleDottedDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.change-double-dotted";
-	
+
 	public ChangeDoubleDottedDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		getSelectedDuration().setDoubleDotted(!getSelectedDuration().isDoubleDotted());
 		getSelectedDuration().setDotted(false);
-		
+
 		setDurations();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/DecrementDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/DecrementDurationAction.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/DecrementDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/DecrementDurationAction.java
index df8664f6..b24dd330 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/DecrementDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/DecrementDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -15,36 +12,34 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DecrementDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.decrement-duration";
-	
+
 	public DecrementDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGDuration duration = getEditor().getTablature().getCaret().getDuration();
 		if(duration.getValue() > TGDuration.WHOLE){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			this.changeDuration(duration.getValue() / 2);
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			this.updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
-		
+
 		return 0;
 	}
-	
+
 	private void changeDuration(int value) {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.getDuration().setValue(value);
@@ -52,7 +47,8 @@ private void changeDuration(int value) {
 		caret.getDuration().setDoubleDotted(false);
 		caret.changeDuration(caret.getDuration().clone(getSongManager().getFactory()));
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/IncrementDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/IncrementDurationAction.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/IncrementDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/IncrementDurationAction.java
index 3bb87008..93d2cf76 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/IncrementDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/IncrementDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -15,36 +12,34 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class IncrementDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.increment-duration";
-	
+
 	public IncrementDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGDuration duration = getEditor().getTablature().getCaret().getDuration();
 		if(duration.getValue() < TGDuration.SIXTY_FOURTH){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			this.changeDuration(duration.getValue() * 2);
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			this.updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
-		
+
 		return 0;
 	}
-	
+
 	private void changeDuration(int value) {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.getDuration().setValue(value);
@@ -52,7 +47,8 @@ private void changeDuration(int value) {
 		caret.getDuration().setDoubleDotted(false);
 		caret.changeDuration(caret.getDuration().clone(getSongManager().getFactory()));
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetEighthDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetEighthDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetEighthDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetEighthDurationAction.java
index e38a88a5..62105a71 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetEighthDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetEighthDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,20 +14,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetEighthDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-eighth";
-	
+
 	public static final int VALUE = TGDuration.EIGHTH;
-	
+
 	public SetEighthDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -40,26 +35,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetHalfDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetHalfDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetHalfDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetHalfDurationAction.java
index 274e1e69..7f7f0edf 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetHalfDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetHalfDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,20 +14,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetHalfDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-half";
-	
+
 	public static final int VALUE = TGDuration.HALF;
-	
+
 	public SetHalfDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -40,26 +35,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetQuarterDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetQuarterDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetQuarterDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetQuarterDurationAction.java
index 4dbabc59..8b3512e3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetQuarterDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetQuarterDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,20 +14,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetQuarterDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-quarter";
-	
+
 	public static final int VALUE = TGDuration.QUARTER;
-	
+
 	public SetQuarterDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -40,26 +35,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetSixteenthDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetSixteenthDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetSixteenthDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetSixteenthDurationAction.java
index 1e77be40..13448296 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetSixteenthDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetSixteenthDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,20 +14,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetSixteenthDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-sixteenth";
-	
+
 	public static final int VALUE = TGDuration.SIXTEENTH;
-	
+
 	public SetSixteenthDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -40,26 +35,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetSixtyFourthDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetSixtyFourthDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetSixtyFourthDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetSixtyFourthDurationAction.java
index 1d703845..2dfd7503 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetSixtyFourthDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetSixtyFourthDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,20 +14,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetSixtyFourthDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-sixty-fourth";
-	
+
 	public static final int VALUE = TGDuration.SIXTY_FOURTH;
-	
+
 	public SetSixtyFourthDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -40,26 +35,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetThirtySecondDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetThirtySecondDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetThirtySecondDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetThirtySecondDurationAction.java
index 79b1568c..2551c2de 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetThirtySecondDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetThirtySecondDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,20 +14,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetThirtySecondDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-thirty-second";
-	
+
 	public static final int VALUE = TGDuration.THIRTY_SECOND;
-	
+
 	public SetThirtySecondDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -40,26 +35,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetWholeDurationAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetWholeDurationAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetWholeDurationAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetWholeDurationAction.java
index ba6b08de..5dfa47f1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/duration/SetWholeDurationAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/duration/SetWholeDurationAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.duration;
 
@@ -17,19 +14,17 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetWholeDurationAction extends Action{
-	
+
 	public static final String NAME = "action.note.duration.set-whole";
 	public static final int VALUE = TGDuration.WHOLE;
-	
+
 	public SetWholeDurationAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -39,26 +34,26 @@ protected int execute(ActionData actionData){
 			if(duration.getValue() != VALUE || (!voice.isEmpty() && voice.getDuration().getValue() != VALUE)){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				getSelectedDuration().setValue(VALUE);
 				getSelectedDuration().setDotted(false);
 				getSelectedDuration().setDoubleDotted(false);
 				setDurations();
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 			}
 		}
 		return 0;
 	}
-	
+
 	private void setDurations() {
 		Caret caret = getEditor().getTablature().getCaret();
 		caret.changeDuration(getSelectedDuration().clone(getSongManager().getFactory()));
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public TGDuration getSelectedDuration(){
 		return getEditor().getTablature().getCaret().getDuration();
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/RedoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/RedoAction.java
new file mode 100644
index 00000000..bf344028
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/RedoAction.java
@@ -0,0 +1,33 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.undo.CannotRedoException;
+
+/**
+ * @author julian
+ */
+public class RedoAction extends Action{
+
+	public static final String NAME = "action.edit.redo";
+
+	public RedoAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		try {
+			if(TuxGuitar.instance().getUndoableManager().canRedo()){
+				TuxGuitar.instance().getUndoableManager().redo();
+			}
+		} catch (CannotRedoException e1) {
+			e1.printStackTrace();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetMouseModeEditionAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetMouseModeEditionAction.java
new file mode 100644
index 00000000..d126a934
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetMouseModeEditionAction.java
@@ -0,0 +1,26 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.edit.EditorKit;
+
+/**
+ * @author julian
+ */
+public class SetMouseModeEditionAction extends Action{
+
+	public static final String NAME = "action.edit.set-mouse-mode-edition";
+
+	public SetMouseModeEditionAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getEditorKit().setMouseMode(EditorKit.MOUSE_MODE_EDITION);
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetMouseModeSelectionAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetMouseModeSelectionAction.java
new file mode 100644
index 00000000..d1d23858
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetMouseModeSelectionAction.java
@@ -0,0 +1,26 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.edit.EditorKit;
+
+/**
+ * @author julian
+ */
+public class SetMouseModeSelectionAction extends Action{
+
+	public static final String NAME = "action.edit.set-mouse-mode-selection";
+
+	public SetMouseModeSelectionAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getEditorKit().setMouseMode(EditorKit.MOUSE_MODE_SELECTION);
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetNaturalKeyAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetNaturalKeyAction.java
new file mode 100644
index 00000000..b072a19e
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetNaturalKeyAction.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class SetNaturalKeyAction extends Action{
+
+	public static final String NAME = "action.edit.set-natural-key";
+
+	public SetNaturalKeyAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getEditorKit().setNatural(!getEditor().getTablature().getEditorKit().isNatural());
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetVoice1Action.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetVoice1Action.java
new file mode 100644
index 00000000..6e8ea081
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetVoice1Action.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class SetVoice1Action extends Action{
+
+	public static final String NAME = "action.edit.voice-1";
+
+	public SetVoice1Action() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getCaret().setVoice(0);
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetVoice2Action.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetVoice2Action.java
new file mode 100644
index 00000000..831ba712
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/SetVoice2Action.java
@@ -0,0 +1,25 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class SetVoice2Action extends Action{
+
+	public static final String NAME = "action.edit.voice-2";
+
+	public SetVoice2Action() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		getEditor().getTablature().getCaret().setVoice(1);
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/UndoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/UndoAction.java
new file mode 100644
index 00000000..313be407
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/edit/UndoAction.java
@@ -0,0 +1,33 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.edit;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.undo.CannotUndoException;
+
+/**
+ * @author julian
+ */
+public class UndoAction extends Action{
+
+	public static final String NAME = "action.edit.undo";
+
+	public UndoAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		try {
+			if(TuxGuitar.instance().getUndoableManager().canUndo()){
+				TuxGuitar.instance().getUndoableManager().undo();
+			}
+		} catch (CannotUndoException e1) {
+			e1.printStackTrace();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeAccentuatedNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeAccentuatedNoteAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeAccentuatedNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeAccentuatedNoteAction.java
index 850a3fcf..a07db789 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeAccentuatedNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeAccentuatedNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeAccentuatedNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-accentuated";
-	
+
 	public ChangeAccentuatedNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeAccentuatedNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeBendNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeBendNoteAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeBendNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeBendNoteAction.java
index 1ba7b1f1..89dacca1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeBendNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeBendNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -17,18 +14,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeBendNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-bend";
-	
+
 	public ChangeBendNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
@@ -40,20 +35,21 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	private void changeBend(TGEffectBend effect){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeBendNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber(),effect);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeDeadNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeDeadNoteAction.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeDeadNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeDeadNoteAction.java
index 76859451..68b8acfc 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeDeadNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeDeadNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -16,22 +13,20 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeDeadNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-dead";
-	
+
 	public ChangeDeadNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGNote note = caret.getSelectedNote();
 		if(note == null){
@@ -39,22 +34,23 @@ protected int execute(ActionData actionData){
 			note.setValue(0);
 			note.setVelocity(caret.getVelocity());
 			note.setString(caret.getSelectedString().getNumber());
-			
+
 			TGDuration duration = getSongManager().getFactory().newDuration();
 			caret.getDuration().copy(duration);
-			
+
 			getSongManager().getMeasureManager().addNote(caret.getMeasure(),caret.getPosition(),note,duration,caret.getVoice());
 		}
 		getSongManager().getMeasureManager().changeDeadNote(note);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeFadeInAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeFadeInAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeFadeInAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeFadeInAction.java
index 9725273e..cf286a0b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeFadeInAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeFadeInAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeFadeInAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-fade-in";
-	
+
 	public ChangeFadeInAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeFadeIn(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeGhostNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeGhostNoteAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeGhostNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeGhostNoteAction.java
index 76112da6..f672015b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeGhostNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeGhostNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeGhostNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-ghost";
-	
+
 	public ChangeGhostNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeGhostNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeGraceNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeGraceNoteAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeGraceNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeGraceNoteAction.java
index 901349b7..ce1a18e1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeGraceNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeGraceNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -17,18 +14,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeGraceNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-grace";
-	
+
 	public ChangeGraceNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
@@ -40,20 +35,21 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	private void changeGrace(TGEffectGrace effect){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeGraceNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber(),effect);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHammerNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHammerNoteAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHammerNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHammerNoteAction.java
index 2613a756..d2f13dde 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHammerNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHammerNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeHammerNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-hammer";
-	
+
 	public ChangeHammerNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeHammerNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHarmonicNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHarmonicNoteAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHarmonicNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHarmonicNoteAction.java
index b4de1a2b..88faec40 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHarmonicNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHarmonicNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -17,18 +14,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeHarmonicNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-harmonic";
-	
+
 	public ChangeHarmonicNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
@@ -40,20 +35,21 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	private void changeHarmonic(TGEffectHarmonic effect){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeHarmonicNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber(),effect);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHeavyAccentuatedNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHeavyAccentuatedNoteAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHeavyAccentuatedNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHeavyAccentuatedNoteAction.java
index 41d7d34d..ec00c19f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeHeavyAccentuatedNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeHeavyAccentuatedNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeHeavyAccentuatedNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-heavy-accentuated";
-	
+
 	public ChangeHeavyAccentuatedNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeHeavyAccentuatedNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeLetRingAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeLetRingAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeLetRingAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeLetRingAction.java
index b48c0379..c167479c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeLetRingAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeLetRingAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeLetRingAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-let-ring";
-	
+
 	public ChangeLetRingAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeLetRing(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangePalmMuteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangePalmMuteAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangePalmMuteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangePalmMuteAction.java
index f5f55c32..c96d1e9c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangePalmMuteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangePalmMuteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangePalmMuteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-palm-mute";
-	
+
 	public ChangePalmMuteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changePalmMute(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangePoppingAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangePoppingAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangePoppingAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangePoppingAction.java
index cdbfd7fb..4bf771f0 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangePoppingAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangePoppingAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangePoppingAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-popping";
-	
+
 	public ChangePoppingAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changePopping(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeSlappingAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeSlappingAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeSlappingAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeSlappingAction.java
index 7dc571d6..13798ec1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeSlappingAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeSlappingAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeSlappingAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-slapping";
-	
+
 	public ChangeSlappingAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeSlapping(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeSlideNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeSlideNoteAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeSlideNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeSlideNoteAction.java
index 33ac5d9d..7635f590 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeSlideNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeSlideNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeSlideNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-slide";
-	
+
 	public ChangeSlideNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeSlideNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeStaccatoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeStaccatoAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeStaccatoAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeStaccatoAction.java
index 57a1d0c3..267bda0b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeStaccatoAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeStaccatoAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeStaccatoAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-staccato";
-	
+
 	public ChangeStaccatoAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeStaccato(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTappingAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTappingAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTappingAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTappingAction.java
index b8b3af3c..8fd3846b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTappingAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTappingAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTappingAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-tapping";
-	
+
 	public ChangeTappingAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeTapping(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTremoloBarAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTremoloBarAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTremoloBarAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTremoloBarAction.java
index 17664194..dcbcaeff 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTremoloBarAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTremoloBarAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -17,18 +14,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTremoloBarAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-tremolo-bar";
-	
+
 	public ChangeTremoloBarAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if( note != null ){
@@ -40,20 +35,21 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	private void changeTremoloBar(TGEffectTremoloBar effect){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeTremoloBar(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber(),effect);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTremoloPickingAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTremoloPickingAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTremoloPickingAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTremoloPickingAction.java
index c5ba348d..2ec33c3d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTremoloPickingAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTremoloPickingAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -17,18 +14,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTremoloPickingAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-tremolo-picking";
-	
+
 	public ChangeTremoloPickingAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
@@ -40,20 +35,21 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	private void changeTremoloPicking(TGEffectTremoloPicking effect){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeTremoloPicking(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber(),effect);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTrillNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTrillNoteAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTrillNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTrillNoteAction.java
index 01df7557..3370c261 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeTrillNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeTrillNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -17,18 +14,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTrillNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-trill";
-	
+
 	public ChangeTrillNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if( note != null ){
@@ -40,20 +35,21 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	private void changeTrill(TGEffectTrill effect){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeTrillNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber(),effect);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeVibratoNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeVibratoNoteAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeVibratoNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeVibratoNoteAction.java
index 4927fb27..00ec7e8f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/effects/ChangeVibratoNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/effects/ChangeVibratoNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.effects;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeVibratoNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.effect.change-vibrato";
-	
+
 	public ChangeVibratoNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		getSongManager().getMeasureManager().changeVibratoNote(caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ExitAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ExitAction.java
new file mode 100644
index 00000000..5333bf47
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ExitAction.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.file;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.actions.ActionLock;
+
+/**
+ * @author julian
+ */
+public class ExitAction extends Action {
+
+	public static final String NAME = "action.file.exit";
+
+	public ExitAction() {
+		super(NAME, AUTO_LOCK | KEY_BINDING_AVAILABLE );
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		ActionLock.unlock();
+		TuxGuitar.instance().getShell().close();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ExportSongAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ExportSongAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ExportSongAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ExportSongAction.java
index eacf6437..19e2e78f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ExportSongAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ExportSongAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -16,44 +13,44 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class ExportSongAction extends Action {
-	
+
 	public static final String NAME = "action.file.export";
-	
+
 	public static final String PROPERTY_EXPORTER = "exporter";
-	
+
 	public ExportSongAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE );
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Object propertyExporter = actionData.get(PROPERTY_EXPORTER);
 		if(!(propertyExporter instanceof TGRawExporter) ){
 			return AUTO_UNLOCK;
 		}
-		
+
 		final TGRawExporter exporter = (TGRawExporter)propertyExporter;
 		if( exporter instanceof TGLocalFileExporter ){
 			return this.processLocalFileExporter( (TGLocalFileExporter)exporter );
 		}
 		return this.processRawExporter( exporter );
 	}
-	
+
 	private int processLocalFileExporter( final TGLocalFileExporter exporter ){
 		if(!exporter.configure(false)){
 			return AUTO_UNLOCK;
 		}
-		
+
 		final String fileName = FileActionUtils.chooseFileName(exporter.getFileFormat());
 		if(fileName == null){
 			return AUTO_UNLOCK;
 		}
-		
+
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.exportSong(exporter, fileName);
@@ -62,13 +59,14 @@ public void run() {
 				}
 			}
 		}).start();
-		
+
 		return 0;
 	}
-	
+
 	private int processRawExporter( final TGRawExporter exporter ){
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.exportSong(exporter);
@@ -77,7 +75,7 @@ public void run() {
 				}
 			}
 		}).start();
-		
+
 		return 0;
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/FileActionUtils.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/FileActionUtils.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/FileActionUtils.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/FileActionUtils.java
index b127c8ca..8517b96a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/FileActionUtils.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/FileActionUtils.java
@@ -19,16 +19,16 @@
 import org.herac.tuxguitar.io.base.TGFileFormat;
 import org.herac.tuxguitar.io.base.TGFileFormatException;
 import org.herac.tuxguitar.io.base.TGFileFormatManager;
-import org.herac.tuxguitar.io.base.TGOutputStreamBase;
 import org.herac.tuxguitar.io.base.TGLocalFileExporter;
 import org.herac.tuxguitar.io.base.TGLocalFileImporter;
+import org.herac.tuxguitar.io.base.TGOutputStreamBase;
 import org.herac.tuxguitar.io.base.TGRawExporter;
 import org.herac.tuxguitar.io.base.TGRawImporter;
 import org.herac.tuxguitar.song.managers.TGSongManager;
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class FileActionUtils {
-	
+
 	public static String getFileName(){
 		if (TuxGuitar.instance().getFileHistory().isNewFile() || !TuxGuitar.instance().getFileHistory().isLocalFile()) {
 			return chooseFileName();
@@ -38,7 +38,7 @@ public static String getFileName(){
 		String fullPath = path + File.separator + file;
 		return ( isSupportedFormat(fullPath) ? fullPath : chooseFileName() );
 	}
-	
+
 	public static String chooseFileName(){
 		String fileName = FileChooser.instance().save(TuxGuitar.instance().getShell(),TGFileFormatManager.instance().getOutputFormats());
 		if (fileName != null) {
@@ -51,7 +51,7 @@ public static String chooseFileName(){
 		}
 		return fileName;
 	}
-	
+
 	public static String chooseFileName(TGFileFormat format){
 		String fileName = FileChooser.instance().save(TuxGuitar.instance().getShell(),format);
 		if (fileName != null && !canWrite(fileName)){
@@ -59,14 +59,14 @@ public static String chooseFileName(TGFileFormat format){
 		}
 		return fileName;
 	}
-	
+
 	public static boolean isSupportedFormat(String path) {
 		if(path != null){
 			int index = path.lastIndexOf(".");
 			if(index > 0){
-				Iterator it = TGFileFormatManager.instance().getOutputStreams();
+				Iterator<TGOutputStreamBase> it = TGFileFormatManager.instance().getOutputStreams();
 				while(it.hasNext()){
-					TGOutputStreamBase writer = (TGOutputStreamBase)it.next();
+					TGOutputStreamBase writer = it.next();
 					if(writer.isSupportedExtension(path.substring(index))){
 						return true;
 					}
@@ -75,7 +75,7 @@ public static boolean isSupportedFormat(String path) {
 		}
 		return false;
 	}
-	
+
 	public static boolean canWrite(String fileName){
 		boolean canWrite = true;
 		File file = new File(fileName);
@@ -88,7 +88,7 @@ public static boolean canWrite(String fileName){
 		}
 		return canWrite;
 	}
-	
+
 	public static void open(final String fileName){
 		try {
 			TGSong song = TGFileFormatManager.instance().getLoader().load(TuxGuitar.instance().getSongManager().getFactory(),new FileInputStream(fileName));
@@ -98,7 +98,7 @@ public static void open(final String fileName){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.open.error", new String[]{fileName}),throwable));
 		}
 	}
-	
+
 	public static void save(final String fileName){
 		try {
 			TGSongManager manager = TuxGuitar.instance().getSongManager();
@@ -108,7 +108,7 @@ public static void save(final String fileName){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.save.error", new String[]{fileName}),throwable));
 		}
 	}
-	
+
 	public static void open(final URL url){
 		try {
 			InputStream stream = (isLocalFile(url) ? url.openStream() : getInputStream(url.openStream()));
@@ -119,7 +119,7 @@ public static void open(final URL url){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.open.error", new String[]{url.toString()}),throwable));
 		}
 	}
-	
+
 	public static void exportSong(TGRawExporter exporter){
 		try {
 			TGSongManager manager = TuxGuitar.instance().getSongManager();
@@ -128,7 +128,7 @@ public static void exportSong(TGRawExporter exporter){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.export.error"),throwable));
 		}
 	}
-	
+
 	public static void exportSong(TGLocalFileExporter exporter, String path){
 		try {
 			OutputStream stream = new BufferedOutputStream(new FileOutputStream(new File(path)));
@@ -139,7 +139,7 @@ public static void exportSong(TGLocalFileExporter exporter, String path){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.export.error", new String[]{path}),throwable));
 		}
 	}
-	
+
 	public static void importSong(final TGRawImporter importer){
 		try {
 			TGSong song = importer.importSong();
@@ -149,7 +149,7 @@ public static void importSong(final TGRawImporter importer){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.import.error"),throwable));
 		}
 	}
-	
+
 	public static void importSong(final TGLocalFileImporter importer, String path){
 		try {
 			InputStream stream = new BufferedInputStream(new FileInputStream(new File(path)));
@@ -161,7 +161,7 @@ public static void importSong(final TGLocalFileImporter importer, String path){
 			MessageDialog.errorMessage(new TGFileFormatException(TuxGuitar.getProperty("file.import.error", new String[]{path}),throwable));
 		}
 	}
-	
+
 	private static boolean isLocalFile(URL url){
 		try {
 			if(url.getProtocol().equals( new File(url.getFile()).toURI().toURL().getProtocol() ) ){
@@ -172,7 +172,7 @@ private static boolean isLocalFile(URL url){
 		}
 		return false;
 	}
-	
+
 	private static InputStream getInputStream(InputStream in)throws Throwable {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		int read = 0;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ImportSongAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ImportSongAction.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ImportSongAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ImportSongAction.java
index 9bc6ecbe..6b5e38f1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ImportSongAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/ImportSongAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -21,24 +18,23 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class ImportSongAction extends Action {
-	
+
 	public static final String NAME = "action.file.import";
-	
+
 	public static final String PROPERTY_IMPORTER = "importer";
-	
+
 	public ImportSongAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final Object propertyImporter = actionData.get(PROPERTY_IMPORTER);
-		
+
 		TuxGuitar.instance().getPlayer().reset();
-		
+
 		if(TuxGuitar.instance().getFileHistory().isUnsavedFile()){
 			ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("file.save-changes-question"));
 			confirm.setDefaultStatus( ConfirmDialog.STATUS_CANCEL );
@@ -53,10 +49,12 @@ protected int execute(ActionData actionData){
 				}
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 				new Thread(new Runnable() {
+					@Override
 					public void run() {
 						if(!TuxGuitar.isDisposed()){
 							FileActionUtils.save(fileName);
 							new SyncThread(new Runnable() {
+								@Override
 								public void run() {
 									if(!TuxGuitar.isDisposed()){
 										TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
@@ -71,10 +69,10 @@ public void run() {
 			}
 		}
 		processImporter(propertyImporter);
-		
+
 		return 0;
 	}
-	
+
 	protected void processImporter(Object importer){
 		if( importer instanceof TGLocalFileImporter ){
 			this.processLocalFileImporter( (TGLocalFileImporter)importer );
@@ -82,16 +80,17 @@ protected void processImporter(Object importer){
 			this.processRawImporter( (TGRawImporter)importer );
 		}
 	}
-	
+
 	private void processLocalFileImporter(final TGLocalFileImporter importer){
 		final String path = FileChooser.instance().open(TuxGuitar.instance().getShell(),importer.getFileFormat());
 		if(!isValidFile(path) || !importer.configure(false)){
 			ActionLock.unlock();
 			return;
 		}
-		
+
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.importSong(importer, path);
@@ -101,10 +100,11 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	private void processRawImporter( final TGRawImporter importer ){
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.importSong(importer);
@@ -114,7 +114,7 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	protected boolean isValidFile( String path ){
 		if( path != null ){
 			File file = new File( path );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/NewFileAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/NewFileAction.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/NewFileAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/NewFileAction.java
index 6823bad6..9d8b66f4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/NewFileAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/NewFileAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -17,23 +14,21 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class NewFileAction extends Action{
-	
+
 	public static final String NAME = "action.file.new";
-	
+
 	public static final String PROPERTY_TEMPLATE = "template";
-	
+
 	public NewFileAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final Object propertyTemplate = actionData.get(PROPERTY_TEMPLATE);
-		
+
 		if(TuxGuitar.instance().getFileHistory().isUnsavedFile()){
 			ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("file.save-changes-question"));
 			confirm.setDefaultStatus( ConfirmDialog.STATUS_CANCEL );
@@ -48,11 +43,13 @@ protected int execute(ActionData actionData){
 				}
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 				new Thread(new Runnable() {
+					@Override
 					public void run() {
 						if(!TuxGuitar.isDisposed()){
 							FileActionUtils.save(fileName);
 							TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
 							new SyncThread(new Runnable() {
+								@Override
 								public void run() {
 									if(!TuxGuitar.isDisposed()){
 										newSong(propertyTemplate);
@@ -66,13 +63,14 @@ public void run() {
 			}
 		}
 		newSong(propertyTemplate);
-		
+
 		return 0;
 	}
-	
+
 	protected void newSong(final Object propertyTemplate){
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					TuxGuitar.instance().newSong(getTemplate(propertyTemplate));
@@ -82,7 +80,7 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	protected TGTemplate getTemplate(Object propertyTemplate){
 		TGTemplate tgTemplate = null;
 		if( propertyTemplate instanceof TGTemplate ){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/OpenFileAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/OpenFileAction.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/OpenFileAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/OpenFileAction.java
index 79065160..dad9f76a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/OpenFileAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/OpenFileAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -22,24 +19,23 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class OpenFileAction extends Action {
-	
+
 	public static final String NAME = "action.file.open";
-	
+
 	public static final String PROPERTY_URL = "url";
-	
+
 	public OpenFileAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final Object propertyUrl = actionData.get(PROPERTY_URL);
-		
+
 		TuxGuitar.instance().getPlayer().reset();
-		
+
 		if(TuxGuitar.instance().getFileHistory().isUnsavedFile()){
 			ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("file.save-changes-question"));
 			confirm.setDefaultStatus( ConfirmDialog.STATUS_CANCEL );
@@ -54,10 +50,12 @@ protected int execute(ActionData actionData){
 				}
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 				new Thread(new Runnable() {
+					@Override
 					public void run() {
 						if(!TuxGuitar.isDisposed()){
 							FileActionUtils.save(fileName);
 							new SyncThread(new Runnable() {
+								@Override
 								public void run() {
 									if(!TuxGuitar.isDisposed()){
 										TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
@@ -72,10 +70,10 @@ public void run() {
 			}
 		}
 		openFile( propertyUrl );
-		
+
 		return 0;
 	}
-	
+
 	protected void openFile(Object data){
 		final URL url = getOpenFileName(data);
 		if(url == null){
@@ -85,8 +83,10 @@ protected void openFile(Object data){
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		try {
 			TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					new Thread(new Runnable() {
+						@Override
 						public void run() {
 							if(!TuxGuitar.isDisposed()){
 								FileActionUtils.open(url);
@@ -101,7 +101,7 @@ public void run() {
 			e.printStackTrace();
 		}
 	}
-	
+
 	protected URL getOpenFileName(Object data){
 		try{
 			if(data instanceof URL){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/OpenURLAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/OpenURLAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/OpenURLAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/OpenURLAction.java
index 4c4beab6..10fb7a18 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/OpenURLAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/OpenURLAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -30,24 +27,23 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class OpenURLAction extends Action {
-	
+
 	public static final String NAME = "action.file.open-url";
-	
+
 	public static final String PROPERTY_URL = "url";
-	
+
 	public OpenURLAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final Object propertyUrl = actionData.get(PROPERTY_URL);
-		
+
 		TuxGuitar.instance().getPlayer().reset();
-		
+
 		if(TuxGuitar.instance().getFileHistory().isUnsavedFile()){
 			ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("file.save-changes-question"));
 			confirm.setDefaultStatus( ConfirmDialog.STATUS_CANCEL );
@@ -62,10 +58,12 @@ protected int execute(ActionData actionData){
 				}
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 				new Thread(new Runnable() {
+					@Override
 					public void run() {
 						if(!TuxGuitar.isDisposed()){
 							FileActionUtils.save(fileName);
 							new SyncThread(new Runnable() {
+								@Override
 								public void run() {
 									if(!TuxGuitar.isDisposed()){
 										TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
@@ -80,10 +78,10 @@ public void run() {
 			}
 		}
 		openURL( propertyUrl );
-		
+
 		return 0;
 	}
-	
+
 	protected void openURL(Object data){
 		final URL url = getURL(data);
 		if(url == null){
@@ -92,6 +90,7 @@ protected void openURL(Object data){
 		}
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.open(url);
@@ -101,50 +100,51 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	protected URL getURL(Object data){
 		if(data instanceof URL){
 			return (URL)data;
 		}
 		return new URLDialog().openDialog();
 	}
-	
+
 	protected class URLDialog{
-		
+
 		protected URL url;
-		
+
 		protected URL openDialog(){
 			this.url = null;
-			
+
 			final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("file.open-url"));
-			
+
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout());
 			group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			group.setText(TuxGuitar.getProperty("file.open-url"));
-			
+
 			Composite composite = new Composite(group, SWT.NONE);
 			composite.setLayout(new GridLayout(2,false));
 			composite.setLayoutData(getMainData());
-			
+
 			final Label label = new Label(composite,SWT.LEFT);
 			label.setText(TuxGuitar.getProperty("url") + ":");
 			label.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-			
+
 			final Text url = new Text(composite,SWT.BORDER | SWT.SINGLE);
 			url.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-			
+
 			//------------------BUTTONS--------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					try {
 						URLDialog.this.url = new URL(url.getText());
@@ -154,29 +154,30 @@ public void widgetSelected(SelectionEvent arg0) {
 					}
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-			
+
 			return this.url;
 		}
-		
+
 		private GridData getMainData(){
 			GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 			data.minimumWidth = 450;
 			return data;
 		}
-		
+
 		private GridData getButtonData(){
 			GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 			data.minimumWidth = 80;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/PrintAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/PrintAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/PrintAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/PrintAction.java
index 4392d83f..a0d49369 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/PrintAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/PrintAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -33,28 +30,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class PrintAction extends Action{
-	
+
 	public static final String NAME = "action.file.print";
-	
+
 	public PrintAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		try{
 			final PrintStyles data = PrintStylesDialog.open(TuxGuitar.instance().getShell());
 			if(data != null){
 				PrintDialog dialog = new PrintDialog(TuxGuitar.instance().getShell(), SWT.NULL);
 				PrinterData printerData = dialog.open();
-				
+
 				if (printerData != null) {
 					TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
-					
+
 					this.print(printerData, data);
 				}
 			}
@@ -63,23 +58,25 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	public void print(final PrinterData printerData ,final PrintStyles data){
 		try{
 			new Thread(new Runnable() {
+				@Override
 				public void run() {
 					try{
 						final TGSongManager manager = new TGSongManager();
 						manager.setFactory(new TGFactoryImpl());
 						manager.setSong(getSongManager().getSong().clone(manager.getFactory()));
-						
+
 						new SyncThread(new Runnable() {
+							@Override
 							public void run() {
 								try{
 									Printer printer = new Printer(printerData);
 									PrintController controller = new PrintController(manager, new TGResourceFactoryImpl(printer));
 									PrintLayout layout = new PrintLayout(controller,data);
-									
+
 									print(printer, printerData, layout , getPrinterArea(printer,0.5), getPrinterScale(printer) );
 								}catch(Throwable throwable ){
 									MessageDialog.errorMessage(throwable);
@@ -95,9 +92,10 @@ public void run() {
 			MessageDialog.errorMessage(throwable);
 		}
 	}
-	
+
 	protected void print(final Printer printer,final PrinterData printerData ,final PrintLayout layout, final TGRectangle bounds, final float scale){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					layout.loadStyles(scale);
@@ -109,20 +107,20 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	protected TGRectangle getPrinterArea(Printer printer,double margin) {
 		Rectangle clientArea = printer.getClientArea();
 		Rectangle trim = printer.computeTrim(0, 0, 0, 0);
 		Point dpi = printer.getDPI();
-		
+
 		int x = (int) (margin * dpi.x) - trim.x;
 		int y = (int) (margin * dpi.y) - trim.y;
 		int width = clientArea.width + trim.width - (int) (margin * dpi.x) - trim.x;
 		int height = clientArea.height + trim.height - (int) (margin * dpi.y) - trim.y;
-		
+
 		return new TGRectangle(x,y,width,height);
 	}
-	
+
 	protected float getPrinterScale(Printer printer) {
 		Point dpi = printer.getDPI();
 		if( dpi != null ){
@@ -130,16 +128,16 @@ protected float getPrinterScale(Printer printer) {
 		}
 		return 1.0f;
 	}
-	
+
 	private class PrintDocumentImpl implements PrintDocument{
-		
+
 		private Printer printer;
 		private PrinterData printerData;
 		private PrintLayout layout;
 		private TGPainterImpl painter;
 		private TGRectangle bounds;
 		private boolean started;
-		
+
 		public PrintDocumentImpl(PrintLayout layout, Printer printer,PrinterData printerData, TGRectangle bounds){
 			this.layout = layout;
 			this.printer = printer;
@@ -147,39 +145,46 @@ public PrintDocumentImpl(PrintLayout layout, Printer printer,PrinterData printer
 			this.bounds = bounds;
 			this.painter = new TGPainterImpl();
 		}
-		
+
+		@Override
 		public TGPainter getPainter() {
 			return this.painter;
 		}
-		
+
+		@Override
 		public TGRectangle getBounds(){
 			return this.bounds;
 		}
-		
+
+		@Override
 		public void pageStart() {
 			if(this.started){
 				this.printer.startPage();
 				this.painter.init(new GC(this.printer));
 			}
 		}
-		
+
+		@Override
 		public void pageFinish() {
 			if(this.started){
 				this.painter.dispose();
 				this.printer.endPage();
 			}
 		}
-		
+
+		@Override
 		public void start() {
 			this.started = this.printer.startJob(getJobName());
 		}
-		
+
+		@Override
 		public void finish() {
 			if(this.started){
 				this.printer.endJob();
 				this.started = false;
 				try {
 					TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable(){
+						@Override
 						public void run() {
 							dispose();
 						}
@@ -190,7 +195,8 @@ public void run() {
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
 			}
 		}
-		
+
+		@Override
 		public boolean isPaintable(int page){
 			if(this.printerData.scope == PrinterData.PAGE_RANGE){
 				if(this.printerData.startPage > 0 && this.printerData.startPage > page){
@@ -202,13 +208,13 @@ public boolean isPaintable(int page){
 			}
 			return true;
 		}
-		
+
 		public String getJobName(){
 			String prefix = TuxGuitar.APPLICATION_NAME;
 			String song = this.layout.getSongManager().getSong().getName();
 			return ( song != null && song.length() > 0 ? (prefix + "-" + song) : prefix );
 		}
-		
+
 		public void dispose(){
 			if(!this.printer.isDisposed()){
 				this.printer.dispose();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/PrintPreviewAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/PrintPreviewAction.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/PrintPreviewAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/PrintPreviewAction.java
index 374d357e..52506574 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/PrintPreviewAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/PrintPreviewAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -34,24 +31,22 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class PrintPreviewAction extends Action{
-	
+
 	public static final String NAME = "action.file.print-preview";
-	
+
 	public PrintPreviewAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		try{
 			final PrintStyles data = PrintStylesDialog.open(TuxGuitar.instance().getShell());
 			if(data != null){
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
-				
+
 				this.printPreview(data);
 			}
 		}catch(Throwable throwable){
@@ -59,15 +54,16 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
 	public void printPreview(final PrintStyles data){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					final TGSongManager manager = new TGSongManager();
 					manager.setFactory(new TGFactoryImpl());
 					manager.setSong(getSongManager().getSong().clone(manager.getFactory()));
-				
+
 					printPreview(manager,data);
 				}catch(Throwable throwable){
 					MessageDialog.errorMessage(throwable);
@@ -75,15 +71,16 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void printPreview(final TGSongManager manager, final PrintStyles data){
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					TGResourceFactory factory = new TGResourceFactoryImpl(TuxGuitar.instance().getDisplay());
 					PrintController controller = new PrintController(manager, factory);
 					PrintLayout layout = new PrintLayout(controller,data);
-					
+
 					printPreview( layout );
 				}catch(Throwable throwable){
 					MessageDialog.errorMessage(throwable);
@@ -91,9 +88,10 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void printPreview(final PrintLayout layout){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					layout.loadStyles(1f);
@@ -105,52 +103,59 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	private class PrintDocumentImpl implements PrintDocument{
-		
-		private TGPainterImpl painter;
-		private TGRectangle bounds;
-		private List pages;
-		
+
+		private final TGPainterImpl painter;
+		private final TGRectangle bounds;
+		private final List<Image> pages;
+
 		public PrintDocumentImpl(TGRectangle bounds){
 			this.bounds = bounds;
 			this.painter = new TGPainterImpl();
-			this.pages = new ArrayList();
+			this.pages = new ArrayList<Image>();
 		}
-		
+
+		@Override
 		public TGPainter getPainter() {
 			return this.painter;
 		}
-		
+
+		@Override
 		public TGRectangle getBounds(){
 			return this.bounds;
 		}
-		
+
+		@Override
 		public void pageStart() {
 			Image page = new Image(TuxGuitar.instance().getDisplay(),this.bounds.getWidth() - this.bounds.getX(), this.bounds.getHeight() - this.bounds.getY());
 			this.painter.init( page );
 			this.pages.add( page );
 		}
-		
+
+		@Override
 		public void pageFinish() {
 			this.painter.dispose();
 		}
-		
+
+		@Override
 		public void start() {
 			// Not implemented
 		}
-		
+
+		@Override
 		public void finish() {
 			final TGRectangle bounds = this.bounds;
-			final List pages = this.pages;
+			final List<Image> pages = this.pages;
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable(){
+					@Override
 					public void run() {
 						PrintPreview preview = new PrintPreview(pages,bounds);
 						preview.showPreview(getEditor().getTablature().getShell());
-						Iterator it = pages.iterator();
+						Iterator<Image> it = pages.iterator();
 						while(it.hasNext()){
-							Image image = (Image)it.next();
+							Image image = it.next();
 							image.dispose();
 						}
 					}
@@ -159,7 +164,8 @@ public void run() {
 				e.printStackTrace();
 			}
 		}
-		
+
+		@Override
 		public boolean isPaintable(int page) {
 			return true;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/SaveAsFileAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/SaveAsFileAction.java
similarity index 78%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/SaveAsFileAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/SaveAsFileAction.java
index cc16a545..c27a3f6c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/SaveAsFileAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/SaveAsFileAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -14,17 +11,16 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class SaveAsFileAction extends Action {
-	
+
 	public static final String NAME = "action.file.save-as";
-	
+
 	public SaveAsFileAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE );
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final String fileName = FileActionUtils.chooseFileName();
 		if(fileName == null){
@@ -32,6 +28,7 @@ protected int execute(ActionData actionData){
 		}
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.save(fileName);
@@ -40,7 +37,7 @@ public void run() {
 				}
 			}
 		}).start();
-		
+
 		return 0;
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/SaveFileAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/SaveFileAction.java
similarity index 78%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/file/SaveFileAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/SaveFileAction.java
index 6579ae0f..23a2ef0e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/SaveFileAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/file/SaveFileAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.file;
 
@@ -14,18 +11,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SaveFileAction extends Action{
-	
+
 	public static final String NAME = "action.file.save";
-	
+
 	public SaveFileAction() {
 		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE );
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final String fileName = FileActionUtils.getFileName();
 		if(fileName == null){
@@ -33,6 +28,7 @@ protected int execute(ActionData actionData){
 		}
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.save(fileName);
@@ -41,7 +37,7 @@ public void run() {
 				}
 			}
 		}).start();
-		
+
 		return 0;
 	}
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/help/ShowAboutAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/help/ShowAboutAction.java
new file mode 100644
index 00000000..6068e061
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/help/ShowAboutAction.java
@@ -0,0 +1,32 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.help;
+
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Canvas;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.help.about.AboutDialog;
+
+/**
+ * @author julian
+ */
+public class ShowAboutAction extends Action {
+
+	public static final String NAME = "action.help.about";
+
+	protected Canvas imageCanvas;
+	protected Image tabImage;
+
+	public ShowAboutAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		new AboutDialog().open(TuxGuitar.instance().getShell());
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/help/ShowDocAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/help/ShowDocAction.java
new file mode 100644
index 00000000..34967436
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/help/ShowDocAction.java
@@ -0,0 +1,31 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.help;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.help.doc.TGDocumentation;
+import org.herac.tuxguitar.app.util.MessageDialog;
+
+/**
+ * @author julian
+ */
+public class ShowDocAction extends Action {
+
+	public static final String NAME = "action.help.doc";
+
+	public ShowDocAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | KEY_BINDING_AVAILABLE );
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		try {
+			new TGDocumentation().display();
+		} catch (Throwable throwable) {
+			MessageDialog.errorMessage(throwable);
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/DoubleBarAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/DoubleBarAction.java
new file mode 100644
index 00000000..c6c42d1d
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/DoubleBarAction.java
@@ -0,0 +1,38 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.insert;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.undo.undoables.custom.UndoableChangeDoubleBar;
+import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
+
+public class DoubleBarAction extends Action{
+
+	public static final String NAME = "action.insert.doublebar";
+
+	public DoubleBarAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		UndoableChangeDoubleBar undoable = UndoableChangeDoubleBar.startUndo();
+		TuxGuitar.instance().getFileHistory().setUnsavedFile();
+
+		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
+		measure.getHeader().setDoubleBar(!measure.getHeader().hasDoubleBar());
+		updateTablature();
+
+		addUndoableEdit(undoable.endUndo());
+
+		return 0;
+	}
+
+	@Override
+	public void updateTablature() {
+		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/InsertChordAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/InsertChordAction.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/InsertChordAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/InsertChordAction.java
index d806706b..b697a3d1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/InsertChordAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/InsertChordAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.insert;
 
@@ -26,22 +23,21 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class InsertChordAction extends Action {
-	
+
 	public static final String NAME = "action.insert.chord";
-	
+
 	public static final String PROPERTY_CHORD = "chord";
-	
+
 	public InsertChordAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Object propertyChord = actionData.get(PROPERTY_CHORD);
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGTrackImpl track = caret.getTrack();
 		TGMeasureImpl measure = caret.getMeasure();
@@ -56,7 +52,7 @@ protected int execute(ActionData actionData){
 			else{
 				Shell shell = TuxGuitar.instance().getShell();
 				ChordDialog dialog = new ChordDialog();
-				
+
 				int result = dialog.open(shell, measure,beat, caret.getPosition());
 				if( result == ChordDialog.RESULT_SAVE ){
 					insertChord(dialog.getChord(), track, measure, beat, caret.getVoice());
@@ -68,56 +64,56 @@ else if( result == ChordDialog.RESULT_CLEAN ){
 		}
 		return 0;
 	}
-	
+
 	protected void insertChord(TGChord chord, TGTrackImpl track, TGMeasureImpl measure, TGBeat beat, int voiceIndex) {
 		boolean restBeat = beat.isRestBeat();
 		if(!restBeat || chord.countNotes() > 0 ) {
-			
+
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			// Add the chord notes to the tablature
 			// Only if this is a "rest" beat
 			TGVoice voice = beat.getVoice(voiceIndex);
 			if( restBeat ){
-				
-				Iterator it = track.getStrings().iterator();
+
+				Iterator<TGString> it = track.getStrings().iterator();
 				while (it.hasNext()) {
-					TGString string = (TGString) it.next();
-					
+					TGString string = it.next();
+
 					int value = chord.getFretValue(string.getNumber() - 1);
 					if (value >= 0) {
 						TGNote note = getSongManager().getFactory().newNote();
 						note.setValue(value);
 						note.setVelocity(getEditor().getTablature().getCaret().getVelocity());
 						note.setString(string.getNumber());
-						
+
 						TGDuration duration = getSongManager().getFactory().newDuration();
 						voice.getDuration().copy(duration);
-						
+
 						getSongManager().getMeasureManager().addNote(beat,note,duration,voice.getIndex());
 					}
 				}
 			}
-			
+
 			getSongManager().getMeasureManager().addChord(beat, chord);
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			fireUpdate(measure.getNumber());
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
 	}
-	
+
 	protected void removeChord(TGMeasureImpl measure, TGBeat beat) {
 		if( beat.isChordBeat() ){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			getSongManager().getMeasureManager().removeChord(measure, beat.getStart());
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			fireUpdate(measure.getNumber());
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/InsertTextAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/InsertTextAction.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/InsertTextAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/InsertTextAction.java
index 3458ce8d..1341f634 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/InsertTextAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/InsertTextAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.insert;
 
@@ -27,127 +24,130 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class InsertTextAction extends Action {
-	
+
 	public static final String NAME = "action.insert.text";
-	
+
 	public InsertTextAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		final TGBeat beat = getEditor().getTablature().getCaret().getSelectedBeat();
-		
+
 		showInsertDialog(beat,(beat.getText() == null?new String():beat.getText().getValue()));
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public void showInsertDialog(final TGBeat beat,String value) {
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
-		
+
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("text.editor"));
-		
+
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("text.insert"));
-		
+
 		Composite composite = new Composite(group, SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
-		composite.setLayoutData(getMainData());  
-		
+		composite.setLayoutData(getMainData());
+
 		final Label label = new Label(composite,SWT.LEFT);
 		label.setText(TuxGuitar.getProperty("text.text") + ":");
 		label.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Text text = new Text(composite,SWT.BORDER | SWT.SINGLE);
 		text.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		text.setText(value);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				insertText(beat,text.getText());
 				dialog.dispose();
 			}
 		});
-		
+
 		final Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				removeText(beat);
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData getMainData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 300;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void insertText(TGBeat beat,String value) {
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		TGText text = getSongManager().getFactory().newText();
 		text.setValue(value);
 		getSongManager().getMeasureManager().addText(beat, text);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
-	
+
 	protected void removeText(TGBeat beat) {
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		getSongManager().getMeasureManager().removeText(beat);
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatAlternativeAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatAlternativeAction.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatAlternativeAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatAlternativeAction.java
index f7d3c603..26d274e3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatAlternativeAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatAlternativeAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.insert;
 
@@ -29,39 +26,37 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class RepeatAlternativeAction extends Action{
-	
+
 	public static final String NAME = "action.insert.repeat-alternative";
-	
+
 	public RepeatAlternativeAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGMeasure measure = getEditor().getTablature().getCaret().getMeasure();
 		showCloseRepeatDialog(getEditor().getTablature().getShell(), measure);
 		return 0;
 	}
-	
+
 	public void showCloseRepeatDialog(Shell shell, final TGMeasure measure) {
 		if (measure != null) {
 			int existentEndings = getExistentEndings(measure);
 			int selectedEndings = (measure.getHeader().getRepeatAlternative() > 0)?measure.getHeader().getRepeatAlternative():getDefaultEndings(existentEndings);
-			
+
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("repeat.alternative.editor"));
-			
+
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout(4,true));
 			group.setLayoutData(getMainData());
 			group.setText(TuxGuitar.getProperty("repeat.alternative"));
-			
+
 			final Button[] selections = new Button[8];
 			for(int i = 0; i < selections.length; i ++){
 				boolean enabled = ((existentEndings & (1 << i)) == 0);
@@ -71,16 +66,17 @@ public void showCloseRepeatDialog(Shell shell, final TGMeasure measure) {
 				selections[i].setEnabled(enabled);
 				selections[i].setSelection(enabled && ((selectedEndings & (1 << i)) != 0)  );
 			}
-			
+
 			//----------------------BUTTONS--------------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(3,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					int values = 0;
 					for(int i = 0; i < selections.length; i ++){
@@ -94,6 +90,7 @@ public void widgetSelected(SelectionEvent arg0) {
 			buttonClean.setText(TuxGuitar.getProperty("clean"));
 			buttonClean.setLayoutData(getButtonData());
 			buttonClean.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					update(measure,0);
 					dialog.dispose();
@@ -103,35 +100,36 @@ public void widgetSelected(SelectionEvent arg0) {
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getMainData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 350;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected int getExistentEndings(TGMeasure measure){
 		int existentEndings = 0;
-		Iterator it = getSongManager().getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSongManager().getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.getNumber() == measure.getNumber()){
 				break;
 			}
@@ -142,7 +140,7 @@ protected int getExistentEndings(TGMeasure measure){
 		}
 		return existentEndings;
 	}
-	
+
 	protected int getDefaultEndings(int existentEndings){
 		for(int i = 0; i < 8; i ++){
 			if((existentEndings & (1 << i)) == 0){
@@ -151,24 +149,24 @@ protected int getDefaultEndings(int existentEndings){
 		}
 		return -1;
 	}
-	
+
 	protected void update(TGMeasure measure, int value) {
 		//Solo si hubieron cambios
 		if(value != measure.getHeader().getRepeatAlternative()){
 			//Si no estoy editando, y la alternativa no contiene el primer final,
 			//por defecto se cierra la repeticion del compas anterior
 			boolean previousRepeatClose = (measure.getHeader().getRepeatAlternative() == 0 && ((value & (1 << 0)) == 0)) ;
-			
+
 			//comienza el undoable
 			UndoableJoined undoable = new UndoableJoined();
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			//Guardo la repeticion alternativa
 			UndoableChangeAlternativeRepeat u1 = UndoableChangeAlternativeRepeat.startUndo();
 			getSongManager().changeAlternativeRepeat(measure.getStart(), value);
 			fireUpdate(measure.getNumber());
 			undoable.addUndoableEdit(u1.endUndo(value));
-			
+
 			if(previousRepeatClose){
 				//Agrego un cierre de repeticion al compaz anterior
 				TGMeasureHeader previous = getSongManager().getMeasureHeader( measure.getNumber() - 1);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatCloseAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatCloseAction.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatCloseAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatCloseAction.java
index 8bb0790f..4658121f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatCloseAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatCloseAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.insert;
 
@@ -26,63 +23,63 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class RepeatCloseAction extends Action{
-	
+
 	public static final String NAME = "action.insert.close-repeat";
-	
+
 	public RepeatCloseAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		showCloseRepeatDialog(getEditor().getTablature().getShell(), measure);
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
-	
+
 	public void showCloseRepeatDialog(Shell shell, final TGMeasureImpl measure) {
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			
+
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("repeat.close"));
-			
+
 			int currentRepeatClose = measure.getRepeatClose();
 			if (currentRepeatClose < 1) {
 				currentRepeatClose = 1;
 			}
-			
+
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout(2,false));
 			group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			group.setText(TuxGuitar.getProperty("repeat.close"));
-			
+
 			Label repeatCloseLabel = new Label(group, SWT.NULL);
 			repeatCloseLabel.setText(TuxGuitar.getProperty("repeat.number-of-repetitions"));
-			
+
 			final Spinner repeatClose = new Spinner(group, SWT.BORDER);
 			repeatClose.setMinimum(0);
 			repeatClose.setMaximum(100);
 			repeatClose.setSelection(currentRepeatClose);
 			repeatClose.setLayoutData(getSpinnerData());
-			
+
 			//----------------------BUTTONS--------------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(3,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					closeRepeat(measure,repeatClose.getSelection());
 					dialog.dispose();
@@ -92,6 +89,7 @@ public void widgetSelected(SelectionEvent arg0) {
 			buttonClean.setText(TuxGuitar.getProperty("clean"));
 			buttonClean.setLayoutData(getButtonData());
 			buttonClean.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					closeRepeat(measure,0);
 					dialog.dispose();
@@ -101,41 +99,42 @@ public void widgetSelected(SelectionEvent arg0) {
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 100;
 		return data;
 	}
-	
+
 	protected void closeRepeat(TGMeasureImpl measure, int repeatClose) {
 		if(repeatClose >= 0){
-			
+
 			//comienza el undoable
 			UndoableChangeCloseRepeat undoable = UndoableChangeCloseRepeat.startUndo();
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			//numberOfRepetitions = Math.abs(numberOfRepetitions);
 			getSongManager().changeCloseRepeat(measure.getStart(), repeatClose);
 			updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(repeatClose));
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatOpenAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatOpenAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatOpenAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatOpenAction.java
index 69c33948..93ad939c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/insert/RepeatOpenAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/insert/RepeatOpenAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.insert;
 
@@ -14,33 +11,32 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class RepeatOpenAction extends Action{
-	
+
 	public static final String NAME = "action.insert.open-repeat";
-	
+
 	public RepeatOpenAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableChangeOpenRepeat undoable = UndoableChangeOpenRepeat.startUndo();
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		getSongManager().changeOpenRepeat(measure.getStart());
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
new file mode 100644
index 00000000..e1031cb0
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.layout;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.graphics.control.TGLayout;
+
+/**
+ * @author julian
+ */
+public class SetChordDiagramEnabledAction extends Action{
+
+	public static final String NAME = "action.view.layout-set-chord-diagram-enabled";
+
+	public SetChordDiagramEnabledAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TGLayout layout = getEditor().getTablature().getViewLayout();
+		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_CHORD_DIAGRAM) );
+		updateTablature();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
new file mode 100644
index 00000000..deaa328b
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.layout;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.graphics.control.TGLayout;
+
+/**
+ * @author julian
+ */
+public class SetChordNameEnabledAction extends Action{
+
+	public static final String NAME = "action.view.layout-set-chord-name-enabled";
+
+	public SetChordNameEnabledAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TGLayout layout = getEditor().getTablature().getViewLayout();
+		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_CHORD_NAME ) );
+		updateTablature();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetCompactViewAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetCompactViewAction.java
new file mode 100644
index 00000000..e87cbb52
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetCompactViewAction.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.layout;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.graphics.control.TGLayout;
+
+/**
+ * @author julian
+ */
+public class SetCompactViewAction extends Action{
+
+	public static final String NAME = "action.view.layout-set-compact";
+
+	public SetCompactViewAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TGLayout layout = getEditor().getTablature().getViewLayout();
+		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_COMPACT ) );
+		updateTablature();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetLinearLayoutAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetLinearLayoutAction.java
similarity index 75%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetLinearLayoutAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetLinearLayoutAction.java
index 452e8bc5..aba25473 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetLinearLayoutAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetLinearLayoutAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.layout;
 
@@ -13,18 +10,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetLinearLayoutAction extends Action{
-	
+
 	public static final String NAME = "action.view.layout-set-linear";
-	
+
 	public SetLinearLayoutAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Tablature tablature = getEditor().getTablature();
 		tablature.setViewLayout(new TGLayoutHorizontal(tablature,tablature.getViewLayout().getStyle()));
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetMultitrackViewAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetMultitrackViewAction.java
new file mode 100644
index 00000000..41febbb6
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetMultitrackViewAction.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.layout;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.graphics.control.TGLayout;
+
+/**
+ * @author julian
+ */
+public class SetMultitrackViewAction extends Action{
+
+	public static final String NAME = "action.view.layout-set-multitrack";
+
+	public SetMultitrackViewAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TGLayout layout = getEditor().getTablature().getViewLayout();
+		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_MULTITRACK ) );
+		updateTablature();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetPageLayoutAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetPageLayoutAction.java
new file mode 100644
index 00000000..2946a5f4
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetPageLayoutAction.java
@@ -0,0 +1,29 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.layout;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.Tablature;
+import org.herac.tuxguitar.graphics.control.TGLayoutVertical;
+
+/**
+ * @author julian
+ */
+public class SetPageLayoutAction extends Action{
+
+	public static final String NAME = "action.view.layout-set-page";
+
+	public SetPageLayoutAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Tablature tablature = getEditor().getTablature();
+		tablature.setViewLayout(new TGLayoutVertical(tablature,tablature.getViewLayout().getStyle()));
+		updateTablature();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
similarity index 77%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
index 1668d06f..056cd076 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetScoreEnabledAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.layout;
 
@@ -12,18 +9,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetScoreEnabledAction extends Action{
-	
+
 	public static final String NAME = "action.view.layout-set-score-enabled";
-	
+
 	public SetScoreEnabledAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGLayout layout = getEditor().getTablature().getViewLayout();
 		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_SCORE ) );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
similarity index 77%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
index d9b236d3..c064b001 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/layout/SetTablatureEnabledAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.layout;
 
@@ -12,18 +9,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetTablatureEnabledAction extends Action{
-	
+
 	public static final String NAME = "action.view.layout-set-tablature-enabled";
-	
+
 	public SetTablatureEnabledAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGLayout layout = getEditor().getTablature().getViewLayout();
 		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_TABLATURE ) );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/AddMarkerAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/AddMarkerAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/AddMarkerAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/AddMarkerAction.java
index 0a02c828..0018fa10 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/AddMarkerAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/AddMarkerAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.marker;
 
@@ -15,25 +12,23 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class AddMarkerAction extends Action{
-	
+
 	public static final String NAME = "action.marker.add";
-	
+
 	public AddMarkerAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		if(new MarkerEditor(getMarker()).open(getEditor().getTablature().getShell())){
 			MarkerList.instance().update(true);
 		}
 		return 0;
 	}
-	
+
 	private TGMarker getMarker(){
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoFirstMarkerAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoFirstMarkerAction.java
new file mode 100644
index 00000000..a4f52a9f
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoFirstMarkerAction.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.marker;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.marker.MarkerNavigator;
+
+/**
+ * @author julian
+ */
+public class GoFirstMarkerAction extends Action{
+
+	public static final String NAME = "action.marker.go-first";
+
+	public GoFirstMarkerAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		new MarkerNavigator().goToSelectedMarker(getSongManager().getFirstMarker());
+
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoLastMarkerAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoLastMarkerAction.java
new file mode 100644
index 00000000..9b8eaaf3
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoLastMarkerAction.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.marker;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.marker.MarkerNavigator;
+
+/**
+ * @author julian
+ */
+public class GoLastMarkerAction extends Action{
+
+	public static final String NAME = "action.marker.go-last";
+
+	public GoLastMarkerAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		new MarkerNavigator().goToSelectedMarker(getSongManager().getLastMarker());
+
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoNextMarkerAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoNextMarkerAction.java
new file mode 100644
index 00000000..1fb260da
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoNextMarkerAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.marker;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.Caret;
+import org.herac.tuxguitar.app.marker.MarkerNavigator;
+
+/**
+ * @author julian
+ */
+public class GoNextMarkerAction extends Action{
+
+	public static final String NAME = "action.marker.go-next";
+
+	public GoNextMarkerAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE );
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Caret caret = getEditor().getTablature().getCaret();
+
+		new MarkerNavigator().goToSelectedMarker(getSongManager().getNextMarker(caret.getMeasure().getNumber()));
+
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoPreviousMarkerAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoPreviousMarkerAction.java
new file mode 100644
index 00000000..775a7300
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/GoPreviousMarkerAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.marker;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.Caret;
+import org.herac.tuxguitar.app.marker.MarkerNavigator;
+
+/**
+ * @author julian
+ */
+public class GoPreviousMarkerAction extends Action{
+
+	public static final String NAME = "action.marker.go-previous";
+
+	public GoPreviousMarkerAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Caret caret = getEditor().getTablature().getCaret();
+
+		new MarkerNavigator().goToSelectedMarker(getSongManager().getPreviousMarker(caret.getMeasure().getNumber()));
+
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/ListMarkersAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/ListMarkersAction.java
new file mode 100644
index 00000000..07dfdf3c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/marker/ListMarkersAction.java
@@ -0,0 +1,31 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.marker;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.marker.MarkerList;
+
+/**
+ * @author julian
+ */
+public class ListMarkersAction extends Action{
+
+	public static final String NAME = "action.marker.list";
+
+	public ListMarkersAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(MarkerList.instance().isDisposed()){
+			MarkerList.instance().show();
+		}
+		else{
+			MarkerList.instance().dispose();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/AddMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/AddMeasureAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/AddMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/AddMeasureAction.java
index e4ed04fc..7138cea8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/AddMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/AddMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -27,56 +24,54 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class AddMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.add";
-	
+
 	public AddMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog();
 		return 0;
 	}
-	
+
 	public void showDialog() {
 		if (getEditor().getTablature().getCaret().getMeasure() != null) {
 			final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("measure.add"));
-			
+
 			//-----------------COUNT------------------------
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout(2,false));
 			group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			group.setText(TuxGuitar.getProperty("measure.add"));
-			
+
 			Label countLabel = new Label(group, SWT.NULL);
 			countLabel.setText(TuxGuitar.getProperty("measure.add.count"));
-			
+
 			final Spinner countSpinner = new Spinner(group, SWT.BORDER);
 			countSpinner.setLayoutData(getSpinnerData());
 			countSpinner.setMinimum( 1 );
 			countSpinner.setMaximum( 100 );
 			countSpinner.setSelection( 1 );
-			
+
 			//----------------------------------------------------------------------
 			Group options = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			options.setLayout(new GridLayout());
 			options.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			options.setText(TuxGuitar.getProperty("options"));
-			
+
 			final Button beforePosition = new Button(options,SWT.RADIO);
 			beforePosition.setText(TuxGuitar.getProperty("measure.add-before-current-position"));
-			
+
 			final Button afterPosition = new Button(options,SWT.RADIO);
 			afterPosition.setText(TuxGuitar.getProperty("measure.add-after-current-position"));
-			
+
 			final Button atEnd = new Button(options,SWT.RADIO);
 			atEnd.setText(TuxGuitar.getProperty("measure.add-at-end"));
 			atEnd.setSelection(true);
@@ -84,11 +79,12 @@ public void showDialog() {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					int number = 0;
 					int count = countSpinner.getSelection();
@@ -103,62 +99,65 @@ public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 150;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private void addMeasure( final int number , final int count ){
 		if(count > 0 && number > 0 && number <=  (getSongManager().getSong().countMeasureHeaders() + 1)){
 			new Thread(new Runnable() {
+				@Override
 				public void run() {
 					new SyncThread(new Runnable() {
+						@Override
 						public void run() {
 							UndoableJoined undoable = new UndoableJoined();
 							for( int i = 0 ; i < count ; i ++ ){
 								//comienza el undoable
 								UndoableAddMeasure mUndoable = UndoableAddMeasure.startUndo( ( number + i ) );
-								
+
 								getSongManager().addNewMeasure( ( number + i ) );
-								
+
 								//termia el undoable
 								undoable.addUndoableEdit(mUndoable.endUndo());
-								
+
 							}
 							updateTablature();
-							
+
 							int trackNumber = getEditor().getTablature().getCaret().getTrack().getNumber();
 							int stringNumber = getEditor().getTablature().getCaret().getStringNumber();
 							long start = getSongManager().getMeasureHeader(number).getStart();
 							getEditor().getTablature().getCaret().update(trackNumber,start,stringNumber);
-							
+
 							//termia el undoable
 							addUndoableEdit( undoable.endUndo() );
-							
+
 							TuxGuitar.instance().getFileHistory().setUnsavedFile();
 							TuxGuitar.instance().updateCache(true);
 						}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/CleanMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/CleanMeasureAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/CleanMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/CleanMeasureAction.java
index e633f73a..5d09ab49 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/CleanMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/CleanMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -30,23 +27,21 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class CleanMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.clean";
-	
+
 	public CleanMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(TuxGuitar.instance().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGTrackImpl track = getEditor().getTablature().getCaret().getTrack();
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
@@ -54,15 +49,15 @@ public void showDialog(Shell shell) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("measure.clean"));
-			
+
 			//----------------------------------------------------------------------
 			Group range = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			range.setLayout(new GridLayout(2,false));
 			range.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			range.setText(TuxGuitar.getProperty("measure.clean"));
-			
+
 			int measureCount = getSongManager().getSong().countMeasureHeaders();
-			
+
 			Label fromLabel = new Label(range, SWT.NULL);
 			fromLabel.setText(TuxGuitar.getProperty("edit.from"));
 			final Spinner fromSpinner = new Spinner(range, SWT.BORDER);
@@ -70,7 +65,7 @@ public void showDialog(Shell shell) {
 			fromSpinner.setMinimum(1);
 			fromSpinner.setMaximum(measureCount);
 			fromSpinner.setSelection(measure.getNumber());
-			
+
 			Label toLabel = new Label(range, SWT.NULL);
 			toLabel.setText(TuxGuitar.getProperty("edit.to"));
 			final Spinner toSpinner = new Spinner(range, SWT.BORDER);
@@ -78,15 +73,16 @@ public void showDialog(Shell shell) {
 			toSpinner.setMinimum(1);
 			toSpinner.setMaximum(measureCount);
 			toSpinner.setSelection(measure.getNumber());
-			
+
 			final int minSelection = 1;
 			final int maxSelection = track.countMeasures();
-			
+
 			fromSpinner.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					int fromSelection = fromSpinner.getSelection();
 					int toSelection = toSpinner.getSelection();
-					
+
 					if(fromSelection < minSelection){
 						fromSpinner.setSelection(minSelection);
 					}else if(fromSelection > toSelection){
@@ -95,6 +91,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			toSpinner.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					int toSelection = toSpinner.getSelection();
 					int fromSelection = fromSpinner.getSelection();
@@ -105,75 +102,77 @@ public void widgetSelected(SelectionEvent e) {
 					}
 				}
 			});
-			
+
 			//------------------BUTTONS--------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					cleanMeasures(fromSpinner.getSelection(),toSpinner.getSelection());
 					dialog.dispose();
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 180;
 		return data;
 	}
-	
+
 	public void cleanMeasures(int m1,int m2){
 		if(m1 > 0 && m1 <= m2){
 			//comienza el undoable
 			UndoableJoined undoable = new UndoableJoined();
-			
+
 			Caret caret = getEditor().getTablature().getCaret();
 			for( int number = m1 ; number <= m2 ; number ++ ){
 				TGMeasure measure = getSongManager().getTrackManager().getMeasure( caret.getTrack() , number );
 				if( measure != null ){
 					//comienza el undoable
 					UndoableMeasureGeneric mUndoable = UndoableMeasureGeneric.startUndo( measure );
-					
+
 					getSongManager().getMeasureManager().cleanMeasure( measure );
-					
+
 					//termia el undoable
 					undoable.addUndoableEdit( mUndoable.endUndo( measure ) );
 				}
 			}
-			
+
 			//termia el undoable
 			if( ! undoable.isEmpty()){
 				addUndoableEdit(undoable.endUndo());
 			}
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			updateTablature();
 		}
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/CopyMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/CopyMeasureAction.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/CopyMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/CopyMeasureAction.java
index 097c6b96..890c91f4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/CopyMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/CopyMeasureAction.java
@@ -1,12 +1,10 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
@@ -20,6 +18,7 @@
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.actions.Action;
 import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.clipboard.MeasureTransfer;
 import org.herac.tuxguitar.app.clipboard.MeasureTransferable;
 import org.herac.tuxguitar.app.util.DialogUtils;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
@@ -27,26 +26,24 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class CopyMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.copy";
-	
+
 	protected boolean copyAllTracks;
-	
+
 	public CopyMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
-		
+
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGTrackImpl track = getEditor().getTablature().getCaret().getTrack();
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
@@ -54,15 +51,15 @@ public void showDialog(Shell shell) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("edit.copy"));
-			
+
 			//----------------------------------------------------------------------
 			Group range = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			range.setLayout(new GridLayout(2,false));
 			range.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			range.setText(TuxGuitar.getProperty("edit.copy"));
-			
+
 			int measureCount = getSongManager().getSong().countMeasureHeaders();
-			
+
 			Label fromLabel = new Label(range, SWT.NULL);
 			fromLabel.setText(TuxGuitar.getProperty("edit.from"));
 			final Spinner fromSpinner = new Spinner(range, SWT.BORDER);
@@ -70,7 +67,7 @@ public void showDialog(Shell shell) {
 			fromSpinner.setMinimum(1);
 			fromSpinner.setMaximum(measureCount);
 			fromSpinner.setSelection(measure.getNumber());
-			
+
 			Label toLabel = new Label(range, SWT.NULL);
 			toLabel.setText(TuxGuitar.getProperty("edit.to"));
 			final Spinner toSpinner = new Spinner(range, SWT.BORDER);
@@ -78,15 +75,16 @@ public void showDialog(Shell shell) {
 			toSpinner.setMinimum(1);
 			toSpinner.setMaximum(measureCount);
 			toSpinner.setSelection(measure.getNumber());
-			
+
 			final int minSelection = 1;
 			final int maxSelection = track.countMeasures();
-			
+
 			fromSpinner.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					int fromSelection = fromSpinner.getSelection();
 					int toSelection = toSpinner.getSelection();
-					
+
 					if(fromSelection < minSelection){
 						fromSpinner.setSelection(minSelection);
 					}else if(fromSelection > toSelection){
@@ -95,6 +93,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			toSpinner.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					int toSelection = toSpinner.getSelection();
 					int fromSelection = fromSpinner.getSelection();
@@ -112,11 +111,12 @@ public void widgetSelected(SelectionEvent e) {
 				checkComposites.setLayout(new GridLayout());
 				checkComposites.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 				checkComposites.setText(TuxGuitar.getProperty("options"));
-				
+
 				final Button allTracks = new Button(checkComposites,SWT.CHECK);
 				allTracks.setText(TuxGuitar.getProperty("edit.all-tracks"));
 				allTracks.setSelection(this.copyAllTracks);
 				allTracks.addSelectionListener(new SelectionAdapter() {
+					@Override
 					public void widgetSelected(SelectionEvent e) {
 						CopyMeasureAction.this.copyAllTracks = allTracks.getSelection();
 					}
@@ -126,49 +126,53 @@ public void widgetSelected(SelectionEvent e) {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					copyMeasures(fromSpinner.getSelection(),toSpinner.getSelection(),CopyMeasureAction.this.copyAllTracks);
 					dialog.dispose();
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 180;
 		return data;
 	}
-	
+
 	protected void copyMeasures(int m1,int m2,boolean allTracks){
 		if(m1 > 0 && m1 <= m2){
 			MeasureTransferable transferable = new MeasureTransferable(getEditor(),m1,m2,allTracks);
-			getEditor().getClipBoard().addTransferable(transferable);
+			Object[] objects = {transferable};
+			Transfer[] transfers = {MeasureTransfer.getInstance()};
+			TuxGuitar.instance().getClipBoard().setContents(objects, transfers);
 		}
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoFirstMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoFirstMeasureAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoFirstMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoFirstMeasureAction.java
index 3126b09c..2087d0fd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoFirstMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoFirstMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -15,18 +12,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GoFirstMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.go-first";
-	
+
 	public GoFirstMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			TuxGuitar.instance().getTransport().gotoFirst();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoLastMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoLastMeasureAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoLastMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoLastMeasureAction.java
index 602f99ad..e94b0dbb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoLastMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoLastMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -15,18 +12,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GoLastMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.go-last";
-	
+
 	public GoLastMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			TuxGuitar.instance().getTransport().gotoLast();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
index 1771734c..1fa44c20 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoNextMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -16,41 +13,39 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GoNextMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.go-next";
-	
+
 	public GoNextMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		//si es el ultimo compas, agrego uno nuevo
 		if(getSongManager().getTrackManager().isLastMeasure(caret.getMeasure())){
 			int number = (getSongManager().getSong().countMeasureHeaders() + 1);
-			
+
 			//comienza el undoable
 			UndoableAddMeasure undoable = UndoableAddMeasure.startUndo(number);
-			
+
 			this.getSongManager().addNewMeasure(number);
 			this.fireUpdate(number);
 			this.moveToNext();
-			
+
 			//termia el undoable
 			this.addUndoableEdit(undoable.endUndo());
 		}
 		else{
 			this.moveToNext();
 		}
-		
+
 		return 0;
 	}
-	
+
 	private void moveToNext(){
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			TuxGuitar.instance().getTransport().gotoNext();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
index 41d56022..e4fdab2b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/GoPreviousMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -15,18 +12,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GoPreviousMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.go-previous";
-	
+
 	public GoPreviousMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			TuxGuitar.instance().getTransport().gotoPrevious();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/PasteMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/PasteMeasureAction.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/PasteMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/PasteMeasureAction.java
index c3256bbe..6d7dd524 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/PasteMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/PasteMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -21,74 +18,73 @@
 import org.herac.tuxguitar.app.actions.Action;
 import org.herac.tuxguitar.app.actions.ActionData;
 import org.herac.tuxguitar.app.clipboard.CannotInsertTransferException;
+import org.herac.tuxguitar.app.clipboard.MeasureTransfer;
 import org.herac.tuxguitar.app.clipboard.MeasureTransferable;
-import org.herac.tuxguitar.app.clipboard.Transferable;
 import org.herac.tuxguitar.app.util.DialogUtils;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class PasteMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.paste";
-	
+
 	public PasteMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
 		if (measure != null) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("edit.paste"));
-			
+
 			//-----------------COUNT------------------------
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout(2,false));
 			group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			group.setText(TuxGuitar.getProperty("edit.paste"));
-			
+
 			Label countLabel = new Label(group, SWT.NULL);
 			countLabel.setText(TuxGuitar.getProperty("edit.paste.count"));
-			
+
 			final Spinner countSpinner = new Spinner(group, SWT.BORDER);
 			countSpinner.setLayoutData(getSpinnerData());
 			countSpinner.setMinimum( 1 );
 			countSpinner.setMaximum( 100 );
 			countSpinner.setSelection( 1 );
-			
+
 			//----------------------------------------------------------------------
 			Group options = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			options.setLayout(new GridLayout());
 			options.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			options.setText(TuxGuitar.getProperty("options"));
-			
+
 			final Button replace = new Button(options,SWT.RADIO);
 			replace.setText(TuxGuitar.getProperty("edit.paste.replace-mode"));
 			replace.setSelection(true);
-			
+
 			final Button insert = new Button(options,SWT.RADIO);
 			insert.setText(TuxGuitar.getProperty("edit.paste.insert-mode"));
-			
+
 			//------------------BUTTONS--------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					int pasteMode = 0;
 					int pasteCount = countSpinner.getSelection();
@@ -98,50 +94,54 @@ public void widgetSelected(SelectionEvent arg0) {
 						pasteMode = MeasureTransferable.TRANSFER_TYPE_INSERT;
 					}
 					pasteMeasures( pasteMode , pasteCount);
-					
+
 					dialog.dispose();
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 150;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void pasteMeasures(int pasteMode, int pasteCount){
 		try {
 			if( pasteMode > 0 && pasteCount > 0 ){
-				Transferable transferable = getEditor().getClipBoard().getTransferable();
-				if(transferable instanceof MeasureTransferable){
-					((MeasureTransferable)transferable).setTransferType( pasteMode );
-					((MeasureTransferable)transferable).setPasteCount( pasteCount );
-					
-					transferable.insertTransfer();
-					
+				Object content = TuxGuitar.instance().getClipBoard().getContents(MeasureTransfer.getInstance());
+				MeasureTransferable transferable = (MeasureTransferable) content;
+				if(transferable != null){
+					transferable.setTransferType( pasteMode );
+					transferable.setPasteCount( pasteCount );
+
+					transferable.insertTransfer(getEditor());
+
 					updateTablature();
+				} else {
+					System.err.println("Unsupported clipboard content");
 				}
 			}
 		} catch (CannotInsertTransferException ex) {
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/RemoveMeasureAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/RemoveMeasureAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/RemoveMeasureAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/RemoveMeasureAction.java
index e9681fcb..1a8b01d3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/measure/RemoveMeasureAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/measure/RemoveMeasureAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.measure;
 
@@ -30,23 +27,21 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class RemoveMeasureAction extends Action{
-	
+
 	public static final String NAME = "action.measure.remove";
-	
+
 	public RemoveMeasureAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell()/*,e*/);
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell/*,final TypedEvent event*/) {
 		TGTrackImpl track = getEditor().getTablature().getCaret().getTrack();
 		TGMeasureImpl measure = getEditor().getTablature().getCaret().getMeasure();
@@ -54,15 +49,15 @@ public void showDialog(Shell shell/*,final TypedEvent event*/) {
 			final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("edit.delete"));
-			
+
 			//----------------------------------------------------------------------
 			Group range = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			range.setLayout(new GridLayout(2,false));
 			range.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			range.setText(TuxGuitar.getProperty("edit.delete"));
-			
+
 			int measureCount = getSongManager().getSong().countMeasureHeaders();
-			
+
 			Label fromLabel = new Label(range, SWT.NULL);
 			fromLabel.setText(TuxGuitar.getProperty("edit.from"));
 			final Spinner fromSpinner = new Spinner(range, SWT.BORDER);
@@ -70,7 +65,7 @@ public void showDialog(Shell shell/*,final TypedEvent event*/) {
 			fromSpinner.setMinimum(1);
 			fromSpinner.setMaximum(measureCount);
 			fromSpinner.setSelection(measure.getNumber());
-			
+
 			Label toLabel = new Label(range, SWT.NULL);
 			toLabel.setText(TuxGuitar.getProperty("edit.to"));
 			final Spinner toSpinner = new Spinner(range, SWT.BORDER);
@@ -78,15 +73,16 @@ public void showDialog(Shell shell/*,final TypedEvent event*/) {
 			toSpinner.setMinimum(1);
 			toSpinner.setMaximum(measureCount);
 			toSpinner.setSelection(measure.getNumber());
-			
+
 			final int minSelection = 1;
 			final int maxSelection = track.countMeasures();
-			
+
 			fromSpinner.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					int fromSelection = fromSpinner.getSelection();
 					int toSelection = toSpinner.getSelection();
-					
+
 					if(fromSelection < minSelection){
 						fromSpinner.setSelection(minSelection);
 					}else if(fromSelection > toSelection){
@@ -95,6 +91,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			});
 			toSpinner.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					int toSelection = toSpinner.getSelection();
 					int fromSelection = fromSpinner.getSelection();
@@ -109,49 +106,51 @@ public void widgetSelected(SelectionEvent e) {
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					removeMeasures(fromSpinner.getSelection(),toSpinner.getSelection()/*,event*/);
 					dialog.dispose();
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 180;
 		return data;
 	}
-	
+
 	protected void removeMeasures(int m1,int m2/*,TypedEvent event*/){
 		if(m1 > 0 && m1 <= m2 && m2 <= getSongManager().getSong().countMeasureHeaders()){
 			Caret caret = getEditor().getTablature().getCaret();
-			
+
 			if(m1 == 1 && m2 == getSongManager().getSong().countMeasureHeaders()){
 				//TuxGuitar.instance().getAction(NewFileAction.NAME).process(event);
 				TuxGuitar.instance().newSong();
@@ -160,19 +159,19 @@ protected void removeMeasures(int m1,int m2/*,TypedEvent event*/){
 			//comienza el undoable
 			UndoableRemoveMeasure undoable = new UndoableRemoveMeasure(m1,m2);
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			//borro los compases
 			getSongManager().removeMeasureHeaders(m1,m2);
-			
+
 			updateTablature();
-			
+
 			int measureCount = getSongManager().getSong().countMeasureHeaders();
 			if(caret.getMeasure().getNumber() > measureCount){
 				TGTrack track = getSongManager().getTrack(caret.getTrack().getNumber());
 				TGMeasure measure = getSongManager().getTrackManager().getMeasure(track,measureCount);
 				caret.update(track.getNumber(),measure.getStart(),1);
 			}
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeNoteAction.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeNoteAction.java
index 0c64354c..d770b905 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -18,67 +15,66 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeNoteAction extends Action {
-	
+
 	private static final String NAME = "action.note.general.change";
-	
+
 	public static final String PROPERTY_TRACK = "track";
 	public static final String PROPERTY_START = "start";
 	public static final String PROPERTY_FRET = "fret";
 	public static final String PROPERTY_STRING = "string";
 	public static final String PROPERTY_VELOCITY = "velocity";
 	public static final String PROPERTY_DURATION = "duration";
-	
+
 	public ChangeNoteAction() {
 		this(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING);
 	}
-	
+
 	protected ChangeNoteAction(String name, int flags) {
 		super(name, flags);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		long start = getPropertyStart(actionData);
 		int fret = getPropertyFret(actionData);
 		int string = getPropertyString(actionData);
 		int velocity = getPropertyVelocity(actionData);
 		TGDuration tgDuration = getPropertyDuration(actionData);
-		
+
 		TGTrack track = getSongManager().getTrack( getPropertyTrack(actionData) );
 		TGMeasure measure = (track != null ? getSongManager().getTrackManager().getMeasureAt(track, start) : null);
-		
+
 		if( track != null && measure != null && fret >= 0) {
 			this.addNote(measure, tgDuration, start, fret, string, velocity);
 			this.fireUpdate(measure.getNumber());
-			
+
 			return AUTO_UPDATE;
 		}
-		
+
 		return 0;
 	}
-	
+
 	private void addNote(TGMeasure measure,TGDuration duration, long start, int value,int string, int velocity) {
 		TGNote note = getSongManager().getFactory().newNote();
 		note.setValue(value);
 		note.setVelocity(velocity);
 		note.setString(string);
-		
+
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		getSongManager().getMeasureManager().addNote(measure,start,note,duration.clone(getSongManager().getFactory()), getEditor().getTablature().getCaret().getVoice());
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		//reprodusco las notas en el pulso
 		TuxGuitar.instance().playBeat(getEditor().getTablature().getCaret().getSelectedBeat());
 	}
-	
+
 	private long getPropertyStart(ActionData actionData){
 		Object propertyValue = actionData.get(PROPERTY_START);
 		if( propertyValue instanceof Long ){
@@ -86,7 +82,7 @@ private long getPropertyStart(ActionData actionData){
 		}
 		return getEditor().getTablature().getCaret().getPosition();
 	}
-	
+
 	private int getPropertyTrack(ActionData actionData){
 		Object propertyValue = actionData.get(PROPERTY_TRACK);
 		if( propertyValue instanceof Integer ){
@@ -94,7 +90,7 @@ private int getPropertyTrack(ActionData actionData){
 		}
 		return getEditor().getTablature().getCaret().getTrack().getNumber();
 	}
-	
+
 	private int getPropertyVelocity(ActionData actionData){
 		Object propertyValue = actionData.get(PROPERTY_VELOCITY);
 		if( propertyValue instanceof Integer ){
@@ -102,7 +98,7 @@ private int getPropertyVelocity(ActionData actionData){
 		}
 		return getEditor().getTablature().getCaret().getVelocity();
 	}
-	
+
 	private TGDuration getPropertyDuration(ActionData actionData){
 		Object propertyValue = actionData.get(PROPERTY_DURATION);
 		if( propertyValue instanceof TGDuration ){
@@ -110,7 +106,7 @@ private TGDuration getPropertyDuration(ActionData actionData){
 		}
 		return getEditor().getTablature().getCaret().getDuration();
 	}
-	
+
 	private int getPropertyString(ActionData actionData){
 		Object propertyValue = actionData.get(PROPERTY_STRING);
 		if( propertyValue instanceof Integer ){
@@ -118,7 +114,7 @@ private int getPropertyString(ActionData actionData){
 		}
 		return getEditor().getTablature().getCaret().getSelectedString().getNumber();
 	}
-	
+
 	private int getPropertyFret(ActionData actionData){
 		Object propertyValue = actionData.get(PROPERTY_FRET);
 		if( propertyValue instanceof Integer ){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeTiedNoteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeTiedNoteAction.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeTiedNoteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeTiedNoteAction.java
index eb18075e..f3eebd0d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeTiedNoteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeTiedNoteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -20,26 +17,24 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTiedNoteAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.tied";
-	
+
 	public ChangeTiedNoteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		if(caret.getSelectedNote() != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			getSongManager().getMeasureManager().changeTieNote(caret.getSelectedNote());
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}else{
@@ -48,17 +43,17 @@ protected int execute(ActionData actionData){
 			note.setVelocity(caret.getVelocity());
 			note.setString(caret.getSelectedString().getNumber());
 			note.setTiedNote(true);
-			
+
 			TGDuration duration = getSongManager().getFactory().newDuration();
 			caret.getDuration().copy(duration);
-			
+
 			setTiedNoteValue(note,caret);
-			
+
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			getSongManager().getMeasureManager().addNote(caret.getSelectedBeat(),note,duration, caret.getVoice());
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 		}
@@ -66,7 +61,7 @@ protected int execute(ActionData actionData){
 		updateTablature();
 		return 0;
 	}
-	
+
 	private void setTiedNoteValue(TGNote note,Caret caret){
 		TGMeasure measure = caret.getMeasure();
 		TGVoice voice = getSongManager().getMeasureManager().getPreviousVoice( measure.getBeats(), caret.getSelectedBeat(), caret.getVoice());
@@ -77,9 +72,9 @@ private void setTiedNoteValue(TGNote note,Caret caret){
 					return;
 				}
 				// Check if is there any note at same string.
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while( it.hasNext() ){
-					TGNote current = (TGNote) it.next();
+					TGNote current = it.next();
 					if(current.getString() == note.getString()){
 						note.setValue( current.getValue() );
 						return;
@@ -93,7 +88,8 @@ private void setTiedNoteValue(TGNote note,Caret caret){
 			}
 		}
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeVelocityAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeVelocityAction.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeVelocityAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeVelocityAction.java
index fdfced5b..bf3abe98 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ChangeVelocityAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ChangeVelocityAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -14,42 +11,41 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeVelocityAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.velocity";
-	
+
 	public static final String PROPERTY_VELOCITY = "velocity";
-	
+
 	public ChangeVelocityAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Object propertyVelocity = actionData.get(PROPERTY_VELOCITY);
 		if( propertyVelocity instanceof Integer){
 			int velocity = ((Integer)propertyVelocity).intValue();
-			
+
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			Caret caret = getEditor().getTablature().getCaret();
 			caret.setVelocity(velocity);
 			getSongManager().getMeasureManager().changeVelocity(velocity,caret.getMeasure(),caret.getPosition(),caret.getSelectedString().getNumber());
 			updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
-			
+
 			return AUTO_UPDATE;
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/CleanBeatAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/CleanBeatAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/CleanBeatAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/CleanBeatAction.java
index d791bce0..6fe49824 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/CleanBeatAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/CleanBeatAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -14,35 +11,34 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class CleanBeatAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.clean-beat";
-	
+
 	public CleanBeatAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGBeat beat = getEditor().getTablature().getCaret().getSelectedBeat();
 		if( beat != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			//getSongManager().getMeasureManager().removeAllComponentsAt(caret.getMeasure(),caret.getSelectedComponent().getStart());
 			getSongManager().getMeasureManager().cleanBeat(beat);
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 			updateTablature();
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/DecrementNoteSemitoneAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/DecrementNoteSemitoneAction.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/DecrementNoteSemitoneAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/DecrementNoteSemitoneAction.java
index ebf6fdb7..8d6b0a74 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/DecrementNoteSemitoneAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/DecrementNoteSemitoneAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -14,24 +11,22 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DecrementNoteSemitoneAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.decrement-semitone";
-	
+
 	public DecrementNoteSemitoneAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			if(getSongManager().getMeasureManager().moveSemitoneDown(getEditor().getTablature().getCaret().getMeasure(),note.getVoice().getBeat().getStart(),note.getString())){
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
@@ -41,7 +36,8 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/DeleteNoteOrRestAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/DeleteNoteOrRestAction.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/DeleteNoteOrRestAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/DeleteNoteOrRestAction.java
index 27dbd95a..ddfe10bd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/DeleteNoteOrRestAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/DeleteNoteOrRestAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -16,23 +13,21 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DeleteNoteOrRestAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.delete-note-or-rest";
-	
+
 	public DeleteNoteOrRestAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
 		TGVoice voice = beat.getVoice( caret.getVoice() );
@@ -44,14 +39,15 @@ protected int execute(ActionData actionData){
 			int string = caret.getSelectedString().getNumber();
 			getSongManager().getMeasureManager().removeNote(caret.getMeasure(),beat.getStart(), caret.getVoice(), string);
 		}
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
 		updateTablature();
-		
+
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/IncrementNoteSemitoneAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/IncrementNoteSemitoneAction.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/IncrementNoteSemitoneAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/IncrementNoteSemitoneAction.java
index a08870c0..cf452d45 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/IncrementNoteSemitoneAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/IncrementNoteSemitoneAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -14,24 +11,22 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class IncrementNoteSemitoneAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.increment-semitone";
-	
+
 	public IncrementNoteSemitoneAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			if(getSongManager().getMeasureManager().moveSemitoneUp(getEditor().getTablature().getCaret().getMeasure(),note.getVoice().getBeat().getStart(),note.getString())){
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
@@ -41,7 +36,8 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/InsertRestBeatAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/InsertRestBeatAction.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/InsertRestBeatAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/InsertRestBeatAction.java
index d4d576ed..4c2be68d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/InsertRestBeatAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/InsertRestBeatAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -15,18 +12,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class InsertRestBeatAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.insert-rest";
-	
+
 	public InsertRestBeatAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -34,7 +29,7 @@ protected int execute(ActionData actionData){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			if(beat.getVoice(caret.getVoice()).isEmpty()){
 				getSongManager().getMeasureManager().addSilence(beat, caret.getDuration().clone(getSongManager().getFactory()), caret.getVoice());
 			}
@@ -45,13 +40,14 @@ protected int execute(ActionData actionData){
 			}
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
-			
+
 			updateTablature();
-			
+
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsCustomAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsCustomAction.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsCustomAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsCustomAction.java
index 294997aa..c4435cef 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsCustomAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsCustomAction.java
@@ -33,14 +33,14 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class MoveBeatsCustomAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.move-custom";
-	
+
 	private static final ComboItem[] MOVE_DIRECTIONS = new ComboItem[]{
 		new ComboItem( TuxGuitar.getProperty("beat.move-custom.dialog.direction.right"), new Integer(1) ),
 		new ComboItem( TuxGuitar.getProperty("beat.move-custom.dialog.direction.left") , new Integer(-1) ),
 	};
-	
+
 	private static final ComboItem[] MOVE_DURATIONS = new ComboItem[]{
 		new ComboItem( TuxGuitar.getProperty("duration.whole") , new Integer(TGDuration.WHOLE) ),
 		new ComboItem( TuxGuitar.getProperty("duration.half") , new Integer(TGDuration.HALF) ),
@@ -50,58 +50,59 @@ public class MoveBeatsCustomAction extends Action{
 		new ComboItem( TuxGuitar.getProperty("duration.thirtysecond") , new Integer(TGDuration.THIRTY_SECOND) ),
 		new ComboItem( TuxGuitar.getProperty("duration.sixtyfourth") , new Integer(TGDuration.SIXTY_FOURTH) ),
 	};
-	
+
 	private static final ComboItem[] MOVE_DURATION_TYPES = new ComboItem[]{
 		new ComboItem( TuxGuitar.getProperty("beat.move-custom.dialog.duration.type.normal") , new boolean[]{ false, false} ),
 		new ComboItem( TuxGuitar.getProperty("duration.dotted") , new boolean[]{ true, false} ),
 		new ComboItem( TuxGuitar.getProperty("duration.doubledotted") , new boolean[]{ false, true} ),
 	};
-	
+
 	private static final ComboItem[] MOVE_DURATION_DIVISIONS = createDivisionTypeComboItems();
-	
+
 	public MoveBeatsCustomAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		this.showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	protected void showDialog(Shell shell){
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("beat.move-custom.dialog.title"));
-		
+
 		//-------direction-------------------------------------
 		Group direction = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		direction.setLayout(new GridLayout(2,false));
 		direction.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		direction.setText(TuxGuitar.getProperty("beat.move-custom.dialog.direction-tip"));
-		
+
 		Label directionLabel = new Label(direction, SWT.RIGHT);
 		directionLabel.setText(TuxGuitar.getProperty("beat.move-custom.dialog.direction") + ":");
-		
+
 		final Combo directionCombo = new Combo(direction, SWT.DROP_DOWN | SWT.READ_ONLY);
 		for( int i = 0 ; i < MOVE_DIRECTIONS.length ; i ++ ){
 			directionCombo.add( MOVE_DIRECTIONS[i].getLabel() );
 		}
 		directionCombo.select( 0 );
 		directionCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		//-------move 1------------------------------------------
-		final List move1Controls = new ArrayList();
-		
+		final List<Control> move1Controls = new ArrayList<Control>();
+
 		Group move1 = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		move1.setLayout(new GridLayout(2,false));
 		move1.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		move1.setText(TuxGuitar.getProperty("beat.move-custom.dialog.move-1.tip"));
-		
+
 		Label count1Label = new Label(move1, SWT.RIGHT);
 		count1Label.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,true,true));
 		count1Label.setText(TuxGuitar.getProperty("beat.move-custom.dialog.count") + ":");
-		
+
 		final Spinner count1Spinner = new Spinner(move1 , SWT.BORDER );
 		count1Spinner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		count1Spinner.setMinimum(0);
@@ -109,16 +110,17 @@ protected void showDialog(Shell shell){
 		count1Spinner.setIncrement(1);
 		count1Spinner.setSelection(0);
 		count1Spinner.addSelectionListener( new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateControls( count1Spinner.getSelection(), move1Controls );
 			}
 		});
-		
+
 		Label duration1Label = new Label(move1, SWT.RIGHT);
 		duration1Label.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,true,true));
 		duration1Label.setText(TuxGuitar.getProperty("beat.move-custom.dialog.duration") + ":");
 		move1Controls.add( duration1Label );
-		
+
 		final Combo duration1Combo = new Combo(move1, SWT.DROP_DOWN | SWT.READ_ONLY);
 		duration1Combo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		for( int i = 0 ; i < MOVE_DURATIONS.length ; i ++ ){
@@ -126,34 +128,35 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		duration1Combo.select( 0 );
 		move1Controls.add( duration1Combo );
-		
+
 		updateControls( 0, move1Controls );
 		//-------move 2------------------------------------------
-		final List move2Controls = new ArrayList();
-		
+		final List<Control> move2Controls = new ArrayList<Control>();
+
 		Group move2 = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		move2.setLayout(new GridLayout(2,false));
 		move2.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		move2.setText(TuxGuitar.getProperty("beat.move-custom.dialog.move-2.tip"));
-		
+
 		Label count2Label = new Label(move2, SWT.RIGHT);
 		count2Label.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,true,true));
 		count2Label.setText(TuxGuitar.getProperty("beat.move-custom.dialog.count") + ":");
-		
+
 		final Spinner count2Spinner = new Spinner(move2 , SWT.BORDER );
 		count2Spinner.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		count2Spinner.setSelection(0);
 		count2Spinner.addSelectionListener( new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateControls( count2Spinner.getSelection(), move2Controls );
 			}
 		});
-		
+
 		Label duration2Label = new Label(move2, SWT.RIGHT);
 		duration2Label.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,true,true));
 		duration2Label.setText(TuxGuitar.getProperty("beat.move-custom.dialog.duration") + ":");
 		move2Controls.add( duration2Label );
-		
+
 		final Combo duration2Combo = new Combo(move2, SWT.DROP_DOWN | SWT.READ_ONLY);
 		duration2Combo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		for( int i = 0 ; i < MOVE_DURATIONS.length ; i ++ ){
@@ -161,12 +164,12 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		duration2Combo.select( 2 );
 		move2Controls.add( duration2Combo );
-		
+
 		Label type2Label = new Label(move2, SWT.RIGHT);
 		type2Label.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,true,true));
 		type2Label.setText(TuxGuitar.getProperty("beat.move-custom.dialog.duration.type") + ":");
 		move2Controls.add( type2Label );
-		
+
 		final Combo type2Combo = new Combo(move2, SWT.DROP_DOWN | SWT.READ_ONLY);
 		type2Combo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		for( int i = 0 ; i < MOVE_DURATION_TYPES.length ; i ++ ){
@@ -174,12 +177,12 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		type2Combo.select( 0 );
 		move2Controls.add( type2Combo );
-		
+
 		Label division2Label = new Label(move2, SWT.RIGHT);
 		division2Label.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,true,true));
 		division2Label.setText(TuxGuitar.getProperty("beat.move-custom.dialog.duration.division-type") + ":");
 		move2Controls.add( division2Label );
-		
+
 		final Combo division2Combo = new Combo(move2, SWT.DROP_DOWN | SWT.READ_ONLY);
 		division2Combo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		for( int i = 0 ; i < MOVE_DURATION_DIVISIONS.length ; i ++ ){
@@ -187,26 +190,28 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		division2Combo.select( 0 );
 		move2Controls.add( division2Combo );
-		
+
 		updateControls( 0, move2Controls );
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				final int directionValue = getDirection( directionCombo.getSelectionIndex() );
 				final long duration1 = getDuration1(duration1Combo.getSelectionIndex(), count1Spinner.getSelection());
 				final long duration2 = getDuration2(duration2Combo.getSelectionIndex(),type2Combo.getSelectionIndex(),division2Combo.getSelectionIndex(), count2Spinner.getSelection());
 				final long duration = ( ( duration1 + duration2 ) * directionValue );
-				
+
 				dialog.dispose();
 				try {
 					TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+						@Override
 						public void run() throws Throwable {
 							ActionLock.lock();
 							TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -221,35 +226,36 @@ public void run() throws Throwable {
 				}
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected int getDirection( int index ){
 		if( index >= 0 && index < MOVE_DIRECTIONS.length ){
 			return ((Integer)MOVE_DIRECTIONS[ index ].getValue()).intValue();
 		}
 		return 0;
 	}
-	
+
 	protected long getDuration1( int index , int count ){
 		if( count > 0 && index >= 0 && index < MOVE_DURATIONS.length ){
 			TGDuration duration = getSongManager().getFactory().newDuration();
@@ -262,7 +268,7 @@ protected long getDuration1( int index , int count ){
 		}
 		return 0;
 	}
-	
+
 	protected long getDuration2( int index , int indexType , int indexDivision, int count ){
 		if( count > 0 && index >= 0 && index < MOVE_DURATIONS.length ){
 			if( indexType >= 0 && indexType < MOVE_DURATION_TYPES.length && indexDivision >= 0 && indexDivision < MOVE_DURATION_DIVISIONS.length ){
@@ -277,63 +283,63 @@ protected long getDuration2( int index , int indexType , int indexDivision, int
 		}
 		return 0;
 	}
-	
-	protected void updateControls(int count, List controls){
-		Iterator it = controls.iterator();
+
+	protected void updateControls(int count, List<Control> controls){
+		Iterator<Control> it = controls.iterator();
 		while( it.hasNext() ){
-			Control control = (Control) it.next();
+			Control control = it.next();
 			control.setEnabled( count > 0 );
 		}
 	}
-	
+
 	protected int moveBeats( long theMove ){
-		Caret caret = getEditor().getTablature().getCaret();		
+		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
 		TGMeasure measure = caret.getMeasure();
 		TGTrack track = caret.getTrack();
 		if(beat != null && measure != null && track != null){
 			//comienza el undoable
 			UndoableTrackGeneric undoable = UndoableTrackGeneric.startUndo(track);
-			
+
 			getSongManager().getTrackManager().moveTrackBeats(track, measure.getStart(), beat.getStart(), theMove );
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			updateTablature();
 		}
 		return 0;
 	}
-	
-	protected static class ComboItem {		
+
+	protected static class ComboItem {
 		private String label;
 		private Object value;
-		
+
 		public ComboItem(String label, Object value){
 			this.label = label;
 			this.value = value;
 		}
-		
+
 		public String getLabel() {
 			return this.label;
 		}
-		
+
 		public Object getValue() {
 			return this.value;
 		}
 	}
-	
+
 	private static ComboItem[] createDivisionTypeComboItems(){
 		TGDivisionType[] types = TGDivisionType.ALTERED_DIVISION_TYPES;
-		
+
 		ComboItem[] comboItems = new ComboItem[ types.length + 1 ];
 		comboItems[0] = new ComboItem( TuxGuitar.getProperty("beat.move-custom.dialog.duration.division-type.normal") , new int[] { 1  , 1} );
-		for( int i = 0 ; i < types.length ; i ++ ){ 
+		for( int i = 0 ; i < types.length ; i ++ ){
 			comboItems[i + 1] = new ComboItem(new Integer(types[i].getEnters()).toString(),new int[]{types[i].getEnters(),types[i].getTimes()});
 		}
-		
+
 		return comboItems;
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsLeftAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsLeftAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsLeftAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsLeftAction.java
index 38ebb4cd..16f1cbe3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsLeftAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsLeftAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -18,20 +15,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MoveBeatsLeftAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.move-left";
-	
+
 	public MoveBeatsLeftAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();		
+		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
 		TGMeasure measure = caret.getMeasure();
 		TGTrack track = caret.getTrack();
@@ -39,14 +34,14 @@ protected int execute(ActionData actionData){
 		if(beat != null && measure != null && track != null && duration != null){
 			//comienza el undoable
 			UndoableTrackGeneric undoable = UndoableTrackGeneric.startUndo(track);
-			
+
 			getSongManager().getTrackManager().moveTrackBeats(track, measure.getStart(), beat.getStart(), -duration.getTime() );
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			updateTablature();
 		}
 		return 0;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsRightAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsRightAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsRightAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsRightAction.java
index 7c99130d..e4fb0244 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/MoveBeatsRightAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/MoveBeatsRightAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -18,20 +15,18 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MoveBeatsRightAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.move-right";
-	
+
 	public MoveBeatsRightAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();		
+		Caret caret = getEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
 		TGMeasure measure = caret.getMeasure();
 		TGTrack track = caret.getTrack();
@@ -39,14 +34,14 @@ protected int execute(ActionData actionData){
 		if(beat != null && measure != null && track != null && duration != null){
 			//comienza el undoable
 			UndoableTrackGeneric undoable = UndoableTrackGeneric.startUndo(track);
-			
+
 			getSongManager().getTrackManager().moveTrackBeats(track, measure.getStart(), beat.getStart(), duration.getTime() );
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			updateTablature();
 		}
 		return 0;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/RemoveUnusedVoiceAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/RemoveUnusedVoiceAction.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/RemoveUnusedVoiceAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/RemoveUnusedVoiceAction.java
index 7e807d67..f2ee7ba6 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/RemoveUnusedVoiceAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/RemoveUnusedVoiceAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -15,38 +12,37 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class RemoveUnusedVoiceAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.remove-unused-voice";
-	
+
 	public RemoveUnusedVoiceAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		if( caret.getMeasure() != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			for( int v = 0 ; v < TGBeat.MAX_VOICES ; v ++ ){
 				if( caret.getVoice() != v ){
 					getSongManager().getMeasureManager().removeMeasureVoices( caret.getMeasure(), v );
 				}
 			}
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo());
 			updateTablature();
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetNoteFretNumberAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetNoteFretNumberAction.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetNoteFretNumberAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetNoteFretNumberAction.java
index c89c1fd3..ca84dd60 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetNoteFretNumberAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetNoteFretNumberAction.java
@@ -4,31 +4,32 @@
 import org.herac.tuxguitar.app.editors.tab.Caret;
 
 public class SetNoteFretNumberAction extends ChangeNoteAction {
-	
+
 	public static final String NAME_PREFIX = "action.note.general.set-fret-number-";
-	
+
 	private static final int DELAY = 1000;
-	
+
 	private static int lastAddedFret;
 	private static int lastAddedString;
 	private static long lastAddedStart;
 	private static long lastAddedTime;
-	
+
 	private int number;
-	
+
 	public SetNoteFretNumberAction(int number){
 		super(getActionName(number), AUTO_LOCK | AUTO_UNLOCK | KEY_BINDING_AVAILABLE | DISABLE_ON_PLAYING);
 		this.number = number;
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
-		
+
 		int fret = this.number;
 		int string = caret.getSelectedString().getNumber();
 		long start = caret.getPosition();
 		long time = System.currentTimeMillis();
-		
+
 		if( this.number < 10 ){
 			if( lastAddedStart == start && lastAddedString == string ){
 				if (lastAddedFret > 0 && lastAddedFret < 10 && time <  ( lastAddedTime + DELAY ) ){
@@ -43,14 +44,14 @@ protected int execute(ActionData actionData){
 			lastAddedString = string;
 			lastAddedTime = time;
 		}
-		
+
 		actionData.put(PROPERTY_START, new Long(start) );
 		actionData.put(PROPERTY_FRET, new Integer(fret));
 		actionData.put(PROPERTY_STRING, new Integer(string));
-		
+
 		return super.execute(actionData);
 	}
-	
+
 	public static final String getActionName(int number){
 		return (NAME_PREFIX + number);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetStrokeDownAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetStrokeDownAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetStrokeDownAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetStrokeDownAction.java
index c1b0a32a..2c1760a8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetStrokeDownAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetStrokeDownAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -16,18 +13,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetStrokeDownAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.set-stroke-down";
-	
+
 	public SetStrokeDownAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGBeat beat = getEditor().getTablature().getCaret().getSelectedBeat();
 		if(beat != null && !beat.isRestBeat()){
@@ -36,7 +31,7 @@ protected int execute(ActionData actionData){
 			if( editor.getStatus() != StrokeEditor.STATUS_CANCEL ){
 				int direction = ( editor.getStatus() == StrokeEditor.STATUS_CLEAN ? TGStroke.STROKE_NONE : TGStroke.STROKE_DOWN );
 				int value = editor.getValue();
-				
+
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 				if(getSongManager().getMeasureManager().setStroke( beat.getMeasure(), beat.getStart(), value, direction ) ){
@@ -49,7 +44,8 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetStrokeUpAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetStrokeUpAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetStrokeUpAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetStrokeUpAction.java
index 73998ff6..b3348c93 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetStrokeUpAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetStrokeUpAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -16,18 +13,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetStrokeUpAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.set-stroke-up";
-	
+
 	public SetStrokeUpAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGBeat beat = getEditor().getTablature().getCaret().getSelectedBeat();
 		if(beat != null && !beat.isRestBeat()){
@@ -36,7 +31,7 @@ protected int execute(ActionData actionData){
 			if( editor.getStatus() != StrokeEditor.STATUS_CANCEL ){
 				int direction = ( editor.getStatus() == StrokeEditor.STATUS_CLEAN ? TGStroke.STROKE_NONE : TGStroke.STROKE_UP );
 				int value = editor.getValue();
-				
+
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
 				if(getSongManager().getMeasureManager().setStroke( beat.getMeasure(), beat.getStart(), value, direction ) ){
@@ -49,7 +44,8 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceAutoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceAutoAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceAutoAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceAutoAction.java
index 7a39bb2b..0b05be62 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceAutoAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceAutoAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -20,18 +17,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetVoiceAutoAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.voice-auto";
-	
+
 	public SetVoiceAutoAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeatImpl beat = caret.getSelectedBeat();
@@ -41,23 +36,24 @@ protected int execute(ActionData actionData){
 			if(!voice.isEmpty() && !voice.isRestVoice() && group != null ){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
-				Iterator it = group.getVoices().iterator();
+
+				Iterator<TGVoiceImpl> it = group.getVoices().iterator();
 				while( it.hasNext() ){
-					TGVoice current = (TGVoice)it.next();
+					TGVoice current = it.next();
 					getSongManager().getMeasureManager().changeVoiceDirection(current, TGVoice.DIRECTION_NONE);
 				}
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
-				
+
 				updateTablature();
 			}
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceDownAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceDownAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceDownAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceDownAction.java
index 443e9438..9dc2ad15 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceDownAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceDownAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -20,18 +17,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetVoiceDownAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.voice-down";
-	
+
 	public SetVoiceDownAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeatImpl beat = caret.getSelectedBeat();
@@ -41,23 +36,24 @@ protected int execute(ActionData actionData){
 			if(!voice.isEmpty() && !voice.isRestVoice() && group != null ){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
-				Iterator it = group.getVoices().iterator();
+
+				Iterator<TGVoiceImpl> it = group.getVoices().iterator();
 				while( it.hasNext() ){
-					TGVoice current = (TGVoice)it.next();
+					TGVoice current = it.next();
 					getSongManager().getMeasureManager().changeVoiceDirection(current, TGVoice.DIRECTION_DOWN);
 				}
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
-				
+
 				updateTablature();
 			}
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceUpAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceUpAction.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceUpAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceUpAction.java
index 89d62055..21cda0a2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/SetVoiceUpAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/SetVoiceUpAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -20,18 +17,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SetVoiceUpAction extends Action{
-	
+
 	public static final String NAME = "action.beat.general.voice-up";
-	
+
 	public SetVoiceUpAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGBeatImpl beat = caret.getSelectedBeat();
@@ -41,23 +36,24 @@ protected int execute(ActionData actionData){
 			if(!voice.isEmpty() && !voice.isRestVoice() && group != null ){
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
-				Iterator it = group.getVoices().iterator();
+
+				Iterator<TGVoiceImpl> it = group.getVoices().iterator();
 				while( it.hasNext() ){
-					TGVoice current = (TGVoice)it.next();
+					TGVoice current = it.next();
 					getSongManager().getMeasureManager().changeVoiceDirection(current, TGVoice.DIRECTION_UP);
 				}
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
-				
+
 				updateTablature();
 			}
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ShiftNoteDownAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ShiftNoteDownAction.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ShiftNoteDownAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ShiftNoteDownAction.java
index 801a4918..7e847be2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ShiftNoteDownAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ShiftNoteDownAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -14,28 +11,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ShiftNoteDownAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.shift-down";
-	
+
 	public ShiftNoteDownAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			int nextString = getSongManager().getMeasureManager().shiftNoteDown(getEditor().getTablature().getCaret().getMeasure(),note.getVoice().getBeat().getStart(),note.getString());
 			if(nextString > 0){
 				getEditor().getTablature().getCaret().setStringNumber(nextString);
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
@@ -44,7 +39,8 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ShiftNoteUpAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ShiftNoteUpAction.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ShiftNoteUpAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ShiftNoteUpAction.java
index f0bf94f3..b60e34d1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/note/ShiftNoteUpAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/note/ShiftNoteUpAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.note;
 
@@ -14,28 +11,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ShiftNoteUpAction extends Action{
-	
+
 	public static final String NAME = "action.note.general.shift-up";
-	
+
 	public ShiftNoteUpAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGNote note = getEditor().getTablature().getCaret().getSelectedNote();
 		if(note != null){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			int nextString = getSongManager().getMeasureManager().shiftNoteUp(getEditor().getTablature().getCaret().getMeasure(),note.getVoice().getBeat().getStart(),note.getString());
 			if(nextString > 0){
 				getEditor().getTablature().getCaret().setStringNumber(nextString);
-				
+
 				//termia el undoable
 				addUndoableEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
@@ -44,7 +39,8 @@ protected int execute(ActionData actionData){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public void updateTablature() {
 		fireUpdate(getEditor().getTablature().getCaret().getMeasure().getNumber());
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditConfigAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditConfigAction.java
new file mode 100644
index 00000000..6e4636cb
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditConfigAction.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.settings;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.system.config.TGConfigEditor;
+
+/**
+ * @author julian
+ */
+public class EditConfigAction extends Action{
+
+	public static final String NAME = "action.settings.configure";
+
+	public EditConfigAction() {
+		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE );
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		new TGConfigEditor().showDialog(TuxGuitar.instance().getShell());
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditKeyBindingsAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditKeyBindingsAction.java
new file mode 100644
index 00000000..df17fceb
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditKeyBindingsAction.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.settings;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.system.keybindings.editor.KeyBindingEditor;
+
+/**
+ * @author julian
+ */
+public class EditKeyBindingsAction extends Action{
+
+	public static final String NAME = "action.settings.key-bindings";
+
+	public EditKeyBindingsAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		new KeyBindingEditor().show(TuxGuitar.instance().getShell());
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditPluginsAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditPluginsAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditPluginsAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditPluginsAction.java
index f9f47147..ad841610 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditPluginsAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/settings/EditPluginsAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.settings;
 
@@ -36,63 +33,62 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class EditPluginsAction extends Action{
-	
+
 	public static final String NAME = "action.settings.plugins";
-	
+
 	private static final int TABLE_WIDTH = 400;
 	private static final int TABLE_HEIGHT = 300;
-	
+
 	public EditPluginsAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog();
 		return 0;
 	}
-	
+
 	public void showDialog() {
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		dialog.setText(TuxGuitar.getProperty("plugins"));
-		
+
 		final Table table = new Table(dialog, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.CHECK | SWT.H_SCROLL | SWT.V_SCROLL);
 		table.setLayoutData(new GridData(TABLE_WIDTH,TABLE_HEIGHT));
 		table.setHeaderVisible(true);
-		
+
 		final TableColumn columnEnabled = new TableColumn(table, SWT.LEFT);
 		final TableColumn columnPlugin = new TableColumn(table, SWT.LEFT);
 		columnEnabled.setText(TuxGuitar.getProperty("plugin.column.enabled"));
 		columnPlugin.setText(TuxGuitar.getProperty("plugin.column.name"));
 		columnEnabled.setWidth( (TABLE_WIDTH / 4) );
 		columnPlugin.setWidth( (TABLE_WIDTH - (TABLE_WIDTH / 4)) );
-		
-		Iterator it = TuxGuitar.instance().getPluginManager().getPlugins().iterator();
+
+		Iterator<TGPlugin> it = TuxGuitar.instance().getPluginManager().getPlugins().iterator();
 		while(it.hasNext()){
-			TGPlugin plugin = (TGPlugin)it.next();
+			TGPlugin plugin = it.next();
 			TableItem item = new TableItem(table, SWT.NONE);
 			item.setData(plugin);
 			item.setText(1,((plugin.getName() != null)?plugin.getName():"Undefined Plugin"));
 			item.setChecked(TuxGuitar.instance().getPluginManager().isEnabled(plugin));
 		}
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonSetup = new Button(buttons, SWT.PUSH);
 		buttonSetup.setText(TuxGuitar.getProperty("configure"));
 		buttonSetup.setLayoutData(getButtonData());
 		buttonSetup.setEnabled(false);
 		buttonSetup.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TableItem item = table.getItem(table.getSelectionIndex());
 				if(item != null && item.getData() instanceof TGPluginSetup){
@@ -104,12 +100,13 @@ public void widgetSelected(SelectionEvent arg0) {
 				}
 			}
 		});
-		
+
 		final Button buttonInfo = new Button(buttons, SWT.PUSH);
 		buttonInfo.setText(TuxGuitar.getProperty("info"));
 		buttonInfo.setLayoutData(getButtonData());
 		buttonInfo.setEnabled(false);
 		buttonInfo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TableItem item = table.getItem(table.getSelectionIndex());
 				if(item != null && item.getData() instanceof TGPlugin){
@@ -121,17 +118,19 @@ public void widgetSelected(SelectionEvent arg0) {
 				}
 			}
 		});
-		
+
 		Button buttonClose = new Button(buttons, SWT.PUSH);
 		buttonClose.setText(TuxGuitar.getProperty("close"));
 		buttonClose.setLayoutData(getButtonData());
 		buttonClose.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		table.addListener (SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent (Event event) {
 				buttonInfo.setEnabled(false);
 				buttonSetup.setEnabled(false);
@@ -148,45 +147,46 @@ public void handleEvent (Event event) {
 				}
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonInfo );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	public void showInfo(Shell parent,TGPlugin plugin) {
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		dialog.setText(TuxGuitar.getProperty("plugins"));
-		
+
 		Composite info = new Composite(dialog,SWT.NONE);
 		info.setLayout(new GridLayout(2,false));
-		
+
 		showInfoString(info,TuxGuitar.getProperty("name") + ":",plugin.getName());
 		showInfoString(info,TuxGuitar.getProperty("version") + ":",plugin.getVersion());
 		showInfoString(info,TuxGuitar.getProperty("author") + ":",plugin.getAuthor());
 		showInfoString(info,TuxGuitar.getProperty("description") + ":",plugin.getDescription());
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout());
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		Button buttonExit = new Button(buttons, SWT.PUSH);
 		buttonExit.setText(TuxGuitar.getProperty("exit"));
 		buttonExit.setLayoutData(getButtonData());
 		buttonExit.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonExit );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	private void showInfoString(Composite parent,String key,String value){
 		Label labelKey = new Label(parent,SWT.LEFT);
 		Label labelValue = new Label(parent,SWT.LEFT | SWT.WRAP);
@@ -196,20 +196,21 @@ private void showInfoString(Composite parent,String key,String value){
 		labelKey.setText(key);
 		labelValue.setText( (value != null && value.length() > 0)?value:TuxGuitar.getProperty("plugin.unknown-value"));
 	}
-	
+
 	private void setBold(Label label){
 		FontData[] fontDatas = label.getFont().getFontData();
 		if(fontDatas.length > 0){
 			final Font font = new Font(label.getDisplay(),fontDatas[0].getName(),(fontDatas[0].getHeight()),SWT.BOLD);
 			label.setFont(font);
 			label.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					font.dispose();
 				}
 			});
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/system/DisposeAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/system/DisposeAction.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/system/DisposeAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/system/DisposeAction.java
index aded2057..7b7c66a4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/system/DisposeAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/system/DisposeAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.system;
 
@@ -22,23 +19,22 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class DisposeAction extends Action {
-	
+
 	public static final String NAME = "action.system.dispose";
-	
+
 	public DisposeAction() {
 		super(NAME, AUTO_LOCK);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TypedEvent e = (TypedEvent)actionData.get(ActionAdapter.PROPERTY_TYPED_EVENT);
-		
+
 		if(e instanceof ShellEvent){
 			TuxGuitar.instance().getPlayer().reset();
-			
+
 			if(TuxGuitar.instance().getFileHistory().isUnsavedFile()){
 				ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("file.save-changes-question"));
 				confirm.setDefaultStatus( ConfirmDialog.STATUS_CANCEL );
@@ -53,11 +49,12 @@ protected int execute(ActionData actionData){
 					}
 					TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 					new Thread(new Runnable() {
+						@Override
 						public void run() {
 							if(!TuxGuitar.isDisposed()){
 								FileActionUtils.save(fileName);
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
-								
+
 								exit();
 							}
 						}
@@ -69,10 +66,11 @@ public void run() {
 		}
 		return 0;
 	}
-	
+
 	protected void exit(){
 		try {
 			TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					TuxGuitar.instance().lock();
 					closeModules();
@@ -85,10 +83,10 @@ public void run() throws Throwable {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	protected void saveConfig(){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
-		
+
 		config.setProperty(TGConfigKeys.LAYOUT_MODE,getEditor().getTablature().getViewLayout().getMode());
 		config.setProperty(TGConfigKeys.LAYOUT_STYLE,getEditor().getTablature().getViewLayout().getStyle());
 		config.setProperty(TGConfigKeys.SHOW_PIANO,!TuxGuitar.instance().getPianoEditor().isDisposed());
@@ -102,15 +100,15 @@ protected void saveConfig(){
 		config.setProperty(TGConfigKeys.HEIGHT,TuxGuitar.instance().getShell().getClientArea().height);
 		config.setProperty(TGConfigKeys.EDITOR_MOUSE_MODE,getEditor().getTablature().getEditorKit().getMouseMode());
 		config.setProperty(TGConfigKeys.MATRIX_GRIDS,TuxGuitar.instance().getMatrixEditor().getGrids());
-		
+
 		TuxGuitar.instance().getConfig().save();
 	}
-	
+
 	protected void closeModules(){
 		TuxGuitar.instance().getPlayer().close();
 		TuxGuitar.instance().getPluginManager().closePlugins();
 	}
-	
+
 	protected void dispose(){
 		TuxGuitar.instance().getTable().dispose();
 		TuxGuitar.instance().getSongManager().clearSong();
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/ScaleAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/ScaleAction.java
new file mode 100644
index 00000000..ebdc35db
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/ScaleAction.java
@@ -0,0 +1,26 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.tools;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.tools.scale.ScaleEditor;
+
+/**
+ * @author julian
+ */
+public class ScaleAction extends Action{
+
+	public static final String NAME = "action.tools.scale";
+
+	public ScaleAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		new ScaleEditor().show();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/TGBrowserAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/TGBrowserAction.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/TGBrowserAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/TGBrowserAction.java
index 07d23f73..81f21a75 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/TGBrowserAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/TGBrowserAction.java
@@ -5,13 +5,14 @@
 import org.herac.tuxguitar.app.actions.ActionData;
 
 public class TGBrowserAction extends Action{
-	
+
 	public static final String NAME = "action.tools.browser";
-	
+
 	public TGBrowserAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		if(TuxGuitar.instance().getBrowser().isDisposed()){
 			TuxGuitar.instance().getBrowser().show();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/TransposeAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/TransposeAction.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/TransposeAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/TransposeAction.java
index 8600729b..1236e128 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/TransposeAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/tools/TransposeAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.tools;
 
@@ -34,86 +31,85 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TransposeAction extends Action{
-	
+
 	public static final String NAME = "action.tools.transpose";
-	
+
 	public TransposeAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		showDialog(getEditor().getTablature().getShell());
 		return 0;
 	}
-	
+
 	public void showDialog(Shell shell) {
 		final int[] transpositions = new int[25];
 		for( int i = 0 ; i < transpositions.length ; i ++ ){
 			transpositions[ i ] = ( i - ( transpositions.length / 2 ) );
 		}
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("tools.transpose"));
-		
+
 		//-----------------TEMPO------------------------
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(2,false));
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("tools.transpose"));
-		
-		
+
+
 		Label transpositionLabel = new Label(group, SWT.NULL);
 		transpositionLabel.setText(TuxGuitar.getProperty("tools.transpose.semitones"));
 		transpositionLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo transpositionCombo = new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY );
 		transpositionCombo.setLayoutData( new GridData(SWT.FILL, SWT.FILL, true , true) );
 		for( int i = 0 ; i < transpositions.length ; i ++ ){
 			transpositionCombo.add( Integer.toString( transpositions[i]) );
 		}
 		transpositionCombo.select( ( transpositions.length / 2 ) );
-		
+
 		//------------------OPTIONS--------------------------
 		Group options = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		options.setLayout(new GridLayout());
 		options.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		options.setText(TuxGuitar.getProperty("options"));
-		
+
 		final Button applyToAllMeasuresButton = new Button(options, SWT.RADIO);
 		applyToAllMeasuresButton.setText(TuxGuitar.getProperty("tools.transpose.apply-to-track"));
 		applyToAllMeasuresButton.setSelection(true);
-		
+
 		final Button applyToCurrentMeasureButton = new Button(options, SWT.RADIO);
 		applyToCurrentMeasureButton.setText(TuxGuitar.getProperty("tools.transpose.apply-to-measure"));
-		
+
 		final Button applyToAllTracksButton = new Button(options, SWT.CHECK);
 		applyToAllTracksButton.setText(TuxGuitar.getProperty("tools.transpose.apply-to-all-tracks"));
 		applyToAllTracksButton.setSelection(true);
-		
+
 		final Button applyToChordsButton = new Button(options, SWT.CHECK);
 		applyToChordsButton.setText(TuxGuitar.getProperty("tools.transpose.apply-to-chords"));
 		applyToChordsButton.setSelection(true);
-		
+
 		final Button tryKeepStringButton = new Button(options, SWT.CHECK);
 		tryKeepStringButton.setText(TuxGuitar.getProperty("tools.transpose.try-keep-strings"));
 		tryKeepStringButton.setSelection(true);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int transpositionIndex =  transpositionCombo.getSelectionIndex() ;
 				if( transpositionIndex >= 0 && transpositionIndex < transpositions.length ){
@@ -122,10 +118,11 @@ public void widgetSelected(SelectionEvent arg0) {
 					final boolean applyToChords = applyToChordsButton.getSelection();
 					final boolean applyToAllTracks = applyToAllTracksButton.getSelection();
 					final boolean applyToAllMeasures = applyToAllMeasuresButton.getSelection();
-					
+
 					dialog.dispose();
 					try {
 						TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+							@Override
 							public void run() throws Throwable {
 								ActionLock.lock();
 								TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -143,35 +140,36 @@ public void run() throws Throwable {
 				}
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	public void transpose( int transposition , boolean tryKeepString , boolean applyToChords , boolean applyToAllMeasures , boolean applyToAllTracks) {
 		//comienza el undoable
 		UndoableJoined undoableJoined = new UndoableJoined();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		if( applyToAllMeasures ){
-			
+
 			if( applyToAllTracks ){
 				TGSong song = getSongManager().getSong();
 				for( int i = 0 ; i < song.countTracks() ; i ++ ){
@@ -180,7 +178,7 @@ public void transpose( int transposition , boolean tryKeepString , boolean apply
 			} else {
 				transposeTrack( undoableJoined , caret.getTrack(), transposition , tryKeepString , applyToChords);
 			}
-			
+
 			updateTablature();
 		}else{
 			if( applyToAllTracks ){
@@ -197,33 +195,33 @@ public void transpose( int transposition , boolean tryKeepString , boolean apply
 			}
 			fireUpdate( caret.getMeasure().getNumber() );
 		}
-		
+
 		//termia el undoable
 		if( !undoableJoined.isEmpty() ){
 			addUndoableEdit(undoableJoined.endUndo());
 		}
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 	}
-	
+
 	public void transposeMeasure( UndoableJoined undoableJoined , TGMeasure measure, int transposition , boolean tryKeepString , boolean applyToChords ) {
 		if( transposition != 0 && !getSongManager().isPercussionChannel(measure.getTrack().getChannelId()) ){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo( measure );
-			
+
 			getSongManager().getMeasureManager().transposeNotes( measure , transposition , tryKeepString , applyToChords , -1 );
-			
+
 			//termia el undoable
 			undoableJoined.addUndoableEdit( undoable.endUndo( measure ) );
 		}
 	}
-	
+
 	public void transposeTrack( UndoableJoined undoableJoined , TGTrack track, int transposition , boolean tryKeepString , boolean applyToChords ) {
 		if( transposition != 0 && !getSongManager().isPercussionChannel(track.getChannelId()) ){
 			//comienza el undoable
 			UndoableTrackGeneric undoable = UndoableTrackGeneric.startUndo( track );
-			
+
 			getSongManager().getTrackManager().transposeNotes( track , transposition , tryKeepString , applyToChords, -1 );
-			
+
 			//termia el undoable
 			undoableJoined.addUndoableEdit( undoable.endUndo( track ) );
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/AddTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/AddTrackAction.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/AddTrackAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/AddTrackAction.java
index b89b0901..d527df1c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/AddTrackAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/AddTrackAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -15,32 +12,30 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class AddTrackAction extends Action{
-	
+
 	public static final String NAME = "action.track.add";
-	
+
 	public AddTrackAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableAddTrack undoable = UndoableAddTrack.startUndo();
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
-		
+
 		TGTrack track = getSongManager().addTrack();
 		updateTablature();
 		caret.update(track.getNumber(),caret.getPosition(),1);
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo(track));
-		
+
 		return 0;
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/ChangeTrackMuteAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/ChangeTrackMuteAction.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/ChangeTrackMuteAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/ChangeTrackMuteAction.java
index c68f4010..7f6f6368 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/ChangeTrackMuteAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/ChangeTrackMuteAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -14,29 +11,27 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTrackMuteAction extends Action{
-	
+
 	public static final String NAME = "action.track.change-mute";
-	
+
 	public ChangeTrackMuteAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGTrack track = getEditor().getTablature().getCaret().getTrack();
 		if( track != null ){
 			//comienza el undoable
 			UndoableTrackSoloMute undoable = UndoableTrackSoloMute.startUndo(track);
-			
+
 			getSongManager().getTrackManager().changeMute(track, !track.isMute());
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			if (TuxGuitar.instance().getPlayer().isRunning()) {
 				TuxGuitar.instance().getPlayer().updateTracks();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/ChangeTrackSoloAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/ChangeTrackSoloAction.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/ChangeTrackSoloAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/ChangeTrackSoloAction.java
index fa220cfd..1cf7beda 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/ChangeTrackSoloAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/ChangeTrackSoloAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -14,29 +11,27 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChangeTrackSoloAction extends Action{
-	
+
 	public static final String NAME = "action.track.change-solo";
-	
+
 	public ChangeTrackSoloAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGTrack track = getEditor().getTablature().getCaret().getTrack();
 		if( track != null ){
 			//comienza el undoable
 			UndoableTrackSoloMute undoable = UndoableTrackSoloMute.startUndo(track);
-			
+
 			getSongManager().getTrackManager().changeSolo(track, !track.isSolo());
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
-			
+
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			if (TuxGuitar.instance().getPlayer().isRunning()) {
 				TuxGuitar.instance().getPlayer().updateTracks();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/CloneTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/CloneTrackAction.java
similarity index 78%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/CloneTrackAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/CloneTrackAction.java
index fa2914c0..0e690cd6 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/CloneTrackAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/CloneTrackAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -14,31 +11,29 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class CloneTrackAction extends Action{
-	
+
 	public static final String NAME = "action.track.clone";
-	
+
 	public CloneTrackAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableCloneTrack undoable = UndoableCloneTrack.startUndo();
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
-		
+
 		getSongManager().cloneTrack(caret.getTrack());
 		updateTablature();
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/EditLyricsAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/EditLyricsAction.java
new file mode 100644
index 00000000..2e33ddd6
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/EditLyricsAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.track;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class EditLyricsAction extends Action{
+
+	public static final String NAME = "action.track.lyrics";
+
+	public EditLyricsAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(TuxGuitar.instance().getLyricEditor().isDisposed()){
+			TuxGuitar.instance().getLyricEditor().show();
+		}else{
+			TuxGuitar.instance().getLyricEditor().dispose();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoFirstTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoFirstTrackAction.java
new file mode 100644
index 00000000..fb0e72b6
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoFirstTrackAction.java
@@ -0,0 +1,31 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.track;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.Caret;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+/**
+ * @author julian
+ */
+public class GoFirstTrackAction extends Action{
+
+	public static final String NAME = "action.track.go-first";
+
+	public GoFirstTrackAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Caret caret = getEditor().getTablature().getCaret();
+		TGTrack track = getSongManager().getFirstTrack();
+		if(track != null){
+			caret.update(track.getNumber());
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoLastTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoLastTrackAction.java
new file mode 100644
index 00000000..02abe3a1
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoLastTrackAction.java
@@ -0,0 +1,31 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.track;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.Caret;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+/**
+ * @author julian
+ */
+public class GoLastTrackAction extends Action{
+
+	public static final String NAME = "action.track.go-last";
+
+	public GoLastTrackAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Caret caret = getEditor().getTablature().getCaret();
+		TGTrack track = getSongManager().getLastTrack();
+		if(track != null){
+			caret.update(track.getNumber());
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoNextTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoNextTrackAction.java
new file mode 100644
index 00000000..0656ce36
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoNextTrackAction.java
@@ -0,0 +1,31 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.track;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.editors.tab.Caret;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+/**
+ * @author julian
+ */
+public class GoNextTrackAction extends Action{
+
+	public static final String NAME = "action.track.go-next";
+
+	public GoNextTrackAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Caret caret = getEditor().getTablature().getCaret();
+		TGTrack track = getSongManager().getTrack(caret.getTrack().getNumber() + 1);
+		if(track != null){
+			caret.update(track.getNumber());
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoPreviousTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoPreviousTrackAction.java
similarity index 75%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoPreviousTrackAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoPreviousTrackAction.java
index 40103be7..636145f2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoPreviousTrackAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoPreviousTrackAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -13,18 +10,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GoPreviousTrackAction extends Action{
-	
+
 	public static final String NAME = "action.track.go-previous";
-	
+
 	public GoPreviousTrackAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
 		TGTrack track = getSongManager().getTrack(caret.getTrack().getNumber() - 1);
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoToTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoToTrackAction.java
new file mode 100644
index 00000000..fe93ce8c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/GoToTrackAction.java
@@ -0,0 +1,32 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.track;
+
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.graphics.control.TGTrackImpl;
+
+/**
+ * @author julian
+ */
+public class GoToTrackAction extends Action{
+
+	public static final String NAME = "action.track.goto";
+
+	public static final String PROPERTY_TRACK = "track";
+
+	public GoToTrackAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		Object data = actionData.get(PROPERTY_TRACK);
+		if(data instanceof TGTrackImpl){
+			TGTrackImpl track = (TGTrackImpl)data;
+			getEditor().getTablature().getCaret().update(track.getNumber());
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/MoveTrackDownAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/MoveTrackDownAction.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/MoveTrackDownAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/MoveTrackDownAction.java
index 4db07a75..f3657c25 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/MoveTrackDownAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/MoveTrackDownAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -15,28 +12,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MoveTrackDownAction extends Action{
-	
+
 	public static final String NAME = "action.track.move-down";
-	
+
 	public MoveTrackDownAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMoveTrackDown undoable = UndoableMoveTrackDown.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGTrack track = caret.getTrack();
-		
+
 		if(getSongManager().moveTrackDown(track)){
 			updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/MoveTrackUpAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/MoveTrackUpAction.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/MoveTrackUpAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/MoveTrackUpAction.java
index d8651e3a..d5b8419a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/MoveTrackUpAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/MoveTrackUpAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -15,28 +12,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MoveTrackUpAction extends Action{
-	
+
 	public static final String NAME = "action.track.move-up";
-	
+
 	public MoveTrackUpAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableMoveTrackUp undoable = UndoableMoveTrackUp.startUndo();
-		
+
 		Caret caret = getEditor().getTablature().getCaret();
 		TGTrack track = caret.getTrack();
-		
+
 		if(getSongManager().moveTrackUp(track)){
 			updateTablature();
-			
+
 			//termia el undoable
 			addUndoableEdit(undoable.endUndo(track));
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/RemoveTrackAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/RemoveTrackAction.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/track/RemoveTrackAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/RemoveTrackAction.java
index 91983bdd..f8c13844 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/RemoveTrackAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/RemoveTrackAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.track;
 
@@ -15,21 +12,19 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class RemoveTrackAction extends Action{
-	
+
 	public static final String NAME = "action.track.remove";
-	
+
 	public RemoveTrackAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		Caret caret = getEditor().getTablature().getCaret();
-		
+
 		if(getSongManager().getSong().countTracks() <= 1){
 			//TuxGuitar.instance().getAction(NewFileAction.NAME).process(e);
 			TuxGuitar.instance().newSong();
@@ -38,7 +33,7 @@ protected int execute(ActionData actionData){
 		//comienza el undoable
 		UndoableRemoveTrack undoable = UndoableRemoveTrack.startUndo();
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		TGTrackImpl track = caret.getTrack();
 		TGTrackImpl nextCaretTrack = (TGTrackImpl)getSongManager().getTrack(track.getNumber() + 1);
 		if(nextCaretTrack == null){
@@ -46,15 +41,15 @@ protected int execute(ActionData actionData){
 		}
 		getSongManager().removeTrack(track);
 		updateTablature();
-		
+
 		//move the caret to the next or previous track
 		if(nextCaretTrack != null){
 			caret.update(nextCaretTrack.getNumber(),getSongManager().getTrackManager().getMeasureAt(nextCaretTrack, caret.getMeasure().getStart()).getStart(),1);
 		}
-		
+
 		//termia el undoable
 		addUndoableEdit(undoable.endUndo());
-		
+
 		return 0;
 	}
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/TrackPropertiesAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/TrackPropertiesAction.java
new file mode 100644
index 00000000..85c02bf7
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/track/TrackPropertiesAction.java
@@ -0,0 +1,37 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.track;
+
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.util.DialogUtils;
+import org.herac.tuxguitar.app.widgets.TrackPropertiesDialog;
+import org.herac.tuxguitar.graphics.control.TGTrackImpl;
+
+/**
+ * @author julian
+ */
+public class TrackPropertiesAction extends Action {
+
+	public static final String NAME = "action.track.properties";
+
+	public TrackPropertiesAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		showDialog(getEditor().getTablature().getShell());
+		return 0;
+	}
+
+	private void showDialog(Shell shell) {
+		TGTrackImpl track = getEditor().getTablature().getCaret().getTrack();
+		if (track != null) {
+			Shell dialog = new TrackPropertiesDialog(shell, track);
+			DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
+		}
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportCountDownAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportCountDownAction.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportCountDownAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportCountDownAction.java
index 46424478..73be97f8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportCountDownAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportCountDownAction.java
@@ -5,13 +5,14 @@
 import org.herac.tuxguitar.app.actions.ActionData;
 
 public class TransportCountDownAction extends Action {
-	
+
 	public static final String NAME = "action.transport.count-down";
-	
+
 	public TransportCountDownAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TuxGuitar.instance().getPlayer().getCountDown().setEnabled(!TuxGuitar.instance().getPlayer().getCountDown().isEnabled());
 		return 0;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportMetronomeAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportMetronomeAction.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportMetronomeAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportMetronomeAction.java
index 6f749b09..e04d40e4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportMetronomeAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportMetronomeAction.java
@@ -5,13 +5,14 @@
 import org.herac.tuxguitar.app.actions.ActionData;
 
 public class TransportMetronomeAction extends Action {
-	
+
 	public static final String NAME = "action.transport.metronome";
-	
+
 	public TransportMetronomeAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TuxGuitar.instance().getPlayer().setMetronomeEnabled(!TuxGuitar.instance().getPlayer().isMetronomeEnabled());
 		return 0;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportModeAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportModeAction.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportModeAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportModeAction.java
index 77908c47..6d87fa2e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportModeAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportModeAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.transport;
 
@@ -35,64 +32,62 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
  */
 public class TransportModeAction extends Action {
-	
+
 	public static final String NAME = "action.transport.mode";
-	
+
 	protected static final int MIN_SELECTION = 1;
 	protected static final int MAX_SELECTION = 500;
 	protected static final int[] DEFAULT_PERCENTS = new int[]{25,50,75,100,125,150,175,200};
-	
+
 	protected Button simple;
 	protected Button simpleLoop;
 	protected Combo simplePercent;
-	
+
 	protected Button custom;
 	protected Spinner customFrom;
 	protected Spinner customTo;
 	protected Spinner customIncrement;
-	
+
 	protected MHeaderCombo loopSHeader;
 	protected MHeaderCombo loopEHeader;
-	
+
 	public TransportModeAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TypedEvent e = (TypedEvent)actionData.get(ActionAdapter.PROPERTY_TYPED_EVENT);
-		
+
 		this.showDialog(e.widget.getDisplay().getActiveShell(), TuxGuitar.instance().getPlayer().getMode());
 		return 0;
 	}
-	
+
 	public void showDialog(final Shell parent,final MidiPlayerMode mode) {
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("transport.mode"));
-		
+
 		// ----------------------------------------------------------------------
-		
+
 		Composite radios = new Composite(dialog, SWT.NONE);
 		radios.setLayout(new GridLayout());
 		radios.setLayoutData(getMainData());
-		
+
 		//---Simple---
 		this.simple = new Button(radios, SWT.RADIO);
 		this.simple.setText(TuxGuitar.getProperty("transport.mode.simple"));
 		this.simple.setSelection(mode.getType() == MidiPlayerMode.TYPE_SIMPLE);
 		RadioSelectionAdapter simpleAdapter = new RadioSelectionAdapter(this.simple);
-		
+
 		Group simpleGroup = new Group(radios, SWT.SHADOW_ETCHED_IN);
 		simpleGroup.setLayout(new GridLayout(2,false));
 		simpleGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		simpleGroup.setText(TuxGuitar.getProperty("transport.mode.simple"));
 		simpleAdapter.addControl(simpleGroup);
-		
+
 		simpleAdapter.addControl(makeLabel(simpleGroup, TuxGuitar.getProperty("transport.mode.simple.tempo-percent"),SWT.LEFT,1));
 		this.simplePercent = new Combo(simpleGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.simplePercent.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
@@ -103,28 +98,28 @@ public void showDialog(final Shell parent,final MidiPlayerMode mode) {
 			}
 		}
 		simpleAdapter.addControl(this.simplePercent);
-		
+
 		this.simpleLoop = new Button(simpleGroup, SWT.CHECK);
 		this.simpleLoop.setText(TuxGuitar.getProperty("transport.mode.simple.loop"));
 		this.simpleLoop.setSelection(mode.isLoop());
 		simpleAdapter.addControl(this.simpleLoop);
-		
+
 		GridData loopedData = new GridData(SWT.FILL,SWT.FILL,true,true);
 		loopedData.horizontalSpan = 2;
 		this.simpleLoop.setLayoutData(loopedData);
-		
+
 		//---Trainer---
 		this.custom = new Button(radios, SWT.RADIO);
 		this.custom.setText(TuxGuitar.getProperty("transport.mode.trainer"));
 		this.custom.setSelection(mode.getType() == MidiPlayerMode.TYPE_CUSTOM);
 		RadioSelectionAdapter customAdapter = new RadioSelectionAdapter(this.custom);
-		
+
 		Group trainerGroup = new Group(radios, SWT.SHADOW_ETCHED_IN);
 		trainerGroup.setLayout(new GridLayout(6,false));
 		trainerGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		trainerGroup.setText(TuxGuitar.getProperty("transport.mode.trainer"));
 		customAdapter.addControl(trainerGroup);
-		
+
 		customAdapter.addControl(makeLabel(trainerGroup, TuxGuitar.getProperty("composition.tempo"),SWT.LEFT,1));
 		this.customFrom = new Spinner(trainerGroup,SWT.BORDER);
 		this.customFrom.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -133,7 +128,7 @@ public void showDialog(final Shell parent,final MidiPlayerMode mode) {
 		this.customFrom.setSelection(mode.getCustomPercentFrom());
 		customAdapter.addControl(this.customFrom);
 		customAdapter.addControl(makeLabel(trainerGroup, "%",SWT.LEFT,1));
-		
+
 		customAdapter.addControl(makeLabel(trainerGroup, TuxGuitar.getProperty("edit.to"),SWT.RIGHT,1));
 		this.customTo = new Spinner(trainerGroup,SWT.BORDER);
 		this.customTo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -142,7 +137,7 @@ public void showDialog(final Shell parent,final MidiPlayerMode mode) {
 		this.customTo.setSelection(mode.getCustomPercentTo());
 		customAdapter.addControl(this.customTo);
 		customAdapter.addControl(makeLabel(trainerGroup, "%",SWT.LEFT,1));
-		
+
 		customAdapter.addControl(makeLabel(trainerGroup, TuxGuitar.getProperty("transport.mode.trainer.increment-description"),SWT.LEFT,4));
 		this.customIncrement = new Spinner(trainerGroup,SWT.BORDER);
 		this.customIncrement.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -151,34 +146,34 @@ public void showDialog(final Shell parent,final MidiPlayerMode mode) {
 		this.customIncrement.setSelection(mode.getCustomPercentIncrement());
 		customAdapter.addControl(this.customIncrement);
 		customAdapter.addControl(makeLabel(trainerGroup, "%",SWT.LEFT,1));
-		
+
 		SpinnerSelectionAdapter spinnerAdapter = new SpinnerSelectionAdapter(this.customFrom,this.customTo,this.customIncrement);
 		this.customFrom.addSelectionListener(spinnerAdapter);
 		this.customTo.addSelectionListener(spinnerAdapter);
 		this.customIncrement.addSelectionListener(spinnerAdapter);
-		
+
 		//--- Loop Range ---
 		MHeaderRangeStatus mHeaderRangeStatus = new MHeaderRangeStatus(this.simple,this.simpleLoop,this.custom);
-		
+
 		Group rangeGroup = new Group(radios, SWT.SHADOW_ETCHED_IN);
 		rangeGroup.setLayout(new GridLayout(2,false));
 		rangeGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		rangeGroup.setText(TuxGuitar.getProperty("transport.mode.loop-range"));
 		mHeaderRangeStatus.addControl( rangeGroup );
-		
+
 		mHeaderRangeStatus.addControl( makeLabel(rangeGroup, TuxGuitar.getProperty("transport.mode.loop-range.from"), SWT.LEFT, 1) );
 		this.loopSHeader = new MHeaderCombo(rangeGroup);
 		mHeaderRangeStatus.addControl( this.loopSHeader.getControl() );
-		
+
 		mHeaderRangeStatus.addControl( makeLabel(rangeGroup, TuxGuitar.getProperty("transport.mode.loop-range.to"), SWT.LEFT, 1) );
 		this.loopEHeader = new MHeaderCombo(rangeGroup);
 		mHeaderRangeStatus.addControl( this.loopEHeader.getControl() );
-		
+
 		MHeaderComboController mHeaderController = new MHeaderComboController(this.loopSHeader, this.loopEHeader);
 		mHeaderController.updateLoopSHeader( mode.getLoopSHeader() );
 		mHeaderController.updateLoopEHeader( mode.getLoopSHeader() , mode.getLoopEHeader() );
 		mHeaderController.appendListener();
-		
+
 		simpleAdapter.update();
 		customAdapter.update();
 		mHeaderRangeStatus.update();
@@ -186,44 +181,46 @@ public void showDialog(final Shell parent,final MidiPlayerMode mode) {
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2, false));
 		buttons.setLayoutData(new GridData(SWT.END, SWT.FILL, true, true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				updateMode(mode);
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData getMainData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 350;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private Label makeLabel(Composite parent,String text,int aligment,int horizontalSpan){
 		Label label = new Label(parent,SWT.CENTER | aligment);
 		label.setText(text);
@@ -232,7 +229,7 @@ private Label makeLabel(Composite parent,String text,int aligment,int horizontal
 		label.setLayoutData(data);
 		return label;
 	}
-	
+
 	protected void updateMode(MidiPlayerMode mode){
 		int type = (this.custom.getSelection())?MidiPlayerMode.TYPE_CUSTOM:MidiPlayerMode.TYPE_SIMPLE;
 		boolean loop = (type == MidiPlayerMode.TYPE_CUSTOM || (type == MidiPlayerMode.TYPE_SIMPLE && this.simpleLoop.getSelection()));
@@ -248,47 +245,49 @@ protected void updateMode(MidiPlayerMode mode){
 		//mode.setLoopEHeader( ( loop && this.loopEHeader.getSelectionIndex() > 0 ? this.loopEHeader.getSelectionIndex() : -1 ) );
 		mode.reset();
 	}
-	
+
 	private class RadioSelectionAdapter extends SelectionAdapter{
 		private Button control;
-		private List controls;
-		
+		private List<Control> controls;
+
 		public RadioSelectionAdapter(Button control) {
-			this.controls = new ArrayList();
+			this.controls = new ArrayList<Control>();
 			this.control = control;
 			this.control.addSelectionListener(this);
 		}
-		
+
 		public void addControl(Control control){
 			this.controls.add(control);
 		}
-		
+
 		public void update(){
 			boolean enabled = this.control.getSelection();
-			Iterator it = this.controls.iterator();
+			Iterator<Control> it = this.controls.iterator();
 			while(it.hasNext()){
-				Control control = (Control)it.next();
+				Control control = it.next();
 				control.setEnabled(enabled);
 			}
 		}
-		
+
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			update();
 		}
-		
+
 	}
-	
+
 	private class SpinnerSelectionAdapter extends SelectionAdapter{
 		private Spinner to;
 		private Spinner from;
 		private Spinner increment;
-		
+
 		public SpinnerSelectionAdapter(Spinner from,Spinner to, Spinner increment) {
 			this.from = from;
 			this.to = to;
 			this.increment = increment;
 		}
-		
+
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			if(e.widget.equals(this.from)){
 				if(this.from.getSelection() < MIN_SELECTION){
@@ -308,18 +307,18 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		}
 	}
-	
+
 	private class MHeaderRangeStatus extends SelectionAdapter{
-		
-		private List controls;
+
+		private List<Control> controls;
 		private boolean enabled;
-		
+
 		private Button simpleMode;
 		private Button simpleLoop;
 		private Button customLoop;
-		
+
 		public MHeaderRangeStatus(Button simpleMode, Button simpleLoop, Button customLoop) {
-			this.controls = new ArrayList();
+			this.controls = new ArrayList<Control>();
 			this.enabled = false;
 			this.simpleMode = simpleMode;
 			this.simpleLoop = simpleLoop;
@@ -328,11 +327,11 @@ public MHeaderRangeStatus(Button simpleMode, Button simpleLoop, Button customLoo
 			this.simpleLoop.addSelectionListener(this);
 			this.customLoop.addSelectionListener(this);
 		}
-		
+
 		public void addControl(Control control){
 			this.controls.add(control);
 		}
-		
+
 		public void update(){
 			// Check enabled
 			this.enabled = this.customLoop.getSelection();
@@ -341,51 +340,52 @@ public void update(){
 					this.enabled = this.simpleLoop.getSelection();
 				}
 			}
-			
+
 			// Update controls
-			Iterator it = this.controls.iterator();
+			Iterator<Control> it = this.controls.iterator();
 			while(it.hasNext()){
-				Control control = (Control)it.next();
+				Control control = it.next();
 				control.setEnabled( this.enabled );
 			}
 		}
-		
+
+		@Override
 		public void widgetSelected(SelectionEvent e) {
 			this.update();
 		}
 	}
-	
+
 	private class MHeaderCombo {
-		private List values;
+		private List<Integer> values;
 		private Combo combo;
-		
+
 		public MHeaderCombo( Composite parent ){
-			this.values = new ArrayList();
+			this.values = new ArrayList<Integer>();
 			this.combo = new Combo( parent, SWT.DROP_DOWN | SWT.READ_ONLY );
 			this.combo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		}
-		
+
 		public Combo getControl(){
 			return this.combo;
 		}
-		
+
 		public void clear(){
 			this.values.clear();
 			this.combo.removeAll();
 		}
-		
+
 		public void addItem( String text , int value ){
 			this.values.add( new Integer( value ) );
 			this.combo.add( text );
 		}
-		
+
 		public void addItem( TGMeasureHeader header ){
 			this.addItem( getItemText(header) , header.getNumber() );
 		}
-		
+
 		public void setValue( int value ){
 			for( int index = 0 ; index < this.values.size() ; index++ ){
-				Integer currentValue = (Integer) this.values.get( index );
+				Integer currentValue = this.values.get( index );
 				if( currentValue != null && currentValue.intValue() == value ){
 					int currentIndex = this.combo.getSelectionIndex();
 					if( currentIndex != index ){
@@ -394,18 +394,18 @@ public void setValue( int value ){
 				}
 			}
 		}
-		
+
 		public int getValue(){
 			int index = this.combo.getSelectionIndex();
 			if( index >= 0 && index < this.values.size() ){
-				Integer value = (Integer) this.values.get( index );
+				Integer value = this.values.get( index );
 				if( value != null ){
 					return value.intValue();
 				}
 			}
 			return -1;
 		}
-		
+
 		private String getItemText( TGMeasureHeader header ){
 			String text = ("#" + header.getNumber());
 			if( header.hasMarker() ){
@@ -414,16 +414,16 @@ private String getItemText( TGMeasureHeader header ){
 			return text;
 		}
 	}
-	
+
 	private class MHeaderComboController {
 		protected MHeaderCombo loopSHeader;
 		protected MHeaderCombo loopEHeader;
-		
+
 		public MHeaderComboController(MHeaderCombo loopSHeader, MHeaderCombo loopEHeader){
 			this.loopSHeader = loopSHeader;
 			this.loopEHeader = loopEHeader;
 		}
-		
+
 		public void updateLoopSHeader( int sHeader ){
 			TGSong song = TuxGuitar.instance().getSongManager().getSong();
 			this.loopSHeader.clear();
@@ -434,7 +434,7 @@ public void updateLoopSHeader( int sHeader ){
 			}
 			this.loopSHeader.setValue( sHeader );
 		}
-		
+
 		public void updateLoopEHeader( int sHeader , int eHeader ){
 			TGSong song = TuxGuitar.instance().getSongManager().getSong();
 			this.loopEHeader.clear();
@@ -447,7 +447,7 @@ public void updateLoopEHeader( int sHeader , int eHeader ){
 			}
 			this.loopEHeader.setValue( eHeader );
 		}
-		
+
 		public void updateLoopEHeader(){
 			int sHeader = this.loopSHeader.getValue();
 			int eHeader = this.loopEHeader.getValue();
@@ -456,9 +456,10 @@ public void updateLoopEHeader(){
 			}
 			this.updateLoopEHeader( sHeader , eHeader );
 		}
-		
+
 		public void appendListener(){
 			this.loopSHeader.getControl().addSelectionListener( new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					updateLoopEHeader();
 				}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
new file mode 100644
index 00000000..67413e56
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
@@ -0,0 +1,26 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.transport;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class TransportPlayAction extends Action {
+
+	public static final String NAME = "action.transport.play";
+
+	public TransportPlayAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TuxGuitar.instance().getTransport().play();
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportSetLoopEHeaderAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetLoopEHeaderAction.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportSetLoopEHeaderAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetLoopEHeaderAction.java
index 5f78656e..f79872b8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportSetLoopEHeaderAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetLoopEHeaderAction.java
@@ -7,13 +7,14 @@
 import org.herac.tuxguitar.song.models.TGMeasure;
 
 public class TransportSetLoopEHeaderAction extends Action {
-	
+
 	public static final String NAME = "action.transport.set-loop-end";
-	
+
 	public TransportSetLoopEHeaderAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGMeasure measure = getEditor().getTablature().getCaret().getMeasure();
 		if( measure != null ){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportSetLoopSHeaderAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetLoopSHeaderAction.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportSetLoopSHeaderAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetLoopSHeaderAction.java
index 21598c3e..51eef2dd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportSetLoopSHeaderAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportSetLoopSHeaderAction.java
@@ -7,13 +7,14 @@
 import org.herac.tuxguitar.song.models.TGMeasure;
 
 public class TransportSetLoopSHeaderAction extends Action {
-	
+
 	public static final String NAME = "action.transport.set-loop-start";
-	
+
 	public TransportSetLoopSHeaderAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TGMeasure measure = getEditor().getTablature().getCaret().getMeasure();
 		if( measure != null ){
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
new file mode 100644
index 00000000..ab04925b
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
@@ -0,0 +1,26 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.transport;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class TransportStopAction extends Action{
+
+	public static final String NAME = "action.transport.stop";
+
+	public TransportStopAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TuxGuitar.instance().getTransport().stop();
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowFretBoardAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowFretBoardAction.java
similarity index 76%
rename from TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowFretBoardAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowFretBoardAction.java
index 9e791b99..94890641 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowFretBoardAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowFretBoardAction.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.actions.view;
 
@@ -13,18 +10,16 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ShowFretBoardAction extends Action{
-	
+
 	public static final String NAME = "action.view.show-fretboard";
-	
+
 	public ShowFretBoardAction() {
 		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 	}
-	
+
+	@Override
 	protected int execute(ActionData actionData){
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		if(TuxGuitar.instance().getFretBoardEditor().isVisible()){
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowInstrumentsAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowInstrumentsAction.java
new file mode 100644
index 00000000..64c5ea1e
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowInstrumentsAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.view;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class ShowInstrumentsAction extends Action{
+
+	public static final String NAME = "action.view.show-instruments";
+
+	public ShowInstrumentsAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(TuxGuitar.instance().getChannelManager().isDisposed()){
+			TuxGuitar.instance().getChannelManager().show();
+		}else{
+			TuxGuitar.instance().getChannelManager().dispose();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowMatrixAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowMatrixAction.java
new file mode 100644
index 00000000..29cec375
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowMatrixAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.view;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class ShowMatrixAction extends Action{
+
+	public static final String NAME = "action.view.show-matrix";
+
+	public ShowMatrixAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(TuxGuitar.instance().getMatrixEditor().isDisposed()){
+			TuxGuitar.instance().getMatrixEditor().show();
+		}else{
+			TuxGuitar.instance().getMatrixEditor().dispose();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowPianoAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowPianoAction.java
new file mode 100644
index 00000000..261b0fd8
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowPianoAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.view;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class ShowPianoAction extends Action{
+
+	public static final String NAME = "action.view.show-piano";
+
+	public ShowPianoAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(TuxGuitar.instance().getPianoEditor().isDisposed()){
+			TuxGuitar.instance().getPianoEditor().show();
+		}else{
+			TuxGuitar.instance().getPianoEditor().dispose();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowToolbarsAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowToolbarsAction.java
new file mode 100644
index 00000000..f0d05adf
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowToolbarsAction.java
@@ -0,0 +1,27 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.view;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class ShowToolbarsAction extends Action{
+
+	public static final String NAME = "action.view.show-toolbars";
+
+	public ShowToolbarsAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		TuxGuitar.instance().getItemManager().toogleToolbarVisibility();
+
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowTransportAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowTransportAction.java
new file mode 100644
index 00000000..21cb7834
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/actions/view/ShowTransportAction.java
@@ -0,0 +1,30 @@
+/*
+ * Created on 17-dic-2005
+ */
+package org.herac.tuxguitar.app.actions.view;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.Action;
+import org.herac.tuxguitar.app.actions.ActionData;
+
+/**
+ * @author julian
+ */
+public class ShowTransportAction extends Action{
+
+	public static final String NAME = "action.view.show-transport";
+
+	public ShowTransportAction() {
+		super(NAME, AUTO_LOCK | AUTO_UNLOCK |  AUTO_UPDATE | KEY_BINDING_AVAILABLE);
+	}
+
+	@Override
+	protected int execute(ActionData actionData){
+		if(TuxGuitar.instance().getTransport().isDisposed()){
+			TuxGuitar.instance().getTransport().show();
+		}else{
+			TuxGuitar.instance().getTransport().dispose();
+		}
+		return 0;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/CannotInsertTransferException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/CannotInsertTransferException.java
new file mode 100644
index 00000000..8498a61c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/CannotInsertTransferException.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 05-dic-2005
+ */
+package org.herac.tuxguitar.app.clipboard;
+
+/**
+ * @author julian
+ */
+public class CannotInsertTransferException extends Exception{
+
+	private static final long serialVersionUID = 1L;
+
+	public CannotInsertTransferException() {
+		super();
+	}
+
+	public CannotInsertTransferException(String message) {
+		super(message);
+	}
+
+	public CannotInsertTransferException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public CannotInsertTransferException(Throwable cause) {
+		super(cause);
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/MeasureTransfer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/MeasureTransfer.java
new file mode 100644
index 00000000..a9f286a5
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/MeasureTransfer.java
@@ -0,0 +1,29 @@
+package org.herac.tuxguitar.app.clipboard;
+
+import org.herac.tuxguitar.util.TGVersion;
+
+
+public class MeasureTransfer extends SerializableTransfer {
+
+	private static final String NAME = "TuxGuitar " + TGVersion.CURRENT + " measure transfer";
+
+	private static final int ID = registerType(NAME);
+
+	private static MeasureTransfer instance = new MeasureTransfer();
+
+	private MeasureTransfer() {}
+
+	public static MeasureTransfer getInstance () {
+		return instance;
+	}
+
+	@Override
+	protected int[] getTypeIds() {
+		return new int[]{ID};
+	}
+
+	@Override
+	protected String[] getTypeNames() {
+		return new String[]{NAME};
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/MeasureTransferable.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/MeasureTransferable.java
new file mode 100644
index 00000000..dd2ade01
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/MeasureTransferable.java
@@ -0,0 +1,129 @@
+/*
+ * Created on 09-dic-2005
+ */
+package org.herac.tuxguitar.app.clipboard;
+
+import java.io.Serializable;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.editors.TablatureEditor;
+import org.herac.tuxguitar.app.undo.undoables.measure.UndoableInsertMeasure;
+import org.herac.tuxguitar.app.undo.undoables.measure.UndoableReplaceMeasures;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.helpers.TGSongSegment;
+import org.herac.tuxguitar.song.helpers.TGSongSegmentHelper;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGTrack;
+/**
+ * @author julian
+ */
+public class MeasureTransferable implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	public static final int TRANSFER_TYPE_REPLACE = 1;
+	public static final int TRANSFER_TYPE_INSERT = 2;
+
+	private TGSongSegment segment;
+	private int transferType;
+	private int pasteCount;
+
+	public MeasureTransferable(TablatureEditor tablatureEditor, int p1, int p2,boolean allTracks) {
+		this.transferType = TRANSFER_TYPE_REPLACE;
+		this.getTransfer(tablatureEditor, p1, p2,allTracks);
+	}
+
+	private void getTransfer(TablatureEditor tablatureEditor, int p1, int p2,boolean allTracks) {
+		if(allTracks){
+			this.segment = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).copyMeasures(p1,p2);
+		}else{
+			TGTrack track = tablatureEditor.getTablature().getCaret().getTrack();
+			this.segment = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).copyMeasures(p1,p2,track);
+		}
+		this.segment = this.segment.clone(new TGFactory());
+		skipMarkers(this.segment);
+	}
+
+	public void insertTransfer(TablatureEditor tablatureEditor) throws CannotInsertTransferException {
+		TGSongSegmentHelper helper = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager());
+		TGSongSegment segment = helper.createSegmentCopies(this.segment, this.pasteCount );
+		if(this.transferType == TRANSFER_TYPE_REPLACE){
+			replaceMeasures(tablatureEditor, helper, segment);
+		}else if(this.transferType == TRANSFER_TYPE_INSERT){
+			insertMeasures(tablatureEditor, helper, segment);
+		}
+	}
+
+	public void insertMeasures(TablatureEditor tablatureEditor, TGSongSegmentHelper helper, TGSongSegment segment) throws CannotInsertTransferException {
+		TGMeasure measure = tablatureEditor.getTablature().getCaret().getMeasure();
+		TGTrack track = tablatureEditor.getTablature().getCaret().getTrack();
+		if (measure == null || segment.isEmpty()) {
+			throw new CannotInsertTransferException();
+		}
+		//Si el segmento tiene una sola pista,
+		//la pego en la pista seleccionada
+		int toTrack = ((segment.getTracks().size() == 1)?track.getNumber():0);
+
+		//comienza el undoable
+		UndoableInsertMeasure undoable = new UndoableInsertMeasure(toTrack);
+		TuxGuitar.instance().getFileHistory().setUnsavedFile();
+
+		TGMeasureHeader first = segment.getHeaders().get(0);
+		int fromNumber = measure.getNumber();
+		long theMove = (measure.getStart() - first.getStart());
+
+		helper.insertMeasures(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),fromNumber,theMove,toTrack);
+
+		//termia el undoable
+		TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),segment.getHeaders().size(),fromNumber,theMove));
+	}
+
+	public void replaceMeasures(TablatureEditor tablatureEditor, TGSongSegmentHelper helper, TGSongSegment segment) throws CannotInsertTransferException {
+		TGMeasure measure = tablatureEditor.getTablature().getCaret().getMeasure();
+		TGTrack track = tablatureEditor.getTablature().getCaret().getTrack();
+		if (measure == null || segment.isEmpty()) {
+			throw new CannotInsertTransferException();
+		}
+		TGMeasureHeader first = segment.getHeaders().get(0);
+
+		//Si el segmento tiene una sola pista,
+		//la pego en la pista seleccionada
+		int toTrack = ((segment.getTracks().size() == 1)?track.getNumber():0);
+
+		//si no existen los compases los creo
+		int count = segment.getHeaders().size();
+		int current = measure.getNumber();
+		int freeSpace =  (track.countMeasures() - (current - 1));
+		long theMove = (measure.getStart() - first.getStart());
+
+		//comienza el undoable
+		UndoableReplaceMeasures undoable = new UndoableReplaceMeasures(current, (current + count) , toTrack);
+		TuxGuitar.instance().getFileHistory().setUnsavedFile();
+
+		for(int i = freeSpace;i < count;i ++){
+			TuxGuitar.instance().getSongManager().addNewMeasureBeforeEnd();
+		}
+		helper.replaceMeasures(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),theMove,toTrack);
+
+		//Termina el undoable
+		TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),count,freeSpace,theMove));
+	}
+
+	public void setTransferType(int transferType){
+		this.transferType = transferType;
+	}
+
+	public void setPasteCount(int pasteCount){
+		this.pasteCount = pasteCount;
+	}
+
+	private void skipMarkers(TGSongSegment segment){
+		Iterator<TGMeasureHeader> it = segment.getHeaders().iterator();
+		while(it.hasNext()){
+			TGMeasureHeader header = it.next();
+			header.setMarker(null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/SerializableTransfer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/SerializableTransfer.java
new file mode 100644
index 00000000..7a8f8ccf
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/clipboard/SerializableTransfer.java
@@ -0,0 +1,79 @@
+package org.herac.tuxguitar.app.clipboard;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
+import org.eclipse.swt.dnd.ByteArrayTransfer;
+import org.eclipse.swt.dnd.TransferData;
+
+
+public abstract class SerializableTransfer extends ByteArrayTransfer {
+
+	@Override
+	public void javaToNative(Object object, TransferData transferData) {
+		if (object == null || !(object instanceof Serializable)) {
+			// FIXME it should exists a dedicated exception
+			System.err.println("Unsupported transfer type");
+			return;
+		}
+
+		if (!isSupportedType(transferData)) {
+			// FIXME it should exists a dedicated exception
+			System.err.println("Unsupported transfer type");
+			return;
+		}
+
+		Serializable serializable = (Serializable) object;
+		try {
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+			ObjectOutputStream objectStream = new ObjectOutputStream(out);
+			objectStream.writeObject(serializable);
+			objectStream.close();
+
+			byte[] buffer = out.toByteArray();
+			super.javaToNative(buffer, transferData);
+
+		} catch (IOException e) {
+			// FIXME it should exists a dedicated exception
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public Object nativeToJava(TransferData transferData) {
+
+		if (!isSupportedType(transferData)) {
+			// FIXME it should exists a dedicated exception
+			System.err.println("Unsupported transfer type");
+			return null;
+		}
+
+		byte[] buffer = (byte[]) super.nativeToJava(transferData);
+		if (buffer == null) {
+			// FIXME it should exists a dedicated exception
+			System.err.println("Byte array expected");
+			return null;
+		}
+
+		Serializable result = null;
+		try {
+			ByteArrayInputStream in = new ByteArrayInputStream(buffer);
+			ObjectInputStream ois = new ObjectInputStream(in);
+			result = (Serializable) ois.readObject();
+			ois.close();
+		} catch (IOException e) {
+			// FIXME it should exists a dedicated exception
+			e.printStackTrace();
+			return null;
+		} catch (ClassNotFoundException e) {
+			// FIXME it should exists a dedicated exception
+			e.printStackTrace();
+			return null;
+		}
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/EditorCache.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/EditorCache.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/EditorCache.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/EditorCache.java
index 41967605..5c57432e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/EditorCache.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/EditorCache.java
@@ -12,11 +12,11 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class EditorCache {
-	
+
 	//Modo edition
 	private boolean editUpdate;
 	private TGBeatImpl editBeat;
-	
+
 	//Modo reproduccion
 	private int playTrack;
 	private long playTick;
@@ -26,21 +26,21 @@ public class EditorCache {
 	private boolean playUpdate;
 	private TGBeatImpl playBeat;
 	private TGMeasureImpl playMeasure;
-	
+
 	public EditorCache(){
 		this.reset();
 	}
-	
+
 	public void reset(){
 		this.resetEditMode();
 		this.resetPlayMode();
 	}
-	
+
 	private void resetEditMode(){
 		this.editBeat = null;
 		this.editUpdate = false;
 	}
-	
+
 	private void resetPlayMode(){
 		this.playBeat = null;
 		this.playMeasure = null;
@@ -51,19 +51,19 @@ private void resetPlayMode(){
 		this.playStart = 0;
 		this.playBeatEnd = 0;
 	}
-	
+
 	public void updateEditMode(){
 		this.editUpdate = true;
 		this.resetPlayMode();
 		this.getEditBeat();
 	}
-	
+
 	public void updatePlayMode(){
 		this.playUpdate = true;
 		this.resetEditMode();
 		this.getPlayBeat();
 	}
-	
+
 	public TGBeatImpl getEditBeat() {
 		if(this.editUpdate){
 			this.editBeat =  TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getSelectedBeat();
@@ -71,28 +71,28 @@ public TGBeatImpl getEditBeat() {
 		}
 		return this.editBeat;
 	}
-	
+
 	public TGBeatImpl getPlayBeat(){
 		if(this.playUpdate){
 			this.playChanges = false;
-			
+
 			TGSongManager manager = TuxGuitar.instance().getSongManager();
 			if( this.isPlaying() ){
 				Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 				TGTrack track = caret.getTrack();
-				
+
 				long tick = TuxGuitar.instance().getPlayer().getTickPosition();
 				long start = this.playStart + (tick - this.playTick);
 				if(this.playMeasure == null || start < this.playMeasure.getStart() || start > (this.playMeasure.getStart() + this.playMeasure.getLength())){
 					this.playMeasure = null;
 					start = MidiTickUtil.getStart(tick);
 				}
-				
+
 				if(this.playMeasure == null || this.playBeatEnd == 0 || start > this.playBeatEnd || start < this.playStart || track.getNumber() != this.playTrack){
 					this.playBeat = null;
 					this.playBeatEnd = 0;
 					this.playChanges = true;
-					
+
 					if(this.playMeasure == null || !this.playMeasure.hasTrack(track.getNumber())  || !isPlaying(this.playMeasure)){
 						this.playMeasure = (TGMeasureImpl)manager.getTrackManager().getMeasureAt(track,start);
 					}
@@ -117,35 +117,35 @@ public TGBeatImpl getPlayBeat(){
 		}
 		return this.playBeat;
 	}
-	
+
 	public long getPlayTick(){
 		return this.playTick;
 	}
-	
+
 	public long getPlayStart(){
 		return this.playStart;
 	}
-	
+
 	public TGMeasureImpl getPlayMeasure(){
 		return this.playMeasure;
 	}
-	
+
 	public boolean shouldRedraw(){
 		return this.playChanges;
 	}
-	
+
 	public boolean isPlaying(){
 		return TuxGuitar.instance().getPlayer().isRunning();
 	}
-	
+
 	public boolean isPlayingCountDown(){
 		return TuxGuitar.instance().getPlayer().getCountDown().isRunning();
 	}
-	
+
 	public boolean isPlaying(TGMeasure measure){
 		return (isPlaying() && this.playMeasure != null && measure.equals(this.playMeasure));
 	}
-	
+
 	public boolean isPlaying(TGMeasure measure,TGBeat b){
 		return (isPlaying(measure) && this.playBeat != null && this.playBeat.getStart() == b.getStart());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/FretBoardEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/FretBoardEditor.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/FretBoardEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/FretBoardEditor.java
index 6668c0f8..abca93e2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/FretBoardEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/FretBoardEditor.java
@@ -11,20 +11,20 @@
 import org.herac.tuxguitar.song.models.TGBeat;
 
 public class FretBoardEditor implements TGRedrawListener, TGExternalBeatViewerListener, IconLoader, LanguageLoader, ScaleListener{
-	
+
 	private FretBoard fretBoard;
 	private boolean visible;
-	
+
 	public FretBoardEditor(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
-		TuxGuitar.instance().getScaleManager().addListener(this); 
+		TuxGuitar.instance().getScaleManager().addListener(this);
 	}
-	
+
 	private FretBoard getFretBoard(){
 		return this.fretBoard;
 	}
-	
+
 	public void hideFretBoard(){
 		this.visible = false;
 		getFretBoard().setVisible(this.visible);
@@ -32,7 +32,7 @@ public void hideFretBoard(){
 		TuxGuitar.instance().getEditorManager().removeBeatViewerListener(this);
 		TuxGuitar.instance().updateShellFooter(0,0,0);
 	}
-	
+
 	public void showFretBoard(){
 		this.visible = true;
 		getFretBoard().setVisible(this.visible);
@@ -40,58 +40,62 @@ public void showFretBoard(){
 		TuxGuitar.instance().getEditorManager().addBeatViewerListener(this);
 		TuxGuitar.instance().updateShellFooter(getFretBoard().getHeight(), 730,520);
 	}
-	
+
 	public void showFretBoard(Composite parent) {
 		FormData data = new FormData();
 		data.left = new FormAttachment(0, 0);
 		data.right = new FormAttachment(100, 0);
 		data.top = new FormAttachment(0,0);
 		data.bottom = new FormAttachment(100,0);
-		
+
 		this.fretBoard = new FretBoard(parent);
 		this.fretBoard.setLayoutData(data);
 	}
-	
+
 	public void dispose(){
 		if(getFretBoard() != null && !getFretBoard().isDisposed()){
 			getFretBoard().dispose();
 		}
 	}
-	
+
 	public void redraw(){
 		if(getFretBoard() != null && !getFretBoard().isDisposed() && !TuxGuitar.instance().isLocked()){
 			getFretBoard().redraw();
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(getFretBoard() != null && !getFretBoard().isDisposed() && !TuxGuitar.instance().isLocked()){
 			getFretBoard().redrawPlayingMode();
 		}
 	}
-	
+
 	public boolean isVisible(){
 		return (getFretBoard() != null && !getFretBoard().isDisposed() && this.visible);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		if(getFretBoard() != null && !getFretBoard().isDisposed()){
 			getFretBoard().loadProperties();
 		}
 	}
-	
+
+	@Override
 	public void loadIcons(){
 		if(getFretBoard() != null && !getFretBoard().isDisposed()){
 			getFretBoard().loadIcons();
 		}
 	}
-	
+
+	@Override
 	public void loadScale(){
 		if(getFretBoard() != null){
 			getFretBoard().loadScale();
 		}
 	}
-	
+
+	@Override
 	public void doRedraw(int type) {
 		if( type == TGRedrawListener.NORMAL ){
 			this.redraw();
@@ -99,13 +103,15 @@ public void doRedraw(int type) {
 			this.redrawPlayingMode();
 		}
 	}
-	
+
+	@Override
 	public void showExternalBeat(TGBeat beat) {
 		if(getFretBoard() != null && !getFretBoard().isDisposed()){
 			getFretBoard().setExternalBeat(beat);
 		}
 	}
-	
+
+	@Override
 	public void hideExternalBeat() {
 		if(getFretBoard() != null && !getFretBoard().isDisposed()){
 			getFretBoard().setExternalBeat(null);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/PianoEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/PianoEditor.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/PianoEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/PianoEditor.java
index 7edee143..9ba6005a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/PianoEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/PianoEditor.java
@@ -14,22 +14,23 @@
 import org.herac.tuxguitar.song.models.TGBeat;
 
 public class PianoEditor implements TGRedrawListener, TGExternalBeatViewerListener, IconLoader, LanguageLoader, ScaleListener{
-	
+
 	private Piano piano;
-	
+
 	public PianoEditor(){
 		super();
 	}
-	
+
 	public void show() {
 		Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("piano.editor"));
-		
+
 		this.piano = new Piano(dialog,SWT.NONE);
-		
+
 		this.addListeners();
 		dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				removeListeners();
 				TuxGuitar.instance().updateCache(true);
@@ -37,7 +38,7 @@ public void widgetDisposed(DisposeEvent e) {
 		});
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
@@ -45,61 +46,65 @@ public void addListeners(){
 		TuxGuitar.instance().getEditorManager().addRedrawListener(this);
 		TuxGuitar.instance().getEditorManager().addBeatViewerListener(this);
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
-		TuxGuitar.instance().getScaleManager().removeListener(this); 
+		TuxGuitar.instance().getScaleManager().removeListener(this);
 		TuxGuitar.instance().getEditorManager().removeRedrawListener(this);
 		TuxGuitar.instance().getEditorManager().removeBeatViewerListener(this);
 	}
-	
+
 	private Piano getPiano(){
 		return this.piano;
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			getPiano().getShell().dispose();
 			getPiano().dispose();
 		}
 	}
-	
+
 	public void redraw(){
 		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
 			getPiano().redraw();
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
 			getPiano().redrawPlayingMode();
 		}
 	}
-	
+
 	public boolean isDisposed() {
 		return (this.getPiano() == null || getPiano().isDisposed());
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		if(!isDisposed()){
 			getPiano().loadProperties();
 			getPiano().getShell().setText(TuxGuitar.getProperty("piano.editor"));
 		}
 	}
-	
+
+	@Override
 	public void loadIcons(){
 		if(!isDisposed()){
 			getPiano().loadIcons();
 		}
 	}
-	
+
+	@Override
 	public void loadScale(){
 		if(!isDisposed()){
 			getPiano().loadScale();
 		}
 	}
-	
+
+	@Override
 	public void doRedraw(int type) {
 		if( type == TGRedrawListener.NORMAL ){
 			this.redraw();
@@ -107,13 +112,15 @@ public void doRedraw(int type) {
 			this.redrawPlayingMode();
 		}
 	}
-	
+
+	@Override
 	public void showExternalBeat(TGBeat beat) {
 		if(!isDisposed()){
 			getPiano().setExternalBeat(beat);
 		}
 	}
-	
+
+	@Override
 	public void hideExternalBeat() {
 		if(!isDisposed()){
 			getPiano().setExternalBeat(null);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGColorImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGColorImpl.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGColorImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGColorImpl.java
index f51a989c..4e39cdd6 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGColorImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGColorImpl.java
@@ -5,37 +5,42 @@
 import org.herac.tuxguitar.graphics.TGColor;
 
 public class TGColorImpl implements TGColor{
-	
+
 	private Color handle;
-	
+
 	public TGColorImpl( Color handle ){
 		this.handle = handle;
 	}
-	
+
 	public TGColorImpl( Device device , int red, int green, int blue ){
 		this( new Color(device,red,green,blue) );
 	}
-	
+
 	public Color getHandle(){
 		return this.handle;
 	}
-	
+
+	@Override
 	public int getRed() {
 		return this.handle.getRed();
 	}
-	
+
+	@Override
 	public int getGreen() {
 		return this.handle.getGreen();
 	}
-	
+
+	@Override
 	public int getBlue() {
 		return this.handle.getBlue();
 	}
-	
+
+	@Override
 	public boolean isDisposed(){
 		return this.handle.isDisposed();
 	}
-	
+
+	@Override
 	public void dispose(){
 		this.handle.dispose();
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGEditorManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGEditorManager.java
new file mode 100644
index 00000000..00ca7b56
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGEditorManager.java
@@ -0,0 +1,83 @@
+package org.herac.tuxguitar.app.editors;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.song.models.TGBeat;
+
+public class TGEditorManager {
+
+	private List<TGRedrawListener> redrawListeners;
+	private List<TGUpdateListener> updateListeners;
+	private List<TGExternalBeatViewerListener> beatViewerListeners;
+
+	public TGEditorManager(){
+		this.redrawListeners = new ArrayList<TGRedrawListener>();
+		this.updateListeners = new ArrayList<TGUpdateListener>();
+		this.beatViewerListeners = new ArrayList<TGExternalBeatViewerListener>();
+	}
+
+	public void doRedraw( int type ){
+		for(int i = 0; i < this.redrawListeners.size(); i ++){
+			TGRedrawListener listener = this.redrawListeners.get( i );
+			listener.doRedraw( type );
+		}
+	}
+
+	public void doUpdate( int type ){
+		for(int i = 0; i < this.updateListeners.size(); i ++){
+			TGUpdateListener listener = this.updateListeners.get( i );
+			listener.doUpdate( type );
+		}
+	}
+
+	public void showExternalBeat( TGBeat beat ){
+		for(int i = 0; i < this.beatViewerListeners.size(); i ++){
+			TGExternalBeatViewerListener listener = this.beatViewerListeners.get( i );
+			listener.showExternalBeat(beat);
+		}
+	}
+
+	public void hideExternalBeat(){
+		for(int i = 0; i < this.beatViewerListeners.size(); i ++){
+			TGExternalBeatViewerListener listener = this.beatViewerListeners.get( i );
+			listener.hideExternalBeat();
+		}
+	}
+
+	public void addRedrawListener( TGRedrawListener listener){
+		if(!this.redrawListeners.contains( listener )){
+			this.redrawListeners.add( listener );
+		}
+	}
+
+	public void removeRedrawListener( TGRedrawListener listener){
+		if(this.redrawListeners.contains( listener )){
+			this.redrawListeners.remove( listener );
+		}
+	}
+
+	public void addUpdateListener( TGUpdateListener listener){
+		if(!this.updateListeners.contains( listener )){
+			this.updateListeners.add( listener );
+		}
+	}
+
+	public void removeUpdateListener( TGUpdateListener listener){
+		if(this.updateListeners.contains( listener )){
+			this.updateListeners.remove( listener );
+		}
+	}
+
+	public void addBeatViewerListener( TGExternalBeatViewerListener listener){
+		if(!this.beatViewerListeners.contains( listener )){
+			this.beatViewerListeners.add( listener );
+		}
+	}
+
+	public void removeBeatViewerListener( TGExternalBeatViewerListener listener){
+		if(this.beatViewerListeners.contains( listener )){
+			this.beatViewerListeners.remove( listener );
+		}
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGExternalBeatViewerListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGExternalBeatViewerListener.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGExternalBeatViewerListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGExternalBeatViewerListener.java
index 539ddfb2..a4b772e0 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGExternalBeatViewerListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGExternalBeatViewerListener.java
@@ -3,8 +3,8 @@
 import org.herac.tuxguitar.song.models.TGBeat;
 
 public interface TGExternalBeatViewerListener {
-	
+
 	public void showExternalBeat( TGBeat beat );
-	
+
 	public void hideExternalBeat();
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGFontImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGFontImpl.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGFontImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGFontImpl.java
index 6d02cfd4..24c73fc3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGFontImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGFontImpl.java
@@ -7,44 +7,50 @@
 import org.herac.tuxguitar.graphics.TGFont;
 
 public class TGFontImpl implements TGFont {
-	
+
 	private Font handle;
-	
+
 	public TGFontImpl( Font handle ){
 		this.handle = handle;
 	}
-	
+
 	public TGFontImpl( Device device , String name, int height, boolean bold, boolean italic){
 		this( new Font( device, name, height, (SWT.NORMAL | (bold ? SWT.BOLD : 0) | (italic ? SWT.ITALIC : 0)) ) );
 	}
-	
+
+	@Override
 	public void dispose(){
 		this.handle.dispose();
 	}
-	
+
+	@Override
 	public boolean isDisposed(){
 		return this.handle.isDisposed();
 	}
-	
+
 	public Font getHandle(){
 		return this.handle;
 	}
-	
+
+	@Override
 	public String getName() {
 		FontData[] fd = this.handle.getFontData();
 		return ( fd != null && fd.length > 0 ? fd[0].getName() : new String() );
 	}
-	
+
+	@Override
 	public int getHeight() {
 		FontData[] fd = this.handle.getFontData();
 		return ( fd != null && fd.length > 0 ? fd[0].getHeight() : 0 );
 	}
-	
+
+	@Override
 	public boolean isBold() {
 		FontData[] fd = this.handle.getFontData();
 		return ( fd != null && fd.length > 0 ? ((fd[0].getStyle() & SWT.BOLD) != 0) : false );
 	}
-	
+
+	@Override
 	public boolean isItalic() {
 		FontData[] fd = this.handle.getFontData();
 		return ( fd != null && fd.length > 0 ? ((fd[0].getStyle() & SWT.ITALIC) != 0) : false );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGImageImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGImageImpl.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGImageImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGImageImpl.java
index 984e7c88..5bf5263a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGImageImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGImageImpl.java
@@ -10,49 +10,55 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGImageImpl implements TGImage {
-	
+
 	private Image handle;
-	
+
 	public TGImageImpl( Image handle ){
 		this.handle = handle;
 	}
-	
+
 	public TGImageImpl( Device device , int width , int height ){
 		this( new Image(device,width,height) );
 	}
-	
+
 	public TGImageImpl(Device device, ImageData source, ImageData mask){
 		this( new Image(device,source,mask) );
 	}
-	
+
+	@Override
 	public TGPainter createPainter() {
 		return new TGPainterImpl(this.handle);
 	}
-	
+
+	@Override
 	public int getWidth() {
 		return this.handle.getBounds().width;
 	}
-	
+
+	@Override
 	public int getHeight() {
 		return this.handle.getBounds().height;
 	}
-	
+
 	public Image getHandle(){
 		return this.handle;
 	}
-	
+
+	@Override
 	public boolean isDisposed(){
 		return this.handle.isDisposed();
 	}
-	
+
+	@Override
 	public void dispose(){
 		this.handle.dispose();
 	}
-	
+
+	@Override
 	public void applyTransparency( TGColor background ){
 		RGB alpha = new RGB( background.getRed(), background.getGreen(), background.getBlue() );
 		RGB none = new RGB((0xff ^ alpha.red),(0xff ^ alpha.green),(0xff ^ alpha.blue));
-		
+
 		Image srcImage = this.handle;
 		ImageData srcData = srcImage.getImageData();
 		ImageData maskData = new ImageData(srcData.width,srcData.height,1,new PaletteData(new RGB[]{ none,alpha }  ));
@@ -67,7 +73,7 @@ public void applyTransparency( TGColor background ){
 			}
 		}
 		this.handle = new Image(srcImage.getDevice(),srcData,maskData);
-		
+
 		srcImage.dispose();
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGPainterImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGPainterImpl.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGPainterImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGPainterImpl.java
index fbdf646a..20eb9582 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGPainterImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGPainterImpl.java
@@ -17,31 +17,31 @@
 import org.herac.tuxguitar.graphics.TGPoint;
 
 public class TGPainterImpl extends TGResourceFactoryImpl implements TGPainter {
-	
+
 	private boolean pathEmpty;
-	
+
 	private int style;
-	
+
 	private GC gc;
-	
+
 	private Path path;
-	
+
 	public TGPainterImpl(){
 		super();
 	}
-	
+
 	public TGPainterImpl(GC gc){
 		this.init(gc);
 	}
-	
+
 	public TGPainterImpl(Image image){
 		this.init(image);
 	}
-	
+
 	public void init(Image image){
 		this.init(new GC(image));
 	}
-	
+
 	public void init(GC gc){
 		this.setDevice(gc.getDevice());
 		if(this.gc != null && !this.gc.isDisposed()){
@@ -49,18 +49,21 @@ public void init(GC gc){
 		}
 		this.gc = gc;
 	}
-	
+
+	@Override
 	public void initPath(int style){
 		this.style = style;
 		this.path = new Path(this.gc.getDevice());
 		this.pathEmpty = true;
 		this.setAntialias(true);
 	}
-	
+
+	@Override
 	public void initPath(){
 		this.initPath( PATH_DRAW );
 	}
-	
+
+	@Override
 	public void closePath(){
 		if(! this.pathEmpty ){
 			if( (this.style & PATH_DRAW) != 0){
@@ -75,139 +78,167 @@ public void closePath(){
 		this.pathEmpty = true;
 		this.setAntialias(false);
 	}
-	
+
 	public GC getGC(){
 		return this.gc;
 	}
-	
+
+	@Override
 	public void dispose(){
 		this.gc.dispose();
 	}
-	
+
+	@Override
 	public boolean isDisposed(){
 		return this.gc.isDisposed();
 	}
-	
+
+	@Override
 	public void copyArea(TGImage image, int x, int y) {
 		this.gc.copyArea(getImage(image), x, y);
 	}
-	
+
+	@Override
 	public void drawString(String string, int x, int y) {
 		this.setAdvanced(false);
 		this.gc.drawString(string, x, y);
 	}
-	
+
+	@Override
 	public void drawString(String string, int x, int y, boolean isTransparent) {
 		this.setAdvanced(false);
 		this.gc.drawString(string, x, y, isTransparent);
 	}
-	
+
+	@Override
 	public void drawImage(TGImage image, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight) {
 		this.setAdvanced(false);
 		this.gc.drawImage(getImage(image), srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight);
 	}
-	
+
+	@Override
 	public void drawImage(TGImage image, int x, int y) {
 		this.setAdvanced(false);
 		this.gc.drawImage(getImage(image), x, y);
 	}
-	
+
+	@Override
 	public void drawPolygon(int[] arg0) {
 		this.gc.drawPolygon(arg0);
 	}
-	
+
+	@Override
 	public void fillPolygon(int[] arg0) {
 		this.gc.fillPolygon(arg0);
 	}
-	
+
+	@Override
 	public void cubicTo(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5) {
 		this.path.cubicTo(arg0, arg1, arg2, arg3, arg4, arg5);
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void lineTo(float arg0, float arg1) {
 		this.path.lineTo(arg0, arg1);
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void moveTo(float arg0, float arg1) {
 		this.path.moveTo(arg0, arg1);
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void addString(String arg0, float arg1, float arg2, TGFont font) {
 		this.path.addString(arg0, arg1, arg2, getFont(font));
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void addArc(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5) {
 		this.path.addArc(arg0, arg1, arg2, arg3, arg4, arg5);
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void addOval(float arg0, float arg1, float arg2, float arg3) {
 		this.path.addArc(arg0, arg1, arg2, arg3, 0, 360);
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void addRectangle(float x,float y,float width,float height) {
 		this.path.addRectangle(x, y, width, height);
 		this.pathEmpty = false;
 	}
-	
+
 	public void addRectangle(Rectangle rectangle) {
 		this.path.addRectangle(rectangle.x,rectangle.y,rectangle.width,rectangle.height);
 		this.pathEmpty = false;
 	}
-	
+
+	@Override
 	public void setFont(TGFont font) {
 		this.gc.setFont(getFont(font));
 	}
-	
+
+	@Override
 	public void setForeground(TGColor color) {
 		this.gc.setForeground(getColor(color));
 	}
-	
+
+	@Override
 	public void setBackground(TGColor color) {
 		this.gc.setBackground(getColor(color));
 	}
-	
+
+	@Override
 	public void setLineWidth(int width) {
 		this.gc.setLineWidth(width);
 	}
-	
+
+	@Override
 	public void setLineStyleSolid(){
 		this.gc.setLineStyle(SWT.LINE_SOLID);
 	}
-	
+
+	@Override
 	public void setLineStyleDot(){
 		this.gc.setLineStyle(SWT.LINE_DOT);
 	}
-	
+
+	@Override
 	public void setLineStyleDash(){
 		this.gc.setLineStyle(SWT.LINE_DASH);
 	}
-	
+
+	@Override
 	public void setLineStyleDashDot(){
 		this.gc.setLineStyle(SWT.LINE_DASHDOT);
 	}
-	
+
+	@Override
 	public void setAlpha(int alpha) {
 		this.gc.setAlpha(alpha);
 	}
-	
+
+	@Override
 	public void setAntialias(boolean enabled){
 		if( !TGPainterUtils.FORCE_OS_DEFAULTS ){
 			this.gc.setAntialias(enabled ? SWT.ON : SWT.OFF );
 		}
 	}
-	
+
+	@Override
 	public void setAdvanced(boolean advanced){
 		if( !TGPainterUtils.FORCE_OS_DEFAULTS ){
 			this.gc.setAdvanced(advanced);
 		}
 	}
-	
+
+	@Override
 	public int getFontSize(){
 		FontData[] fd = this.gc.getFont().getFontData();
 		if( fd != null && fd.length > 0 ){
@@ -215,49 +246,53 @@ public int getFontSize(){
 		}
 		return 0;
 	}
-	
+
+	@Override
 	public int getFMHeight(){
 		this.setAdvanced(false);
 		return this.gc.getFontMetrics().getHeight();
 	}
-	
+
+	@Override
 	public int getFMAscent(){
 		this.setAdvanced(false);
 		return this.gc.getFontMetrics().getAscent();
 	}
-	
+
+	@Override
 	public int getFMDescent(){
 		this.setAdvanced(false);
 		return this.gc.getFontMetrics().getDescent();
 	}
-	
+
+	@Override
 	public int getFMWidth( String text ){
 		this.setAdvanced(false);
 		return this.gc.stringExtent( text ).x;
 	}
-	
+
 	public TGPoint createPoint( Point point ){
 		return new TGPoint( point.x , point.y );
 	}
-	
+
 	public TGDimension createDimension( Point point ){
 		return new TGDimension( point.x , point.y );
 	}
-	
+
 	public Image getImage(TGImage image){
 		if( image instanceof TGImageImpl ){
 			return ((TGImageImpl)image).getHandle();
 		}
 		return null;
 	}
-	
+
 	public Color getColor(TGColor color){
 		if( color instanceof TGColorImpl ){
 			return ((TGColorImpl)color).getHandle();
 		}
 		return null;
 	}
-	
+
 	public Font getFont(TGFont font){
 		if( font instanceof TGFontImpl ){
 			return ((TGFontImpl)font).getHandle();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGPainterUtils.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGPainterUtils.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGPainterUtils.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGPainterUtils.java
index 0e58c65b..800e7c5f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGPainterUtils.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGPainterUtils.java
@@ -4,10 +4,10 @@
 import org.herac.tuxguitar.app.system.config.TGConfigKeys;
 
 public class TGPainterUtils {
-	
+
 	/** On swt-carbon (and maybe another platform) advanced mode must be allways true **/
 	public static final boolean FORCE_OS_DEFAULTS = getValue(TGConfigKeys.FORCE_OS_DEFAULTS);
-	
+
 	private static boolean getValue(String key){
 		return TuxGuitar.instance().getConfig().getBooleanConfigValue(key);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGRedrawListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGRedrawListener.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGRedrawListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGRedrawListener.java
index 3e83f18e..ae3c1bf8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGRedrawListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGRedrawListener.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.app.editors;
 
 public interface TGRedrawListener {
-	
+
 	public static final int NORMAL = 1;
 	public static final int PLAYING_THREAD = 2;
 	public static final int PLAYING_NEW_BEAT = 3;
-	
+
 	public void doRedraw( int type );
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
index b3428226..aa81db68 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGResourceFactoryImpl.java
@@ -9,41 +9,46 @@
 import org.herac.tuxguitar.graphics.TGResourceFactory;
 
 public class TGResourceFactoryImpl implements TGResourceFactory {
-	
+
 	private Device device;
-	
+
 	public TGResourceFactoryImpl(){
 		this(null);
 	}
-	
+
 	public TGResourceFactoryImpl( Device device ){
 		this.device = device;
 	}
-	
+
 	public void setDevice(Device device) {
 		this.device = device;
 	}
-	
+
 	public Device getDevice() {
 		return this.device;
 	}
-	
+
+	@Override
 	public TGImage createImage( int width, int height ){
 		return new TGImageImpl( this.getDevice() , width, height );
 	}
-	
+
+	@Override
 	public TGColor createColor( int red, int green, int blue ){
 		return new TGColorImpl( this.getDevice() , red, green , blue );
 	}
-	
+
+	@Override
 	public TGColor createColor( TGColorModel cm ){
 		return this.createColor(cm.getRed(), cm.getGreen(), cm.getBlue());
 	}
-	
+
+	@Override
 	public TGFont createFont( String name, int height, boolean bold, boolean italic ){
 		return new TGFontImpl( this.getDevice() , name , height , bold , italic );
 	}
-	
+
+	@Override
 	public TGFont createFont( TGFontModel fm ){
 		return this.createFont(fm.getName(), fm.getHeight(), fm.isBold(), fm.isItalic());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGUpdateListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGUpdateListener.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TGUpdateListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGUpdateListener.java
index 07dabc47..8775887f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGUpdateListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TGUpdateListener.java
@@ -5,6 +5,6 @@ public interface TGUpdateListener {
 	public static final int SONG_UPDATED = 2;
 	public static final int SONG_LOADED = 3;
 	public static final int SONG_SAVED = 4;
-	
+
 	public void doUpdate( int type );
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TablatureEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TablatureEditor.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/TablatureEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TablatureEditor.java
index f1a4b897..aa4ff4e0 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TablatureEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/TablatureEditor.java
@@ -1,8 +1,5 @@
 /*
  * Created on 30-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors;
 
@@ -10,22 +7,17 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Menu;
 import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.clipboard.ClipBoard;
 import org.herac.tuxguitar.app.editors.tab.Tablature;
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TablatureEditor implements TGRedrawListener, TGUpdateListener{
 	private Tablature tablature;
-	private ClipBoard clipBoard;
-	
+
 	public TablatureEditor() {
-		this.clipBoard = new ClipBoard();
 	}
-	
+
 	public void showTablature(Composite parent) {
 		this.tablature = new Tablature(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.DOUBLE_BUFFERED, TuxGuitar.instance().getSongManager());
 		this.tablature.initGUI();
@@ -37,34 +29,31 @@ public void showTablature(Composite parent) {
 		this.initKeyActions();
 		this.initMenu();
 	}
-	
+
 	private void initListener(){
 		TuxGuitar.instance().getEditorManager().addRedrawListener( this );
 		TuxGuitar.instance().getEditorManager().addUpdateListener( this );
 	}
-	
+
 	private void initKeyActions(){
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.tablature);
 	}
-	
+
 	private void initMenu(){
 		Menu menu = TuxGuitar.instance().getItemManager().getPopupMenu();
 		menu.addMenuListener(getTablature().getEditorKit());
 		this.tablature.setMenu(menu);
 	}
-	
+
 	public void reloadConfig(){
 		getTablature().reloadStyles();
 	}
-	
+
 	public Tablature getTablature() {
 		return this.tablature;
 	}
-	
-	public ClipBoard getClipBoard(){
-		return this.clipBoard;
-	}
-	
+
+	@Override
 	public void doRedraw(int type) {
 		if( type == TGRedrawListener.NORMAL ){
 			getTablature().redraw();
@@ -72,7 +61,8 @@ public void doRedraw(int type) {
 			getTablature().redrawPlayingMode();
 		}
 	}
-	
+
+	@Override
 	public void doUpdate(int type) {
 		if( type == TGUpdateListener.SONG_UPDATED ){
 			getTablature().updateTablature();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelHandle.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelHandle.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelHandle.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelHandle.java
index b377cfce..5d5bbb1a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelHandle.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelHandle.java
@@ -9,50 +9,50 @@
 import org.herac.tuxguitar.song.models.TGChannel;
 
 public class TGChannelHandle {
-	
+
 	public TGChannelHandle(){
 		super();
 	}
-	
+
 	public void addChannel(){
 		// Comienza el Undoable
 		UndoableChannelGeneric undoable = UndoableChannelGeneric.startUndo();
-		
+
 		getManager().addChannel();
-		
+
 		// Termina el Undoable
 		TuxGuitar.instance().getUndoableManager().addEdit( undoable.endUndo() );
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	public void removeChannel(TGChannel channel){
 		// Comienza el Undoable
 		UndoableChannelGeneric undoable = UndoableChannelGeneric.startUndo();
-		
+
 		getManager().removeChannel(channel);
-		
+
 		// Termina el Undoable
 		TuxGuitar.instance().getUndoableManager().addEdit( undoable.endUndo() );
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	public void updateChannel(int id,short c1,short c2,short bnk,short prg,short vol,short bal,short cho,short rev,short pha,short tre,String name){
 		TGChannel channel = getManager().getChannel(id);
 		if( channel != null ){
 			boolean programChange = (bnk != channel.getBank() || prg != channel.getProgram());
-			
+
 			// Comienza el Undoable
 			UndoableModifyChannel undoable = UndoableModifyChannel.startUndo(id);
-			
+
 			getManager().updateChannel(id, c1, c2, bnk, prg, vol, bal, cho, rev, pha, tre, name);
-			
+
 			// Termina el Undoable
 			TuxGuitar.instance().getUndoableManager().addEdit( undoable.endUndo() );
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			TuxGuitar.instance().updateCache(true);
-			
+
 			if (TuxGuitar.instance().getPlayer().isRunning()) {
 				if(programChange){
 					TuxGuitar.instance().getPlayer().updatePrograms();
@@ -62,27 +62,27 @@ public void updateChannel(int id,short c1,short c2,short bnk,short prg,short vol
 			}
 		}
 	}
-	
-	public List getChannels(){
+
+	public List<TGChannel> getChannels(){
 		return getManager().getChannels();
 	}
-	
-	public List getFreeChannels( TGChannel forChannel ){
+
+	public List<Integer> getFreeChannels( TGChannel forChannel ){
 		return getManager().getFreeChannels(forChannel);
 	}
-	
+
 	public boolean isAnyTrackConnectedToChannel(TGChannel channel){
 		return getManager().isAnyTrackConnectedToChannel( channel.getChannelId() );
 	}
-	
+
 	public boolean isAnyPercussionChannel(){
 		return getManager().isAnyPercussionChannel();
 	}
-	
+
 	public boolean isPlayerRunning(){
 		return TuxGuitar.instance().getPlayer().isRunning();
 	}
-	
+
 	private TGSongManager getManager(){
 		return TuxGuitar.instance().getSongManager();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelItem.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelItem.java
index 1b200f67..af844651 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelItem.java
@@ -22,217 +22,225 @@
 import org.herac.tuxguitar.song.models.TGChannel;
 
 public class TGChannelItem {
-	
+
 	private TGChannel channel;
-	private TGChannelManagerDialog dialog;
-	
+	private final TGChannelManagerDialog dialog;
+
 	private Composite composite;
-	
+
 	private Text nameText;
 	private Combo programCombo;
 	private Combo bankCombo;
-	
+
 	private Button removeChannelButton;
 	private Button percussionButton;
 	private Combo channel1Combo;
 	private Combo channel2Combo;
-	
+
 	private TGScalePopup volumeScale;
 	private TGScalePopup balanceScale;
 	private TGScalePopup reverbScale;
 	private TGScalePopup chorusScale;
 	private TGScalePopup tremoloScale;
 	private TGScalePopup phaserScale;
-	
+
 	public TGChannelItem(TGChannelManagerDialog dialog){
 		this.dialog = dialog;
 	}
-	
+
 	public void show(final Composite parent, Object layoutData){
 		this.composite = new Composite(parent, SWT.BORDER);
 		this.composite.setLayout(this.dialog.createGridLayout(3, false, true, true));
 		this.composite.setLayoutData(layoutData);
-		
+
 		// Column 1
 		Composite col1Composite = new Composite(this.composite, SWT.NONE);
 		col1Composite.setLayout(this.dialog.createGridLayout(1,false, true, false));
 		col1Composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.nameText = new Text(col1Composite, SWT.BORDER | SWT.LEFT);
 		this.nameText.setLayoutData(new GridData(150, SWT.DEFAULT));
 		this.nameText.addFocusListener(new FocusAdapter() {
+			@Override
 			public void focusLost(FocusEvent e) {
 				checkForNameModified();
 			}
 		});
 		this.nameText.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				checkForNameModified();
 			}
 		});
-		
+
 		this.programCombo = new Combo(col1Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.programCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,false));
 		this.programCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateChannel(false);
 			}
 		});
-		
+
 		this.bankCombo = new Combo(col1Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.bankCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,false));
 		this.bankCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateChannel(false);
 			}
 		});
-		
+
 		// Column 2
 		Composite col2Composite = new Composite(this.composite, SWT.NONE);
 		col2Composite.setLayout(this.dialog.createGridLayout(1,false, true, false));
 		col2Composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.percussionButton = new Button(col2Composite, SWT.CHECK);
 		this.percussionButton.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.percussionButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateChannel(true);
 			}
 		});
-		
+
 		this.channel1Combo = new Combo(col2Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.channel1Combo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,false));
 		this.channel1Combo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateChannel(false);
 			}
 		});
-		
+
 		this.channel2Combo = new Combo(col2Composite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.channel2Combo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,false));
 		this.channel2Combo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateChannel(false);
 			}
 		});
-		
+
 		// Column 3
 		Composite col3Composite = new Composite(this.composite, SWT.NONE);
 		col3Composite.setLayout(this.dialog.createGridLayout(1,false, true, false));
 		col3Composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.removeChannelButton = new Button(col3Composite, SWT.PUSH);
 		this.removeChannelButton.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, false));
 		this.removeChannelButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				removeChannel();
 			}
 		});
-		
+
 		Composite controllerScalesComposite = new Composite(col3Composite, SWT.NONE);
 		controllerScalesComposite.setLayout(new RowLayout());
 		controllerScalesComposite.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,true));
-		
+
 		SelectionListener scaleSelectionListener = new TGScaleSelectionListener(this);
-		
+
 		this.volumeScale = new TGScalePopup(controllerScalesComposite);
 		this.volumeScale.setSelectionListener(scaleSelectionListener);
-		
+
 		this.balanceScale = new TGScalePopup(controllerScalesComposite);
 		this.balanceScale.setSelectionListener(scaleSelectionListener);
-		
+
 		this.reverbScale = new TGScalePopup(controllerScalesComposite);
 		this.reverbScale.setSelectionListener(scaleSelectionListener);
-		
+
 		this.chorusScale = new TGScalePopup(controllerScalesComposite);
 		this.chorusScale.setSelectionListener(scaleSelectionListener);
-		
+
 		this.tremoloScale = new TGScalePopup(controllerScalesComposite);
 		this.tremoloScale.setSelectionListener(scaleSelectionListener);
-		
+
 		this.phaserScale = new TGScalePopup(controllerScalesComposite);
 		this.phaserScale.setSelectionListener(scaleSelectionListener);
-		
+
 		//--------------------------------------------------------------//
-		
+
 		this.loadProperties();
 		this.updateItems();
 	}
-	
-	
+
+
 	public void loadProperties(){
 		if(!isDisposed()){
 			this.percussionButton.setText(TuxGuitar.getProperty("instrument.percussion-channel"));
 			this.removeChannelButton.setText(TuxGuitar.getProperty("remove"));
-			
+
 			this.volumeScale.setText(TuxGuitar.getProperty("instrument.volume"));
 			this.balanceScale.setText(TuxGuitar.getProperty("instrument.balance"));
 			this.reverbScale.setText(TuxGuitar.getProperty("instrument.reverb"));
 			this.chorusScale.setText(TuxGuitar.getProperty("instrument.chorus"));
 			this.tremoloScale.setText(TuxGuitar.getProperty("instrument.tremolo"));
 			this.phaserScale.setText(TuxGuitar.getProperty("instrument.phaser"));
-			
+
 			this.updateChannelCombos( this.getHandle().isPlayerRunning() );
 		}
 	}
-	
+
 	public void updateItems(){
 		if(!isDisposed() && getChannel() != null){
 			boolean playerRunning = this.getHandle().isPlayerRunning();
 			boolean anyPercussionChannel = this.getHandle().isAnyPercussionChannel();
 			boolean anyTrackConnectedToChannel = this.getHandle().isAnyTrackConnectedToChannel(getChannel());
-			
+
 			this.nameText.setText(getChannel().getName());
 			this.percussionButton.setSelection(getChannel().isPercussionChannel());
 			this.percussionButton.setEnabled(!anyTrackConnectedToChannel && (!anyPercussionChannel || getChannel().isPercussionChannel()));
 			this.removeChannelButton.setEnabled(!anyTrackConnectedToChannel);
-			
+
 			this.volumeScale.setValue(getChannel().getVolume());
 			this.balanceScale.setValue(getChannel().getBalance());
 			this.reverbScale.setValue(getChannel().getReverb());
 			this.chorusScale.setValue(getChannel().getChorus());
 			this.tremoloScale.setValue(getChannel().getTremolo());
 			this.phaserScale.setValue(getChannel().getPhaser());
-			
+
 			this.updateBankCombo(playerRunning);
 			this.updateProgramCombo(playerRunning);
 			this.updateChannelCombos(playerRunning);
 		}
 	}
-	
+
 	private void updateChannelCombos(boolean playerRunning){
 		if(!isDisposed() && getChannel() != null){
-			List channels = getHandle().getFreeChannels(getChannel());
-			
+			List<Integer> channels = getHandle().getFreeChannels(getChannel());
+
 			String channel1Prefix = TuxGuitar.getProperty("instrument.channel");
 			String channel2Prefix = TuxGuitar.getProperty("instrument.effect-channel");
-			
+
 			this.reloadChannelCombo(this.channel1Combo, channels, getChannel().getChannel(), channel1Prefix);
 			this.reloadChannelCombo(this.channel2Combo, channels, getChannel().getEffectChannel(), channel2Prefix);
-			
+
 			this.channel1Combo.setEnabled(!playerRunning && !getChannel().isPercussionChannel() && this.channel1Combo.getItemCount() > 0);
 			this.channel2Combo.setEnabled(!playerRunning && !getChannel().isPercussionChannel() && this.channel2Combo.getItemCount() > 0);
 		}
 	}
-	
-	private void reloadChannelCombo(Combo combo, List channels, int selected, String prefix){
-		if(!(combo.getData() instanceof List) || isDifferentList(channels, (List)combo.getData())){
+
+	private void reloadChannelCombo(Combo combo, List<Integer> channels, int selected, String prefix){
+		if(!(combo.getData() instanceof List) || channels.equals(combo.getData())){
 			combo.removeAll();
 			combo.setData(channels);
 			for( int i = 0 ; i < channels.size() ; i ++ ){
-				Integer channel = (Integer)channels.get(i);
-				
+				Integer channel = channels.get(i);
+
 				combo.add(prefix + " #" + channel.toString() );
 			}
 		}
 		for( int i = 0 ; i < channels.size() ; i ++ ){
-			Integer channel = (Integer)channels.get(i);
+			Integer channel = channels.get(i);
 			if( channel.intValue() == selected ){
 				combo.select( i );
 			}
 		}
 	}
-	
+
 	private void updateBankCombo(boolean playerRunning){
 		if(!isDisposed() && getChannel() != null){
 			if( this.bankCombo.getItemCount() == 0 ){
@@ -247,15 +255,15 @@ private void updateBankCombo(boolean playerRunning){
 			this.bankCombo.setEnabled(!getChannel().isPercussionChannel());
 		}
 	}
-	
+
 	private void updateProgramCombo(boolean playerRunning){
 		if(!isDisposed() && getChannel() != null){
-			List programNames = getProgramNames();
-			if(!(this.programCombo.getData() instanceof List) || isDifferentList(programNames, (List)this.programCombo.getData())){
+			List<String> programNames = getProgramNames();
+			if(!(this.programCombo.getData() instanceof List) || !programNames.equals(this.programCombo.getData())){
 				this.programCombo.removeAll();
 				this.programCombo.setData(programNames);
 				for( int i = 0 ; i < programNames.size() ; i ++ ){
-					this.programCombo.add((String)programNames.get(i));
+					this.programCombo.add(programNames.get(i));
 				}
 			}
 			if( getChannel().getProgram() >= 0 && getChannel().getProgram() < this.programCombo.getItemCount() ){
@@ -263,9 +271,9 @@ private void updateProgramCombo(boolean playerRunning){
 			}
 		}
 	}
-	
-	private List getProgramNames(){
-		List programNames = new ArrayList();
+
+	private List<String> getProgramNames(){
+		List<String> programNames = new ArrayList<String>();
 		if(!getChannel().isPercussionChannel() ){
 			MidiInstrument[] instruments = TuxGuitar.instance().getPlayer().getInstruments();
 			if (instruments != null) {
@@ -281,35 +289,22 @@ private List getProgramNames(){
 		if( programNames.isEmpty() ){
 			String programPrefix = TuxGuitar.getProperty("instrument.program");
 			for (int i = 0; i < 128; i++) {
-				programNames.add((programPrefix + " #" + i));
+				programNames.add(programPrefix + " #" + i);
 			}
 		}
 		return programNames;
 	}
-	
-	private boolean isDifferentList(List list1, List list2){
-		if( list1.size() != list2.size() ){
-			return true;
-		}
-		for( int i = 0 ; i < list1.size() ; i ++ ){
-			if(!list1.get(i).equals(list2.get(i)) ){
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
+
 	public void checkForNameModified(){
 		if( getChannel() != null && !isDisposed() && !this.nameText.getText().equals(getChannel().getName()) ){
 			updateChannel(false);
 		}
 	}
-	
+
 	public TGChannelHandle getHandle() {
 		return this.dialog.getHandle();
 	}
-	
+
 	public TGChannel getChannel() {
 		return this.channel;
 	}
@@ -317,25 +312,25 @@ public TGChannel getChannel() {
 	public void setChannel(TGChannel channel) {
 		this.channel = channel;
 	}
-	
+
 	public Composite getComposite(){
 		return this.composite;
 	}
-	
+
 	public boolean isDisposed() {
 		return (this.getComposite() == null || this.getComposite().isDisposed());
 	}
-	
+
 	public void dispose() {
 		if(!isDisposed()){
 			getComposite().dispose();
 		}
 	}
-	
+
 	public void updateChannel(boolean percussionChanged){
-		if( getChannel() != null && !isDisposed() ){			
+		if( getChannel() != null && !isDisposed() ){
 			boolean percussionChannel = this.percussionButton.getSelection();
-			
+
 			int bank = getChannel().getBank();
 			int program = getChannel().getProgram();
 			if( percussionChanged ){
@@ -346,13 +341,13 @@ public void updateChannel(boolean percussionChanged){
 				if( bankSelection >= 0 ){
 					bank = bankSelection;
 				}
-				
+
 				int programSelection = this.programCombo.getSelectionIndex();
 				if( programSelection >= 0 ){
 					program = programSelection;
 				}
 			}
-			
+
 			int channel1 = -1;
 			int channel2 = -1;
 			if( percussionChannel ){
@@ -361,19 +356,25 @@ public void updateChannel(boolean percussionChanged){
 			}else{
 				int channel1Selection = this.channel1Combo.getSelectionIndex();
 				Object channel1Data = this.channel1Combo.getData();
-				if( channel1Selection >= 0 && channel1Data instanceof List && ((List)channel1Data).size() > channel1Selection ){
-					channel1 = ((Integer)((List)channel1Data).get(channel1Selection)).intValue();
+				if( channel1Selection >= 0 && channel1Data instanceof List ){
+					List<?> list = (List<?>) channel1Data;
+					if ( list.size() > channel1Selection ){
+						channel1 = ((Integer)list.get(channel1Selection)).intValue();
+					}
 				}
-				
+
 				int channel2Selection = this.channel2Combo.getSelectionIndex();
 				Object channel2Data = this.channel2Combo.getData();
-				if( channel2Selection >= 0 && channel2Data instanceof List && ((List)channel2Data).size() > channel2Selection ){
-					channel2 = ((Integer)((List)channel2Data).get(channel2Selection)).intValue();
+				if( channel2Selection >= 0 && channel2Data instanceof List ){
+					List<?> list = (List<?>) channel2Data;
+					if ( list.size() > channel2Selection ){
+						channel2 = ((Integer)list.get(channel2Selection)).intValue();
+					}
 				}
 			}
-			
+
 			getHandle().updateChannel(
-				getChannel().getChannelId(), 
+				getChannel().getChannelId(),
 				(short)channel1,
 				(short)channel2,
 				(short)bank,
@@ -388,7 +389,7 @@ public void updateChannel(boolean percussionChanged){
 			);
 		}
 	}
-	
+
 	public void removeChannel(){
 		if( getChannel() != null && !isDisposed() ){
 			getHandle().removeChannel(getChannel());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelList.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelList.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelList.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelList.java
index 29c4dada..f92916da 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelList.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelList.java
@@ -11,68 +11,68 @@
 import org.herac.tuxguitar.song.models.TGChannel;
 
 public class TGChannelList {
-	
-	private List channelItems;
-	private TGChannelManagerDialog dialog;
-	
+
+	private final List<TGChannelItem> channelItems;
+	private final TGChannelManagerDialog dialog;
+
 	protected ScrolledComposite channelItemAreaSC;
 	protected Composite channelItemArea;
-	
+
 	public TGChannelList(TGChannelManagerDialog dialog){
 		this.dialog = dialog;
-		this.channelItems = new ArrayList();
+		this.channelItems = new ArrayList<TGChannelItem>();
 	}
-	
+
 	public void show(final Composite parent){
 		this.channelItemAreaSC = new ScrolledComposite(parent, SWT.NONE | SWT.V_SCROLL);
 		this.channelItemAreaSC.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.channelItemAreaSC.setExpandHorizontal(true);
 		this.channelItemAreaSC.setExpandVertical(true);
-		
+
 		this.channelItemArea = new Composite(this.channelItemAreaSC, SWT.NONE);
 		this.channelItemArea.setLayout(this.dialog.createGridLayout(1,false, true, false));
 		this.channelItemArea.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.channelItemAreaSC.setContent(this.channelItemArea);
 	}
-	
+
 	public void removeChannelsAfter( int count ){
 		while(!this.channelItems.isEmpty() && this.channelItems.size() > count ){
-			TGChannelItem tgChannelItem = (TGChannelItem)this.channelItems.get(0);
+			TGChannelItem tgChannelItem = this.channelItems.get(0);
 			tgChannelItem.dispose();
-			
+
 			this.channelItemAreaSC.setMinSize(this.channelItemArea.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 			this.channelItemArea.layout(true,true);
 			this.channelItems.remove(tgChannelItem);
 		}
 	}
-	
+
 	public TGChannelItem getOrCreateChannelItemAt( int index ){
 		while( this.channelItems.size() <= index ){
 			TGChannelItem tgChannelItem = new TGChannelItem(this.dialog);
 			tgChannelItem.show(this.channelItemArea, new GridData(SWT.FILL,SWT.TOP,true,false));
-			
+
 			this.channelItemAreaSC.setMinSize(this.channelItemArea.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 			this.channelItemArea.layout(true,true);
 			this.channelItems.add(tgChannelItem);
 		}
-		return (TGChannelItem)this.channelItems.get(index);
+		return this.channelItems.get(index);
 	}
-	
+
 	public void loadProperties(){
-		Iterator it = this.channelItems.iterator();
+		Iterator<TGChannelItem> it = this.channelItems.iterator();
 		while( it.hasNext() ){
-			TGChannelItem tgChannelItem = (TGChannelItem)it.next();
+			TGChannelItem tgChannelItem = it.next();
 			tgChannelItem.loadProperties();
 		}
 	}
-	
+
 	public void updateItems(){
-		List channels = this.dialog.getHandle().getChannels();
-		
+		List<TGChannel> channels = this.dialog.getHandle().getChannels();
+
 		this.removeChannelsAfter(channels.size());
-		
+
 		for( int i = 0 ; i < channels.size() ; i ++ ){
-			TGChannel channel = (TGChannel)channels.get(i);
+			TGChannel channel = channels.get(i);
 			TGChannelItem tgChannelItem = getOrCreateChannelItemAt(i);
 			tgChannelItem.setChannel(channel);
 			tgChannelItem.updateItems();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelManagerDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelManagerDialog.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelManagerDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelManagerDialog.java
index 333d633a..eb21f4a4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGChannelManagerDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGChannelManagerDialog.java
@@ -22,131 +22,134 @@
 import org.herac.tuxguitar.song.models.TGChannel;
 
 public class TGChannelManagerDialog implements TGUpdateListener,IconLoader,LanguageLoader{
-	
+
 	protected Shell dialog;
-	
-	private TGChannelHandle channelHandle;
+
+	private final TGChannelHandle channelHandle;
 	private TGChannelList channelList;
-	
+
 	private Button addChannelButton;
-	
+
 	private Scale volumeScale;
 	private Label volumeValueLabel;
 	private Label volumeValueTitleLabel;
 	private String volumeTip;
 	private int volumeValue;
-	
+
 	public TGChannelManagerDialog(){
 		this.channelHandle = new TGChannelHandle();
 	}
-	
+
 	public void show(){
 		show(TuxGuitar.instance().getShell());
 	}
-	
+
 	public void show(Shell parent){
 		this.dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.RESIZE);
 		this.dialog.setLayout(createGridLayout(1,false, true, true));
-		
+
 		this.createWindow(this.dialog, new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.addListeners();
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				removeListeners();
 				TuxGuitar.instance().updateCache(true);
 			}
 		});
-		
+
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	public boolean isDisposed() {
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	public void dispose() {
 		if(!isDisposed()){
 			this.dialog.dispose();
 		}
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
 		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
 	}
-	
+
 	private void createWindow(Composite parent, Object layoutData){
 		Composite composite = new Composite(parent, SWT.BORDER);
 		composite.setLayout(createGridLayout(2,false,true,true));
 		composite.setLayoutData(layoutData);
-		
+
 		createChannelList(composite);
 		createRightComposite(composite);
-		
+
 		updateItems();
 		loadProperties();
 	}
-	
+
 	private void createRightComposite(Composite composite){
 		Composite rightComposite = new Composite(composite, SWT.NONE);
 		rightComposite.setLayout(createGridLayout(1,false, true, false));
 		rightComposite.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,false,true));
-		
+
 		Composite toolbarComposite = new Composite(rightComposite, SWT.BORDER);
 		toolbarComposite.setLayout(createGridLayout(1,false, true, true));
 		toolbarComposite.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
-		
+
 		this.addChannelButton = new Button(toolbarComposite, SWT.PUSH);
 		this.addChannelButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 		this.addChannelButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getHandle().addChannel();
 			}
 		});
-		
-		
+
+
 		Composite volumeComposite = new Composite(rightComposite, SWT.BORDER);
 		volumeComposite.setLayout(createGridLayout(1,false, true, true));
 		volumeComposite.setLayoutData(new GridData(SWT.CENTER,SWT.FILL,true,true));
-		
+
 		this.volumeScale = new Scale(volumeComposite, SWT.VERTICAL);
 		this.volumeScale.setMaximum(10);
 		this.volumeScale.setMinimum(0);
 		this.volumeScale.setIncrement(1);
 		this.volumeScale.setPageIncrement(1);
 		this.volumeScale.setLayoutData(new GridData(SWT.CENTER,SWT.FILL,true,true));
-		
+
 		Label separator = new Label(volumeComposite, SWT.HORIZONTAL | SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,false));
-		
+
 		Composite volumeValueComposite = new Composite(volumeComposite, SWT.NONE);
 		volumeValueComposite.setLayout(createGridLayout(2,false, true, true));
-		
+
 		this.volumeValueTitleLabel = new Label(volumeValueComposite, SWT.NONE);
-		
+
 		this.volumeValueLabel = new Label(volumeValueComposite, SWT.CENTER);
 		this.volumeValueLabel.setLayoutData(createGridData(SWT.CENTER,SWT.NONE,true,false,1,1,40,0));
-		
+
 		this.volumeScale.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				changeVolume();
 			}
 		});
 	}
-	
+
 	private void createChannelList(Composite composite){
 		this.channelList = new TGChannelList(this);
 		this.channelList.show(composite);
 	}
-	
+
 	public GridLayout createGridLayout(int numColumns, boolean makeColumnsEqualWidth, boolean addSpacings, boolean addMargins) {
 		GridLayout gridLayout = new GridLayout();
 		gridLayout.numColumns = numColumns;
@@ -161,7 +164,7 @@ public GridLayout createGridLayout(int numColumns, boolean makeColumnsEqualWidth
 		gridLayout.marginBottom = (addMargins ? gridLayout.marginBottom : 0);
 		return gridLayout;
 	}
-	
+
 	public GridData createGridData(int hAlign, int vAlign, boolean gEHSpace, boolean gEVSpace, int hSpan, int vSpan,int mWidth, int mHeight){
 		GridData gridData = new GridData();
 		gridData.horizontalAlignment = hAlign;
@@ -174,7 +177,7 @@ public GridData createGridData(int hAlign, int vAlign, boolean gEHSpace, boolean
 		gridData.minimumHeight = mHeight;
 		return gridData;
 	}
-	
+
 	protected void changeVolume(){
 		int volume = (short)(this.volumeScale.getMaximum() - this.volumeScale.getSelection());
 		if(volume != TuxGuitar.instance().getPlayer().getVolume()){
@@ -184,53 +187,55 @@ protected void changeVolume(){
 			this.volumeValue = volume;
 		}
 	}
-	
+
 	private void updateItems(){
 		if(!isDisposed()){
 			TuxGuitar.instance().loadCursor(this.dialog,SWT.CURSOR_WAIT);
-			
+
 			this.channelList.updateItems();
-			
+
 			int volume = TuxGuitar.instance().getPlayer().getVolume();
 			if(this.volumeValue != volume){
 				this.volumeScale.setSelection(this.volumeScale.getMaximum() - TuxGuitar.instance().getPlayer().getVolume());
 				this.volumeValueLabel.setText(Integer.toString(this.volumeScale.getMaximum() - this.volumeScale.getSelection()));
 				this.volumeValue = volume;
 			}
-			
+
 			TuxGuitar.instance().loadCursor(this.dialog,SWT.CURSOR_ARROW);
 		}
 	}
 
+	@Override
 	public void loadProperties() {
 		if(!isDisposed()){
 			this.addChannelButton.setText(TuxGuitar.getProperty("add"));
-			
+
 			this.volumeValueTitleLabel.setText(TuxGuitar.getProperty("instruments.volume") + ":");
 			this.volumeTip = TuxGuitar.getProperty("instruments.volume");
 			this.volumeScale.setToolTipText(this.volumeTip + ": " + TuxGuitar.instance().getPlayer().getVolume());
 			this.dialog.setText(TuxGuitar.getProperty("instruments.dialog-title"));
-			
+
 			this.channelList.loadProperties();
 		}
 	}
 
+	@Override
 	public void loadIcons() {
-		// TODO Auto-generated method stub
 	}
 
+	@Override
 	public void doUpdate(int type) {
 		if( type == TGUpdateListener.SELECTION ){
 			this.updateItems();
 		}
 	}
-	
+
 	public void onUpdateChannel(TGChannel channel){
 		if (TuxGuitar.instance().getPlayer().isRunning()) {
 			TuxGuitar.instance().getPlayer().updateControllers();
 		}
 	}
-	
+
 	public TGChannelHandle getHandle(){
 		return this.channelHandle;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGScalePopup.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGScalePopup.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGScalePopup.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGScalePopup.java
index 20605fdd..bd37cfe3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGScalePopup.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGScalePopup.java
@@ -17,7 +17,7 @@
 import org.eclipse.swt.widgets.Shell;
 
 public class TGScalePopup{
-	
+
 	private int type;
 	private int value;
 	private boolean inverted;
@@ -26,27 +26,29 @@ public class TGScalePopup{
 	private Button item;
 	private Scale scale;
 	private String text;
-	
+
 	private SelectionListener selectionListener;
 	private MouseListener mouseListener;
-	
+
 	public TGScalePopup(Composite parent){
 		this.init(parent);
 	}
-	
+
 	public void init(Composite parent){
 		this.value = -1;
 		this.inverted =  true;
 		this.item = new Button(parent, SWT.PUSH);
 		this.item.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				showShell();
 			}
 		});
 	}
-	
+
 	public void addDefaultListeners(){
 		this.scale.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent event) {
 				TGScalePopup.this.getValueFromScale();
 				if( TGScalePopup.this.selectionListener != null ){
@@ -58,7 +60,7 @@ public void widgetSelected(SelectionEvent event) {
 			this.scale.addMouseListener(this.mouseListener);
 		}
 	}
-	
+
 	private GridLayout getGridLayout(){
 		GridLayout layout = new GridLayout();
 		layout.horizontalSpacing = 0;
@@ -71,24 +73,24 @@ private GridLayout getGridLayout(){
 		layout.marginHeight = 0;
 		return layout;
 	}
-	
+
 	private GridData getScaleLayoutData(){
 		GridData data = new GridData(SWT.CENTER,SWT.FILL,false,true);
 		data.heightHint = 65;
 		return data;
 	}
-		
+
 	public int getType(){
 		return this.type;
 	}
-	
+
 	public int getValue(){
 		if( this.value < 0 ){
 			this.getValueFromScale();
 		}
 		return this.value;
 	}
-	
+
 	public void setValue(int value){
 		if( value != this.value ){
 			this.value = value;
@@ -96,19 +98,19 @@ public void setValue(int value){
 			this.updateToolTipValue();
 		}
 	}
-	
+
 	public void getValueFromScale(){
 		if(!isShellDisposed()){
 			this.setValue( ( this.inverted ? 127 - this.scale.getSelection() : this.scale.getSelection() ) );
 		}
 	}
-	
+
 	public void setValueToScale(){
 		if(!isShellDisposed()){
 			this.scale.setSelection( ( this.inverted ? 127 - this.value : this.value ) );
 		}
 	}
-	
+
 	public void updateToolTipValue(){
 		if( this.getText() != null ){
 			this.item.setToolTipText( this.getText() + ": " + this.getValue() );
@@ -117,7 +119,7 @@ public void updateToolTipValue(){
 			}
 		}
 	}
-	
+
 	public void setText(String text){
 		this.text = text;
 		if(this.getText() != null && this.getText().length() > 0){
@@ -125,25 +127,27 @@ public void setText(String text){
 		}
 		this.updateToolTipValue();
 	}
-	
+
 	public String getText(){
 		return this.text;
 	}
-	
+
 	public void showShell() {
-		if( isShellDisposed() ){			
+		if( isShellDisposed() ){
 			this.shell = new Shell( this.item.getShell(), SWT.NO_TRIM);
 			this.shell.setVisible(false);
 			this.shell.setLayout(getGridLayout());
 			this.shell.addShellListener(new ShellAdapter() {
+				@Override
 				public void shellDeactivated(ShellEvent e) {
 					hideShell();
 				}
+				@Override
 				public void shellClosed(ShellEvent e) {
 					hideShell();
 				}
 			});
-			
+
 			this.composite = new Composite(this.shell, SWT.BORDER);
 			this.composite.setLayout(getGridLayout());
 			this.composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -156,28 +160,28 @@ public void shellClosed(ShellEvent e) {
 			this.scale.setLayoutData(getScaleLayoutData());
 			this.setValueToScale();
 			this.addDefaultListeners();
-			
+
 			Rectangle bounds = this.item.getBounds();
 			Point location = this.item.getParent().toDisplay(new Point(bounds.x, bounds.y));
-			
+
 			this.shell.pack();
 			this.shell.setLocation( (location.x + (bounds.width / 2)) - (this.shell.getSize().x / 2), location.y + bounds.height);
 			this.shell.setVisible(true);
 			this.shell.setActive();
 		}
 	}
-	
+
 	public void hideShell() {
 		if(!isShellDisposed()){
 			this.shell.dispose();
 			this.shell = null;
 		}
 	}
-	
+
 	public boolean isShellDisposed(){
 		return ( this.shell == null || this.shell.isDisposed() );
 	}
-	
+
 	public void setSelectionListener(SelectionListener selectionListener){
 		this.selectionListener = selectionListener;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGScaleSelectionListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGScaleSelectionListener.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGScaleSelectionListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGScaleSelectionListener.java
index 2d845f12..621b5465 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/channel/TGScaleSelectionListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/channel/TGScaleSelectionListener.java
@@ -5,71 +5,74 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class TGScaleSelectionListener extends SelectionAdapter implements Runnable{
-	
+
 	private static final long MAXIMUM_TIME = 500;
-	
+
 	private long time;
 	private boolean running;
 	private TGChannelItem handle;
-	
+
 	private Object mutex = new Object();
-	
+
 	public TGScaleSelectionListener(TGChannelItem handle){
 		this.handle = handle;
 	}
-	
+
+	@Override
 	public void widgetSelected(SelectionEvent e) {
 		this.process();
 	}
-	
+
 	public void process(){
 		synchronized (this.mutex) {
-			
+
 			if(!this.running){
 				this.running = true;
-				
+
 				// Start the thread.
 				Thread thread = new Thread(this);
 				thread.start();
 			}
-			
+
 			this.time = System.currentTimeMillis();
-			
+
 			this.mutex.notifyAll();
 		}
 	}
-	
+
+	@Override
 	public void run(){
 		try {
 			long timeToWait = MAXIMUM_TIME;
-			
+
 			while( this.running ){
 				synchronized (this.mutex) {
 					timeToWait = ((this.time + MAXIMUM_TIME) - System.currentTimeMillis());
-					
+
 					this.running = ( timeToWait > 0 );
-					
+
 					if( this.running ){
 						this.mutex.wait(timeToWait);
 					}
 				}
 			}
-			
+
 			this.doActionSynchronized();
-			
+
 		} catch (Throwable e) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void doActionSynchronized() throws Throwable {
 		TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+			@Override
 			public void run() throws Throwable {
-				doAction();		
+				doAction();
 			}
 		});
 	}
-	
+
 	public void doAction(){
 		this.handle.updateChannel(false);
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCreatorListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCreatorListener.java
new file mode 100644
index 00000000..cdc60d4f
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCreatorListener.java
@@ -0,0 +1,11 @@
+package org.herac.tuxguitar.app.editors.chord;
+
+import java.util.List;
+
+import org.herac.tuxguitar.song.models.TGChord;
+
+public interface ChordCreatorListener {
+
+	public void notifyChords(ChordCreatorUtil process, List<TGChord> chords);
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCreatorUtil.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCreatorUtil.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCreatorUtil.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCreatorUtil.java
index ed4b5fd6..4877b3a2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCreatorUtil.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCreatorUtil.java
@@ -4,7 +4,7 @@
 
  * Redesigned on 05-March-2007
 
- * 
+ *
 
  */
 
@@ -12,97 +12,93 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-
 import java.util.Comparator;
-
 import java.util.Iterator;
-
 import java.util.List;
 
 import org.herac.tuxguitar.app.TuxGuitar;
-
 import org.herac.tuxguitar.song.models.TGChord;
 
 /**
- * 
+ *
  * Class that helps to create a chord from information put in ChordSelector
  * dialog.
- * 
+ *
  * Also contains ChordDatabase static field.
- * 
+ *
  * @author Nikola Kolarovic
- * 
+ *
  * @author julian
- * 
+ *
  */
 public class ChordCreatorUtil {
-	
+
 	/**
 	 * Maximum number of strings variable - has twin in TrackPropertiesAction
 	 * class
 	 */
 	public static final int MAX_STRINGS = 7;
-	
+
 	/** Maximum fret distance for a chord */
-	
+
 	public static final int MAX_FRET_SPAN = 5;
-	
+
 	/** mark for bass note type **/
 	private final int BASS_INDEX = -1;
-	
+
 	/** mark for essential note in a chord - MUST be in */
 	private final int ESSENTIAL_INDEX = -2;
-	
+
 	/** mark for essential note in a chord - PENALTY if not in */
 	private final int NOT_ESSENTIAL_INDEX = -3;
-	
+
 	/** Keep the Thread control */
 	private static long runningProcess;
-	
+
 	// ------ attributes ------
-	
+
 	//protected ChordInfo info;
-	private long processId;
-	
-	private ChordCreatorListener listener;
-	
+	private final long processId;
+
+	private final ChordCreatorListener listener;
+
 	/** the alteration List selectionIndex */
 	private int alteration;
-	
+
 	private int chordIndex;
-	
+
 	/** essential notes for the chord (from ChordInfo) */
 	private int[] requiredNotes;
-	
+
 	/** notes that expand the chord (add+-) */
 	private int[] expandingNotes;
-	
+
 	/** is the fifth altered */
 	private int add5 = 0;
-	
+
 	/** name of a chord */
 	private String chordName = null;
-	
-	private int bassTonic; 
-	
+
+	private int bassTonic;
+
 	private int chordTonic;
-	
+
 	/** current tunning */
 	private int[] tuning;
-	
+
 	private ChordCreatorUtil(long processId,ChordCreatorListener listener){
 		this.processId = processId;
 		this.listener = listener;
 	}
-	
+
 	public boolean isValidProcess(){
 		return (this.processId == runningProcess);
 	}
-	
+
 	public static long getNewProcess(){
 		return (++ runningProcess);
 	}
-	
+
 	public static void getChords(final ChordCreatorListener listener,
 	                             final int[] tuning,
 	                             final int chordIndex,
@@ -115,15 +111,16 @@ public static void getChords(final ChordCreatorListener listener,
 	                             final int bassTonic,
 	                             final int chordTonic,
 	                             final boolean sharp){
-		
+
 		final ChordCreatorUtil chordCreator = new ChordCreatorUtil(getNewProcess(), listener );
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				chordCreator.getChords( tuning, chordIndex, alteration, plusMinus, add, add5, add9, add11, bassTonic, chordTonic, sharp);
 			}
 		}).start();
 	}
-	
+
 	protected void getChords(int[] tuning,
 	                         int chordIndex,
 	                         int alteration,
@@ -135,23 +132,23 @@ protected void getChords(int[] tuning,
 	                         int bassTonic,
 	                         int chordTonic,
 	                         boolean sharp) {
-		
+
 		if(!isValidProcess()){
 			return;
 		}
-		
+
 		this.add5 = add5;
-		
+
 		this.tuning = tuning;
-		
+
 		this.chordIndex = chordIndex;
-		
+
 		this.chordTonic = chordTonic;
-		
+
 		this.bassTonic = bassTonic;
-		
+
 		this.alteration = alteration;
-		
+
 		this.chordName = new ChordNamingConvention().createChordName(this.chordTonic,
 		                                                             this.chordIndex,
 		                                                             this.alteration,
@@ -162,8 +159,8 @@ protected void getChords(int[] tuning,
 		                                                             add11,
 		                                                             this.bassTonic,
 		                                                             sharp);
-		
-		
+
+
 		// find the notes that expand the chord
 		if (this.alteration!=0) {
 			if (add) {
@@ -177,31 +174,31 @@ protected void getChords(int[] tuning,
 				this.expandingNotes = new int[1+this.alteration];
 				this.expandingNotes[0] = 11; //7b
 				this.expandingNotes[1] = getAddNote(this.alteration-1,plusMinus); //this.alteration+-
-				
+
 				// rest
 				for (int i=2; i<=this.alteration; i++)
 					this.expandingNotes[i]=getAddNote(i-2, i==2 ? add9 : add11); // @2=add9+-, @3=add11+- tone
 			}
-			
+
 		}
 		else this.expandingNotes=new int[0];
-		
-		
-		
+
+
+
 		// Required notes
 		//this.requiredNotes = ((ChordDatabase.ChordInfo)new ChordDatabase().getChords().get(chordIndex)).cloneRequireds();
 		this.requiredNotes = ChordDatabase.get(chordIndex).cloneRequireds();
 		//IT DON'T BUILD UNDER JRE1.4
 		//this.requiredNotes = ((ChordDatabase.ChordInfo) ChordCreatorUtil.getChordData().getChords().get(chordIndex)).getRequiredNotes().clone();
-		
-		
+
+
 		// adjust the subdominant if needed
 		if (add5!=0) {
 			for (int i=0; i<this.requiredNotes.length; i++)
 				if (this.requiredNotes[i]==8) // alternate the subdominant
 					this.requiredNotes[i]+=(add5==1 ? 1 : -1);
 		}
-		
+
 		// first count different from -1
 		int count = 0;
 		for (int i=0; i<this.requiredNotes.length; i++) {
@@ -219,16 +216,16 @@ protected void getChords(int[] tuning,
 			}
 		// and substitute them
 		this.requiredNotes = tempNotes;
-		
+
 		//return getChords();
 		if(isValidProcess()){
-			List chords = getChords();
+			List<TGChord> chords = getChords();
 			if(chords != null && isValidProcess()){
 				this.listener.notifyChords(this, chords);
 			}
 		}
 	}
-	
+
 	/** We have to make sure that if required note is already inside
 	 * expanding notes array so we don't put it twice...
 	 */
@@ -238,74 +235,74 @@ protected int checkForOverlapping(int checkIt) {
 				return -1;
 		return checkIt;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * Creates the chord combinations out of given data and then uses some kind
 	 * of
-	 * 
+	 *
 	 * heuristics to check the most suitable formations.
-	 * 
+	 *
 	 * @return the list of TGChord structures that are most suitable
-	 * 
+	 *
 	 */
-	private java.util.List getChords() {
+	private java.util.List<TGChord> getChords() {
 		if(!isValidProcess()){
 			return null;
 		}
-		ArrayList potentialNotes = makePotentialNotes();
-		
-		ArrayList combinations = makeCombinations( potentialNotes);
-		
-		ArrayList priorities = determinePriority( combinations);
-		
-		ArrayList theBestOnes = takeBest( priorities);
-		
+		ArrayList<ArrayList<StringValue>> potentialNotes = makePotentialNotes();
+
+		ArrayList<ArrayList<StringValue>> combinations = makeCombinations( potentialNotes);
+
+		ArrayList<PriorityItem> priorities = determinePriority( combinations);
+
+		List<List<StringValue>> theBestOnes = takeBest( priorities);
+
 		return createChords( theBestOnes);
 	}
-	
+
 	/**
 	 * Creates the TGChord ArrayList out of StringValue's ArrayLists
-	 * 
+	 *
 	 * @param Highest rated StringValues
 	 * @return TGChord collection
 	 */
-	private ArrayList createChords(ArrayList top) {
+	private List<TGChord> createChords(List<List<StringValue>> top) {
 		if(!isValidProcess()){
 			return null;
 		}
-		
-		ArrayList chords = new ArrayList(top.size());
-		
-		Iterator it = top.iterator();
-		
+
+		ArrayList<TGChord> chords = new ArrayList<TGChord>(top.size());
+
+		Iterator<List<StringValue>> it = top.iterator();
+
 		while (it.hasNext()) {
 			TGChord chord = TuxGuitar.instance().getSongManager().getFactory()
 					.newChord(this.tuning.length);
-			Iterator it2 = ((ArrayList) it.next()).iterator();
-			
+			Iterator<StringValue> it2 = (it.next()).iterator();
+
 			while (it2.hasNext()) {
-				StringValue stringValue = (StringValue) it2.next();
+				StringValue stringValue = it2.next();
 				int string = ((chord.getStrings().length - 1) - (stringValue.getString()));
 				int fret = stringValue.getFret();
 				chord.addFretValue(string, fret);
 				chord.setName(this.chordName);
 			}
-			
+
 			chords.add(chord);
 		}
 		return chords;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * If string/fret combination is needed for the chord formation, add it into
 	 * List
-	 * 
+	 *
 	 * @return true if the note is needed for chord formation
-	 * 
+	 *
 	 */
-	private void find(int stringTone, int stringIndex, int fret,List stringList){
+	private void find(int stringTone, int stringIndex, int fret,List<StringValue> stringList){
 		if(!isValidProcess()){
 			return;
 		}
@@ -318,7 +315,7 @@ private void find(int stringTone, int stringIndex, int fret,List stringList){
 				stringList.add(new StringValue(stringIndex, fret, i));
 				return;
 			}
-		
+
 		// alterations
 		if (this.expandingNotes.length!=0) {
 			for (int i=0; i<this.expandingNotes.length; i++) {
@@ -329,30 +326,30 @@ private void find(int stringTone, int stringIndex, int fret,List stringList){
 				}
 			}
 		}
-		
+
 		// bass tone
 		if (!bassAlreadyIn)
 			if ((stringTone + fret) % 12 == this.bassTonic) {
 				stringList.add(new StringValue(stringIndex, fret, this.BASS_INDEX));
 				return;
 			}
-		
+
 	}
-	
+
 	/**
 	 * Returns the wanted note for ADD chord
-	 * 
+	 *
 	 * @param type
-	 *            0==add9; 1==add11; 2==add13; 
+	 *            0==add9; 1==add11; 2==add13;
 	 * @param selectionIndex
 	 *            index of selected item in the List combo
 	 * @return wanted note, or -1 if nothing was selected
-	 * 
+	 *
 	 */
 	private int getAddNote(int type, int selectionIndex) {
-		
+
 		int wantedNote = 0;
-		
+
 		switch (type) {
 			case 0:
 				wantedNote = 3; // add9
@@ -364,7 +361,7 @@ private int getAddNote(int type, int selectionIndex) {
 				wantedNote = 10; // add13
 				break;
 		}
-		
+
 		switch (selectionIndex) {
 			case 1:
 				wantedNote++;
@@ -375,272 +372,272 @@ private int getAddNote(int type, int selectionIndex) {
 			default:
 				break;
 		}
-		
+
 		return wantedNote;
 	}
-	
-	private ArrayList makePotentialNotes(){
+
+	private ArrayList<ArrayList<StringValue>> makePotentialNotes(){
 		if(!isValidProcess()){
 			return null;
 		}
-		ArrayList potentialNotes = new ArrayList(this.tuning.length);
-		
+		ArrayList<ArrayList<StringValue>> potentialNotes = new ArrayList<ArrayList<StringValue>>(this.tuning.length);
+
 		for (int string = 0; string < this.tuning.length; string++) {
-			
-			ArrayList currentStringList = new ArrayList(10);
-			
+
+			ArrayList<StringValue> currentStringList = new ArrayList<StringValue>(10);
+
 			// search all the frets
-			
+
 			if (ChordSettings.instance().getFindChordsMin()>0 && ChordSettings.instance().isEmptyStringChords())
 				find(this.tuning[string], string, 0, currentStringList); // if it's open chord but wanted to search from different minimal fret
-				
-			
+
+
 			for (int fret = ChordSettings.instance().getFindChordsMin(); fret <= ChordSettings.instance().getFindChordsMax(); fret++) {
 				// put in all the needed notes
 				find(this.tuning[string], string, fret, currentStringList);
 			}
-			
+
 			potentialNotes.add(currentStringList);
-			
+
 		}
 		return potentialNotes;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * Makes the all-possible combinations of found notes that can be reached by
 	 * fingers
-	 * 
+	 *
 	 * @param potentialNotes
 	 *            list consisted of found notes for each string
-	 * 
+	 *
 	 * @return list of list of StringValues, with tones that can form a chord
-	 * 
+	 *
 	 */
-	private ArrayList makeCombinations(ArrayList potentialNotes) {
+	private ArrayList<ArrayList<StringValue>> makeCombinations(ArrayList<ArrayList<StringValue>> potentialNotes) {
 		if(!isValidProcess()){
 			return null;
 		}
-		
+
 		// COMBINATIONS of strings used in a chord
-		ArrayList stringCombination = new ArrayList(60);
-		ArrayList lastLevelCombination = null;
-		
+		ArrayList<ArrayList<Integer>> stringCombination = new ArrayList<ArrayList<Integer>>(60);
+		ArrayList<ArrayList<Integer>> lastLevelCombination = null;
+
 		for (int i = 0; i < this.tuning.length - 1; i++)
 		{
 			lastLevelCombination = makeStringCombination(lastLevelCombination);
-			
+
 			// lastLevelCombination after 3rd round: [[0, 1, 2, 3], [0, 1, 2,
 			// 4], [0, 1, 3, 4], [0, 2, 3, 4], [1, 2, 3, 4], [0, 1, 2, 5], [0,
 			// 1, 3, 5], [0, 2, 3, 5], [1, 2, 3, 5], [0, 1, 4, 5], [0, 2, 4, 5],
 			// [1, 2, 4, 5], [0, 3, 4, 5], [1, 3, 4, 5], [2, 3, 4, 5]]
-			
+
 			stringCombination.addAll(lastLevelCombination);
 		}
-		
-		ArrayList combinations = new ArrayList(800);
-		
+
+		ArrayList<ArrayList<StringValue>> combinations = new ArrayList<ArrayList<StringValue>>(800);
+
 		// --- combine the StringValues according to strings combination
 		// ----------------------=======
-		
-		Iterator iterator = stringCombination.iterator();
-		
+
+		Iterator<ArrayList<Integer>> iterator = stringCombination.iterator();
+
 		while (iterator.hasNext()) { // go through all string combinations list
 			// take a string combinations
-			ArrayList currentStringCombination = (ArrayList) iterator.next();
-			lastLevelCombination = null;
-			
+			ArrayList<Integer> currentStringCombination = iterator.next();
+			ArrayList<ArrayList<StringValue>> lastLevelCombination2 = null;
+
 			// go through all the strings in one combination
-			for (int level = 0; level < currentStringCombination.size(); level++) { 
-				
+			for (int level = 0; level < currentStringCombination.size(); level++) {
+
 				// take the string index
-				int currentString = ((Integer) currentStringCombination.get(level)).intValue();
-				
+				int currentString = currentStringCombination.get(level).intValue();
+
 				// take all the potential notes from currentString and combine
 				// them with potential notes from other strings
-				
-				lastLevelCombination = makeStringValueCombination(lastLevelCombination,(ArrayList)potentialNotes.get(currentString));
-				
+
+				lastLevelCombination2 = makeStringValueCombination(lastLevelCombination2,potentialNotes.get(currentString));
+
 				// the structure of combinations is AL { AL(StringValue,SV,SV),
 				// AL(SV), AL(SV,SV),AL(SV,SV,SV,SV,SV,SV) }
-				
+
 			}
-			
+
 			if(lastLevelCombination != null){
-				combinations.addAll(lastLevelCombination);
+				combinations.addAll(lastLevelCombination2);
 			}
 		}
-		
+
 		return combinations;
 	}
-	
+
 	/**
 	 * Makes a combination of string indices
-	 * 
+	 *
 	 * @param lastLevelCombination
 	 *            structure to be expanded by current level
-	 * 
+	 *
 	 * @return structure of stringCombination is AL { AL(0), AL(0,1),
 	 *         AL(0,2),AL(0,1,3,4),AL(0,1,2,3,4,5) }
 	 */
-	private ArrayList makeStringCombination(ArrayList lastLevelCombinationRef){
+	private ArrayList<ArrayList<Integer>> makeStringCombination(ArrayList<ArrayList<Integer>> lastLevelCombinationRef){
 		if(!isValidProcess()){
 			return null;
 		}
-		
-		List lastLevelCombination = lastLevelCombinationRef;
-		
+
+		ArrayList<ArrayList<Integer>> lastLevelCombination = lastLevelCombinationRef;
+
 		if (lastLevelCombination == null) {
 			// first combination is AL { AL(0), AL(1), AL(2), AL(3), AL(4),
 			// ...AL(tuning.length) }
-			lastLevelCombination = new ArrayList();
-			
+			lastLevelCombination = new ArrayList<ArrayList<Integer>>();
+
 			for (int i = 0; i < this.tuning.length; i++) {
-				lastLevelCombination.add(new ArrayList());
-				((ArrayList) lastLevelCombination.get(i)).add(new Integer(i));
+				lastLevelCombination.add(new ArrayList<Integer>());
+				lastLevelCombination.get(i).add(i);
 			}
 		}
-		
-		ArrayList thisLevelCombination = new ArrayList();
+
+		ArrayList<ArrayList<Integer>> thisLevelCombination = new ArrayList<ArrayList<Integer>>();
 		for (int current = 1; current < this.tuning.length; current++)
 		{
-			Iterator it = lastLevelCombination.iterator();
-			
+			Iterator<ArrayList<Integer>> it = lastLevelCombination.iterator();
+
 			while (it.hasNext()) {
-				ArrayList combination = (ArrayList) it.next();
+				ArrayList<Integer> combination = it.next();
 				Integer currentInteger = new Integer(current);
-				if (((Integer) combination.get(combination.size() - 1))
+				if (combination.get(combination.size() - 1)
 						.intValue() < current
 						&& !combination.contains(currentInteger)) {
-					
+
 					// check if the string is already in combination
-					ArrayList newCombination = (ArrayList) combination.clone();
+					ArrayList<Integer> newCombination = new ArrayList<Integer>(combination);
 					newCombination.add(currentInteger);
 					thisLevelCombination.add(newCombination);
 				}
-				
+
 			}
-			
+
 		}
-		
+
 		return thisLevelCombination;
-		
+
 	}
-	
+
 	/**
 	 * Makes a combination of notes by multiplying last combination and current
 	 * note arrays
-	 * 
-	 * 
-	 * 
+	 *
+	 *
+	 *
 	 * @param lastLevelCombination
 	 *            structure to be expanded by current level
-	 * 
+	 *
 	 * @param notes
 	 *            notes that can be considered into making a chord
-	 * 
+	 *
 	 * @return structure of StringValue combinations : AL {
 	 *         AL(StringValue,SV,SV), AL(SV), AL(SV,SV),AL(SV,SV,SV,SV,SV,SV) }
-	 * 
+	 *
 	 */
-	private ArrayList makeStringValueCombination(ArrayList lastLevelCombination, ArrayList notes) {
+	private ArrayList<ArrayList<StringValue>> makeStringValueCombination(ArrayList<ArrayList<StringValue>> lastLevelCombination, ArrayList<StringValue> notes) {
 		if(!isValidProcess()){
 			return null;
 		}
-		ArrayList thisLevelCombination = null;
-		
+		ArrayList<ArrayList<StringValue>> thisLevelCombination = null;
+
 		if (lastLevelCombination == null) { // initial combination
-			
-			thisLevelCombination = new ArrayList(notes.size());
-			
+
+			thisLevelCombination = new ArrayList<ArrayList<StringValue>>(notes.size());
+
 			for (int i = 0; i < notes.size(); i++) {
-				
-				thisLevelCombination.add(new ArrayList(6));
-				
-				((ArrayList) thisLevelCombination.get(i)).add(notes.get(i));
-				
+
+				thisLevelCombination.add(new ArrayList<StringValue>(6));
+
+				thisLevelCombination.get(i).add(notes.get(i));
+
 			}
-			
+
 			// first combination is AL { AL(firstOne), AL(anotherFret) }
-			
+
 		}
-		
+
 		else {
-			
-			thisLevelCombination = new ArrayList();
-			
+
+			thisLevelCombination = new ArrayList<ArrayList<StringValue>>();
+
 			for (int i = 0; i < notes.size(); i++)
 				for (int j = 0; j < lastLevelCombination.size(); j++) { // cartesian multiplication
-					ArrayList currentCombination = (ArrayList) ((ArrayList) lastLevelCombination.get(j)).clone();
+					ArrayList<StringValue> currentCombination = new ArrayList<StringValue>(lastLevelCombination.get(j));
 					currentCombination.add(notes.get(i));
-					
+
 					// if the distance maximum between the existing frets
 					// is less than wanted, add it into potential list
-					
+
 					if (checkCombination(currentCombination))
 						thisLevelCombination.add(currentCombination);
-					
+
 				}
 		}
-		
+
 		return thisLevelCombination;
 	}
-	
+
 	/**
 	 * Checks if the combination can be reached by fingers. It is reachable
-	 * 
+	 *
 	 * if the distance between lowest and highest fret is less than
-	 * 
+	 *
 	 * <i>ChordCreatorUtil.MAX_FRET_SPAN</i>.
-	 * 
+	 *
 	 * Also note that this method eliminates or includes the chords with empty
 	 * strings,
-	 * 
+	 *
 	 * which is controlled with <i>boolean ChordCreatorUtil.EMPTY_STRING_CHORDS</i>
-	 * 
+	 *
 	 * @param combination
 	 *            current combination to be examined
-	 * 
+	 *
 	 * @return true if it can be reached
-	 * 
+	 *
 	 */
-	private boolean checkCombination(ArrayList combination) {
-		
-		Iterator it = combination.iterator();
+	private boolean checkCombination(ArrayList<StringValue> combination) {
+
+		Iterator<StringValue> it = combination.iterator();
 		int maxLeft, maxRight;
-		
-		maxLeft = maxRight = ((StringValue) combination.get(0)).getFret();
-		
+
+		maxLeft = maxRight = combination.get(0).getFret();
+
 		while (it.hasNext()) {
-			
-			int fret = ((StringValue) it.next()).getFret();
-			
+
+			int fret = it.next().getFret();
+
 			//chords with empty-string are welcome
 			if (fret != 0 || !ChordSettings.instance().isEmptyStringChords()) {
-				
+
 				if (fret < maxLeft)
 					maxLeft = fret;
-				
+
 				if (fret > maxRight)
 					maxRight = fret;
-				
+
 			}
-			
+
 		}
-		
+
 		if (Math.abs(maxLeft - maxRight) >= MAX_FRET_SPAN)
-			
+
 			return false;
-		
+
 		return true;
-		
+
 	}
-	
+
 	/**
 	 * orders the StringValue ArrayList by their priority, calculated here
-	 * 
+	 *
 	 * for every single chord combination.<br>
-	 * 
+	 *
 	 * Priority is higher if:<br>
 	 *  - tone combination has all notes required for the chord basis<br>
 	 *  - has good chord semantics uses many basic tones, and all necessary
@@ -649,151 +646,151 @@ private boolean checkCombination(ArrayList combination) {
 	 *  - has a chord bass tone as lowest tone<br>
 	 *  - uses more strings<br>
 	 *  - uses good fingering positions<br>
-	 * 
+	 *
 	 * @param allCombinations
 	 *            all the StringValue combinations that make some sense
-	 * 
+	 *
 	 * @return Treemap of the StringValue ArrayLists, in which the key is
-	 * 
+	 *
 	 * <i>float priority</i>.
-	 * 
+	 *
 	 */
-	private ArrayList determinePriority(ArrayList allCombinations) {
+	private ArrayList<PriorityItem> determinePriority(ArrayList<ArrayList<StringValue>> allCombinations) {
 		if(!isValidProcess()){
 			return null;
 		}
-		ArrayList ordered = new ArrayList();
-		
-		Iterator it = allCombinations.iterator();
-		
+		ArrayList<PriorityItem> ordered = new ArrayList<PriorityItem>();
+
+		Iterator<ArrayList<StringValue>> it = allCombinations.iterator();
+
 		while (it.hasNext() && isValidProcess()) {
-			
+
 			float priority = 0;
-			
-			ArrayList stringValueCombination = (ArrayList) it.next();
-			
+
+			ArrayList<StringValue> stringValueCombination = it.next();
+
 			// tone combination has all notes required for the chord basis
-			
+
 			priority += combinationHasAllRequiredNotes(stringValueCombination);
-			
+
 			// uses good chord semantics
-			
+
 			priority += combinationChordSemantics(stringValueCombination);
-			
+
 			// tone combination has all subsequent strings (no string skipping)
-			
+
 			priority += combinationHasSubsequentStrings(stringValueCombination);
-			
+
 			// has a chord bass tone as lowest tone
-			
+
 			priority += combinationBassInBass(stringValueCombination);
-			
+
 			// uses many strings
 			// 4 and less strings will be more praised in case of negative grade
-			// 4 and more strings will be more praised in case of positive grade 
+			// 4 and more strings will be more praised in case of positive grade
 			priority += ChordSettings.instance().getManyStringsGrade() / 3
-				* (stringValueCombination.size()-this.tuning.length / 
+				* (stringValueCombination.size()-this.tuning.length /
 						(ChordSettings.instance().getManyStringsGrade()>0 ? 2 : 1.2) );
-			
+
 			// uses good fingering positions
-			
+
 			priority += combinationHasGoodFingering(stringValueCombination);
-			
+
 			// System.out.println("OVERALL:
 			// "+priority+"----------------------------");
-			
+
 			PriorityItem item = new PriorityItem();
-			
+
 			item.priority = priority;
-			
+
 			item.stringValues = stringValueCombination;
-			
+
 			ordered.add(item);
-			
+
 		}
-		
+
 		return ordered;
-		
+
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * Takes the StringValue ArrayLists that has the best priority rating
-	 * 
+	 *
 	 */
-	private ArrayList takeBest(ArrayList priorityItems) {
+	private List<List<StringValue>> takeBest(List<PriorityItem> priorityItems) {
 		if(!isValidProcess()){
 			return null;
 		}
-		
+
 		int maximum = ChordSettings.instance().getChordsToDisplay();
-		
-		ArrayList bestOnes = new ArrayList(maximum);
-		
+
+		List<List<StringValue>> bestOnes = new ArrayList<List<StringValue>>(maximum);
+
 		Collections.sort(priorityItems, new PriorityComparator());
 		for(int i = 0; i < priorityItems.size() && isValidProcess(); i ++){
-			PriorityItem item = (PriorityItem)priorityItems.get(i);
+			PriorityItem item = priorityItems.get(i);
 			if (!checkIfSubset(item.stringValues, bestOnes) ){
 				bestOnes.add(item.stringValues);
-				
+
 				if( bestOnes.size() >= maximum ){
 					break;
 				}
 			}
 		}
-		
+
 		return bestOnes;
-		
+
 	}
-	
+
 	/** adds points if the combination has all the notes in the basis of chord */
-	private float combinationHasAllRequiredNotes(ArrayList stringValueCombination) {
+	private float combinationHasAllRequiredNotes(ArrayList<StringValue> stringValueCombination) {
 		if(!isValidProcess()){
 			return 0;
 		}
-		Iterator it = stringValueCombination.iterator();
+		Iterator<StringValue> it = stringValueCombination.iterator();
 		int[] values = new int[this.requiredNotes.length];
 		int currentIndex = 0;
-		
+
 		while (it.hasNext()) {
-			StringValue sv = (StringValue) it.next();
-			
+			StringValue sv = it.next();
+
 			if (sv.getRequiredNoteIndex() >= 0) { // only basis tones
 				boolean insert = true;
-				
+
 				for (int i = 0; i < currentIndex; i++)
 					if (values[i] == sv.getRequiredNoteIndex() + 1)
 						insert = false;
-				
+
 				// sv.requiredNoteIndex+1, because we have index 0 and we don't
 				// want it inside
-				
+
 				if (insert) {
 					values[currentIndex] = sv.getRequiredNoteIndex() + 1;
 					currentIndex++;
 				}
-				
+
 			}
 		}
-		
+
 		if (currentIndex == this.requiredNotes.length) {
 			return ChordSettings.instance().getRequiredBasicsGrade();
 		}
-		
+
 		if (currentIndex == this.requiredNotes.length - 1) {
-			
+
 			boolean existsSubdominant = false;
-			
-			Iterator it2 = stringValueCombination.iterator();
+
+			Iterator<StringValue> it2 = stringValueCombination.iterator();
 			while (it2.hasNext()) {
-				StringValue current = (StringValue)it2.next();
+				StringValue current = it2.next();
 				if ((this.tuning[current.getString()] + current.getFret()) % 12 == (this.chordTonic + 7) %12)
 					existsSubdominant = true;
 			}
-			
+
 			if (!existsSubdominant && currentIndex == this.requiredNotes.length-1) {
-				// if not riff. "sus" chord, or chord with altered fifth allow chord without JUST subdominant (fifth) with small penalty 
-				
+				// if not riff. "sus" chord, or chord with altered fifth allow chord without JUST subdominant (fifth) with small penalty
+
 				//if ( !((ChordInfo)new ChordDatabase().getChords().get(this.chordIndex)).getName().contains("sus") && this.requiredNotes.length!=2 && this.add5==0) {
 				//String.contains(String) is not available at JRE1.4
 				//Replaced by "String.indexOf(String) >= 0"
@@ -801,30 +798,30 @@ private float combinationHasAllRequiredNotes(ArrayList stringValueCombination) {
 					return ( ChordSettings.instance().getRequiredBasicsGrade() * 4 / 5 );
 				}
 			}
-			
+
 		}
-		
+
 		// required notes count should decrease the penalty
 		int noteCount = (this.alteration == 0 ? 0 : 1+ this.alteration)+currentIndex+ (this.bassTonic == this.chordTonic ? 0 : 1);
-		
+
 		// sometimes, when noteCount is bigger then tunning length, this pennalty will become positive, which may help
 		return -ChordSettings.instance().getRequiredBasicsGrade()
 				* (this.tuning.length - noteCount) / this.tuning.length * 2;
-		
+
 	}
-	
+
 	/** adds points if the combination has strings in a row */
-	private float combinationHasSubsequentStrings(ArrayList stringValueCombination) {
+	private float combinationHasSubsequentStrings(ArrayList<StringValue> stringValueCombination) {
 		if(!isValidProcess()){
 			return 0;
 		}
 		boolean stumbled = false, noMore = false, penalty = false;
-		
+
 		for (int i = 0; i < this.tuning.length; i++) {
 			boolean found = false;
-			Iterator it = stringValueCombination.iterator();
+			Iterator<StringValue> it = stringValueCombination.iterator();
 			while (it.hasNext())
-				if (((StringValue) it.next()).getString() == i)
+				if (it.next().getString() == i)
 					found = true;
 			if (found) {
 				if (!stumbled)
@@ -838,25 +835,25 @@ private float combinationHasSubsequentStrings(ArrayList stringValueCombination)
 			if (stumbled)
 				noMore = true;
 		}
-		
+
 		if (penalty)
 			return 0.0f;
-		
+
 		return ChordSettings.instance().getSubsequentGrade();
 	}
-	
+
 	/** checks if the bass tone is the lowest tone in chord */
-	private float combinationBassInBass(ArrayList stringValueCombination) {
+	private float combinationBassInBass(ArrayList<StringValue> stringValueCombination) {
 		if(!isValidProcess()){
 			return 0;
 		}
 		for (int i = 0; i < this.tuning.length; i++) {
-			
-			Iterator it = stringValueCombination.iterator();
-			
+
+			Iterator<StringValue> it = stringValueCombination.iterator();
+
 			while (it.hasNext()) {
-				StringValue sv = (StringValue) it.next();
-				
+				StringValue sv = it.next();
+
 				if (sv.getString() == i) { // stumbled upon lowest tone
 					if ( (this.tuning[sv.getString()]+sv.getFret()) % 12 == this.bassTonic  )
 					  return ChordSettings.instance().getBassGrade();
@@ -864,23 +861,23 @@ private float combinationBassInBass(ArrayList stringValueCombination) {
 					return -ChordSettings.instance().getBassGrade();
 				}
 			}
-			
+
 		}
-		
+
 		return 0;
 	}
-	
+
 	/**
 	 * grades the fingering in a chord.
-	 * 
+	 *
 	 * fingering is good if:<br>
 	 *  - uses as little as possible fret positions<br>
 	 *  - uses less than 3 fret positions<br>
 	 *  - distributes good among fingers<br>
 	 *  - can be placed capo <br>
-	 * 
+	 *
 	 */
-	private float combinationHasGoodFingering(ArrayList stringValueCombination) {
+	private float combinationHasGoodFingering(ArrayList<StringValue> stringValueCombination) {
 		if(!isValidProcess()){
 			return 0;
 		}
@@ -890,46 +887,46 @@ private float combinationHasGoodFingering(ArrayList stringValueCombination) {
 		for (int i = 0; i < this.tuning.length; i++)
 			positions[i] = -1;
 		{
-			Iterator it = stringValueCombination.iterator();
-			
+			Iterator<StringValue> it = stringValueCombination.iterator();
+
 			while (it.hasNext()) {
-				StringValue sv = (StringValue) it.next();
+				StringValue sv = it.next();
 				positions[sv.getString()] = sv.getFret();
 			}
 		}
 		// algorithm
-		
+
 		// distance between fingers
 		int min = ChordSettings.instance().getFindChordsMax()+2, max = 0, maxCount=0;
 		boolean openChord = false, zeroString = false;
-		
+
 		for (int i = 0; i < this.tuning.length; i++) {
-			
+
 			openChord|= ChordSettings.instance().isEmptyStringChords() && positions[i] == 0;
 			zeroString |= positions[i]==0;
-			
+
 			if (positions[i] < min && positions[i] != 0 && positions[i]!=-1)
 				min = positions[i];
-			
+
 			if (positions[i] > max) {
 				max = positions[i];
 				maxCount=1;
 			}
-			else 
-				if (positions[i]==max) 
+			else
+				if (positions[i]==max)
 					maxCount++;
-			
+
 		}
-		
+
 		// finger as capo
-		
+
 		int count = 0;
-		
+
 		for (int i = 0; i < this.tuning.length; i++)
 			if (positions[i] == min)
 				count++;
-		
-		if (!openChord) { 
+
+		if (!openChord) {
 			if (zeroString)
 				finalGrade += ChordSettings.instance().getFingeringGrade()/8;
 			else
@@ -939,10 +936,10 @@ private float combinationHasGoodFingering(ArrayList stringValueCombination) {
 		else
 			if (openChord)
 				finalGrade += ChordSettings.instance().getFingeringGrade()/8;
-		
+
 		// position distance: 1-2 nice 3 good 4 bad 5 disaster
 		float distanceGrade;
-		
+
 		switch(Math.abs(max-min)) {
 			case 0 : distanceGrade=ChordSettings.instance().getFingeringGrade()/5;
 					break;
@@ -952,7 +949,7 @@ private float combinationHasGoodFingering(ArrayList stringValueCombination) {
 					 if (min<5) distanceGrade*=0.9;
 					break;
 			case 3 : distanceGrade=-ChordSettings.instance().getFingeringGrade()/10*maxCount;
-					// I emphasize the penalty if big difference is on some 
+					// I emphasize the penalty if big difference is on some
 					// lower frets (it is greater distance then)
 					if (min<5) distanceGrade*=1.3;
 					break;
@@ -963,73 +960,77 @@ private float combinationHasGoodFingering(ArrayList stringValueCombination) {
 					break;
 		}
 		finalGrade += distanceGrade;
-		
+
 		// ============== finger position abstraction ==================
 		// TODO: what to do with e.g. chord -35556 (C7)
 		// ... it can be held with capo on 5th fret, but very hard :)
 		// ... This is the same as with "capo after", I didn't consider that (e.g. chord -35555)
-		ArrayList[] fingers={new ArrayList(2),new ArrayList(2),new ArrayList(2),new ArrayList(2)};
+		ArrayList<ArrayList<Integer>> fingers=new ArrayList<ArrayList<Integer>>(4);
+		fingers.add(new ArrayList<Integer>(2));
+		fingers.add(new ArrayList<Integer>(2));
+		fingers.add(new ArrayList<Integer>(2));
+		fingers.add(new ArrayList<Integer>(2));
 		// TODO: still no thumb, sorry :)
-		
+
 		// STRUCTURE: ArrayList consists of Integers - first is fret
 		//                                           - others are strings
-/*		
+/*
 		for (int i=0; i<this.tuning.length; i++)
 			System.out.print(" "+positions[i]);
 		System.out.println("");
 */
-		
+
 		// if chord is open, then we can have capo only in strings before open string
 		int lastZeroIndex = 0;
-		
+
 		if (zeroString)
 			for (int i=0; i<positions.length; i++)
 				if (positions[i]==0) lastZeroIndex=i;
-		
+
 		// open or not not open chord,
 		// index finger is always on lowest fret possible
-		fingers[0].add(new Integer(min));
-		
+		fingers.get(0).add(new Integer(min));
+
 		for (int i=lastZeroIndex; i<positions.length; i++)
 				if (positions[i]==min) {
-					fingers[0].add(new Integer(i));
+					fingers.get(0).add(new Integer(i));
 					positions[i]=-1;
 				}
-		
+
 		// other fingers
 		// if not zero-fret, occupy fingers respectivly
 		int finger=1;
 		for (int i=0; i<positions.length; i++) {
 			if (positions[i]!=0 && positions[i]!=-1) {
 				if (finger<4) {
-					fingers[finger].add(new Integer(positions[i]));
-					fingers[finger].add(new Integer(i));
+					fingers.get(finger).add(new Integer(positions[i]));
+					fingers.get(finger).add(new Integer(i));
 					positions[i]=-1;
 				}
 				finger++;
 			}
 		}
-		
+
 /*		System.out.println("Positions:");
 		for (int i=0; i<4; i++) {
 			if (fingers[i].size()>1)
 				System.out.print("G"+(i+1)+"R"+((Integer)fingers[i].get(0)).intValue()+"S"+((Integer)fingers[i].get(1)).intValue()+" ");
 		}
-*/		
-		
-		if (finger>4) 
+*/
+
+		if (finger>4)
 			finalGrade-=ChordSettings.instance().getFingeringGrade();
 		 else
 			finalGrade+=ChordSettings.instance().getFingeringGrade()*0.1*(15-2*finger);
-		
+
 		// TODO: maybe to put each finger's distance from the minimum
 		return finalGrade;
-		
+
 	}
-	
+
 	/**
 	 * grades the chord semantics, based on theory.
-	 * 
+	 *
 	 * Tone semantics is good if:<br>
 	 *  - there appear tones from chord basis or bass tone<br>
 	 *  - there appear alteration tones on their specific places<br><br>
@@ -1041,43 +1042,43 @@ private float combinationHasGoodFingering(ArrayList stringValueCombination) {
 	 *  - if expanding note isn't higher than tonic octave, then priority should be less<br>
 	 *  - If there are not some with NON_ESSENTIAL_INDEX are not here, penalty should be less<br>
 	 */
-	private float combinationChordSemantics(ArrayList stringValueCombination) {
+	private float combinationChordSemantics(ArrayList<StringValue> stringValueCombination) {
 		if(!isValidProcess()){
 			return 0;
 		}
 		float finalGrade = 0;
-		
+
 		int foundTonic = -1;
-		
+
 		int[] foundExpanding = new int[this.expandingNotes.length];
 		int stringDepth=0;
-		
+
 		for (int string = 0; string < this.tuning.length; string++) {
 			// we have to go string-by-string because of the octave
-			Iterator it = stringValueCombination.iterator();
+			Iterator<StringValue> it = stringValueCombination.iterator();
 			StringValue current = null;
 			boolean found=false;
-			
+
 			while (it.hasNext() && !found) {
-				StringValue sv = (StringValue) it.next();
+				StringValue sv = it.next();
 				if (sv.getString() == string &&!found && sv.getFret()!=-1) { // stumbled upon next string
 					current = sv;
 					found=true;
 					stringDepth++;
 				}
 			}
-			
+
 			// grade algorithms----
 			if (current != null) {
 				// search for tonic
 				if (foundTonic==-1 && current.getRequiredNoteIndex()==0)
 					foundTonic=this.tuning[current.getString()]+current.getFret();
-				
+
 				// specific bass not in bass?
 				if (stringDepth>1) {
-					if (current.getRequiredNoteIndex()==this.BASS_INDEX)  
+					if (current.getRequiredNoteIndex()==this.BASS_INDEX)
 						finalGrade -= ChordSettings.instance().getGoodChordSemanticsGrade();
-					
+
 					if (current.getRequiredNoteIndex()<0) { // expanding tones
 						// expanding tone found before the tonic
 						if (foundTonic==-1)
@@ -1087,18 +1088,18 @@ private float combinationChordSemantics(ArrayList stringValueCombination) {
 							if (foundTonic+11 > this.tuning[current.getString()]+current.getFret())
 								finalGrade -= ChordSettings.instance().getGoodChordSemanticsGrade()/3;
 						}
-						
+
 						// search for distinct expanding notes
 						for (int i=0; i<this.expandingNotes.length; i++)
 							if ((this.tuning[string]+current.getFret())%12==(this.chordTonic+this.expandingNotes[i]-1)%12)
 								if (foundExpanding[i]==0)
 									foundExpanding[i]=current.getRequiredNoteIndex();
-						
+
 					}
 				}
 			}
 		}
-		
+
 		// penalties for not founding an expanding note
 		if (this.alteration!=0) {
 			int essentials=0, nonEssentials=0;
@@ -1109,13 +1110,13 @@ private float combinationChordSemantics(ArrayList stringValueCombination) {
 					if (foundExpanding[i]!=0)
 						nonEssentials++;
 			}
-			
+
 			if (essentials+nonEssentials==this.expandingNotes.length)
 				finalGrade+=ChordSettings.instance().getGoodChordSemanticsGrade();
 			else {
 				if (essentials==2) // if all essentials are there, it's good enough
 					finalGrade+=ChordSettings.instance().getGoodChordSemanticsGrade()/2;
-				
+
 				// but if some are missing, that's BAD:
 				else {
 					finalGrade+= (essentials+nonEssentials-this.expandingNotes.length)*ChordSettings.instance().getGoodChordSemanticsGrade();
@@ -1124,11 +1125,11 @@ private float combinationChordSemantics(ArrayList stringValueCombination) {
 				}
 			}
 		}
-		
+
 		return finalGrade;
-		
+
 	}
-	
+
 	/**
 	 *  If current StringValue is a subset or superset of already better ranked
 	 *  chords, it shouldn't be put inside, because it is duplicate.
@@ -1136,81 +1137,82 @@ private float combinationChordSemantics(ArrayList stringValueCombination) {
 	 *  @param betterOnes ArrayList of already stored StringList chords
 	 *  @return true if it is duplicate, false if it is unique
 	 */
-	private boolean checkIfSubset(List stringValues, List betterOnes) {
+	private boolean checkIfSubset(List<StringValue> stringValues, List<List<StringValue>> betterOnes) {
 		if(!isValidProcess()){
 			return false;
 		}
-		Iterator it = betterOnes.iterator();
+		Iterator<List<StringValue>> it = betterOnes.iterator();
 		while (it.hasNext()) {
-			List currentStringValue = (List)it.next();
+			List<StringValue> currentStringValue = it.next();
 			boolean foundDifferentFret = false;
 			// repeat until gone through all strings, or found something different
 			for (int i=0; i<currentStringValue.size(); i++) {
-				int currentString = ((ChordCreatorUtil.StringValue)currentStringValue.get(i)).getString() ;
+				int currentString = currentStringValue.get(i).getString() ;
 				// search for the same string - if not found do nothing
 				for (int j=0; j<stringValues.size(); j++)
-				if ( ((ChordCreatorUtil.StringValue)stringValues.get(j)).getString() == currentString) {
+				if ( stringValues.get(j).getString() == currentString) {
 					// if the frets on the same string differ, then chords are not subset/superset of each other
-					if (((ChordCreatorUtil.StringValue)stringValues.get(j)).getFret() != ((ChordCreatorUtil.StringValue)currentStringValue.get(i)).getFret())
+					if (stringValues.get(j).getFret() != currentStringValue.get(i).getFret())
 						foundDifferentFret=true;
 				}
-				
+
 			}
 			if (!foundDifferentFret)// nothing is different
 				return true;
 		}
-		
+
 		return false;
 	}
-	
+
 	/**
 	 * contains information about the note: string, fret and tone function in a
 	 * chord
-	 * 
+	 *
 	 * @author julian
-	 * 
+	 *
 	 */
-	
+
 	private class StringValue {
-		
+
 		protected int string;
 		protected int fret;
 		protected int requiredNoteIndex;
-		
+
 		public StringValue(int string, int fret, int requiredNoteIndex) {
 			this.string = string;
 			this.fret = fret;
 			this.requiredNoteIndex = requiredNoteIndex;
-			
+
 		}
-		
+
 		public int getString() {
 			return this.string;
 		}
-		
+
 		public int getFret() {
 			return this.fret;
 		}
-		
+
 		public int getRequiredNoteIndex() {
 			return this.requiredNoteIndex;
 		}
 	}
-	
+
 	/** used just to sort StringValue ArrayLists by priorities */
 	protected class PriorityItem {
-		
-		ArrayList stringValues;
+
+		ArrayList<StringValue> stringValues;
 		float priority;
-		
+
 	}
-	
+
 	/** used to sort the array */
-	protected class PriorityComparator implements Comparator {
-		
-		public int compare(Object o1, Object o2) {
-			return Math.round(((PriorityItem) o2).priority - ((PriorityItem) o1).priority);
+	protected class PriorityComparator implements Comparator<PriorityItem> {
+
+		@Override
+		public int compare(PriorityItem o1, PriorityItem o2) {
+			return Math.round(o2.priority - o1.priority);
 		}
-		
+
 	}
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCustomList.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCustomList.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCustomList.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCustomList.java
index 3e78fb12..852175a3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCustomList.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordCustomList.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.chord;
 
@@ -25,14 +22,12 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChordCustomList extends Composite {
-	
+
 	private ChordDialog dialog;
 	private List chords;
-	
+
 	public ChordCustomList(ChordDialog dialog,Composite parent,int style,int height) {
 		super(parent,style);
 		this.setLayout(dialog.gridLayout(1,false,0,0));
@@ -40,85 +35,89 @@ public ChordCustomList(ChordDialog dialog,Composite parent,int style,int height)
 		this.dialog = dialog;
 		this.init();
 	}
-	
+
 	public GridData makeGridData(int height){
 		GridData data = new GridData(SWT.FILL,SWT.TOP,true,true);
 		data.heightHint = height;
-		
+
 		return data;
 	}
-	
+
 	public void init(){
 		Composite composite = new Composite(this,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.chords = new List(composite,SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
 		this.chords.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.chords.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null){
 					showChord(getChords().getSelectionIndex());
 				}
 			}
 		});
-		
+
 		//-------------BUTTONS-----------------------------
 		Composite buttons = new Composite(this,SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
-		
+
 		Button add = new Button(buttons,SWT.PUSH);
 		add.setText(TuxGuitar.getProperty("add"));
 		add.addSelectionListener(new SelectionAdapter(){
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				addCustomChord();
 			}
 		});
-		
+
 		Button rename = new Button(buttons,SWT.PUSH);
 		rename.setText(TuxGuitar.getProperty("rename"));
 		rename.addSelectionListener(new SelectionAdapter(){
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				renameCustomChord(getChords().getSelectionIndex());
 			}
 		});
-		
+
 		Button remove = new Button(buttons,SWT.PUSH);
 		remove.setText(TuxGuitar.getProperty("remove"));
 		remove.addSelectionListener(new SelectionAdapter(){
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				removeCustomChord(getChords().getSelectionIndex());
 			}
 		});
-		
+
 		loadChords();
 	}
-	
+
 	private void loadChords(){
 		int selectionIndex = this.chords.getSelectionIndex();
 		this.chords.removeAll();
-		
+
 		for(int i = 0;i < TuxGuitar.instance().getCustomChordManager().countChords();i ++){
 			TGChord chord = TuxGuitar.instance().getCustomChordManager().getChord(i);
 			if(chord != null){
 				this.chords.add(chord.getName());
 			}
 		}
-		
+
 		if(selectionIndex >= 0 && selectionIndex < this.chords.getItemCount()){
 			this.chords.select(selectionIndex);
 		}else if(selectionIndex > 0 && (selectionIndex - 1) < this.chords.getItemCount()){
 			this.chords.select((selectionIndex - 1));
 		}
 	}
-	
+
 	protected void showChord(int index) {
 		TGChord chord = TuxGuitar.instance().getCustomChordManager().getChord(index);
 		if (chord != null) {
 			this.dialog.getEditor().setChord(chord);
 		}
 	}
-	
+
 	protected void addCustomChord(){
 		TGChord chord = this.dialog.getEditor().getChord();
 		if(chord != null){
@@ -140,7 +139,7 @@ protected void addCustomChord(){
 			}
 		}
 	}
-	
+
 	protected void renameCustomChord(int index){
 		TGChord chord =  TuxGuitar.instance().getCustomChordManager().getChord(index);
 		if(chord != null){
@@ -159,93 +158,95 @@ protected void renameCustomChord(int index){
 			}
 		}
 	}
-	
+
 	protected void removeCustomChord(int index){
 		if (index >= 0 && index < TuxGuitar.instance().getCustomChordManager().countChords()) {
 			TuxGuitar.instance().getCustomChordManager().removeChord(index);
 			loadChords();
 		}
 	}
-	
+
 	protected ChordDialog getDialog(){
 		return this.dialog;
 	}
-	
+
 	protected List getChords(){
 		return this.chords;
 	}
-	
+
 	private class NameDialog{
 		protected String name;
-		
+
 		public NameDialog(String name){
 			this.name = name;
 		}
-		
+
 		public NameDialog(){
 			this(new String());
 		}
-		
+
 		public String open(){
 			final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 			dialog.setLayout(new GridLayout());
 			dialog.setText(TuxGuitar.getProperty("chord.custom"));
-			
+
 			Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 			group.setLayout(new GridLayout());
 			group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			group.setText(TuxGuitar.getProperty("chord.custom"));
-			
+
 			Composite composite = new Composite(group, SWT.NONE);
 			composite.setLayout(new GridLayout(2,false));
 			composite.setLayoutData(getMainData());
-			
+
 			final Label label = new Label(composite,SWT.LEFT);
 			label.setText(TuxGuitar.getProperty("chord.name") + ":");
 			label.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-			
+
 			final Text text = new Text(composite,SWT.BORDER | SWT.SINGLE);
 			text.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 			text.setText(this.name);
-			
+
 			//------------------BUTTONS--------------------------
 			Composite buttons = new Composite(dialog, SWT.NONE);
 			buttons.setLayout(new GridLayout(2,false));
 			buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-			
+
 			final Button buttonOK = new Button(buttons, SWT.PUSH);
 			buttonOK.setText(TuxGuitar.getProperty("ok"));
 			buttonOK.setLayoutData(getButtonData());
 			buttonOK.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					NameDialog.this.name = text.getText();
 					dialog.dispose();
 				}
 			});
-			
+
 			Button buttonCancel = new Button(buttons, SWT.PUSH);
 			buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 			buttonCancel.setLayoutData(getButtonData());
 			buttonCancel.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					NameDialog.this.name = null;
 					dialog.dispose();
 				}
 			});
-			
+
 			dialog.setDefaultButton( buttonOK );
-			
+
 			DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-			
+
 			return this.name;
 		}
-		
+
 		private GridData getMainData(){
 			GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 			data.minimumWidth = 300;
 			return data;
 		}
-		
+
 		private GridData getButtonData(){
 			GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 			data.minimumWidth = 80;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordDatabase.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordDatabase.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordDatabase.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordDatabase.java
index d223681b..db459a78 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordDatabase.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordDatabase.java
@@ -3,102 +3,102 @@
 /**
  * Stores the information about the chord name, structure and
  * alteration abilities into a list
- * 
+ *
  * @author Nikola Kolarovic <nikola.kolarovic@gmail.com>
  *
  */
 public class ChordDatabase {
-	
+
 	/**
 	 * fills all the necessary data into chords List consisted out of ChordInfo-s
-	 * 
+	 *
 	 * If you want to change it, please contact me on
 	 * nikola.kolarovic@gmail.com
 	 */
 	private static final ChordInfo[] data = new ChordInfo[]{
-		
+
 		// Major--------------------------
 		new ChordInfo("M",new int[]{ 1, 5, 8 }),
-		
+
 		// 7--------------------------
 		new ChordInfo("7",new int[]{ 1, 5, 8, 11 }),
-		
+
 		// 7M--------------------------
 		// hard-coded index used in ChordRecognizer, below comment "determine seventh", line 315 now
 		new ChordInfo("maj7",new int[]{ 1, 5, 8, 12 }),
-		
+
 		// 6--------------------------
 		new ChordInfo("6",new int[]{ 1, 5, 8, 10 }),
-		
+
 		// m--------------------------
 		// index 4 hard-coded in ChordRecognizer line 220, so it is not so unusual
 		new ChordInfo("m",new int[]{ 1, 4, 8 }),
-		
+
 		// m7--------------------------
 		new ChordInfo("m7",new int[]{ 1, 4, 8, 11 }),
-		
+
 		// m7M--------------------------
 		new ChordInfo("m/maj7",new int[]{ 1, 4, 8, 12 }),
-		
+
 		// m6--------------------------
 		new ChordInfo("m6",new int[]{ 1, 4, 8, 10 }),
-		
+
 		// sus2--------------------------
 		new ChordInfo("sus2",new int[]{ 1, 3, 8 }),
-		
+
 		// sus4--------------------------
 		new ChordInfo("sus4",new int[]{ 1, 6, 8 }),
-		
+
 		// 7sus2--------------------------
 		new ChordInfo("7sus2",new int[]{ 1, 3, 8, 11 }),
-		
+
 		// 7sus4--------------------------
 		new ChordInfo("7sus4",new int[]{ 1, 6, 8, 11 }),
-		
+
 		// below indexes are hard-coded in ChordRecognizer line 311 now
-		
+
 		// dim--------------------------
 		new ChordInfo("dim",new int[]{ 1, 4, 7 }),
-		
+
 		// dim7--------------------------
 		new ChordInfo("dim7",new int[]{ 1, 4, 7, 10 }),
-		
+
 		// aug--------------------------
 		new ChordInfo("aug",new int[]{ 1, 5, 9 }),
-		
+
 		// 5--------------------------
 		// index <last> hard-coded in ChordRecognizer line 220, so it is not so unusual
 		new ChordInfo("5",new int[]{ 1, 8 }),
-		
+
 	};
-	
+
 	public static int length(){
 		return data.length;
 	}
-	
+
 	public static ChordInfo get(int index){
 		return data[index];
 	}
-	
+
 	/** chord data structure, contains all info for chord formation **/
 	public static class ChordInfo {
-		
+
 		private String name;
 		private int[] requiredNotes;
-		
+
 		public ChordInfo(String name,int[] requiredNotes){
 			this.name = name;
 			this.requiredNotes = requiredNotes;
 		}
-		
+
 		public String getName() {
 			return this.name;
 		}
-		
+
 		public int[] getRequiredNotes() {
 			return this.requiredNotes;
 		}
-		
+
 		public int[] cloneRequireds() {
 			int[] requiredNotes = new int[this.requiredNotes.length];
 			for(int i = 0; i < requiredNotes.length; i ++){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordDialog.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordDialog.java
index 69fba3ac..7a6de60e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordDialog.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.chord;
 
@@ -33,18 +30,16 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class ChordDialog {
 	public static final String NAME = "action.insert.chord";
-	
+
 	public static final int RESULT_SAVE = 1;
 	public static final int RESULT_CLEAN = 2;
 	public static final int RESULT_CANCEL = 3;
-	
+
 	private static final int DEFAULT_STYLE = SWT.BORDER;
-	
+
 	private Shell dialog;
 	private TGChord chord;
 	private ChordEditor editor;
@@ -53,140 +48,144 @@ public class ChordDialog {
 	private ChordRecognizer recognizer;
 	//private boolean accepted;
 	private int result;
-	
+
 	public ChordDialog() {
 		super();
 	}
-	
+
 	public int open(Shell shell,final TGMeasureImpl measure,TGBeat beat, long start) {
 		this.setResult(RESULT_CANCEL);
-		
+
 		this.dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setText(TuxGuitar.getProperty("chord.editor"));
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				TuxGuitar.instance().getCustomChordManager().write();
 			}
 		});
-		
+
 		Composite topComposite = new Composite(this.dialog, SWT.NONE);
 		topComposite.setLayout(new GridLayout(4,false));
 		topComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
-		Composite bottomComposite = new Composite(this.dialog, SWT.NONE);  
+
+		Composite bottomComposite = new Composite(this.dialog, SWT.NONE);
 		bottomComposite.setLayout(new GridLayout());
 		bottomComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		int[] tuning = findCurrentTuning(measure.getTrack());
-		
+
 		//---------------SELECTOR--------------------------------
 		this.selector = new ChordSelector(this,topComposite,DEFAULT_STYLE, tuning);
 		this.selector.pack();
-		
+
 		//---------------EDITOR--------------------------------
 		this.editor = new ChordEditor(this, topComposite, DEFAULT_STYLE,(short)tuning.length);
 		this.editor.pack();
-		
+
 		this.editor.setCurrentTrack(measure.getTrack());
-		
+
 		//---------------RECOGNIZER------------------------------------
 		this.recognizer = new ChordRecognizer(this, topComposite, DEFAULT_STYLE);
-		
+
 		//---------------CUSTOM CHORDS---------------------------------
 		new ChordCustomList(this, topComposite, DEFAULT_STYLE,Math.max(this.selector.getBounds().height,this.editor.getBounds().height));
-		
+
 		//---------------LIST--------------------------------
 		Composite listComposite = new Composite(bottomComposite, SWT.NONE);
 		listComposite.setLayout(gridLayout(1,false,0,0));
 		listComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.list = new ChordList(this,listComposite,beat);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(gridLayout(3,false,0,0));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setChord(getEditor().getChord());
 				setResult(RESULT_SAVE);
 				getDialog().dispose();
 			}
 		});
-		
+
 		Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setResult(RESULT_CLEAN);
 				getDialog().dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				getDialog().dispose();
 			}
 		});
-		
+
 		// load the current chord
 		this.editor.setChord(findCurrentChord(measure, start));
-		
+
 		this.dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return getResult();
 	}
-	
+
 	public ChordEditor getEditor() {
 		return this.editor;
 	}
-	
+
 	public ChordSelector getSelector() {
 		return this.selector;
 	}
-	
+
 	public ChordList getList() {
 		return this.list;
 	}
-	
+
 	public ChordRecognizer getRecognizer() {
 		return this.recognizer;
 	}
-	
+
 	public TGChord getChord() {
 		return this.chord;
 	}
-	
+
 	public void setChord(TGChord chord) {
 		this.chord = chord;
 	}
-	
+
 	public int getResult() {
 		return this.result;
 	}
-	
+
 	public void setResult(int result) {
 		this.result = result;
 	}
-	
+
 	public boolean isDisposed(){
 		return this.dialog.isDisposed();
 	}
-	
+
 	public Shell getDialog(){
 		return this.dialog;
 	}
-	
+
 	public GridLayout gridLayout(int numColumns,boolean makeColumnsEqualWidth,int marginWidth,int marginHeight){
 		GridLayout layout = new GridLayout();
 		layout.numColumns = numColumns;
@@ -195,39 +194,39 @@ public GridLayout gridLayout(int numColumns,boolean makeColumnsEqualWidth,int ma
 		layout.marginHeight = (marginHeight >= 0)?marginHeight:layout.marginHeight;
 		return layout;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private int[] findCurrentTuning(TGTrack track){
 		int[] tuning = new int[track.stringCount()];
-		Iterator it = track.getStrings().iterator();
+		Iterator<TGString> it = track.getStrings().iterator();
 		while(it.hasNext()){
-			TGString string = (TGString)it.next();
+			TGString string = it.next();
 			tuning[(tuning.length - string.getNumber())] = string.getValue();
 		}
 		return tuning;
 	}
-	
+
 	protected TGChord findCurrentChord(TGMeasure measure, long start){
 		TGSongManager manager = TuxGuitar.instance().getSongManager();
 		TGChord chord = manager.getMeasureManager().getChord(measure, start);
 		if(chord == null){
 			chord = manager.getFactory().newChord(measure.getTrack().stringCount());
 			chord.setFirstFret(1);
-			List notes = manager.getMeasureManager().getNotes(measure, start);
+			List<TGNote> notes = manager.getMeasureManager().getNotes(measure, start);
 			if(!notes.isEmpty()){
 				int maxValue = -1;
 				int minValue = -1;
-				
+
 				//verifico el first fret
-				Iterator it = notes.iterator();
+				Iterator<TGNote> it = notes.iterator();
 				while(it.hasNext()){
-					TGNote note = (TGNote)it.next(); 
+					TGNote note = it.next();
 					if(maxValue < 0 || maxValue < note.getValue()){
 						maxValue = note.getValue();
 					}
@@ -238,11 +237,11 @@ protected TGChord findCurrentChord(TGMeasure measure, long start){
 				if(maxValue > TGChordImpl.MAX_FRETS  && minValue > 0){
 					chord.setFirstFret((short)(minValue));
 				}
-				
+
 				//agrego los valores
 				it = notes.iterator();
 				while(it.hasNext()){
-					TGNote note = (TGNote)it.next();
+					TGNote note = it.next();
 					chord.addFretValue( ( note.getString() - 1) , note.getValue());
 				}
 			}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordEditor.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordEditor.java
index 5d527c19..81e198c9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordEditor.java
@@ -1,8 +1,5 @@
 /*
  * Created on 28-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.chord;
 
@@ -36,16 +33,16 @@
  * @author Nikola Kolarovic
  */
 public class ChordEditor extends Composite {
-	
+
 	public static final int STRING_SPACING = 30;
 	public static final int FRET_SPACING = 30;
 	public static final short MIN_FRET = 1;
 	public static final short MAX_FRET = 24;
-	
+
 	private ChordDialog dialog;
 	private Composite composite;
 	private Text chordName;
-	private List points;
+	private List<Point> points;
 	private boolean[] firstFrets;
 	private int[] strings;
 	private int[] frets;
@@ -54,11 +51,11 @@ public class ChordEditor extends Composite {
 	private int width;
 	private int height;
 	private TGTrack currentTrack = null;
-	
+
 	public ChordEditor(Composite parent, int style) {
 		super(parent, style);
 	}
-	
+
 	public ChordEditor(ChordDialog dialog, Composite parent,int style, short maxStrings) {
 		this(parent, style);
 		this.dialog = dialog;
@@ -66,7 +63,7 @@ public ChordEditor(ChordDialog dialog, Composite parent,int style, short maxStri
 		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		this.init(maxStrings);
 	}
-	
+
 	public void init(short maxStrings) {
 		this.fret = MIN_FRET;
 		this.maxStrings = maxStrings;
@@ -75,91 +72,94 @@ public void init(short maxStrings) {
 		this.frets = new int[TGChordImpl.MAX_FRETS];
 		this.width = ((STRING_SPACING * this.maxStrings) - STRING_SPACING);
 		this.height = ((FRET_SPACING * TGChordImpl.MAX_FRETS) - FRET_SPACING);
-		this.points = new ArrayList();
-		
+		this.points = new ArrayList<Point>();
+
 		for (int i = 0; i < this.firstFrets.length; i++) {
 			this.firstFrets[i] = false;
 		}
-		
+
 		for (int i = 0; i < this.strings.length; i++) {
 			this.strings[i] = ((i + 1) * STRING_SPACING);
 		}
-		
+
 		for (int i = 0; i < this.frets.length; i++) {
 			this.frets[i] = ((i + 1) * FRET_SPACING);
 		}
-		
+
 		Composite composite = new Composite(this, SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		this.composite = new Composite(composite, SWT.BORDER | SWT.V_SCROLL | SWT.DOUBLE_BUFFERED);
-		
+
 		Composite nameComposite = new Composite(composite, SWT.NONE);
 		nameComposite.setLayout(this.dialog.gridLayout(1, true, 0, 0));
 		nameComposite.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true,true));
-		
+
 		Label formulaLabel = new Label(nameComposite, SWT.SEPARATOR | SWT.HORIZONTAL);
 		formulaLabel.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true,true));
-		
+
 		Label chordNameLabel = new Label(nameComposite, SWT.LEFT);
 		chordNameLabel.setText(TuxGuitar.getProperty("chord.name"));
 		chordNameLabel.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true,false));
-		
+
 		this.chordName = new Text(nameComposite, SWT.SINGLE | SWT.BORDER);
 		this.chordName.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true,false));
-		
+
 		this.composite.setBackground(this.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.composite.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				paintEditor(painter);
 			}
 		});
-		
+
 		this.composite.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
 				getComposite().setFocus();
 				checkPoint(e.x, e.y);
 				redraw();
 			}
 		});
-		
+
 		this.composite.getVerticalBar().setIncrement(1);
 		this.composite.getVerticalBar().setMaximum( ((MAX_FRET + MIN_FRET) - (TGChordImpl.MAX_FRETS - 1) + 1));
 		this.composite.getVerticalBar().setMinimum(MIN_FRET);
 		this.composite.getVerticalBar().setThumb(1);
 		this.composite.getVerticalBar().addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				setFret((short) getComposite().getVerticalBar().getSelection(), false, true);
 				redraw();
 			}
 		});
-		
+
 		this.composite.setLayoutData(makeCompositeData());
 	}
-	
+
 	private GridData makeCompositeData() {
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = (getWidth() + (STRING_SPACING * 2) + this.composite.getVerticalBar().getSize().x);
 		data.minimumHeight = (getHeight() + (FRET_SPACING * 2));
 		return data;
 	}
-	
+
 	protected void paintEditor(TGPainterImpl painter) {
 		int noteSize = (FRET_SPACING / 2);
-		
+
 		painter.setForeground(new TGColorImpl(this.getDisplay().getSystemColor(SWT.COLOR_BLACK)));
-		
+
 		// dibujo el puente
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo((STRING_SPACING - 10), (FRET_SPACING - 10));
 		painter.lineTo(STRING_SPACING + (this.width + 10), (FRET_SPACING - 10));
 		painter.closePath();
-		
+
 		painter.drawString(Integer.toString(getFret()), FRET_SPACING - 25,STRING_SPACING);
-		
+
 		// dibujo las cuerdas
 		painter.initPath();
 		painter.setAntialias(false);
@@ -168,7 +168,7 @@ protected void paintEditor(TGPainterImpl painter) {
 			painter.lineTo(this.strings[i], FRET_SPACING + this.height);
 		}
 		painter.closePath();
-		
+
 		// dibujo las cegillas
 		painter.initPath();
 		painter.setAntialias(false);
@@ -177,17 +177,17 @@ protected void paintEditor(TGPainterImpl painter) {
 			painter.lineTo(STRING_SPACING + this.width, this.frets[i]);
 		}
 		painter.closePath();
-		
+
 		// dibujo las notas
 		painter.setBackground(new TGColorImpl(this.getDisplay().getSystemColor(SWT.COLOR_BLACK)));
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while (it.hasNext()) {
-			Point point = (Point) it.next();
+			Point point = it.next();
 			painter.initPath(TGPainter.PATH_FILL);
 			painter.addOval(point.x - (noteSize / 2), point.y + (noteSize / 2),noteSize, noteSize);
 			painter.closePath();
 		}
-		
+
 		// dibujo las notas al aire
 		for (int i = 0; i < this.firstFrets.length; i++) {
 			if (!hasPoints(i)) {
@@ -208,11 +208,11 @@ protected void paintEditor(TGPainterImpl painter) {
 			}
 		}
 	}
-	
+
 	protected void checkPoint(int x, int y) {
 		int stringIndex = getStringIndex(x);
 		int fretIndex = getFretIndex(y);
-		
+
 		if (y < FRET_SPACING) {
 			this.firstFrets[stringIndex] = !this.firstFrets[stringIndex];
 			this.removePointsAtStringLine(this.strings[stringIndex]);
@@ -228,15 +228,15 @@ protected void checkPoint(int x, int y) {
 		else{
 			return; // don't recognize it otherwise
 		}
-		
+
 		// after changing a chord, recognize it
 		this.dialog.getRecognizer().recognize(getChord(),true,false);
 	}
-	
+
 	private boolean removePoint(Point point) {
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while (it.hasNext()) {
-			Point currPoint = (Point) it.next();
+			Point currPoint = it.next();
 			if (currPoint.x == point.x && currPoint.y == point.y) {
 				this.points.remove(point);
 				return true;
@@ -244,12 +244,12 @@ private boolean removePoint(Point point) {
 		}
 		return false;
 	}
-	
+
 	private void orderPoints() {
 		for (int i = 0; i < this.points.size(); i++) {
 			Point minPoint = null;
 			for (int noteIdx = i; noteIdx < this.points.size(); noteIdx++) {
-				Point point = (Point) this.points.get(noteIdx);
+				Point point = this.points.get(noteIdx);
 				if (minPoint == null || point.x < minPoint.x) {
 					minPoint = point;
 				}
@@ -258,22 +258,22 @@ private void orderPoints() {
 			this.points.add(i, minPoint);
 		}
 	}
-	
+
 	private void removePointsAtStringLine(int x) {
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while (it.hasNext()) {
-			Point point = (Point) it.next();
+			Point point = it.next();
 			if (point.x == x) {
 				this.points.remove(point);
 				break;
 			}
 		}
 	}
-	
+
 	private void addPoint(Point point) {
 		this.points.add(point);
 	}
-	
+
 	private int getStringIndex(int x) {
 		int index = -1;
 		for (int i = 0; i < this.strings.length; i++) {
@@ -289,7 +289,7 @@ private int getStringIndex(int x) {
 		}
 		return index;
 	}
-	
+
 	private int getFretIndex(int y) {
 		int index = -1;
 		for (int i = 0; i < this.frets.length; i++) {
@@ -304,34 +304,34 @@ private int getFretIndex(int y) {
 			}
 		}
 		return index;
-		
+
 	}
-	
+
 	private boolean hasPoints(int stringIndex) {
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while (it.hasNext()) {
-			Point point = (Point) it.next();
+			Point point = it.next();
 			if (point.x == this.strings[stringIndex]) {
 				return true;
 			}
 		}
 		return false;
 	}
-	
+
 	public boolean isEmpty() {
 		return this.points.isEmpty();
 	}
-	
+
 	public int getValue(int string) {
 		int value = -1;
 		if (this.firstFrets[this.maxStrings - string]) {
 			value = 0;
 		}
-		
+
 		if (value < 0) {
-			Iterator it = this.points.iterator();
+			Iterator<Point> it = this.points.iterator();
 			while (it.hasNext()) {
-				Point point = (Point) it.next();
+				Point point = it.next();
 				if (string == (this.maxStrings - getStringIndex(point.x))) {
 					value = (getFretIndex(point.y + (FRET_SPACING / 2)) + 1);
 					value += (getFret() - 1);
@@ -340,7 +340,7 @@ public int getValue(int string) {
 		}
 		return value;
 	}
-	
+
 	public void addValue(int value, int string/*, boolean redecorate*/) {
 		int realValue = value;
 		if (string >= 1 && string <= this.maxStrings) {
@@ -355,37 +355,37 @@ public void addValue(int value, int string/*, boolean redecorate*/) {
 				}
 			}
 			//INNECESARY CODE
-			//this method is called allways from "setChord(c)" 
+			//this method is called allways from "setChord(c)"
 			//but it is called some times, as Strings has the chord.
 			//So i moved it to "setChord" to call "recognize" only one time.
-			
+
 			// after adding a value, recognize the current chord
 			//this.chordName.setText(this.dialog.getRecognizer().recognize(getChord(), redecorate));
 		}
 	}
-	
+
 	public short getFret() {
 		return this.fret;
 	}
-	
+
 	public void setFret(short fret) {
 		setFret(fret, true, false);
 	}
-	
+
 	protected void setFret(short fret, boolean updateScroll, boolean recognize) {
 		if (fret >= MIN_FRET && fret <= MAX_FRET) {
 			this.fret = fret;
 		}
-		
+
 		if (updateScroll) {
 			this.composite.getVerticalBar().setSelection(this.fret);
 		}
-		
+
 		if(recognize){
 			this.dialog.getRecognizer().recognize(getChord(), true,false);
 		}
 	}
-	
+
 	public TGChord getChord() {
 		TGChord chord = TuxGuitar.instance().getSongManager().getFactory().newChord(this.strings.length);
 		chord.setName(this.chordName.getText());
@@ -396,7 +396,7 @@ public TGChord getChord() {
 		}
 		return chord;
 	}
-	
+
 	public void setChord(TGChord chord) {
 		if (chord != null) {
 			this.setFret((short)chord.getFirstFret());
@@ -404,68 +404,70 @@ public void setChord(TGChord chord) {
 				int fretValue = chord.getFretValue(i);
 				this.addValue(fretValue, i + 1/*, false*/);
 			}
-			
+
 			//SEE Comment on addValue.
 			//this.getChordName().setText(chord.getName() != null ? chord.getName() : this.dialog.getRecognizer().recognize(getChord(),true) );
-			
+
 			String name = chord.getName();
-			
+
 			this.dialog.getRecognizer().recognize(getChord(), (name == null), (name == null) );
-			
+
 			this.previewChord(chord);
-			
+
 			if(name != null){
 				this.setChordName( name );
 			}
-			
+
 			this.redraw();
 		}
 	}
-	
+
 	public short getMaxStrings() {
 		return this.maxStrings;
 	}
-	
+
 	public void setMaxStrings(short maxStrings) {
 		this.maxStrings = maxStrings;
 	}
-	
+
 	public int getWidth() {
 		return this.width;
 	}
-	
+
 	public int getHeight() {
 		return this.height;
 	}
-	
+
 	protected Composite getComposite(){
 		return this.composite;
 	}
-	
+
 	public Text getChordName() {
 		return this.chordName;
 	}
-	
+
 	public void setChordName(String chordName) {
 		this.chordName.setText(chordName);
 	}
-	
+
+	@Override
 	public void redraw() {
 		super.redraw();
 		this.composite.redraw();
 	}
-	
+
 	public void setCurrentTrack(TGTrack track) {
 		this.currentTrack = track;
 	}
-	
+
 	public TGTrack getCurrentTrack() {
 		return this.currentTrack;
 	}
-	
+
 	public void previewChord(final TGChord chord) {
-		
+
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				int playedStrings = 0;
 				int stringCount = Math.min( getMaxStrings(), chord.countStrings() );
@@ -485,7 +487,7 @@ public void run() {
 						next ++;
 					}
 				}
-				
+
 				TGChannel channel = TuxGuitar.instance().getSongManager().getChannel(getCurrentTrack().getChannelId());
 				if( channel != null ){
 					TuxGuitar.instance().getPlayer().playBeat(
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordList.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordList.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordList.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordList.java
index 624cb1d8..3d0aea84 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordList.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordList.java
@@ -1,18 +1,5 @@
 /*
-
-
  * Created on 02-ene-2006
-
-
- *
-
-
- * TODO To change the template for this generated file go to
-
-
- * Window - Preferences - Java - Code Style - Code Templates
-
-
  */
 
 package org.herac.tuxguitar.app.editors.chord;
@@ -46,60 +33,64 @@
 import org.herac.tuxguitar.graphics.control.TGChordImpl;
 import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChord;
 import org.herac.tuxguitar.song.models.TGString;
 /**
  * @author julian
- * 
+ *
  * Component that shows the list of (alternative) chords - bottom of the screen
  */
 public class ChordList extends Composite {
-	
+
 	private static final int MIN_HEIGHT = 160;
 	private static final int SCROLL_INCREMENT = 25;
 	private static final int CHORD_FIRST_FRET_SPACING = 12;
 	private static final int CHORD_STRING_SPACING = 8;
 	private static final int CHORD_FRET_SPACING = 10;
 	private static final int CHORD_NOTE_SIZE = 6;
-	
-	private ChordDialog dialog;
-	private TGBeat beat;
-	private List graphicChords;
+
+	private final ChordDialog dialog;
+	private final TGBeat beat;
+	private final List<TGChordImpl> graphicChords;
 	private int height;
 	private TGChordImpl selectedChord;
 	private Composite composite;
 	private Font font;
-	
+
 	public ChordList(ChordDialog dialog,Composite parent,TGBeat beat) {
 		super(parent, SWT.NONE);
 		this.setLayout(dialog.gridLayout(1,false,0,0));
 		this.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		this.graphicChords = new ArrayList();
+		this.graphicChords = new ArrayList<TGChordImpl>();
 		this.dialog = dialog;
 		this.beat = beat;
 		this.init();
 	}
-	
+
 	private void init(){
 		this.composite = new Composite(this,SWT.BORDER | SWT.V_SCROLL | SWT.DOUBLE_BUFFERED);
 		this.composite.setBackground(this.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.composite.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				paintChords(painter);
 			}
 		});
 		this.composite.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(MouseEvent e) {
 				getComposite().setFocus();
 				getDialog().getEditor().setChord(getChord(e.x, e.y,true));
 				redraw();
 			}
 		});
-		
+
 		final Point origin = new Point(0, 0);
 		final ScrollBar vBar = this.composite.getVerticalBar();
 		vBar.setIncrement(SCROLL_INCREMENT);
 		vBar.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				int vSelection = vBar.getSelection();
 				int destY = -vSelection - origin.y;
@@ -109,32 +100,34 @@ public void handleEvent(Event e) {
 				redraw();
 			}
 		});
-		
+
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumHeight = MIN_HEIGHT;
 		this.composite.setLayoutData(data);
 		this.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent arg0) {
 				disposeChords();
 				disposeFont();
 			}
 		});
 	}
-	
+
+	@Override
 	public void redraw(){
 		super.redraw();
 		this.composite.redraw();
 	}
-	
+
 	protected void paintChords(TGPainterImpl painter) {
 		int maxHeight = 0;
 		int fromX = 15;
 		int fromY = 10;
 		int vScroll = this.composite.getVerticalBar().getSelection();
-		Iterator it = this.graphicChords.iterator();
+		Iterator<TGChordImpl> it = this.graphicChords.iterator();
 		while (it.hasNext()) {
-			TGChordImpl chord = (TGChordImpl) it.next();
-			
+			TGChordImpl chord = it.next();
+
 			TGColor color = new TGColorImpl(getChordColor(chord));
 			chord.setBackgroundColor(new TGColorImpl(this.composite.getBackground()));
 			chord.setColor(color);
@@ -155,21 +148,21 @@ protected void paintChords(TGPainterImpl painter) {
 			chord.setPosX( fromX );
 			chord.setPosY( fromY - vScroll);
 			chord.paint(painter,(chord.getWidth() / 2),0);
-			
+
 			fromX += chord.getWidth() + 10;
 			maxHeight = Math.max(maxHeight,chord.getHeight());
 		}
 		this.height = (fromY + maxHeight + 10);
 		this.updateScroll();
 	}
-	
+
 	private Color getChordColor(TGChordImpl chord){
 		if(this.selectedChord != null && this.selectedChord.equals(chord)){
 			return getDisplay().getSystemColor(SWT.COLOR_BLUE);
 		}
 		return getDisplay().getSystemColor(SWT.COLOR_BLACK);
 	}
-	
+
 	public void updateScroll(){
 		Rectangle rect = this.composite.getBounds();
 		Rectangle client = this.composite.getClientArea();
@@ -177,14 +170,14 @@ public void updateScroll(){
 		vBar.setMaximum(this.height);
 		vBar.setThumb(Math.min(rect.height, client.height));
 	}
-	
+
 	protected int getTrackString(int number){
 		TGString string = ChordList.this.beat.getMeasure().getTrack().getString(number);
 		return string.getValue();
 	}
-	
+
 	protected Font getFont(GC painter){
-		if(this.font == null || this.font.isDisposed()){ 
+		if(this.font == null || this.font.isDisposed()){
 			Font available = painter.getFont();
 			if(available == null || available.isDisposed()){
 				available = getDisplay().getSystemFont();
@@ -196,11 +189,11 @@ protected Font getFont(GC painter){
 		}
 		return this.font;
 	}
-	
+
 	protected TGChordImpl getChord(int x, int y,boolean setAsSelected) {
-		Iterator it = this.graphicChords.iterator();
+		Iterator<TGChordImpl> it = this.graphicChords.iterator();
 		while (it.hasNext()) {
-			TGChordImpl chord = (TGChordImpl) it.next();
+			TGChordImpl chord = it.next();
 			int x1 = chord.getPosX();
 			int x2 = x1 + chord.getWidth();
 			int y1 = chord.getPosY();
@@ -218,12 +211,12 @@ protected TGChordImpl getChord(int x, int y,boolean setAsSelected) {
 		}
 		return null;
 	}
-	
-	public void setChords(List chords) {
+
+	public void setChords(List<TGChord> chords) {
 		this.disposeChords();
 		this.selectedChord = null;
-		
-		Iterator it = chords.iterator();
+
+		Iterator<TGChord> it = chords.iterator();
 		while (it.hasNext()) {
 			TGChordImpl chord = (TGChordImpl) it.next();
 			chord.setTonic( ChordList.this.dialog.getSelector().getTonicList().getSelectionIndex() );
@@ -232,25 +225,25 @@ public void setChords(List chords) {
 		}
 		this.redraw();
 	}
-	
+
 	public void disposeFont(){
 		if(this.font != null){
 			this.font.dispose();
 		}
 	}
-	
+
 	public void disposeChords(){
-		Iterator it = this.graphicChords.iterator();
+		Iterator<TGChordImpl> it = this.graphicChords.iterator();
 		while (it.hasNext()) {
-			((TGChordImpl) it.next()).dispose();
+			it.next().dispose();
 		}
 		this.graphicChords.clear();
 	}
-	
+
 	protected Composite getComposite(){
 		return this.composite;
 	}
-	
+
 	protected ChordDialog getDialog(){
 		return this.dialog;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordNamingConvention.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordNamingConvention.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordNamingConvention.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordNamingConvention.java
index 82d6731e..cddac4aa 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordNamingConvention.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordNamingConvention.java
@@ -5,7 +5,7 @@
  * @author Nikola Kolarovic
  */
 public class ChordNamingConvention {
-	
+
 	/** generates the chord name out of selected items */
 	public String createChordName(int chordTonic,
 	                              int chordIndex,
@@ -17,26 +17,26 @@ public String createChordName(int chordTonic,
 	                              int add11,
 	                              int bassTonic,
 	                              boolean sharp) {
-		
+
 		StringBuffer sb = new StringBuffer();
-		
+
 		sb.append(getTonic(chordTonic,sharp));
-		
+
 		//String chordName = ((ChordInfo)ChordCreatorUtil.getChordData().getChords().get(chordIndex)).getName();
 		String chordName = ChordDatabase.get(chordIndex).getName();
 		if (!chordName.equals("M"))
 			sb.append(chordName);
-		
+
 		if (add)
 			sb.append("add");
-		
+
 		// TODO: ALTERATION
 		if (alteration!=0) {
 			char lastChar = sb.toString().charAt(sb.toString().length()-1);
 			// if chord name ends with a number then add a backslash
 			if (lastChar>='0' && lastChar <='9')
 				sb.append("/");
-			
+
 			switch (alteration) {
 				case 1 : sb.append( getAdd("9",plusMinus));
 					break;
@@ -45,23 +45,23 @@ public String createChordName(int chordTonic,
 				case 3 : sb.append( getAdd("13",plusMinus));
 					break;
 			}
-			
+
 		}
-		
+
 		if (add5!=0)
 			sb.append("/").append(getAdd("5",add5));
 		if (add9!=0)
 			sb.append("/").append(getAdd("9",add9));
 		if (add11!=0)
 			sb.append("/").append(getAdd("11",add11));
-		
+
 		if (chordTonic!=bassTonic) {
 			sb.append(" \\");
 			sb.append(getTonic(bassTonic,sharp));
 		}
 		return sb.toString();
 	}
-	
+
 	/** tonic marks */
 	public String getTonic(int chordTonic, boolean sharp) {
 		String retVal;
@@ -81,7 +81,7 @@ public String getTonic(int chordTonic, boolean sharp) {
 		}
 		return retVal;
 	}
-	
+
 	/** adds + or - to an add chord String */
 	private String getAdd(String number, int selectionIndex) {
 		StringBuffer retVal=new StringBuffer(number);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordRecognizer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordRecognizer.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordRecognizer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordRecognizer.java
index c041e2a0..59590efe 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordRecognizer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordRecognizer.java
@@ -17,10 +17,10 @@
 
 /**
  * @author Nikola Kolarovic
- * 
+ *
  */
 public class ChordRecognizer extends Composite {
-	
+
 	// index for parameter array
 	protected static final int TONIC_INDEX = 0;
 	protected static final int CHORD_INDEX = 1;
@@ -31,14 +31,14 @@ public class ChordRecognizer extends Composite {
 	protected static final int I5_INDEX = 6;
 	protected static final int I9_INDEX = 7;
 	protected static final int I11_INDEX = 8;
-	
+
 	private ChordDialog dialog;
 	private List proposalList;
-	private java.util.List proposalParameters;
-	
+	private java.util.List<int[]> proposalParameters;
+
 	// this var keep a control to running threads.
 	private long runningProcess;
-	
+
 	public ChordRecognizer(ChordDialog dialog, Composite parent,int style) {
 		super(parent,style);
 		this.setLayout(dialog.gridLayout(1,false,0,0));
@@ -47,35 +47,36 @@ public ChordRecognizer(ChordDialog dialog, Composite parent,int style) {
 		this.dialog = dialog;
 		this.init();
 	}
-	
+
 	public GridData makeGridData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 180;
 		return data;
 	}
-	
+
 	public void init(){
 		Composite composite = new Composite(this,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
-		this.proposalParameters = new ArrayList();
-		
+
+		this.proposalParameters = new ArrayList<int[]>();
+
 		this.proposalList = new List(composite,SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
 		this.proposalList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.proposalList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null){
 					showChord(getProposalList().getSelectionIndex());
 				}
 			}
 		});
-		
+
 	}
-	
+
 	/** sets the current chord to be selected proposal */
 	protected void showChord(int index) {
-		int[] params = (int[])this.proposalParameters.get(index);
+		int[] params = this.proposalParameters.get(index);
 		this.dialog.getSelector().adjustWidgets(params[TONIC_INDEX],
 		                                        params[CHORD_INDEX],
 		                                        params[ALTERATION_INDEX],
@@ -90,7 +91,7 @@ protected void showChord(int index) {
 		this.dialog.getEditor().getChordName().setText(chordName);
 		this.dialog.getEditor().redraw();
 	}
-	
+
 	/**
 	 * - Recognizes the chord string
 	 * - Fills the component's list with alternative names
@@ -100,24 +101,26 @@ protected void showChord(int index) {
 	 *  @param chord chord structure (frets, strings)
 	 *  @param redecorate is the Chord Editor in editing mode, or it is just changed by ChordSelector
 	 */
-	
+
 	public void recognize(final TGChord chord,final boolean redecorate,final boolean setChordName) {
-		
+
 		final long processId = (++ this.runningProcess);
 		final boolean sharp = this.dialog.getSelector().getSharpButton().getSelection();
-		
+
 		this.clearProposals();
-		
+
 		new Thread( new Runnable() {
+			@Override
 			public void run() {
 				if(!getDialog().isDisposed() && isValidProcess(processId)){
-					
+
 					final int params[] = makeProposals(processId, chord,sharp);
-					
+
 					if (params == null) { // could not recognize anything!?
 						if (isValidProcess(processId) && setChordName) {
 							try {
 								TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+									@Override
 									public void run() {
 										if(!getDialog().isDisposed() && isValidProcess(processId)){
 											getDialog().getEditor().setChordName("");
@@ -130,13 +133,14 @@ public void run() {
 						}
 						return;
 					}
-					
+
 					final String chordName = getChordName(params,sharp);
-					
+
 					// Sets all the ChordSelector fields into recognized chord (tonic, bass, chord, alterations)
 					if (isValidProcess(processId) && redecorate) {
 						try {
 							TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+								@Override
 								public void run() {
 									if(!getDialog().isDisposed()){
 										redecorate(params);
@@ -147,10 +151,11 @@ public void run() {
 							e.printStackTrace();
 						}
 					}
-					
+
 					if (isValidProcess(processId) && setChordName) {
 						try {
 							TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+								@Override
 								public void run() {
 									if(!getDialog().isDisposed()){
 										getDialog().getEditor().setChordName( (chordName != null ? chordName : "" ) );
@@ -165,22 +170,22 @@ public void run() {
 			}
 		} ).start();
 	}
-	
+
 	/** Fills the component's list with alternative names
 	 * @param chord TGChord to be recognized
-	 * @return parameters for adjustWidgets and getChordName methods 
+	 * @return parameters for adjustWidgets and getChordName methods
 	 */
 	protected int[] makeProposals(final long processId, TGChord chord,final boolean sharp) {
-		
+
 		int[] tuning = this.dialog.getSelector().getTuning();
-		java.util.List notesInside = new ArrayList();
-		
+		java.util.List<Integer> notesInside = new ArrayList<Integer>();
+
 		// find and put in all the distinct notes
 		for (int i=0; i<tuning.length; i++) {
 			int fret = chord.getStrings()[i];
 			if (fret!=-1) {
 				Integer note = new Integer((tuning[tuning.length-1-i] + fret) % 12);
-				Iterator it = notesInside.iterator();
+				Iterator<Integer> it = notesInside.iterator();
 				boolean found=false;
 				while (it.hasNext())
 					if (it.next().equals(note))
@@ -189,48 +194,48 @@ protected int[] makeProposals(final long processId, TGChord chord,final boolean
 					notesInside.add(note);
 			}
 		}
-		
+
 		// Now search:
 		// go through all the possible tonics
 		// it is required because tonic isn't mandatory in a chord
-		java.util.List allProposals = new ArrayList(10);
-		
+		java.util.List<Proposal> allProposals = new ArrayList<Proposal>(10);
+
 		for (int tonic=0; tonic<12; tonic++) {
-			
+
 			Proposal currentProp = null;
-			
+
 			// first check for the basic chord tones
 			for (int chordIndex = 0; chordIndex < ChordDatabase.length(); chordIndex ++) {
 				ChordDatabase.ChordInfo info = ChordDatabase.get(chordIndex);
-				
+
 				currentProp = new Proposal(notesInside);
 				// it is more unusual the more we go down the index
 				// except chords "5" and "m", they are quite usual :)
 				currentProp.unusualGrade-=(chordIndex!=ChordDatabase.length() && chordIndex!=4 ? 2*chordIndex : 0);
-				
+
 				//ChordDatabase.ChordInfo info = (ChordDatabase.ChordInfo)chordItr.next();
 				boolean foundNote = false;
 				for (int i=0; i<info.getRequiredNotes().length; i++) { // go through all the requred notes
-					Iterator nit = notesInside.iterator();
+					Iterator<Integer> nit = notesInside.iterator();
 					while (nit.hasNext()) // go through all the needed notes
-						if (((Integer)nit.next()).intValue() == (tonic+info.getRequiredNotes()[i]-1)%12) {
+						if (nit.next().intValue() == (tonic+info.getRequiredNotes()[i]-1)%12) {
 							foundNote=true;
 							if (tonic+info.getRequiredNotes()[i]-1 == tonic)
 								currentProp.dontHaveGrade+=15; // this means penalty for not having tonic is -65
 							currentProp.foundNote(tonic+info.getRequiredNotes()[i]-1); // found a note in a chord
 						}
-					
+
 				}
 				// if something found, add it into a proposal if it's worth
 				if (foundNote) {
 					currentProp.params[TONIC_INDEX] = tonic;
 					currentProp.params[CHORD_INDEX] = chordIndex;//possibleChords.indexOf(info);
 					int foundNotesCount = currentProp.missingNotes.length-currentProp.missingCount;
-					
+
 					// it is worth if it is missing 1 essential note and/or fifth
 					if (!info.getName().startsWith("dim") && !info.getName().startsWith("aug"))
 						if (!currentProp.isFound(tonic+8-1)) {
-							
+
 							// hmmm. maybe it's altered fifth? Create a branch for it.
 							if (currentProp.isNeeded(tonic+7-1) || currentProp.isNeeded(tonic+9-1)) {
 								Proposal branchProp = (Proposal)currentProp.clone();
@@ -247,14 +252,14 @@ protected int[] makeProposals(final long processId, TGChord chord,final boolean
 									branchProp.dontHaveGrade-=(info.getRequiredNotes().length-(foundNotesCount+1))*50;
 									allProposals.add(branchProp);
 								}
-								
+
 							}
 							else {
 								currentProp.params[I5_INDEX] = 0;
 								currentProp.dontHaveGrade+=30;
 							}
 						}
-					
+
 					currentProp.params[I5_INDEX] = 0;
 					if (foundNotesCount>=info.getRequiredNotes().length-1 ) {
 							currentProp.dontHaveGrade-=(info.getRequiredNotes().length-foundNotesCount)*50;
@@ -264,15 +269,15 @@ protected int[] makeProposals(final long processId, TGChord chord,final boolean
 				currentProp=null;
 			}
 		}
-		
-		Iterator props = allProposals.iterator();
-		java.util.List unsortedProposals = new ArrayList(5);
+
+		Iterator<Proposal> props = allProposals.iterator();
+		java.util.List<Proposal> unsortedProposals = new ArrayList<Proposal>(5);
 		while (props.hasNext()) {
 			// place the still missing alterations notes accordingly... bass also
 			///////////////////////////////////////////////////////////////
-			
-			final Proposal current = (Proposal)props.next();
-			
+
+			final Proposal current = props.next();
+
 			boolean bassIsOnlyInBass = true;
 			// ---------------- bass tone ----------------
 			for (int i=chord.getStrings().length-1; i>=0; i--) {
@@ -286,7 +291,7 @@ protected int[] makeProposals(final long processId, TGChord chord,final boolean
 						bassIsOnlyInBass=false; // if we stumbled upon bass tone again
 				}
 			}
-			
+
 			if (current.isNeeded(current.params[BASS_INDEX]) && bassIsOnlyInBass) {
 				   // do not mark as FOUND if bass is somewhere other than in bass only
 					current.foundNote(current.params[BASS_INDEX]);
@@ -310,14 +315,14 @@ protected int[] makeProposals(final long processId, TGChord chord,final boolean
 							if (current.isNeeded(current.params[TONIC_INDEX]+getAddNote(i, plusminus)) && !current.filled[i]) {
 								current.filled[i]=true;
 								current.plusminusValue[i]=plusminus;
-								if (plusminus!=0) 
+								if (plusminus!=0)
 									current.unusualGrade-=15;
 								current.foundNote(current.params[TONIC_INDEX]+getAddNote(i, plusminus));
 							}
-					
+
 				}
 			}
-			
+
 			// fill in the list
 			///////////////////////////////////////////////////////////////
 			if (!(current.filled[3] && !(current.filled[0] || current.filled[1] || current.filled[2])) &&  // if just found seventh, cancel it
@@ -326,33 +331,34 @@ protected int[] makeProposals(final long processId, TGChord chord,final boolean
 						findChordLogic(current);
 						unsortedProposals.add(current);
 				}
-			
+
 		}
 		// first, sort by DontHaveGrade
 		shellsort(unsortedProposals,1);
-		
+
 		int cut=-1;
 		int howManyIncomplete = ChordSettings.instance().getIncompleteChords();
-		
+
 		for (int i=0; i<unsortedProposals.size() && cut==-1; i++) {
-			int prior = ((Proposal)unsortedProposals.get(i)).dontHaveGrade;
-			if (prior<0) 
+			int prior = unsortedProposals.get(i).dontHaveGrade;
+			if (prior<0)
 				cut=i+howManyIncomplete;
 		}
 		// cut the search
 		unsortedProposals=unsortedProposals.subList(0, (cut>0 && cut<unsortedProposals.size() ? cut : unsortedProposals.size()));
 		// sort by unusualGrade
 		shellsort(unsortedProposals,2);
-		
+
 		int firstNegative = 0;
 		for (int i=0; i<unsortedProposals.size(); i++) {
-			final Proposal current = (Proposal)unsortedProposals.get(i);
-			if (firstNegative==0 && current.unusualGrade<0) 
+			final Proposal current = unsortedProposals.get(i);
+			if (firstNegative==0 && current.unusualGrade<0)
 				firstNegative=current.unusualGrade;
-			
+
 			if (current.unusualGrade > (firstNegative>=0 ? 0 : firstNegative)-60){
 				try {
 					TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+						@Override
 						public void run() {
 							if(!getDialog().isDisposed() && isValidProcess(processId)){
 								addProposal(current.params, getChordName(current.params,sharp)+" ("+Math.round(100+current.dontHaveGrade*7/10)+"%)" );
@@ -366,9 +372,9 @@ public void run() {
 		}
 		if (this.proposalParameters.size()==0)
 			return null;
-		return (int[])this.proposalParameters.get(0);
+		return this.proposalParameters.get(0);
 	}
-	
+
 	/** adjusts widgets on the Recognizer combo */
 	protected void redecorate(int params[]){
 		this.dialog.getSelector().adjustWidgets(params[TONIC_INDEX],
@@ -381,7 +387,7 @@ protected void redecorate(int params[]){
 		                                        params[I9_INDEX],
 		                                        params[I11_INDEX]);
 	}
-	
+
 	/** Assembles chord name according to ChordNamingConvention */
 	protected String getChordName(int[] param, boolean sharp) {
 		return new ChordNamingConvention().createChordName(param[TONIC_INDEX],
@@ -395,15 +401,15 @@ protected String getChordName(int[] param, boolean sharp) {
 		                                                   param[BASS_INDEX],
 		                                                   sharp);
 	}
-	
+
 	/** Return required interval in semitones for add type and +- modificator
 	 * @param type 0=add9, 1=add11, 2=add13
 	 * @param selectionIndex 0=usual, 1="+", 2="-"
 	 */
 	protected int getAddNote(int type, int selectionIndex) {
-		
+
 		int wantedNote = 0;
-		
+
 		switch (type) {
 			case 0:
 				wantedNote = 3; // add9
@@ -415,7 +421,7 @@ protected int getAddNote(int type, int selectionIndex) {
 				wantedNote = 10; // add13
 				break;
 		}
-		
+
 		switch (selectionIndex) {
 			case 1:
 				wantedNote++;
@@ -426,11 +432,11 @@ protected int getAddNote(int type, int selectionIndex) {
 			default:
 				break;
 		}
-		
+
 		return --wantedNote;
-		
+
 	}
-	
+
 	void findChordLogic(Proposal current) {
 		boolean[] found = current.filled;
 		int[] plusMinus = current.plusminusValue;
@@ -441,7 +447,7 @@ void findChordLogic(Proposal current) {
 		current.params[I11_INDEX]=plusMinus[1];
 		current.params[ADDCHK_INDEX]=0;
 		current.params[PLUSMINUS_INDEX]=0;
-		
+
 		if (found[2]) { // -------------- 13
 			current.params[ALTERATION_INDEX]=3;
 			current.params[PLUSMINUS_INDEX]=plusMinus[2];
@@ -469,7 +475,7 @@ void findChordLogic(Proposal current) {
 				current.params[PLUSMINUS_INDEX]=plusMinus[1];
 				current.params[I11_INDEX]=0;
 				current.unusualGrade-=10;
-				
+
 				if (!found[0] || !found[3]) { // b7 or 9 not inside
 					if (!found[0] && !found[3])
 						current.params[ADDCHK_INDEX]=1;
@@ -483,7 +489,7 @@ void findChordLogic(Proposal current) {
 					}
 				}
 			}
-			else 
+			else
 				if (found[0]) { // 9
 					current.params[ALTERATION_INDEX]=1;
 					current.params[I9_INDEX]=0;
@@ -492,10 +498,10 @@ void findChordLogic(Proposal current) {
 					current.unusualGrade-=10;
 					if (!found[3])
 						current.params[ADDCHK_INDEX]=1;
-					
+
 				}
 	}
-	
+
 	/**
 	 * Shellsort, using a sequence suggested by Gonnet.
 	 * -- a little adopted
@@ -503,83 +509,83 @@ void findChordLogic(Proposal current) {
 	 * @param sortIndex 1 to sort by don'tHaveGrade, 2 to sort by unusualGrade
 	 * @return sorted list by selected criteria
 	 */
-	public void shellsort( java.util.List a, int sortIndex ){
+	public void shellsort( java.util.List<Proposal> a, int sortIndex ){
 		int length = a.size();
 		for( int gap = length / 2; gap > 0;
 					 gap = gap == 2 ? 1 : (int) ( gap / 2.2 ) )
 			for( int i = gap; i < length; i++ ){
-				Proposal tmp = (Proposal)a.get(i);
+				Proposal tmp = a.get(i);
 				int j = i;
-				
-				for( ; j >= gap && 
+
+				for( ; j >= gap &&
 				(  sortIndex == 1 ?
-				tmp.dontHaveGrade > ((Proposal)a.get(j - gap)).dontHaveGrade :
-				tmp.unusualGrade > ((Proposal)a.get(j - gap)).unusualGrade  )
-				; 
+				tmp.dontHaveGrade > a.get(j - gap).dontHaveGrade :
+				tmp.unusualGrade > a.get(j - gap).unusualGrade  )
+				;
 				j -= gap )
 					a.set(j, a.get(j - gap));
 				a.set( j , tmp);
 			}
 	}
-	
+
 	protected void addProposal(int[] params, String name){
 		this.proposalParameters.add(params);
 		this.proposalList.add(name);
 	}
-	
+
 	protected void clearProposals(){
 		this.proposalList.removeAll();
 		this.proposalParameters.clear();
 	}
-	
+
 	protected ChordDialog getDialog(){
 		return this.dialog;
 	}
-	
+
 	protected List getProposalList(){
 		return this.proposalList;
 	}
-	
+
 	protected boolean isValidProcess(long processId){
 		return (this.runningProcess == processId);
 	}
-	
+
 	protected class Proposal implements Cloneable{
 		int[] params;
-		
+
 		/** grade for chord "unusualness" - Cm is less unusual than E7/9+/C */
 		int unusualGrade = 0;
 		/** penalty for notes that chord doesn't have */
 		int dontHaveGrade = -15;
-		
+
 		/** counts the notes that are in chord but still not recognized */
 		int missingCount;
 		int[] missingNotes;
-		
+
 		boolean filled[]={false,false,false,false};
 		int plusminusValue[]={0,0,0};
-		
+
 		private Proposal() {
 			super();
 			this.params = new int[9];
 			for (int i=0; i<9; i++)
 				this.params[i]=-1;
 		}
-		
+
 		/** initialize with needed notes */
-		public Proposal(java.util.List notes) {
+		public Proposal(java.util.List<Integer> notes) {
 			this.params = new int[9];
 			for (int i=0; i<9; i++)
 				this.params[i]=-1;
-			
+
 			int length = notes.size();
 			this.missingNotes = new int[length];
 			for (int i = 0; i< length; i++){ // deep copy, because of clone() method
-				this.missingNotes[i] = ((Integer)notes.get(i)).intValue();
+				this.missingNotes[i] = notes.get(i).intValue();
 			}
 			this.missingCount = length;
 		}
-		
+
 		/** if note is found, mark it as found in the Missing array*/
 		void foundNote(int value) {
 			int note = (value % 12);
@@ -588,13 +594,13 @@ void foundNote(int value) {
 					if (this.missingNotes[i] == note) {
 						// put the found one on the end, switch positions
 						this.missingCount--;
-						int temp = this.missingNotes[i]; 
+						int temp = this.missingNotes[i];
 						this.missingNotes[i]=this.missingNotes[this.missingCount];
 						this.missingNotes[this.missingCount]=temp;
 						return;
 					}
 		}
-		
+
 		/** is note already found? */
 		boolean isFound(int value) {
 			int note = (value % 12);
@@ -603,7 +609,7 @@ boolean isFound(int value) {
 					return true;
 			return false;
 		}
-		
+
 		/** is note required to be found? */
 		boolean isNeeded(int value) {
 			int note = (value % 12);
@@ -613,7 +619,7 @@ boolean isNeeded(int value) {
 						return true;
 			return false;
 		}
-		
+
 		/** does note exist in a chord? (found or not found) */
 		boolean isExisting(int value) {
 			int note = (value % 12);
@@ -622,8 +628,9 @@ boolean isExisting(int value) {
 					return true;
 			return false;
 		}
-		
+
 		/** calls the Object.clone() method, since it is private (?!!??) */
+		@Override
 		public Object clone() {
 			Proposal proposal = new Proposal();
 			for (int i=0; i<9; i++)
@@ -638,14 +645,15 @@ public Object clone() {
 			proposal.filled = new boolean[this.filled.length];
 			for (int i=0; i<proposal.filled.length; i++)
 				proposal.filled[i] = this.filled[i];
-			
+
 			proposal.plusminusValue = new int[this.plusminusValue.length];
 			for (int i=0; i<proposal.plusminusValue.length; i++)
 				proposal.plusminusValue[i] = this.plusminusValue[i];
-			
+
 			return proposal;
 		}
-		
+
+		@Override
 		public boolean equals(Object o) {
 			Proposal another = (Proposal)o;
 			for (int i=0; i<9; i++)
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSelector.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSelector.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSelector.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSelector.java
index bb5853ce..c2014fbd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSelector.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSelector.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.chord;
 
@@ -19,6 +16,7 @@
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.helper.SyncThread;
 import org.herac.tuxguitar.app.util.TGMusicKeyUtils;
+import org.herac.tuxguitar.song.models.TGChord;
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 /**
@@ -29,12 +27,12 @@
  *    Chord theory according to <a href="http://www.jazzguitar.be/quick_crd_ref.html">http://www.jazzguitar.be/quick_crd_ref.html</a>.
  */
 public class ChordSelector extends Composite{
-	
+
 	public static final String[][] KEY_NAMES = new String[][]{
 		TGMusicKeyUtils.getSharpKeyNames(TGMusicKeyUtils.PREFIX_CHORD),
 		TGMusicKeyUtils.getFlatKeyNames(TGMusicKeyUtils.PREFIX_CHORD),
 	};
-	
+
 	private ChordDialog dialog;
 	private int[] tuning;
 	private List tonicList;
@@ -48,29 +46,29 @@ public class ChordSelector extends Composite{
 	private List _5List;
 	private List _9List;
 	private List _11List;
-	
+
 	private boolean refresh;
-	
+
 	public ChordSelector(ChordDialog dialog,Composite parent,int style,int[] tuning) {
 		super(parent,style);
 		this.setLayout(new GridLayout(3,false));
 		this.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.dialog = dialog;
 		this.tuning = tuning;
-		
+
 		this.refresh = true;
 		this.init();
 	}
-	
-	
+
+
 	public void init(){
 		Composite tonicComposite = new Composite(this,SWT.NONE);
 		tonicComposite.setLayout(this.dialog.gridLayout(1,false,0,0));
 		tonicComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.tonicList = new List(tonicComposite,SWT.BORDER);
 		this.tonicList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		// sharp & flat buttons
 		Composite buttonsComposite = new Composite(tonicComposite,SWT.NONE);
 		buttonsComposite.setLayout(this.dialog.gridLayout(2,true,0,0));
@@ -86,17 +84,19 @@ public void init(){
 		this.flatButton.setText("b");
 		this.chordList = new List(this,SWT.BORDER);
 		this.chordList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Label separator = new Label(tonicComposite,SWT.SEPARATOR | SWT.HORIZONTAL);
 		separator.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,true));
 		Button customizeButton = new Button(tonicComposite,SWT.PUSH);
 		customizeButton.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,false));
 		customizeButton.setText(TuxGuitar.getProperty("settings"));
-		
+
 		customizeButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(new ChordSettingsDialog().open(ChordSelector.this.getShell())){
 					new SyncThread(new Runnable() {
+						@Override
 						public void run() {
 							ChordSelector.this.showChord();
 							getChordList().redraw();
@@ -105,13 +105,13 @@ public void run() {
 				}
 			}
 		});
-		
-		
+
+
 		initChordWidgets();
-		
+
 		// fill the List widgets with text
 		insertTonicNames(true);
-		
+
 		for(int i = 0 ; i < ChordDatabase.length(); i ++) {
 			this.chordList.add( ChordDatabase.get(i).getName() );
 		}
@@ -121,21 +121,21 @@ public void run() {
 			this.chordList.add( ((ChordDatabase.ChordInfo)chordInfo.next()).getName() );
 		}
 		*/
-		
+
 		this.chordList.setSelection(0);
-		
+
 		String[] alterationNames = getAlterationNames();
 		for(int i = 0;i < alterationNames.length;i++){
 			this.alterationList.add(alterationNames[i]);
 		}
 		this.alterationList.setSelection(0);
-		
+
 		String[] plusMinus = this.getPlusMinus("");
 		for(int i = 0;i < plusMinus.length;i++){
 			this.plusMinusList.add(plusMinus[i]);
 		}
 		this.plusMinusList.setSelection(0);
-		
+
 		String[] plus5Minus = this.getPlusMinus("/5");
 		for(int i = 0;i < plus5Minus.length;i++){
 			this._5List.add(plus5Minus[i]);
@@ -151,10 +151,11 @@ public void run() {
 			this._11List.add(plus11Minus[i]);
 		}
 		this._11List.setSelection(0);
-		
+
 		// LISTENERS
-		
+
 		this.tonicList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (ChordSelector.this.getRefresh()) {
 					if(getDialog().getEditor() != null && getDialog().getList() != null){
@@ -164,8 +165,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.bassCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if (ChordSelector.this.getRefresh()) {
 					if(getDialog().getEditor() != null && getDialog().getList() != null){
@@ -174,8 +176,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.chordList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
 					adjustWidgetAvailability();
@@ -185,8 +188,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.alterationList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
 					ChordSelector.this.adjustWidgetAvailability();
@@ -196,11 +200,12 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.addCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
-					
+
 					ChordSelector.this.adjustWidgetAvailability();
 					/*
 					if (getAddCheck().getSelection()) {
@@ -213,11 +218,12 @@ public void widgetSelected(SelectionEvent arg0) {
 						//ChordSelector.this.dialog.getList().redraw();
 					}
 				}
-				
+
 			}
 		});
-		
+
 		this._5List.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
 					if (ChordSelector.this.getRefresh()) {
@@ -226,8 +232,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this._9List.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
 					if (ChordSelector.this.getRefresh()) {
@@ -236,8 +243,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this._11List.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
 					if (ChordSelector.this.getRefresh()) {
@@ -246,8 +254,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.plusMinusList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(getDialog().getEditor() != null && getDialog().getList() != null){
 					if (ChordSelector.this.getRefresh()) {
@@ -257,21 +266,23 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.sharpButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				insertTonicNames(true);
 			}
 		});
-		
+
 		this.flatButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				insertTonicNames(false);
 			}
 		});
 		this.adjustWidgetAvailability();
 	}
-	
+
 	protected void initChordWidgets() {
 		Composite alterationComposite = new Composite(this,SWT.NONE);
 		alterationComposite.setLayout(this.dialog.gridLayout(1,true,0,0));
@@ -286,19 +297,19 @@ protected void initChordWidgets() {
 		this.alterationList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.plusMinusList = new List(firstComposite,SWT.BORDER);
 		this.plusMinusList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite secondComposite = new Composite(aboveComposite,SWT.NONE);
 		secondComposite.setLayout(this.dialog.gridLayout(1,false,0,0));
 		secondComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this._5List = new List(secondComposite,SWT.BORDER);
 		this._5List.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this._9List = new List(secondComposite,SWT.BORDER);
 		this._9List.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this._11List = new List(secondComposite,SWT.BORDER);
 		this._11List.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite bassComposite = new Composite(alterationComposite,SWT.NONE);
 		bassComposite.setLayout(this.dialog.gridLayout(1,true,0,0));
 		bassComposite.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,true));
@@ -307,21 +318,21 @@ protected void initChordWidgets() {
 		//this.addCheck.setSelection(false);
 		//this.addCheck.setEnabled(false);
 		this.addCheck.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,true));
-		
+
 		Label separator = new Label(bassComposite,SWT.SEPARATOR | SWT.HORIZONTAL );
 		separator.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,true));
-		
+
 		Label bText = new Label(bassComposite,SWT.LEFT);
 		bText.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,false));
 		bText.setText(TuxGuitar.getProperty("chord.bass"));
 		this.bassCombo = new Combo(bassComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.bassCombo.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,false));
 	}
-	
+
 	protected void insertTonicNames(boolean sharp){
-		
+
 		String[] names = KEY_NAMES[ sharp?0:1 ];
-		
+
 		// update the buttons
 		this.flatButton.setSelection(!sharp);
 		this.sharpButton.setSelection(sharp);
@@ -330,7 +341,7 @@ protected void insertTonicNames(boolean sharp){
 		if (indexL==-1) indexL=0;
 		int indexC = this.bassCombo.getSelectionIndex();
 		if (indexC==-1) indexC=0;
-		
+
 		// update the list
 		this.tonicList.removeAll();
 		this.bassCombo.removeAll();
@@ -341,34 +352,36 @@ protected void insertTonicNames(boolean sharp){
 		this.tonicList.setSelection(indexL);
 		this.bassCombo.select(indexC);
 	}
-	
+
 	private String[] getPlusMinus(String text){
 		String[] names = new String[3];
-		
+
 		names[0] = " ";
 		names[1] = text+"+";
 		names[2] = text+"-";
-		
+
 		return names;
 	}
-	
+
 	private String[] getAlterationNames(){
 		String[] names = new String[4];
-		
+
 		names[0] = " ";
 		names[1] = "9";
 		names[2] = "11";
 		names[3] = "13";
-		
+
 		return names;
 	}
-	
+
 	protected void showChord(){
 		TuxGuitar.instance().loadCursor(getShell(),SWT.CURSOR_WAIT);
 		ChordCreatorListener listener = new ChordCreatorListener() {
-			public void notifyChords(final ChordCreatorUtil instance,final java.util.List chords) {
+			@Override
+			public void notifyChords(final ChordCreatorUtil instance,final java.util.List<TGChord> chords) {
 				try {
 					TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+						@Override
 						public void run() {
 							if(instance.isValidProcess() && !getDialog().isDisposed()){
 								getDialog().getList().setChords(chords);
@@ -381,7 +394,7 @@ public void run() {
 				}
 			}
 		};
-		
+
 		ChordCreatorUtil.getChords(listener,
 		                           this.tuning,
 		                           this.chordList.getSelectionIndex(),
@@ -395,23 +408,23 @@ public void run() {
 		                           this.tonicList.getSelectionIndex(),
 		                           this.sharpButton.getSelection());
 	}
-	
+
 	protected void updateWidget(List widget, boolean enabled) {
 		widget.setEnabled(enabled);
 		if(!enabled){
 			widget.setSelection(0);
 		}
 	}
-	
+
 	protected void updateWidget(Button widget, boolean enabled) {
 		widget.setEnabled(enabled);
 		if(!enabled){
 			widget.setSelection(false);
 		}
 	}
-	
+
 	/**
-	 * Sets all the widgets' fields into recognized chord 
+	 * Sets all the widgets' fields into recognized chord
 	 * (tonic, bass, chord, alterations)
 	 */
 	public void adjustWidgets(int tonic, int chordBasic, int alteration, int bass, int plusMinus, int addBoolean, int index5, int index9, int index11) {
@@ -430,7 +443,7 @@ public void adjustWidgets(int tonic, int chordBasic, int alteration, int bass, i
 		this.setRefresh(true);
 		this.showChord();
 	}
-	
+
 	/**
 	 * adjusts the widgets availability according to chord theory options
 	 */
@@ -442,7 +455,7 @@ protected void adjustWidgetAvailability() {
 			updateWidget(get_9List(),false);
 			updateWidget(get_11List(),false);
 			updateWidget(getPlusMinusList(),false);
-			
+
 			if (!chordName.equals("5")){
 				updateWidget(get_5List(),false);//disableWidget(get_5List());
 			}else{
@@ -456,7 +469,7 @@ protected void adjustWidgetAvailability() {
 			updateWidget(getAlterationList(),true);
 			updateWidget(get_5List(),true);
 		}
-		
+
 		if(this.alterationList.isEnabled()){
 			int currentIndex = this.alterationList.getSelectionIndex();
 			// handle the +- list and ADD checkbox
@@ -467,67 +480,67 @@ protected void adjustWidgetAvailability() {
 			updateWidget(this._11List, (currentIndex >= 3 && !this.addCheck.getSelection() ) );
 		}
 	}
-	
+
 	public boolean getRefresh() {
 		return this.refresh;
 	}
-	
+
 	public void setRefresh(boolean refresh) {
 		this.refresh = refresh;
 	}
-	
+
 	public void setTuning(int[] tuning){
 		this.tuning = tuning;
 	}
-	
+
 	public int[] getTuning(){
 		return this.tuning;
 	}
-	
+
 	protected ChordDialog getDialog() {
 		return this.dialog;
 	}
-	
+
 	protected List getTonicList() {
 		return this.tonicList;
 	}
-	
+
 	protected List getChordList() {
 		return this.chordList;
 	}
-	
+
 	protected List getAlterationList() {
 		return this.alterationList;
 	}
-	
+
 	protected Button getSharpButton() {
 		return this.sharpButton;
 	}
-	
+
 	protected Button getFlatButton() {
 		return this.flatButton;
 	}
-	
+
 	protected Combo getBassCombo() {
 		return this.bassCombo;
 	}
-	
+
 	protected Button getAddCheck() {
 		return this.addCheck;
 	}
-	
+
 	protected List getPlusMinusList() {
 		return this.plusMinusList;
 	}
-	
+
 	protected List get_5List() {
 		return this._5List;
 	}
-	
+
 	protected List get_9List() {
 		return this._9List;
 	}
-	
+
 	protected List get_11List() {
 		return this._11List;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSettings.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSettings.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSettings.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSettings.java
index 441b3280..f05c8494 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSettings.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSettings.java
@@ -1,9 +1,9 @@
 package org.herac.tuxguitar.app.editors.chord;
 
 public class ChordSettings {
-	
+
 	private static ChordSettings instance;
-	
+
 	private boolean emptyStringChords;
 	private float bassGrade;
 	private float fingeringGrade;
@@ -16,7 +16,7 @@ public class ChordSettings {
 	private int chordTypeIndex;
 	private int findChordsMin;
 	private int findChordsMax;
-	
+
 	private ChordSettings() {
 		this.emptyStringChords = false;
 		this.bassGrade = 200.0f;
@@ -31,106 +31,106 @@ private ChordSettings() {
 		this.findChordsMin=0;
 		this.findChordsMax=15;
 	}
-	
+
 	public static ChordSettings instance(){
 		if( instance == null ){
 			instance = new ChordSettings();
 		}
 		return instance;
 	}
-	
+
 	public float getBassGrade() {
 		return this.bassGrade;
 	}
-	
+
 	public void setBassGrade(float bassGrade) {
 		this.bassGrade = bassGrade;
 	}
-	
+
 	public int getChordsToDisplay() {
 		return this.chordsToDisplay;
 	}
-	
+
 	public void setChordsToDisplay(int chordsToDisplay) {
 		this.chordsToDisplay = chordsToDisplay;
 	}
-	
+
 	public boolean isEmptyStringChords() {
 		return this.emptyStringChords;
 	}
-	
+
 	public void setEmptyStringChords(boolean emptyStringChords) {
 		this.emptyStringChords = emptyStringChords;
 	}
-	
+
 	public float getFingeringGrade() {
 		return this.fingeringGrade;
 	}
-	
+
 	public void setFingeringGrade(float fingeringGrade) {
 		this.fingeringGrade = fingeringGrade;
 	}
-	
+
 	public float getGoodChordSemanticsGrade() {
 		return this.goodChordSemanticsGrade;
 	}
-	
+
 	public void setGoodChordSemanticsGrade(float goodChordSemanticsGrade) {
 		this.goodChordSemanticsGrade = goodChordSemanticsGrade;
 	}
-	
+
 	public float getManyStringsGrade() {
 		return this.manyStringsGrade;
 	}
-	
+
 	public void setManyStringsGrade(float manyStringsGrade) {
 		this.manyStringsGrade = manyStringsGrade;
 	}
-	
+
 	public float getRequiredBasicsGrade() {
 		return this.requiredBasicsGrade;
 	}
-	
+
 	public void setRequiredBasicsGrade(float requiredBasicsGrade) {
 		this.requiredBasicsGrade = requiredBasicsGrade;
 	}
-	
+
 	public float getSubsequentGrade() {
 		return this.subsequentGrade;
 	}
-	
+
 	public void setSubsequentGrade(float subsequentGrade) {
 		this.subsequentGrade = subsequentGrade;
 	}
-	
+
 	public int getIncompleteChords() {
 		return this.howManyIncompleteChords;
 	}
-	
+
 	public void setIncompleteChords(int incomplete) {
 		this.howManyIncompleteChords = incomplete;
 	}
-	
+
 	public int getFindChordsMin() {
 		return this.findChordsMin;
 	}
-	
+
 	public void setFindChordsMin(int min) {
 		this.findChordsMin = min;
 	}
-	
+
 	public int getFindChordsMax() {
 		return this.findChordsMax;
 	}
-	
+
 	public void setFindChordsMax(int max) {
 		this.findChordsMax = max;
 	}
-	
+
 	public int getChordTypeIndex() {
 		return this.chordTypeIndex;
 	}
-	
+
 	public void setChordTypeIndex(int index) {
 		switch (index) {
 			case 0 : // normal
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSettingsDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSettingsDialog.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSettingsDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSettingsDialog.java
index e8703f3a..2c1c682c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordSettingsDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/ChordSettingsDialog.java
@@ -17,12 +17,12 @@
 
 /**
  * Dialog for customizing chord criteria parameters
- * 
+ *
  * @author Nikola Kolarovic
  *
  */
 public class ChordSettingsDialog {
-	
+
 	private boolean updated;
 	private Shell dialog;
 	private Button emptyStringChords = null;
@@ -30,79 +30,81 @@ public class ChordSettingsDialog {
 	private Combo typeCombo = null;
 	private Spinner minFret = null;
 	private Spinner maxFret = null;
-	
+
 	public ChordSettingsDialog() {
 		super();
 	}
-	
+
 	public boolean open(Shell parent){
 		this.updated = false;
-		
+
 		this.dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setText(TuxGuitar.getProperty("settings"));
 		this.init();
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return this.updated;
 	}
-	
+
 	protected void init() {
 		Group group = new Group(this.dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("chord.settings.tip"));
-		
+
 		Composite composite = new Composite(group,SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		initTypeCombo(composite);
 		initChordsToDisplay(composite);
 		initEmptyStringChords(composite);
 		initFretSearch(composite);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dispose(true);
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dispose(false);
 			}
 		});
-		
+
 		this.dialog.setDefaultButton( buttonOK );
 	}
-	
+
 	private GridData getGridData(int minimumWidth, int minimumHeight){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = minimumWidth;
 		data.minimumHeight = minimumHeight;
 		return data;
 	}
-	
+
 	private GridData getGridData(){
 		return getGridData(125,0);
 	}
-	
+
 	private GridData getButtonData(){
 		return getGridData(80,25);
 	}
-	
+
 	private Spinner makeSpinner(Composite parent,String label,int value, int min, int max){
 		this.newLabel(parent,label);
 		Spinner spinner = new Spinner(parent,SWT.BORDER);
@@ -112,13 +114,13 @@ private Spinner makeSpinner(Composite parent,String label,int value, int min, in
 		spinner.setLayoutData(getGridData());
 		return spinner;
 	}
-	
+
 	private Label newLabel(Composite parent,String text){
 		Label label = new Label(parent,SWT.HORIZONTAL);
 		label.setText(text);
 		return label;
 	}
-	
+
 	private void initTypeCombo(Composite parent) {
 		this.newLabel(parent, TuxGuitar.getProperty("chord.settings.type"));
 		this.typeCombo = new Combo(parent,SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -129,11 +131,11 @@ private void initTypeCombo(Composite parent) {
 		this.typeCombo.add(TuxGuitar.getProperty("chord.settings.type.open-voiced"));
 		this.typeCombo.select(ChordSettings.instance().getChordTypeIndex());
 	}
-	
+
 	private void initChordsToDisplay(Composite parent) {
 		this.chordsToDisplay = makeSpinner(parent,TuxGuitar.getProperty("chord.settings.chords-to-display"),ChordSettings.instance().getChordsToDisplay(),1,100);
 	}
-	
+
 	private void initEmptyStringChords(Composite parent) {
 		this.emptyStringChords = new Button(parent,SWT.CHECK);
 		this.emptyStringChords.setSelection(ChordSettings.instance().isEmptyStringChords());
@@ -141,7 +143,7 @@ private void initEmptyStringChords(Composite parent) {
 		this.emptyStringChords.setSize(100,20);
 		this.emptyStringChords.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true,2,1));
 	}
-	
+
 	private void initFretSearch(Composite parent) {
 		Group group = new Group(parent,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(4,false));
@@ -150,17 +152,19 @@ private void initFretSearch(Composite parent) {
 		this.minFret = makeSpinner(group,TuxGuitar.getProperty("chord.settings.minimum-fret"),ChordSettings.instance().getFindChordsMin(),0,15);
 		this.maxFret = makeSpinner(group,TuxGuitar.getProperty("chord.settings.maximum-fret"),ChordSettings.instance().getFindChordsMax(),2,25);
 		this.minFret.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				checkMinimumFretValue();
 			}
 		});
 		this.maxFret.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				checkMaximumFretValue();
 			}
 		});
 	}
-	
+
 	protected void checkMinimumFretValue(){
 		int maxSelection = this.maxFret.getSelection();
 		int minSelection = this.minFret.getSelection();
@@ -168,7 +172,7 @@ protected void checkMinimumFretValue(){
 			this.maxFret.setSelection(minSelection);
 		}
 	}
-	
+
 	protected void checkMaximumFretValue(){
 		int maxSelection = this.maxFret.getSelection();
 		int minSelection = this.minFret.getSelection();
@@ -176,7 +180,7 @@ protected void checkMaximumFretValue(){
 			this.maxFret.setSelection(minSelection);
 		}
 	}
-	
+
 	private void update(){
 		ChordSettings.instance().setChordTypeIndex(this.typeCombo.getSelectionIndex());
 		ChordSettings.instance().setEmptyStringChords(this.emptyStringChords.getSelection());
@@ -184,7 +188,7 @@ private void update(){
 		ChordSettings.instance().setFindChordsMax(this.maxFret.getSelection());
 		ChordSettings.instance().setFindChordsMin(this.minFret.getSelection());
 	}
-	
+
 	protected void dispose(boolean updated){
 		this.updated = updated;
 		if(this.updated){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/CustomChordManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/CustomChordManager.java
similarity index 89%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/CustomChordManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/CustomChordManager.java
index 56f8fac5..1f214d3a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/CustomChordManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/CustomChordManager.java
@@ -10,45 +10,45 @@
 import org.herac.tuxguitar.song.models.TGChord;
 
 public class CustomChordManager {
-	
+
 	private long lastEdit;
-	private List chords;
-	
+	private List<TGChord> chords;
+
 	public CustomChordManager() {
 		this.chords = ChordXMLReader.getChords(getUserFileName());
 		this.setLastEdit();
 	}
-	
+
 	public int countChords() {
 		return this.chords.size();
 	}
-	
+
 	public TGChord getChord(int index) {
 		if (index >= 0 && index < countChords()) {
-			return ((TGChord) this.chords.get(index)).clone(TuxGuitar.instance().getSongManager().getFactory());
+			return this.chords.get(index).clone(TuxGuitar.instance().getSongManager().getFactory());
 		}
 		return null;
 	}
-	
+
 	public void addChord(TGChord chord) {
 		this.chords.add(chord);
 		this.setLastEdit();
 	}
-	
+
 	public void removeChord(int index) {
 		if (index >= 0 && index < countChords()) {
 			this.chords.remove(index);
 			this.setLastEdit();
 		}
 	}
-	
+
 	public void renameChord(int index, String name) {
 		if (index >= 0 && index < countChords()) {
-			((TGChord) this.chords.get(index)).setName(name);
+			this.chords.get(index).setName(name);
 			this.setLastEdit();
 		}
 	}
-	
+
 	public boolean existOtherEqualCustomChord(String name, int index) {
 		for (int i = 0; i < countChords(); i++) {
 			TGChord chord = getChord(i);
@@ -58,19 +58,19 @@ public boolean existOtherEqualCustomChord(String name, int index) {
 		}
 		return false;
 	}
-	
+
 	public void write() {
 		ChordXMLWriter.setChords(this.chords, getUserFileName());
 	}
-	
+
 	private static String getUserFileName() {
 		return (TGFileUtils.PATH_USER_CONFIG + File.separator + "customchords.xml");
 	}
-	
+
 	private void setLastEdit() {
 		this.lastEdit = System.currentTimeMillis();
 	}
-	
+
 	public long getLastEdit() {
 		return this.lastEdit;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXML.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXML.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXML.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXML.java
index faae1b26..487bb0b9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXML.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXML.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.app.editors.chord.xml;
 
 public class ChordXML {
-	
+
 	public static final String CHORD_LIST_TAG = "chords";
 	public static final String CHORD_TAG = "chord";
 	public static final String CHORD_NAME_ATTRIBUTE = "name";
@@ -10,5 +10,5 @@ public class ChordXML {
 	public static final String STRING_TAG = "string";
 	public static final String STRING_NUMBER_ATTRIBUTE = "number";
 	public static final String STRING_FRET_ATTRIBUTE = "fret";
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLReader.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLReader.java
index 7f29001f..1955c3ca 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLReader.java
@@ -18,9 +18,9 @@
 import org.xml.sax.SAXException;
 
 public class ChordXMLReader {
-	
-	public static List getChords(String fileName) {
-		List chords = new ArrayList();
+
+	public static List<TGChord> getChords(String fileName) {
+		List<TGChord> chords = new ArrayList<TGChord>();
 		try{
 			File file = new File(fileName);
 			if (file.exists()){
@@ -32,7 +32,7 @@ public static List getChords(String fileName) {
 		}
 		return chords;
 	}
-	
+
 	private static Document getDocument(File file) {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -48,38 +48,38 @@ private static Document getDocument(File file) {
 		}
 		return document;
 	}
-	
+
 	/**
 	 * Read shortcuts from xml file
-	 * 
+	 *
 	 * @param shortcutsNode
 	 * @return
 	 */
-	private static void loadChords(Node chordsNode,List chords){
+	private static void loadChords(Node chordsNode,List<TGChord> chords){
 		try{
 			NodeList chordList = chordsNode.getChildNodes();
 			for (int i = 0; i < chordList.getLength(); i++) {
 				Node chordItem = chordList.item(i);
 				if (chordItem.getNodeName().equals(ChordXML.CHORD_TAG)) {
 					NamedNodeMap chordAttributes = chordItem.getAttributes();
-					
+
 					String name = chordAttributes.getNamedItem(ChordXML.CHORD_NAME_ATTRIBUTE).getNodeValue();
 					String strings = chordAttributes.getNamedItem(ChordXML.CHORD_STRINGS_ATTRIBUTE).getNodeValue();
 					String firstFret = chordAttributes.getNamedItem(ChordXML.CHORD_FIRST_FRET_ATTRIBUTE).getNodeValue();
-					
+
 					TGChord chord = TuxGuitar.instance().getSongManager().getFactory().newChord(Integer.parseInt(strings));
 					chord.setName(name);
 					chord.setFirstFret(Integer.parseInt(firstFret));
-					
+
 					NodeList stringList = chordItem.getChildNodes();
 					for (int j = 0; j < stringList.getLength(); j++) {
 						Node stringItem = stringList.item(j);
 						if (stringItem.getNodeName().equals(ChordXML.STRING_TAG)) {
 							NamedNodeMap stringAttributes = stringItem.getAttributes();
-							
+
 							String number = stringAttributes.getNamedItem(ChordXML.STRING_NUMBER_ATTRIBUTE).getNodeValue();
 							String fret = stringAttributes.getNamedItem(ChordXML.STRING_FRET_ATTRIBUTE).getNodeValue();
-							
+
 							chord.addFretValue(Integer.parseInt(number),Integer.parseInt(fret));
 						}
 					}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLWriter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLWriter.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLWriter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLWriter.java
index a5af6b59..6af90cb4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLWriter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/chord/xml/ChordXMLWriter.java
@@ -26,15 +26,15 @@
 import org.w3c.dom.Node;
 
 public class ChordXMLWriter {
-	
-	public static void setChords(List chords,String fileName) {
+
+	public static void setChords(List<TGChord> chords,String fileName) {
 		File file = new File(fileName);
-		
+
 		Document doc = createDocument();
 		setChords(chords,doc);
 		saveDocument(doc,file);
 	}
-	
+
 	public static Document createDocument() {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -46,11 +46,11 @@ public static Document createDocument() {
 		}
 		return document;
 	}
-	
+
 	public static void saveDocument(Document document,File file) {
 		try {
 			FileOutputStream fs = new FileOutputStream(file);
-			
+
 			// Write it out again
 			TransformerFactory xformFactory = TransformerFactory.newInstance();
 			Transformer idTransform = xformFactory.newTransformer();
@@ -68,54 +68,54 @@ public static void saveDocument(Document document,File file) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * Write chords to xml file
 	 */
-	private static void setChords(List chords,Document document){
+	private static void setChords(List<TGChord> chords,Document document){
 		//chords tag
 		Node chordsNode = document.createElement(ChordXML.CHORD_LIST_TAG);
-		
-		Iterator it = chords.iterator();
+
+		Iterator<TGChord> it = chords.iterator();
 		while(it.hasNext()){
-			TGChord chord = (TGChord)it.next();
-			
+			TGChord chord = it.next();
+
 			//chord tag
 			Node chordNode = document.createElement(ChordXML.CHORD_TAG);
 			chordsNode.appendChild(chordNode);
-			
+
 			//name attribute
 			Attr nameAttr = document.createAttribute(ChordXML.CHORD_NAME_ATTRIBUTE);
 			nameAttr.setNodeValue( chord.getName());
 			chordNode.getAttributes().setNamedItem(nameAttr);
-			
+
 			//strings attribute
 			Attr stringsAttr = document.createAttribute(ChordXML.CHORD_STRINGS_ATTRIBUTE);
 			stringsAttr.setNodeValue(Integer.toString(chord.getStrings().length));
 			chordNode.getAttributes().setNamedItem(stringsAttr);
-			
+
 			//first fret attribute
 			Attr firstFretAttr = document.createAttribute(ChordXML.CHORD_FIRST_FRET_ATTRIBUTE);
 			firstFretAttr.setNodeValue(Integer.toString(chord.getFirstFret()));
 			chordNode.getAttributes().setNamedItem(firstFretAttr);
-			
+
 			for(int i = 0;i < chord.getStrings().length; i++){
 				//string tag
 				Node stringNode = document.createElement(ChordXML.STRING_TAG);
 				chordNode.appendChild(stringNode);
-				
+
 				//number attribute
 				Attr numberAttr = document.createAttribute(ChordXML.STRING_NUMBER_ATTRIBUTE);
 				numberAttr.setNodeValue(Integer.toString(i));
 				stringNode.getAttributes().setNamedItem(numberAttr);
-				
+
 				//fret attribute
 				Attr fretAttr = document.createAttribute(ChordXML.STRING_FRET_ATTRIBUTE);
 				fretAttr.setNodeValue(Integer.toString(chord.getFretValue(i)));
 				stringNode.getAttributes().setNamedItem(fretAttr);
 			}
 		}
-		
+
 		document.appendChild(chordsNode);
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/BendEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/BendEditor.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/BendEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/BendEditor.java
index fd929471..843cce81 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/BendEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/BendEditor.java
@@ -1,8 +1,5 @@
 /*
  * Created on 28-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.effects;
 
@@ -28,39 +25,37 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 import org.herac.tuxguitar.song.models.TGNote;
 import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend.BendPoint;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class BendEditor{
 	private static final int X_SPACING = 30;
 	private static final int Y_SPACING = 15;
 	private static final int X_LENGTH = TGEffectBend.MAX_POSITION_LENGTH + 1;
 	private static final int Y_LENGTH = TGEffectBend.MAX_VALUE_LENGTH + 1;
-	
+
 	private int[] x;
 	private int[] y;
 	private int width;
 	private int height;
-	private List points;
+	private List<Point> points;
 	protected Composite editor;
 	protected DefaultBend[] defaultBends;
 	protected TGEffectBend result;
 	protected boolean cancelled;
-	
+
 	public BendEditor() {
 		this.init();
 	}
-	
+
 	private void init(){
 		this.x = new int[X_LENGTH];
 		this.y = new int[Y_LENGTH];
 		this.width = ((X_SPACING * X_LENGTH) - X_SPACING);
 		this.height = ((Y_SPACING * Y_LENGTH) - Y_SPACING);
-		this.points = new ArrayList();
-		
+		this.points = new ArrayList<Point>();
+
 		for(int i = 0;i < this.x.length;i++){
 			this.x[i] = ((i + 1) * X_SPACING);
 		}
@@ -68,56 +63,58 @@ private void init(){
 			this.y[i] = ((i + 1) * Y_SPACING);
 		}
 	}
-	
+
 	public boolean isCancelled(){
 		return this.cancelled;
 	}
-	
+
 	public TGEffectBend getResult(){
 		return this.result;
 	}
-	
+
 	public void show(Shell shell,final TGNote note){
 		this.cancelled = true;
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("bend.editor"));
-		
+
 		//----------------------------------------------------------------------
 		Composite composite = new Composite(dialog,SWT.NONE);
 		composite.setLayout(new GridLayout(3,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite leftComposite = new Composite(composite,SWT.NONE);
 		leftComposite.setLayout(new GridLayout());
 		leftComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite rightComposite = new Composite(composite,SWT.NONE);
 		rightComposite.setLayout(new GridLayout());
 		rightComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		//-------------EDITOR---------------------------------------------------
 		this.editor = new Composite(leftComposite, SWT.BORDER | SWT.DOUBLE_BUFFERED);
 		this.editor.setBackground(this.editor.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.editor.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.FILL,true,true) , getWidth() + (X_SPACING * 2),getHeight() + (Y_SPACING * 2))  );
 		this.editor.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				paintEditor(painter);
 			}
 		});
 		this.editor.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
 				checkPoint(e.x,e.y);
 				BendEditor.this.editor.redraw();
 			}
 		});
-		
+
 		//-------------DEFAULT BEND LIST---------------------------------------------------
 		this.resetDefaultBends();
-		
+
 		final org.eclipse.swt.widgets.List defaultBendList = new org.eclipse.swt.widgets.List(rightComposite,SWT.BORDER | SWT.SINGLE);
 		for(int i = 0;i < BendEditor.this.defaultBends.length;i++){
 			defaultBendList.add(this.defaultBends[i].getName());
@@ -125,6 +122,7 @@ public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
 		defaultBendList.select(0);
 		defaultBendList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		defaultBendList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int index = defaultBendList.getSelectionIndex();
 				if(index >= 0 && index < BendEditor.this.defaultBends.length){
@@ -133,12 +131,13 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Button buttonClean = new Button(rightComposite, SWT.PUSH);
 		buttonClean.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.BOTTOM,true,true), 80,25));
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				BendEditor.this.result = null;
 				BendEditor.this.cancelled = false;
@@ -149,6 +148,7 @@ public void widgetSelected(SelectionEvent arg0) {
 		buttonOK.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.BOTTOM,true,false), 80,25));
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				BendEditor.this.result = getBend();
 				BendEditor.this.cancelled = false;
@@ -159,30 +159,31 @@ public void widgetSelected(SelectionEvent arg0) {
 		buttonCancel.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.BOTTOM,true,false), 80,25));
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				BendEditor.this.result = note.getEffect().getBend();
 				BendEditor.this.cancelled = true;
 				dialog.dispose();
 			}
 		});
-		
+
 		if(note.getEffect().isBend()){
 			setBend(note.getEffect().getBend());
 		}else{
 			setBend(this.defaultBends[0].getBend());
 		}
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData resizeData(GridData data,int minimumWidth,int minimumHeight){
 		data.minimumWidth = minimumWidth;
 		data.minimumHeight = minimumHeight;
 		return data;
 	}
-	
+
 	protected void paintEditor(TGPainterImpl painter){
 		for(int i = 0;i < this.x.length;i++){
 			this.setStyleX(painter,i);
@@ -200,16 +201,16 @@ protected void paintEditor(TGPainterImpl painter){
 			painter.lineTo(X_SPACING + this.width,this.y[i]);
 			painter.closePath();
 		}
-		
-		Iterator it = null;
+
+		Iterator<Point> it = null;
 		Point prevPoint = null;
 		painter.setLineStyleSolid();
 		painter.setLineWidth(2);
 		painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_GRAY)));
-		
+
 		it = this.points.iterator();
 		while(it.hasNext()){
-			Point point = (Point)it.next();
+			Point point = it.next();
 			if(prevPoint != null){
 				painter.initPath();
 				painter.moveTo(prevPoint.x,prevPoint.y);
@@ -218,13 +219,13 @@ protected void paintEditor(TGPainterImpl painter){
 			}
 			prevPoint = point;
 		}
-		
+
 		painter.setLineWidth(5);
 		painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_BLACK)));
-		
+
 		it = this.points.iterator();
 		while(it.hasNext()){
-			Point point = (Point)it.next();
+			Point point = it.next();
 			painter.initPath();
 			painter.setAntialias(false);
 			painter.addRectangle(point.x - 2,point.y - 2,5,5);
@@ -232,7 +233,7 @@ protected void paintEditor(TGPainterImpl painter){
 		}
 		painter.setLineWidth(1);
 	}
-	
+
 	private void setStyleX(TGPainterImpl painter,int i){
 		painter.setLineStyleSolid();
 		if(i == 0 || i == (X_LENGTH - 1)){
@@ -244,14 +245,14 @@ private void setStyleX(TGPainterImpl painter,int i){
 			}
 		}
 	}
-	
+
 	private void setStyleY(TGPainterImpl painter,int i){
 		painter.setLineStyleSolid();
 		if(i == 0 || i == (Y_LENGTH - 1)){
 			painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_BLACK)));
 		}else{
 			painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_RED)));
-			
+
 			if((i % 2) > 0){
 				painter.setLineStyleDot();
 				painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_GRAY)));
@@ -260,7 +261,7 @@ private void setStyleY(TGPainterImpl painter,int i){
 			}
 		}
 	}
-	
+
 	protected void checkPoint(int x,int y){
 		Point point = new Point(this.getX(x),this.getY(y));
 		if(!this.removePoint(point)){
@@ -269,11 +270,11 @@ protected void checkPoint(int x,int y){
 			this.orderPoints();
 		}
 	}
-	
+
 	protected boolean removePoint(Point point){
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while(it.hasNext()){
-			Point currPoint = (Point)it.next();
+			Point currPoint = it.next();
 			if(currPoint.x == point.x && currPoint.y == point.y){
 				this.points.remove(point);
 				return true;
@@ -281,12 +282,12 @@ protected boolean removePoint(Point point){
 		}
 		return false;
 	}
-	
+
 	protected void orderPoints(){
 		for(int i = 0;i < this.points.size();i++){
 			Point minPoint = null;
 			for(int noteIdx = i;noteIdx < this.points.size();noteIdx++){
-				Point point = (Point)this.points.get(noteIdx);
+				Point point = this.points.get(noteIdx);
 				if(minPoint == null || point.x < minPoint.x){
 					minPoint = point;
 				}
@@ -295,22 +296,22 @@ protected void orderPoints(){
 			this.points.add(i,minPoint);
 		}
 	}
-	
+
 	protected void removePointsAtXLine(int x){
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while(it.hasNext()){
-			Point point = (Point)it.next();
+			Point point = it.next();
 			if(point.x == x){
 				this.points.remove(point);
 				break;
 			}
 		}
 	}
-	
+
 	protected void addPoint(Point point){
 		this.points.add(point);
 	}
-	
+
 	protected int getX(int pointX){
 		int currPointX = -1;
 		for(int i = 0;i < this.x.length;i++){
@@ -326,7 +327,7 @@ protected int getX(int pointX){
 		}
 		return currPointX;
 	}
-	
+
 	protected int getY(int pointY){
 		int currPointY = -1;
 		for(int i = 0;i < this.y.length;i++){
@@ -342,24 +343,24 @@ protected int getY(int pointY){
 		}
 		return currPointY;
 	}
-	
+
 	public boolean isEmpty(){
 		return this.points.isEmpty();
 	}
-	
+
 	public TGEffectBend getBend(){
 		if(this.points != null && !this.points.isEmpty()){
 			TGEffectBend bend = TuxGuitar.instance().getSongManager().getFactory().newEffectBend();//new BendEffect();
-			Iterator it = this.points.iterator();
+			Iterator<Point> it = this.points.iterator();
 			while(it.hasNext()){
-				Point point = (Point)it.next();
+				Point point = it.next();
 				addBendPoint(bend,point);
 			}
 			return bend;
 		}
 		return null;
 	}
-	
+
 	private void addBendPoint(TGEffectBend effect,Point point){
 		int position = 0;
 		int value = 0;
@@ -375,16 +376,16 @@ private void addBendPoint(TGEffectBend effect,Point point){
 		}
 		effect.addPoint(position,value);
 	}
-	
+
 	public void setBend(TGEffectBend effect){
 		this.points.clear();
-		Iterator it = effect.getPoints().iterator();
+		Iterator<BendPoint> it = effect.getPoints().iterator();
 		while(it.hasNext()){
-			TGEffectBend.BendPoint bendPoint = (TGEffectBend.BendPoint)it.next();
+			TGEffectBend.BendPoint bendPoint = it.next();
 			this.makePoint(bendPoint);
 		}
 	}
-	
+
 	private void makePoint(TGEffectBend.BendPoint bendPoint){
 		int indexX = bendPoint.getPosition();
 		int indexY = (this.y.length - bendPoint.getValue()) - 1;
@@ -395,30 +396,30 @@ private void makePoint(TGEffectBend.BendPoint bendPoint){
 			this.points.add(point);
 		}
 	}
-	
+
 	public int getWidth(){
 		return this.width;
 	}
-	
+
 	public int getHeight(){
 		return this.height;
 	}
-	
+
 	private void resetDefaultBends(){
 		this.defaultBends = new DefaultBend[5];
-		
+
 		this.defaultBends[0] = new DefaultBend(TuxGuitar.getProperty("bend.bend"),TuxGuitar.instance().getSongManager().getFactory().newEffectBend());
 		this.defaultBends[0].getBend().addPoint(0,0);
 		this.defaultBends[0].getBend().addPoint(6,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[0].getBend().addPoint(12,(TGEffectBend.SEMITONE_LENGTH * 4));
-		
+
 		this.defaultBends[1] = new DefaultBend(TuxGuitar.getProperty("bend.bend-release"),TuxGuitar.instance().getSongManager().getFactory().newEffectBend());
 		this.defaultBends[1].getBend().addPoint(0,0);
 		this.defaultBends[1].getBend().addPoint(3,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[1].getBend().addPoint(6,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[1].getBend().addPoint(9,0);
 		this.defaultBends[1].getBend().addPoint(12,0);
-		
+
 		this.defaultBends[2] = new DefaultBend(TuxGuitar.getProperty("bend.bend-release-bend"),TuxGuitar.instance().getSongManager().getFactory().newEffectBend());
 		this.defaultBends[2].getBend().addPoint(0,0);
 		this.defaultBends[2].getBend().addPoint(2,(TGEffectBend.SEMITONE_LENGTH * 4));
@@ -427,31 +428,31 @@ private void resetDefaultBends(){
 		this.defaultBends[2].getBend().addPoint(8,0);
 		this.defaultBends[2].getBend().addPoint(10,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[2].getBend().addPoint(12,(TGEffectBend.SEMITONE_LENGTH * 4));
-		
+
 		this.defaultBends[3] = new DefaultBend(TuxGuitar.getProperty("bend.prebend"),TuxGuitar.instance().getSongManager().getFactory().newEffectBend());
 		this.defaultBends[3].getBend().addPoint(0,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[3].getBend().addPoint(12,(TGEffectBend.SEMITONE_LENGTH * 4));
-		
+
 		this.defaultBends[4] = new DefaultBend(TuxGuitar.getProperty("bend.prebend-release"),TuxGuitar.instance().getSongManager().getFactory().newEffectBend());
 		this.defaultBends[4].getBend().addPoint(0,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[4].getBend().addPoint(4,(TGEffectBend.SEMITONE_LENGTH * 4));
 		this.defaultBends[4].getBend().addPoint(8,0);
 		this.defaultBends[4].getBend().addPoint(12,0);
 	}
-	
+
 	private class DefaultBend{
-		private String name;
-		private TGEffectBend bend;
-		
+		private final String name;
+		private final TGEffectBend bend;
+
 		public DefaultBend(String name,TGEffectBend bend){
 			this.name = name;
 			this.bend = bend;
 		}
-		
+
 		public TGEffectBend getBend() {
 			return this.bend;
 		}
-		
+
 		public String getName() {
 			return this.name;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/GraceEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/GraceEditor.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/GraceEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/GraceEditor.java
index 13a7691d..061a20f5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/GraceEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/GraceEditor.java
@@ -19,9 +19,9 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
 
 public class GraceEditor extends SelectionAdapter{
-	
+
 	private static final int LAYOUT_COLUMNS = 2;
-	
+
 	private Spinner fretSpinner;
 	private Button deadButton;
 	private Button beforeBeatButton;
@@ -41,37 +41,37 @@ public class GraceEditor extends SelectionAdapter{
 	private Button slideButton;
 	private Button bendButton;
 	private Button hammerButton;
-	
+
 	protected TGEffectGrace result;
 	protected boolean cancelled;
-	
+
 	public GraceEditor(){
 		super();
 	}
-	
+
 	public boolean isCancelled(){
 		return this.cancelled;
 	}
-	
+
 	public TGEffectGrace getResult(){
 		return this.result;
 	}
-	
+
 	public void show(final TGNote note){
 		this.cancelled = true;
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("effects.grace-editor"));
 		dialog.setMinimumSize(360,360);
-		
+
 		Composite composite = new Composite(dialog,SWT.NONE);
 		composite.setLayout(new GridLayout(LAYOUT_COLUMNS,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		int horizontalSpan = 2;
-		
+
 		//-----defaults-------------------------------------------------
 		boolean dead = false;
 		boolean onBeat = false;
@@ -92,15 +92,15 @@ public void show(final TGNote note){
 		//---------------------------------------------------
 		Group noteGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("note"));
 		noteGroup.setLayout(new GridLayout(2,false));
-		
+
 		Label fretLabel = new Label(noteGroup,SWT.NONE);
-		
+
 		fretLabel.setText(TuxGuitar.getProperty("fret") + ": ");
-		
+
 		this.fretSpinner = new Spinner(noteGroup,SWT.BORDER);
 		this.fretSpinner.setLayoutData(makeGridData(1));
 		this.fretSpinner.setSelection(fret);
-		
+
 		this.deadButton = new Button(noteGroup,SWT.CHECK);
 		this.deadButton.setText(TuxGuitar.getProperty("note.deadnote"));
 		this.deadButton.setLayoutData(makeGridData(2));
@@ -110,12 +110,12 @@ public void show(final TGNote note){
 		//---------------------------------------------------
 		Group positionGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("position"));
 		positionGroup.setLayout(new GridLayout());
-		
+
 		this.beforeBeatButton = new Button(positionGroup,SWT.RADIO);
 		this.beforeBeatButton.setText(TuxGuitar.getProperty("effects.grace.before-beat"));
 		this.beforeBeatButton.setLayoutData(makeGridData(1));
 		this.beforeBeatButton.setSelection(!onBeat);
-		
+
 		this.onBeatButton = new Button(positionGroup,SWT.RADIO);
 		this.onBeatButton.setText(TuxGuitar.getProperty("effects.grace.on-beat"));
 		this.onBeatButton.setLayoutData(makeGridData(1));
@@ -125,64 +125,64 @@ public void show(final TGNote note){
 		//---------------------------------------------------
 		Group durationGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("duration"));
 		durationGroup.setLayout(new GridLayout(3,false));
-		
+
 		this.durationButton1 = new Button(durationGroup,SWT.RADIO);
 		this.durationButton1.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTY_FOURTH));
 		this.durationButton1.setLayoutData(makeGridData(1));
 		this.durationButton1.setSelection(duration == 1);
-		
+
 		this.durationButton2 = new Button(durationGroup,SWT.RADIO);
 		this.durationButton2.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.THIRTY_SECOND));
 		this.durationButton2.setLayoutData(makeGridData(1));
 		this.durationButton2.setSelection(duration == 2);
-		
+
 		this.durationButton3 = new Button(durationGroup,SWT.RADIO);
 		this.durationButton3.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTEENTH));
 		this.durationButton3.setLayoutData(makeGridData(1));
 		this.durationButton3.setSelection(duration == 3);
-		
+
 		horizontalSpan = 1;
 		//---------------------------------------------------
 		//------------------DYNAMIC--------------------------
 		//---------------------------------------------------
 		Group dynamicGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("dynamic"));
 		dynamicGroup.setLayout(new GridLayout(2,false));
-		
+
 		this.pppButton = new Button(dynamicGroup,SWT.RADIO);
 		this.pppButton.setImage(TuxGuitar.instance().getIconManager().getDynamicPPP());
 		this.pppButton.setLayoutData(makeGridData(1));
 		this.pppButton.setSelection(dynamic == TGVelocities.PIANO_PIANISSIMO);
-		
+
 		this.mfButton = new Button(dynamicGroup,SWT.RADIO);
 		this.mfButton.setImage(TuxGuitar.instance().getIconManager().getDynamicMF());
 		this.mfButton.setLayoutData(makeGridData(1));
 		this.mfButton.setSelection(dynamic == TGVelocities.MEZZO_FORTE);
-		
+
 		this.ppButton = new Button(dynamicGroup,SWT.RADIO);
 		this.ppButton.setImage(TuxGuitar.instance().getIconManager().getDynamicPP());
 		this.ppButton.setLayoutData(makeGridData(1));
 		this.ppButton.setSelection(dynamic == TGVelocities.PIANISSIMO);
-		
+
 		this.fButton = new Button(dynamicGroup,SWT.RADIO);
 		this.fButton.setImage(TuxGuitar.instance().getIconManager().getDynamicF());
 		this.fButton.setLayoutData(makeGridData(1));
 		this.fButton.setSelection(dynamic == TGVelocities.FORTE);
-		
+
 		this.pButton = new Button(dynamicGroup,SWT.RADIO);
 		this.pButton.setImage(TuxGuitar.instance().getIconManager().getDynamicP());
 		this.pButton.setLayoutData(makeGridData(1));
 		this.pButton.setSelection(dynamic == TGVelocities.PIANO);
-		
+
 		this.ffButton = new Button(dynamicGroup,SWT.RADIO);
 		this.ffButton.setImage(TuxGuitar.instance().getIconManager().getDynamicFF());
 		this.ffButton.setLayoutData(makeGridData(1));
 		this.ffButton.setSelection(dynamic == TGVelocities.FORTISSIMO);
-		
+
 		this.mpButton = new Button(dynamicGroup,SWT.RADIO);
 		this.mpButton.setImage(TuxGuitar.instance().getIconManager().getDynamicMP());
 		this.mpButton.setLayoutData(makeGridData(1));
 		this.mpButton.setSelection(dynamic == TGVelocities.MEZZO_PIANO);
-		
+
 		this.fffButton = new Button(dynamicGroup,SWT.RADIO);
 		this.fffButton.setImage(TuxGuitar.instance().getIconManager().getDynamicFFF());
 		this.fffButton.setLayoutData(makeGridData(1));
@@ -192,22 +192,22 @@ public void show(final TGNote note){
 		//---------------------------------------------------
 		Group transitionGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("effects.grace.transition"));
 		transitionGroup.setLayout(new GridLayout());
-		
+
 		this.noneButton = new Button(transitionGroup,SWT.RADIO);
 		this.noneButton.setText(TuxGuitar.getProperty("effects.grace.transition-none"));
 		this.noneButton.setLayoutData(makeGridData(1));
 		this.noneButton.setSelection(transition == TGEffectGrace.TRANSITION_NONE);
-		
+
 		this.bendButton = new Button(transitionGroup,SWT.RADIO);
 		this.bendButton.setText(TuxGuitar.getProperty("effects.grace.transition-bend"));
 		this.bendButton.setLayoutData(makeGridData(1));
 		this.bendButton.setSelection(transition == TGEffectGrace.TRANSITION_BEND);
-		
+
 		this.slideButton = new Button(transitionGroup,SWT.RADIO);
 		this.slideButton.setText(TuxGuitar.getProperty("effects.grace.transition-slide"));
 		this.slideButton.setLayoutData(makeGridData(1));
 		this.slideButton.setSelection(transition == TGEffectGrace.TRANSITION_SLIDE);
-		
+
 		this.hammerButton = new Button(transitionGroup,SWT.RADIO);
 		this.hammerButton.setText(TuxGuitar.getProperty("effects.grace.transition-hammer"));
 		this.hammerButton.setLayoutData(makeGridData(1));
@@ -218,73 +218,76 @@ public void show(final TGNote note){
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.BOTTOM,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				GraceEditor.this.result = getGrace();
 				GraceEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				GraceEditor.this.result = null;
 				GraceEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				GraceEditor.this.result = note.getEffect().getGrace();
 				GraceEditor.this.cancelled = true;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private Group makeGroup(Composite parent,int horizontalSpan,String text){
 		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
 		group.setLayoutData(makeGridData(horizontalSpan));
 		group.setText(text);
-		
+
 		return group;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData makeGridData(int horizontalSpan){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.horizontalSpan = horizontalSpan;
 		return data;
 	}
-	
+
 	public TGEffectGrace getGrace(){
 		TGEffectGrace effect = TuxGuitar.instance().getSongManager().getFactory().newEffectGrace();
-		
+
 		effect.setFret(this.fretSpinner.getSelection());
 		effect.setDead(this.deadButton.getSelection());
 		effect.setOnBeat(this.onBeatButton.getSelection());
-		
+
 		//duration
 		if(this.durationButton1.getSelection()){
 			effect.setDuration(1);
@@ -311,7 +314,7 @@ public TGEffectGrace getGrace(){
 		}else if(this.fffButton.getSelection()){
 			effect.setDynamic(TGVelocities.FORTE_FORTISSIMO);
 		}
-		
+
 		//transition
 		if(this.noneButton.getSelection()){
 			effect.setTransition(TGEffectGrace.TRANSITION_NONE);
@@ -322,7 +325,7 @@ public TGEffectGrace getGrace(){
 		}else if(this.hammerButton.getSelection()){
 			effect.setTransition(TGEffectGrace.TRANSITION_HAMMER);
 		}
-		
+
 		return effect;
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/HarmonicEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/HarmonicEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/HarmonicEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/HarmonicEditor.java
index a1253f44..e2213a6b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/HarmonicEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/HarmonicEditor.java
@@ -17,35 +17,35 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
 
 public class HarmonicEditor extends SelectionAdapter{
-	
+
 	public static final int WIDTH = 400;
-	
+
 	protected Combo harmonicType;
 	protected Combo harmonicDataCombo;
 	protected Button[] typeButtons;
 	protected TGEffectHarmonic result;
 	protected boolean cancelled;
-	
+
 	public HarmonicEditor(){
 		super();
 	}
-	
+
 	public boolean isCancelled(){
 		return this.cancelled;
 	}
-	
+
 	public TGEffectHarmonic getResult(){
 		return this.result;
 	}
-	
+
 	public void show(final TGNote note){
 		this.cancelled = true;
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("effects.harmonic-editor"));
-		
+
 		//---------------------------------------------------------------------
 		//------------HARMONIC-------------------------------------------------
 		//---------------------------------------------------------------------
@@ -53,97 +53,101 @@ public void show(final TGNote note){
 		group.setLayout(new GridLayout());
 		group.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.FILL,true,true),WIDTH));
 		group.setText(TuxGuitar.getProperty("effects.harmonic.type-of-harmonic"));
-		
+
 		this.typeButtons = new Button[5];
 		SelectionListener listener = new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				update(note,getSelectedType());
 			}
 		};
-		
+
 		// Natural
 		String label = "[" + TGEffectHarmonic.KEY_NATURAL + "] " + TuxGuitar.getProperty("effects.harmonic.natural");
 		initButton(group,listener,0,TGEffectHarmonic.TYPE_NATURAL,label);
-		
+
 		// Artificial
 		label = ("[" + TGEffectHarmonic.KEY_ARTIFICIAL + "] " + TuxGuitar.getProperty("effects.harmonic.artificial"));
 		initButton(group,listener,1,TGEffectHarmonic.TYPE_ARTIFICIAL,label);
-		
+
 		// Tapped
 		label = ("[" + TGEffectHarmonic.KEY_TAPPED + "] " + TuxGuitar.getProperty("effects.harmonic.tapped"));
 		initButton(group,listener,2,TGEffectHarmonic.TYPE_TAPPED,label);
-		
+
 		// Pinch
 		label = ("[" + TGEffectHarmonic.KEY_PINCH + "] " + TuxGuitar.getProperty("effects.harmonic.pinch"));
 		initButton(group,listener,3,TGEffectHarmonic.TYPE_PINCH,label);
-		
+
 		// Semi
 		label = ("[" + TGEffectHarmonic.KEY_SEMI + "] " + TuxGuitar.getProperty("effects.harmonic.semi"));
 		initButton(group,listener,4,TGEffectHarmonic.TYPE_SEMI,label);
-		
+
 		this.harmonicDataCombo = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.harmonicDataCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		//---------------------------------------------------
 		//------------------BUTTONS--------------------------
 		//---------------------------------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.BOTTOM,true,true));
-		
+
 		Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				HarmonicEditor.this.result = getHarmonic();
 				HarmonicEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.setEnabled( note.getEffect().isHarmonic());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				HarmonicEditor.this.result = null;
 				HarmonicEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				HarmonicEditor.this.result = note.getEffect().getHarmonic();
 				HarmonicEditor.this.cancelled = true;
 				dialog.dispose();
 			}
 		});
-		
+
 		this.initDefaults(note);
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData resizeData(GridData data,int minWidth){
 		data.minimumWidth = minWidth;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private void initButton(Composite parent,SelectionListener listener,int index, int type, String label){
 		this.typeButtons[index] = new Button(parent,SWT.RADIO);
 		this.typeButtons[index].setText(label);
@@ -151,7 +155,7 @@ private void initButton(Composite parent,SelectionListener listener,int index, i
 		this.typeButtons[index].setData(new Integer(type));
 		this.typeButtons[index].addSelectionListener(listener);
 	}
-	
+
 	protected void initDefaults(TGNote note){
 		int type = TGEffectHarmonic.TYPE_NATURAL;
 		if(note.getEffect().isHarmonic()){
@@ -169,7 +173,7 @@ protected void initDefaults(TGNote note){
 				this.typeButtons[0].setEnabled(false);
 				type = TGEffectHarmonic.TYPE_ARTIFICIAL;
 			}
-			
+
 		}
 		for(int i = 0; i < this.typeButtons.length; i ++){
 			int data = ((Integer)this.typeButtons[i].getData()).intValue();
@@ -177,7 +181,7 @@ protected void initDefaults(TGNote note){
 		}
 		update(note,type);
 	}
-	
+
 	protected int getSelectedType(){
 		for(int i = 0; i < this.typeButtons.length; i ++){
 			if(this.typeButtons[i].getSelection()){
@@ -186,7 +190,7 @@ protected int getSelectedType(){
 		}
 		return 0;
 	}
-	
+
 	protected void update(TGNote note,int type){
 		TGEffectHarmonic h = note.getEffect().getHarmonic();
 		this.harmonicDataCombo.removeAll();
@@ -199,7 +203,7 @@ protected void update(TGNote note,int type){
 			this.harmonicDataCombo.select((h != null && h.getType() == type)?h.getData():0);
 		}
 	}
-	
+
 	private String getTypeLabel(int type){
 		if(type == TGEffectHarmonic.TYPE_NATURAL){
 			return TGEffectHarmonic.KEY_NATURAL;
@@ -218,7 +222,7 @@ private String getTypeLabel(int type){
 		}
 		return new String();
 	}
-	
+
 	public TGEffectHarmonic getHarmonic(){
 		int type = getSelectedType();
 		if(type > 0){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/StrokeEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/StrokeEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/StrokeEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/StrokeEditor.java
index 176b9197..5567e08b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/StrokeEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/StrokeEditor.java
@@ -16,41 +16,41 @@
 import org.herac.tuxguitar.song.models.TGStroke;
 
 public class StrokeEditor extends SelectionAdapter{
-	
+
 	public static final int WIDTH = 400;
-	
+
 	public static final int HEIGHT = 0;
-	
+
 	public static final int STATUS_OK = 1;
 	public static final int STATUS_CLEAN = 2;
 	public static final int STATUS_CANCEL = 3;
-	
+
 	private Button duration4;
 	private Button duration8;
 	private Button duration16;
 	private Button duration32;
 	private Button duration64;
-	
+
 	private int status;
 	private int value;
-	
+
 	public StrokeEditor(){
 		super();
 	}
-	
+
 	public void open(final TGBeat beat){
 		this.status = STATUS_CANCEL;
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("beat.stroke"));
-		
+
 		//-----defaults-------------------------------------------------
 		int duration = TGDuration.SIXTEENTH;
 		if( beat.getStroke().getDirection() != TGStroke.STROKE_NONE ){
 			duration = beat.getStroke().getValue();
 		}
-		
+
 		//---------------------------------------------------
 		//------------------DURATION-------------------------
 		//---------------------------------------------------
@@ -58,27 +58,27 @@ public void open(final TGBeat beat){
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setLayout(new GridLayout(5,false));
 		group.setText( TuxGuitar.getProperty("duration") );
-		
+
 		this.duration64 = new Button(group,SWT.RADIO);
 		this.duration64.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTY_FOURTH));
 		this.duration64.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.duration64.setSelection(duration == TGDuration.SIXTY_FOURTH);
-		
+
 		this.duration32 = new Button(group,SWT.RADIO);
 		this.duration32.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.THIRTY_SECOND));
 		this.duration32.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.duration32.setSelection(duration == TGDuration.THIRTY_SECOND);
-		
+
 		this.duration16 = new Button(group,SWT.RADIO);
 		this.duration16.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTEENTH));
 		this.duration16.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.duration16.setSelection(duration == TGDuration.SIXTEENTH);
-		
+
 		this.duration8 = new Button(group,SWT.RADIO);
 		this.duration8.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.EIGHTH));
 		this.duration8.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.duration8.setSelection(duration == TGDuration.EIGHTH);
-		
+
 		this.duration4 = new Button(group,SWT.RADIO);
 		this.duration4.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.QUARTER));
 		this.duration4.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
@@ -89,50 +89,53 @@ public void open(final TGBeat beat){
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.BOTTOM,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setStatus( STATUS_OK );
 				setValue( getSelection() );
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setStatus( STATUS_CLEAN );
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setStatus( STATUS_CANCEL );
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected int getSelection(){
 		if( this.duration4.getSelection() ){
 			return TGDuration.QUARTER;
@@ -151,7 +154,7 @@ protected int getSelection(){
 		}
 		return 0;
 	}
-	
+
 	public int getStatus() {
 		return this.status;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TremoloBarEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TremoloBarEditor.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TremoloBarEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TremoloBarEditor.java
index 61b8f81a..d8c6291e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TremoloBarEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TremoloBarEditor.java
@@ -1,8 +1,5 @@
 /*
  * Created on 28-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.effects;
 
@@ -28,39 +25,37 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 import org.herac.tuxguitar.song.models.TGNote;
 import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar.TremoloBarPoint;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TremoloBarEditor{
 	private static final int X_SPACING = 30;
 	private static final int Y_SPACING = 10;
 	private static final int X_LENGTH = TGEffectTremoloBar.MAX_POSITION_LENGTH + 1;
 	private static final int Y_LENGTH = (TGEffectTremoloBar.MAX_VALUE_LENGTH * 2) + 1;
-	
-	private int[] x; 
+
+	private int[] x;
 	private int[] y;
 	private int width;
 	private int height;
-	private List points;
+	private List<Point> points;
 	protected Composite editor;
 	protected DefaultTremoloBar[] defaultTremoloBars;
 	protected TGEffectTremoloBar result;
 	protected boolean cancelled;
-	
+
 	public TremoloBarEditor() {
 		this.init();
 	}
-	
+
 	private void init(){
 		this.x = new int[X_LENGTH];
 		this.y = new int[Y_LENGTH];
 		this.width = ((X_SPACING * X_LENGTH) - X_SPACING);
 		this.height = ((Y_SPACING * Y_LENGTH) - Y_SPACING);
-		this.points = new ArrayList();
-		
+		this.points = new ArrayList<Point>();
+
 		for(int i = 0;i < this.x.length;i++){
 			this.x[i] = ((i + 1) * X_SPACING);
 		}
@@ -68,53 +63,55 @@ private void init(){
 			this.y[i] = ((i + 1) * Y_SPACING);
 		}
 	}
-	
+
 	public boolean isCancelled(){
 		return this.cancelled;
 	}
-	
+
 	public TGEffectTremoloBar getResult(){
 		return this.result;
 	}
-	
+
 	public void show(Shell shell,final TGNote note){
 		this.cancelled = true;
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("effects.tremolo-bar-editor"));
-		
+
 		//----------------------------------------------------------------------
 		Composite composite = new Composite(dialog,SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite leftComposite = new Composite(composite,SWT.NONE);
 		leftComposite.setLayout(new GridLayout());
 		leftComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite rightComposite = new Composite(composite,SWT.NONE);
 		rightComposite.setLayout(new GridLayout());
 		rightComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		//-------------EDITOR---------------------------------------------------
 		this.editor = new Composite(leftComposite, SWT.BORDER | SWT.DOUBLE_BUFFERED);
 		this.editor.setBackground(this.editor.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.editor.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.FILL,true,true) , getWidth() + (X_SPACING * 2),getHeight() + (Y_SPACING * 2))  );
 		this.editor.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				paintEditor(painter);
 			}
 		});
 		this.editor.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
 				checkPoint(e.x,e.y);
 				TremoloBarEditor.this.editor.redraw();
 			}
 		});
-		
+
 		//-------------DEFAULT BEND LIST---------------------------------------------------
 		this.resetDefaultTremoloBars();
 		final org.eclipse.swt.widgets.List defaultTremoloBarList = new org.eclipse.swt.widgets.List(rightComposite,SWT.BORDER);
@@ -124,6 +121,7 @@ public void mouseUp(org.eclipse.swt.events.MouseEvent e) {
 		defaultTremoloBarList.select(0);
 		defaultTremoloBarList.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		defaultTremoloBarList.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int index = defaultTremoloBarList.getSelectionIndex();
 				if(index >= 0 && index < TremoloBarEditor.this.defaultTremoloBars.length){
@@ -132,12 +130,13 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Button buttonClean = new Button(rightComposite, SWT.PUSH);
 		buttonClean.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.BOTTOM,true,true), 80,25));
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TremoloBarEditor.this.result = null;
 				TremoloBarEditor.this.cancelled = false;
@@ -148,6 +147,7 @@ public void widgetSelected(SelectionEvent arg0) {
 		buttonOK.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.BOTTOM,true,false), 80,25));
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TremoloBarEditor.this.result = getTremoloBar();
 				TremoloBarEditor.this.cancelled = false;
@@ -158,30 +158,31 @@ public void widgetSelected(SelectionEvent arg0) {
 		buttonCancel.setLayoutData(resizeData(new GridData(SWT.FILL,SWT.BOTTOM,true,false), 80,25));
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TremoloBarEditor.this.result = note.getEffect().getTremoloBar();
 				TremoloBarEditor.this.cancelled = true;
 				dialog.dispose();
 			}
 		});
-		
+
 		if(note.getEffect().isTremoloBar()){
 			setTremoloBar(note.getEffect().getTremoloBar());
 		}else{
 			setTremoloBar(this.defaultTremoloBars[0].getTremoloBar());
 		}
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData resizeData(GridData data,int minimumWidth,int minimumHeight){
 		data.minimumWidth = minimumWidth;
 		data.minimumHeight = minimumHeight;
 		return data;
 	}
-	
+
 	protected void paintEditor(TGPainterImpl painter){
 		for(int i = 0;i < this.x.length;i++){
 			this.setStyleX(painter,i);
@@ -199,15 +200,15 @@ protected void paintEditor(TGPainterImpl painter){
 			painter.lineTo(X_SPACING + this.width,this.y[i]);
 			painter.closePath();
 		}
-		
-		Iterator it = null;
+
+		Iterator<Point> it = null;
 		Point prevPoint = null;
 		painter.setLineStyleSolid();
 		painter.setLineWidth(2);
 		painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_GRAY)));
 		it = this.points.iterator();
 		while(it.hasNext()){
-			Point point = (Point)it.next();
+			Point point = it.next();
 			if(prevPoint != null){
 				painter.initPath();
 				painter.moveTo(prevPoint.x,prevPoint.y);
@@ -216,12 +217,12 @@ protected void paintEditor(TGPainterImpl painter){
 			}
 			prevPoint = point;
 		}
-		
+
 		painter.setLineWidth(5);
 		painter.setForeground(new TGColorImpl(this.editor.getDisplay().getSystemColor(SWT.COLOR_BLACK)));
 		it = this.points.iterator();
 		while(it.hasNext()){
-			Point point = (Point)it.next();
+			Point point = it.next();
 			painter.initPath();
 			painter.setAntialias(false);
 			painter.addRectangle(point.x - 2,point.y - 2,5,5);
@@ -229,7 +230,7 @@ protected void paintEditor(TGPainterImpl painter){
 		}
 		painter.setLineWidth(1);
 	}
-	
+
 	private void setStyleX(TGPainterImpl painter,int i){
 		painter.setLineStyleSolid();
 		if(i == 0 || i == (X_LENGTH - 1)){
@@ -241,7 +242,7 @@ private void setStyleX(TGPainterImpl painter,int i){
 			}
 		}
 	}
-	
+
 	private void setStyleY(TGPainterImpl painter,int i){
 		painter.setLineStyleSolid();
 		if(i == 0 || i == (Y_LENGTH - 1)){
@@ -257,7 +258,7 @@ else if(i == (TGEffectTremoloBar.MAX_VALUE_LENGTH)){
 			}
 		}
 	}
-	
+
 	protected void checkPoint(int x,int y){
 		Point point = new Point(this.getX(x),this.getY(y));
 		if(!this.removePoint(point)){
@@ -266,11 +267,11 @@ protected void checkPoint(int x,int y){
 			this.orderPoints();
 		}
 	}
-	
+
 	private boolean removePoint(Point point){
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while(it.hasNext()){
-			Point currPoint = (Point)it.next();
+			Point currPoint = it.next();
 			if(currPoint.x == point.x && currPoint.y == point.y){
 				this.points.remove(point);
 				return true;
@@ -278,12 +279,12 @@ private boolean removePoint(Point point){
 		}
 		return false;
 	}
-	
+
 	private void orderPoints(){
 		for(int i = 0;i < this.points.size();i++){
 			Point minPoint = null;
 			for(int noteIdx = i;noteIdx < this.points.size();noteIdx++){
-				Point point = (Point)this.points.get(noteIdx);
+				Point point = this.points.get(noteIdx);
 				if(minPoint == null || point.x < minPoint.x){
 					minPoint = point;
 				}
@@ -292,22 +293,22 @@ private void orderPoints(){
 			this.points.add(i,minPoint);
 		}
 	}
-	
+
 	private void removePointsAtXLine(int x){
-		Iterator it = this.points.iterator();
+		Iterator<Point> it = this.points.iterator();
 		while(it.hasNext()){
-			Point point = (Point)it.next();
+			Point point = it.next();
 			if(point.x == x){
 				this.points.remove(point);
 				break;
 			}
 		}
 	}
-	
+
 	private void addPoint(Point point){
 		this.points.add(point);
 	}
-	
+
 	private int getX(int pointX){
 		int currPointX = -1;
 		for(int i = 0;i < this.x.length;i++){
@@ -323,7 +324,7 @@ private int getX(int pointX){
 		}
 		return currPointX;
 	}
-	
+
 	private int getY(int pointY){
 		int currPointY = -1;
 		for(int i = 0;i < this.y.length;i++){
@@ -339,24 +340,24 @@ private int getY(int pointY){
 		}
 		return currPointY;
 	}
-	
+
 	public boolean isEmpty(){
 		return this.points.isEmpty();
 	}
-	
+
 	public TGEffectTremoloBar getTremoloBar(){
 		if(this.points != null && !this.points.isEmpty()){
 			TGEffectTremoloBar tremoloBar = TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar();//new TremoloBarEffect();
-			Iterator it = this.points.iterator();
+			Iterator<Point> it = this.points.iterator();
 			while(it.hasNext()){
-				Point point = (Point)it.next();
+				Point point = it.next();
 				addTremoloBarPoint(tremoloBar,point);
 			}
 			return tremoloBar;
 		}
 		return null;
 	}
-	
+
 	private void addTremoloBarPoint(TGEffectTremoloBar effect,Point point){
 		int position = 0;
 		int value = 0;
@@ -372,16 +373,16 @@ private void addTremoloBarPoint(TGEffectTremoloBar effect,Point point){
 		}
 		effect.addPoint(position,value);
 	}
-	
+
 	public void setTremoloBar(TGEffectTremoloBar effect){
 		this.points.clear();
-		Iterator it = effect.getPoints().iterator();
+		Iterator<TremoloBarPoint> it = effect.getPoints().iterator();
 		while(it.hasNext()){
-			TGEffectTremoloBar.TremoloBarPoint tremoloBarPoint = (TGEffectTremoloBar.TremoloBarPoint)it.next();
+			TGEffectTremoloBar.TremoloBarPoint tremoloBarPoint = it.next();
 			this.makePoint(tremoloBarPoint);
 		}
 	}
-	
+
 	private void makePoint(TGEffectTremoloBar.TremoloBarPoint tremoloBarPoint){
 		int indexX = tremoloBarPoint.getPosition();
 		int indexY = ( (this.y.length - TGEffectTremoloBar.MAX_VALUE_LENGTH) - tremoloBarPoint.getValue()) - 1;
@@ -392,62 +393,62 @@ private void makePoint(TGEffectTremoloBar.TremoloBarPoint tremoloBarPoint){
 			this.points.add(point);
 		}
 	}
-	
+
 	public int getWidth(){
 		return this.width;
 	}
-	
+
 	public int getHeight(){
 		return this.height;
 	}
-	
+
 	private void resetDefaultTremoloBars(){
 		this.defaultTremoloBars = new DefaultTremoloBar[6];
-		
+
 		this.defaultTremoloBars[0] = new DefaultTremoloBar(TuxGuitar.getProperty("effects.tremolo-bar.dip"),TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar());
 		this.defaultTremoloBars[0].getTremoloBar().addPoint(0,0);
 		this.defaultTremoloBars[0].getTremoloBar().addPoint(6,-2);
 		this.defaultTremoloBars[0].getTremoloBar().addPoint(12,0);
-		
+
 		this.defaultTremoloBars[1] = new DefaultTremoloBar(TuxGuitar.getProperty("effects.tremolo-bar.dive"),TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar());
 		this.defaultTremoloBars[1].getTremoloBar().addPoint(0,0);
 		this.defaultTremoloBars[1].getTremoloBar().addPoint(9,-2);
 		this.defaultTremoloBars[1].getTremoloBar().addPoint(12,-2);
-		
+
 		this.defaultTremoloBars[2] = new DefaultTremoloBar(TuxGuitar.getProperty("effects.tremolo-bar.release-up"),TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar());
 		this.defaultTremoloBars[2].getTremoloBar().addPoint(0,-2);
 		this.defaultTremoloBars[2].getTremoloBar().addPoint(9,-2);
 		this.defaultTremoloBars[2].getTremoloBar().addPoint(12,0);
-		
+
 		this.defaultTremoloBars[3] = new DefaultTremoloBar(TuxGuitar.getProperty("effects.tremolo-bar.inverted-dip"),TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar());
 		this.defaultTremoloBars[3].getTremoloBar().addPoint(0,0);
 		this.defaultTremoloBars[3].getTremoloBar().addPoint(6,2);
 		this.defaultTremoloBars[3].getTremoloBar().addPoint(12,0);
-		
+
 		this.defaultTremoloBars[4] = new DefaultTremoloBar(TuxGuitar.getProperty("effects.tremolo-bar.return"),TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar());
 		this.defaultTremoloBars[4].getTremoloBar().addPoint(0,0);
 		this.defaultTremoloBars[4].getTremoloBar().addPoint(9,2);
 		this.defaultTremoloBars[4].getTremoloBar().addPoint(12,2);
-		
+
 		this.defaultTremoloBars[5] = new DefaultTremoloBar(TuxGuitar.getProperty("effects.tremolo-bar.release-down"),TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloBar());
 		this.defaultTremoloBars[5].getTremoloBar().addPoint(0,2);
 		this.defaultTremoloBars[5].getTremoloBar().addPoint(9,2);
 		this.defaultTremoloBars[5].getTremoloBar().addPoint(12,0);
 	}
-	
+
 	private class DefaultTremoloBar{
-		private String name;
-		private TGEffectTremoloBar tremoloBar;
-		
+		private final String name;
+		private final TGEffectTremoloBar tremoloBar;
+
 		public DefaultTremoloBar(String name,TGEffectTremoloBar tremoloBar){
 			this.name = name;
 			this.tremoloBar = tremoloBar;
 		}
-		
+
 		public TGEffectTremoloBar getTremoloBar() {
 			return this.tremoloBar;
 		}
-		
+
 		public String getName() {
 			return this.name;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TremoloPickingEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TremoloPickingEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TremoloPickingEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TremoloPickingEditor.java
index f6aa6682..eb1e3f85 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TremoloPickingEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TremoloPickingEditor.java
@@ -16,62 +16,62 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
 
 public class TremoloPickingEditor extends SelectionAdapter{
-	
+
 	private Button thirtySecondButton;
 	private Button sixTeenthButton;
 	private Button eighthButton;
-	
+
 	protected TGEffectTremoloPicking result;
 	protected boolean cancelled;
-	
+
 	public TremoloPickingEditor(){
 		super();
 	}
-	
+
 	public boolean isCancelled(){
 		return this.cancelled;
 	}
-	
+
 	public TGEffectTremoloPicking getResult(){
 		return this.result;
 	}
-	
+
 	public void show(final TGNote note){
 		this.cancelled = true;
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("effects.tremolo-picking-editor"));
-		
+
 		Composite composite = new Composite(dialog,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		int horizontalSpan = 2;
-		
+
 		//-----defaults-------------------------------------------------
 		int duration = TGDuration.EIGHTH;
 		if(note.getEffect().isTremoloPicking()){
 			duration = note.getEffect().getTremoloPicking().getDuration().getValue();
 		}
-		
+
 		//---------------------------------------------------
 		//------------------DURATION-------------------------
 		//---------------------------------------------------
 		Group durationGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("duration"));
 		durationGroup.setLayout(new GridLayout(3,false));
-		
+
 		this.thirtySecondButton = new Button(durationGroup,SWT.RADIO);
 		this.thirtySecondButton.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.THIRTY_SECOND));
 		this.thirtySecondButton.setLayoutData(makeGridData(1));
 		this.thirtySecondButton.setSelection(duration == TGDuration.THIRTY_SECOND);
-		
+
 		this.sixTeenthButton = new Button(durationGroup,SWT.RADIO);
 		this.sixTeenthButton.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTEENTH));
 		this.sixTeenthButton.setLayoutData(makeGridData(1));
 		this.sixTeenthButton.setSelection(duration == TGDuration.SIXTEENTH);
-		
+
 		this.eighthButton = new Button(durationGroup,SWT.RADIO);
 		this.eighthButton.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.EIGHTH));
 		this.eighthButton.setLayoutData(makeGridData(1));
@@ -82,66 +82,69 @@ public void show(final TGNote note){
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.BOTTOM,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TremoloPickingEditor.this.result = getTremoloPicking();
 				TremoloPickingEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TremoloPickingEditor.this.result = null;
 				TremoloPickingEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TremoloPickingEditor.this.result = note.getEffect().getTremoloPicking();
 				TremoloPickingEditor.this.cancelled = true;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private Group makeGroup(Composite parent,int horizontalSpan,String text){
 		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
 		group.setLayoutData(makeGridData(horizontalSpan));
 		group.setText(text);
-		
+
 		return group;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData makeGridData(int horizontalSpan){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.horizontalSpan = horizontalSpan;
 		return data;
 	}
-	
+
 	public TGEffectTremoloPicking getTremoloPicking(){
 		TGEffectTremoloPicking effect = TuxGuitar.instance().getSongManager().getFactory().newEffectTremoloPicking();
 		if(this.thirtySecondButton.getSelection()){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TrillEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TrillEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TrillEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TrillEditor.java
index 3f914bfa..0c45ed68 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/effects/TrillEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/effects/TrillEditor.java
@@ -18,42 +18,42 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
 
 public class TrillEditor extends SelectionAdapter{
-	
+
 	private Spinner fretSpinner;
 	private Button sixtyFourthButton;
 	private Button thirtySecondButton;
 	private Button sixTeenthButton;
-	
+
 	protected TGEffectTrill result;
 	protected boolean cancelled;
-	
+
 	public TrillEditor(){
 		super();
 	}
-	
+
 	public boolean isCancelled(){
 		return this.cancelled;
 	}
-	
+
 	public TGEffectTrill getResult(){
 		return this.result;
 	}
-	
+
 	public void show(final TGNote note){
 		this.cancelled = true;
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("effects.trill-editor"));
-		
-		
+
+
 		Composite composite = new Composite(dialog,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		int horizontalSpan = 2;
-		
+
 		//-----defaults-------------------------------------------------
 		int fret = note.getValue();
 		int duration = TGDuration.SIXTEENTH;
@@ -66,102 +66,105 @@ public void show(final TGNote note){
 		//---------------------------------------------------
 		Group noteGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("note"));
 		noteGroup.setLayout(new GridLayout(2,false));
-		
+
 		Label fretLabel = new Label(noteGroup,SWT.NONE);
-		
+
 		fretLabel.setText(TuxGuitar.getProperty("fret") + ": ");
-		
+
 		this.fretSpinner = new Spinner(noteGroup,SWT.BORDER);
 		this.fretSpinner.setLayoutData(makeGridData(1));
 		this.fretSpinner.setSelection(fret);
-		
+
 		//---------------------------------------------------
 		//------------------DURATION-------------------------
 		//---------------------------------------------------
 		Group durationGroup = makeGroup(composite,horizontalSpan, TuxGuitar.getProperty("duration"));
 		durationGroup.setLayout(new GridLayout(3,false));
-		
+
 		this.sixtyFourthButton = new Button(durationGroup,SWT.RADIO);
 		this.sixtyFourthButton.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTY_FOURTH));
 		this.sixtyFourthButton.setLayoutData(makeGridData(1));
 		this.sixtyFourthButton.setSelection(duration == TGDuration.SIXTY_FOURTH);
-		
+
 		this.thirtySecondButton = new Button(durationGroup,SWT.RADIO);
 		this.thirtySecondButton.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.THIRTY_SECOND));
 		this.thirtySecondButton.setLayoutData(makeGridData(1));
 		this.thirtySecondButton.setSelection(duration == TGDuration.THIRTY_SECOND);
-		
+
 		this.sixTeenthButton = new Button(durationGroup,SWT.RADIO);
 		this.sixTeenthButton.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.SIXTEENTH));
 		this.sixTeenthButton.setLayoutData(makeGridData(1));
 		this.sixTeenthButton.setSelection(duration == TGDuration.SIXTEENTH);
-		
+
 		//---------------------------------------------------
 		//------------------BUTTONS--------------------------
 		//---------------------------------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.BOTTOM,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TrillEditor.this.result = getTrill();
 				TrillEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TrillEditor.this.result = null;
 				TrillEditor.this.cancelled = false;
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TrillEditor.this.result = note.getEffect().getTrill();
 				TrillEditor.this.cancelled = true;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private Group makeGroup(Composite parent,int horizontalSpan,String text){
 		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
 		group.setLayoutData(makeGridData(horizontalSpan));
 		group.setText(text);
-		
+
 		return group;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData makeGridData(int horizontalSpan){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.horizontalSpan = horizontalSpan;
 		return data;
 	}
-	
+
 	public TGEffectTrill getTrill(){
 		TGEffectTrill effect = TuxGuitar.instance().getSongManager().getFactory().newEffectTrill();
 		effect.setFret(this.fretSpinner.getSelection());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/fretboard/FretBoard.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/fretboard/FretBoard.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/fretboard/FretBoard.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/fretboard/FretBoard.java
index b8f84805..fda4fe75 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/fretboard/FretBoard.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/fretboard/FretBoard.java
@@ -1,8 +1,5 @@
 /*
  * Created on 28-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.fretboard;
 
@@ -57,30 +54,28 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class FretBoard extends Composite {
-	
+
 	public static final int MAX_FRETS = 24;
 	public static final int TOP_SPACING = 10;
 	public static final int BOTTOM_SPACING = 10;
-	
+
 	private static final int STRING_SPACING = TuxGuitar.instance().getConfig().getIntConfigValue(TGConfigKeys.FRETBOARD_STRING_SPACING);
 	private static final String[] NOTE_NAMES = TGMusicKeyUtils.getSharpKeyNames(TGMusicKeyUtils.PREFIX_FRETBOARD);
-	
-	private FretBoardListener listener;
-	private FretBoardConfig config;
+
+	private final FretBoardListener listener;
+	private final FretBoardConfig config;
 	private Composite toolComposite;
 	private Label durationLabel;
 	private Label scaleName;
 	private Button scale;
 	private Button settings;
 	private TGImage fretBoard;
-	
+
 	private TGBeat beat;
 	private TGBeat externalBeat;
-	
+
 	private int[] frets;
 	private int[] strings;
 	private int fretSpacing;
@@ -89,7 +84,7 @@ public class FretBoard extends Composite {
 	private int duration;
 	protected Combo handSelector;
 	protected Composite fretBoardComposite;
-	
+
 	public FretBoard(Composite parent) {
 		super(parent, SWT.NONE);
 		this.setLayout(new FormLayout());
@@ -100,53 +95,53 @@ public FretBoard(Composite parent) {
 		this.initEditor();
 		this.loadIcons();
 		this.loadProperties();
-		
+
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.toolComposite);
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.fretBoardComposite);
 	}
-	
+
 	private void initToolBar() {
 		FormData data = new FormData();
 		data.left = new FormAttachment(0, 0);
 		data.right = new FormAttachment(100, 0);
 		data.top = new FormAttachment(0,0);
-		
+
 		GridLayout layout = new GridLayout();
 		layout.makeColumnsEqualWidth = false;
 		layout.numColumns = 0;
 		layout.marginWidth = 0;
-		
+
 		this.toolComposite = new Composite(this, SWT.NONE);
-		
+
 		// position
 		layout.numColumns ++;
 		Button goLeft = new Button(this.toolComposite, SWT.ARROW | SWT.LEFT);
 		goLeft.addSelectionListener(TuxGuitar.instance().getAction(GoLeftAction.NAME));
-		
+
 		layout.numColumns ++;
 		Button goRight = new Button(this.toolComposite, SWT.ARROW | SWT.RIGHT);
 		goRight.addSelectionListener(TuxGuitar.instance().getAction(GoRightAction.NAME));
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolComposite);
-		
+
 		// duration
 		layout.numColumns ++;
 		Button decrement = new Button(this.toolComposite, SWT.ARROW | SWT.MIN);
 		decrement.addSelectionListener(TuxGuitar.instance().getAction(DecrementDurationAction.NAME));
-		
+
 		layout.numColumns ++;
 		this.durationLabel = new Label(this.toolComposite, SWT.BORDER);
-		
+
 		layout.numColumns ++;
 		Button increment = new Button(this.toolComposite, SWT.ARROW | SWT.MAX);
 		increment.addSelectionListener(TuxGuitar.instance().getAction(IncrementDurationAction.NAME));
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolComposite);
-		
+
 		// hand selector
 		layout.numColumns ++;
 		this.handSelector = new Combo(this.toolComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -154,25 +149,26 @@ private void initToolBar() {
 		this.handSelector.add(TuxGuitar.getProperty("fretboard.left-mode"));
 		this.handSelector.select( this.getDirection(this.config.getDirection()) );
 		this.handSelector.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateDirection(FretBoard.this.handSelector.getSelectionIndex());
 			}
 		});
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolComposite);
-		
+
 		// scale
 		layout.numColumns ++;
 		this.scale = new Button(this.toolComposite, SWT.PUSH);
 		this.scale.setText(TuxGuitar.getProperty("scale"));
 		this.scale.addSelectionListener(TuxGuitar.instance().getAction(ScaleAction.NAME));
-		
+
 		// scale name
 		layout.numColumns ++;
 		this.scaleName = new Label(this.toolComposite, SWT.LEFT);
-		
+
 		// settings
 		layout.numColumns ++;
 		this.settings = new Button(this.toolComposite, SWT.PUSH);
@@ -180,36 +176,37 @@ public void widgetSelected(SelectionEvent e) {
 		this.settings.setToolTipText(TuxGuitar.getProperty("settings"));
 		this.settings.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
 		this.settings.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				configure();
 			}
 		});
-		
+
 		this.toolComposite.setLayoutData(data);
 		this.toolComposite.setLayout(layout);
 	}
-	
+
 	private void makeToolSeparator(Composite parent){
 		Label separator = new Label(parent,SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(20,20));
 	}
-	
+
 	private void initEditor() {
 		this.lastSize = new Point(0,0);
-		
+
 		FormData data = new FormData();
 		data.left = new FormAttachment(0, 0);
 		data.right = new FormAttachment(100, 0);
 		data.top = new FormAttachment(this.toolComposite,0);
 		data.bottom = new FormAttachment(100, 0);
-		
+
 		this.fretBoardComposite = new Composite(this, SWT.BORDER | SWT.DOUBLE_BUFFERED);
 		this.fretBoardComposite.setLayoutData(data);
 		this.fretBoardComposite.setBackground(this.config.getColorBackground());
 		this.fretBoardComposite.addMouseListener(this.listener);
 		this.fretBoardComposite.addPaintListener(this.listener);
 	}
-	
+
 	private void loadDurationImage(boolean force) {
 		int duration = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getDuration().getValue();
 		if(force || this.duration != duration){
@@ -217,7 +214,7 @@ private void loadDurationImage(boolean force) {
 			this.durationLabel.setImage(TuxGuitar.instance().getIconManager().getDuration(this.duration));
 		}
 	}
-	
+
 	private void loadScaleName() {
 		int scaleKey = TuxGuitar.instance().getScaleManager().getSelectionKey();
 		int scaleIndex = TuxGuitar.instance().getScaleManager().getSelectionIndex();
@@ -226,7 +223,7 @@ private void loadScaleName() {
 		this.scaleName.setText( ( key != null && name != null ) ? ( key + " - " + name ) : "" );
 		this.scaleName.pack();
 	}
-	
+
 	private void calculateFretSpacing(int width) {
 		this.fretSpacing = (width / MAX_FRETS);
 		int aux = 0;
@@ -235,13 +232,13 @@ private void calculateFretSpacing(int width) {
 		}
 		this.fretSpacing += (aux / MAX_FRETS) + 2;
 	}
-	
+
 	private void disposeFretBoardImage(){
 		if(this.fretBoard != null && !this.fretBoard.isDisposed()){
 			this.fretBoard.dispose();
 		}
 	}
-	
+
 	protected void initFrets(int fromX) {
 		this.frets = new int[MAX_FRETS];
 		int nextX = fromX;
@@ -258,7 +255,7 @@ protected void initFrets(int fromX) {
 			}
 		}
 	}
-	
+
 	private int getDirection( int value ){
 		int direction = value;
 		if( direction != FretBoardConfig.DIRECTION_RIGHT && direction != FretBoardConfig.DIRECTION_LEFT ){
@@ -266,16 +263,16 @@ private int getDirection( int value ){
 		}
 		return direction;
 	}
-	
+
 	private void initStrings(int count) {
 		int fromY = TOP_SPACING;
 		this.strings = new int[count];
-		
+
 		for (int i = 0; i < this.strings.length; i++) {
 			this.strings[i] = fromY + (STRING_SPACING * i);
 		}
 	}
-	
+
 	private void updateEditor(){
 		if(isVisible()){
 			if(TuxGuitar.instance().getPlayer().isRunning()){
@@ -285,21 +282,21 @@ private void updateEditor(){
 			}else{
 				this.beat = TuxGuitar.instance().getEditorCache().getEditBeat();
 			}
-			
+
 			if (this.strings.length != getStringCount()) {
 				disposeFretBoardImage();
 				initStrings(getStringCount());
 				//Fuerzo a cambiar el ancho
 				this.lastSize.y = 0;
 			}
-			
+
 			int clientWidth = getClientArea().width;
 			int clientHeight = getClientArea().height;
-			
+
 			if(this.lastSize.x != clientWidth || hasChanges()){
 				this.layout(getClientArea().width);
 			}
-			
+
 			if(this.lastSize.y != clientHeight){
 				TuxGuitar.instance().getFretBoardEditor().showFretBoard();
 			}
@@ -307,34 +304,34 @@ private void updateEditor(){
 			this.lastSize.y = clientHeight;
 		}
 	}
-	
+
 	private void paintFretBoard(TGPainter painter){
 		if(this.fretBoard == null || this.fretBoard.isDisposed()){
 			Rectangle clientArea = getClientArea();
-			
+
 			this.fretBoard = new TGImageImpl(getDisplay(),clientArea.width,((STRING_SPACING) * (this.strings.length - 1)) + TOP_SPACING + BOTTOM_SPACING);
-			
+
 			TGPainter painterBuffer = this.fretBoard.createPainter();
-			
+
 			//fondo
 			painterBuffer.setBackground(new TGColorImpl(this.config.getColorBackground()));
 			painterBuffer.initPath(TGPainter.PATH_FILL);
 			painterBuffer.addRectangle(clientArea.x,clientArea.y,clientArea.width,clientArea.height);
 			painterBuffer.closePath();
-			
-			
+
+
 			// pinto las cegillas
 			TGImage fretImage = new TGImageImpl(TuxGuitar.instance().getIconManager().getFretboardFret());
 			TGImage firstFretImage = new TGImageImpl(TuxGuitar.instance().getIconManager().getFretboardFirstFret());
-			
+
 			painterBuffer.drawImage(firstFretImage,0,0,firstFretImage.getWidth(),firstFretImage.getHeight(),this.frets[0] - 5,this.strings[0] - 5,firstFretImage.getWidth(),this.strings[this.strings.length - 1] );
-			
+
 			paintFretPoints(painterBuffer,0);
 			for (int i = 1; i < this.frets.length; i++) {
 				painterBuffer.drawImage(fretImage,0,0,fretImage.getWidth(),fretImage.getHeight(),this.frets[i],this.strings[0] - 5,fretImage.getWidth(),this.strings[this.strings.length - 1] );
 				paintFretPoints(painterBuffer, i);
 			}
-			
+
 			// pinto las cuerdas
 			for (int i = 0; i < this.strings.length; i++) {
 				painterBuffer.setForeground(new TGColorImpl(this.config.getColorString()));
@@ -347,15 +344,15 @@ private void paintFretBoard(TGPainter painter){
 				painterBuffer.lineTo(this.frets[this.frets.length - 1], this.strings[i]);
 				painterBuffer.closePath();
 			}
-			
+
 			// pinto la escala
 			paintScale(painterBuffer);
-			
+
 			painterBuffer.dispose();
 		}
 		painter.drawImage(this.fretBoard,0,0);
 	}
-	
+
 	private void paintFretPoints(TGPainter painter, int fretIndex) {
 		painter.setBackground(new TGColorImpl(this.config.getColorFretPoint()));
 		if ((fretIndex + 1) < this.frets.length) {
@@ -381,14 +378,14 @@ private void paintFretPoints(TGPainter painter, int fretIndex) {
 			painter.setLineWidth(1);
 		}
 	}
-	
+
 	private void paintScale(TGPainter painter) {
 		TGTrack track = getTrack();
-		
+
 		for (int i = 0; i < this.strings.length; i++) {
 			TGString string = track.getString(i + 1);
 			for (int j = 0; j < this.frets.length; j++) {
-				
+
 				int noteIndex = ((string.getValue() + j) %  12 );
 				if(TuxGuitar.instance().getScaleManager().getScale().getNote(noteIndex)){
 					int x = this.frets[j];
@@ -396,7 +393,7 @@ private void paintScale(TGPainter painter) {
 						x -= ((x - this.frets[j - 1]) / 2);
 					}
 					int y = this.strings[i];
-					
+
 					if( (this.config.getStyle() & FretBoardConfig.DISPLAY_TEXT_SCALE) != 0 ){
 						paintKeyText(painter,this.config.getColorScale(),x,y,NOTE_NAMES[noteIndex]);
 					}
@@ -406,19 +403,19 @@ private void paintScale(TGPainter painter) {
 				}
 			}
 		}
-		
+
 		painter.setForeground(new TGColorImpl(this.config.getColorBackground()));
 	}
-	
+
 	private void paintNotes(TGPainter painter) {
 		if(this.beat != null){
 			TGTrack track = getTrack();
-			
+
 			for(int v = 0; v < this.beat.countVoices(); v ++){
 				TGVoice voice = this.beat.getVoice( v );
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while (it.hasNext()) {
-					TGNote note = (TGNote) it.next();
+					TGNote note = it.next();
 					int fretIndex = note.getValue();
 					int stringIndex = note.getString() - 1;
 					if (fretIndex >= 0 && fretIndex < this.frets.length && stringIndex >= 0 && stringIndex < this.strings.length) {
@@ -427,7 +424,7 @@ private void paintNotes(TGPainter painter) {
 							x -= ((this.frets[fretIndex] - this.frets[fretIndex - 1]) / 2);
 						}
 						int y = this.strings[stringIndex];
-						
+
 						if( (this.config.getStyle() & FretBoardConfig.DISPLAY_TEXT_NOTE) != 0 ){
 							int realValue = track.getString(note.getString()).getValue() + note.getValue();
 							paintKeyText(painter,this.config.getColorNote(), x, y, NOTE_NAMES[ (realValue % 12) ]);
@@ -441,7 +438,7 @@ private void paintNotes(TGPainter painter) {
 			painter.setLineWidth(1);
 		}
 	}
-	
+
 	private void paintKeyOval(TGPainter painter,Color background,int x, int y) {
 		int size = getOvalSize();
 		painter.setBackground(new TGColorImpl(background));
@@ -450,21 +447,21 @@ private void paintKeyOval(TGPainter painter,Color background,int x, int y) {
 		painter.addOval(x - (size / 2),y - (size / 2),size, size);
 		painter.closePath();
 	}
-	
+
 	private void paintKeyText(TGPainter painter,Color foreground,int x, int y,String text) {
 		painter.setBackground(new TGColorImpl(getDisplay().getSystemColor(SWT.COLOR_WHITE)));
 		painter.setForeground(new TGColorImpl(foreground));
 		painter.setFont(new TGFontImpl(this.config.getFont()));
-		
+
 		int fmWidth = painter.getFMWidth(text);
 		int fmHeight = painter.getFMHeight();
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		painter.addRectangle(x - (fmWidth / 2),y - (fmHeight / 2),fmWidth, fmHeight);
 		painter.closePath();
 		painter.drawString(text,x - (fmWidth / 2),y - (fmHeight / 2),true);
 	}
-	
+
 	protected void paintEditor(TGPainter painter) {
 		if(!TuxGuitar.instance().isLocked()){
 			TuxGuitar.instance().lock();
@@ -476,17 +473,17 @@ protected void paintEditor(TGPainter painter) {
 			TuxGuitar.instance().unlock();
 		}
 	}
-	
+
 	protected void hit(int x, int y) {
 		int fretIndex = getFretIndex(x);
 		int stringIndex = getStringIndex(y);
-		
+
 		TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().setStringNumber(stringIndex + 1);
 		if (!removeNote(fretIndex, stringIndex + 1)) {
 			addNote(fretIndex, stringIndex + 1);
 		}
 	}
-	
+
 	private int getStringIndex(int y) {
 		int index = -1;
 		for (int i = 0; i < this.strings.length; i++) {
@@ -502,7 +499,7 @@ private int getStringIndex(int y) {
 		}
 		return index;
 	}
-	
+
 	private int getFretIndex(int x) {
 		int length = this.frets.length;
 		if ((x - 10) <= this.frets[0] && this.frets[0] < this.frets[length - 1]) {
@@ -511,7 +508,7 @@ private int getFretIndex(int x) {
 		if ((x + 10) >= this.frets[0] && this.frets[0] > this.frets[length - 1]) {
 			return 0;
 		}
-		
+
 		for (int i = 0; i < length; i++) {
 			if ((i + 1) < length) {
 				if (x > this.frets[i] && x <= this.frets[i + 1] || x > this.frets[i + 1] && x <= this.frets[i]) {
@@ -521,25 +518,25 @@ private int getFretIndex(int x) {
 		}
 		return length - 1;
 	}
-	
+
 	private boolean removeNote(int fret, int string) {
 		if(this.beat != null){
 			for(int v = 0; v < this.beat.countVoices(); v ++){
 				TGVoice voice = this.beat.getVoice( v );
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while (it.hasNext()) {
-					TGNote note = (TGNote) it.next();
+					TGNote note = it.next();
 					if (note.getValue() == fret && note.getString() == string) {
 						//comienza el undoable
 						UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-						
+
 						TGSongManager manager = TuxGuitar.instance().getSongManager();
 						manager.getMeasureManager().removeNote(note);
-						
+
 						//termia el undoable
 						TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 						TuxGuitar.instance().getFileHistory().setUnsavedFile();
-						
+
 						return true;
 					}
 				}
@@ -547,7 +544,7 @@ private boolean removeNote(int fret, int string) {
 		}
 		return false;
 	}
-	
+
 	private TGTrack getTrack() {
 		if( this.beat != null ){
 			TGMeasure measure = this.beat.getMeasure();
@@ -560,7 +557,7 @@ private TGTrack getTrack() {
 		}
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack();
 	}
-	
+
 	private int getStringCount() {
 		TGTrack track = getTrack();
 		if( track != null ){
@@ -568,66 +565,67 @@ private int getStringCount() {
 		}
 		return 0;
 	}
-	
+
 	private int getOvalSize(){
 		return ((STRING_SPACING / 2) + (STRING_SPACING / 10));
 	}
-	
+
 	private void addNote(int fret, int string) {
 		TGSongManager manager = TuxGuitar.instance().getSongManager();
-		
+
 		//comienza el undoable
 		UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-		
+
 		Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
-		
+
 		TGNote note = manager.getFactory().newNote();
 		note.setValue(fret);
 		note.setVelocity(caret.getVelocity());
 		note.setString(string);
-		
+
 		TGDuration duration = manager.getFactory().newDuration();
 		caret.getDuration().copy(duration);
-		
+
 		manager.getMeasureManager().addNote(caret.getMeasure(),caret.getPosition(),note,duration, caret.getVoice());
-		
+
 		//termia el undoable
 		TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
+
 		//reprodusco las notas en el pulso
 		TuxGuitar.instance().playBeat(caret.getSelectedBeat());
 	}
-	
+
 	protected void afterAction() {
 		TGMeasureHeader measure = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure().getHeader();
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	protected void updateDirection( int direction ){
 		this.config.saveDirection( this.getDirection(direction) );
 		this.initFrets(10);
 		this.setChanges(true);
 		this.fretBoardComposite.redraw();
 	}
-	
+
 	public boolean hasChanges(){
 		return this.changes;
 	}
-	
+
 	public void setChanges(boolean changes){
 		this.changes = changes;
 	}
-	
+
 	public void setExternalBeat(TGBeat externalBeat){
 		this.externalBeat = externalBeat;
 	}
-	
+
 	public TGBeat getExternalBeat(){
 		return this.externalBeat;
 	}
-	
+
+	@Override
 	public void redraw() {
 		if(!super.isDisposed() && !TuxGuitar.instance().isLocked()){
 			super.redraw();
@@ -635,19 +633,20 @@ public void redraw() {
 			this.loadDurationImage(false);
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!super.isDisposed() && !TuxGuitar.instance().isLocked()){
 			this.fretBoardComposite.redraw();
 		}
 	 }
-	
+
+	@Override
 	public void dispose(){
 		super.dispose();
 		this.disposeFretBoardImage();
 		this.config.dispose();
 	}
-	
+
 	public void loadProperties(){
 		int selection = this.handSelector.getSelectionIndex();
 		this.handSelector.removeAll();
@@ -660,34 +659,35 @@ public void loadProperties(){
 		this.setChanges(true);
 		this.layout(true,true);
 	}
-	
+
 	public void loadIcons(){
 		this.settings.setImage(TuxGuitar.instance().getIconManager().getSettings());
 		this.loadDurationImage(true);
 		this.layout(true,true);
 		this.layout(getClientArea().width);
 	}
-	
+
 	public void loadScale(){
 		this.loadScaleName();
 		this.setChanges(true);
 	}
-	
+
 	public int getHeight(){
 		int borderWidth = (2 * this.fretBoardComposite.getBorderWidth());
 		int toolBarHeight = (this.toolComposite.getBounds().height);
 		int fretBoardHeight = (((STRING_SPACING) * (this.strings.length - 1)) + TOP_SPACING + BOTTOM_SPACING);
 		return (borderWidth + toolBarHeight + fretBoardHeight);
 	}
-	
+
 	public int getWidth(){
 		return this.frets[this.frets.length - 1];
 	}
-	
+
+	@Override
 	public void layout(){
 		super.layout();
 	}
-	
+
 	public void layout(int width){
 		this.disposeFretBoardImage();
 		this.calculateFretSpacing(width);
@@ -695,29 +695,31 @@ public void layout(int width){
 		this.initStrings(getStringCount());
 		this.setChanges(false);
 	}
-	
+
 	protected void configure(){
 		this.config.configure(getShell());
 		this.handSelector.select( this.getDirection(this.config.getDirection()) );
 		this.setChanges(true);
 		this.redraw();
 	}
-	
+
 	public Composite getFretBoardComposite(){
 		return this.fretBoardComposite;
 	}
-	
+
 	private class FretBoardListener implements PaintListener,MouseListener {
-		
+
 		public FretBoardListener(){
 			super();
 		}
-		
+
+		@Override
 		public void paintControl(PaintEvent e) {
 			TGPainterImpl painter = new TGPainterImpl(e.gc);
 			paintEditor(painter);
 		}
-		
+
+		@Override
 		public void mouseUp(MouseEvent e) {
 			getFretBoardComposite().setFocus();
 			if(e.button == 1){
@@ -735,11 +737,13 @@ public void mouseUp(MouseEvent e) {
 				TuxGuitar.instance().getAction(GoRightAction.NAME).process(new ActionData());
 			}
 		}
-		
+
+		@Override
 		public void mouseDown(MouseEvent e) {
 			//Not implemented
 		}
-		
+
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			//Not implemented
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/fretboard/FretBoardConfig.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/fretboard/FretBoardConfig.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/fretboard/FretBoardConfig.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/fretboard/FretBoardConfig.java
index 8a7d6e8b..94c2acc5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/fretboard/FretBoardConfig.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/fretboard/FretBoardConfig.java
@@ -28,15 +28,15 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class FretBoardConfig {
-	
+
 	public static final int DISPLAY_TEXT_NOTE = 0x01;
-	
+
 	public static final int DISPLAY_TEXT_SCALE = 0x02;
-	
+
 	public static final int DIRECTION_RIGHT = 0;
-	
+
 	public static final int DIRECTION_LEFT = 1;
-	
+
 	private int style;
 	private int direction;
 	private Font font;
@@ -45,43 +45,43 @@ public class FretBoardConfig {
 	private Color colorFretPoint;
 	private Color colorNote;
 	private Color colorScale;
-	
+
 	public FretBoardConfig(){
 		super();
 	}
-	
+
 	public int getStyle() {
 		return this.style;
 	}
-	
+
 	public Font getFont() {
 		return this.font;
 	}
-	
+
 	public Color getColorBackground() {
 		return this.colorBackground;
 	}
-	
+
 	public Color getColorString() {
 		return this.colorString;
 	}
-	
+
 	public Color getColorFretPoint() {
 		return this.colorFretPoint;
 	}
-	
+
 	public Color getColorNote() {
 		return this.colorNote;
 	}
-	
+
 	public Color getColorScale() {
 		return this.colorScale;
 	}
-	
+
 	public int getDirection(){
 		return this.direction;
 	}
-	
+
 	public void load(){
 		Display display = TuxGuitar.instance().getDisplay();
 		TGConfigManager config = TuxGuitar.instance().getConfig();
@@ -94,7 +94,7 @@ public void load(){
 		this.colorNote = new Color(display,config.getRGBConfigValue(TGConfigKeys.FRETBOARD_COLOR_NOTE));
 		this.colorScale = new Color(display,config.getRGBConfigValue(TGConfigKeys.FRETBOARD_COLOR_SCALE));
 	}
-	
+
 	public void defaults(){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
 		Properties defaults = config.getDefaults();
@@ -107,7 +107,7 @@ public void defaults(){
 		config.setProperty(TGConfigKeys.FRETBOARD_COLOR_NOTE,defaults.getProperty(TGConfigKeys.FRETBOARD_COLOR_NOTE));
 		config.setProperty(TGConfigKeys.FRETBOARD_COLOR_SCALE,defaults.getProperty(TGConfigKeys.FRETBOARD_COLOR_SCALE));
 	}
-	
+
 	public void save(int style, int direction, FontData fontData,RGB rgbBackground,RGB rgbString,RGB rgbFretPoint,RGB rgbNote,RGB rgbScale){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
 		config.setProperty(TGConfigKeys.FRETBOARD_STYLE,style);
@@ -119,14 +119,14 @@ public void save(int style, int direction, FontData fontData,RGB rgbBackground,R
 		config.setProperty(TGConfigKeys.FRETBOARD_COLOR_NOTE,rgbNote);
 		config.setProperty(TGConfigKeys.FRETBOARD_COLOR_SCALE,rgbScale);
 	}
-	
+
 	public void saveDirection( int direction ){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
 		config.setProperty(TGConfigKeys.FRETBOARD_DIRECTION,direction);
-		
+
 		this.direction = direction;
 	}
-	
+
 	public void dispose(){
 		this.font.dispose();
 		this.colorBackground.dispose();
@@ -135,143 +135,147 @@ public void dispose(){
 		this.colorNote.dispose();
 		this.colorScale.dispose();
 	}
-	
+
 	private static final int MINIMUM_CONTROL_WIDTH = 180;
 	private static final int MINIMUM_BUTTON_WIDTH = 80;
 	private static final int MINIMUM_BUTTON_HEIGHT = 25;
-	
+
 	public void configure(Shell shell) {
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("fretboard.settings"));
-		
+
 		// ----------------------------------------------------------------------
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(2, false));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("fretboard.settings"));
-		
+
 		final FontData fontData = getFontChooser(group,TuxGuitar.getProperty("fretboard.font"),this.font.getFontData()[0]);
-		
+
 		// Color
 		final RGB rgbBackground = getColorChooser(group,TuxGuitar.getProperty("fretboard.background-color"), this.colorBackground.getRGB());
 		final RGB rgbString = getColorChooser(group,TuxGuitar.getProperty("fretboard.string-color"), this.colorString.getRGB());
 		final RGB rgbFretPoint = getColorChooser(group,TuxGuitar.getProperty("fretboard.fretpoint-color"), this.colorFretPoint.getRGB());
 		final RGB rgbNote = getColorChooser(group,TuxGuitar.getProperty("fretboard.note-color"), this.colorNote.getRGB());
 		final RGB rgbScale = getColorChooser(group,TuxGuitar.getProperty("fretboard.scale-note-color"), this.colorScale.getRGB());
-		
+
 		Label directionLabel = new Label(group, SWT.NULL);
 		directionLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
 		directionLabel.setText(TuxGuitar.getProperty("fretboard.direction"));
-		
+
 		final Combo directionCombo = new Combo(group , SWT.DROP_DOWN | SWT.READ_ONLY);
 		directionCombo.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		directionCombo.add(TuxGuitar.getProperty("fretboard.right-mode"));
 		directionCombo.add(TuxGuitar.getProperty("fretboard.left-mode"));
 		directionCombo.select( this.direction );
-		
+
 		// ----------------------------------------------------------------------
 		group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("fretboard.settings.options"));
-		
+
 		final Button displayTextNote = new Button(group,SWT.CHECK);
 		displayTextNote.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		displayTextNote.setText(TuxGuitar.getProperty("fretboard.display-note-text"));
 		displayTextNote.setSelection( (this.style & DISPLAY_TEXT_NOTE) != 0 );
-		
+
 		final Button displayTextScale = new Button(group,SWT.CHECK);
 		displayTextScale.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		displayTextScale.setText(TuxGuitar.getProperty("fretboard.display-scale-text"));
 		displayTextScale.setSelection( (this.style & DISPLAY_TEXT_SCALE) != 0 );
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3, false));
 		buttons.setLayoutData(new GridData(SWT.END, SWT.FILL, true, true));
-		
+
 		final Button buttonDefaults = new Button(buttons, SWT.PUSH);
 		buttonDefaults.setText(TuxGuitar.getProperty("defaults"));
 		buttonDefaults.setLayoutData(getButtonData());
 		buttonDefaults.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 				defaults();
 				applyChanges();
 			}
 		});
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int style = 0;
 				style |= (displayTextNote.getSelection() ? DISPLAY_TEXT_NOTE : 0 );
 				style |= (displayTextScale.getSelection() ? DISPLAY_TEXT_SCALE : 0 );
-				
+
 				int direction = directionCombo.getSelectionIndex();
 				if( direction != DIRECTION_RIGHT && direction != DIRECTION_LEFT ){
 					direction = DIRECTION_RIGHT;
 				}
 				//if( direction )
 				dialog.dispose();
-				
+
 				save(style, direction, fontData, rgbBackground, rgbString, rgbFretPoint, rgbNote, rgbScale);
 				applyChanges();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
 		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
 		return data;
 	}
-	
+
 	protected void applyChanges(){
 		this.dispose();
 		this.load();
 	}
-	
+
 	private RGB getColorChooser(final Composite parent,String title,RGB rgb){
 		Label label = new Label(parent, SWT.NULL);
 		label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
 		label.setText(title);
-		
+
 		ButtonColor button = new ButtonColor(parent, SWT.PUSH, TuxGuitar.getProperty("choose"));
 		button.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		button.loadColor(rgb);
-		
+
 		return button.getValue();
 	}
-	
+
 	private FontData getFontChooser(final Composite parent,String title,FontData fontData){
 		final FontData selection = new FontData(fontData.getName(),fontData.getHeight(),fontData.getStyle());
-		
+
 		Label label = new Label(parent, SWT.NULL);
 		label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
 		label.setText(title);
-		
+
 		Button button = new Button(parent, SWT.PUSH);
 		button.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		button.setText(TuxGuitar.getProperty("choose"));
 		button.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				Font font = new Font(parent.getDisplay(),selection);
 				FontDialog fontDialog = new FontDialog(parent.getShell());
@@ -287,7 +291,7 @@ public void widgetSelected(SelectionEvent arg0) {
 		});
 		return selection;
 	}
-	
+
 	private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		GridData data = new GridData();
 		data.minimumWidth = minimumWidth;
@@ -297,43 +301,44 @@ private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		data.grabExcessVerticalSpace = true;
 		return data;
 	}
-	
+
 	private class ButtonColor {
 		protected Button button;
 		protected Color color;
 		protected RGB value;
-		
+
 		public ButtonColor(Composite parent, int style, String text){
 			this.value = new RGB(0,0,0);
-			this.button = new Button(parent, style);			
+			this.button = new Button(parent, style);
 			this.button.setText(text);
 			this.addListeners();
 		}
-		
+
 		protected void setLayoutData(Object layoutData){
 			this.button.setLayoutData(layoutData);
 		}
-		
+
 		protected void loadColor(RGB rgb){
 			this.value.red = rgb.red;
 			this.value.green = rgb.green;
 			this.value.blue = rgb.blue;
-			
+
 			Color color = new Color(this.button.getDisplay(), this.value);
 			this.button.setForeground(color);
 			this.disposeColor();
 			this.color = color;
 		}
-		
+
 		protected void disposeColor(){
 			if(this.color != null && !this.color.isDisposed()){
 				this.color.dispose();
 				this.color = null;
 			}
 		}
-		
+
 		private void addListeners(){
 			this.button.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent event) {
 					ColorDialog dlg = new ColorDialog(ButtonColor.this.button.getShell());
 					dlg.setRGB(ButtonColor.this.value);
@@ -345,12 +350,13 @@ public void widgetSelected(SelectionEvent event) {
 				}
 			});
 			this.button.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					ButtonColor.this.disposeColor();
 				}
 			});
 		}
-		
+
 		protected RGB getValue(){
 			return this.value;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/lyric/LyricEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/lyric/LyricEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/lyric/LyricEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/lyric/LyricEditor.java
index aa3153cb..69961929 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/lyric/LyricEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/lyric/LyricEditor.java
@@ -33,16 +33,16 @@
 public class LyricEditor implements TGUpdateListener,IconLoader,LanguageLoader{
 	private static int EDITOR_WIDTH = 450;
 	private static int EDITOR_HEIGHT = 200;
-	
+
 	protected static final KeyBindingAction KB_ACTIONS[] = new KeyBindingAction[]{
 		new KeyBindingAction(UndoAction.NAME,new KeyBinding(122,KeyBindingUtil.CONTROL)),
 		new KeyBindingAction(RedoAction.NAME,new KeyBinding(121,KeyBindingUtil.CONTROL)),
 	};
-	
+
 	private TGTrack track;
 	private Shell dialog;
 	private LyricModifyListener listener;
-	
+
 	private Button previous;
 	private Button next;
 	private Label label;
@@ -50,26 +50,27 @@ public class LyricEditor implements TGUpdateListener,IconLoader,LanguageLoader{
 	private Spinner from;
 	private Text text;
 	private int caretPosition;
-	
+
 	private boolean updated;
 	private int lastTrack;
 	private int lastMeasuseCount;
 	private String lastTrackName;
-	
+
 	public LyricEditor(){
 		this.listener = new LyricModifyListener(this);
 	}
-	
+
 	public void show() {
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.RESIZE);
 		this.dialog.setLayout(getDialogLayout());
 		this.dialog.setSize(EDITOR_WIDTH,EDITOR_HEIGHT);
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				onDispose();
 			}
 		});
-		
+
 		this.track = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack();
 		this.loadComposites();
 		this.loadProperties();
@@ -78,19 +79,19 @@ public void widgetDisposed(DisposeEvent e) {
 		this.addListeners();
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER);
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
 		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
 	}
-	
+
 	public void onDispose(){
 		this.track = null;
 		this.label = null;
@@ -99,7 +100,7 @@ public void onDispose(){
 		this.removeListeners();
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	private GridLayout getDialogLayout(){
 		GridLayout layout = new GridLayout();
 		layout.marginWidth = 0;
@@ -107,61 +108,64 @@ private GridLayout getDialogLayout(){
 		layout.verticalSpacing = 0;
 		return layout;
 	}
-	
+
 	private void loadComposites(){
 		loadToolBar(this.dialog);
 		loadLyricText(this.dialog);
 	}
-	
+
 	private void loadToolBar(Composite parent){
 		final Composite composite = new Composite(parent,SWT.NONE);
 		composite.setLayout(new GridLayout(5,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
-		
+
 		this.previous = new Button(composite, SWT.ARROW | SWT.LEFT);
 		this.next = new Button(composite, SWT.ARROW | SWT.RIGHT);
-		
+
 		this.label = new Label(composite,SWT.NONE);
 		this.label.setText(this.track.getName());
 		this.label.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
-		
+
 		this.fromLabel = new Label(composite,SWT.NONE);
 		this.fromLabel.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
-		
+
 		this.from = new Spinner(composite,SWT.BORDER);
 		this.from.setLayoutData(new GridData(50,SWT.DEFAULT));
-		
+
 		this.from.setMinimum(1);
 		this.from.setMaximum(this.track.countMeasures());
 		this.from.setSelection(this.track.getLyrics().getFrom());
 		this.from.setEnabled(this.track.countMeasures() > 1);
 		this.from.addModifyListener(this.listener);
-		
+
 		this.previous.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().getAction(GoPreviousTrackAction.NAME).process(new ActionData());
 				composite.layout();
 			}
 		});
 		this.next.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().getAction(GoNextTrackAction.NAME).process(new ActionData());
 				composite.layout();
 			}
 		});
 	}
-	
+
 	private void loadLyricText(Composite parent){
 		Composite composite = new Composite(parent,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.text = new Text(composite,SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
 		this.text.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.text.setFocus();
 		this.text.setText(this.track.getLyrics().getLyrics());
 		this.text.addModifyListener(this.listener);
 		this.text.addKeyListener(new KeyAdapter() {
+			@Override
 			public void keyPressed(KeyEvent event) {
 				for( int i = 0 ; i < KB_ACTIONS.length ; i ++ ){
 					if(event.keyCode == KB_ACTIONS[i].getKeyBinding().getKey() && event.stateMask == KB_ACTIONS[i].getKeyBinding().getMask()){
@@ -172,11 +176,11 @@ public void keyPressed(KeyEvent event) {
 			}
 		});
 	}
-	
+
 	public void updateItems(){
 		if(!isDisposed()){
 			boolean enabled = !TuxGuitar.instance().getPlayer().isRunning();
-			
+
 			this.listener.setEnabled(false);
 			if(this.updated){
 				this.lastTrack = 0;
@@ -195,17 +199,17 @@ public void updateItems(){
 				this.text.setText(this.track.getLyrics().getLyrics());
 				this.text.setSelection( (this.caretPosition >= 0 ? this.caretPosition : this.text.getCharCount()));
 			}
-			
+
 			this.from.setEnabled( enabled && (this.track.countMeasures() > 1) );
 			this.text.setEnabled( enabled );
-			
+
 			this.setCaretPosition(-1);
-			
+
 			this.listener.setEnabled( enabled );
 			this.updated = false;
 		}
 	}
-	
+
 	private boolean isTrackChanged(){
 		int current = this.track.getNumber();
 		if(current != this.lastTrack){
@@ -214,7 +218,7 @@ private boolean isTrackChanged(){
 		}
 		return false;
 	}
-	
+
 	private boolean isTrackNameChanged(){
 		String current = this.track.getName();
 		if(this.lastTrackName == null || !current.equals( this.lastTrackName ) ){
@@ -223,7 +227,7 @@ private boolean isTrackNameChanged(){
 		}
 		return false;
 	}
-	
+
 	private boolean isMeasureCountChanged(){
 		int current = this.track.countMeasures();
 		if(current != this.lastMeasuseCount){
@@ -232,42 +236,45 @@ private boolean isMeasureCountChanged(){
 		}
 		return false;
 	}
-	
+
 	public void update(){
 		this.updated = true;
 	}
-	
+
 	public void setCaretPosition(int caretPosition) {
 		this.caretPosition = caretPosition;
 	}
-	
+
 	public TGTrack getTrack(){
 		return this.track;
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		if(!isDisposed()){
 			this.dialog.setText(TuxGuitar.getProperty("lyric.editor"));
 			this.fromLabel.setText(TuxGuitar.getProperty("edit.from"));
 		}
 	}
-	
+
+	@Override
 	public void loadIcons(){
 		if(!isDisposed()){
 			this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		}
 	}
-	
+
 	public boolean isDisposed() {
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			this.dialog.dispose();
 		}
 	}
 
+	@Override
 	public void doUpdate(int type) {
 		if( type == TGUpdateListener.SELECTION ){
 			this.updateItems();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/lyric/LyricModifyListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/lyric/LyricModifyListener.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/lyric/LyricModifyListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/lyric/LyricModifyListener.java
index 39ee06de..254f34df 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/lyric/LyricModifyListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/lyric/LyricModifyListener.java
@@ -9,29 +9,30 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class LyricModifyListener implements ModifyListener{
-	
+
 	private boolean enabled;
 	private LyricEditor editor;
 	private int lastPosition;
-	
+
 	public LyricModifyListener(LyricEditor editor){
 		this.editor = editor;
 	}
-	
+
+	@Override
 	public void modifyText(ModifyEvent e) {
 		if(isEnabled() && !TuxGuitar.instance().getPlayer().isRunning()){
-			
+
 			if(e.widget instanceof Text){
 				TGTrack track = this.editor.getTrack();
 				Text text = (Text)e.widget;
 				String value = text.getText();
 				int position = text.getCaretPosition();
-				
+
 				UndoableTrackLyric undoable = UndoableTrackLyric.startUndo(track,this.lastPosition);
 				track.getLyrics().setLyrics(value);
 				TuxGuitar.instance().getUndoableManager().addEdit( undoable.endUndo(track,position) );
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
-				
+
 				this.lastPosition = position;
 			}else if(e.widget instanceof Spinner){
 				TGTrack track = this.editor.getTrack();
@@ -40,15 +41,15 @@ public void modifyText(ModifyEvent e) {
 				TuxGuitar.instance().getUndoableManager().addEdit( undoable.endUndo(track,this.lastPosition) );
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
 			}
-			
+
 			TuxGuitar.instance().updateCache(true);
 		}
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/matrix/MatrixConfig.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/matrix/MatrixConfig.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/matrix/MatrixConfig.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/matrix/MatrixConfig.java
index e8fe9e47..d9b442bd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/matrix/MatrixConfig.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/matrix/MatrixConfig.java
@@ -28,7 +28,7 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class MatrixConfig {
-	
+
 	private Font font;
 	private Color[] colorLines;
 	private Color colorForeground;
@@ -36,43 +36,43 @@ public class MatrixConfig {
 	private Color colorPosition;
 	private Color colorNote;
 	private Color colorPlay;
-	
+
 	public MatrixConfig(){
 		super();
 	}
-	
+
 	public Font getFont() {
 		return this.font;
 	}
-	
+
 	public Color getColorForeground() {
 		return this.colorForeground;
 	}
-	
+
 	public Color getColorBorder() {
 		return this.colorBorder;
 	}
-	
+
 	public Color getColorPosition() {
 		return this.colorPosition;
 	}
-	
+
 	public Color getColorNote() {
 		return this.colorNote;
 	}
-	
+
 	public Color getColorPlay() {
 		return this.colorPlay;
 	}
-	
+
 	public Color[] getColorLines() {
 		return this.colorLines;
 	}
-	
+
 	public Color getColorLine(int index) {
 		return this.colorLines[index];
 	}
-	
+
 	public void load(){
 		Display display = TuxGuitar.instance().getDisplay();
 		TGConfigManager config = TuxGuitar.instance().getConfig();
@@ -88,7 +88,7 @@ public void load(){
 				new Color(display,config.getRGBConfigValue(TGConfigKeys.MATRIX_COLOR_LINE_3)),
 		};
 	}
-	
+
 	public void defaults(){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
 		Properties defaults = config.getDefaults();
@@ -102,7 +102,7 @@ public void defaults(){
 		config.setProperty(TGConfigKeys.MATRIX_COLOR_LINE_2,defaults.getProperty(TGConfigKeys.MATRIX_COLOR_LINE_2));
 		config.setProperty(TGConfigKeys.MATRIX_COLOR_LINE_3,defaults.getProperty(TGConfigKeys.MATRIX_COLOR_LINE_3));
 	}
-	
+
 	public void save(FontData fontData,
 					 RGB rgbForeground,
 					 RGB rgbBorder,
@@ -111,7 +111,7 @@ public void save(FontData fontData,
 					 RGB rgbPlay,
 					 RGB rgbLines[]){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
-		
+
 		config.setProperty(TGConfigKeys.MATRIX_FONT,fontData);
 		config.setProperty(TGConfigKeys.MATRIX_COLOR_FOREGROUND,rgbForeground);
 		config.setProperty(TGConfigKeys.MATRIX_COLOR_BORDER,rgbBorder);
@@ -122,7 +122,7 @@ public void save(FontData fontData,
 		config.setProperty(TGConfigKeys.MATRIX_COLOR_LINE_2,rgbLines[1]);
 		config.setProperty(TGConfigKeys.MATRIX_COLOR_LINE_3,rgbLines[2]);
 	}
-	
+
 	public void dispose(){
 		dispose(this.font);
 		dispose(this.colorForeground);
@@ -132,7 +132,7 @@ public void dispose(){
 		dispose(this.colorPlay);
 		dispose(this.colorLines);
 	}
-	
+
 	protected void dispose(Resource[] resources){
 		if(resources != null){
 			for(int i = 0; i < resources.length; i ++){
@@ -140,121 +140,125 @@ protected void dispose(Resource[] resources){
 			}
 		}
 	}
-	
+
 	protected void dispose(Resource resource){
 		if(resource != null){
 			resource.dispose();
 		}
 	}
-	
+
 	private static final int MINIMUM_CONTROL_WIDTH = 180;
 	private static final int MINIMUM_BUTTON_WIDTH = 80;
 	private static final int MINIMUM_BUTTON_HEIGHT = 25;
-	
+
 	public void configure(Shell shell) {
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("matrix.settings"));
-		
+
 		// ----------------------------------------------------------------------
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(2, false));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("matrix.settings"));
-		
+
 		// fonts
 		final FontData fontData = getFontChooser(group,TuxGuitar.getProperty("matrix.font"),this.font.getFontData()[0]);
-		
+
 		// colors
 		final RGB rgbForeground = getColorChooser(group,TuxGuitar.getProperty("matrix.foreground-color"), this.colorForeground.getRGB());
-		
+
 		final RGB rgbLines[] = new RGB[]{
 				getColorChooser(group,TuxGuitar.getProperty("matrix.line-color-1"), this.colorLines[0].getRGB()),
 				getColorChooser(group,TuxGuitar.getProperty("matrix.line-color-2"), this.colorLines[1].getRGB()),
 				getColorChooser(group,TuxGuitar.getProperty("matrix.line-color-over"), this.colorLines[2].getRGB()),
 		};
-		
+
 		final RGB rgbBorder = getColorChooser(group,TuxGuitar.getProperty("matrix.border-color"), this.colorBorder.getRGB());
 		final RGB rgbPosition = getColorChooser(group,TuxGuitar.getProperty("matrix.position-color"), this.colorPosition.getRGB());
 		final RGB rgbNote = getColorChooser(group,TuxGuitar.getProperty("matrix.note-color"), this.colorNote.getRGB());
 		final RGB rgbPlay = getColorChooser(group,TuxGuitar.getProperty("matrix.play-note-color"), this.colorPlay.getRGB());
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3, false));
 		buttons.setLayoutData(new GridData(SWT.END, SWT.FILL, true, true));
-		
+
 		final Button buttonDefaults = new Button(buttons, SWT.PUSH);
 		buttonDefaults.setText(TuxGuitar.getProperty("defaults"));
 		buttonDefaults.setLayoutData(getButtonData());
 		buttonDefaults.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 				defaults();
 				applyChanges();
 			}
 		});
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 				save(fontData, rgbForeground, rgbBorder, rgbPosition, rgbNote, rgbPlay, rgbLines);
 				applyChanges();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
 		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
 		return data;
 	}
-	
+
 	protected void applyChanges(){
 		this.dispose();
 		this.load();
 	}
-	
+
 	private RGB getColorChooser(final Composite parent,String title,RGB rgb){
 		Label label = new Label(parent, SWT.NULL);
 		label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
 		label.setText(title);
-		
+
 		ButtonColor button = new ButtonColor(parent, SWT.PUSH, TuxGuitar.getProperty("choose"));
 		button.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		button.loadColor(rgb);
-		
+
 		return button.getValue();
 	}
-	
+
 	private FontData getFontChooser(final Composite parent,String title,FontData fontData){
 		final FontData selection = new FontData(fontData.getName(),fontData.getHeight(),fontData.getStyle());
-		
+
 		Label label = new Label(parent, SWT.NULL);
 		label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
 		label.setText(title);
-		
+
 		Button button = new Button(parent, SWT.PUSH);
 		button.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		button.setText(TuxGuitar.getProperty("choose"));
 		button.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				Font font = new Font(parent.getDisplay(),selection);
 				FontDialog fontDialog = new FontDialog(parent.getShell());
@@ -270,7 +274,7 @@ public void widgetSelected(SelectionEvent arg0) {
 		});
 		return selection;
 	}
-	
+
 	private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		GridData data = new GridData();
 		data.minimumWidth = minimumWidth;
@@ -280,43 +284,44 @@ private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		data.grabExcessVerticalSpace = true;
 		return data;
 	}
-	
+
 	private class ButtonColor {
 		protected Button button;
 		protected Color color;
 		protected RGB value;
-		
+
 		public ButtonColor(Composite parent, int style, String text){
 			this.value = new RGB(0,0,0);
-			this.button = new Button(parent, style);			
+			this.button = new Button(parent, style);
 			this.button.setText(text);
 			this.addListeners();
 		}
-		
+
 		protected void setLayoutData(Object layoutData){
 			this.button.setLayoutData(layoutData);
 		}
-		
+
 		protected void loadColor(RGB rgb){
 			this.value.red = rgb.red;
 			this.value.green = rgb.green;
 			this.value.blue = rgb.blue;
-			
+
 			Color color = new Color(this.button.getDisplay(), this.value);
 			this.button.setForeground(color);
 			this.disposeColor();
 			this.color = color;
 		}
-		
+
 		protected void disposeColor(){
 			if(this.color != null && !this.color.isDisposed()){
 				this.color.dispose();
 				this.color = null;
 			}
 		}
-		
+
 		private void addListeners(){
 			this.button.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent event) {
 					ColorDialog dlg = new ColorDialog(ButtonColor.this.button.getShell());
 					dlg.setRGB(ButtonColor.this.value);
@@ -328,12 +333,13 @@ public void widgetSelected(SelectionEvent event) {
 				}
 			});
 			this.button.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					ButtonColor.this.disposeColor();
 				}
 			});
 		}
-		
+
 		protected RGB getValue(){
 			return this.value;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/matrix/MatrixEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/matrix/MatrixEditor.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/matrix/MatrixEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/matrix/MatrixEditor.java
index 6b2ffeb9..2a8b8d63 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/matrix/MatrixEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/matrix/MatrixEditor.java
@@ -62,15 +62,15 @@
 import org.herac.tuxguitar.song.models.TGVoice;
 
 public class MatrixEditor implements TGRedrawListener,IconLoader,LanguageLoader{
-	
+
 	private static final int BORDER_HEIGHT = 20;
 	private static final int SCROLL_INCREMENT = 50;
 	private static final String[] NOTE_NAMES = TGMusicKeyUtils.getSharpKeyNames(TGMusicKeyUtils.PREFIX_MATRIX);
 	private static final MidiPercussion[] PERCUSSIONS = TuxGuitar.instance().getPlayer().getPercussions();
 	protected static final int[] DIVISIONS = new int[] {1,2,3,4,6,8,16};
-	
+
 	private MatrixConfig config;
-	private MatrixListener listener;
+	private final MatrixListener listener;
 	private Shell dialog;
 	private Composite composite;
 	private Composite toolbar;
@@ -96,39 +96,40 @@ public class MatrixEditor implements TGRedrawListener,IconLoader,LanguageLoader{
 	private int playedTrack;
 	private int playedMeasure;
 	private TGBeat playedBeat;
-	
+
 	private TGImage selectionBackBuffer;
 	private int selectionX;
 	private int selectionY;
-	
+
 	private boolean selectionPaintDisabled;
-	
+
 	public MatrixEditor(){
 		this.grids = this.loadGrids();
 		this.listener = new MatrixListener();
 	}
-	
+
 	public void show(){
 		this.config = new MatrixConfig();
 		this.config.load();
-		
+
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(),SWT.DIALOG_TRIM | SWT.RESIZE);
 		this.dialog.setText(TuxGuitar.getProperty("matrix.editor"));
 		this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.addDisposeListener(new DisposeListenerImpl());
 		this.bufferDisposer = new BufferDisposer();
-		
+
 		this.composite = new Composite(this.dialog,SWT.NONE);
 		this.composite.setLayout(new GridLayout());
 		this.composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.initToolBar();
 		this.initEditor();
 		this.loadIcons();
-		
+
 		this.addListeners();
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				removeListeners();
 				TuxGuitar.instance().updateCache(true);
@@ -136,7 +137,7 @@ public void widgetDisposed(DisposeEvent e) {
 		});
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER);
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.toolbar);
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.editor);
@@ -144,56 +145,56 @@ public void addListeners(){
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addRedrawListener( this );
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
 		TuxGuitar.instance().getEditorManager().removeRedrawListener( this );
 	}
-	
+
 	private void initToolBar() {
 		GridLayout layout = new GridLayout();
 		layout.makeColumnsEqualWidth = false;
 		layout.numColumns = 0;
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
-		
+
 		this.toolbar = new Composite(this.composite, SWT.NONE);
-		
+
 		// position
 		layout.numColumns ++;
 		Button goLeft = new Button(this.toolbar, SWT.ARROW | SWT.LEFT);
 		goLeft.addSelectionListener(TuxGuitar.instance().getAction(GoLeftAction.NAME));
-		
+
 		layout.numColumns ++;
 		Button goRight = new Button(this.toolbar, SWT.ARROW | SWT.RIGHT);
 		goRight.addSelectionListener(TuxGuitar.instance().getAction(GoRightAction.NAME));
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolbar);
-		
+
 		// duration
 		layout.numColumns ++;
 		Button decrement = new Button(this.toolbar, SWT.ARROW | SWT.MIN);
 		decrement.addSelectionListener(TuxGuitar.instance().getAction(DecrementDurationAction.NAME));
-		
+
 		layout.numColumns ++;
 		this.durationLabel = new Label(this.toolbar, SWT.BORDER);
-		
+
 		layout.numColumns ++;
 		Button increment = new Button(this.toolbar, SWT.ARROW | SWT.MAX);
 		increment.addSelectionListener(TuxGuitar.instance().getAction(IncrementDurationAction.NAME));
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolbar);
-		
+
 		// grids
 		layout.numColumns ++;
 		this.gridsLabel = new Label(this.toolbar,SWT.NONE);
 		this.gridsLabel.setText(TuxGuitar.getProperty("matrix.grids"));
-		
+
 		layout.numColumns ++;
 		final Combo divisionsCombo = new Combo(this.toolbar, SWT.DROP_DOWN | SWT.READ_ONLY);
 		divisionsCombo.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false, true));
@@ -207,6 +208,7 @@ private void initToolBar() {
 			divisionsCombo.select(0);
 		}
 		divisionsCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int index = divisionsCombo.getSelectionIndex();
 				if(index >= 0 && index < DIVISIONS.length){
@@ -214,7 +216,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		// settings
 		layout.numColumns ++;
 		this.settings = new Button(this.toolbar, SWT.PUSH);
@@ -222,20 +224,21 @@ public void widgetSelected(SelectionEvent e) {
 		this.settings.setToolTipText(TuxGuitar.getProperty("settings"));
 		this.settings.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
 		this.settings.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				configure();
 			}
 		});
-		
+
 		this.toolbar.setLayout(layout);
 		this.toolbar.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
 	}
-	
+
 	private void makeToolSeparator(Composite parent){
 		Label separator = new Label(parent,SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(20,20));
 	}
-	
+
 	private void loadDurationImage(boolean force) {
 		int duration = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getDuration().getValue();
 		if(force || this.duration != duration){
@@ -243,7 +246,7 @@ private void loadDurationImage(boolean force) {
 			this.durationLabel.setImage(TuxGuitar.instance().getIconManager().getDuration(this.duration));
 		}
 	}
-	
+
 	public void initEditor(){
 		this.selection = -1;
 		this.editor = new Composite(this.composite,SWT.DOUBLE_BUFFERED | SWT.BORDER  | SWT.H_SCROLL | SWT.V_SCROLL);
@@ -256,18 +259,20 @@ public void initEditor(){
 		this.editor.addMouseTrackListener(this.listener);
 		this.editor.getHorizontalBar().setIncrement(SCROLL_INCREMENT);
 		this.editor.getHorizontalBar().addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				redrawLocked();
 			}
 		});
 		this.editor.getVerticalBar().setIncrement(SCROLL_INCREMENT);
 		this.editor.getVerticalBar().addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				redrawLocked();
 			}
 		});
 	}
-	
+
 	protected void updateScroll(){
 		if( this.clientArea != null ){
 			int borderWidth = this.editor.getBorderWidth();
@@ -279,7 +284,7 @@ protected void updateScroll(){
 			hBar.setThumb(Math.round(Math.min(this.width + (borderWidth * 2), this.clientArea.width)));
 		}
 	}
-	
+
 	protected int getValueAt(float y){
 		if(this.clientArea == null || (y - BORDER_HEIGHT) < 0 || y + BORDER_HEIGHT > this.clientArea.height){
 			return -1;
@@ -288,41 +293,41 @@ protected int getValueAt(float y){
 		int value = (this.maxNote -  ((int)(  (y + scroll - BORDER_HEIGHT)  / this.lineHeight)) );
 		return value;
 	}
-	
+
 	protected long getStartAt(float x){
 		TGMeasure measure = getMeasure();
 		float posX = (x + this.editor.getHorizontalBar().getSelection());
 		long start =(long) (measure.getStart() + (((posX - this.leftSpacing) * measure.getLength()) / (this.timeWidth * measure.getTimeSignature().getNumerator())));
 		return start;
 	}
-	
+
 	protected void paintEditor(TGPainter painter){
 		if(!TuxGuitar.instance().getPlayer().isRunning()){
 			this.resetPlayed();
 		}
-		
+
 		this.disposeSelectionBuffer();
 		this.clientArea = this.editor.getClientArea();
-		
+
 		if( this.clientArea != null ){
 			TGImage buffer = getBuffer();
-			
+
 			this.width = this.bufferWidth;
 			this.height = (this.bufferHeight + (BORDER_HEIGHT *2));
-			
+
 			this.updateScroll();
 			int scrollX = this.editor.getHorizontalBar().getSelection();
 			int scrollY = this.editor.getVerticalBar().getSelection();
-			
+
 			painter.drawImage(buffer,-scrollX,(BORDER_HEIGHT - scrollY));
 			this.paintMeasure(painter,(-scrollX), (BORDER_HEIGHT - scrollY) );
 			this.paintBorders(painter,(-scrollX),0);
 			this.paintPosition(painter,(-scrollX),0);
-			
+
 			this.paintSelection(painter, (-scrollX), (BORDER_HEIGHT - scrollY) );
 		}
 	}
-	
+
 	protected TGImage getBuffer(){
 		if( this.clientArea != null ){
 			this.bufferDisposer.update(this.clientArea.width, this.clientArea.height);
@@ -349,7 +354,7 @@ protected TGImage getBuffer(){
 						names[i] = (NOTE_NAMES[ (this.maxNote - i) % 12] + ((this.maxNote - i) / 12 ) );
 					}
 				}
-				
+
 				int minimumNameWidth = 110;
 				int minimumNameHeight = 0;
 				TGPainter painter = new TGPainterImpl(new GC(this.dialog.getDisplay()));
@@ -365,17 +370,17 @@ protected TGImage getBuffer(){
 					}
 				}
 				painter.dispose();
-				
+
 				int cols = measure.getTimeSignature().getNumerator();
 				int rows = (this.maxNote - this.minNote);
-				
+
 				this.leftSpacing = minimumNameWidth + 10;
 				this.lineHeight = Math.max(minimumNameHeight,( (this.clientArea.height - (BORDER_HEIGHT * 2.0f))/ (rows + 1.0f)));
 				this.timeWidth = Math.max((10 * (TGDuration.SIXTY_FOURTH / measure.getTimeSignature().getDenominator().getValue())),( (this.clientArea.width-this.leftSpacing) / cols)  );
 				this.bufferWidth = this.leftSpacing + (this.timeWidth * cols);
 				this.bufferHeight = (this.lineHeight * (rows + 1));
 				this.buffer = new TGImageImpl(this.editor.getDisplay(),Math.round( this.bufferWidth),Math.round(this.bufferHeight));
-				
+
 				painter = this.buffer.createPainter();
 				painter.setFont(new TGFontImpl(this.config.getFont()));
 				painter.setForeground(new TGColorImpl(this.config.getColorForeground()));
@@ -408,25 +413,25 @@ protected TGImage getBuffer(){
 		}
 		return this.buffer;
 	}
-	
+
 	protected void paintMeasure(TGPainter painter,float fromX, float fromY){
 		if( this.clientArea != null ){
 			TGMeasure measure = getMeasure();
 			if(measure != null){
-				Iterator it = measure.getBeats().iterator();
+				Iterator<TGBeat> it = measure.getBeats().iterator();
 				while(it.hasNext()){
-					TGBeat beat = (TGBeat)it.next();
+					TGBeat beat = it.next();
 					paintBeat(painter, measure, beat, fromX, fromY);
 				}
 			}
 		}
 	}
-	
+
 	protected void paintBeat(TGPainter painter,TGMeasure measure,TGBeat beat,float fromX, float fromY){
 		if( this.clientArea != null ){
 			int minimumY = BORDER_HEIGHT;
 			int maximumY = (this.clientArea.height - BORDER_HEIGHT);
-			
+
 			for( int v = 0; v < beat.countVoices(); v ++ ){
 				TGVoice voice = beat.getVoice(v);
 				for( int i = 0 ; i < voice.countNotes() ; i ++){
@@ -435,14 +440,14 @@ protected void paintBeat(TGPainter painter,TGMeasure measure,TGBeat beat,float f
 					float y1 = (fromY + (((this.maxNote - this.minNote) - (note.getRealValue() - this.minNote)) * this.lineHeight) + 1 );
 					float x2 = (x1 + ((voice.getDuration().getTime() * this.timeWidth) / measure.getTimeSignature().getDenominator().getTime()) - 2 );
 					float y2 = (y1 + this.lineHeight - 2 );
-					
+
 					if( y1 >= maximumY || y2 <= minimumY){
 						continue;
 					}
-					
+
 					y1 = ( y1 < minimumY ? minimumY : y1 );
 					y2 = ( y2 > maximumY ? maximumY : y2 );
-					
+
 					if((x2 - x1) > 0 && (y2 - y1) > 0){
 						painter.setBackground(new TGColorImpl( (note.getBeatImpl().isPlaying(TuxGuitar.instance().getTablatureEditor().getTablature().getViewLayout()) ? this.config.getColorPlay():this.config.getColorNote() ) ));
 						painter.initPath(TGPainter.PATH_FILL);
@@ -454,7 +459,7 @@ protected void paintBeat(TGPainter painter,TGMeasure measure,TGBeat beat,float f
 			}
 		}
 	}
-	
+
 	protected void paintBorders(TGPainter painter,float fromX, float fromY){
 		if( this.clientArea != null ){
 			painter.setBackground(new TGColorImpl(this.config.getColorBorder()));
@@ -463,14 +468,14 @@ protected void paintBorders(TGPainter painter,float fromX, float fromY){
 			painter.addRectangle(fromX,fromY,this.bufferWidth ,BORDER_HEIGHT);
 			painter.addRectangle(fromX,fromY + (this.clientArea.height - BORDER_HEIGHT),this.bufferWidth ,BORDER_HEIGHT);
 			painter.closePath();
-			
+
 			painter.initPath();
 			painter.setAntialias(false);
 			painter.addRectangle(fromX,fromY,this.width,this.clientArea.height);
 			painter.closePath();
 		}
 	}
-	
+
 	protected void paintPosition(TGPainter painter,float fromX, float fromY){
 		if( this.clientArea != null && !TuxGuitar.instance().getPlayer().isRunning()){
 			Caret caret = getCaret();
@@ -484,7 +489,7 @@ protected void paintPosition(TGPainter painter,float fromX, float fromY){
 				painter.setAntialias(false);
 				painter.addRectangle(fromX + (this.leftSpacing + x),fromY , width,BORDER_HEIGHT);
 				painter.closePath();
-				
+
 				painter.initPath(TGPainter.PATH_FILL);
 				painter.setAntialias(false);
 				painter.addRectangle(fromX + (this.leftSpacing + x),fromY + (this.clientArea.height - BORDER_HEIGHT), width,BORDER_HEIGHT);
@@ -492,18 +497,18 @@ protected void paintPosition(TGPainter painter,float fromX, float fromY){
 			}
 		}
 	}
-	
+
 	protected void paintSelection(TGPainter painter, float fromX, float fromY){
 		if( !this.selectionPaintDisabled && this.clientArea != null && !TuxGuitar.instance().getPlayer().isRunning()){
 			selectionFinish();
 			if(this.selection >= 0){
 				this.selectionPaintDisabled = true;
-				
+
 				int x = Math.round( fromX );
 				int y = Math.round( fromY + ((this.maxNote - this.selection) * this.lineHeight)  );
 				int width = Math.round( this.bufferWidth );
 				int height = Math.round( this.lineHeight );
-				
+
 				TGImage selectionArea = new TGImageImpl(this.editor.getDisplay(),width,height);
 				painter.copyArea(selectionArea,x,y);
 				painter.setAlpha(100);
@@ -512,7 +517,7 @@ protected void paintSelection(TGPainter painter, float fromX, float fromY){
 				painter.setAntialias(false);
 				painter.addRectangle(x,y,width,height);
 				painter.closePath();
-				
+
 				this.selectionX = x;
 				this.selectionY = y;
 				this.selectionBackBuffer = selectionArea;
@@ -520,24 +525,24 @@ protected void paintSelection(TGPainter painter, float fromX, float fromY){
 			}
 		}
 	}
-	
+
 	protected void updateSelection(float y){
 		if(!TuxGuitar.instance().getPlayer().isRunning()){
 			int selection = getValueAt(y);
-			
+
 			if(this.selection != selection){
 				this.selection = selection;
-				
+
 				int scrollX = this.editor.getHorizontalBar().getSelection();
 				int scrollY = this.editor.getVerticalBar().getSelection();
-				
+
 				TGPainter painter = new TGPainterImpl(new GC(this.editor));
 				this.paintSelection(painter, (-scrollX), (BORDER_HEIGHT - scrollY) );
 				painter.dispose();
 			}
 		}
 	}
-	
+
 	public void selectionFinish(){
 		if(this.selectionBackBuffer != null && !this.selectionBackBuffer.isDisposed()){
 			TGPainter painter = new TGPainterImpl(new GC(this.editor));
@@ -546,21 +551,21 @@ public void selectionFinish(){
 		}
 		disposeSelectionBuffer();
 	}
-	
+
 	protected void disposeSelectionBuffer(){
 		if(this.selectionBackBuffer != null && !this.selectionBackBuffer.isDisposed()){
 			this.selectionBackBuffer.dispose();
 			this.selectionBackBuffer = null;
 		}
 	}
-	
+
 	protected void hit(float x, float y){
 		if(!TuxGuitar.instance().getPlayer().isRunning()){
 			TGMeasure measure = getMeasure();
 			Caret caret = getCaret();
 			int value = getValueAt(y);
 			long start = getStartAt(x);
-			
+
 			if(start >= measure.getStart() && start < (measure.getStart() + measure.getLength())){
 				caret.update(caret.getTrack().getNumber(),start,caret.getStringNumber());
 				TuxGuitar.instance().updateCache(true);
@@ -579,52 +584,52 @@ protected void hit(float x, float y){
 			}
 		}
 	}
-	
+
 	private boolean removeNote(TGBeat beat,int value) {
 		Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 		TGMeasure measure = getMeasure();
-		
+
 		for(int v = 0; v < beat.countVoices(); v ++){
 			TGVoice voice = beat.getVoice( v );
-			Iterator it = voice.getNotes().iterator();
+			Iterator<TGNote> it = voice.getNotes().iterator();
 			while (it.hasNext()) {
 				TGNoteImpl note = (TGNoteImpl) it.next();
 				if (note.getRealValue() == value) {
 					caret.update(measure.getTrack().getNumber(),beat.getStart(),note.getString());
-					
+
 					//comienza el undoable
 					UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-					
+
 					TGSongManager manager = TuxGuitar.instance().getSongManager();
 					manager.getMeasureManager().removeNote(note);
-					
+
 					//termia el undoable
 					TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 					TuxGuitar.instance().getFileHistory().setUnsavedFile();
-					
+
 					this.afterAction();
-					
+
 					return true;
 				}
 			}
 		}
 		return false;
 	}
-	
+
 	private boolean addNote(TGBeat beat,long start, int value) {
 		if(beat != null){
 			TGMeasure measure = getMeasure();
 			Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
-			
-			List strings = measure.getTrack().getStrings();
+
+			List<TGString> strings = measure.getTrack().getStrings();
 			for(int i = 0;i < strings.size();i ++){
-				TGString string = (TGString)strings.get(i);
+				TGString string = strings.get(i);
 				if(value >= string.getValue()){
 					boolean emptyString = true;
-					
+
 					for(int v = 0; v < beat.countVoices(); v ++){
 						TGVoice voice = beat.getVoice( v );
-						Iterator it = voice.getNotes().iterator();
+						Iterator<TGNote> it = voice.getNotes().iterator();
 						while (it.hasNext()) {
 							TGNoteImpl note = (TGNoteImpl) it.next();
 							if (note.getString() == string.getNumber()) {
@@ -635,31 +640,31 @@ private boolean addNote(TGBeat beat,long start, int value) {
 					}
 					if(emptyString){
 						TGSongManager manager = TuxGuitar.instance().getSongManager();
-						
+
 						//comienza el undoable
 						UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-						
+
 						TGNote note = manager.getFactory().newNote();
 						note.setValue((value - string.getValue()));
 						note.setVelocity(caret.getVelocity());
 						note.setString(string.getNumber());
-						
+
 						TGDuration duration = manager.getFactory().newDuration();
 						caret.getDuration().copy(duration);
-						
+
 						manager.getMeasureManager().addNote(beat,note,duration,start,caret.getVoice());
-						
+
 						caret.moveTo(caret.getTrack(),caret.getMeasure(),note.getVoice().getBeat(),note.getString());
-						
+
 						//termia el undoable
 						TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 						TuxGuitar.instance().getFileHistory().setUnsavedFile();
-						
+
 						//reprodusco las notas en el pulso
 						TuxGuitar.instance().playBeat(caret.getSelectedBeat());
-						
+
 						this.afterAction();
-						
+
 						return true;
 					}
 				}
@@ -667,15 +672,16 @@ private boolean addNote(TGBeat beat,long start, int value) {
 		}
 		return false;
 	}
-	
+
 	protected void afterAction() {
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(getMeasure().getNumber());
 		TuxGuitar.instance().updateCache(true);
 		this.editor.redraw();
 	}
-	
+
 	protected void play(final int value){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				TGTrack tgTrack = getMeasure().getTrack();
 				TGChannel tgChannel = TuxGuitar.instance().getSongManager().getChannel(tgTrack.getChannelId());
@@ -695,7 +701,7 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	protected int loadGrids(){
 		int grids = TuxGuitar.instance().getConfig().getIntConfigValue(TGConfigKeys.MATRIX_GRIDS);
 		// check if is valid value
@@ -706,17 +712,17 @@ protected int loadGrids(){
 		}
 		return DIVISIONS[1];
 	}
-	
+
 	protected void setGrids(int grids){
 		this.grids = grids;
 		this.disposeBuffer();
 		this.redrawLocked();
 	}
-	
+
 	public int getGrids(){
 		return this.grids;
 	}
-	
+
 	protected TGMeasure getMeasure(){
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			TGMeasure measure = TuxGuitar.instance().getEditorCache().getPlayMeasure();
@@ -726,21 +732,21 @@ protected TGMeasure getMeasure(){
 		}
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure();
 	}
-	
+
 	protected Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	protected void resetPlayed(){
 		this.playedBeat = null;
 		this.playedMeasure = -1;
 		this.playedTrack = -1;
 	}
-	
+
 	public void redrawLocked(){
 		if(!TuxGuitar.instance().isLocked()){
 			TuxGuitar.instance().lock();
@@ -748,22 +754,22 @@ public void redrawLocked(){
 			TuxGuitar.instance().unlock();
 		}
 	}
-	
+
 	public void redraw(){
 		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
 			//TuxGuitar.instance().lock();
-			
+
 			this.editor.redraw();
 			this.loadDurationImage(false);
-			
+
 			//TuxGuitar.instance().unlock();
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!isDisposed() && !TuxGuitar.instance().isLocked() && TuxGuitar.instance().getPlayer().isRunning()){
 			//TuxGuitar.instance().lock();
-			
+
 			TGMeasure measure = TuxGuitar.instance().getEditorCache().getPlayMeasure();
 			TGBeat beat = TuxGuitar.instance().getEditorCache().getPlayBeat();
 			if(measure != null && beat != null){
@@ -791,13 +797,13 @@ public void redrawPlayingMode(){
 			//TuxGuitar.instance().unlock();
 		}
 	}
-	
+
 	protected void configure(){
 		this.config.configure(this.dialog);
 		this.disposeBuffer();
 		this.redrawLocked();
 	}
-	
+
 	private void layout(){
 		if( !isDisposed() ){
 			this.toolbar.layout();
@@ -805,7 +811,8 @@ private void layout(){
 			this.composite.layout(true,true);
 		}
 	}
-	
+
+	@Override
 	public void loadIcons(){
 		if( !isDisposed() ){
 			this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
@@ -815,7 +822,8 @@ public void loadIcons(){
 			this.redraw();
 		}
 	}
-	
+
+	@Override
 	public void loadProperties() {
 		if( !isDisposed() ){
 			this.dialog.setText(TuxGuitar.getProperty("matrix.editor"));
@@ -826,20 +834,20 @@ public void loadProperties() {
 			this.redraw();
 		}
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			this.dialog.dispose();
 		}
 	}
-	
+
 	protected void disposeBuffer(){
 		if(this.buffer != null && !this.buffer.isDisposed()){
 			this.buffer.dispose();
 			this.buffer = null;
 		}
 	}
-	
+
 	protected void dispose(Resource[] resources){
 		if(resources != null){
 			for(int i = 0; i < resources.length; i ++){
@@ -847,32 +855,32 @@ protected void dispose(Resource[] resources){
 			}
 		}
 	}
-	
+
 	protected void dispose(Resource resource){
 		if(resource != null){
 			resource.dispose();
 		}
 	}
-	
+
 	protected void disposeAll(){
 		this.disposeBuffer();
 		this.disposeSelectionBuffer();
 		this.config.dispose();
 	}
-	
+
 	protected Composite getEditor(){
 		return this.editor;
 	}
-	
+
 	protected class BufferDisposer{
 		private int numerator;
 		private int denominator;
 		private int track;
 		private boolean percussion;
-		
+
 		private int width;
 		private int height;
-		
+
 		public void update(int width, int height){
 			TGMeasure measure = getMeasure();
 			int track = measure.getTrack().getNumber();
@@ -890,19 +898,21 @@ public void update(int width, int height){
 			this.height = height;
 		}
 	}
-	
+
 	protected class DisposeListenerImpl implements DisposeListener{
+		@Override
 		public void widgetDisposed(DisposeEvent e) {
 			disposeAll();
 		}
 	}
-	
+
 	protected class MatrixListener implements PaintListener,MouseListener,MouseMoveListener,MouseTrackListener {
-		
+
 		public MatrixListener(){
 			super();
 		}
-		
+
+		@Override
 		public void paintControl(PaintEvent e) {
 			if(!TuxGuitar.instance().isLocked()){
 				TuxGuitar.instance().lock();
@@ -911,7 +921,8 @@ public void paintControl(PaintEvent e) {
 				TuxGuitar.instance().unlock();
 			}
 		}
-		
+
+		@Override
 		public void mouseUp(MouseEvent e) {
 			getEditor().setFocus();
 			if(e.button == 1){
@@ -922,38 +933,42 @@ public void mouseUp(MouseEvent e) {
 				}
 			}
 		}
-		
+
+		@Override
 		public void mouseMove(MouseEvent e) {
 			if(!TuxGuitar.instance().isLocked() && !ActionLock.isLocked()){
 				updateSelection(e.y);
 			}
 		}
-		
+
+		@Override
 		public void mouseExit(MouseEvent e) {
 			if(!TuxGuitar.instance().isLocked() && !ActionLock.isLocked()){
 				updateSelection(-1);
 			}
 		}
-		
+
+		@Override
 		public void mouseEnter(MouseEvent e) {
 			if(!TuxGuitar.instance().isLocked() && !ActionLock.isLocked()){
 				redrawLocked();
 			}
 		}
-		
+
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
-			// TODO Auto-generated method stub
 		}
-		
+
+		@Override
 		public void mouseDown(MouseEvent e) {
-			// TODO Auto-generated method stub
 		}
-		
+
+		@Override
 		public void mouseHover(MouseEvent e) {
-			// TODO Auto-generated method stub
 		}
 	}
-	
+
+	@Override
 	public void doRedraw(int type) {
 		if( type == TGRedrawListener.NORMAL ){
 			this.redraw();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/piano/Piano.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/piano/Piano.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/piano/Piano.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/piano/Piano.java
index 66d03a98..f7744fb5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/piano/Piano.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/piano/Piano.java
@@ -43,7 +43,7 @@
 import org.herac.tuxguitar.song.models.TGVoice;
 
 public class Piano extends Composite{
-	
+
 	private static final boolean TYPE_NOTES[] = new boolean[]{true,false,true,false,true,true,false,true,false,true,false,true};
 	private static final int NATURAL_NOTES = 7;
 	private static final int MAX_OCTAVES = 8;
@@ -51,11 +51,11 @@ public class Piano extends Composite{
 	private static final int SHARP_WIDTH = 8;
 	private static final int NATURAL_HEIGHT = 60;
 	private static final int SHARP_HEIGHT = 40;
-	
+
 	private int duration;
 	private boolean changes;
-	private PianoListener listener;
-	private PianoConfig config;
+	private final PianoListener listener;
+	private final PianoConfig config;
 	private Composite pianoComposite;
 	private Composite toolComposite;
 	private Label durationLabel;
@@ -65,7 +65,7 @@ public class Piano extends Composite{
 	protected TGBeat beat;
 	protected TGBeat externalBeat;
 	protected TGImage image;
-	
+
 	public Piano(Composite parent, int style) {
 		super(parent, style);
 		this.setLayout(new GridLayout());
@@ -77,59 +77,59 @@ public Piano(Composite parent, int style) {
 		this.makePiano();
 		this.loadIcons();
 		this.loadProperties();
-		
+
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.toolComposite);
 		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.pianoComposite);
 	}
-	
+
 	private void initToolBar() {
 		GridLayout layout = new GridLayout();
 		layout.makeColumnsEqualWidth = false;
 		layout.numColumns = 0;
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
-		
+
 		this.toolComposite = new Composite(this, SWT.NONE);
-		
+
 		// position
 		layout.numColumns ++;
 		Button goLeft = new Button(this.toolComposite, SWT.ARROW | SWT.LEFT);
 		goLeft.addSelectionListener(TuxGuitar.instance().getAction(GoLeftAction.NAME));
-		
+
 		layout.numColumns ++;
 		Button goRight = new Button(this.toolComposite, SWT.ARROW | SWT.RIGHT);
 		goRight.addSelectionListener(TuxGuitar.instance().getAction(GoRightAction.NAME));
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolComposite);
-		
+
 		// duration
 		layout.numColumns ++;
 		Button decrement = new Button(this.toolComposite, SWT.ARROW | SWT.MIN);
 		decrement.addSelectionListener(TuxGuitar.instance().getAction(DecrementDurationAction.NAME));
-		
+
 		layout.numColumns ++;
 		this.durationLabel = new Label(this.toolComposite, SWT.BORDER);
-		
+
 		layout.numColumns ++;
 		Button increment = new Button(this.toolComposite, SWT.ARROW | SWT.MAX);
 		increment.addSelectionListener(TuxGuitar.instance().getAction(IncrementDurationAction.NAME));
-		
+
 		// separator
 		layout.numColumns ++;
 		makeToolSeparator(this.toolComposite);
-		
+
 		// scale
 		layout.numColumns ++;
 		this.scale = new Button(this.toolComposite, SWT.PUSH);
 		this.scale.setText(TuxGuitar.getProperty("scale"));
 		this.scale.addSelectionListener(TuxGuitar.instance().getAction(ScaleAction.NAME));
-		
+
 		// scale name
 		layout.numColumns ++;
 		this.scaleName = new Label(this.toolComposite, SWT.LEFT);
-		
+
 		// settings
 		layout.numColumns ++;
 		this.settings = new Button(this.toolComposite, SWT.PUSH);
@@ -137,20 +137,21 @@ private void initToolBar() {
 		this.settings.setToolTipText(TuxGuitar.getProperty("settings"));
 		this.settings.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
 		this.settings.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				configure();
 			}
 		});
-		
+
 		this.toolComposite.setLayout(layout);
 		this.toolComposite.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
 	}
-	
+
 	private void makeToolSeparator(Composite parent){
 		Label separator = new Label(parent,SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(20,20));
 	}
-	
+
 	private void loadDurationImage(boolean force) {
 		int duration = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getDuration().getValue();
 		if(force || this.duration != duration){
@@ -158,7 +159,7 @@ private void loadDurationImage(boolean force) {
 			this.durationLabel.setImage(TuxGuitar.instance().getIconManager().getDuration(this.duration));
 		}
 	}
-	
+
 	private void loadScaleName() {
 		int scaleKey = TuxGuitar.instance().getScaleManager().getSelectionKey();
 		int scaleIndex = TuxGuitar.instance().getScaleManager().getSelectionIndex();
@@ -167,7 +168,7 @@ private void loadScaleName() {
 		this.scaleName.setText( ( key != null && name != null ) ? ( key + " - " + name ) : "" );
 		this.scaleName.pack();
 	}
-	
+
 	private void makePiano(){
 		this.image = makePianoImage();
 		this.pianoComposite = new Composite(this,SWT.BORDER | SWT.DOUBLE_BUFFERED);
@@ -177,7 +178,7 @@ private void makePiano(){
 		this.pianoComposite.addMouseListener(this.listener);
 		this.pianoComposite.setFocus();
 	}
-	
+
 	/**
 	 * Crea la imagen del piano
 	 *
@@ -186,7 +187,7 @@ private void makePiano(){
 	private TGImage makePianoImage(){
 		TGImage image = new TGImageImpl(getDisplay(),(NATURAL_WIDTH * (MAX_OCTAVES * NATURAL_NOTES) ),NATURAL_HEIGHT);
 		TGPainter painter = image.createPainter();
-		
+
 		int x = 0;
 		int y = 0;
 		painter.setBackground(new TGColorImpl(this.config.getColorNatural()));
@@ -194,7 +195,7 @@ private TGImage makePianoImage(){
 		painter.addRectangle(x,y,(NATURAL_WIDTH * (MAX_OCTAVES * NATURAL_NOTES) ),NATURAL_HEIGHT);
 		painter.closePath();
 		for(int i = 0; i < (MAX_OCTAVES * TYPE_NOTES.length); i ++){
-			
+
 			if(TYPE_NOTES[i % TYPE_NOTES.length]){
 				painter.setForeground(new TGColorImpl(this.config.getColorNotNatural()));
 				painter.initPath();
@@ -211,14 +212,14 @@ private TGImage makePianoImage(){
 			}
 		}
 		paintScale(painter);
-		
+
 		painter.dispose();
 		return image;
 	}
-	
+
 	/**
 	 * Pinta la nota a partir del indice
-	 * 	 
+	 *
 	 * @param gc
 	 * @param value
 	 */
@@ -226,10 +227,10 @@ private void paintScale(TGPainter painter){
 		painter.setBackground(new TGColorImpl(this.config.getColorScale()));
 		painter.setForeground(new TGColorImpl(this.config.getColorScale()));
 		int posX = 0;
-		
+
 		for(int i = 0; i < (MAX_OCTAVES * TYPE_NOTES.length); i ++){
 			int width = 0;
-			
+
 			if(TYPE_NOTES[i % TYPE_NOTES.length]){
 				width = NATURAL_WIDTH;
 				if(i > 0 && !TYPE_NOTES[(i - 1)  % TYPE_NOTES.length]){
@@ -241,14 +242,14 @@ private void paintScale(TGPainter painter){
 			}else{
 				width = SHARP_WIDTH;
 			}
-			
+
 			if(TuxGuitar.instance().getScaleManager().getScale().getNote(i)){
 				if(TYPE_NOTES[i % TYPE_NOTES.length] ){
 					int x = posX;
 					if(i > 0 && !TYPE_NOTES[(i - 1)  % TYPE_NOTES.length]){
 						x -= ((SHARP_WIDTH / 2));
 					}
-					
+
 					int size = SHARP_WIDTH;
 					painter.initPath(TGPainter.PATH_FILL);
 					painter.setAntialias(false);
@@ -261,14 +262,14 @@ private void paintScale(TGPainter painter){
 					painter.closePath();
 				}
 			}
-			
+
 			posX += width;
 		}
 	}
-	
+
 	/**
 	 * Pinta la nota a partir del indice
-	 * 	 
+	 *
 	 * @param gc
 	 * @param value
 	 */
@@ -276,10 +277,10 @@ protected void paintNote(TGPainterImpl painter,int value){
 		painter.setBackground(new TGColorImpl(this.config.getColorNote()));
 		int posX = 0;
 		int y = 0;
-		
+
 		for(int i = 0; i < (MAX_OCTAVES * TYPE_NOTES.length); i ++){
 			int width = 0;
-			
+
 			if(TYPE_NOTES[i % TYPE_NOTES.length]){
 				width = NATURAL_WIDTH;
 				if(i > 0 && !TYPE_NOTES[(i - 1)  % TYPE_NOTES.length]){
@@ -291,13 +292,13 @@ protected void paintNote(TGPainterImpl painter,int value){
 			}else{
 				width = SHARP_WIDTH;
 			}
-			
+
 			if(i == value){
 				if(TYPE_NOTES[i % TYPE_NOTES.length]){
 					painter.initPath(TGPainter.PATH_FILL);
 					painter.setAntialias(false);
 					painter.addRectangle(posX + 1,y + 1,width - 1,SHARP_HEIGHT);
-					
+
 					int x = posX;
 					if(i > 0 && !TYPE_NOTES[(i - 1)  % TYPE_NOTES.length]){
 						x -= ((SHARP_WIDTH / 2));
@@ -310,25 +311,25 @@ protected void paintNote(TGPainterImpl painter,int value){
 					painter.addRectangle(posX + 1,y + 1,width - 1,SHARP_HEIGHT - 1);
 					painter.closePath();
 				}
-				
+
 			}
-			
+
 			posX += width;
 		}
 	}
-	
+
 	/**
 	 * Retorna el indice de la nota seleccionada
-	 * 
+	 *
 	 * @param point
 	 * @return
 	 */
 	private int getSelection(Point point){
 		int posX = 0;
-		
+
 		for(int i = 0; i < (MAX_OCTAVES * TYPE_NOTES.length); i ++){
 			int width = 0;
-			
+
 			if(TYPE_NOTES[i % TYPE_NOTES.length]){
 				width = NATURAL_WIDTH;
 				if(i > 0 && !TYPE_NOTES[(i - 1)  % TYPE_NOTES.length]){
@@ -340,42 +341,42 @@ private int getSelection(Point point){
 			}else{
 				width = SHARP_WIDTH;
 			}
-			
+
 			if(point.x >= posX && point.x < (posX + width)  ){
 				return i;
 			}
-			
+
 			posX += width;
 		}
 		return -1;
 	}
-	
+
 	protected void hit(int x, int y) {
 		int value = getSelection(new Point(x,y));
-		
+
 		if (!removeNote(value)) {
 			addNote(value);
 		}
 	}
-	
+
 	private boolean removeNote(int value) {
 		if(this.beat != null){
 			for(int v = 0; v < this.beat.countVoices(); v ++){
 				TGVoice voice = this.beat.getVoice( v );
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while (it.hasNext()) {
-					TGNote note = (TGNote) it.next();
+					TGNote note = it.next();
 					if (getRealNoteValue(note) == value) {
 						//comienza el undoable
 						UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-						
+
 						TGSongManager manager = TuxGuitar.instance().getSongManager();
 						manager.getMeasureManager().removeNote(note);
-						
+
 						//termia el undoable
 						TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 						TuxGuitar.instance().getFileHistory().setUnsavedFile();
-						
+
 						return true;
 					}
 				}
@@ -383,20 +384,20 @@ private boolean removeNote(int value) {
 		}
 		return false;
 	}
-	
+
 	private boolean addNote(int value) {
 		Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
-		
-		List strings = caret.getTrack().getStrings();
+
+		List<TGString> strings = caret.getTrack().getStrings();
 		for(int i = 0;i < strings.size();i ++){
-			TGString string = (TGString)strings.get(i);
+			TGString string = strings.get(i);
 			if(value >= string.getValue()){
 				boolean emptyString = true;
-				
+
 				if(this.beat != null){
 					for(int v = 0; v < this.beat.countVoices(); v ++){
 						TGVoice voice = this.beat.getVoice( v );
-						Iterator it = voice.getNotes().iterator();
+						Iterator<TGNote> it = voice.getNotes().iterator();
 						while (it.hasNext()) {
 							TGNoteImpl note = (TGNoteImpl) it.next();
 							if (note.getString() == string.getNumber()) {
@@ -408,40 +409,40 @@ private boolean addNote(int value) {
 				}
 				if(emptyString){
 					TGSongManager manager = TuxGuitar.instance().getSongManager();
-					
+
 					//comienza el undoable
 					UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-					
+
 					TGNote note = manager.getFactory().newNote();
 					note.setValue((value - string.getValue()));
 					note.setVelocity(caret.getVelocity());
 					note.setString(string.getNumber());
-					
+
 					TGDuration duration = manager.getFactory().newDuration();
 					caret.getDuration().copy(duration);
-					
+
 					manager.getMeasureManager().addNote(caret.getMeasure(),caret.getPosition(),note,duration,caret.getVoice());
-					
+
 					//termia el undoable
 					TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 					TuxGuitar.instance().getFileHistory().setUnsavedFile();
-					
+
 					//reprodusco las notas en el pulso
 					TuxGuitar.instance().playBeat(caret.getSelectedBeat());
-					
+
 					return true;
 				}
 			}
 		}
 		return false;
 	}
-	
+
 	protected void afterAction() {
 		TGMeasureHeader measure = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure().getHeader();
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	protected int getRealNoteValue(TGNote note){
 		TGVoice voice = note.getVoice();
 		if( voice != null ){
@@ -464,23 +465,23 @@ protected int getRealNoteValue(TGNote note){
 		}
 		return 0;
 	}
-	
+
 	public boolean hasChanges(){
 		return this.changes;
 	}
-	
+
 	public void setChanges(boolean changes){
 		this.changes = changes;
 	}
-	
+
 	public void setExternalBeat(TGBeat externalBeat){
 		this.externalBeat = externalBeat;
 	}
-	
+
 	public TGBeat getExternalBeat(){
 		return this.externalBeat;
 	}
-	
+
 	protected void updateEditor(){
 		if(isVisible()){
 			if(hasChanges()){
@@ -496,7 +497,8 @@ protected void updateEditor(){
 			}
 		}
 	}
-	
+
+	@Override
 	public void redraw() {
 		if(!super.isDisposed() && !TuxGuitar.instance().isLocked()){
 			super.redraw();
@@ -504,69 +506,71 @@ public void redraw() {
 			this.loadDurationImage(false);
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!super.isDisposed() && !TuxGuitar.instance().isLocked()){
 			this.pianoComposite.redraw();
 		}
 	}
-	
+
+	@Override
 	public void dispose(){
 		super.dispose();
 		this.image.dispose();
 		this.config.dispose();
 	}
-	
+
 	public void loadProperties(){
 		this.scale.setText(TuxGuitar.getProperty("scale"));
 		this.settings.setToolTipText(TuxGuitar.getProperty("settings"));
 		this.loadScaleName();
 		this.layout(true,true);
 	}
-	
+
 	public void loadIcons(){
 		this.getShell().setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		this.settings.setImage(TuxGuitar.instance().getIconManager().getSettings());
 		this.loadDurationImage(true);
 		this.layout(true,true);
 	}
-	
+
 	public void loadScale(){
 		this.loadScaleName();
 		this.setChanges(true);
 	}
-	
+
 	protected void configure(){
 		this.config.configure(getShell());
 		this.setChanges(true);
 		this.redraw();
 	}
-	
+
 	public Composite getPianoComposite() {
 		return this.pianoComposite;
 	}
-	
+
 	private class PianoListener implements PaintListener,MouseListener {
-		
+
 		public PianoListener(){
 			super();
 		}
-		
+
+		@Override
 		public void paintControl(PaintEvent e) {
 			if(!TuxGuitar.instance().isLocked()){
 				TuxGuitar.instance().lock();
 				updateEditor();
-				
+
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				painter.drawImage(Piano.this.image,0,0);
-				
+
 				//pinto notas
 				if(Piano.this.beat != null){
 					for(int v = 0; v < Piano.this.beat.countVoices(); v ++){
 						TGVoice voice = Piano.this.beat.getVoice( v );
-						Iterator it = voice.getNotes().iterator();
+						Iterator<TGNote> it = voice.getNotes().iterator();
 						while(it.hasNext()){
-							TGNote note = (TGNote)it.next();
+							TGNote note = it.next();
 							paintNote(painter, getRealNoteValue( note ) );
 						}
 					}
@@ -574,7 +578,8 @@ public void paintControl(PaintEvent e) {
 				TuxGuitar.instance().unlock();
 			}
 		}
-		
+
+		@Override
 		public void mouseUp(MouseEvent e) {
 			getPianoComposite().setFocus();
 			if(e.button == 1){
@@ -592,11 +597,13 @@ public void mouseUp(MouseEvent e) {
 				TuxGuitar.instance().getAction(GoRightAction.NAME).process(new ActionData());
 			}
 		}
-		
+
+		@Override
 		public void mouseDoubleClick(MouseEvent e) {
 			//Not implemented
 		}
-		
+
+		@Override
 		public void mouseDown(MouseEvent e) {
 			//Not implemented
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/piano/PianoConfig.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/piano/PianoConfig.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/piano/PianoConfig.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/piano/PianoConfig.java
index 9371b331..b28afb23 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/piano/PianoConfig.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/piano/PianoConfig.java
@@ -24,36 +24,36 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class PianoConfig {
-	
+
 	private static final int MINIMUM_CONTROL_WIDTH = 180;
 	private static final int MINIMUM_BUTTON_WIDTH = 80;
 	private static final int MINIMUM_BUTTON_HEIGHT = 25;
-	
+
 	private Color colorNatural;
 	private Color colorNotNatural;
 	private Color colorNote;
 	private Color colorScale;
-	
+
 	public PianoConfig(){
 		super();
 	}
-	
+
 	public Color getColorNatural() {
 		return this.colorNatural;
 	}
-	
+
 	public Color getColorNotNatural() {
 		return this.colorNotNatural;
 	}
-	
+
 	public Color getColorNote() {
 		return this.colorNote;
 	}
-	
+
 	public Color getColorScale() {
 		return this.colorScale;
 	}
-	
+
 	public void load(){
 		Display display = TuxGuitar.instance().getDisplay();
 		TGConfigManager config = TuxGuitar.instance().getConfig();
@@ -62,7 +62,7 @@ public void load(){
 		this.colorNote = new Color(display,config.getRGBConfigValue(TGConfigKeys.PIANO_COLOR_NOTE));
 		this.colorScale = new Color(display,config.getRGBConfigValue(TGConfigKeys.PIANO_COLOR_SCALE));
 	}
-	
+
 	public void defaults(){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
 		Properties defaults = config.getDefaults();
@@ -71,7 +71,7 @@ public void defaults(){
 		config.setProperty(TGConfigKeys.PIANO_COLOR_NOTE,defaults.getProperty(TGConfigKeys.PIANO_COLOR_NOTE));
 		config.setProperty(TGConfigKeys.PIANO_COLOR_SCALE,defaults.getProperty(TGConfigKeys.PIANO_COLOR_SCALE));
 	}
-	
+
 	public void save(RGB rgbNatural,RGB rgbNotNatural,RGB rgbNote,RGB rgbScale){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
 		config.setProperty(TGConfigKeys.PIANO_COLOR_KEY_NATURAL,rgbNatural);
@@ -79,90 +79,93 @@ public void save(RGB rgbNatural,RGB rgbNotNatural,RGB rgbNote,RGB rgbScale){
 		config.setProperty(TGConfigKeys.PIANO_COLOR_NOTE,rgbNote);
 		config.setProperty(TGConfigKeys.PIANO_COLOR_SCALE,rgbScale);
 	}
-	
+
 	public void dispose(){
 		this.colorNatural.dispose();
 		this.colorNotNatural.dispose();
 		this.colorNote.dispose();
 		this.colorScale.dispose();
 	}
-	
+
 	public void configure(Shell shell) {
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("piano.settings"));
-		
+
 		// ----------------------------------------------------------------------
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(2, false));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("piano.settings"));
-		
+
 		// Color
 		final RGB rgbNatural = getColorChooser(group,TuxGuitar.getProperty("piano.natural-key-color"), this.colorNatural.getRGB());
 		final RGB rgbNotNatural = getColorChooser(group,TuxGuitar.getProperty("piano.not-natural-key-color"), this.colorNotNatural.getRGB());
 		final RGB rgbNote = getColorChooser(group,TuxGuitar.getProperty("piano.note-color"), this.colorNote.getRGB());
 		final RGB rgbScale = getColorChooser(group,TuxGuitar.getProperty("piano.scale-note-color"), this.colorScale.getRGB());
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(3, false));
 		buttons.setLayoutData(new GridData(SWT.END, SWT.FILL, true, true));
-		
+
 		final Button buttonDefaults = new Button(buttons, SWT.PUSH);
 		buttonDefaults.setText(TuxGuitar.getProperty("defaults"));
 		buttonDefaults.setLayoutData(getButtonData());
 		buttonDefaults.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 				defaults();
 				applyChanges();
 			}
 		});
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
-				
+
 				save(rgbNatural, rgbNotNatural,rgbNote, rgbScale);
 				applyChanges();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected void applyChanges(){
 		this.dispose();
 		this.load();
 	}
-	
+
 	private RGB getColorChooser(final Composite parent,String title,RGB rgb){
 		Label label = new Label(parent, SWT.NULL);
 		label.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
 		label.setText(title);
-		
+
 		ButtonColor button = new ButtonColor(parent, SWT.PUSH, TuxGuitar.getProperty("choose"));
 		button.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		button.loadColor(rgb);
-		
+
 		return button.getValue();
 	}
-	
+
 	private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		GridData data = new GridData();
 		data.minimumWidth = minimumWidth;
@@ -172,50 +175,51 @@ private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		data.grabExcessVerticalSpace = true;
 		return data;
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
 		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
 		return data;
 	}
-	
+
 	private class ButtonColor {
 		protected Button button;
 		protected Color color;
 		protected RGB value;
-		
+
 		public ButtonColor(Composite parent, int style, String text){
 			this.value = new RGB(0,0,0);
-			this.button = new Button(parent, style);			
+			this.button = new Button(parent, style);
 			this.button.setText(text);
 			this.addListeners();
 		}
-		
+
 		protected void setLayoutData(Object layoutData){
 			this.button.setLayoutData(layoutData);
 		}
-		
+
 		protected void loadColor(RGB rgb){
 			this.value.red = rgb.red;
 			this.value.green = rgb.green;
 			this.value.blue = rgb.blue;
-			
+
 			Color color = new Color(this.button.getDisplay(), this.value);
 			this.button.setForeground(color);
 			this.disposeColor();
 			this.color = color;
 		}
-		
+
 		protected void disposeColor(){
 			if(this.color != null && !this.color.isDisposed()){
 				this.color.dispose();
 				this.color = null;
 			}
 		}
-		
+
 		private void addListeners(){
 			this.button.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent event) {
 					ColorDialog dlg = new ColorDialog(ButtonColor.this.button.getShell());
 					dlg.setRGB(ButtonColor.this.value);
@@ -227,12 +231,13 @@ public void widgetSelected(SelectionEvent event) {
 				}
 			});
 			this.button.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					ButtonColor.this.disposeColor();
 				}
 			});
 		}
-		
+
 		protected RGB getValue(){
 			return this.value;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/Caret.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/Caret.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/Caret.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/Caret.java
index 0fc3c941..2ce658dd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/Caret.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/Caret.java
@@ -1,8 +1,5 @@
 /*
  * Created on 30-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.tab;
 
@@ -31,11 +28,9 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class Caret {
-	private Tablature tablature;
+	private final Tablature tablature;
 	private TGTrackImpl selectedTrack;
 	private TGMeasureImpl selectedMeasure;
 	private TGBeat selectedBeat;
@@ -47,10 +42,10 @@ public class Caret {
 	private int velocity;
 	private boolean restBeat;
 	private boolean changes;
-	
+
 	private TGColor color1;
 	private TGColor color2;
-	
+
 	public Caret(Tablature tablature) {
 		this.tablature = tablature;
 		this.selectedDuration = getSongManager().getFactory().newDuration();
@@ -58,23 +53,23 @@ public Caret(Tablature tablature) {
 		this.velocity = TGVelocities.DEFAULT;
 		this.changes = false;
 	}
-	
+
 	public synchronized void update(){
 		int trackNumber = (this.selectedTrack != null)?this.selectedTrack.getNumber():1;
 		update(trackNumber,this.position,this.string);
 	}
-	
+
 	public synchronized void update(int trackNumber){
 		update(trackNumber,this.position,this.string);
 	}
-	
+
 	public synchronized void update(int trackNumber,long position,int string){
 		update(trackNumber, position, string,getVelocity());
 	}
-	
+
 	public synchronized void update(int trackNumber,long position,int string,int velocity) {
 		long realPosition = ((TuxGuitar.instance().getPlayer().isRunning())?MidiTickUtil.getStart(TuxGuitar.instance().getPlayer().getTickPosition()):position);
-		TGTrackImpl track = findTrack(trackNumber); 
+		TGTrackImpl track = findTrack(trackNumber);
 		TGMeasureImpl measure = findMeasure(realPosition,track);
 		TGBeat beat = findBeat(realPosition,measure);
 		if(track != null && measure != null && beat != null){
@@ -82,7 +77,7 @@ public synchronized void update(int trackNumber,long position,int string,int vel
 		}
 		setVelocity(velocity);
 	}
-	
+
 	public void moveTo(TGTrackImpl selectedTrack, TGMeasureImpl selectedMeasure, TGBeat selectedBeat,int string) {
 		this.selectedTrack = selectedTrack;
 		this.selectedMeasure = selectedMeasure;
@@ -96,7 +91,7 @@ public void moveTo(TGTrackImpl selectedTrack, TGMeasureImpl selectedMeasure, TGB
 		this.checkTransport();
 		this.setChanges(true);
 	}
-	
+
 	private TGTrackImpl findTrack(int number){
 		TGTrackImpl track = (TGTrackImpl)getSongManager().getTrack(number);
 		if(track == null){
@@ -104,7 +99,7 @@ private TGTrackImpl findTrack(int number){
 		}
 		return track;
 	}
-	
+
 	private TGMeasureImpl findMeasure(long position,TGTrackImpl track){
 		TGMeasureImpl measure = null;
 		if(track != null){
@@ -115,7 +110,7 @@ private TGMeasureImpl findMeasure(long position,TGTrackImpl track){
 		}
 		return measure;
 	}
-	
+
 	private TGBeat findBeat(long position,TGMeasureImpl measure){
 		TGBeat beat = null;
 		if(measure != null){
@@ -130,13 +125,13 @@ private TGBeat findBeat(long position,TGMeasureImpl measure){
 		}
 		return beat;
 	}
-	
+
 	public synchronized void goToTickPosition(){
 		long start = MidiTickUtil.getStart(TuxGuitar.instance().getPlayer().getTickPosition());
 		this.update(this.selectedTrack.getNumber(),start,this.string);
 		this.setChanges(true);
 	}
-	
+
 	public void paintCaret(TGLayout layout,TGPainter painter) {
 		if(!TuxGuitar.instance().getPlayer().isRunning()){
 			if (this.selectedMeasure != null && !this.selectedMeasure.isOutOfBounds() && this.selectedBeat instanceof TGBeatImpl) {
@@ -150,7 +145,7 @@ public void paintCaret(TGLayout layout,TGPainter painter) {
 					int width = 14;
 					int height = 14;
 					this.setPaintStyle(painter, expectedVoice);
-					
+
 					painter.initPath();
 					painter.setAntialias(false);
 					painter.addRectangle(x, y, width, height);
@@ -165,7 +160,7 @@ else if( (layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0){
 					float y1 = this.selectedMeasure.getPosY() + this.selectedMeasure.getTs().getPosition(TGTrackSpacing.POSITION_TOP) - line;
 					float y2 = this.selectedMeasure.getPosY() + this.selectedMeasure.getTs().getPosition(TGTrackSpacing.POSITION_BOTTOM);
 					this.setPaintStyle(painter, true);
-					
+
 					painter.initPath();
 					painter.moveTo(x1, y1);
 					painter.lineTo(x1 + ((x2 - x1) / 2f), y1 + (line / 2f));
@@ -178,14 +173,14 @@ else if( (layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0){
 			}
 		}
 	}
-	
+
 	public void setPaintStyle(TGPainter painter, boolean expectedVoice){
 		TGColor foreground = ( expectedVoice ? this.color1 : this.color2 );
 		if( foreground != null ){
 			painter.setForeground( foreground );
 		}
 	}
-	
+
 	public boolean moveRight() {
 		if (getSelectedBeat() != null) {
 			TGMeasureImpl measure = getMeasure();
@@ -209,7 +204,7 @@ public boolean moveRight() {
 		}
 		return true;
 	}
-	
+
 	public void moveLeft() {
 		if (getSelectedBeat() != null) {
 			TGMeasureImpl measure = getMeasure();
@@ -232,7 +227,7 @@ public void moveLeft() {
 			}
 		}
 	}
-	
+
 	/**
 	 * Luego de mover el Caret. cambia la duracion seleccionada por la del componente. solo si lo que resta del compas no esta vacio
 	 */
@@ -241,149 +236,149 @@ private void updateDuration() {
 			this.selectedBeat.getVoice(getVoice()).getDuration().copy(this.selectedDuration);
 		}
 	}
-	
+
 	public void moveUp() {
 		int stringCount = this.selectedTrack.stringCount() ;
 		int nextString = (( (this.string - 2 + stringCount) % stringCount) + 1);
 		setStringNumber(nextString);
 	}
-	
+
 	public void moveDown() {
 		int stringCount = this.selectedTrack.stringCount() ;
 		int nextString = ( (this.string  % stringCount) + 1);
 		setStringNumber(nextString);
 	}
-	
+
 	public void setStringNumber(int number){
 		this.string = number;
 		this.updateNote();
 	}
-	
+
 	public int getStringNumber(){
 		return this.string;
 	}
-	
+
 	public long getPosition() {
 		return this.position;
 	}
-	
+
 	public TGMeasureImpl getMeasure() {
 		return this.selectedMeasure;
 	}
-	
+
 	public TGTrackImpl getTrack() {
 		return this.selectedTrack;
 	}
-	
+
 	public TGDuration getDuration() {
 		return this.selectedDuration;
 	}
-	
+
 	public void setSelectedDuration(TGDuration selectedDuration) {
 		this.selectedDuration = selectedDuration;
 	}
-	
+
 	public TGString getSelectedString() {
-		List strings = this.selectedTrack.getStrings();
-		Iterator it = strings.iterator();
+		List<TGString> strings = this.selectedTrack.getStrings();
+		Iterator<TGString> it = strings.iterator();
 		while (it.hasNext()) {
-			TGString instrumentString = (TGString) it.next();
+			TGString instrumentString = it.next();
 			if (instrumentString.getNumber() == this.string) {
 				return instrumentString;
 			}
 		}
 		return null;
 	}
-	
+
 	public void changeDuration(TGDuration duration){
 		getSongManager().getMeasureManager().changeDuration(getMeasure(),getSelectedBeat(),duration,getVoice(), true);
 		setChanges(true);
 	}
-	
+
 	private void updatePosition(){
 		this.position = getSelectedBeat().getStart();
 	}
-	
+
 	private void updateString(){
 		if(this.string < 1 || this.string > getTrack().stringCount() ){
 			this.string = 1;
 		}
 	}
-	
+
 	private void checkTransport(){
 		TuxGuitar.instance().getTransport().gotoMeasure(getMeasure().getHeader());
 	}
-	
+
 	public boolean hasChanges() {
 		return this.changes;
 	}
-	
+
 	public void setChanges(boolean changes) {
 		this.changes = changes;
 	}
-	
+
 	public int getVelocity() {
 		return this.velocity;
 	}
-	
+
 	public void setVelocity(int velocity) {
 		this.velocity = velocity;
 	}
-	
+
 	private void updateNote(){
 		this.selectedNote = null;
-		
+
 		TGString string = getSelectedString();
 		if( string != null ){
 			this.selectedNote = getSongManager().getMeasureManager().getNote(getMeasure(),getPosition(),string.getNumber());
 		}
 	}
-	
+
 	public TGNote getSelectedNote(){
 		return this.selectedNote;
 	}
-	
+
 	private void updateBeat(){
 		this.restBeat = this.selectedBeat.isRestBeat();
 	}
-	
+
 	public TGBeatImpl getSelectedBeat(){
 		return (TGBeatImpl)this.selectedBeat;
 	}
-	
+
 	public TGSongManager getSongManager(){
 		return this.tablature.getSongManager();
 	}
-	
+
 	public int getVoice() {
 		return this.voice;
 	}
-	
+
 	public void setVoice(int voice) {
 		this.voice = voice;
 		this.update();
 	}
-	
+
 	public boolean isRestBeatSelected(){
 		return this.restBeat;
 	}
-	
+
 	public void setColor1(TGColorModel cm){
 		this.disposeResource( this.color1 );
 		this.color1 = this.tablature.getResourceFactory().createColor(cm);
 	}
-	
+
 	public void setColor2(TGColorModel cm){
 		this.disposeResource( this.color2 );
 		this.color2 = this.tablature.getResourceFactory().createColor(cm);
 	}
-	
+
 	public void disposeResource(TGResource resource){
 		if( resource != null && !resource.isDisposed() ){
 			resource.dispose();
 		}
 	}
-	
+
 	public void dispose(){
 		this.disposeResource( this.color1 );
 		this.disposeResource( this.color2 );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/Tablature.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/Tablature.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/Tablature.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/Tablature.java
index 097b45ce..f4c320db 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/Tablature.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/Tablature.java
@@ -1,8 +1,5 @@
 /*
  * Created on 29-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.editors.tab;
 
@@ -25,13 +22,13 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 import org.herac.tuxguitar.graphics.TGRectangle;
 import org.herac.tuxguitar.graphics.TGResourceFactory;
-import org.herac.tuxguitar.graphics.control.TGLayoutHorizontal;
-import org.herac.tuxguitar.graphics.control.TGLayoutVertical;
 import org.herac.tuxguitar.graphics.control.TGBeatImpl;
 import org.herac.tuxguitar.graphics.control.TGController;
+import org.herac.tuxguitar.graphics.control.TGLayout;
+import org.herac.tuxguitar.graphics.control.TGLayoutHorizontal;
 import org.herac.tuxguitar.graphics.control.TGLayoutStyles;
+import org.herac.tuxguitar.graphics.control.TGLayoutVertical;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
-import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.player.base.MidiPlayerMode;
 import org.herac.tuxguitar.song.managers.TGSongManager;
 import org.herac.tuxguitar.song.models.TGBeat;
@@ -40,14 +37,12 @@
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class Tablature extends Composite implements TGController {
-	
+
 	private static final int SCROLL_DELAY = 15;
 	private static final int SCROLL_INCREMENT = 50;
-	
+
 	private TGResourceFactory resourceFactory;
 	private TGSongManager songManager;
 	private Caret caret;
@@ -55,7 +50,7 @@ public class Tablature extends Composite implements TGController {
 	private int height;
 	private TGLayout viewLayout;
 	private EditorKit editorKit;
-	
+
 	private TGBeatImpl playedBeat;
 	private TGMeasureImpl playedMeasure;
 	private int scrollX;
@@ -63,22 +58,23 @@ public class Tablature extends Composite implements TGController {
 	private boolean resetScroll;
 	protected long lastVScrollTime;
 	protected long lastHScrollTime;
-	
+
 	private boolean painting;
-	
+
 	public Tablature(Composite parent,int style, TGSongManager songManager ) {
 		super(parent, style);
 		this.songManager = songManager;
 		this.caret = new Caret(this);
 		this.editorKit = new EditorKit(this);
 	}
-	
+
 	public void initGUI(){
 		this.addPaintListener(new TablaturePaintListener(this));
-		
+
 		final ScrollBar hBar = getHorizontalBar();
 		hBar.setIncrement(SCROLL_INCREMENT);
 		hBar.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				if(Tablature.this.lastHScrollTime + SCROLL_DELAY < System.currentTimeMillis()){
 					redraw();
@@ -86,10 +82,11 @@ public void handleEvent(Event e) {
 				}
 			}
 		});
-		
+
 		final ScrollBar vBar = getVerticalBar();
 		vBar.setIncrement(SCROLL_INCREMENT);
 		vBar.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				if(Tablature.this.lastVScrollTime + SCROLL_DELAY < System.currentTimeMillis()){
 					redraw();
@@ -97,53 +94,54 @@ public void handleEvent(Event e) {
 				}
 			}
 		});
-		
+
 		this.addControlListener(new ControlAdapter() {
+			@Override
 			public void controlResized(ControlEvent arg0) {
 				updateScroll();
 			}
 		});
 	}
-	
+
 	public void updateTablature(){
 		this.playedBeat = null;
 		this.playedMeasure = null;
 		getViewLayout().updateSong();
 		getCaret().update();
 	}
-	
+
 	public void updateMeasure(int number){
 		this.playedBeat = null;
 		this.playedMeasure = null;
 		getViewLayout().updateMeasureNumber(number);
 		getCaret().update();
 	}
-	
+
 	public void resetCaret(){
 		this.caret.update(1,TGDuration.QUARTER_TIME,1);
 	}
-	
+
 	public synchronized void paintTablature(TGPainter painter){
 		if(!TuxGuitar.instance().isLocked()){
 			TuxGuitar.instance().lock();
 			this.setPainting(true);
 			try{
 				this.checkScroll();
-				
+
 				TGRectangle area = createRectangle(getClientArea());
 				ScrollBar xScroll = getHorizontalBar();
 				ScrollBar yScroll = getVerticalBar();
 				this.scrollX = xScroll.getSelection();
 				this.scrollY = yScroll.getSelection();
-				
+
 				this.getViewLayout().paint(painter,area,-this.scrollX,-this.scrollY);
 				this.getCaret().paintCaret(this.getViewLayout(),painter);
-				
+
 				this.width = this.viewLayout.getWidth();
 				this.height = this.viewLayout.getHeight();
-				
+
 				this.updateScroll();
-				
+
 				if(TuxGuitar.instance().getPlayer().isRunning()){
 					redrawPlayingMode(painter,true);
 				}
@@ -153,7 +151,7 @@ else if(getCaret().hasChanges()){
 					// Mover el scroll puede necesitar redibujar
 					// por eso es importante desmarcar los cambios antes de hacer el moveScrollTo
 					getCaret().setChanges(false);
-					
+
 					moveScrollTo(getCaret().getMeasure(), xScroll, yScroll,area);
 				}
 			}catch(Throwable throwable){
@@ -163,11 +161,11 @@ else if(getCaret().hasChanges()){
 			TuxGuitar.instance().unlock();
 		}
 	}
-	
+
 	public void resetScroll(){
 		this.resetScroll = true;
 	}
-	
+
 	public void checkScroll(){
 		if(this.resetScroll){
 			getHorizontalBar().setSelection(0);
@@ -175,7 +173,7 @@ public void checkScroll(){
 			this.resetScroll = false;
 		}
 	}
-	
+
 	public void updateScroll(){
 		Rectangle bounds = getBounds();
 		Rectangle client = getClientArea();
@@ -186,11 +184,11 @@ public void updateScroll(){
 		hBar.setThumb(Math.min(bounds.width, client.width));
 		vBar.setThumb(Math.min(bounds.height, client.height));
 	}
-	
+
 	public boolean moveScrollTo(TGMeasureImpl measure){
 		return moveScrollTo(measure,getHorizontalBar(),getVerticalBar(), createRectangle(getClientArea()));
 	}
-	
+
 	public boolean moveScrollTo(TGMeasureImpl measure,ScrollBar xScroll,ScrollBar yScroll,TGRectangle area){
 		boolean success = false;
 		if(measure != null && measure.getTs() != null){
@@ -201,33 +199,34 @@ public boolean moveScrollTo(TGMeasureImpl measure,ScrollBar xScroll,ScrollBar yS
 			int marginWidth = getViewLayout().getFirstMeasureSpacing();
 			int marginHeight = getViewLayout().getFirstTrackSpacing();
 			boolean forceRedraw = false;
-			
+
 			//Solo se ajusta si es necesario
 			//si el largo del compas es mayor al de la pantalla. nunca se puede ajustar a la medida.
 			if( mX < 0 || ( (mX + mWidth ) > area.getWidth() && (area.getWidth() >= mWidth + marginWidth || mX > marginWidth) ) ){
 				xScroll.setSelection((this.scrollX + mX) - marginWidth );
 				success = true;
 			}
-			
+
 			//Solo se ajusta si es necesario
 			//si el alto del compas es mayor al de la pantalla. nunca se puede ajustar a la medida.
 			if( mY < 0 || ( (mY + mHeight ) > area.getHeight() && (area.getHeight() >= mHeight + marginHeight || mY > marginHeight) ) ){
 				yScroll.setSelection( (this.scrollY + mY)  - marginHeight );
 				success = true;
 			}
-			
+
 			if(!success){
 				// Si la seleccion "real" del scroll es distinta a la anterior, se fuerza el redraw
 				forceRedraw = (this.scrollX != xScroll.getSelection() || this.scrollY != yScroll.getSelection());
 			}
-			
+
 			if(forceRedraw || success){
 				redraw();
 			}
 		}
 		return success;
 	}
-	
+
+	@Override
 	public void redraw(){
 		if(!super.isDisposed() && !TuxGuitar.instance().isLocked()){
 			this.playedBeat = null;
@@ -237,24 +236,24 @@ public void redraw(){
 			super.redraw();
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!super.isDisposed() && !isPainting() && !TuxGuitar.instance().isLocked()){
 			//TuxGuitar.instance().lock();
 			if(TuxGuitar.instance().getPlayer().isRunning()){
 				this.editorKit.tryBack();
 				this.setPainting(true);
-				
+
 				TGPainter painter = new TGPainterImpl(new GC(this));
 				redrawPlayingMode(painter,false);
 				painter.dispose();
-				
+
 				this.setPainting(false);
 			}
 			//TuxGuitar.instance().unlock();
 		}
 	}
-	
+
 	private void redrawPlayingMode(TGPainter painter,boolean force){
 		if(!super.isDisposed() && !TuxGuitar.instance().isLocked()){
 			try{
@@ -278,31 +277,32 @@ private void redrawPlayingMode(TGPainter painter,boolean force){
 			}
 		}
 	}
-	
+
 	public boolean isPainting() {
 		return this.painting;
 	}
-	
+
 	public void setPainting(boolean painting) {
 		this.painting = painting;
 	}
-	
+
 	public Caret getCaret(){
 		return this.caret;
 	}
-	
+
 	public EditorKit getEditorKit() {
 		return this.editorKit;
 	}
-	
+
+	@Override
 	public TGSongManager getSongManager() {
 		return this.songManager;
 	}
-	
+
 	public TGLayout getViewLayout(){
 		return this.viewLayout;
 	}
-	
+
 	public void setViewLayout(TGLayout viewLayout){
 		if(getViewLayout() != null){
 			getViewLayout().disposeLayout();
@@ -316,24 +316,24 @@ public void setViewLayout(TGLayout viewLayout){
 		}
 		this.reloadStyles();
 	}
-	
+
 	public TGRectangle createRectangle( Rectangle rectangle ){
 		return new TGRectangle(rectangle.x,rectangle.y,rectangle.width,rectangle.height);
 	}
-	
+
 	public void reloadStyles(){
 		if(this.getViewLayout() != null){
 			this.getViewLayout().loadStyles(1.0f);
 			this.setBackground( ((TGColorImpl)getViewLayout().getResources().getBackgroundColor()).getHandle() );
 		}
 	}
-	
+
 	public void reloadViewLayout(){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
-		
+
 		this.loadViewLayout(config.getIntConfigValue(TGConfigKeys.LAYOUT_STYLE), config.getIntConfigValue(TGConfigKeys.LAYOUT_MODE));
 	}
-	
+
 	private void loadViewLayout( int style, int mode ){
 		switch(mode){
 			case TGLayout.MODE_VERTICAL:
@@ -349,48 +349,56 @@ private void loadViewLayout( int style, int mode ){
 			break;
 		}
 	}
-	
+
+	@Override
 	public void dispose(){
 		super.dispose();
 		this.getCaret().dispose();
 		this.getViewLayout().disposeLayout();
 	}
-	
+
+	@Override
 	public TGResourceFactory getResourceFactory(){
 		if( this.resourceFactory == null ){
 			this.resourceFactory = new TGResourceFactoryImpl(this.getDisplay());
 		}
 		return this.resourceFactory;
 	}
-	
+
+	@Override
 	public int getTrackSelection(){
 		if( (getViewLayout().getStyle() & TGLayout.DISPLAY_MULTITRACK) == 0 ){
 			return getCaret().getTrack().getNumber();
 		}
 		return -1;
 	}
-	
+
+	@Override
 	public boolean isRunning(TGBeat beat) {
 		return ( isRunning( beat.getMeasure() ) && TuxGuitar.instance().getEditorCache().isPlaying(beat.getMeasure(),beat) );
 	}
-	
+
+	@Override
 	public boolean isRunning(TGMeasure measure) {
 		return ( measure.getTrack().equals(getCaret().getTrack()) && TuxGuitar.instance().getEditorCache().isPlaying( measure ) );
 	}
-	
+
+	@Override
 	public boolean isLoopSHeader(TGMeasureHeader measureHeader){
 		MidiPlayerMode pm = TuxGuitar.instance().getPlayer().getMode();
 		return ( pm.isLoop() && pm.getLoopSHeader() == measureHeader.getNumber() );
 	}
-	
+
+	@Override
 	public boolean isLoopEHeader(TGMeasureHeader measureHeader){
 		MidiPlayerMode pm = TuxGuitar.instance().getPlayer().getMode();
 		return ( pm.isLoop() && pm.getLoopEHeader() == measureHeader.getNumber() );
 	}
-	
+
+	@Override
 	public void configureStyles(TGLayoutStyles styles){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
-		
+
 		styles.setBufferEnabled(true);
 		styles.setStringSpacing(config.getIntConfigValue(TGConfigKeys.TAB_LINE_SPACING));
 		styles.setScoreLineSpacing(config.getIntConfigValue(TGConfigKeys.SCORE_LINE_SPACING));
@@ -410,7 +418,7 @@ public void configureStyles(TGLayoutStyles styles){
 		styles.setLoopMarkerSpacing(5);
 		styles.setDivisionTypeSpacing(10);
 		styles.setEffectSpacing(8);
-		
+
 		styles.setDefaultFont(config.getFontModelConfigValue(TGConfigKeys.FONT_DEFAULT));
 		styles.setNoteFont(config.getFontModelConfigValue(TGConfigKeys.FONT_NOTE));
 		styles.setTimeSignatureFont(config.getFontModelConfigValue(TGConfigKeys.FONT_TIME_SIGNATURE));
@@ -427,7 +435,7 @@ public void configureStyles(TGLayoutStyles styles){
 		styles.setPlayNoteColor(config.getColorModelConfigValue(TGConfigKeys.COLOR_PLAY_NOTE));
 		styles.setLoopSMarkerColor(config.getColorModelConfigValue(TGConfigKeys.COLOR_LOOP_S_MARKER));
 		styles.setLoopEMarkerColor(config.getColorModelConfigValue(TGConfigKeys.COLOR_LOOP_E_MARKER));
-		
+
 		getCaret().setColor1(config.getColorModelConfigValue(TGConfigKeys.COLOR_CARET_1));
 		getCaret().setColor2(config.getColorModelConfigValue(TGConfigKeys.COLOR_CARET_2));
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/TablaturePaintListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/TablaturePaintListener.java
new file mode 100644
index 00000000..d60c9b1e
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/TablaturePaintListener.java
@@ -0,0 +1,24 @@
+/*
+ * Created on 30-nov-2005
+ */
+package org.herac.tuxguitar.app.editors.tab;
+
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.herac.tuxguitar.app.editors.TGPainterImpl;
+
+/**
+ * @author julian
+ */
+public class TablaturePaintListener implements PaintListener{
+	private Tablature tablature;
+
+	public TablaturePaintListener(Tablature tablature){
+		this.tablature = tablature;
+	}
+
+	@Override
+	public void paintControl(PaintEvent e) {
+		this.tablature.paintTablature( new TGPainterImpl(e.gc) );
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/edit/EditorKit.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/edit/EditorKit.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/edit/EditorKit.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/edit/EditorKit.java
index 560bf8bf..1fbcb346 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/edit/EditorKit.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/edit/EditorKit.java
@@ -13,25 +13,26 @@
 import org.herac.tuxguitar.app.editors.tab.Tablature;
 import org.herac.tuxguitar.app.system.config.TGConfigKeys;
 import org.herac.tuxguitar.graphics.control.TGBeatImpl;
+import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackSpacing;
-import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGString;
 
 public class EditorKit implements MouseListener,MouseMoveListener,MouseTrackListener,MenuListener{
-	
+
 	public static final int MOUSE_MODE_SELECTION = 1;
 	public static final int MOUSE_MODE_EDITION = 2;
-	
+
 	private int mouseMode;
 	private boolean natural;
-	private Tablature tablature;
-	private MouseKit mouseKit;
-	private Point position;
+	private final Tablature tablature;
+	private final MouseKit mouseKit;
+	private final Point position;
 	private boolean menuOpen;
-	
+
 	public EditorKit(Tablature tablature){
 		this.tablature = tablature;
 		this.mouseKit = new MouseKit(this);
@@ -42,36 +43,36 @@ public EditorKit(Tablature tablature){
 		this.tablature.addMouseTrackListener(this);
 		this.setDefaults();
 	}
-	
+
 	private void setDefaults(){
 		this.setMouseMode(TuxGuitar.instance().getConfig().getIntConfigValue(TGConfigKeys.EDITOR_MOUSE_MODE,MOUSE_MODE_EDITION));
 		this.setNatural(TuxGuitar.instance().getConfig().getBooleanConfigValue(TGConfigKeys.EDITOR_NATURAL_KEY_MODE,true));
 	}
-	
+
 	public int getMouseMode() {
 		return this.mouseMode;
 	}
-	
+
 	public void setMouseMode(int mouseMode) {
 		this.mouseMode = mouseMode;
 	}
-	
+
 	public boolean isNatural() {
 		return this.natural;
 	}
-	
+
 	public void setNatural(boolean natural) {
 		this.natural = natural;
 	}
-	
+
 	public Tablature getTablature() {
 		return this.tablature;
-	}	
-	
+	}
+
 	public void tryBack(){
 		this.mouseKit.tryBack();
 	}
-	
+
 	public boolean select() {
 		int x = this.position.x;
 		int y = this.position.y;
@@ -92,11 +93,11 @@ public boolean select() {
 		}
 		return false;
 	}
-	
+
 	private boolean isScoreEnabled(){
 		return ( (getTablature().getViewLayout().getStyle() & TGLayout.DISPLAY_SCORE) != 0 );
 	}
-	
+
 	public TGTrackImpl findSelectedTrack(int y){
 		TGLayout layout = getTablature().getViewLayout();
 		int number = layout.getTrackNumberAt(y);
@@ -105,12 +106,12 @@ public TGTrackImpl findSelectedTrack(int y){
 		}
 		return null;
 	}
-	
+
 	public TGMeasureImpl findSelectedMeasure(TGTrackImpl track,int x,int y){
 		TGMeasureImpl measure = null;
 		int minorDistance = 0;
-		
-		Iterator it = track.getMeasures();
+
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
 			TGMeasureImpl m = (TGMeasureImpl)it.next();
 			if(!m.isOutOfBounds() && m.getTs() != null){
@@ -127,13 +128,13 @@ public TGMeasureImpl findSelectedMeasure(TGTrackImpl track,int x,int y){
 		}
 		return measure;
 	}
-	
+
 	public TGBeatImpl findSelectedBeat(TGMeasureImpl measure, int x){
 		int voice = getTablature().getCaret().getVoice();
 		int posX = measure.getHeaderImpl().getLeftSpacing(getTablature().getViewLayout()) + measure.getPosX();
 		int bestDiff = -1;
 		TGBeatImpl bestBeat = null;
-		Iterator it = measure.getBeats().iterator();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
 			TGBeatImpl beat = (TGBeatImpl)it.next();
 			if(!beat.getVoice(voice).isEmpty()){
@@ -149,31 +150,33 @@ public TGBeatImpl findSelectedBeat(TGMeasureImpl measure, int x){
 		}
 		return bestBeat;
 	}
-	
+
 	public TGString findSelectedString(TGMeasureImpl measure,int y) {
 		TGString string = null;
 		int stringSpacing = getTablature().getViewLayout().getStringSpacing();
 		int minorDistance = 0;
 		int firstStringY = measure.getPosY() + measure.getTs().getPosition(TGTrackSpacing.POSITION_TABLATURE);
-		
-		Iterator it = measure.getTrack().getStrings().iterator();
+
+		Iterator<TGString> it = measure.getTrack().getStrings().iterator();
 		while(it.hasNext()){
-			TGString currString = (TGString)it.next();
+			TGString currString = it.next();
 			int distanceX = Math.abs(y - (firstStringY + ((currString.getNumber() * stringSpacing) - stringSpacing)));
 			if(string == null || distanceX < minorDistance){
 				string = currString;
 				minorDistance = distanceX;
 			}
 		}
-		
+
 		return string;
 	}
-	
+
+	@Override
 	public void mouseDown(MouseEvent e) {
 		this.position.x = e.x;
 		this.position.y = e.y;
 	}
-	
+
+	@Override
 	public void mouseUp(MouseEvent e) {
 		this.position.x = e.x;
 		this.position.y = e.y;
@@ -185,7 +188,8 @@ public void mouseUp(MouseEvent e) {
 			}
 		}
 	}
-	
+
+	@Override
 	public void mouseMove(MouseEvent e) {
 		if(!this.menuOpen && !TuxGuitar.instance().getPlayer().isRunning()){
 			if(isScoreEnabled() && getMouseMode() == MOUSE_MODE_EDITION){
@@ -193,7 +197,8 @@ public void mouseMove(MouseEvent e) {
 			}
 		}
 	}
-	
+
+	@Override
 	public void mouseExit(MouseEvent e) {
 		if(!this.menuOpen && !TuxGuitar.instance().getPlayer().isRunning()){
 			if(isScoreEnabled() && getMouseMode() == MOUSE_MODE_EDITION){
@@ -201,26 +206,31 @@ public void mouseExit(MouseEvent e) {
 			}
 		}
 	}
-	
+
+	@Override
 	public void menuShown(MenuEvent e) {
 		this.menuOpen = true;
 		this.select();
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
+	@Override
 	public void menuHidden(MenuEvent e){
 		this.menuOpen = false;
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
+	@Override
 	public void mouseDoubleClick(MouseEvent e) {
 		//not implemented
 	}
-	
+
+	@Override
 	public void mouseEnter(MouseEvent e) {
 		//not implemented
 	}
-	
+
+	@Override
 	public void mouseHover(MouseEvent e) {
 		//not implemented
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/edit/MouseKit.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/edit/MouseKit.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/edit/MouseKit.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/edit/MouseKit.java
index de85754e..f0144bc5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/edit/MouseKit.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/editors/tab/edit/MouseKit.java
@@ -15,13 +15,12 @@
 import org.herac.tuxguitar.graphics.TGImage;
 import org.herac.tuxguitar.graphics.TGPainter;
 import org.herac.tuxguitar.graphics.control.TGBeatImpl;
+import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
 import org.herac.tuxguitar.graphics.control.TGNoteImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackSpacing;
 import org.herac.tuxguitar.graphics.control.TGVoiceImpl;
-import org.herac.tuxguitar.graphics.control.TGLayout;
-
 import org.herac.tuxguitar.song.managers.TGSongManager;
 import org.herac.tuxguitar.song.models.TGBeat;
 import org.herac.tuxguitar.song.models.TGDuration;
@@ -32,20 +31,20 @@
 
 public class MouseKit {
 	private static final int FIRST_LINE_VALUES[] = new int[] {65,45,52,55};
-	
-	private EditorKit kit;
+
+	private final EditorKit kit;
 	private TGImage back = null;
 	private int lastx;
 	private int lasty;
-	
+
 	public MouseKit(EditorKit kit){
 		this.kit = kit;
 	}
-	
+
 	private TGLayout.TrackPosition getTrackPosition(int y) {
 		return this.kit.getTablature().getViewLayout().getTrackPositionAt(y);
 	}
-	
+
 	public void tryBack(){
 		if(!TuxGuitar.instance().isLocked() && !ActionLock.isLocked() && !this.kit.getTablature().isPainting()){
 			TGPainter painter = new TGPainterImpl(new GC(this.kit.getTablature()));
@@ -58,19 +57,19 @@ public void tryBack(){
 			this.back.dispose();
 		}
 	}
-	
+
 	public void mouseExit() {
 		tryBack();
 	}
-	
+
 	public void mouseMove(MouseEvent e) {
 		this.tryBack();
 		if(!TuxGuitar.instance().isLocked() && !ActionLock.isLocked() && !this.kit.getTablature().isPainting()){
-			
+
 			TGTrackImpl track = this.kit.findSelectedTrack(e.y);
 			if (track != null) {
 				TGMeasureImpl measure = this.kit.findSelectedMeasure(track,e.x,e.y);
-				
+
 				if(measure != null && measure.getTs() != null){
 					float scale = this.kit.getTablature().getViewLayout().getScale();
 					int minValue = track.getString(track.stringCount()).getValue();
@@ -80,12 +79,12 @@ public void mouseMove(MouseEvent e) {
 					int width = (int)(10.0f * scale);
 					int topHeight = measure.getTs().getPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES);
 					int bottomHeight = (measure.getTs().getPosition(TGTrackSpacing.POSITION_TABLATURE) - measure.getTs().getPosition(TGTrackSpacing.POSITION_SCORE_DOWN_LINES));
-					
+
 					int x1 = (int)(e.x - (width / 2.0f));
 					int x2 = (int)(e.x + (width / 2.0f));
 					int y1 = (measure.getPosY() + measure.getTs().getPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES));
 					int y2 = (y1 + (lineSpacing * 5));
-					
+
 					if(e.y < (y1 + 3) && e.y >= (y1 - topHeight)){
 						this.back = new TGImageImpl(TuxGuitar.instance().getDisplay(),width + 1,topHeight + 1);
 						TGPainter painter = new TGPainterImpl(new GC(this.kit.getTablature()));
@@ -104,13 +103,13 @@ public void mouseMove(MouseEvent e) {
 							painter.closePath();
 						}
 						painter.dispose();
-						
+
 						this.lastx = x1;
 						this.lasty = (y1 - topHeight);
 					}else if(e.y > (y2 - 3) && e.y  < y2 + bottomHeight){
 						this.back = new TGImageImpl(TuxGuitar.instance().getDisplay(),width + 1,bottomHeight + 1);
 						TGPainter painter = new TGPainterImpl(new GC(this.kit.getTablature()));
-						painter.copyArea(this.back,x1, y2);	
+						painter.copyArea(this.back,x1, y2);
 						painter.setForeground(this.kit.getTablature().getViewLayout().getResources().getLineColor());
 						tempValue -= 14;
 						for(int y = y2; y <= (y2 + bottomHeight); y += lineSpacing){
@@ -128,7 +127,7 @@ public void mouseMove(MouseEvent e) {
 							}
 						}
 						painter.dispose();
-						
+
 						this.lastx = x1;
 						this.lasty = y2;
 					}
@@ -136,11 +135,11 @@ public void mouseMove(MouseEvent e) {
 			}
 		}
 	}
-	
+
 	public void mouseUp(MouseEvent e) {
 		if(!TuxGuitar.instance().isLocked() && !ActionLock.isLocked() && !this.kit.getTablature().isPainting()){
 			ActionLock.lock();
-			
+
 			TGLayout.TrackPosition pos = getTrackPosition(e.y) ;
 			if(pos != null){
 				TGTrackImpl track = this.kit.getTablature().getCaret().getTrack();
@@ -148,24 +147,24 @@ public void mouseUp(MouseEvent e) {
 				if(measure.getTs() != null){
 					int minValue = track.getString(track.stringCount()).getValue();
 					int maxValue = track.getString(1).getValue() + 29; //Max frets = 29
-					
+
 					int lineSpacing = this.kit.getTablature().getViewLayout().getScoreLineSpacing();
-					
+
 					int topHeight = measure.getTs().getPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES);
 					int bottomHeight = (measure.getTs().getPosition(TGTrackSpacing.POSITION_TABLATURE) - measure.getTs().getPosition(TGTrackSpacing.POSITION_SCORE_DOWN_LINES));
-					
+
 					int y1 = (pos.getPosY() + measure.getTs().getPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES));
 					int y2 = (y1 + (lineSpacing * 5));
-					
+
 					if(e.y >= (y1 - topHeight) && e.y  < (y2 + bottomHeight)){
-						
+
 						int value = 0;
 						int tempValue = FIRST_LINE_VALUES[measure.getClef() - 1];
 						double limit = (topHeight / (lineSpacing / 2.00));
 						for(int i = 0;i < limit;i ++){
 							tempValue += (TGMeasureImpl.ACCIDENTAL_NOTES[(tempValue + 1) % 12])?2:1;
 						}
-						
+
 						float minorDistance = 0;
 						for(float y = (y1 - topHeight); y <= (y2 + bottomHeight); y += (lineSpacing / 2.00)){
 							if(tempValue > 0){
@@ -193,7 +192,7 @@ public void mouseUp(MouseEvent e) {
 			ActionLock.unlock();
 		}
 	}
-	
+
 	private long getRealStart(TGVoiceImpl voice,int x){
 		if(voice.isEmpty()){
 			return voice.getBeat().getStart();
@@ -208,7 +207,7 @@ private long getRealStart(TGVoiceImpl voice,int x){
 		}
 		return beatStart;
 	}
-	
+
 	private int getRealValue(int value){
 		int realValue = value;
 		int key = this.kit.getTablature().getCaret().getMeasure().getKeySignature();
@@ -233,29 +232,29 @@ else if(TGMeasureImpl.KEY_SIGNATURES[key][TGMeasureImpl.ACCIDENTAL_FLAT_NOTES[re
 		}
 		return realValue;
 	}
-	
+
 	private boolean removeNote(int value,TGVoice voice) {
-		Iterator it = voice.getNotes().iterator();
+		Iterator<TGNote> it = voice.getNotes().iterator();
 		while (it.hasNext()) {
 			TGNoteImpl note = (TGNoteImpl) it.next();
-			
+
 			if (note.getRealValue() == value) {
 				//comienza el undoable
 				UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-				
+
 				TGSongManager manager = this.kit.getTablature().getSongManager();
 				manager.getMeasureManager().removeNote(note);
-				
+
 				//termia el undoable
 				TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
-				
+
 				return true;
 			}
 		}
 		return false;
 	}
-	
+
 	private void makeNote(TGVoice voice, long start,  int value){
 		Caret caret = this.kit.getTablature().getCaret();
 		TGSongManager manager = this.kit.getTablature().getSongManager();
@@ -264,42 +263,42 @@ private void makeNote(TGVoice voice, long start,  int value){
 		if(string > 0){
 			//comienza el undoable
 			UndoableMeasureGeneric undoable = UndoableMeasureGeneric.startUndo();
-			
+
 			TGNote note = manager.getFactory().newNote();
 			note.setValue((value - track.getString(string).getValue()));
 			note.setVelocity(caret.getVelocity());
 			note.setString(string);
-			
+
 			TGDuration duration = manager.getFactory().newDuration();
 			caret.getDuration().copy(duration);
-			
+
 			manager.getMeasureManager().addNote(voice.getBeat(),note,duration, start, voice.getIndex());
-			
+
 			caret.moveTo(caret.getTrack(),caret.getMeasure(),note.getVoice().getBeat(),note.getString());
-			
+
 			//termia el undoable
 			TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 			TuxGuitar.instance().getFileHistory().setUnsavedFile();
-			
+
 			//reprodusco las notas en el pulso
 			TuxGuitar.instance().playBeat(caret.getSelectedBeat());
 		}
 	}
-	
+
 	private void redrawTablature(){
 		Caret caret = this.kit.getTablature().getCaret();
 		this.kit.getTablature().updateMeasure(caret.getMeasure().getNumber());
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	private int findBestString(TGTrack track,TGVoice voice,int value){
-		List strings = new ArrayList();
+		List<TGString> strings = new ArrayList<TGString>();
 		for(int number = 1;number <= track.stringCount();number++){
 			boolean used = false;
 			TGString string = track.getString(number);
-			Iterator it = voice.getNotes().iterator();
+			Iterator<TGNote> it = voice.getNotes().iterator();
 			while (it.hasNext()) {
-				TGNote note = (TGNote) it.next();
+				TGNote note = it.next();
 				if(note.getString() == string.getNumber()){
 					used = true;
 				}
@@ -308,11 +307,11 @@ private int findBestString(TGTrack track,TGVoice voice,int value){
 				strings.add(string);
 			}
 		}
-		
+
 		int minFret = -1;
 		int stringForValue = 0;
 		for(int i = 0;i < strings.size();i++){
-			TGString string = (TGString)strings.get(i);
+			TGString string = strings.get(i);
 			int fret = value - string.getValue();
 			if((fret >= 0) && (minFret < 0 || fret < minFret)){
 				stringForValue = string.getNumber();
@@ -321,14 +320,14 @@ private int findBestString(TGTrack track,TGVoice voice,int value){
 		}
 		return stringForValue;
 	}
-	
+
 	public TGVoiceImpl findBestVoice(TGMeasureImpl measure, int x){
 		int voiceIndex = this.kit.getTablature().getCaret().getVoice();
 		int posX = measure.getHeaderImpl().getLeftSpacing( this.kit.getTablature().getViewLayout() ) + measure.getPosX();
 		int bestDiff = -1;
 		TGVoiceImpl bestVoice = null;
 		TGDuration duration = this.kit.getTablature().getCaret().getDuration();
-		Iterator it = measure.getBeats().iterator();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
 			TGBeatImpl beat = (TGBeatImpl)it.next();
 			TGVoiceImpl voice = beat.getVoiceImpl( voiceIndex );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/help/about/AboutContentReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/about/AboutContentReader.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/help/about/AboutContentReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/about/AboutContentReader.java
index cafa4dd3..a19e5a85 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/help/about/AboutContentReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/about/AboutContentReader.java
@@ -7,18 +7,18 @@
 import org.herac.tuxguitar.util.TGClassLoader;
 
 public class AboutContentReader {
-	
+
 	private static final String PREFIX = "about_";
 	private static final String EXTENSION = ".dist";
-	
+
 	public static final String DESCRIPTION = "description";
 	public static final String AUTHORS = "authors";
 	public static final String LICENSE = "license";
-	
+
 	public AboutContentReader(){
 		super();
 	}
-	
+
 	public StringBuffer read(String doc){
 		String lang = TuxGuitar.instance().getLanguageManager().getLanguage();
 		InputStream is = TGClassLoader.instance().getClassLoader().getResourceAsStream(PREFIX + doc + "_" + lang + EXTENSION);
@@ -29,10 +29,10 @@ public StringBuffer read(String doc){
 			return read(is);
 		}
 		System.out.println(doc + ".txt");
-		
+
 		return new StringBuffer();
 	}
-	
+
 	public StringBuffer read(InputStream is){
 		StringBuffer sb = new StringBuffer();
 		try {
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/help/about/AboutDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/about/AboutDialog.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/help/about/AboutDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/about/AboutDialog.java
index 368a49a2..60b09d78 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/help/about/AboutDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/about/AboutDialog.java
@@ -29,45 +29,46 @@
 import org.herac.tuxguitar.util.TGVersion;
 
 public class AboutDialog {
-	
+
 	private static final String RELEASE_NAME = (TuxGuitar.APPLICATION_NAME + " " + TGVersion.CURRENT.getVersion());
 	private static final String PROPERTY_PREFIX = ("help.about.");
-	
+
 	private static final int IMAGE_WIDTH = 100;
 	private static final int IMAGE_HEIGHT = 100;
-	
+
 	private static final int TAB_ITEM_WIDTH = 660;
 	private static final int TAB_ITEM_HEIGHT = 300;
-	
+
 	protected Composite imageComposite;
 	protected Image image;
-	
+
 	public AboutDialog() {
 		super();
 	}
-	
+
 	public void open(Shell shell) {
 		final Shell dialog = DialogUtils.newDialog(shell,SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("help.about"));
-		
+
 		//--------------------HEADER----------------------------------
 		Composite header = new Composite(dialog,SWT.NONE);
 		header.setLayout(new GridLayout(2,false));
 		header.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true ,true));
-		
+
 		this.image = TuxGuitar.instance().getIconManager().getAboutDescription();
-		
+
 		this.imageComposite = new Composite(header,SWT.NONE);
 		this.imageComposite.setLayoutData(new GridData(IMAGE_WIDTH,IMAGE_HEIGHT));
 		this.imageComposite.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				Rectangle bounds = AboutDialog.this.image.getBounds();
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				painter.drawImage(new TGImageImpl(AboutDialog.this.image),((IMAGE_WIDTH - bounds.width) /2),((IMAGE_HEIGHT - bounds.height) /2));
 			}
 		});
-		
+
 		final Font titleFont = new Font(dialog.getDisplay(),TuxGuitar.instance().getConfig().getFontDataConfigValue(TGConfigKeys.FONT_ABOUT_DIALOG_TITLE));
 		Label title = new Label(header,SWT.NONE);
 		title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true ,true));
@@ -75,27 +76,29 @@ public void paintControl(PaintEvent e) {
 		title.setForeground(dialog.getDisplay().getSystemColor(SWT.COLOR_GRAY));
 		title.setText(RELEASE_NAME);
 		title.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				titleFont.dispose();
 			}
 		});
-		
+
 		//-------------------TABS-----------------------
 		Composite tabs = new Composite(dialog, SWT.NONE);
 		tabs.setLayout(new GridLayout());
 		tabs.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		final TabFolder tabFolder = new TabFolder(tabs, SWT.NONE);
 		tabFolder.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		tabFolder.setLayout(new FormLayout());
-		
+
 		AboutContentReader docReader = new AboutContentReader();
-		
+
 		makeTabItem(tabFolder,AboutContentReader.DESCRIPTION,docReader.read(AboutContentReader.DESCRIPTION).toString());
 		makeTabItem(tabFolder,AboutContentReader.AUTHORS,docReader.read(AboutContentReader.AUTHORS).toString());
 		makeTabItem(tabFolder,AboutContentReader.LICENSE,docReader.read(AboutContentReader.LICENSE).toString());
-		
+
 		tabFolder.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(tabFolder.getSelectionIndex() == 0){
 					AboutDialog.this.image = TuxGuitar.instance().getIconManager().getAboutDescription();
@@ -107,47 +110,48 @@ public void widgetSelected(SelectionEvent e) {
 				AboutDialog.this.imageComposite.redraw();
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout());
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		Button buttonClose = new Button(buttons, SWT.PUSH);
 		buttonClose.setLayoutData(getButtonData());
 		buttonClose.setText(TuxGuitar.getProperty("close"));
 		buttonClose.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		tabFolder.setSelection(0);
-		
+
 		dialog.setDefaultButton( buttonClose );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private void makeTabItem(TabFolder tabFolder,String itemName,String itemText){
 		Composite control = new Composite(tabFolder, SWT.NONE);
 		control.setLayout(new GridLayout());
 		control.setLayoutData(new FormData(TAB_ITEM_WIDTH,TAB_ITEM_HEIGHT));
-		
+
 		Text text = new Text(control,SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
 		text.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		text.setBackground(TuxGuitar.instance().getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		text.setEditable(false);
 		text.append(itemText);
 		text.setSelection(0);
-		
+
 		TabItem tabItem = new TabItem(tabFolder, SWT.NONE);
 		tabItem.setText(TuxGuitar.getProperty(PROPERTY_PREFIX + itemName));
 		tabItem.setControl(control);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/help/doc/TGDocumentation.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/doc/TGDocumentation.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/help/doc/TGDocumentation.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/doc/TGDocumentation.java
index a5f4a068..7a40c193 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/help/doc/TGDocumentation.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/help/doc/TGDocumentation.java
@@ -10,17 +10,17 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class TGDocumentation {
-	
+
 	private static final String RESOURCE_PATH = "help";
 	private static final String TEMPORAL_PATH = System.getProperty("java.io.tmpdir") + File.separator + "tuxguitar";
-	
+
 	public void display() throws Throwable{
 		URL url = getIndexUrl();
 		if( url != null ){
 			Program.launch( url.toExternalForm() );
 		}
 	}
-	
+
 	private URL getIndexUrl() throws Throwable{
 		URL url = TGFileUtils.getResourceUrl(RESOURCE_PATH + "/index.html");
 		if( url != null && !TGFileUtils.isLocalFile( url ) ){
@@ -30,7 +30,7 @@ private URL getIndexUrl() throws Throwable{
 		}
 		return url;
 	}
-	
+
 	private void copyTemporalResources( String dstPath , String resourcePath, String[] resources ) throws Throwable{
 		if( resources != null ){
 			for( int i = 0 ; i < resources.length ; i ++ ){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/helper/FileHistory.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/helper/FileHistory.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/helper/FileHistory.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/helper/FileHistory.java
index 6f7f5804..5865d3a3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/helper/FileHistory.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/helper/FileHistory.java
@@ -1,8 +1,5 @@
 /*
  * Created on 08-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.helper;
 
@@ -25,61 +22,58 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class FileHistory {
-	
+
 	private static final int URL_LIMIT = TuxGuitar.instance().getConfig().getIntConfigValue(TGConfigKeys.MAX_HISTORY_FILES);
-	
+
 	private boolean changed;
 	private boolean newFile;
 	private boolean localFile;
 	private boolean unsavedFile;
-	private List urls;
+	private List<URL> urls;
 	private String chooserPath;
-	
+
 	public FileHistory(){
-		this.urls = new ArrayList();
+		this.urls = new ArrayList<URL>();
 		this.loadHistory();
 		this.reset(null);
 	}
-	
+
 	public void reset(URL url) {
 		this.unsavedFile = false;
 		this.newFile = (url == null);
 		this.localFile = (url != null && isLocalFile(url));
 		this.addURL(url);
 	}
-	
+
 	public boolean isNewFile(){
 		return this.newFile;
 	}
-	
+
 	public boolean isLocalFile(){
 		return this.localFile;
 	}
-	
+
 	public boolean isUnsavedFile() {
 		return this.unsavedFile;
 	}
-	
+
 	public void setUnsavedFile() {
 		this.unsavedFile = true;
 	}
-	
+
 	public void setChooserPath(String chooserPath){
 		this.chooserPath = chooserPath;
 	}
-	
+
 	public void setChooserPath(URL url){
 		String path = getFilePath(url);
 		if( path != null ){
 			this.setChooserPath( path );
 		}
 	}
-	
+
 	public String getCurrentFileName(String defaultName) {
 		if(!this.isNewFile()){
 			URL url = getCurrentURL();
@@ -89,7 +83,7 @@ public String getCurrentFileName(String defaultName) {
 		}
 		return defaultName;
 	}
-	
+
 	public String getCurrentFilePath() {
 		if(!this.isNewFile()){
 			URL url = getCurrentURL();
@@ -102,23 +96,23 @@ public String getCurrentFilePath() {
 		}
 		return this.chooserPath;
 	}
-	
+
 	public String getSavePath() {
 		String current = getCurrentFilePath();
 		return (current != null ? current : this.chooserPath);
 	}
-	
+
 	public String getOpenPath() {
 		return this.chooserPath;
 	}
-	
+
 	protected String getFilePath(URL url){
 		if(isLocalFile(url)){
 			return new File(url.getFile()).getParent();
 		}
 		return null;
 	}
-	
+
 	protected String decode(String url){
 		try {
 			return URLDecoder.decode(url, "UTF-8");
@@ -127,7 +121,7 @@ protected String decode(String url){
 		}
 		return url;
 	}
-	
+
 	protected boolean isLocalFile(URL url){
 		try {
 			if(url.getProtocol().equals( new File(url.getFile()).toURI().toURL().getProtocol() ) ){
@@ -138,14 +132,14 @@ protected boolean isLocalFile(URL url){
 		}
 		return false;
 	}
-	
+
 	protected URL getCurrentURL(){
 		if(!this.urls.isEmpty()){
-			return (URL)this.urls.get(0);
+			return this.urls.get(0);
 		}
 		return null;
 	}
-	
+
 	public void addURL(URL url){
 		if(url != null){
 			removeURL(url);
@@ -155,35 +149,35 @@ public void addURL(URL url){
 		}
 		saveHistory();
 	}
-	
-	public List getURLs(){
+
+	public List<URL> getURLs(){
 		return this.urls;
 	}
-	
+
 	private void checkLimit(){
 		while(this.urls.size() > URL_LIMIT){
 			this.urls.remove(this.urls.size() - 1);
 		}
 	}
-	
+
 	private void removeURL(URL url){
 		for(int i = 0; i < this.urls.size(); i++){
-			URL old = (URL)this.urls.get(i);
+			URL old = this.urls.get(i);
 			if(old.toString().equals(url.toString())){
 				this.urls.remove(i);
 				break;
 			}
 		}
 	}
-	
+
 	public boolean isChanged() {
 		return this.changed;
 	}
-	
+
 	public void setChanged(boolean changed) {
 		this.changed = changed;
 	}
-	
+
 	public void loadHistory() {
 		try {
 			this.urls.clear();
@@ -191,9 +185,9 @@ public void loadHistory() {
 				InputStream inputStream = new FileInputStream(getHistoryFileName());
 				Properties properties = new Properties();
 				properties.load(inputStream);
-				
+
 				this.chooserPath = (String)properties.get("history.path");
-				
+
 				int count = Integer.parseInt((String)properties.get("history.count"));
 				for(int i = 0; i < count;i ++){
 					String url = (String)properties.get("history." + i);
@@ -209,11 +203,11 @@ public void loadHistory() {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void saveHistory(){
 		try {
 			Properties properties = new Properties();
-			
+
 			int count = this.urls.size();
 			for(int i = 0;i < count;i ++){
 				properties.put("history." + i,this.urls.get(i).toString());
@@ -229,7 +223,7 @@ public void saveHistory(){
 			e1.printStackTrace();
 		}
 	}
-	
+
 	private String getHistoryFileName(){
 		return TGFileUtils.PATH_USER_CONFIG + File.separator + "history.properties";
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/helper/SyncThread.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/helper/SyncThread.java
new file mode 100644
index 00000000..8762c4a8
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/helper/SyncThread.java
@@ -0,0 +1,36 @@
+/*
+ * Created on 09-dic-2005
+ */
+package org.herac.tuxguitar.app.helper;
+
+import org.herac.tuxguitar.util.TGSynchronizer;
+
+/**
+ * @author julian
+ */
+public class SyncThread extends Thread {
+
+	private TGSynchronizer.TGRunnable runnable;
+
+	public SyncThread(TGSynchronizer.TGRunnable runnable) {
+		this.runnable = runnable;
+	}
+
+	public SyncThread(final Runnable runnable) {
+		this(new TGSynchronizer.TGRunnable() {
+			@Override
+			public void run() throws Throwable {
+				runnable.run();
+			}
+		});
+	}
+
+	@Override
+	public void run() {
+		try {
+			TGSynchronizer.instance().addRunnable(this.runnable);
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/ItemBase.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ItemBase.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/ItemBase.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ItemBase.java
index 0fa2c6fb..0c98f68c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/ItemBase.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ItemBase.java
@@ -9,5 +9,5 @@ public interface ItemBase {
 	 * Actualiza los textos
 	 */
 	public void loadProperties();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/ItemManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ItemManager.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/ItemManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ItemManager.java
index 1d35294c..60111b55 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/ItemManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ItemManager.java
@@ -1,8 +1,5 @@
 /*
  * Created on 18-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items;
 
@@ -59,29 +56,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ItemManager implements TGUpdateListener,IconLoader,LanguageLoader{
-	
+
 	private Menu menu;
 	private Menu popupMenu;
 	private CoolBar coolBar;
-	private List loadedToolItems;
-	private List loadedMenuItems;
-	private List loadedPopupMenuItems;
+	private List<ItemBase> loadedToolItems;
+	private List<ItemBase> loadedMenuItems;
+	private List<ItemBase> loadedPopupMenuItems;
 	private ToolItems[] toolItems;
-	
+
 	private boolean layout_locked;
 	private boolean shouldReloadToolBars;
 	private boolean coolbarVisible;
 	private boolean updateCoolBarWrapIndicesEnabled;
-	
+
 	public ItemManager(){
-		this.loadedToolItems = new ArrayList();
-		this.loadedMenuItems = new ArrayList();
-		this.loadedPopupMenuItems = new ArrayList();
+		this.loadedToolItems = new ArrayList<ItemBase>();
+		this.loadedMenuItems = new ArrayList<ItemBase>();
+		this.loadedPopupMenuItems = new ArrayList<ItemBase>();
 		this.layout_locked = false;
 		this.setDefaultToolBars();
 		this.loadItems();
@@ -89,20 +83,20 @@ public ItemManager(){
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public void loadItems(){
 		this.createMenu();
 		this.createPopupMenu();
 		this.createCoolbar();
 	}
-	
+
 	public boolean isCoolbarVisible(){
 		return this.coolbarVisible;
 	}
-	
+
 	public void createCoolbar() {
 		boolean initialized = (this.coolBar != null && !this.coolBar.isDisposed());
-		
+
 		this.layout_locked = true;
 		this.updateCoolBarWrapIndicesEnabled = true;
 		if( !initialized ){
@@ -110,52 +104,54 @@ public void createCoolbar() {
 			coolData.left = new FormAttachment(0);
 			coolData.right = new FormAttachment(100);
 			coolData.top = new FormAttachment(0,0);
-			
+
 			this.coolBar = new CoolBar(TuxGuitar.instance().getShell(),SWT.HORIZONTAL | SWT.FLAT);
 			this.coolBar.setLayoutData(coolData);
 			this.coolBar.setVisible( this.coolbarVisible );
 			this.coolBar.addListener(SWT.Resize, new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					layoutCoolBar();
 				}
 			});
 			this.coolBar.addListener(SWT.DragDetect, new Listener() {
+				@Override
 				public void handleEvent(Event event) {
 					disableUpdateCoolBarWrapIndices();
 				}
 			});
-			
+
 			TuxGuitar.instance().getkeyBindingManager().appendListenersTo(this.coolBar);
 		}
-		
+
 		if( this.coolbarVisible ) {
 			this.makeCoolItems();
 		}
-		
+
 		this.layout_locked = false;
-		
+
 		if( initialized ){
 			this.layoutCoolBar();
 		}
 	}
-	
+
 	public void toogleToolbarVisibility(){
 		if(this.coolBar != null && !this.coolBar.isDisposed()){
 			this.layout_locked = true;
-			
+
 			this.coolBar.setVisible( !this.coolbarVisible );
 			if( this.coolbarVisible ){
 				this.clearCoolBar();
 			}else{
 				this.makeCoolItems();
 			}
-			
+
 			this.layout_locked = false;
-			
+
 			this.layoutCoolBar();
 		}
 	}
-	
+
 	private void clearCoolBar(){
 		if(this.coolBar != null && !this.coolBar.isDisposed()){
 			this.loadedToolItems.clear();
@@ -170,18 +166,18 @@ private void clearCoolBar(){
 		}
 		this.coolbarVisible = false;
 	}
-	
+
 	protected void updateCoolBarWrapIndices(){
 		int coolBarWidth = this.coolBar.getClientArea().width;
 		int coolItemsWidth = 0;
-		
-		List coolItemIndices = new ArrayList();
-		
+
+		List<Integer> coolItemIndices = new ArrayList<Integer>();
+
 		CoolItem[] items = this.coolBar.getItems();
 		for(int i = 0;i < items.length; i ++){
 			Point controlSise = items[i].getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT);
 			Point itemSize = items[i].computeSize(controlSise.x, controlSise.y);
-			
+
 			int nextCoolItemsWidth = ( coolItemsWidth + itemSize.x );
 			if( nextCoolItemsWidth > coolBarWidth ){
 				coolItemIndices.add( new Integer( i ) );
@@ -189,15 +185,15 @@ protected void updateCoolBarWrapIndices(){
 			}
 			coolItemsWidth = nextCoolItemsWidth;
 		}
-		
+
 		int[] coolItemIndicesArray = new int[ coolItemIndices.size() ];
 		for(int i = 0;i < coolItemIndicesArray.length; i ++){
-			coolItemIndicesArray[i] = ((Integer)coolItemIndices.get(i)).intValue();
+			coolItemIndicesArray[i] = coolItemIndices.get(i).intValue();
 		}
-		
+
 		this.coolBar.setWrapIndices( coolItemIndicesArray );
 	}
-	
+
 	protected void layoutCoolBar(){
 		if(!this.layout_locked){
 			this.layout_locked = true;
@@ -208,7 +204,7 @@ protected void layoutCoolBar(){
 			this.layout_locked = false;
 		}
 	}
-	
+
 	protected void layoutShell(){
 		if(!this.layout_locked){
 			this.layout_locked = true;
@@ -216,10 +212,11 @@ protected void layoutShell(){
 			this.layout_locked = false;
 		}
 	}
-	
+
 	protected void layoutShellLater(){
 		try {
 			TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					layoutShell();
 				}
@@ -228,7 +225,7 @@ public void run() throws Throwable {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void makeCoolItems(){
 		this.clearCoolBar();
 		this.readToolBars();
@@ -239,14 +236,14 @@ public void makeCoolItems(){
 		}
 		this.coolbarVisible = true;
 	}
-	
+
 	private void makeToolBar(ToolItems item){
 		ToolBar toolBar = new ToolBar(this.coolBar,SWT.HORIZONTAL | SWT.FLAT );
 		item.showItems(toolBar);
-		makeCoolItem(toolBar); 
+		makeCoolItem(toolBar);
 		this.loadedToolItems.add(item);
 	}
-	
+
 	private void makeCoolItem(ToolBar toolBar){
 		Point size = toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT);
 		CoolItem coolItem = new CoolItem(this.coolBar, SWT.NONE);
@@ -254,7 +251,7 @@ private void makeCoolItem(ToolBar toolBar){
 		coolItem.setPreferredSize(coolItem.computeSize(size.x, size.y));
 		coolItem.setControl(toolBar);
 	}
-	
+
 	public void createMenu() {
 		Shell shell = TuxGuitar.instance().getShell();
 		if(this.menu == null || this.menu.isDisposed()){
@@ -264,7 +261,7 @@ public void createMenu() {
 		for(int i = 0; i < items.length;i ++){
 			items[i].dispose();
 		}
-		
+
 		this.loadedMenuItems.clear();
 		this.loadedMenuItems.add(new FileMenuItem(shell,this.menu, SWT.CASCADE));
 		this.loadedMenuItems.add(new EditMenuItem(shell,this.menu, SWT.CASCADE));
@@ -280,7 +277,7 @@ public void createMenu() {
 		this.showMenuItems(this.loadedMenuItems);
 		shell.setMenuBar(this.menu);
 	}
-	
+
 	public void createPopupMenu() {
 		Shell shell = TuxGuitar.instance().getShell();
 		if(this.popupMenu == null || this.popupMenu.isDisposed()){
@@ -295,20 +292,20 @@ public void createPopupMenu() {
 		this.loadedPopupMenuItems.add(new CompositionMenuItem(shell,this.popupMenu, SWT.CASCADE));
 		this.loadedPopupMenuItems.add(new TrackMenuItem(shell,this.popupMenu, SWT.CASCADE));
 		this.loadedPopupMenuItems.add(new MeasureMenuItem(shell,this.popupMenu, SWT.CASCADE));
-		this.loadedPopupMenuItems.add(new BeatMenuItem(shell,this.popupMenu, SWT.CASCADE)); 
+		this.loadedPopupMenuItems.add(new BeatMenuItem(shell,this.popupMenu, SWT.CASCADE));
 		this.loadedPopupMenuItems.add(new MarkerMenuItem(shell,this.popupMenu, SWT.CASCADE));
 		this.loadedPopupMenuItems.add(new TransportMenuItem(shell,this.popupMenu, SWT.CASCADE));
 		this.showMenuItems(this.loadedPopupMenuItems);
 	}
-	
-	private void showMenuItems(List items){
-		Iterator it = items.iterator();
+
+	private void showMenuItems(List<ItemBase> items){
+		Iterator<ItemBase> it = items.iterator();
 		while(it.hasNext()){
 			MenuItems item = (MenuItems)it.next();
 			item.showItems();
 		}
 	}
-	
+
 	public void updateItems(){
 		if(!isDisposed()){
 			updateItems(this.loadedToolItems);
@@ -316,15 +313,16 @@ public void updateItems(){
 			updateItems(this.loadedPopupMenuItems);
 		}
 	}
-	
-	public void updateItems(List items){
-		Iterator it = items.iterator();
+
+	public void updateItems(List<ItemBase> items){
+		Iterator<ItemBase> it = items.iterator();
 		while(it.hasNext()){
-			ItemBase item = (ItemBase)it.next();
+			ItemBase item = it.next();
 			item.update();
 		}
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		if(!isDisposed()){
 			loadProperties(this.loadedToolItems);
@@ -332,27 +330,28 @@ public void loadProperties(){
 			loadProperties(this.loadedPopupMenuItems);
 		}
 	}
-	
-	public void loadProperties(List items){
-		Iterator it = items.iterator();
+
+	public void loadProperties(List<ItemBase> items){
+		Iterator<ItemBase> it = items.iterator();
 		while(it.hasNext()){
-			ItemBase item = (ItemBase)it.next();
+			ItemBase item = it.next();
 			item.loadProperties();
 		}
 	}
-	
+
+	@Override
 	public void loadIcons(){
 		this.loadItems();
 	}
-	
+
 	public CoolBar getCoolbar(){
 		return this.coolBar;
 	}
-	
+
 	public Menu getPopupMenu(){
 		return this.popupMenu;
 	}
-	
+
 	public void readToolBars() {
 		File file = new File(getCoolItemsFileName());
 		if(!file.exists()){
@@ -361,25 +360,25 @@ public void readToolBars() {
 		this.shouldReloadToolBars = false;
 		ToolBarsReader.loadToolBars(this,file);
 	}
-	
+
 	public void writeToolBars(){
 		File file = new File(getCoolItemsFileName());
 		ToolBarsWriter.saveToolBars(getToolBars(), file);
 	}
-	
+
 	public void setToolBarStatus(String name, boolean enabled, int index){
 		if(index >= 0 && index < this.toolItems.length){
 			setToolBarPosition(name, index);
 			setToolBarEnabled(index, enabled);
 		}
 	}
-	
+
 	public void setToolBarEnabled(int index, boolean enabled){
 		this.shouldReloadToolBars = (this.shouldReloadToolBars || (this.toolItems[ index ].isEnabled() != enabled ));
-		
+
 		this.toolItems[ index ].setEnabled(enabled);
 	}
-	
+
 	public void setToolBarPosition(String name, int index){
 		if(index >= 0 && index < this.toolItems.length){
 			ToolItems element = this.toolItems[index];
@@ -396,20 +395,20 @@ public void setToolBarPosition(String name, int index){
 				}
 				this.toolItems[index] = this.toolItems[oldIndex];
 				this.toolItems[oldIndex] = element;
-				
+
 				this.shouldReloadToolBars = true;
 			}
 		}
 	}
-	
+
 	public ToolItems[] getToolBars(){
 		return this.toolItems;
 	}
-	
+
 	public boolean shouldReloadToolBars(){
 		return this.shouldReloadToolBars;
 	}
-	
+
 	public void setDefaultToolBars(){
 		this.toolItems = new ToolItems[]{
 				initToolItem(new FileToolItems(), true),
@@ -429,26 +428,27 @@ public void setDefaultToolBars(){
 		this.shouldReloadToolBars = true;
 		this.coolbarVisible = true;
 	}
-	
+
 	private ToolItems initToolItem(ToolItems item, boolean enabled){
 		item.setEnabled(enabled);
 		return item;
 	}
-	
+
 	private boolean isDisposed(){
 		return (this.coolBar.isDisposed() || this.menu.isDisposed() || this.popupMenu.isDisposed());
 	}
-	
+
 	private String getCoolItemsFileName(){
 		return TGFileUtils.PATH_USER_CONFIG + File.separator + "toolbars.xml";
 	}
 
+	@Override
 	public void doUpdate(int type) {
 		if( type == TGUpdateListener.SELECTION ){
 			this.updateItems();
 		}
 	}
-	
+
 	public void disableUpdateCoolBarWrapIndices() {
 		if( this.updateCoolBarWrapIndicesEnabled ){
 			this.coolBar.setWrapIndices( null );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/MenuItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/MenuItems.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/MenuItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/MenuItems.java
index fd82821e..3a204258 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/MenuItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/MenuItems.java
@@ -6,9 +6,9 @@
 import org.herac.tuxguitar.app.system.keybindings.KeyBinding;
 
 public abstract class MenuItems implements ItemBase {
-	
+
 	public abstract void showItems();
-	
+
 	protected void setMenuItemTextAndAccelerator(MenuItem menuItem, String key,String action) {
 		String text = TuxGuitar.getProperty(key);
 		if (action != null) {
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/ToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ToolItems.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/ToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ToolItems.java
index a1959676..b290b404 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/ToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/ToolItems.java
@@ -5,31 +5,31 @@
 import org.herac.tuxguitar.app.editors.TablatureEditor;
 
 public abstract class ToolItems implements ItemBase{
-	
+
 	private String name;
 	private boolean enabled;
-	
+
 	public ToolItems(String name){
 		this.name = name;
 		this.enabled = true;
 	}
-	
+
 	public String getName(){
 		return this.name;
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
-	
+
 	protected TablatureEditor getEditor(){
 		return TuxGuitar.instance().getTablatureEditor();
 	}
-	
+
 	public abstract void showItems(ToolBar toolBar);
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/BeatMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/BeatMenuItem.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/BeatMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/BeatMenuItem.java
index 4a481d35..963570d1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/BeatMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/BeatMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -15,12 +12,12 @@
 import org.herac.tuxguitar.app.actions.note.ChangeTiedNoteAction;
 import org.herac.tuxguitar.app.actions.note.CleanBeatAction;
 import org.herac.tuxguitar.app.actions.note.DecrementNoteSemitoneAction;
+import org.herac.tuxguitar.app.actions.note.DeleteNoteOrRestAction;
 import org.herac.tuxguitar.app.actions.note.IncrementNoteSemitoneAction;
 import org.herac.tuxguitar.app.actions.note.InsertRestBeatAction;
 import org.herac.tuxguitar.app.actions.note.MoveBeatsCustomAction;
 import org.herac.tuxguitar.app.actions.note.MoveBeatsLeftAction;
 import org.herac.tuxguitar.app.actions.note.MoveBeatsRightAction;
-import org.herac.tuxguitar.app.actions.note.DeleteNoteOrRestAction;
 import org.herac.tuxguitar.app.actions.note.RemoveUnusedVoiceAction;
 import org.herac.tuxguitar.app.actions.note.SetStrokeDownAction;
 import org.herac.tuxguitar.app.actions.note.SetStrokeUpAction;
@@ -37,12 +34,9 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class BeatMenuItem extends MenuItems{
-	
+
 	private MenuItem noteMenuItem;
 	private Menu menu;
 	private MenuItem tiedNote;
@@ -67,124 +61,126 @@ public class BeatMenuItem extends MenuItems{
 	private ChordMenuItem chordMenuItem;
 	private NoteEffectsMenuItem effectMenuItem;
 	private DynamicMenuItem dynamicMenuItem;
-	
+
 	public BeatMenuItem(Shell shell,Menu parent, int style) {
 		this.noteMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--Tied Note
 		this.tiedNote = new MenuItem(this.menu, SWT.CHECK);
 		this.tiedNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeTiedNoteAction.NAME));
-		
+
 		//--Insert Rest Beat
 		this.insertRestBeat = new MenuItem(this.menu, SWT.PUSH);
 		this.insertRestBeat.addSelectionListener(TuxGuitar.instance().getAction(InsertRestBeatAction.NAME));
-		
+
 		//--Delete Note or Rest
 		this.deleteNoteOrRest = new MenuItem(this.menu, SWT.PUSH);
 		this.deleteNoteOrRest.addSelectionListener(TuxGuitar.instance().getAction(DeleteNoteOrRestAction.NAME));
-		
+
 		//--Clean Beat
 		this.cleanBeat = new MenuItem(this.menu, SWT.PUSH);
 		this.cleanBeat.addSelectionListener(TuxGuitar.instance().getAction(CleanBeatAction.NAME));
-		
+
 		//--Remove Voice
 		this.removeVoice = new MenuItem(this.menu, SWT.PUSH);
 		this.removeVoice.addSelectionListener(TuxGuitar.instance().getAction(RemoveUnusedVoiceAction.NAME));
-		
+
 		//--Duration--
 		this.durationMenuItem = new DurationMenuItem(this.menu.getShell(),this.menu,SWT.CASCADE);
 		this.durationMenuItem.showItems();
-		
+
 		//--Chord--
 		this.chordMenuItem = new ChordMenuItem(this.menu.getShell(),this.menu,SWT.CASCADE);
 		this.chordMenuItem.showItems();
-		
+
 		//--Effects--
 		this.effectMenuItem = new NoteEffectsMenuItem(this.menu.getShell(),this.menu,SWT.CASCADE);
 		this.effectMenuItem.showItems();
-		
+
 		//--Dynamic--
 		this.dynamicMenuItem = new DynamicMenuItem(this.menu.getShell(),this.menu,SWT.CASCADE);
 		this.dynamicMenuItem.showItems();
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		this.insertText = new MenuItem(this.menu, SWT.PUSH);
 		this.insertText.addSelectionListener(TuxGuitar.instance().getAction(InsertTextAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--Semitone Down
 		this.voiceAuto = new MenuItem(this.menu, SWT.PUSH);
 		this.voiceAuto.addSelectionListener(TuxGuitar.instance().getAction(SetVoiceAutoAction.NAME));
-		
+
 		//--Semitone Up
 		this.voiceUp = new MenuItem(this.menu, SWT.PUSH);
 		this.voiceUp.addSelectionListener(TuxGuitar.instance().getAction(SetVoiceUpAction.NAME));
-		
+
 		//--Semitone Down
 		this.voiceDown = new MenuItem(this.menu, SWT.PUSH);
 		this.voiceDown.addSelectionListener(TuxGuitar.instance().getAction(SetVoiceDownAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--Semitone Up
 		this.strokeUp = new MenuItem(this.menu, SWT.CHECK);
 		this.strokeUp.addSelectionListener(TuxGuitar.instance().getAction(SetStrokeUpAction.NAME));
-		
+
 		//--Semitone Down
 		this.strokeDown = new MenuItem(this.menu, SWT.CHECK);
 		this.strokeDown.addSelectionListener(TuxGuitar.instance().getAction(SetStrokeDownAction.NAME));
-				
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--Semitone Up
 		this.semitoneUp = new MenuItem(this.menu, SWT.PUSH);
 		this.semitoneUp.addSelectionListener(TuxGuitar.instance().getAction(IncrementNoteSemitoneAction.NAME));
-		
+
 		//--Semitone Down
 		this.semitoneDown = new MenuItem(this.menu, SWT.PUSH);
 		this.semitoneDown.addSelectionListener(TuxGuitar.instance().getAction(DecrementNoteSemitoneAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--Shift Up
 		this.shiftUp = new MenuItem(this.menu, SWT.PUSH);
 		this.shiftUp.addSelectionListener(TuxGuitar.instance().getAction(ShiftNoteUpAction.NAME));
-		
+
 		//--Shift Down
 		this.shiftDown = new MenuItem(this.menu, SWT.PUSH);
 		this.shiftDown.addSelectionListener(TuxGuitar.instance().getAction(ShiftNoteDownAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--Move Beats Left
 		this.moveBeatsLeft = new MenuItem(this.menu, SWT.PUSH);
 		this.moveBeatsLeft.addSelectionListener(TuxGuitar.instance().getAction(MoveBeatsLeftAction.NAME));
-		
+
 		//--Move Beats Right
 		this.moveBeatsRight = new MenuItem(this.menu, SWT.PUSH);
 		this.moveBeatsRight.addSelectionListener(TuxGuitar.instance().getAction(MoveBeatsRightAction.NAME));
-		
+
 		//--Move Beats Custom
 		this.moveBeatsCustom = new MenuItem(this.menu, SWT.PUSH);
 		this.moveBeatsCustom.addSelectionListener(TuxGuitar.instance().getAction(MoveBeatsCustomAction.NAME));
-		
+
 		this.noteMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 		TGBeat beat = caret.getSelectedBeat();
@@ -217,7 +213,8 @@ public void update(){
 		this.effectMenuItem.update();
 		this.dynamicMenuItem.update();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.noteMenuItem, "beat", null);
 		setMenuItemTextAndAccelerator(this.cleanBeat, "beat.clean", CleanBeatAction.NAME);
@@ -238,13 +235,13 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.moveBeatsLeft, "beat.move-left", MoveBeatsLeftAction.NAME);
 		setMenuItemTextAndAccelerator(this.moveBeatsRight, "beat.move-right", MoveBeatsRightAction.NAME);
 		setMenuItemTextAndAccelerator(this.moveBeatsCustom, "beat.move-custom", MoveBeatsCustomAction.NAME);
-		
+
 		this.durationMenuItem.loadProperties();
 		this.chordMenuItem.loadProperties();
 		this.effectMenuItem.loadProperties();
 		this.dynamicMenuItem.loadProperties();
 	}
-	
+
 	public void loadIcons(){
 		this.tiedNote.setImage(TuxGuitar.instance().getIconManager().getNoteTied());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ChordMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ChordMenuItem.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ChordMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ChordMenuItem.java
index 2f1a86b2..862b07af 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ChordMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ChordMenuItem.java
@@ -19,14 +19,15 @@ public class ChordMenuItem extends MenuItems{
 	private Menu menu;
 	private MenuItem insertChord;
 	private MenuItem[] subMenuItems;
-	
+
 	private long lastEdit;
-	
+
 	public ChordMenuItem(Shell shell,Menu parent, int style) {
 		this.chordMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems() {
 		//--INSERT CHORD--
 		this.insertChord = new MenuItem(this.menu, SWT.PUSH);
@@ -35,13 +36,13 @@ public void showItems() {
 		new MenuItem(this.menu, SWT.SEPARATOR);
 		//--CUSTOM CHORDS--
 		this.addItems();
-		
+
 		this.chordMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
 	public void addItems() {
 		this.disposeItems();
 		this.subMenuItems = new MenuItem[TuxGuitar.instance().getCustomChordManager().countChords()];
@@ -49,14 +50,14 @@ public void addItems() {
 			TGChord chord = TuxGuitar.instance().getCustomChordManager().getChord(i);
 			ActionData actionData = new ActionData();
 			actionData.put(InsertChordAction.PROPERTY_CHORD, chord);
-			
+
 			this.subMenuItems[i] = new MenuItem(this.menu, SWT.PUSH);
 			this.subMenuItems[i].setData(actionData);
 			this.subMenuItems[i].setText(chord.getName());
 			this.subMenuItems[i].addSelectionListener(TuxGuitar.instance().getAction(InsertChordAction.NAME));
 		}
 	}
-	
+
 	public void disposeItems() {
 		if(this.subMenuItems != null){
 			for(int i = 0;i < this.subMenuItems.length; i++){
@@ -64,7 +65,7 @@ public void disposeItems() {
 			}
 		}
 	}
-	
+
 	public void widgetSelected(SelectionEvent event) {
 		if (event.detail == SWT.ARROW && this.subMenuItems != null && this.subMenuItems.length > 0) {
 			ToolItem item = (ToolItem) event.widget;
@@ -76,7 +77,8 @@ public void widgetSelected(SelectionEvent event) {
 			TuxGuitar.instance().getAction(InsertChordAction.NAME).process(new ActionData());
 		}
 	}
-	
+
+	@Override
 	public void update(){
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
 		if(this.lastEdit != TuxGuitar.instance().getCustomChordManager().getLastEdit()){
@@ -88,12 +90,13 @@ public void update(){
 			this.subMenuItems[i].setEnabled(!running);
 		}
 	}
-	
+
+	@Override
 	public void loadProperties() {
 		setMenuItemTextAndAccelerator(this.chordMenuItem, "chord", null);
 		setMenuItemTextAndAccelerator(this.insertChord, "insert.chord", InsertChordAction.NAME);
 	}
-	
+
 	public void loadIcons() {
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/CompositionMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/CompositionMenuItem.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/CompositionMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/CompositionMenuItem.java
index b5d9e852..6059a089 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/CompositionMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/CompositionMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -24,9 +21,6 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class CompositionMenuItem extends MenuItems{
 	private MenuItem compositionMenuItem;
@@ -39,14 +33,15 @@ public class CompositionMenuItem extends MenuItems{
 	private MenuItem repeatClose;
 	private MenuItem repeatAlternative;
 	private MenuItem tripletFeel;
-	
+
 	private MenuItem properties;
-	
+
 	public CompositionMenuItem(Shell shell,Menu parent, int style) {
 		this.compositionMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--TIME SIGNATURE--
 		this.timeSignature = new MenuItem(this.menu, SWT.PUSH);
@@ -74,19 +69,20 @@ public void showItems(){
 		//--REPEAT ALTERNATIVE--
 		this.repeatAlternative = new MenuItem(this.menu, SWT.PUSH);
 		this.repeatAlternative.addSelectionListener(TuxGuitar.instance().getAction(RepeatAlternativeAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
 		//--INFO--
 		this.properties = new MenuItem(this.menu, SWT.PUSH);
 		this.properties.addSelectionListener(TuxGuitar.instance().getAction(ChangeInfoAction.NAME));
-		
+
 		this.compositionMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
 		this.timeSignature.setEnabled(!running);
@@ -98,9 +94,10 @@ public void update(){
 		this.repeatClose.setEnabled(!running);
 		this.repeatAlternative.setEnabled(!running);
 	}
-	
+
+	@Override
 	public void loadProperties(){
-		setMenuItemTextAndAccelerator(this.compositionMenuItem, "composition", null);		
+		setMenuItemTextAndAccelerator(this.compositionMenuItem, "composition", null);
 		setMenuItemTextAndAccelerator(this.timeSignature, "composition.timesignature", ChangeTimeSignatureAction.NAME);
 		setMenuItemTextAndAccelerator(this.tempo, "composition.tempo", ChangeTempoAction.NAME);
 		setMenuItemTextAndAccelerator(this.clef, "composition.clef", ChangeClefAction.NAME);
@@ -111,7 +108,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.repeatAlternative, "repeat.alternative", RepeatAlternativeAction.NAME);
 		setMenuItemTextAndAccelerator(this.properties, "composition.properties", ChangeInfoAction.NAME);
 	}
-	
+
 	public void loadIcons() {
 		this.timeSignature.setImage(TuxGuitar.instance().getIconManager().getCompositionTimeSignature());
 		this.tempo.setImage(TuxGuitar.instance().getIconManager().getCompositionTempo());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/DurationMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/DurationMenuItem.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/DurationMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/DurationMenuItem.java
index 38ba7f67..c2005144 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/DurationMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/DurationMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -25,9 +22,6 @@
 import org.herac.tuxguitar.song.models.TGDuration;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DurationMenuItem  extends MenuItems{
 	private MenuItem durationMenuItem;
@@ -42,12 +36,13 @@ public class DurationMenuItem  extends MenuItems{
 	private MenuItem dotted;
 	private MenuItem doubleDotted;
 	private MenuItem division;
-	
+
 	public DurationMenuItem(Shell shell,Menu parent, int style) {
 		this.durationMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--whole--
 		this.whole = new MenuItem(this.menu, SWT.PUSH);
@@ -70,27 +65,28 @@ public void showItems(){
 		//--sixtyFourth--
 		this.sixtyFourth = new MenuItem(this.menu, SWT.PUSH);
 		this.sixtyFourth.addSelectionListener(TuxGuitar.instance().getAction(SetSixtyFourthDurationAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--dotted---
 		this.dotted = new MenuItem(this.menu, SWT.PUSH);
 		this.dotted.addSelectionListener(TuxGuitar.instance().getAction(ChangeDottedDurationAction.NAME));
-		
+
 		this.doubleDotted = new MenuItem(this.menu, SWT.PUSH);
 		this.doubleDotted.addSelectionListener(TuxGuitar.instance().getAction(ChangeDoubleDottedDurationAction.NAME));
-		
+
 		//--division---
 		this.division = new MenuItem(this.menu, SWT.PUSH);
 		this.division.addSelectionListener(TuxGuitar.instance().getAction(ChangeDivisionTypeAction.NAME));
-		
+
 		this.durationMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
 		this.whole.setEnabled(!running);
@@ -104,7 +100,8 @@ public void update(){
 		this.doubleDotted.setEnabled(!running);
 		this.division.setEnabled(!running);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.durationMenuItem, "duration", null);
 		setMenuItemTextAndAccelerator(this.whole, "duration.whole", SetWholeDurationAction.NAME);
@@ -118,7 +115,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.doubleDotted, "duration.doubledotted", ChangeDoubleDottedDurationAction.NAME);
 		setMenuItemTextAndAccelerator(this.division, "duration.division-type", ChangeDivisionTypeAction.NAME);
 	}
-	
+
 	public void loadIcons() {
 		this.whole.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.WHOLE));
 		this.half.setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.HALF));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/DynamicMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/DynamicMenuItem.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/DynamicMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/DynamicMenuItem.java
index ff175083..1080ffe3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/DynamicMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/DynamicMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -19,9 +16,6 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DynamicMenuItem extends MenuItems{
 	private MenuItem dynamicMenuItem;
@@ -34,52 +28,54 @@ public class DynamicMenuItem extends MenuItems{
 	private MenuItem forte;
 	private MenuItem fortissimo;
 	private MenuItem forteFortissimo;
-	
+
 	public DynamicMenuItem(Shell shell,Menu parent, int style) {
 		this.dynamicMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
-		
+
 		this.pianoPianissimo = new MenuItem(this.menu, SWT.CHECK);
 		this.pianoPianissimo.setData(createChangeVelocityActionData(TGVelocities.PIANO_PIANISSIMO));
 		this.pianoPianissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.pianissimo = new MenuItem(this.menu, SWT.CHECK);
 		this.pianissimo.setData(createChangeVelocityActionData(TGVelocities.PIANISSIMO));
 		this.pianissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.piano = new MenuItem(this.menu, SWT.CHECK);
 		this.piano.setData(createChangeVelocityActionData(TGVelocities.PIANO));
 		this.piano.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.mezzoPiano = new MenuItem(this.menu, SWT.CHECK);
 		this.mezzoPiano.setData(createChangeVelocityActionData(TGVelocities.MEZZO_PIANO));
 		this.mezzoPiano.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.mezzoForte = new MenuItem(this.menu, SWT.CHECK);
 		this.mezzoForte.setData(createChangeVelocityActionData(TGVelocities.MEZZO_FORTE));
 		this.mezzoForte.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.forte = new MenuItem(this.menu, SWT.CHECK);
 		this.forte.setData(createChangeVelocityActionData(TGVelocities.FORTE));
 		this.forte.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.fortissimo = new MenuItem(this.menu, SWT.CHECK);
 		this.fortissimo.setData(createChangeVelocityActionData(TGVelocities.FORTISSIMO));
 		this.fortissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.forteFortissimo = new MenuItem(this.menu, SWT.CHECK);
 		this.forteFortissimo.setData(createChangeVelocityActionData(TGVelocities.FORTE_FORTISSIMO));
 		this.forteFortissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.dynamicMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGNote note = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getSelectedNote();
 		int velocity = ((note != null)?note.getVelocity():TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getVelocity());
@@ -101,7 +97,8 @@ public void update(){
 		this.forteFortissimo.setSelection(velocity == TGVelocities.FORTE_FORTISSIMO);
 		this.forteFortissimo.setEnabled(!running);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.dynamicMenuItem.setText(TuxGuitar.getProperty("dynamic"));
 		this.pianoPianissimo.setText(TuxGuitar.getProperty("dynamic.piano-pianissimo"));
@@ -113,11 +110,11 @@ public void loadProperties(){
 		this.fortissimo.setText(TuxGuitar.getProperty("dynamic.fortissimo"));
 		this.forteFortissimo.setText(TuxGuitar.getProperty("dynamic.forte-fortissimo"));
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
-	
+
 	private ActionData createChangeVelocityActionData(int velocity){
 		ActionData actionData = new ActionData();
 		actionData.put(ChangeVelocityAction.PROPERTY_VELOCITY, new Integer(velocity));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/EditMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/EditMenuItem.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/EditMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/EditMenuItem.java
index af66b45d..f177525c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/EditMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/EditMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -23,14 +20,11 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class EditMenuItem extends MenuItems{
-	
+
 	private MenuItem editMenuItem;
-	private Menu menu; 
+	private Menu menu;
 	private MenuItem undo;
 	private MenuItem redo;
 	private MenuItem modeSelection;
@@ -38,12 +32,13 @@ public class EditMenuItem extends MenuItems{
 	private MenuItem notNaturalKey;
 	private MenuItem voice1;
 	private MenuItem voice2;
-	
+
 	public EditMenuItem(Shell shell,Menu parent, int style) {
 		this.editMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//---------------------------------------------------
 		//--UNDO--
@@ -71,13 +66,14 @@ public void showItems(){
 		//--VOICE 2
 		this.voice2 = new MenuItem(this.menu, SWT.RADIO);
 		this.voice2.addSelectionListener(TuxGuitar.instance().getAction(SetVoice2Action.NAME));
-		
+
 		this.editMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		EditorKit kit = TuxGuitar.instance().getTablatureEditor().getTablature().getEditorKit();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -92,7 +88,8 @@ public void update(){
 		this.voice1.setSelection(kit.getTablature().getCaret().getVoice() == 0);
 		this.voice2.setSelection(kit.getTablature().getCaret().getVoice() == 1);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.editMenuItem, "edit.menu", null);
 		setMenuItemTextAndAccelerator(this.undo, "edit.undo", UndoAction.NAME);
@@ -103,7 +100,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.voice1, "edit.voice-1", SetVoice1Action.NAME);
 		setMenuItemTextAndAccelerator(this.voice2, "edit.voice-2", SetVoice2Action.NAME);
 	}
-	
+
 	public void loadIcons(){
 		this.undo.setImage(TuxGuitar.instance().getIconManager().getEditUndo());
 		this.redo.setImage(TuxGuitar.instance().getIconManager().getEditRedo());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/FileMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/FileMenuItem.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/FileMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/FileMenuItem.java
index adca8626..8e2b1875 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/FileMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/FileMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -10,6 +7,8 @@
 import java.net.URL;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
@@ -39,16 +38,14 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class FileMenuItem extends MenuItems {
-	
-	private MenuItem fileMenuItem;
-	private Menu menu;
+
+	private final MenuItem fileMenuItem;
+	private final Menu menu;
 	private Menu newSongMenu;
-	private Menu importMenu; 
-	private Menu exportMenu; 
+	private Menu importMenu;
+	private Menu exportMenu;
 	private Menu historyMenu;
 	private MenuItem newSong;
 	private MenuItem newSongDefault;
@@ -63,17 +60,18 @@ public class FileMenuItem extends MenuItems {
 	private MenuItem historyItem;
 	private MenuItem[] historyFiles;
 	private MenuItem exit;
-	
-	private List importItems;
-	private List exportItems;
-	
+
+	private final List<MenuItem> importItems;
+	private final List<MenuItem> exportItems;
+
 	public FileMenuItem(Shell shell,Menu parent, int style) {
 		this.fileMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
-		this.importItems = new ArrayList();
-		this.exportItems = new ArrayList();
+		this.importItems = new ArrayList<MenuItem>();
+		this.exportItems = new ArrayList<MenuItem>();
 	}
-	
+
+	@Override
 	public void showItems(){
 		//---------------------------------------------------
 		//--NEW--
@@ -82,9 +80,9 @@ public void showItems(){
 		this.newSongMenu = new Menu(this.menu.getShell(), SWT.DROP_DOWN);
 		this.newSongDefault = new MenuItem(this.newSongMenu, SWT.PUSH);
 		this.newSongDefault.addSelectionListener(TuxGuitar.instance().getAction(NewFileAction.NAME));
-		
+
 		this.addNewSongTemplates();
-		
+
 		//--OPEN--
 		this.open = new MenuItem(this.menu, SWT.PUSH);
 		this.open.addSelectionListener(TuxGuitar.instance().getAction(OpenFileAction.NAME));
@@ -99,14 +97,14 @@ public void showItems(){
 		//--SAVE AS--
 		this.saveAs = new MenuItem(this.menu, SWT.PUSH);
 		this.saveAs.addSelectionListener(TuxGuitar.instance().getAction(SaveAsFileAction.NAME));
-		
+
 		//-- IMPORT | EXPORT --
 		int countImporters = TGFileFormatManager.instance().countImporters();
 		int countExporters = TGFileFormatManager.instance().countExporters();
 		if( ( countImporters + countExporters ) > 0 ){
 			//--SEPARATOR--
 			new MenuItem(this.menu, SWT.SEPARATOR);
-			
+
 			//--IMPORT--
 			this.importItems.clear();
 			if( countImporters > 0 ){
@@ -114,7 +112,7 @@ public void showItems(){
 				this.importMenu = new Menu(this.menu.getShell(), SWT.DROP_DOWN);
 				this.addImporters();
 			}
-			
+
 			//--EXPORT--
 			this.exportItems.clear();
 			if( countExporters > 0 ){
@@ -123,10 +121,10 @@ public void showItems(){
 				this.addExporters();
 			}
 		}
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--PRINT PREVIEW--
 		this.printPreview = new MenuItem(this.menu, SWT.PUSH);
 		this.printPreview.addSelectionListener(TuxGuitar.instance().getAction(PrintPreviewAction.NAME));
@@ -135,7 +133,7 @@ public void showItems(){
 		this.print.addSelectionListener(TuxGuitar.instance().getAction(PrintAction.NAME));
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--HISTORY--
 		this.historyItem = new MenuItem(this.menu,SWT.CASCADE);
 		this.historyMenu = new Menu(this.menu.getShell(), SWT.DROP_DOWN);
@@ -145,7 +143,7 @@ public void showItems(){
 		//--EXIT--
 		this.exit = new MenuItem(this.menu, SWT.PUSH);
 		this.exit.addSelectionListener(TuxGuitar.instance().getAction(ExitAction.NAME));
-		
+
 		//---------------------------------------------------
 		if( this.importItem != null ){
 			this.importItem.setMenu(this.importMenu);
@@ -156,23 +154,23 @@ public void showItems(){
 		this.newSong.setMenu(this.newSongMenu);
 		this.historyItem.setMenu(this.historyMenu);
 		this.fileMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
-	private void addNewSongTemplates(){		
+
+	private void addNewSongTemplates(){
 		if( TuxGuitar.instance().getTemplateManager().countTemplates() > 0 ){
 			//--SEPARATOR--
 			new MenuItem(this.newSongMenu, SWT.SEPARATOR);
-			
-			Iterator it = TuxGuitar.instance().getTemplateManager().getTemplates();
+
+			Iterator<TGTemplate> it = TuxGuitar.instance().getTemplateManager().getTemplates();
 			while( it.hasNext() ){
-				TGTemplate tgTemplate = (TGTemplate)it.next();
-				
+				TGTemplate tgTemplate = it.next();
+
 				ActionData actionData = new ActionData();
 				actionData.put(NewFileAction.PROPERTY_TEMPLATE, tgTemplate);
-				
+
 				MenuItem menuItem = new MenuItem(this.newSongMenu, SWT.PUSH);
 				menuItem.setText(tgTemplate.getName());
 				menuItem.setData(actionData);
@@ -180,98 +178,116 @@ private void addNewSongTemplates(){
 			}
 		}
 	}
-	
+
 	private void addImporters(){
-		List importersRaw = new ArrayList();
-		List importersFile = new ArrayList();
-		
-		Iterator importers = TGFileFormatManager.instance().getImporters();
+		List<TGRawImporter> importersRaw = new ArrayList<TGRawImporter>();
+		List<TGRawImporter> importersFile = new ArrayList<TGRawImporter>();
+
+		Iterator<TGRawImporter> importers = TGFileFormatManager.instance().getImporters();
 		while(importers.hasNext()){
-			TGRawImporter importer = (TGRawImporter)importers.next();
+			TGRawImporter importer = importers.next();
 			if( importer instanceof TGLocalFileImporter ){
 				importersFile.add( importer );
 			}else{
 				importersRaw.add( importer );
 			}
 		}
-		
+
+		Comparator<TGRawImporter> comparator = new Comparator<TGRawImporter>() {
+			@Override
+			public int compare(TGRawImporter a, TGRawImporter b) {
+				return a.getImportName().compareToIgnoreCase(b.getImportName());
+			}
+		};
+		Collections.sort(importersRaw, comparator);
+		Collections.sort(importersFile, comparator);
+
 		for( int i = 0 ; i < importersFile.size() ; i ++ ){
 			ActionData actionData = new ActionData();
 			actionData.put(ImportSongAction.PROPERTY_IMPORTER, importersFile.get( i ));
-			
+
 			MenuItem item = new MenuItem(this.importMenu, SWT.PUSH);
 			item.setData(actionData);
 			item.addSelectionListener(TuxGuitar.instance().getAction(ImportSongAction.NAME));
 			this.importItems.add( item );
 		}
-		
+
 		//--SEPARATOR--
 		if( !importersFile.isEmpty() && !importersRaw.isEmpty() ){
 			new MenuItem(this.importMenu, SWT.SEPARATOR);
 		}
-		
+
 		for( int i = 0 ; i < importersRaw.size() ; i ++ ){
 			ActionData actionData = new ActionData();
 			actionData.put(ImportSongAction.PROPERTY_IMPORTER, importersRaw.get( i ));
-			
+
 			MenuItem item = new MenuItem(this.importMenu, SWT.PUSH);
 			item.setData(actionData);
 			item.addSelectionListener(TuxGuitar.instance().getAction(ImportSongAction.NAME));
 			this.importItems.add( item );
 		}
 	}
-	
+
 	private void addExporters(){
-		List exportersRaw = new ArrayList();
-		List exportersFile = new ArrayList();
-		
-		Iterator exporters = TGFileFormatManager.instance().getExporters();
+		List<TGRawExporter> exportersRaw = new ArrayList<TGRawExporter>();
+		List<TGRawExporter> exportersFile = new ArrayList<TGRawExporter>();
+
+		Iterator<TGRawExporter> exporters = TGFileFormatManager.instance().getExporters();
 		while(exporters.hasNext()){
-			TGRawExporter exporter = (TGRawExporter)exporters.next();
+			TGRawExporter exporter = exporters.next();
 			if( exporter instanceof TGLocalFileExporter ){
 				exportersFile.add( exporter );
 			}else{
 				exportersRaw.add( exporter );
 			}
 		}
-		
+
+		Comparator<TGRawExporter> comparator = new Comparator<TGRawExporter>() {
+			@Override
+			public int compare(TGRawExporter a, TGRawExporter b) {
+				return a.getExportName().compareToIgnoreCase(b.getExportName());
+			}
+		};
+		Collections.sort(exportersRaw, comparator);
+		Collections.sort(exportersFile, comparator);
+
 		for( int i = 0 ; i < exportersFile.size() ; i ++ ){
 			ActionData actionData = new ActionData();
 			actionData.put(ExportSongAction.PROPERTY_EXPORTER, exportersFile.get( i ));
-			
+
 			MenuItem item = new MenuItem(this.exportMenu, SWT.PUSH);
 			item.setData(actionData);
 			item.addSelectionListener(TuxGuitar.instance().getAction(ExportSongAction.NAME));
 			this.exportItems.add( item );
 		}
-		
+
 		//--SEPARATOR--
 		if( !exportersFile.isEmpty() && !exportersRaw.isEmpty() ){
 			new MenuItem(this.exportMenu, SWT.SEPARATOR);
 		}
-		
+
 		for( int i = 0 ; i < exportersRaw.size() ; i ++ ){
 			ActionData actionData = new ActionData();
 			actionData.put(ExportSongAction.PROPERTY_EXPORTER, exportersRaw.get( i ));
-			
+
 			MenuItem item = new MenuItem(this.exportMenu, SWT.PUSH);
 			item.setData(actionData);
 			item.addSelectionListener(TuxGuitar.instance().getAction(ExportSongAction.NAME));
 			this.exportItems.add( item );
 		}
 	}
-	
+
 	private void disposeHistoryFiles(){
 		for(int i = 0;i < this.historyFiles.length; i++){
 			this.historyFiles[i].dispose();
 		}
 	}
-	
+
 	private void updateHistoryFiles(){
-		List urls = TuxGuitar.instance().getFileHistory().getURLs();
+		List<URL> urls = TuxGuitar.instance().getFileHistory().getURLs();
 		this.historyFiles = new MenuItem[urls.size()];
 		for(int i = 0;i < this.historyFiles.length; i++){
-			URL url = (URL)urls.get(i);
+			URL url = urls.get(i);
 			ActionData actionData = new ActionData();
 			actionData.put(OpenFileAction.PROPERTY_URL, url);
 			this.historyFiles[i] = new MenuItem(this.historyMenu, SWT.PUSH);
@@ -281,7 +297,7 @@ private void updateHistoryFiles(){
 		}
 		this.historyItem.setEnabled(this.historyFiles.length > 0);
 	}
-	
+
 	private String decode(String url){
 		try {
 			return URLDecoder.decode(url, "UTF-8");
@@ -290,7 +306,8 @@ private String decode(String url){
 		}
 		return url;
 	}
-	
+
+	@Override
 	public void update(){
 		if(TuxGuitar.instance().getFileHistory().isChanged()){
 			disposeHistoryFiles();
@@ -298,7 +315,8 @@ public void update(){
 			TuxGuitar.instance().getFileHistory().setChanged(false);
 		}
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.fileMenuItem, "file", null);
 		setMenuItemTextAndAccelerator(this.newSong, "file.new", null);
@@ -311,14 +329,14 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.print, "file.print", PrintAction.NAME);
 		setMenuItemTextAndAccelerator(this.historyItem, "file.history", null);
 		setMenuItemTextAndAccelerator(this.exit, "file.exit", ExitAction.NAME);
-		
+
 		if( this.importItem != null ){
 			setMenuItemTextAndAccelerator(this.importItem, "file.import", ImportSongAction.NAME);
-			
-			Iterator importItems = this.importItems.iterator();
+
+			Iterator<MenuItem> importItems = this.importItems.iterator();
 			while(importItems.hasNext()){
-				MenuItem item = (MenuItem)importItems.next();
-				
+				MenuItem item = importItems.next();
+
 				Object itemImporter = ((ActionData)item.getData()).get(ImportSongAction.PROPERTY_IMPORTER);
 				if( itemImporter instanceof TGLocalFileImporter ){
 					item.setText(TuxGuitar.getProperty("file.import") + " " + ((TGRawImporter)itemImporter).getImportName());
@@ -329,11 +347,11 @@ public void loadProperties(){
 		}
 		if( this.exportItem != null ){
 			setMenuItemTextAndAccelerator(this.exportItem, "file.export", ExportSongAction.NAME);
-			
-			Iterator exportItems = this.exportItems.iterator();
+
+			Iterator<MenuItem> exportItems = this.exportItems.iterator();
 			while(exportItems.hasNext()){
-				MenuItem item = (MenuItem)exportItems.next();
-				
+				MenuItem item = exportItems.next();
+
 				Object itemExporter = ((ActionData)item.getData()).get(ExportSongAction.PROPERTY_EXPORTER);
 				if( itemExporter instanceof TGLocalFileExporter ){
 					item.setText(TuxGuitar.getProperty("file.export") + " " + ((TGRawExporter)itemExporter).getExportName());
@@ -343,7 +361,7 @@ public void loadProperties(){
 			}
 		}
 	}
-	
+
 	public void loadIcons(){
 		this.newSong.setImage(TuxGuitar.instance().getIconManager().getFileNew());
 		this.open.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/HelpMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/HelpMenuItem.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/HelpMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/HelpMenuItem.java
index 5d42ae3f..9f179efe 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/HelpMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/HelpMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -17,46 +14,46 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class HelpMenuItem extends MenuItems{
 	private MenuItem helpMenuItem;
-	private Menu menu; 
+	private Menu menu;
 	private MenuItem doc;
 	private MenuItem about;
-	
+
 	public HelpMenuItem(Shell shell,Menu parent, int style) {
 		this.helpMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--Doc
 		this.doc = new MenuItem(this.menu, SWT.PUSH);
 		this.doc.addSelectionListener(TuxGuitar.instance().getAction(ShowDocAction.NAME));
-		
+
 		//--ABOUT
 		this.about = new MenuItem(this.menu, SWT.PUSH);
 		this.about.addSelectionListener(TuxGuitar.instance().getAction(ShowAboutAction.NAME));
-		
+
 		this.helpMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.helpMenuItem, "help", null);
 		setMenuItemTextAndAccelerator(this.doc, "help.doc", ShowDocAction.NAME);
 		setMenuItemTextAndAccelerator(this.about, "help.about", ShowAboutAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
-	
+
+	@Override
 	public void update(){
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/MarkerMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/MarkerMenuItem.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/MarkerMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/MarkerMenuItem.java
index 52e3cc46..cf948756 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/MarkerMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/MarkerMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -21,9 +18,6 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MarkerMenuItem extends MenuItems{
 	private MenuItem markerMenuItem;
@@ -34,50 +28,53 @@ public class MarkerMenuItem extends MenuItems{
 	private MenuItem last;
 	private MenuItem next;
 	private MenuItem previous;
-	
+
 	public MarkerMenuItem(Shell shell,Menu parent, int style) {
 		this.markerMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--ADD--
 		this.add = new MenuItem(this.menu, SWT.PUSH);
 		this.add.addSelectionListener(TuxGuitar.instance().getAction(AddMarkerAction.NAME));
-		
+
 		//--LIST--
 		this.list = new MenuItem(this.menu, SWT.PUSH);
 		this.list.addSelectionListener(TuxGuitar.instance().getAction(ListMarkersAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--FIRST--
 		this.first = new MenuItem(this.menu, SWT.PUSH);
 		this.first.addSelectionListener(TuxGuitar.instance().getAction(GoFirstMarkerAction.NAME));
-		
+
 		//--PREVIOUS--
 		this.previous = new MenuItem(this.menu, SWT.PUSH);
 		this.previous.addSelectionListener(TuxGuitar.instance().getAction(GoPreviousMarkerAction.NAME));
-		
+
 		//--PREVIOUS--
 		this.next = new MenuItem(this.menu, SWT.PUSH);
 		this.next.addSelectionListener(TuxGuitar.instance().getAction(GoNextMarkerAction.NAME));
-		
+
 		//--LAST--
 		this.last = new MenuItem(this.menu, SWT.PUSH);
 		this.last.addSelectionListener(TuxGuitar.instance().getAction(GoLastMarkerAction.NAME));
-		
+
 		this.markerMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		//Nothing to do
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.markerMenuItem, "marker", null);
 		setMenuItemTextAndAccelerator(this.add, "marker.add", AddMarkerAction.NAME);
@@ -87,7 +84,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.previous, "marker.previous", GoPreviousMarkerAction.NAME);
 		setMenuItemTextAndAccelerator(this.next, "marker.next", GoNextMarkerAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		this.add.setImage(TuxGuitar.instance().getIconManager().getMarkerAdd());
 		this.list.setImage(TuxGuitar.instance().getIconManager().getMarkerList());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/MeasureMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/MeasureMenuItem.java
similarity index 89%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/MeasureMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/MeasureMenuItem.java
index 04aa84ba..6831974d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/MeasureMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/MeasureMenuItem.java
@@ -1,12 +1,10 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
@@ -20,19 +18,17 @@
 import org.herac.tuxguitar.app.actions.measure.GoPreviousMeasureAction;
 import org.herac.tuxguitar.app.actions.measure.PasteMeasureAction;
 import org.herac.tuxguitar.app.actions.measure.RemoveMeasureAction;
+import org.herac.tuxguitar.app.clipboard.MeasureTransfer;
 import org.herac.tuxguitar.app.items.MenuItems;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MeasureMenuItem extends MenuItems{
-	
-	private MenuItem measureMenuItem;
-	private Menu menu; 
+
+	private final MenuItem measureMenuItem;
+	private final Menu menu;
 	private MenuItem first;
 	private MenuItem last;
 	private MenuItem next;
@@ -42,12 +38,13 @@ public class MeasureMenuItem extends MenuItems{
 	private MenuItem removeMeasure;
 	private MenuItem copyMeasure;
 	private MenuItem pasteMeasure;
-	
+
 	public MeasureMenuItem(Shell shell,Menu parent, int style) {
 		this.measureMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--first--
 		this.first = new MenuItem(this.menu, SWT.PUSH);
@@ -61,7 +58,7 @@ public void showItems(){
 		//--last--
 		this.last = new MenuItem(this.menu, SWT.PUSH);
 		this.last.addSelectionListener(TuxGuitar.instance().getAction(GoLastMeasureAction.NAME));
-		
+
 		//--SEPARATOR
 		new MenuItem(this.menu, SWT.SEPARATOR);
 		//--add--
@@ -73,7 +70,7 @@ public void showItems(){
 		//--remove--
 		this.removeMeasure = new MenuItem(this.menu, SWT.PUSH);
 		this.removeMeasure.addSelectionListener(TuxGuitar.instance().getAction(RemoveMeasureAction.NAME));
-		
+
 		//--SEPARATOR
 		new MenuItem(this.menu, SWT.SEPARATOR);
 		//--copy--
@@ -81,15 +78,16 @@ public void showItems(){
 		this.copyMeasure.addSelectionListener(TuxGuitar.instance().getAction(CopyMeasureAction.NAME));
 		//--paste--
 		this.pasteMeasure = new MenuItem(this.menu, SWT.PUSH);
-		
+
 		this.pasteMeasure.addSelectionListener(TuxGuitar.instance().getAction(PasteMeasureAction.NAME));
-		
+
 		this.measureMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGMeasureImpl measure = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -103,9 +101,18 @@ public void update(){
 		this.cleanMeasure.setEnabled(!running);
 		this.removeMeasure.setEnabled(!running);
 		this.copyMeasure.setEnabled(!running);
-		this.pasteMeasure.setEnabled(!running && !TuxGuitar.instance().getTablatureEditor().getClipBoard().isEmpty());
+
+		TransferData[] availableTypes = TuxGuitar.instance().getClipBoard().getAvailableTypes();
+		boolean hasTransferable = false;
+		for(TransferData type: availableTypes) {
+			if (MeasureTransfer.getInstance().isSupportedType(type)) {
+				hasTransferable = true;
+			}
+		}
+		this.pasteMeasure.setEnabled(!running && hasTransferable);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.measureMenuItem, "measure", null);
 		setMenuItemTextAndAccelerator(this.first, "measure.first", GoFirstMeasureAction.NAME);
@@ -118,7 +125,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.copyMeasure, "measure.copy", CopyMeasureAction.NAME);
 		setMenuItemTextAndAccelerator(this.pasteMeasure, "measure.paste", PasteMeasureAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/NoteEffectsMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/NoteEffectsMenuItem.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/NoteEffectsMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/NoteEffectsMenuItem.java
index 220f029c..477a6569 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/NoteEffectsMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/NoteEffectsMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -36,14 +33,11 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class NoteEffectsMenuItem extends MenuItems{
-	
+
 	private MenuItem noteEffectsMenuItem;
-	private Menu menu; 
+	private Menu menu;
 	private MenuItem vibrato;
 	private MenuItem bend;
 	private MenuItem tremoloBar;
@@ -63,113 +57,115 @@ public class NoteEffectsMenuItem extends MenuItems{
 	private MenuItem tapping;
 	private MenuItem slapping;
 	private MenuItem popping;
-	
+
 	private MenuItem fadeIn;
-	
+
 	public NoteEffectsMenuItem(Shell shell,Menu parent, int style) {
 		this.noteEffectsMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--VIBRATO--
 		this.vibrato = new MenuItem(this.menu, SWT.CHECK);
 		this.vibrato.addSelectionListener(TuxGuitar.instance().getAction(ChangeVibratoNoteAction.NAME));
-		
+
 		//--BEND--
 		this.bend = new MenuItem(this.menu, SWT.CHECK);
 		this.bend.addSelectionListener(TuxGuitar.instance().getAction(ChangeBendNoteAction.NAME));
-		
+
 		//--BEND--
 		this.tremoloBar = new MenuItem(this.menu, SWT.CHECK);
 		this.tremoloBar.addSelectionListener(TuxGuitar.instance().getAction(ChangeTremoloBarAction.NAME));
-		
+
 		//--SLIDE--
 		this.slide = new MenuItem(this.menu, SWT.CHECK);
 		this.slide.addSelectionListener(TuxGuitar.instance().getAction(ChangeSlideNoteAction.NAME));
-		
+
 		//--SLIDE--
 		this.deadNote = new MenuItem(this.menu, SWT.CHECK);
 		this.deadNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeDeadNoteAction.NAME));
-		
+
 		//--HAMMER--
 		this.hammer = new MenuItem(this.menu, SWT.CHECK);
 		this.hammer.addSelectionListener(TuxGuitar.instance().getAction(ChangeHammerNoteAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--GHOST NOTE--
 		this.ghostNote = new MenuItem(this.menu, SWT.CHECK);
 		this.ghostNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeGhostNoteAction.NAME));
-		
+
 		//--ACCENTUATED NOTE--
 		this.accentuatedNote = new MenuItem(this.menu, SWT.CHECK);
 		this.accentuatedNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeAccentuatedNoteAction.NAME));
-		
+
 		//--HEAVY ACCENTUATED NOTE--
 		this.heavyAccentuatedNote = new MenuItem(this.menu, SWT.CHECK);
 		this.heavyAccentuatedNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeHeavyAccentuatedNoteAction.NAME));
-		
+
 		//--LET RING--
 		this.letRing = new MenuItem(this.menu, SWT.CHECK);
 		this.letRing.addSelectionListener(TuxGuitar.instance().getAction(ChangeLetRingAction.NAME));
-		
+
 		//--HARMONIC NOTE--
 		this.harmonicNote = new MenuItem(this.menu, SWT.CHECK);
 		this.harmonicNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeHarmonicNoteAction.NAME));
-		
+
 		//--GRACE NOTE--
 		this.graceNote = new MenuItem(this.menu, SWT.CHECK);
 		this.graceNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeGraceNoteAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--TRILL--
 		this.trill = new MenuItem(this.menu, SWT.CHECK);
 		this.trill.addSelectionListener(TuxGuitar.instance().getAction(ChangeTrillNoteAction.NAME));
-		
+
 		//--TREMOLO PICKING--
 		this.tremoloPicking = new MenuItem(this.menu, SWT.CHECK);
 		this.tremoloPicking.addSelectionListener(TuxGuitar.instance().getAction(ChangeTremoloPickingAction.NAME));
-		
+
 		//--PALM MUTE--
 		this.palmMute = new MenuItem(this.menu, SWT.CHECK);
 		this.palmMute.addSelectionListener(TuxGuitar.instance().getAction(ChangePalmMuteAction.NAME));
-		
+
 		//--STACCATO
 		this.staccato = new MenuItem(this.menu, SWT.CHECK);
 		this.staccato.addSelectionListener(TuxGuitar.instance().getAction(ChangeStaccatoAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--TAPPING
 		this.tapping = new MenuItem(this.menu, SWT.CHECK);
 		this.tapping.addSelectionListener(TuxGuitar.instance().getAction(ChangeTappingAction.NAME));
-		
+
 		//--SLAPPING
 		this.slapping = new MenuItem(this.menu, SWT.CHECK);
 		this.slapping.addSelectionListener(TuxGuitar.instance().getAction(ChangeSlappingAction.NAME));
-		
+
 		//--POPPING
 		this.popping = new MenuItem(this.menu, SWT.CHECK);
 		this.popping.addSelectionListener(TuxGuitar.instance().getAction(ChangePoppingAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--FADE IN
 		this.fadeIn = new MenuItem(this.menu, SWT.CHECK);
 		this.fadeIn.addSelectionListener(TuxGuitar.instance().getAction(ChangeFadeInAction.NAME));
-		
+
 		this.noteEffectsMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGNote note = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getSelectedNote();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -214,7 +210,8 @@ public void update(){
 		this.fadeIn.setSelection(note != null && note.getEffect().isFadeIn());
 		this.fadeIn.setEnabled(!running && note != null);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.noteEffectsMenuItem, "effects", null);
 		setMenuItemTextAndAccelerator(this.vibrato, "effects.vibrato", ChangeVibratoNoteAction.NAME);
@@ -238,7 +235,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.popping, "effects.popping", ChangePoppingAction.NAME);
 		setMenuItemTextAndAccelerator(this.fadeIn, "effects.fade-in", ChangeFadeInAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ToolMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ToolMenuItem.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ToolMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ToolMenuItem.java
index cdff856a..37cfd966 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ToolMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ToolMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -25,63 +22,63 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class ToolMenuItem extends MenuItems {
-	private MenuItem settingsMenuItem;
-	private Menu menu;
+	private final MenuItem settingsMenuItem;
+	private final Menu menu;
 	private MenuItem scale;
 	private MenuItem browser;
 	private MenuItem transpose;
 	private MenuItem plugins;
 	private MenuItem config;
 	private MenuItem keyBindings;
-	
+
 	public ToolMenuItem(Shell shell,Menu parent, int style) {
 		this.settingsMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		this.transpose = new MenuItem(this.menu, SWT.PUSH);
 		this.transpose.addSelectionListener(TuxGuitar.instance().getAction(TransposeAction.NAME));
-		
+
 		this.scale = new MenuItem(this.menu, SWT.PUSH);
 		this.scale.addSelectionListener(TuxGuitar.instance().getAction(ScaleAction.NAME));
-		
+
 		this.browser = new MenuItem(this.menu, SWT.PUSH);
 		this.browser.addSelectionListener(TuxGuitar.instance().getAction(TGBrowserAction.NAME));
-		
-		Iterator it = TGCustomToolManager.instance().getCustomTools();
+
+		Iterator<TGCustomTool> it = TGCustomToolManager.instance().getCustomTools();
 		while(it.hasNext()){
-			TGCustomTool tool = (TGCustomTool)it.next();
+			TGCustomTool tool = it.next();
 			MenuItem menuItem = new MenuItem(this.menu, SWT.PUSH);
 			menuItem.setText(tool.getName());
 			menuItem.addSelectionListener(TuxGuitar.instance().getAction(tool.getAction()));
 		}
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--PLUGINS--
 		this.plugins = new MenuItem(this.menu, SWT.PUSH);
 		this.plugins.addSelectionListener(TuxGuitar.instance().getAction(EditPluginsAction.NAME));
-		
+
 		//--KEY BINDINGS--
 		this.keyBindings = new MenuItem(this.menu, SWT.PUSH);
 		this.keyBindings.addSelectionListener(TuxGuitar.instance().getAction(EditKeyBindingsAction.NAME));
-		
+
 		//--CONFIG--
 		this.config = new MenuItem(this.menu, SWT.PUSH);
 		this.config.addSelectionListener(TuxGuitar.instance().getAction(EditConfigAction.NAME));
-		
+
 		this.settingsMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.settingsMenuItem, "tools", null);
 		setMenuItemTextAndAccelerator(this.transpose, "tools.transpose", TransposeAction.NAME);
@@ -91,11 +88,12 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.keyBindings, "tools.shortcuts", EditKeyBindingsAction.NAME);
 		setMenuItemTextAndAccelerator(this.config, "tools.settings", EditConfigAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
-	
+
+	@Override
 	public void update(){
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
 		this.transpose.setEnabled( !running );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TrackMenu.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TrackMenu.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TrackMenu.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TrackMenu.java
index f577eb03..a0d8fbdb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TrackMenu.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TrackMenu.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -29,12 +26,9 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TrackMenu extends MenuItems{
-	
+
 	private Menu menu;
 	private MenuItem first;
 	private MenuItem last;
@@ -49,19 +43,20 @@ public class TrackMenu extends MenuItems{
 	private MenuItem changeSolo;
 	private MenuItem lyrics;
 	private MenuItem properties;
-	
+
 	public TrackMenu(Menu menu) {
 		this.menu = menu;
 	}
-	
+
 	public TrackMenu(Shell shell, int style) {
 		this(new Menu(shell, style));
 	}
-	
+
 	public Menu getMenu() {
 		return this.menu;
 	}
-	
+
+	@Override
 	public void showItems(){
 		if(!isDisposed()){
 			//--First--
@@ -111,12 +106,13 @@ public void showItems(){
 			//--PROPERTIES--
 			this.properties = new MenuItem(this.menu, SWT.PUSH);
 			this.properties.addSelectionListener(TuxGuitar.instance().getAction(TrackPropertiesAction.NAME));
-			
+
 			this.loadIcons();
 			this.loadProperties();
 		}
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		if(!isDisposed()){
 			setMenuItemTextAndAccelerator(this.first, "track.first", GoFirstTrackAction.NAME);
@@ -134,7 +130,8 @@ public void loadProperties(){
 			setMenuItemTextAndAccelerator(this.properties, "track.properties", TrackPropertiesAction.NAME);
 		}
 	}
-	
+
+	@Override
 	public void update(){
 		if(!isDisposed()){
 			TGTrackImpl track = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack();
@@ -156,15 +153,15 @@ public void update(){
 			this.changeMute.setSelection(track.isMute());
 		}
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.menu == null || this.menu.isDisposed());
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			this.menu.dispose();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TrackMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TrackMenuItem.java
similarity index 78%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TrackMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TrackMenuItem.java
index 25a5f327..08b2b097 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TrackMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TrackMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -14,35 +11,35 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TrackMenuItem extends MenuItems{
 	private MenuItem trackMenuItem;
 	private TrackMenu menu;
-	
+
 	public TrackMenuItem(Shell shell,Menu parent, int style) {
 		this.trackMenuItem = new MenuItem(parent, style);
 		this.menu = new TrackMenu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		this.menu.showItems();
 		this.trackMenuItem.setMenu(this.menu.getMenu());
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.setMenuItemTextAndAccelerator(this.trackMenuItem, "track", null);
 		this.menu.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		this.menu.update();
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TransportMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TransportMenuItem.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TransportMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TransportMenuItem.java
index 54ef61bb..34de8b72 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/TransportMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/TransportMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -24,15 +21,12 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TransportMenuItem extends MenuItems{
 	private static final int STATUS_STOPPED = 1;
 	private static final int STATUS_PAUSED = 2;
 	private static final int STATUS_RUNNING = 3;
-	
+
 	private MenuItem transportMenuItem;
 	private Menu menu;
 	private MenuItem play;
@@ -42,49 +36,51 @@ public class TransportMenuItem extends MenuItems{
 	private MenuItem mode;
 	private MenuItem loopSHeader;
 	private MenuItem loopEHeader;
-	
+
 	private int status;
-	
+
 	public TransportMenuItem(Shell shell,Menu parent, int style) {
 		this.transportMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		this.play = new MenuItem(this.menu,SWT.PUSH);
 		this.play.addSelectionListener(TuxGuitar.instance().getAction(TransportPlayAction.NAME));
-		
+
 		this.stop = new MenuItem(this.menu, SWT.PUSH);
 		this.stop.addSelectionListener(TuxGuitar.instance().getAction(TransportStopAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		this.metronome = new MenuItem(this.menu, SWT.CHECK);
 		this.metronome.addSelectionListener(TuxGuitar.instance().getAction(TransportMetronomeAction.NAME));
-		
+
 		this.countDown = new MenuItem(this.menu, SWT.CHECK);
 		this.countDown.addSelectionListener(TuxGuitar.instance().getAction(TransportCountDownAction.NAME));
-		
+
 		this.mode = new MenuItem(this.menu, SWT.PUSH);
 		this.mode.addSelectionListener(TuxGuitar.instance().getAction(TransportModeAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		this.loopSHeader = new MenuItem(this.menu, SWT.CHECK);
 		this.loopSHeader.addSelectionListener(TuxGuitar.instance().getAction(TransportSetLoopSHeaderAction.NAME));
-		
+
 		this.loopEHeader = new MenuItem(this.menu, SWT.CHECK);
 		this.loopEHeader.addSelectionListener(TuxGuitar.instance().getAction(TransportSetLoopEHeaderAction.NAME));
-		
+
 		this.transportMenuItem.setMenu(this.menu);
-		
+
 		this.status = STATUS_STOPPED;
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGMeasure measure = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure();
 		MidiPlayerMode pm = TuxGuitar.instance().getPlayer().getMode();
@@ -96,7 +92,8 @@ public void update(){
 		this.loopEHeader.setSelection( measure != null && measure.getNumber() == pm.getLoopEHeader() );
 		this.loadIcons(false);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.transportMenuItem, "transport", null);
 		setMenuItemTextAndAccelerator(this.play, "transport.start", TransportPlayAction.NAME);
@@ -107,16 +104,16 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.loopSHeader, "transport.set-loop-start", TransportSetLoopSHeaderAction.NAME);
 		setMenuItemTextAndAccelerator(this.loopEHeader, "transport.set-loop-end", TransportSetLoopEHeaderAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		this.loadIcons(true);
 		this.mode.setImage(TuxGuitar.instance().getIconManager().getTransportMode());
 		this.metronome.setImage(TuxGuitar.instance().getIconManager().getTransportMetronome());
 	}
-	
+
 	public void loadIcons(boolean force){
 		int lastStatus = this.status;
-		
+
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			this.status = STATUS_RUNNING;
 		}else if(TuxGuitar.instance().getPlayer().isPaused()){
@@ -124,7 +121,7 @@ public void loadIcons(boolean force){
 		}else{
 			this.status = STATUS_STOPPED;
 		}
-		
+
 		if(force || lastStatus != this.status){
 			if(this.status == STATUS_RUNNING){
 				this.stop.setImage(TuxGuitar.instance().getIconManager().getTransportIconStop2());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ViewMenuItem.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ViewMenuItem.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ViewMenuItem.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ViewMenuItem.java
index 59df70f9..d8c8dc97 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/menu/ViewMenuItem.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/menu/ViewMenuItem.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.menu;
 
@@ -32,12 +29,9 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ViewMenuItem extends MenuItems{
-	
+
 	private Menu menu;
 	private Menu chordMenu;
 	private MenuItem layoutMenuItem;
@@ -53,86 +47,88 @@ public class ViewMenuItem extends MenuItems{
 	private MenuItem scoreEnabled;
 	private MenuItem tablatureEnabled;
 	private MenuItem compact;
-	
+
 	private MenuItem chordMenuItem;
 	private MenuItem chordName;
 	private MenuItem chordDiagram;
-	
+
 	public ViewMenuItem(Shell shell,Menu parent, int style) {
 		this.layoutMenuItem = new MenuItem(parent, style);
 		this.menu = new Menu(shell, SWT.DROP_DOWN);
 	}
-	
+
+	@Override
 	public void showItems(){
 		//--TOOLBARS--
 		this.showToolbars = new MenuItem(this.menu, SWT.CHECK);
 		this.showToolbars.addSelectionListener(TuxGuitar.instance().getAction(ShowToolbarsAction.NAME));
-		
+
 		//--INSTRUMENTS--
 		this.showInstruments = new MenuItem(this.menu, SWT.CHECK);
 		this.showInstruments.addSelectionListener(TuxGuitar.instance().getAction(ShowInstrumentsAction.NAME));
-		
+
 		//--TRANSPORT--
 		this.showTransport = new MenuItem(this.menu, SWT.CHECK);
 		this.showTransport.addSelectionListener(TuxGuitar.instance().getAction(ShowTransportAction.NAME));
-		
+
 		//--FRETBOARD--
 		this.showFretBoard = new MenuItem(this.menu, SWT.CHECK);
 		this.showFretBoard.addSelectionListener(TuxGuitar.instance().getAction(ShowFretBoardAction.NAME));
-		
+
 		//--PIANO--
 		this.showPiano = new MenuItem(this.menu, SWT.CHECK);
 		this.showPiano.addSelectionListener(TuxGuitar.instance().getAction(ShowPianoAction.NAME));
-		
+
 		//--MATRIX--
 		this.showMatrix = new MenuItem(this.menu, SWT.CHECK);
 		this.showMatrix.addSelectionListener(TuxGuitar.instance().getAction(ShowMatrixAction.NAME));
-		
+
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--PAGE LAYOUT--
 		this.pageLayout = new MenuItem(this.menu, SWT.RADIO);
 		this.pageLayout.addSelectionListener(TuxGuitar.instance().getAction(SetPageLayoutAction.NAME));
-		
+
 		//--LINEAR LAYOUT--
 		this.linearLayout = new MenuItem(this.menu, SWT.RADIO);
 		this.linearLayout.addSelectionListener(TuxGuitar.instance().getAction(SetLinearLayoutAction.NAME));
-		
+
 		//--MULTITRACK--
 		this.multitrack = new MenuItem(this.menu, SWT.CHECK);
 		this.multitrack.addSelectionListener(TuxGuitar.instance().getAction(SetMultitrackViewAction.NAME));
-		
+
 		//--SCORE
 		this.scoreEnabled = new MenuItem(this.menu, SWT.CHECK);
 		this.scoreEnabled.addSelectionListener(TuxGuitar.instance().getAction(SetScoreEnabledAction.NAME));
-		
+
 		//--SCORE
 		this.tablatureEnabled = new MenuItem(this.menu, SWT.CHECK);
 		this.tablatureEnabled.addSelectionListener(TuxGuitar.instance().getAction(SetTablatureEnabledAction.NAME));
-		
+
 		//--COMPACT
 		this.compact = new MenuItem(this.menu, SWT.CHECK);
 		this.compact.addSelectionListener(TuxGuitar.instance().getAction(SetCompactViewAction.NAME));
-		
+
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		//--CHORD STYLE
 		this.chordMenuItem = new MenuItem(this.menu,SWT.CASCADE);
 		this.chordMenu = new Menu(this.menu.getShell(), SWT.DROP_DOWN);
-		
+
 		this.chordName = new MenuItem(this.chordMenu, SWT.CHECK);
 		this.chordName.addSelectionListener(TuxGuitar.instance().getAction(SetChordNameEnabledAction.NAME));
-		
+
 		this.chordDiagram = new MenuItem(this.chordMenu, SWT.CHECK);
 		this.chordDiagram.addSelectionListener(TuxGuitar.instance().getAction(SetChordDiagramEnabledAction.NAME));
-		
+
 		this.chordMenuItem.setMenu(this.chordMenu);
 		this.layoutMenuItem.setMenu(this.menu);
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGLayout layout = TuxGuitar.instance().getTablatureEditor().getTablature().getViewLayout();
 		int style = layout.getStyle();
@@ -152,7 +148,8 @@ public void update(){
 		this.chordName.setSelection( (style & TGLayout.DISPLAY_CHORD_NAME) != 0 );
 		this.chordDiagram.setSelection( (style & TGLayout.DISPLAY_CHORD_DIAGRAM) != 0 );
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.layoutMenuItem, "view", null);
 		setMenuItemTextAndAccelerator(this.showToolbars, "view.show-toolbars", ShowToolbarsAction.NAME);
@@ -171,7 +168,7 @@ public void loadProperties(){
 		setMenuItemTextAndAccelerator(this.chordName, "view.layout.chord-name", SetChordNameEnabledAction.NAME);
 		setMenuItemTextAndAccelerator(this.chordDiagram, "view.layout.chord-diagram", SetChordDiagramEnabledAction.NAME);
 	}
-	
+
 	public void loadIcons(){
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/BeatToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/BeatToolItems.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/BeatToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/BeatToolItems.java
index 7c1e2d52..51cc9ba1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/BeatToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/BeatToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -26,34 +23,33 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class BeatToolItems  extends ToolItems{
 	public static final String NAME = "beat.items";
-	
+
 	protected ToolBar toolBar;
 	private ToolItem tiedNote;
 	private ChordMenuItem chordItems;
-	
+
 	public BeatToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.toolBar = toolBar;
-		
+
 		this.tiedNote = new ToolItem(toolBar, SWT.CHECK);
 		this.tiedNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeTiedNoteAction.NAME));
-		
+
 		this.chordItems = new ChordMenuItem();
 		this.chordItems.addItems();
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGNote note = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getSelectedNote();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -62,41 +58,42 @@ public void update(){
 		this.chordItems.setEnabled(!running);
 		this.chordItems.update();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.tiedNote.setToolTipText(TuxGuitar.getProperty("note.tiednote"));
 		this.chordItems.setToolTipText(TuxGuitar.getProperty("insert.chord"));
 	}
-	
+
 	public void loadIcons(){
 		this.tiedNote.setImage(TuxGuitar.instance().getIconManager().getNoteTied());
 		this.chordItems.setImage(TuxGuitar.instance().getIconManager().getChord());
 	}
-	
+
 	private class ChordMenuItem extends SelectionAdapter {
 		private long lastEdit;
 		private ToolItem item;
 		private Menu subMenu;
 		private MenuItem[] subMenuItems;
-		
+
 		public ChordMenuItem() {
 			this.item = new ToolItem(BeatToolItems.this.toolBar, SWT.DROP_DOWN);
 			this.item.addSelectionListener(this);
 			this.subMenu = new Menu(this.item.getParent().getShell());
 		}
-		
+
 		public void setToolTipText(String text){
 			this.item.setToolTipText(text);
 		}
-		
+
 		public void setEnabled(boolean enabled){
 			this.item.setEnabled(enabled);
 		}
-		
+
 		public void setImage(Image image){
 			this.item.setImage(image);
 		}
-		
+
 		public void addItems() {
 			this.disposeItems();
 			this.subMenuItems = new MenuItem[TuxGuitar.instance().getCustomChordManager().countChords()];
@@ -104,14 +101,14 @@ public void addItems() {
 				TGChord chord = TuxGuitar.instance().getCustomChordManager().getChord(i);
 				ActionData actionData = new ActionData();
 				actionData.put(InsertChordAction.PROPERTY_CHORD, chord);
-				
+
 				this.subMenuItems[i] = new MenuItem(this.subMenu, SWT.PUSH);
 				this.subMenuItems[i].setData(actionData);
 				this.subMenuItems[i].setText(chord.getName());
 				this.subMenuItems[i].addSelectionListener(TuxGuitar.instance().getAction(InsertChordAction.NAME));
 			}
 		}
-		
+
 		public void disposeItems() {
 			if(this.subMenuItems != null){
 				for(int i = 0;i < this.subMenuItems.length; i++){
@@ -119,7 +116,8 @@ public void disposeItems() {
 				}
 			}
 		}
-		
+
+		@Override
 		public void widgetSelected(SelectionEvent event) {
 			if (event.detail == SWT.ARROW && this.subMenuItems != null && this.subMenuItems.length > 0) {
 				ToolItem item = (ToolItem) event.widget;
@@ -131,7 +129,7 @@ public void widgetSelected(SelectionEvent event) {
 				TuxGuitar.instance().getAction(InsertChordAction.NAME).process(new ActionData());
 			}
 		}
-		
+
 		public void update(){
 			if(this.lastEdit != TuxGuitar.instance().getCustomChordManager().getLastEdit()){
 				this.addItems();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/CompositionToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/CompositionToolItems.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/CompositionToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/CompositionToolItems.java
index 6d970bc5..428b77b4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/CompositionToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/CompositionToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -12,6 +9,7 @@
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.actions.composition.ChangeTempoAction;
 import org.herac.tuxguitar.app.actions.composition.ChangeTimeSignatureAction;
+import org.herac.tuxguitar.app.actions.insert.DoubleBarAction;
 import org.herac.tuxguitar.app.actions.insert.RepeatAlternativeAction;
 import org.herac.tuxguitar.app.actions.insert.RepeatCloseAction;
 import org.herac.tuxguitar.app.actions.insert.RepeatOpenAction;
@@ -20,61 +18,67 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class CompositionToolItems extends ToolItems{
 	public static final String NAME = "composition.items";
-	
+
 	private ToolItem tempo;
 	private ToolItem timeSignature;
 	private ToolItem repeatOpen;
 	private ToolItem repeatClose;
 	private ToolItem repeatAlternative;
-	
+	private ToolItem doubleBar;
+
 	public CompositionToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.tempo = new ToolItem(toolBar, SWT.PUSH);
 		this.tempo.addSelectionListener(TuxGuitar.instance().getAction(ChangeTempoAction.NAME));
-		
+
 		this.timeSignature = new ToolItem(toolBar, SWT.PUSH);
 		this.timeSignature.addSelectionListener(TuxGuitar.instance().getAction(ChangeTimeSignatureAction.NAME));
-		
+
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		this.repeatOpen = new ToolItem(toolBar, SWT.CHECK);
 		this.repeatOpen.addSelectionListener(TuxGuitar.instance().getAction(RepeatOpenAction.NAME));
-		
+
 		this.repeatClose = new ToolItem(toolBar, SWT.CHECK);
 		this.repeatClose.addSelectionListener(TuxGuitar.instance().getAction(RepeatCloseAction.NAME));
-		
+
+		this.doubleBar = new ToolItem(toolBar, SWT.CHECK);
+		this.doubleBar.addSelectionListener(TuxGuitar.instance().getAction(DoubleBarAction.NAME));
+
 		this.repeatAlternative = new ToolItem(toolBar, SWT.CHECK);
 		this.repeatAlternative.addSelectionListener(TuxGuitar.instance().getAction(RepeatAlternativeAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.tempo.setToolTipText(TuxGuitar.getProperty("composition.tempo"));
 		this.timeSignature.setToolTipText(TuxGuitar.getProperty("composition.timesignature"));
 		this.repeatOpen.setToolTipText(TuxGuitar.getProperty("repeat.open"));
 		this.repeatClose.setToolTipText(TuxGuitar.getProperty("repeat.close"));
 		this.repeatAlternative.setToolTipText(TuxGuitar.getProperty("repeat.alternative"));
+		this.doubleBar.setToolTipText(TuxGuitar.getProperty("composition.doublebar"));
 	}
-	
+
 	public void loadIcons(){
 		this.tempo.setImage(TuxGuitar.instance().getIconManager().getCompositionTempo());
 		this.timeSignature.setImage(TuxGuitar.instance().getIconManager().getCompositionTimeSignature());
 		this.repeatOpen.setImage(TuxGuitar.instance().getIconManager().getCompositionRepeatOpen());
 		this.repeatClose.setImage(TuxGuitar.instance().getIconManager().getCompositionRepeatClose());
 		this.repeatAlternative.setImage(TuxGuitar.instance().getIconManager().getCompositionRepeatAlternative());
+		this.doubleBar.setImage(TuxGuitar.instance().getIconManager().getCompositionDoubleBar());
 	}
-	
+
+	@Override
 	public void update(){
 		TGMeasure measure = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -86,5 +90,7 @@ public void update(){
 		this.repeatClose.setSelection(measure != null && measure.getRepeatClose() > 0);
 		this.repeatAlternative.setEnabled( !running );
 		this.repeatAlternative.setSelection(measure != null && measure.getHeader().getRepeatAlternative() > 0);
+		this.doubleBar.setEnabled( !running );
+		this.doubleBar.setSelection(measure != null && measure.getHeader().hasDoubleBar());
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/DurationToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/DurationToolItems.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/DurationToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/DurationToolItems.java
index 27327c8a..1e4a9155 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/DurationToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/DurationToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -35,9 +32,6 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DurationToolItems  extends ToolItems{
 	public static final String NAME = "duration.items";
@@ -46,52 +40,54 @@ public class DurationToolItems  extends ToolItems{
 	private ToolItem dotted;
 	private ToolItem doubleDotted;
 	private DivisionTypeMenuItem divisionTypeItems;
-	
+
 	public DurationToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.toolBar = toolBar;
 		this.durationItems = new ToolItem[7];
-		
+
 		this.durationItems[0] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[0].addSelectionListener(TuxGuitar.instance().getAction(SetWholeDurationAction.NAME));
-		
+
 		this.durationItems[1] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[1].addSelectionListener(TuxGuitar.instance().getAction(SetHalfDurationAction.NAME));
-		
+
 		this.durationItems[2] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[2].setSelection(true);
 		this.durationItems[2].addSelectionListener(TuxGuitar.instance().getAction(SetQuarterDurationAction.NAME));
-		
+
 		this.durationItems[3] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[3].addSelectionListener(TuxGuitar.instance().getAction(SetEighthDurationAction.NAME));
-		
+
 		this.durationItems[4] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[4].addSelectionListener(TuxGuitar.instance().getAction(SetSixteenthDurationAction.NAME));
-		
+
 		this.durationItems[5] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[5].addSelectionListener(TuxGuitar.instance().getAction(SetThirtySecondDurationAction.NAME));
-		
+
 		this.durationItems[6] = new ToolItem(toolBar, SWT.RADIO);
 		this.durationItems[6].addSelectionListener(TuxGuitar.instance().getAction(SetSixtyFourthDurationAction.NAME));
-		
+
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		this.dotted = new ToolItem(toolBar, SWT.CHECK);
 		this.dotted.addSelectionListener(TuxGuitar.instance().getAction(ChangeDottedDurationAction.NAME));
-		
+
 		this.doubleDotted = new ToolItem(toolBar, SWT.CHECK);
 		this.doubleDotted.addSelectionListener(TuxGuitar.instance().getAction(ChangeDoubleDottedDurationAction.NAME));
-		
+
 		this.divisionTypeItems = new DivisionTypeMenuItem();
 		this.divisionTypeItems.addItems();
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGDuration duration = getEditor().getTablature().getCaret().getDuration();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -104,11 +100,12 @@ public void update(){
 		this.dotted.setEnabled( !running );
 		this.doubleDotted.setSelection(duration.isDoubleDotted());
 		this.doubleDotted.setEnabled( !running );
-		
+
 		this.divisionTypeItems.setEnabled( !running );
 		this.divisionTypeItems.update();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.durationItems[0].setToolTipText(TuxGuitar.getProperty("duration.whole"));
 		this.durationItems[1].setToolTipText(TuxGuitar.getProperty("duration.half"));
@@ -121,7 +118,7 @@ public void loadProperties(){
 		this.doubleDotted.setToolTipText(TuxGuitar.getProperty("duration.doubledotted"));
 		this.divisionTypeItems.setText(TuxGuitar.getProperty("duration.division-type"));
 	}
-	
+
 	public void loadIcons(){
 		this.durationItems[0].setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.WHOLE));
 		this.durationItems[1].setImage(TuxGuitar.instance().getIconManager().getDuration(TGDuration.HALF));
@@ -134,39 +131,40 @@ public void loadIcons(){
 		this.doubleDotted.setImage(TuxGuitar.instance().getIconManager().getDurationDoubleDotted());
 		this.divisionTypeItems.setImage(TuxGuitar.instance().getIconManager().getDivisionType());
 	}
-	
+
+	@Override
 	protected TablatureEditor getEditor(){
 		return super.getEditor();
 	}
-	
+
 	private class DivisionTypeMenuItem extends SelectionAdapter {
 		private TGDivisionType divisionType;
 		private ToolItem divisionTypeItem;
 		private Menu subMenu;
 		private MenuItem[] subMenuItems;
-		
+
 		public DivisionTypeMenuItem() {
 			this.divisionType = createDivisionType(TGDivisionType.TRIPLET);
 			this.divisionTypeItem = new ToolItem(DurationToolItems.this.toolBar, SWT.DROP_DOWN);
 			this.divisionTypeItem.addSelectionListener(this);
 			this.subMenu = new Menu(this.divisionTypeItem.getParent().getShell());
 		}
-		
+
 		public void setText(String text){
 			this.divisionTypeItem.setToolTipText(text);
 		}
-		
+
 		public void setImage(Image image){
 			this.divisionTypeItem.setImage(image);
 		}
-		
+
 		public void setEnabled(boolean enabled){
 			this.divisionTypeItem.setEnabled(enabled);
 		}
-		
+
 		public void addItems() {
 			this.subMenuItems = new MenuItem[TGDivisionType.ALTERED_DIVISION_TYPES.length];
-			
+
 			for( int i = 0 ; i < TGDivisionType.ALTERED_DIVISION_TYPES.length ; i ++ ){
 				this.subMenuItems[i] = new MenuItem(this.subMenu, SWT.CHECK);
 				this.subMenuItems[i].setText(new Integer(TGDivisionType.ALTERED_DIVISION_TYPES[i].getEnters()).toString());
@@ -174,7 +172,8 @@ public void addItems() {
 				this.subMenuItems[i].addSelectionListener(TuxGuitar.instance().getAction(ChangeDivisionTypeAction.NAME));
 			}
 		}
-		
+
+		@Override
 		public void widgetSelected(SelectionEvent event) {
 			if (event.detail == SWT.ARROW) {
 				ToolItem item = (ToolItem) event.widget;
@@ -192,24 +191,24 @@ public void widgetSelected(SelectionEvent event) {
 				TuxGuitar.instance().getAction(ChangeDivisionTypeAction.NAME).process(createDivisionTypeActionData(this.divisionType));
 			}
 		}
-		
+
 		public void update(){
 			TGDuration duration = getEditor().getTablature().getCaret().getDuration();
-			
+
 			for(int i = 0;i < this.subMenuItems.length;i++){
 				ActionData actionData = (ActionData)this.subMenuItems[i].getData();
 				TGDivisionType divisionType = (TGDivisionType)actionData.get(ChangeDivisionTypeAction.PROPERTY_DIVISION_TYPE);
-				
+
 				this.subMenuItems[i].setSelection((divisionType.isEqual(duration.getDivision())));
 			}
 		}
-		
+
 		private TGDivisionType createDivisionType(TGDivisionType tgDivisionTypeSrc){
 			TGDivisionType tgDivisionTypeDst = TuxGuitar.instance().getSongManager().getFactory().newDivisionType();
 			tgDivisionTypeSrc.copy(tgDivisionTypeDst);
 			return tgDivisionTypeDst;
 		}
-		
+
 		private ActionData createDivisionTypeActionData(TGDivisionType tgDivisionType){
 			ActionData actionData = new ActionData();
 			actionData.put(ChangeDivisionTypeAction.PROPERTY_DIVISION_TYPE, createDivisionType(tgDivisionType));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/DynamicToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/DynamicToolItems.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/DynamicToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/DynamicToolItems.java
index dc666f4c..dde3bdb5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/DynamicToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/DynamicToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -17,15 +14,12 @@
 import org.herac.tuxguitar.song.models.TGVelocities;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class DynamicToolItems  extends ToolItems{
 	public static final String NAME = "dynamic.items";
-	
+
 	private ToolBar toolBar;
-	
+
 	private ToolItem pianoPianissimo;
 	private ToolItem pianissimo;
 	private ToolItem piano;
@@ -34,58 +28,60 @@ public class DynamicToolItems  extends ToolItems{
 	private ToolItem forte;
 	private ToolItem fortissimo;
 	private ToolItem forteFortissimo;
-	
-	
+
+
 	public DynamicToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.toolBar = toolBar;
 		//--PPP--
 		this.pianoPianissimo = new ToolItem(this.toolBar, SWT.CHECK);
 		this.pianoPianissimo.setData(createChangeVelocityActionData(TGVelocities.PIANO_PIANISSIMO));
 		this.pianoPianissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--PP--
 		this.pianissimo = new ToolItem(this.toolBar, SWT.CHECK);
 		this.pianissimo.setData(createChangeVelocityActionData(TGVelocities.PIANISSIMO));
 		this.pianissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--P--
 		this.piano = new ToolItem(this.toolBar, SWT.CHECK);
 		this.piano.setData(createChangeVelocityActionData(TGVelocities.PIANO));
 		this.piano.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--MP--
 		this.mezzoPiano = new ToolItem(this.toolBar, SWT.CHECK);
 		this.mezzoPiano.setData(createChangeVelocityActionData(TGVelocities.MEZZO_PIANO));
 		this.mezzoPiano.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--MF--
 		this.mezzoForte = new ToolItem(this.toolBar, SWT.CHECK);
 		this.mezzoForte.setData(createChangeVelocityActionData(TGVelocities.MEZZO_FORTE));
 		this.mezzoForte.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--F--
 		this.forte = new ToolItem(this.toolBar, SWT.CHECK);
 		this.forte.setData(createChangeVelocityActionData(TGVelocities.FORTE));
 		this.forte.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--FF--
 		this.fortissimo = new ToolItem(this.toolBar, SWT.CHECK);
 		this.fortissimo.setData(createChangeVelocityActionData(TGVelocities.FORTISSIMO));
 		this.fortissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		//--FF--
 		this.forteFortissimo = new ToolItem(this.toolBar, SWT.CHECK);
 		this.forteFortissimo.setData(createChangeVelocityActionData(TGVelocities.FORTE_FORTISSIMO));
 		this.forteFortissimo.addSelectionListener(TuxGuitar.instance().getAction(ChangeVelocityAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 		int velocity = ((caret.getSelectedNote() != null)?caret.getSelectedNote().getVelocity():caret.getVelocity());
@@ -107,7 +103,8 @@ public void update(){
 		this.forteFortissimo.setSelection(velocity == TGVelocities.FORTE_FORTISSIMO);
 		this.forteFortissimo.setEnabled( !running );
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.pianoPianissimo.setToolTipText(TuxGuitar.getProperty("dynamic.piano-pianissimo"));
 		this.pianissimo.setToolTipText(TuxGuitar.getProperty("dynamic.pianissimo"));
@@ -118,7 +115,7 @@ public void loadProperties(){
 		this.fortissimo.setToolTipText(TuxGuitar.getProperty("dynamic.fortissimo"));
 		this.forteFortissimo.setToolTipText(TuxGuitar.getProperty("dynamic.forte-fortissimo"));
 	}
-	
+
 	public void loadIcons(){
 		this.pianoPianissimo.setImage(TuxGuitar.instance().getIconManager().getDynamicPPP());
 		this.pianissimo.setImage(TuxGuitar.instance().getIconManager().getDynamicPP());
@@ -129,7 +126,7 @@ public void loadIcons(){
 		this.fortissimo.setImage(TuxGuitar.instance().getIconManager().getDynamicFF());
 		this.forteFortissimo.setImage(TuxGuitar.instance().getIconManager().getDynamicFFF());
 	}
-	
+
 	private ActionData createChangeVelocityActionData(int velocity){
 		ActionData actionData = new ActionData();
 		actionData.put(ChangeVelocityAction.PROPERTY_VELOCITY, new Integer(velocity));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/EditToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/EditToolItems.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/EditToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/EditToolItems.java
index 4f15ec5e..45becdd4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/EditToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/EditToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -21,56 +18,55 @@
 import org.herac.tuxguitar.app.items.ToolItems;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class EditToolItems extends ToolItems {
 	public static final String NAME = "edit.items";
 	private ToolItem undo;
 	private ToolItem redo;
-	
+
 	private ToolItem voice1;
 	private ToolItem voice2;
-	
+
 	private ToolItem modeSelection;
 	private ToolItem modeEdition;
 	private ToolItem notNaturalKey;
-	
+
 	public EditToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.undo = new ToolItem(toolBar, SWT.PUSH);
 		this.undo.addSelectionListener(TuxGuitar.instance().getAction(UndoAction.NAME));
-		
+
 		this.redo = new ToolItem(toolBar, SWT.PUSH);
 		this.redo.addSelectionListener(TuxGuitar.instance().getAction(RedoAction.NAME));
-		
+
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		this.voice1 = new ToolItem(toolBar, SWT.RADIO);
 		this.voice1.addSelectionListener(TuxGuitar.instance().getAction(SetVoice1Action.NAME));
-		
+
 		this.voice2 = new ToolItem(toolBar, SWT.RADIO);
 		this.voice2.addSelectionListener(TuxGuitar.instance().getAction(SetVoice2Action.NAME));
-		
+
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		this.modeSelection = new ToolItem(toolBar, SWT.RADIO);
 		this.modeSelection.addSelectionListener(TuxGuitar.instance().getAction(SetMouseModeSelectionAction.NAME));
-		
+
 		this.modeEdition = new ToolItem(toolBar, SWT.RADIO);
 		this.modeEdition.addSelectionListener(TuxGuitar.instance().getAction(SetMouseModeEditionAction.NAME));
-		
+
 		this.notNaturalKey = new ToolItem(toolBar, SWT.CHECK);
 		this.notNaturalKey.addSelectionListener(TuxGuitar.instance().getAction(SetNaturalKeyAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
 		this.undo.setEnabled(!running && TuxGuitar.instance().getUndoableManager().canUndo());
@@ -86,7 +82,8 @@ public void update(){
 		this.notNaturalKey.setSelection(!getEditor().getTablature().getEditorKit().isNatural());
 		this.notNaturalKey.setEnabled(!running && getEditor().getTablature().getEditorKit().getMouseMode() == EditorKit.MOUSE_MODE_EDITION);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.undo.setToolTipText(TuxGuitar.getProperty("edit.undo"));
 		this.redo.setToolTipText(TuxGuitar.getProperty("edit.redo"));
@@ -96,7 +93,7 @@ public void loadProperties(){
 		this.modeEdition.setToolTipText(TuxGuitar.getProperty("edit.mouse-mode-edition"));
 		this.notNaturalKey.setToolTipText(TuxGuitar.getProperty("edit.not-natural-key"));
 	}
-	
+
 	public void loadIcons(){
 		this.undo.setImage(TuxGuitar.instance().getIconManager().getEditUndo());
 		this.redo.setImage(TuxGuitar.instance().getIconManager().getEditRedo());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/FileToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/FileToolItems.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/FileToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/FileToolItems.java
index b22d6ed1..63bcb227 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/FileToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/FileToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -19,9 +16,6 @@
 import org.herac.tuxguitar.app.items.ToolItems;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class FileToolItems extends ToolItems {
 	public static final String NAME = "file.items";
@@ -31,38 +25,41 @@ public class FileToolItems extends ToolItems {
 	private ToolItem saveAsSong;
 	private ToolItem printSong;
 	private ToolItem printPreviewSong;
-	
+
 	public FileToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.newSong = new ToolItem(toolBar, SWT.PUSH);
 		this.newSong.addSelectionListener(TuxGuitar.instance().getAction(NewFileAction.NAME));
-		
+
 		this.openSong = new ToolItem(toolBar, SWT.PUSH);
 		this.openSong.addSelectionListener(TuxGuitar.instance().getAction(OpenFileAction.NAME));
-		
+
 		this.saveSong = new ToolItem(toolBar, SWT.PUSH);
 		this.saveSong.addSelectionListener(TuxGuitar.instance().getAction(SaveFileAction.NAME));
-		
+
 		this.saveAsSong = new ToolItem(toolBar, SWT.PUSH);
 		this.saveAsSong.addSelectionListener(TuxGuitar.instance().getAction(SaveAsFileAction.NAME));
-		
+
 		this.printSong = new ToolItem(toolBar, SWT.PUSH);
 		this.printSong.addSelectionListener(TuxGuitar.instance().getAction(PrintAction.NAME));
-		
+
 		this.printPreviewSong = new ToolItem(toolBar, SWT.PUSH);
 		this.printPreviewSong.addSelectionListener(TuxGuitar.instance().getAction(PrintPreviewAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		//Nothing to do
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.newSong.setToolTipText(TuxGuitar.getProperty("file.new"));
 		this.openSong.setToolTipText(TuxGuitar.getProperty("file.open"));
@@ -71,7 +68,7 @@ public void loadProperties(){
 		this.printSong.setToolTipText(TuxGuitar.getProperty("file.print"));
 		this.printPreviewSong.setToolTipText(TuxGuitar.getProperty("file.print-preview"));
 	}
-	
+
 	public void loadIcons(){
 		this.newSong.setImage(TuxGuitar.instance().getIconManager().getFileNew());
 		this.openSong.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/LayoutToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/LayoutToolItems.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/LayoutToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/LayoutToolItems.java
index 133bbed3..92a8e76d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/LayoutToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/LayoutToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -16,49 +13,48 @@
 import org.herac.tuxguitar.app.actions.layout.SetPageLayoutAction;
 import org.herac.tuxguitar.app.actions.layout.SetScoreEnabledAction;
 import org.herac.tuxguitar.app.items.ToolItems;
+import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.graphics.control.TGLayoutHorizontal;
 import org.herac.tuxguitar.graphics.control.TGLayoutVertical;
-import org.herac.tuxguitar.graphics.control.TGLayout;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class LayoutToolItems extends ToolItems{
 	public static final String NAME = "layout.items";
-	
+
 	private ToolItem pageLayout;
 	private ToolItem linearLayout;
 	private ToolItem multitrack;
 	private ToolItem scoreEnabled;
 	private ToolItem compact;
-	
+
 	public LayoutToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.pageLayout = new ToolItem(toolBar, SWT.RADIO);
 		this.pageLayout.addSelectionListener(TuxGuitar.instance().getAction(SetPageLayoutAction.NAME));
-		
+
 		this.linearLayout = new ToolItem(toolBar, SWT.RADIO);
 		this.linearLayout.addSelectionListener(TuxGuitar.instance().getAction(SetLinearLayoutAction.NAME));
-		
+
 		this.multitrack = new ToolItem(toolBar, SWT.CHECK);
 		this.multitrack.addSelectionListener(TuxGuitar.instance().getAction(SetMultitrackViewAction.NAME));
-		
+
 		this.scoreEnabled = new ToolItem(toolBar, SWT.CHECK);
 		this.scoreEnabled.addSelectionListener(TuxGuitar.instance().getAction(SetScoreEnabledAction.NAME));
-		
+
 		this.compact = new ToolItem(toolBar, SWT.CHECK);
 		this.compact.addSelectionListener(TuxGuitar.instance().getAction(SetCompactViewAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.pageLayout.setToolTipText(TuxGuitar.getProperty("view.layout.page"));
 		this.linearLayout.setToolTipText(TuxGuitar.getProperty("view.layout.linear"));
@@ -66,7 +62,7 @@ public void loadProperties(){
 		this.scoreEnabled.setToolTipText(TuxGuitar.getProperty("view.layout.score-enabled"));
 		this.compact.setToolTipText(TuxGuitar.getProperty("view.layout.compact"));
 	}
-	
+
 	public void loadIcons(){
 		this.pageLayout.setImage(TuxGuitar.instance().getIconManager().getLayoutPage());
 		this.linearLayout.setImage(TuxGuitar.instance().getIconManager().getLayoutLinear());
@@ -74,7 +70,8 @@ public void loadIcons(){
 		this.scoreEnabled.setImage(TuxGuitar.instance().getIconManager().getLayoutScore());
 		this.compact.setImage(TuxGuitar.instance().getIconManager().getLayoutCompact());
 	}
-	
+
+	@Override
 	public void update(){
 		TGLayout layout = getEditor().getTablature().getViewLayout();
 		int style = layout.getStyle();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/MarkerToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/MarkerToolItems.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/MarkerToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/MarkerToolItems.java
index b890a96e..9588130c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/MarkerToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/MarkerToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -19,60 +16,60 @@
 import org.herac.tuxguitar.app.items.ToolItems;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MarkerToolItems  extends ToolItems{
 	public static final String NAME = "marker.items";
-	
+
 	private ToolItem add;
 	private ToolItem list;
 	private ToolItem first;
 	private ToolItem last;
 	private ToolItem previous;
 	private ToolItem next;
-	
+
 	public MarkerToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		//--ADD--
 		this.add = new ToolItem(toolBar, SWT.PUSH);
 		this.add.addSelectionListener(TuxGuitar.instance().getAction(AddMarkerAction.NAME));
-		
+
 		//--LIST--
 		this.list = new ToolItem(toolBar, SWT.PUSH);
 		this.list.addSelectionListener(TuxGuitar.instance().getAction(ListMarkersAction.NAME));
-		
+
 		//--SEPARATOR--
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		//--FIRST--
 		this.first = new ToolItem(toolBar, SWT.PUSH);
 		this.first.addSelectionListener(TuxGuitar.instance().getAction(GoFirstMarkerAction.NAME));
-		
+
 		//--PREVIOUS--
 		this.previous = new ToolItem(toolBar, SWT.PUSH);
 		this.previous.addSelectionListener(TuxGuitar.instance().getAction(GoPreviousMarkerAction.NAME));
-		
+
 		//--PREVIOUS--
 		this.next = new ToolItem(toolBar, SWT.PUSH);
 		this.next.addSelectionListener(TuxGuitar.instance().getAction(GoNextMarkerAction.NAME));
-		
+
 		//--LAST--
 		this.last = new ToolItem(toolBar, SWT.PUSH);
 		this.last.addSelectionListener(TuxGuitar.instance().getAction(GoLastMarkerAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		//Nothing to do
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.add.setToolTipText(TuxGuitar.getProperty("marker.add"));
 		this.list.setToolTipText(TuxGuitar.getProperty("marker.list"));
@@ -81,7 +78,7 @@ public void loadProperties(){
 		this.previous.setToolTipText(TuxGuitar.getProperty("marker.previous"));
 		this.next.setToolTipText(TuxGuitar.getProperty("marker.next"));
 	}
-	
+
 	public void loadIcons(){
 		this.add.setImage(TuxGuitar.instance().getIconManager().getMarkerAdd());
 		this.list.setImage(TuxGuitar.instance().getIconManager().getMarkerList());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/NoteEffectToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/NoteEffectToolItems.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/NoteEffectToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/NoteEffectToolItems.java
index fa6dca30..927a8e3a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/NoteEffectToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/NoteEffectToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -33,134 +30,133 @@
 import org.herac.tuxguitar.song.models.TGNote;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class NoteEffectToolItems  extends ToolItems{
 	public static final String NAME = "effect.items";
-	
+
 	private ToolItem deadNote;
 	private ToolItem ghostNote;
 	private ToolItem accentuatedNote;
 	private ToolItem heavyAccentuatedNote;
 	private ToolItem harmonicNote;
 	private ToolItem graceNote;
-	
+
 	private ToolItem vibrato;
 	private ToolItem bend;
 	private ToolItem tremoloBar;
 	private ToolItem slide;
 	private ToolItem hammer;
-	
+
 	private ToolItem trill;
 	private ToolItem tremoloPicking;
 	private ToolItem palmMute;
-	
+
 	private ToolItem staccato;
 	private ToolItem tapping;
 	private ToolItem slapping;
 	private ToolItem popping;
-	
+
 	private ToolItem fadeIn;
-	
+
 	public NoteEffectToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		//--DEAD NOTE--
 		this.deadNote = new ToolItem(toolBar, SWT.CHECK);
 		this.deadNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeDeadNoteAction.NAME));
-		
+
 		//--GHOST NOTE--
 		this.ghostNote = new ToolItem(toolBar, SWT.CHECK);
 		this.ghostNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeGhostNoteAction.NAME));
-		
+
 		//--ACCENTUATED NOTE--
 		this.accentuatedNote = new ToolItem(toolBar, SWT.CHECK);
 		this.accentuatedNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeAccentuatedNoteAction.NAME));
-		
+
 		//--HEAVY ACCENTUATED NOTE--
 		this.heavyAccentuatedNote = new ToolItem(toolBar, SWT.CHECK);
 		this.heavyAccentuatedNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeHeavyAccentuatedNoteAction.NAME));
-		
+
 		//--HARMONIC NOTE--
 		this.harmonicNote = new ToolItem(toolBar, SWT.CHECK);
 		this.harmonicNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeHarmonicNoteAction.NAME));
-		
+
 		//--GRACE NOTE--
 		this.graceNote = new ToolItem(toolBar, SWT.CHECK);
 		this.graceNote.addSelectionListener(TuxGuitar.instance().getAction(ChangeGraceNoteAction.NAME));
-		
+
 		//--SEPARATOR--
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		//--VIBRATO--
 		this.vibrato = new ToolItem(toolBar, SWT.CHECK);
 		this.vibrato.addSelectionListener(TuxGuitar.instance().getAction(ChangeVibratoNoteAction.NAME));
-		
+
 		//--BEND--
 		this.bend = new ToolItem(toolBar, SWT.CHECK);
 		this.bend.addSelectionListener(TuxGuitar.instance().getAction(ChangeBendNoteAction.NAME));
-		
+
 		//--BEND--
 		this.tremoloBar = new ToolItem(toolBar, SWT.CHECK);
 		this.tremoloBar.addSelectionListener(TuxGuitar.instance().getAction(ChangeTremoloBarAction.NAME));
-		
+
 		//--SLIDE--
 		this.slide = new ToolItem(toolBar, SWT.CHECK);
 		this.slide.addSelectionListener(TuxGuitar.instance().getAction(ChangeSlideNoteAction.NAME));
-		
+
 		//--HAMMER--
 		this.hammer = new ToolItem(toolBar, SWT.CHECK);
 		this.hammer.addSelectionListener(TuxGuitar.instance().getAction(ChangeHammerNoteAction.NAME));
-		
+
 		//--SEPARATOR--
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		//--TRILL--
 		this.trill = new ToolItem(toolBar, SWT.CHECK);
 		this.trill.addSelectionListener(TuxGuitar.instance().getAction(ChangeTrillNoteAction.NAME));
-		
+
 		//--TREMOLO PICKING--
 		this.tremoloPicking = new ToolItem(toolBar, SWT.CHECK);
 		this.tremoloPicking.addSelectionListener(TuxGuitar.instance().getAction(ChangeTremoloPickingAction.NAME));
-		
+
 		//--PALM MUTE--
 		this.palmMute = new ToolItem(toolBar, SWT.CHECK);
 		this.palmMute.addSelectionListener(TuxGuitar.instance().getAction(ChangePalmMuteAction.NAME));
-		
+
 		//--STACCATO
 		this.staccato = new ToolItem(toolBar, SWT.CHECK);
 		this.staccato.addSelectionListener(TuxGuitar.instance().getAction(ChangeStaccatoAction.NAME));
-		
+
 		//--SEPARATOR--
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		//--TAPPING
 		this.tapping = new ToolItem(toolBar, SWT.CHECK);
 		this.tapping.addSelectionListener(TuxGuitar.instance().getAction(ChangeTappingAction.NAME));
-		
+
 		//--SLAPPING
 		this.slapping = new ToolItem(toolBar, SWT.CHECK);
 		this.slapping.addSelectionListener(TuxGuitar.instance().getAction(ChangeSlappingAction.NAME));
-		
+
 		//--POPPING
 		this.popping = new ToolItem(toolBar, SWT.CHECK);
 		this.popping.addSelectionListener(TuxGuitar.instance().getAction(ChangePoppingAction.NAME));
-		
+
 		//--SEPARATOR--
 		new ToolItem(toolBar, SWT.SEPARATOR);
-		
+
 		//--FADE IN
 		this.fadeIn = new ToolItem(toolBar, SWT.CHECK);
 		this.fadeIn.addSelectionListener(TuxGuitar.instance().getAction(ChangeFadeInAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		TGNote note = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getSelectedNote();
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
@@ -203,7 +199,8 @@ public void update(){
 		this.fadeIn.setSelection(note != null && note.getEffect().isFadeIn());
 		this.fadeIn.setEnabled(!running && note != null);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.vibrato.setToolTipText(TuxGuitar.getProperty("effects.vibrato"));
 		this.bend.setToolTipText(TuxGuitar.getProperty("effects.bend"));
@@ -226,7 +223,7 @@ public void loadProperties(){
 		this.popping.setToolTipText(TuxGuitar.getProperty("effects.popping"));
 		this.fadeIn.setToolTipText(TuxGuitar.getProperty("effects.fade-in"));
 	}
-	
+
 	public void loadIcons(){
 		this.deadNote.setImage(TuxGuitar.instance().getIconManager().getEffectDead());
 		this.ghostNote.setImage(TuxGuitar.instance().getIconManager().getEffectGhost());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/PropertiesToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/PropertiesToolItems.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/PropertiesToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/PropertiesToolItems.java
index 05a67015..14945bbd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/PropertiesToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/PropertiesToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -15,35 +12,35 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class PropertiesToolItems extends ToolItems{
 	public static final String NAME = "property.items";
-	
+
 	private ToolItem info;
-	
+
 	public PropertiesToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.info = new ToolItem(toolBar, SWT.PUSH);
 		this.info.addSelectionListener(TuxGuitar.instance().getAction(ChangeInfoAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.info.setToolTipText(TuxGuitar.getProperty("composition.properties"));
 	}
-	
+
 	public void loadIcons(){
 		this.info.setImage(TuxGuitar.instance().getIconManager().getSongProperties());
 	}
-	
+
+	@Override
 	public void update(){
 		//Nothing to do
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/TrackToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/TrackToolItems.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/TrackToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/TrackToolItems.java
index 2e14cf16..ccd04d89 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/TrackToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/TrackToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -16,41 +13,41 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TrackToolItems extends ToolItems{
 	public static final String NAME = "track.items";
-	
+
 	private ToolItem add;
 	private ToolItem remove;
-	
+
 	public TrackToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.add = new ToolItem(toolBar, SWT.PUSH);
 		this.add.addSelectionListener(TuxGuitar.instance().getAction(AddTrackAction.NAME));
-		
+
 		this.remove = new ToolItem(toolBar, SWT.PUSH);
 		this.remove.addSelectionListener(TuxGuitar.instance().getAction(RemoveTrackAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.add.setToolTipText(TuxGuitar.getProperty("track.add"));
 		this.remove.setToolTipText(TuxGuitar.getProperty("track.remove"));
 	}
-	
+
 	public void loadIcons(){
 		this.add.setImage(TuxGuitar.instance().getIconManager().getTrackAdd());
 		this.remove.setImage(TuxGuitar.instance().getIconManager().getTrackRemove());
 	}
-	
+
+	@Override
 	public void update(){
 		boolean running = TuxGuitar.instance().getPlayer().isRunning();
 		this.add.setEnabled(!running);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/TransportToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/TransportToolItems.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/TransportToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/TransportToolItems.java
index ef5dcbbe..68fe686f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/TransportToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/TransportToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -17,17 +14,14 @@
 import org.herac.tuxguitar.app.items.ToolItems;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TransportToolItems  extends ToolItems{
 	public static final String NAME = "transport.items";
-	
+
 	private static final int STATUS_STOPPED = 1;
 	private static final int STATUS_PAUSED = 2;
 	private static final int STATUS_RUNNING = 3;
-	
+
 	private ToolItem first;
 	private ToolItem last;
 	private ToolItem previous;
@@ -35,55 +29,62 @@ public class TransportToolItems  extends ToolItems{
 	private ToolItem stop;
 	private ToolItem play;
 	private int status;
-	
+
 	public TransportToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		this.first = new ToolItem(toolBar,SWT.PUSH);
 		this.first.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().getTransport().gotoFirst();
 			}
 		});
-		
+
 		this.previous = new ToolItem(toolBar,SWT.PUSH);
 		this.previous.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().getTransport().gotoPrevious();
 			}
 		});
-		
+
 		this.stop = new ToolItem(toolBar,SWT.PUSH);
 		this.stop.addSelectionListener(TuxGuitar.instance().getAction(TransportStopAction.NAME));
-		
+
 		this.play = new ToolItem(toolBar,SWT.PUSH);
 		this.play.addSelectionListener(TuxGuitar.instance().getAction(TransportPlayAction.NAME));
-		
+
 		this.next = new ToolItem(toolBar,SWT.PUSH);
 		this.next.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().getTransport().gotoNext();
 			}
 		});
-		
+
 		this.last = new ToolItem(toolBar,SWT.PUSH);
 		this.last.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().getTransport().gotoLast();
 			}
 		});
-		
+
 		this.status = STATUS_STOPPED;
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		loadIcons(false);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.play.setToolTipText(TuxGuitar.getProperty("transport.start"));
 		this.stop.setToolTipText(TuxGuitar.getProperty("transport.stop"));
@@ -92,14 +93,14 @@ public void loadProperties(){
 		this.previous.setToolTipText(TuxGuitar.getProperty("transport.previous"));
 		this.next.setToolTipText(TuxGuitar.getProperty("transport.next"));
 	}
-	
+
 	public void loadIcons(){
 		loadIcons(true);
 	}
-	
+
 	public void loadIcons(boolean force){
 		int lastStatus = this.status;
-		
+
 		if(TuxGuitar.instance().getPlayer().isRunning()){
 			this.status = STATUS_RUNNING;
 		}else if(TuxGuitar.instance().getPlayer().isPaused()){
@@ -107,7 +108,7 @@ public void loadIcons(boolean force){
 		}else{
 			this.status = STATUS_STOPPED;
 		}
-		
+
 		if(force || lastStatus != this.status){
 			if(this.status == STATUS_RUNNING){
 				this.first.setImage(TuxGuitar.instance().getIconManager().getTransportIconFirst2());
@@ -135,6 +136,6 @@ public void loadIcons(boolean force){
 				this.play.setToolTipText(TuxGuitar.getProperty("transport.start"));
 			}
 		}
-		
+
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/ViewToolItems.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/ViewToolItems.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/tool/ViewToolItems.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/ViewToolItems.java
index 55dea574..ce6b4b7c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/tool/ViewToolItems.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/tool/ViewToolItems.java
@@ -1,8 +1,5 @@
 /*
  * Created on 02-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.items.tool;
 
@@ -17,50 +14,50 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ViewToolItems extends ToolItems{
 	public static final String NAME = "view.items";
-	
+
 	private ToolItem showFretBoard;
 	private ToolItem showInstruments;
 	private ToolItem showTransport;
-	
+
 	public ViewToolItems(){
 		super(NAME);
 	}
-	
+
+	@Override
 	public void showItems(ToolBar toolBar){
 		//--FRETBOARD--
 		this.showFretBoard = new ToolItem(toolBar, SWT.CHECK);
 		this.showFretBoard.addSelectionListener(TuxGuitar.instance().getAction(ShowFretBoardAction.NAME));
-		
+
 		//--INSTRUMENTS--
 		this.showInstruments = new ToolItem(toolBar, SWT.CHECK);
 		this.showInstruments.addSelectionListener(TuxGuitar.instance().getAction(ShowInstrumentsAction.NAME));
-		
+
 		//--TRANSPORT--
 		this.showTransport = new ToolItem(toolBar, SWT.CHECK);
 		this.showTransport.addSelectionListener(TuxGuitar.instance().getAction(ShowTransportAction.NAME));
-		
+
 		this.loadIcons();
 		this.loadProperties();
 	}
-	
+
+	@Override
 	public void update(){
 		this.showFretBoard.setSelection(TuxGuitar.instance().getFretBoardEditor().isVisible());
 		this.showInstruments.setSelection(!TuxGuitar.instance().getChannelManager().isDisposed());
 		this.showTransport.setSelection(!TuxGuitar.instance().getTransport().isDisposed());
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.showFretBoard.setToolTipText(TuxGuitar.getProperty("view.show-fretboard"));
 		this.showInstruments.setToolTipText(TuxGuitar.getProperty("view.show-instruments"));
 		this.showTransport.setToolTipText(TuxGuitar.getProperty("view.show-transport"));
 	}
-	
+
 	public void loadIcons(){
 		this.showFretBoard.setImage(TuxGuitar.instance().getIconManager().getFretboard());
 		this.showInstruments.setImage(TuxGuitar.instance().getIconManager().getInstruments());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/xml/ToolBarsReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/xml/ToolBarsReader.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/xml/ToolBarsReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/xml/ToolBarsReader.java
index 6e71e8ce..6a1e1d93 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/xml/ToolBarsReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/xml/ToolBarsReader.java
@@ -18,7 +18,7 @@ public class ToolBarsReader {
 	private static final String ITEM_TAG = "toolbar";
 	private static final String ATTR_NAME = "name";
 	private static final String ATTR_ENABLED = "enabled";
-	
+
 	public static void loadToolBars(ItemManager manager,File file){
 		try {
 			if (file.exists()){
@@ -28,27 +28,27 @@ public static void loadToolBars(ItemManager manager,File file){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	private static Document getDocument(File file) throws ParserConfigurationException, SAXException, IOException {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		Document document = builder.parse(file);
 		return document;
 	}
-	
+
 	private static void loadToolBars(ItemManager manager,Node node){
 		NodeList listNode = node.getChildNodes();
 		int index = 0;
 		for (int i = 0; i < listNode.getLength(); i++) {
 			Node child = listNode.item(i);
 			String nameNode = child.getNodeName();
-			
+
 			if (nameNode.equals(ITEM_TAG)) {
 				NamedNodeMap params = child.getAttributes();
-				
+
 				Node name = params.getNamedItem(ATTR_NAME);
 				Node enabled = params.getNamedItem(ATTR_ENABLED);
-				
+
 				if (name == null || enabled == null || name.getNodeValue() == null || enabled.getNodeValue() == null ){
 					System.err.println("Invalid ToolBar Attributes.");
 					continue;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/items/xml/ToolBarsWriter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/xml/ToolBarsWriter.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/items/xml/ToolBarsWriter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/xml/ToolBarsWriter.java
index 0971478f..d9279792 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/items/xml/ToolBarsWriter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/items/xml/ToolBarsWriter.java
@@ -22,12 +22,12 @@
 import org.w3c.dom.Node;
 
 public class ToolBarsWriter {
-	
+
 	private static final String ITEM_LIST_TAG = "toolbars";
 	private static final String ITEM_TAG = "toolbar";
 	private static final String ATTR_NAME = "name";
 	private static final String ATTR_ENABLED = "enabled";
-	
+
 	public static void saveToolBars(ToolItems[] items,File file) {
 		try {
 			Document doc = createDocument();
@@ -37,17 +37,17 @@ public static void saveToolBars(ToolItems[] items,File file) {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public static Document createDocument() throws ParserConfigurationException {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		Document document = builder.newDocument();
 		return document;
 	}
-	
+
 	public static void saveDocument(Document document,File file) throws FileNotFoundException, TransformerException {
 		FileOutputStream fs = new FileOutputStream(file);
-		
+
 		// Write it out again
 		TransformerFactory xformFactory = TransformerFactory.newInstance();
 		Transformer idTransform = xformFactory.newTransformer();
@@ -56,28 +56,28 @@ public static void saveDocument(Document document,File file) throws FileNotFound
 		idTransform.setOutputProperty(OutputKeys.INDENT, "yes");
 		idTransform.transform(input, output);
 	}
-	
+
 	private static void setToolBars(ToolItems[] items,Document document){
 		//chords tag
 		Node listNode = document.createElement(ITEM_LIST_TAG);
-		
+
 		for(int i = 0; i < items.length ; i ++){
-			
+
 			//chord tag
 			Node node = document.createElement(ITEM_TAG);
 			listNode.appendChild(node);
-			
+
 			//name attribute
 			Attr attribute = document.createAttribute(ATTR_NAME);
 			attribute.setNodeValue( items[i].getName());
 			node.getAttributes().setNamedItem(attribute);
-			
+
 			//enabled attribute
 			attribute = document.createAttribute(ATTR_ENABLED);
 			attribute.setNodeValue( Boolean.toString(items[i].isEnabled()));
 			node.getAttributes().setNamedItem(attribute);
 		}
-		
+
 		document.appendChild(listNode);
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerEditor.java
index cc728f0c..20e293e5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerEditor.java
@@ -27,11 +27,11 @@
 public class MarkerEditor {
 	public static final int STATUS_NEW = 1;
 	public static final int STATUS_EDIT = 2;
-	
+
 	private static final int MINIMUM_CONTROL_WIDTH = 180;
 	private static final int MINIMUM_BUTTON_WIDTH = 80;
 	private static final int MINIMUM_BUTTON_HEIGHT = 25;
-	
+
 	private int status;
 	protected TGMarker marker;
 	protected Shell dialog;
@@ -39,43 +39,44 @@ public class MarkerEditor {
 	protected Text titleText;
 	protected Button colorButton;
 	protected Color colorButtonValue;
-	
+
 	protected boolean accepted;
-	
+
 	public MarkerEditor(TGMarker marker) {
 		this(marker,STATUS_NEW);
 	}
-	
+
 	public MarkerEditor(TGMarker marker,int status) {
 		this.marker = marker.clone(TuxGuitar.instance().getSongManager().getFactory());
 		this.status = status;
 	}
-	
+
 	public boolean open(Shell shell) {
 		this.accepted = false;
-		
+
 		this.dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setText(TuxGuitar.getProperty("marker"));
-		
+
 		// ----------------------------------------------------------------------
 		Group group = new Group(this.dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(2, false));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("marker"));
-		
+
 		// Measure Number
 		final int measureCount = TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders();
 		Label measureLabel = new Label(group, SWT.NULL);
 		measureLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true,true));
 		measureLabel.setText(TuxGuitar.getProperty("measure"));
-		
+
 		this.measureSpinner = new Spinner(group, SWT.BORDER);
 		this.measureSpinner.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		this.measureSpinner.setMinimum(1);
 		this.measureSpinner.setMaximum(measureCount);
 		this.measureSpinner.setSelection(this.marker.getMeasure());
 		this.measureSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int selection = MarkerEditor.this.measureSpinner.getSelection();
 				if (selection < 1) {
@@ -85,7 +86,7 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		// Title
 		Label titleLabel = new Label(group, SWT.NULL);
 		titleLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
@@ -93,7 +94,7 @@ public void widgetSelected(SelectionEvent e) {
 		this.titleText = new Text(group, SWT.BORDER);
 		this.titleText.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		this.titleText.setText(this.marker.getTitle());
-		
+
 		// Color
 		Label colorLabel = new Label(group, SWT.NULL);
 		colorLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, true, true));
@@ -102,6 +103,7 @@ public void widgetSelected(SelectionEvent e) {
 		this.colorButton.setLayoutData(getAlignmentData(MINIMUM_CONTROL_WIDTH,SWT.FILL));
 		this.colorButton.setText(TuxGuitar.getProperty("choose"));
 		this.colorButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent event) {
 				ColorDialog dlg = new ColorDialog(MarkerEditor.this.dialog);
 				dlg.setRGB(MarkerEditor.this.dialog.getDisplay().getSystemColor(SWT.COLOR_BLACK).getRGB());
@@ -116,48 +118,51 @@ public void widgetSelected(SelectionEvent event) {
 			}
 		});
 		this.colorButton.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				MarkerEditor.this.disposeButtonColor();
 			}
 		});
 		this.setButtonColor();
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2, false));
 		buttons.setLayoutData(new GridData(SWT.END, SWT.FILL, true, true));
-		
+
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
 		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(data);
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				updateMarker();
 				MarkerEditor.this.accepted = true;
 				MarkerEditor.this.dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(data);
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				MarkerEditor.this.dialog.dispose();
 			}
 		});
-		
+
 		this.dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return this.accepted;
 	}
-	
+
 	private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		GridData data = new GridData();
 		data.minimumWidth = minimumWidth;
@@ -167,33 +172,33 @@ private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
 		data.grabExcessVerticalSpace = true;
 		return data;
 	}
-	
+
 	protected void setButtonColor(){
 		Color color = new Color(this.dialog.getDisplay(), this.marker.getColor().getR(), this.marker.getColor().getG(), this.marker.getColor().getB());
-		
+
 		this.colorButton.setForeground( color );
 		this.disposeButtonColor();
 		this.colorButtonValue = color;
 	}
-	
+
 	protected void disposeButtonColor(){
 		if(this.colorButtonValue != null && !this.colorButtonValue.isDisposed()){
 			this.colorButtonValue.dispose();
 			this.colorButtonValue = null;
 		}
 	}
-	
+
 	protected void updateMarker() {
 		int oldMeasure = this.marker.getMeasure();
 		this.marker.setMeasure(this.measureSpinner.getSelection());
 		this.marker.setTitle(this.titleText.getText());
 		this.marker = this.marker.clone(TuxGuitar.instance().getSongManager().getFactory());
-		
+
 		TGSongManager manager = TuxGuitar.instance().getSongManager();
-		
+
 		//comienza el undoable
 		UndoableJoined joinedUndoable = new UndoableJoined();
-		
+
 		if(this.status == STATUS_EDIT && oldMeasure != this.marker.getMeasure()){
 			UndoableChangeMarker undoable = UndoableChangeMarker.startUndo(manager.getMarker(oldMeasure));
 			TuxGuitar.instance().getSongManager().removeMarker(oldMeasure);
@@ -202,7 +207,7 @@ protected void updateMarker() {
 		UndoableChangeMarker undoable = UndoableChangeMarker.startUndo(manager.getMarker(this.marker.getMeasure()));
 		TuxGuitar.instance().getSongManager().updateMarker(this.marker);
 		joinedUndoable.addUndoableEdit(undoable.endUndo(this.marker));
-		
+
 		// termia el undoable
 		TuxGuitar.instance().getUndoableManager().addEdit(joinedUndoable.endUndo());
 		TuxGuitar.instance().getFileHistory().setUnsavedFile();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerList.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerList.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerList.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerList.java
index 5e82425e..54941186 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerList.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerList.java
@@ -30,35 +30,35 @@
 import org.herac.tuxguitar.song.models.TGMarker;
 
 public class MarkerList implements TGUpdateListener, IconLoader,LanguageLoader{
-	
+
 	private static MarkerList instance;
-	
+
 	protected Shell dialog;
 	private Table table;
-	private List markers;
-	
+	private List<TGMarker> markers;
+
 	private Composite compositeTable;
 	private TableColumn measureColumn;
 	private TableColumn titleColumn;
-	
+
 	private Composite compositeButtons;
 	private Button buttonAdd;
 	private Button buttonEdit;
 	private Button buttonDelete;
 	private Button buttonGo;
 	private Button buttonClose;
-	
+
 	public static MarkerList instance(){
 		if(instance == null){
 			instance = new MarkerList();
 		}
 		return instance;
 	}
-	
+
 	private MarkerList() {
 		super();
 	}
-	
+
 	public void show() {
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM);
 		this.dialog.setLayout(new GridLayout(2,false));
@@ -67,11 +67,12 @@ public void show() {
 		this.compositeTable = new Composite(this.dialog, SWT.NONE);
 		this.compositeTable.setLayout(new GridLayout());
 		this.compositeTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		this.table = new Table(this.compositeTable, SWT.BORDER | SWT.FULL_SELECTION);
 		this.table.setLayoutData(new GridData(250,200));
 		this.table.setHeaderVisible(true);
 		this.table.addListener (SWT.MouseDoubleClick, new Listener() {
+			@Override
 			public void handleEvent (Event event) {
 				new MarkerNavigator().goToSelectedMarker(getSelectedMarker());
 				TuxGuitar.instance().updateCache(true);
@@ -79,20 +80,21 @@ public void handleEvent (Event event) {
 		});
 		this.measureColumn = new TableColumn(this.table, SWT.LEFT);
 		this.measureColumn.setWidth(70);
-		
+
 		this.titleColumn = new TableColumn(this.table, SWT.LEFT);
 		this.titleColumn.setWidth(180);
-		
+
 		this.loadTableItems(false);
-		
+
 		// ------------------BUTTONS--------------------------
 		this.compositeButtons = new Composite(this.dialog, SWT.NONE);
 		this.compositeButtons.setLayout(new GridLayout(1,false));
 		this.compositeButtons.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.buttonAdd = new Button(this.compositeButtons, SWT.PUSH);
 		this.buttonAdd.setLayoutData(makeGridData(SWT.FILL, SWT.TOP,false));
 		this.buttonAdd.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(!ActionLock.isLocked() && !TuxGuitar.instance().isLocked()){
 					ActionLock.lock();
@@ -107,10 +109,11 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.buttonEdit = new Button(this.compositeButtons, SWT.PUSH);
 		this.buttonEdit.setLayoutData(makeGridData(SWT.FILL, SWT.TOP,false));
 		this.buttonEdit.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!ActionLock.isLocked() && !TuxGuitar.instance().isLocked()){
 					ActionLock.lock();
@@ -125,19 +128,20 @@ public void widgetSelected(SelectionEvent arg0) {
 				}
 			}
 		});
-		
+
 		this.buttonDelete = new Button(this.compositeButtons, SWT.PUSH);
 		this.buttonDelete.setLayoutData(makeGridData(SWT.FILL, SWT.TOP,false));
 		this.buttonDelete.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!ActionLock.isLocked() && !TuxGuitar.instance().isLocked()){
 					ActionLock.lock();
 					TGMarker marker = getSelectedMarker();
 					// comienza el undoable
 					UndoableChangeMarker undoable = UndoableChangeMarker.startUndo(marker);
-					
+
 					TuxGuitar.instance().getSongManager().removeMarker(marker);
-					
+
 					// termia el undoable
 					TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(null));
 					TuxGuitar.instance().getFileHistory().setUnsavedFile();
@@ -147,10 +151,11 @@ public void widgetSelected(SelectionEvent arg0) {
 				}
 			}
 		});
-		
+
 		this.buttonGo = new Button(this.compositeButtons, SWT.PUSH);
 		this.buttonGo.setLayoutData(makeGridData(SWT.FILL, SWT.BOTTOM,true));
 		this.buttonGo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!ActionLock.isLocked() && !TuxGuitar.instance().isLocked()){
 					ActionLock.lock();
@@ -160,54 +165,57 @@ public void widgetSelected(SelectionEvent arg0) {
 				}
 			}
 		});
-		
+
 		this.buttonClose = new Button(this.compositeButtons, SWT.PUSH);
 		this.buttonClose.setLayoutData(makeGridData(SWT.FILL, SWT.BOTTOM,false));
 		this.buttonClose.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				MarkerList.this.dialog.dispose();
 			}
 		});
-		
+
 		this.loadIcons();
 		this.loadProperties(false);
-		
+
 		this.addListeners();
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				removeListeners();
 			}
 		});
 		this.dialog.setDefaultButton( this.buttonGo );
-		
+
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
 		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			this.dialog.dispose();
 		}
 	}
-	
+
 	public void update(){
 		this.update(false);
 	}
-	
+
 	public void update(final boolean keepSelection){
 		if(!isDisposed()){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					if(!isDisposed()){
 						loadTableItems(keepSelection);
@@ -216,7 +224,7 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 	private GridData makeGridData(int horizontalAlignment,int verticalAlignment,boolean grabExcessVerticalSpace){
 		GridData data = new GridData();
 		data.horizontalAlignment = horizontalAlignment;
@@ -225,51 +233,53 @@ private GridData makeGridData(int horizontalAlignment,int verticalAlignment,bool
 		data.grabExcessVerticalSpace = grabExcessVerticalSpace;
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
-		
+
 		return data;
 	}
-	
+
 	protected void loadTableItems(boolean keepSelection){
 		int itemSelected = (keepSelection ? this.table.getSelectionIndex() : -1 );
-		
+
 		this.table.removeAll();
 		this.markers = TuxGuitar.instance().getSongManager().getMarkers();
-		
-		Iterator it = this.markers.iterator();
+
+		Iterator<TGMarker> it = this.markers.iterator();
 		while (it.hasNext()) {
-			TGMarker marker = (TGMarker) it.next();
-			
+			TGMarker marker = it.next();
+
 			TableItem item = new TableItem(this.table, SWT.NONE);
 			item.setText(new String[] { Integer.toString(marker.getMeasure()),marker.getTitle() });
 		}
-		
+
 		if(itemSelected >= 0 && itemSelected < this.markers.size()){
 			this.table.select(itemSelected);
 		}
 	}
-	
+
 	protected TGMarker getSelectedMarker(){
 		int itemSelected = this.table.getSelectionIndex();
 		if(itemSelected >= 0 && itemSelected < this.markers.size()){
-			return (TGMarker)this.markers.get(itemSelected);
+			return this.markers.get(itemSelected);
 		}
 		return null;
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
+	@Override
 	public void loadIcons() {
 		if(!isDisposed()){
 			this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		}
 	}
-	
+
+	@Override
 	public void loadProperties() {
 		this.loadProperties(true);
 	}
-	
+
 	public void loadProperties(boolean layout) {
 		if(!isDisposed()){
 			this.dialog.setText(TuxGuitar.getProperty("marker.list"));
@@ -280,7 +290,7 @@ public void loadProperties(boolean layout) {
 			this.buttonDelete.setText(TuxGuitar.getProperty("remove"));
 			this.buttonGo.setText(TuxGuitar.getProperty("go"));
 			this.buttonClose.setText(TuxGuitar.getProperty("close"));
-			
+
 			if(layout){
 				this.table.layout();
 				this.compositeTable.layout();
@@ -289,7 +299,8 @@ public void loadProperties(boolean layout) {
 			}
 		}
 	}
-	
+
+	@Override
 	public void doUpdate(int type) {
 		if( type ==  TGUpdateListener.SONG_LOADED ){
 			this.update();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerNavigator.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerNavigator.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerNavigator.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerNavigator.java
index c28ac74a..db78f6c2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/marker/MarkerNavigator.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/marker/MarkerNavigator.java
@@ -9,11 +9,11 @@
 import org.herac.tuxguitar.song.models.TGMarker;
 
 public class MarkerNavigator {
-	
+
 	public MarkerNavigator(){
 		super();
 	}
-	
+
 	public void goToSelectedMarker(TGMarker marker){
 		if(marker != null){
 			Caret caret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixer.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixer.java
index 0f3c276d..c251aaa9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixer.java
@@ -27,7 +27,7 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class TGMixer implements TGUpdateListener,IconLoader,LanguageLoader{
-	
+
 	public static final int MUTE = 0x01;
 	public static final int SOLO = 0x02;
 	public static final int VOLUME = 0x04;
@@ -37,9 +37,9 @@ public class TGMixer implements TGUpdateListener,IconLoader,LanguageLoader{
 	public static final int PHASER = 0x40;
 	public static final int TREMOLO = 0x80;
 	public static final int CHANNEL = 0x100;
-	
+
 	public static final int CHANGE_ALL = (MUTE | SOLO | VOLUME | BALANCE | CHORUS | REVERB | PHASER | TREMOLO | CHANNEL);
-	
+
 	protected Shell dialog;
 	private List tracks;
 	private Scale volumeScale;
@@ -47,15 +47,15 @@ public class TGMixer implements TGUpdateListener,IconLoader,LanguageLoader{
 	private Label volumeValueTitleLabel;
 	private String volumeTip;
 	private int volumeValue;
-	
+
 	public TGMixer() {
 		this.tracks = new ArrayList();
 	}
-	
+
 	public void show() {
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM);
 		this.loadData();
-		
+
 		this.addListeners();
 		this.dialog.addDisposeListener(new DisposeListener() {
 			public void widgetDisposed(DisposeEvent e) {
@@ -65,19 +65,19 @@ public void widgetDisposed(DisposeEvent e) {
 		});
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER );
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
 		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
 	}
-	
+
 	protected void loadData(){
 		this.tracks.clear();
 		Iterator it = TuxGuitar.instance().getSongManager().getSong().getTracks();
@@ -90,48 +90,48 @@ protected void loadData(){
 		Composite composite = new Composite(this.dialog, SWT.BORDER);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.CENTER,SWT.FILL,true,true));
-		
+
 		this.volumeValue = -1;
-		
+
 		this.volumeScale = new Scale(composite, SWT.VERTICAL);
 		this.volumeScale.setMaximum(10);
 		this.volumeScale.setMinimum(0);
 		this.volumeScale.setIncrement(1);
 		this.volumeScale.setPageIncrement(1);
 		this.volumeScale.setLayoutData(new GridData(SWT.CENTER,SWT.FILL,true,true));
-		
+
 		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,false));
-		
+
 		Composite volumeValueComposite = new Composite(composite, SWT.NONE);
 		volumeValueComposite.setLayout(new GridLayout(2,false));
-		
+
 		this.volumeValueTitleLabel = new Label(volumeValueComposite, SWT.NONE);
-		
+
 		this.volumeValueLabel = new Label(volumeValueComposite, SWT.CENTER);
 		this.volumeValueLabel.setLayoutData(getVolumeValueLabelData());
-		
+
 		this.volumeScale.addListener(SWT.Selection, new Listener() {
 			public void handleEvent(Event event) {
 				changeVolume();
 			}
 		});
-		
+
 		this.loadVolume();
 		this.loadIcons();
 		this.loadProperties(false);
-		
+
 		this.dialog.setLayout(getLayout(this.dialog.getChildren().length));
 		this.dialog.pack();
 	}
-	
+
 	private GridLayout getLayout(int columns){
 		GridLayout layout = new GridLayout(columns, false);
 		layout.verticalSpacing = 1;
 		layout.horizontalSpacing = 1;
 		return layout;
 	}
-	
+
 	protected void changeVolume(){
 		int volume = (short)(TGMixer.this.volumeScale.getMaximum() - TGMixer.this.volumeScale.getSelection());
 		if(volume != TuxGuitar.instance().getPlayer().getVolume()){
@@ -141,7 +141,7 @@ protected void changeVolume(){
 			this.volumeValue = volume;
 		}
 	}
-	
+
 	protected void loadVolume(){
 		int volume = TuxGuitar.instance().getPlayer().getVolume();
 		if(this.volumeValue != volume){
@@ -150,24 +150,24 @@ protected void loadVolume(){
 			this.volumeValue = volume;
 		}
 	}
-	
+
 	private GridData getVolumeValueLabelData(){
 		GridData data = new GridData(SWT.CENTER,SWT.NONE,true,false);
 		data.minimumWidth = 40;
 		return data;
 	}
-	
+
 	protected void clear(){
 		Control[] controls = this.dialog.getChildren();
 		for(int i = 0;i < controls.length;i++){
 			controls[i].dispose();
 		}
 	}
-	
+
 	public boolean isDisposed() {
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	public synchronized void fireChanges(TGChannel channel,int type){
 		Iterator it = this.tracks.iterator();
 		while(it.hasNext()){
@@ -181,11 +181,11 @@ public synchronized void fireChanges(TGChannel channel,int type){
 			TuxGuitar.instance().getPlayer().updateControllers();
 		}
 	}
-	
+
 	public synchronized void loadProperties(){
 		this.loadProperties(true);
 	}
-	
+
 	public synchronized void loadProperties(boolean pack){
 		if(!isDisposed()){
 			Iterator it = this.tracks.iterator();
@@ -204,13 +204,13 @@ public synchronized void loadProperties(boolean pack){
 			}
 		}
 	}
-	
+
 	public synchronized void loadIcons(){
 		if(!isDisposed()){
 			this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		}
 	}
-	
+
 	public synchronized void updateItems(){
 		if(!isDisposed()){
 			Iterator it = this.tracks.iterator();
@@ -220,11 +220,11 @@ public synchronized void updateItems(){
 			}
 		}
 	}
-	
+
 	public synchronized void updateValues(){
 		if(!isDisposed()){
 			this.loadVolume();
-			
+
 			Iterator it = this.tracks.iterator();
 			while(it.hasNext()){
 				TGMixerTrack mixer = (TGMixerTrack)it.next();
@@ -232,7 +232,7 @@ public synchronized void updateValues(){
 			}
 		}
 	}
-	
+
 	public synchronized void update(){
 		if(!isDisposed()){
 			new SyncThread(new Runnable() {
@@ -247,7 +247,7 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 	public synchronized void dispose() {
 		if(!isDisposed()){
 			this.dialog.dispose();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixerTrack.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixerTrack.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixerTrack.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixerTrack.java
index 87267f5b..2f691a8e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixerTrack.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixerTrack.java
@@ -25,43 +25,43 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class TGMixerTrack {
-	
+
 	protected TGTrack track;
 	protected TGMixer mixer;
 	protected TGMixerTrackChannel mixerChannel;
-	
+
 	protected Button checkSolo;
 	protected Button checkMute;
-	
+
 	private TGMixerScale scaleVolume;
 	private TGMixerScale scaleBalance;
 	private TGMixerScalePopup scaleChorus;
 	private TGMixerScalePopup scaleReverb;
 	private TGMixerScalePopup scalePhaser;
 	private TGMixerScalePopup scaleTremolo;
-	
+
 	private Label volumeValueLabel;
 	private Label volumeValueTitleLabel;
-	
+
 	public TGMixerTrack(TGMixer mixer,TGTrack track){
 		this.mixer = mixer;
 		this.track = track;
 	}
-	
+
 	public void init(final Composite parent) {
 		final Composite composite = new Composite(parent, SWT.BORDER);
 		composite.setLayout(new GridLayout(1, true));
 		composite.setLayoutData(new GridData(SWT.CENTER,SWT.FILL,true,true));
-		
+
 		this.mixerChannel = new TGMixerTrackChannel(this);
 		this.mixerChannel.init(composite);
-		
+
 		this.checkSolo = new Button(composite,SWT.CHECK);
 		this.checkSolo.setSelection(TGMixerTrack.this.track.isSolo());
 		this.checkSolo.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				TGTrack track = TGMixerTrack.this.track;
-				
+
 				UndoableTrackSoloMute undoable = UndoableTrackSoloMute.startUndo(track);
 				TuxGuitar.instance().getSongManager().getTrackManager().changeSolo(track,TGMixerTrack.this.checkSolo.getSelection());
 				TGMixerTrack.this.mixer.fireChanges(track.getChannel(),TGMixer.SOLO);
@@ -74,7 +74,7 @@ public void widgetSelected(SelectionEvent e) {
 		this.checkMute.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				TGTrack track = TGMixerTrack.this.track;
-				
+
 				UndoableTrackSoloMute undoable = UndoableTrackSoloMute.startUndo(track);
 				TuxGuitar.instance().getSongManager().getTrackManager().changeMute(track,TGMixerTrack.this.checkMute.getSelection());
 				TGMixerTrack.this.mixer.fireChanges(track.getChannel(),TGMixer.MUTE);
@@ -82,63 +82,63 @@ public void widgetSelected(SelectionEvent e) {
 				TuxGuitar.instance().updateCache(true);
 			}
 		});
-		
+
 		new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR).setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,false));
-		
+
 		Composite effects = new Composite(composite, SWT.NONE);
 		effects.setLayout(new GridLayout(4,false));
 		effects.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		this.scaleChorus = new TGMixerScalePopup(effects, SWT.VERTICAL, 64, TGMixer.CHORUS, getVerticalScaleData());
 		this.scaleChorus.setSelection(  this.track.getChannel().getChorus());
-		
+
 		this.scaleReverb = new TGMixerScalePopup(effects, SWT.VERTICAL, 64, TGMixer.REVERB, getVerticalScaleData());
 		this.scaleReverb.setSelection(  this.track.getChannel().getReverb());
-		
+
 		this.scalePhaser = new TGMixerScalePopup(effects, SWT.VERTICAL, 64, TGMixer.PHASER, getVerticalScaleData());
 		this.scalePhaser.setSelection(  this.track.getChannel().getPhaser());
-		
+
 		this.scaleTremolo = new TGMixerScalePopup(effects, SWT.VERTICAL, 64, TGMixer.TREMOLO, getVerticalScaleData());
 		this.scaleTremolo.setSelection(  this.track.getChannel().getTremolo());
-		
+
 		new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR).setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,false));
-		
+
 		this.scaleBalance = new TGMixerScale(composite, SWT.HORIZONTAL, 64, TGMixer.BALANCE, getHorizontalScaleData());
 		this.scaleBalance.setSelection(this.track.getChannel().getBalance());
-		
+
 		this.scaleVolume = new TGMixerScale(composite, SWT.VERTICAL, 16, TGMixer.VOLUME, new GridData(SWT.CENTER,SWT.FILL,true,true));
 		this.scaleVolume.setSelection(  this.track.getChannel().getVolume());
-		
+
 		Label separator = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
 		separator.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,false));
-		
+
 		Composite volumeValueComposite = new Composite(composite, SWT.NONE);
 		volumeValueComposite.setLayout(new GridLayout(2,false));
-		
+
 		this.volumeValueTitleLabel = new Label(volumeValueComposite, SWT.LEFT);
 		this.volumeValueLabel = new Label(volumeValueComposite, SWT.CENTER);
 		this.volumeValueLabel.setLayoutData(getVolumeValueLabelData());
 		this.volumeValueLabel.setText(Integer.toString(this.track.getChannel().getVolume()));
 	}
-	
+
 	private GridData getHorizontalScaleData(){
 		GridData data = new GridData(SWT.CENTER,SWT.NONE,false,true);
 		data.widthHint = 80;
 		return data;
 	}
-	
+
 	private GridData getVerticalScaleData(){
 		GridData data = new GridData(SWT.CENTER,SWT.FILL,false,true);
 		data.heightHint = 65;
 		return data;
 	}
-	
+
 	private GridData getVolumeValueLabelData(){
 		GridData data = new GridData(SWT.CENTER,SWT.NONE,true,false);
 		data.minimumWidth = 40;
 		return data;
 	}
-	
+
 	public void fireChanges(int type){
 		if((type & TGMixer.SOLO) != 0 || (type & TGMixer.MUTE) != 0){
 			this.checkSolo.setSelection(this.track.isSolo());
@@ -173,36 +173,36 @@ public void fireChanges(int type){
 			this.mixerChannel.updateItems(true);
 		}
 	}
-	
+
 	public void loadProperties(){
 		this.checkSolo.setText(TuxGuitar.getProperty("mixer.track.solo"));
 		this.checkMute.setText(TuxGuitar.getProperty("mixer.track.mute"));
 		this.volumeValueTitleLabel.setText(TuxGuitar.getProperty("mixer.channel.volume") + ":");
-		
+
 		this.scaleVolume.setText(TuxGuitar.getProperty("mixer.channel.volume"));
 		this.scaleBalance.setText(TuxGuitar.getProperty("mixer.channel.balance"));
 		this.scaleChorus.setText(TuxGuitar.getProperty("mixer.channel.chorus"));
 		this.scaleReverb.setText(TuxGuitar.getProperty("mixer.channel.reverb"));
 		this.scalePhaser.setText(TuxGuitar.getProperty("mixer.channel.phaser"));
 		this.scaleTremolo.setText(TuxGuitar.getProperty("mixer.channel.tremolo"));
-		
+
 		this.mixerChannel.updateItems(true);
 	}
-	
+
 	public void updateItems(){
 		this.checkSolo.setSelection(this.track.isSolo());
 		this.checkMute.setSelection(this.track.isMute());
 		this.mixerChannel.updateItems(false);
 	}
-	
+
 	public TGTrack getTrack(){
 		return this.track;
 	}
-	
+
 	public TGMixer getMixer(){
 		return this.mixer;
 	}
-	
+
 	protected void updateChannelValue(int type, int value){
 		if( (type & TGMixer.VOLUME) != 0 ){
 			TGMixerTrack.this.track.getChannel().setVolume( (short)value );
@@ -224,20 +224,20 @@ else if( (type & TGMixer.TREMOLO) != 0 ){
 		}
 		this.mixer.fireChanges(TGMixerTrack.this.track.getChannel(), type);
 	}
-	
+
 	private class TGMixerScale {
-		
+
 		private int type;
 		private int value;
 		private boolean inverted;
 		private Scale scale;
 		private String text;
 		protected UndoableTrackChannel undoable;
-		
+
 		public TGMixerScale(Composite parent, int style, int pageIncrement, int type, Object layoutData){
 			this.init(parent, style, pageIncrement, type, layoutData);
 		}
-		
+
 		public void init(Composite parent, int style, int pageIncrement, int type, Object layoutData){
 			this.scale = new Scale(parent, style);
 			this.scale.setMaximum(127);
@@ -250,7 +250,7 @@ public void init(Composite parent, int style, int pageIncrement, int type, Objec
 			this.inverted =  ((style & SWT.VERTICAL) != 0 );
 			this.addDefaultListeners();
 		}
-		
+
 		public void addDefaultListeners(){
 			this.scale.addListener(SWT.Selection, new Listener() {
 				public synchronized void handleEvent(Event event) {
@@ -272,22 +272,22 @@ public void mouseUp(MouseEvent arg0) {
 				}
 			});
 		}
-		
+
 		public void updateValue(){
 			this.setSelection( ( this.inverted ? 127 - this.scale.getSelection() : this.scale.getSelection() ) );
 		}
-		
+
 		public int getType(){
 			return this.type;
 		}
-		
+
 		public int getSelection(){
 			if(this.value < 0){
 				this.updateValue();
 			}
 			return this.value;
 		}
-		
+
 		public void setSelection(int value){
 			if(value != this.value){
 				this.value = value;
@@ -295,33 +295,33 @@ public void setSelection(int value){
 				this.updateToolTipValue();
 			}
 		}
-		
+
 		public void updateToolTipValue(){
 			if(this.text != null){
 				this.scale.setToolTipText( this.text + ": " + this.value );
 			}
 		}
-		
+
 		public void setText(String text){
 			this.text = text;
 			this.updateToolTipValue();
 		}
-		
+
 		public String getText(){
 			return this.text;
 		}
 	}
-	
+
 	private class TGMixerScalePopup extends TGMixerScale{
-		
+
 		private Shell shell;
 		private Composite composite;
 		private Button item;
-		
+
 		public TGMixerScalePopup(Composite parent, int style, int pageIncrement, int type, Object layoutData){
 			super(parent, style, pageIncrement, type, layoutData);
 		}
-		
+
 		public void init(Composite parent, int style, int pageIncrement, int type, Object layoutData){
 			this.shell = new Shell( parent.getShell(), SWT.NO_TRIM);
 			this.shell.setVisible(false);
@@ -335,21 +335,21 @@ public void shellClosed(ShellEvent e) {
 					hideShell();
 				}
 			});
-			
+
 			this.composite = new Composite(this.shell, SWT.BORDER);
 			this.composite.setLayout(getGridLayout());
 			this.composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-			
+
 			this.item = new Button(parent, SWT.PUSH);
 			this.item.addSelectionListener(new SelectionAdapter() {
 				public void widgetSelected(SelectionEvent e) {
 					showSelect();
 				}
 			});
-			
+
 			super.init(this.composite, style, pageIncrement, type, layoutData);
 		}
-		
+
 		private GridLayout getGridLayout(){
 			GridLayout layout = new GridLayout();
 			layout.horizontalSpacing = 0;
@@ -362,33 +362,33 @@ private GridLayout getGridLayout(){
 			layout.marginHeight = 0;
 			return layout;
 		}
-		
+
 		public void updateToolTipValue(){
 			super.updateToolTipValue();
 			if(this.getText() != null){
 				this.item.setToolTipText( this.getText() + ": " + this.getSelection() );
 			}
 		}
-		
+
 		public void setText(String text){
 			super.setText(text);
 			if(this.getText() != null && this.getText().length() > 0){
 				this.item.setText( this.getText().substring(0,1) );
 			}
 		}
-		
+
 		public void showSelect() {
 			if(!this.shell.isVisible()){
 				Rectangle bounds = this.item.getBounds();
 				Point location = this.item.getParent().toDisplay(new Point(bounds.x, bounds.y));
-				
+
 				this.shell.pack();
 				this.shell.setLocation( (location.x + (bounds.width / 2)) - (this.shell.getSize().x / 2), location.y + bounds.height);
 				this.shell.setVisible(true);
 				this.shell.setActive();
 			}
 		}
-		
+
 		public void hideShell() {
 			this.shell.setVisible(false);
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixerTrackChannel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixerTrackChannel.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixerTrackChannel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixerTrackChannel.java
index 5ca3d1ef..3ae27758 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/mixer/TGMixerTrackChannel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/mixer/TGMixerTrackChannel.java
@@ -17,38 +17,38 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class TGMixerTrackChannel {
-	
+
 	private TGMixerTrack mixer;
 	protected Combo normalChannel;
 	protected Combo effectChannel;
 	protected ChannelList normalChannels;
 	protected ChannelList effectChannels;
-	
+
 	public TGMixerTrackChannel(TGMixerTrack mixer){
 		this.mixer = mixer;
 	}
-	
+
 	protected TGTrack getTrack(){
 		return this.mixer.getTrack();
 	}
-	
+
 	protected TGChannel getChannel(){
 		return this.mixer.getTrack().getChannel();
 	}
-	
+
 	public void init(Composite parent){
 		this.normalChannels = new ChannelList();
 		this.normalChannel = new Combo(parent,SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.normalChannel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
+
 		this.effectChannels = new ChannelList();
 		this.effectChannel = new Combo(parent,SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.effectChannel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		
+
 		this.normalChannel.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				UndoableTrackChannel undoable = UndoableTrackChannel.startUndo();
-				
+
 				TGChannel channel = getTrack().getChannel();
 				boolean[] usedChannels = TuxGuitar.instance().getSongManager().getUsedChannels();
 				int idx = TGMixerTrackChannel.this.normalChannels.getChannel(TGMixerTrackChannel.this.normalChannel.getSelectionIndex());
@@ -59,32 +59,32 @@ public void widgetSelected(SelectionEvent e) {
 					TuxGuitar.instance().getSongManager().getUsedChannel(idx).copy(channel);
 				}
 				fireChannelChange(channel);
-				
+
 				TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
 				TuxGuitar.instance().getTable().fireUpdate(false);
 				TuxGuitar.instance().updateCache(true);
 			}
 		});
-		
+
 		this.effectChannel.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				UndoableTrackChannel undoable = UndoableTrackChannel.startUndo();
-				
+
 				TGChannel channel = getTrack().getChannel();
 				int idx = TGMixerTrackChannel.this.effectChannels.getChannel(TGMixerTrackChannel.this.effectChannel.getSelectionIndex());
 				channel.setEffectChannel((short)idx);
 				fireChannelChange(channel);
-				
+
 				TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
 				TuxGuitar.instance().getFileHistory().setUnsavedFile();
 				TuxGuitar.instance().updateCache(true);
 			}
 		});
-		
+
 		this.updateItems(true);
 	}
-	
+
 	public void updateItems(boolean reload){
 		if(reload){
 			this.updateNormalChannel();
@@ -93,11 +93,11 @@ public void updateItems(boolean reload){
 		this.normalChannel.setEnabled(!TuxGuitar.instance().getPlayer().isRunning());
 		this.effectChannel.setEnabled(!TuxGuitar.instance().getPlayer().isRunning());
 	}
-	
+
 	private void updateNormalChannel(){
 		this.normalChannel.removeAll();
 		this.normalChannels.clear();
-		
+
 		boolean[] usedChannels = TuxGuitar.instance().getSongManager().getUsedChannels();
 		boolean[] usedEffectChannels = TuxGuitar.instance().getSongManager().getUsedEffectChannels();
 		if(getChannel().isPercussionChannel()){
@@ -116,7 +116,7 @@ private void updateNormalChannel(){
 							itemName =  i + " " + TuxGuitar.getProperty("mixer.channel.free");
 						}
 						this.normalChannel.add(itemName);
-						
+
 						if(i == getChannel().getChannel()){
 							this.normalChannel.select(itemIndex);
 						}
@@ -127,11 +127,11 @@ private void updateNormalChannel(){
 			}
 		}
 	}
-	
+
 	private void updateEffectChannel(){
 		this.effectChannel.removeAll();
 		this.effectChannels.clear();
-		
+
 		boolean[] usedChannels = TuxGuitar.instance().getSongManager().getUsedChannels();
 		boolean[] usedEffectChannels = TuxGuitar.instance().getSongManager().getUsedEffectChannels();
 		if(getChannel().isPercussionChannel()){
@@ -144,7 +144,7 @@ private void updateEffectChannel(){
 				if(!TGChannel.isPercussionChannel(i)){
 					if((!usedEffectChannels[i] || getChannel().getEffectChannel() == i) && (!usedChannels[i] || i == getChannel().getChannel())){
 						this.effectChannel.add(Integer.toString(i));
-						
+
 						if(i == getChannel().getEffectChannel()){
 							this.effectChannel.select(itemIndex);
 						}
@@ -155,22 +155,22 @@ private void updateEffectChannel(){
 			}
 		}
 	}
-	
+
 	public void fireChannelChange(TGChannel channel){
 		this.mixer.getMixer().fireChanges(channel,TGMixer.CHANNEL);
 	}
-	
+
 	private class ChannelList{
 		private List channelIndexs;
-		
+
 		public ChannelList(){
 			this.channelIndexs = new ArrayList();
 		}
-		
+
 		public void addChannel(int index,int channel){
 			this.channelIndexs.add(new ChannelIndex(index,channel));
 		}
-		
+
 		public int getChannel(int index){
 			Iterator it = this.channelIndexs.iterator();
 			while (it.hasNext()) {
@@ -181,25 +181,25 @@ public int getChannel(int index){
 			}
 			return -1;
 		}
-		
+
 		public void clear(){
 			this.channelIndexs.clear();
 		}
 	}
-	
+
 	private class ChannelIndex{
 		private int index;
 		private int channel;
-		
+
 		public ChannelIndex(int index,int channel){
 			this.index = index;
 			this.channel = channel;
 		}
-		
+
 		public int getChannel() {
 			return this.channel;
 		}
-		
+
 		public int getIndex() {
 			return this.index;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintController.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintController.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintController.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintController.java
index 282607af..acab3293 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintController.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintController.java
@@ -12,7 +12,7 @@
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 
 public class PrintController implements TGController {
-	
+
 	private static final int DEFAULT_SCORE_LINE_SPACING = 7;
 	private static final int DEFAULT_STRING_SPACING = 8;
 	private static final int DEFAULT_HORIZONTAL_SPACING = 15;
@@ -24,46 +24,54 @@ public class PrintController implements TGController {
 	private static final int CHORD_FRET_INDEX_SPACING = 8;
 	private static final int CHORD_STRING_SPACING = 4;
 	private static final int CHORD_FRET_SPACING = 5;
-	
+
 	private TGSongManager songManager;
 	private TGResourceFactory resourceFactory;
-	
+
 	public PrintController(TGSongManager songManager, TGResourceFactory resourceFactory){
 		this.songManager = songManager;
 		this.resourceFactory = resourceFactory;
 	}
-	
+
+	@Override
 	public TGSongManager getSongManager() {
 		return this.songManager;
 	}
-	
+
+	@Override
 	public TGResourceFactory getResourceFactory(){
 		return this.resourceFactory;
 	}
-	
+
+	@Override
 	public int getTrackSelection() {
 		return -1;
 	}
-	
+
+	@Override
 	public boolean isRunning(TGBeat beat) {
 		return false;
 	}
-	
+
+	@Override
 	public boolean isRunning(TGMeasure measure) {
 		return false;
 	}
-	
+
+	@Override
 	public boolean isLoopSHeader(TGMeasureHeader measureHeader) {
 		return false;
 	}
-	
+
+	@Override
 	public boolean isLoopEHeader(TGMeasureHeader measureHeader) {
 		return false;
 	}
-	
+
+	@Override
 	public void configureStyles(TGLayoutStyles styles){
 		TGConfigManager config = TuxGuitar.instance().getConfig();
-		
+
 		styles.setBufferEnabled(false);
 		styles.setFirstMeasureSpacing(DEFAULT_HORIZONTAL_SPACING);
 		styles.setMinBufferSeparator(DEFAULT_MIN_BUFFER_SEPARATOR);
@@ -82,7 +90,7 @@ public void configureStyles(TGLayoutStyles styles){
 		styles.setMarkerSpacing(15);
 		styles.setDivisionTypeSpacing(10);
 		styles.setEffectSpacing(8);
-		
+
 		styles.setDefaultFont(config.getFontModelConfigValue(TGConfigKeys.FONT_PRINTER_DEFAULT));
 		styles.setNoteFont(config.getFontModelConfigValue(TGConfigKeys.FONT_PRINTER_NOTE));
 		styles.setTimeSignatureFont(config.getFontModelConfigValue(TGConfigKeys.FONT_PRINTER_TIME_SIGNATURE));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintDocument.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintDocument.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintDocument.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintDocument.java
index 3732a259..bee25ccd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintDocument.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintDocument.java
@@ -4,19 +4,19 @@
 import org.herac.tuxguitar.graphics.TGRectangle;
 
 public interface PrintDocument{
-	
+
 	public void start();
-	
+
 	public void finish();
-	
+
 	public void pageStart();
-	
+
 	public void pageFinish();
-	
+
 	public boolean isPaintable(int page);
-	
+
 	public TGPainter getPainter();
-	
+
 	public TGRectangle getBounds();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintLayout.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintLayout.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintLayout.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintLayout.java
index 04db81af..a9889478 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintLayout.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintLayout.java
@@ -1,8 +1,5 @@
 /*
  * Created on 04-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.printer;
 
@@ -17,73 +14,72 @@
 import org.herac.tuxguitar.graphics.TGResourceFactory;
 import org.herac.tuxguitar.graphics.control.TGChordImpl;
 import org.herac.tuxguitar.graphics.control.TGController;
+import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.graphics.control.TGLyricImpl;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackSpacing;
-import org.herac.tuxguitar.graphics.control.TGLayout;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 import org.herac.tuxguitar.song.models.TGTrack;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class PrintLayout extends TGLayout{
-	
+
 	private PrintStyles styles;
 	private PrintDocument document;
 	private int page;
-	
+
 	private TGFont songNameFont;
 	private TGFont trackNameFont;
 	private TGFont songAuthorFont;
-	
+
 	public PrintLayout(TGController controller,PrintStyles styles){
 		super(controller,( styles.getStyle() | DISPLAY_COMPACT ) );
 		this.styles = styles;
 	}
-	
+
+	@Override
 	public int getMode(){
 		return 0;
 	}
-	
+
 	public void makeDocument(PrintDocument document){
 		this.page = 0;
 		this.document = document;
 		this.makeDocument();
 	}
-	
+
 	private void makeDocument(){
 		this.document.start();
-		
+
 		this.openPage();
 		paintHeader(this.document.getPainter());
 		paintSong(this.document.getPainter(),null,this.document.getBounds().getX(), ( this.document.getBounds().getY() + Math.round(80.0f * getFontScale() ) ) );
 		paintFooter(this.document.getPainter());
 		this.closePage();
-		
+
 		this.document.finish();
 	}
-	
+
+	@Override
 	public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fromY) {
 		this.setWidth(0);
 		this.setHeight(0);
-		
+
 		int style = getStyle();
 		int posY = fromY + getFirstTrackSpacing();
 		int height = getFirstTrackSpacing();
 		int lineHeight = 0;
-		
+
 		TGTrackImpl track = (TGTrackImpl)getSongManager().getTrack(this.styles.getTrackNumber());
 		((TGLyricImpl)track.getLyrics()).start(getSkippedBeats(track));
-		
+
 		TGTrackSpacing ts = new TGTrackSpacing(this) ;
 		TempLine line = getTempLines(track,( this.styles.getFromMeasure() - 1 ),ts);
 		while(!line.measures.isEmpty()){
-			
+
 			ts.setSize(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES, ((style & DISPLAY_SCORE) != 0?( (getScoreLineSpacing() * 5) ):0));
 			if((style & DISPLAY_SCORE) != 0){
 				ts.setSize(TGTrackSpacing.POSITION_SCORE_UP_LINES, Math.abs(line.minY));
@@ -97,7 +93,7 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 			}
 			ts.setSize(TGTrackSpacing.POSITION_LYRIC,10);
 			checkDefaultSpacing(ts);
-			
+
 			lineHeight = ts.getSize();
 			//Verifico si entra en la pagina actual
 			if((posY + lineHeight + getTrackSpacing()) > (this.document.getBounds().getY() + getMaxHeight())){
@@ -106,19 +102,19 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 				this.openPage();
 				posY = this.document.getBounds().getY() + getFirstTrackSpacing();
 			}
-			
+
 			//pinto la linea
 			paintLine(track,line,painter,fromX,posY,ts);
-			
+
 			posY += lineHeight + getTrackSpacing();
 			height += lineHeight + getTrackSpacing();
-			
+
 			ts = new TGTrackSpacing(this) ;
 			line = getTempLines(track,( line.lastIndex + 1 ),ts);
 		}
 		this.setHeight(height);
 	}
-	
+
 	public void paintHeader(TGPainter painter){
 		if(this.document.isPaintable(this.page) ){
 			int x = this.document.getBounds().getX();
@@ -126,7 +122,7 @@ public void paintHeader(TGPainter painter){
 			String songName = getSongManager().getSong().getName();
 			String songAuthor = getSongManager().getSong().getAuthor();
 			String trackName = "(" + getSongManager().getTrack(this.styles.getTrackNumber()).getName() + ")";
-			
+
 			if(songName == null || songName.length() == 0){
 				songName = TuxGuitar.getProperty("print-header.default-song-name");
 			}
@@ -141,25 +137,25 @@ public void paintHeader(TGPainter painter){
 			painter.drawString(songAuthor,(x + getRight(painter,songAuthor)),(y + Math.round(50.0f * getFontScale())));
 		}
 	}
-	
+
 	private void paintFooter(TGPainter painter){
 		if(this.document.isPaintable(this.page) ){
 			int x = this.document.getBounds().getX();
 			int y = this.document.getBounds().getY();
 			String pageNumber = Integer.toString(this.page);
-			
+
 			painter.setBackground(getResources().getColorWhite());
 			painter.setForeground(getResources().getColorBlack());
 			painter.drawString(pageNumber,(x + getRight(painter,pageNumber)),(y + getBottom(painter,pageNumber)));
 		}
 	}
-	
+
 	public void paintLine(TGTrackImpl track,TempLine line,TGPainter painter,int fromX, int fromY,TGTrackSpacing ts) {
 		if(this.document.isPaintable(this.page) ){
 			int posX = fromX;
 			int posY = fromY;
 			int width = 0;
-			
+
 			int measureSpacing = 0;
 			if(line.fullLine){
 				int diff = ( getMaxWidth() - line.tempWith);
@@ -167,23 +163,23 @@ public void paintLine(TGTrackImpl track,TempLine line,TGPainter painter,int from
 					measureSpacing = diff / line.measures.size();
 				}
 			}
-			
+
 			for(int i = 0;i < line.measures.size();i ++){
-				int index = ((Integer)line.measures.get(i)).intValue();
+				int index = line.measures.get(i).intValue();
 				TGMeasureImpl currMeasure = (TGMeasureImpl)track.getMeasure(index);
-				
+
 				//asigno la posicion dentro del compas
 				currMeasure.setPosX(posX);
 				currMeasure.setPosY(posY);
 				currMeasure.setTs(ts);
-				
+
 				((TGLyricImpl)track.getLyrics()).setCurrentMeasure(currMeasure);
-				
+
 				currMeasure.setFirstOfLine(i == 0);
-				
+
 				paintMeasure(currMeasure,painter,measureSpacing);
 				((TGLyricImpl)track.getLyrics()).paintCurrentNoteBeats(painter,this,currMeasure,posX, posY);
-				
+
 				int measureWidth = ( currMeasure.getWidth(this) + currMeasure.getSpacing() );
 				posX += measureWidth;
 				width += measureWidth;
@@ -191,39 +187,39 @@ public void paintLine(TGTrackImpl track,TempLine line,TGPainter painter,int from
 			this.setWidth(Math.max(getWidth(),width));
 		}
 	}
-	
+
 	private void openPage(){
 		this.page ++;
 		if(this.document.isPaintable(this.page)){
 			this.document.pageStart();
 		}
 	}
-	
+
 	private void closePage(){
 		if(this.document.isPaintable(this.page)){
 			this.document.pageFinish();
 		}
 	}
-	
+
 	private int getCenter(TGPainter painter,String text){
 		return ((getMaxWidth() - painter.getFMWidth(text)) / 2);
 	}
-	
+
 	private int getRight(TGPainter painter,String text){
 		return ((getMaxWidth() - painter.getFMWidth(text)));
 	}
-	
+
 	private int getBottom(TGPainter painter,String text){
 		return ((getMaxHeight() - painter.getFMHeight()));
 	}
-	
+
 	private TempLine getTempLines(TGTrack track,int fromIndex,TGTrackSpacing ts) {
 		TempLine line = new TempLine();
 		int measureCount = track.countMeasures();
 		for (int measureIdx = fromIndex; measureIdx < measureCount; measureIdx++) {
 			TGMeasureImpl measure= (TGMeasureImpl) track.getMeasure(measureIdx);
 			if( measure.getNumber() >= this.styles.getFromMeasure() && measure.getNumber() <= this.styles.getToMeasure()){
-				
+
 				//verifico si tengo que bajar de linea
 				if((line.tempWith + measure.getWidth(this)) >=  getMaxWidth() && !line.measures.isEmpty()){
 					line.fullLine = true;
@@ -232,137 +228,158 @@ private TempLine getTempLines(TGTrack track,int fromIndex,TGTrackSpacing ts) {
 				line.tempWith +=  measure.getWidth(this);
 				line.maxY = (measure.getMaxY() > line.maxY)?measure.getMaxY():line.maxY;
 				line.minY = (measure.getMinY() < line.minY)?measure.getMinY():line.minY;
-				
+
 				line.addMeasure(measureIdx);
 				measure.registerSpacing(this,ts);
 			}
 		}
-		
+
 		return line;
 	}
-	
+
 	private int getSkippedBeats(TGTrack track) {
 		int beats = 0;
-		
+
 		for (int i = 0; i < (this.styles.getFromMeasure() - 1); i++) {
 			TGMeasureImpl measure = (TGMeasureImpl) track.getMeasure(i);
 			beats += measure.getNotEmptyBeats();
 		}
 		return beats;
 	}
-	
+
+	@Override
 	public boolean isPlayModeEnabled(){
 		return false;
 	}
-	
+
+	@Override
 	public void setLineStyle(TGPainter painter){
 		painter.setLineWidth(1);
 		painter.setForeground( getDarkColor( getResources().getLineColor() ) );
 	}
-	
+
+	@Override
 	public void setMeasureNumberStyle(TGPainter painter){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground(getResources().getColorWhite());
 		painter.setForeground(getDarkColor(getResources().getColorRed()));
 	}
-	
+
+	@Override
 	public void setDivisionsStyle(TGPainter painter, boolean fill){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground( (fill ? getResources().getColorBlack() :getResources().getColorWhite() ));
 		painter.setForeground(getResources().getColorBlack());
 	}
-	
+
+	@Override
 	public void setTempoStyle(TGPainter painter, boolean fontStyle){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground( ( fontStyle ? getResources().getColorWhite() : getResources().getColorBlack() ));
 	}
-	
+
+	@Override
 	public void setTripletFeelStyle(TGPainter painter, boolean fontStyle){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground( ( fontStyle ? getResources().getColorWhite() : getResources().getColorBlack() ));
 	}
-	
+
+	@Override
 	public void setTabNoteStyle(TGPainter painter,boolean playMode){
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getDarkColor(getResources().getTabNoteColor()) );
 		painter.setFont(getResources().getNoteFont());
 	}
-	
+
+	@Override
 	public void setTabNoteFooterStyle(TGPainter painter){
 		painter.setForeground( getDarkColor(getResources().getTabNoteColor()));
 		painter.setBackground( getDarkColor(getResources().getTabNoteColor()));
 	}
-	
+
+	@Override
 	public void setTabEffectStyle(TGPainter painter){
 		painter.setForeground( getDarkColor(getResources().getTabNoteColor()));
 		painter.setBackground( getDarkColor(getResources().getTabNoteColor()));
 	}
-	
+
+	@Override
 	public void setScoreNoteStyle(TGPainter painter,boolean playing){
 		painter.setBackground( getDarkColor(getResources().getScoreNoteColor()) );
 		painter.setForeground( getDarkColor(getResources().getScoreNoteColor()) );
 	}
-	
+
+	@Override
 	public void setScoreNoteFooterStyle(TGPainter painter){
 		painter.setForeground( getDarkColor(getResources().getScoreNoteColor()) );
 		painter.setBackground( getDarkColor(getResources().getScoreNoteColor()) );
 	}
-	
+
+	@Override
 	public void setScoreEffectStyle(TGPainter painter){
 		painter.setForeground( getDarkColor(getResources().getScoreNoteColor()) );
 		painter.setBackground( getDarkColor(getResources().getScoreNoteColor()) );
 	}
-	
+
+	@Override
 	public void setTimeSignatureStyle(TGPainter painter){
 		painter.setFont(getResources().getTimeSignatureFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getResources().getColorBlack() );
 	}
-	
+
+	@Override
 	public void setTabGraceStyle(TGPainter painter){
 		painter.setFont(getResources().getGraceFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getDarkColor(getResources().getTabNoteColor()) );
 	}
-	
+
+	@Override
 	public void setLyricStyle(TGPainter painter,boolean playMode){
 		painter.setFont(getResources().getLyricFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground(getResources().getColorBlack());
 	}
-	
+
+	@Override
 	public void setMarkerStyle(TGPainter painter, TGColor color){
 		painter.setFont(getResources().getMarkerFont());
 		painter.setBackground(getResources().getColorWhite());
 		painter.setForeground(getDarkColor(color));
 	}
-	
+
+	@Override
 	public void setTextStyle(TGPainter painter){
 		painter.setFont(getResources().getTextFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getResources().getColorBlack() );
 	}
-	
+
+	@Override
 	public void setOfflineEffectStyle(TGPainter painter){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getResources().getColorBlack() );
 	}
-	
+
+	@Override
 	public void setDivisionTypeStyle(TGPainter painter){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getResources().getColorBlack() );
 	}
-	
+
+	@Override
 	public void setRepeatEndingStyle(TGPainter painter){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground( getResources().getColorWhite() );
 		painter.setForeground( getResources().getColorBlack() );
 	}
-	
+
+	@Override
 	public void setChordStyle(TGChordImpl chord){
 		chord.setStyle(getStyle());
 		chord.setFont(getResources().getChordFont());
@@ -377,32 +394,34 @@ public void setChordStyle(TGChordImpl chord){
 		chord.setFirstFretSpacing(getChordFretIndexSpacing());
 		chord.setFirstFretFont(getResources().getChordFretFont());
 	}
-	
+
 	public TGColor getDarkColor( TGColor color ) {
 		return ( this.styles.isBlackAndWhite() ? getResources().getColorBlack() : color );
 	}
-	
+
 	public int getMaxWidth(){
 		return (this.document.getBounds().getWidth() - this.document.getBounds().getX() - 10);
 	}
-	
+
 	public int getMaxHeight(){
 		return (this.document.getBounds().getHeight() - this.document.getBounds().getY() - 10);
 	}
-	
+
+	@Override
 	public boolean isFirstMeasure(TGMeasureHeader mh){
 		return (mh.getNumber() == this.styles.getFromMeasure());
 	}
-	
+
+	@Override
 	public boolean isLastMeasure(TGMeasureHeader mh){
 		return (mh.getNumber() == this.styles.getToMeasure());
 	}
-	
+
 	/*
 	private int getScaledValue(float scale, int value){
 		return getScaledValue(scale, value,1);
 	}
-	
+
 	private int getScaledValue(float scale, int value, int minimum){
 		float scaledValue = ( value * scale );
 		return Math.max( Math.round( scaledValue ) , minimum );
@@ -414,21 +433,22 @@ public TGFont getSongNameFont( TGResourceFactory factory ){
 		}
 		return this.songNameFont;
 	}
-	
+
 	public TGFont getSongAuthorFont( TGResourceFactory factory ){
 		if( factory != null && ( this.songAuthorFont == null || this.songAuthorFont.isDisposed() ) ){
 			this.songAuthorFont = factory.createFont(this.getResources().getDefaultFont().getName(),Math.round(8.0f * getFontScale()), true, false);
 		}
 		return this.songAuthorFont;
 	}
-	
+
 	public TGFont getTrackNameFont( TGResourceFactory factory ){
 		if( factory != null && ( this.trackNameFont == null || this.trackNameFont.isDisposed() ) ){
 			this.trackNameFont = factory.createFont(this.getResources().getDefaultFont().getName(),Math.round(8.0f * getFontScale()), true, false);
 		}
 		return this.trackNameFont;
 	}
-	
+
+	@Override
 	public void disposeLayout(){
 		super.disposeLayout();
 		if( this.songNameFont != null && !this.songNameFont.isDisposed() ){
@@ -441,19 +461,19 @@ public void disposeLayout(){
 			this.trackNameFont.dispose();
 		}
 	}
-	
+
 	private class TempLine{
 		protected int tempWith;
 		protected int lastIndex;
 		protected boolean fullLine;
 		protected int maxY = 0;
 		protected int minY = 50;
-		protected List measures;
-		
+		protected List<Integer> measures;
+
 		public TempLine(){
-			this.measures = new ArrayList();
+			this.measures = new ArrayList<Integer>();
 		}
-		
+
 		protected void addMeasure(int index){
 			this.measures.add(new Integer(index));
 			this.lastIndex = index;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintPreview.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintPreview.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintPreview.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintPreview.java
index a0b05221..925af281 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintPreview.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintPreview.java
@@ -36,7 +36,7 @@ public class PrintPreview{
 	private static final int MARGIN_BOTTOM = 40;
 	private static final int MARGIN_LEFT = 50;
 	private static final int MARGIN_RIGHT = 20;
-	
+
 	protected Shell dialog;
 	protected Composite previewComposite;
 	protected Composite pageComposite;
@@ -44,41 +44,42 @@ public class PrintPreview{
 	protected Button previous;
 	protected Button next;
 	protected TGRectangle bounds;
-	protected List pages;
+	protected List<Image> pages;
 	protected int currentPage;
-	
-	public PrintPreview(List pages,TGRectangle bounds){
+
+	public PrintPreview(List<Image> pages,TGRectangle bounds){
 		this.pages = pages;
 		this.bounds = bounds;
 	}
-	
+
 	public void showPreview(Shell parent){
 		this.dialog = DialogUtils.newDialog(parent,SWT.SHELL_TRIM | SWT.APPLICATION_MODAL );
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setText(TuxGuitar.getProperty("print.preview"));
-		
+
 		this.initToolBar();
 		this.initPreviewComposite();
 		this.changePage(0);
-		
+
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_MAXIMIZED | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private void initToolBar(){
 		Composite composite = new Composite(this.dialog,SWT.NONE);
 		composite.setLayout(new GridLayout(5,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,false));
-		
+
 		this.previous = new Button(composite,SWT.ARROW | SWT.LEFT);
 		this.currentText = new Text(composite,SWT.BORDER);
 		this.currentText.setLayoutData(new GridData(25,SWT.DEFAULT));
 		this.next = new Button(composite,SWT.ARROW | SWT.RIGHT);
 		Label maxPages = new Label(composite,SWT.NONE);
-		
+
 		Button close = new Button(composite,SWT.PUSH);
 		close.setLayoutData(getButtonData());
-		
+
 		this.currentText.addKeyListener(new KeyAdapter() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				if(e.keyCode == KeyBindingUtil.ENTER){
 					try{
@@ -91,6 +92,7 @@ public void keyReleased(KeyEvent e) {
 			}
 		});
 		this.previous.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(PrintPreview.this.currentPage >= 0){
 					changePage(PrintPreview.this.currentPage - 1);
@@ -98,6 +100,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		this.next.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				if(PrintPreview.this.currentPage >= 0){
 					changePage(PrintPreview.this.currentPage + 1);
@@ -105,6 +108,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		close.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				PrintPreview.this.dialog.dispose();
 			}
@@ -112,14 +116,14 @@ public void widgetSelected(SelectionEvent e) {
 		maxPages.setText(TuxGuitar.getProperty("print.preview.page-of") + " " + this.pages.size());
 		close.setText(TuxGuitar.getProperty("close"));
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.RIGHT, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private void initPreviewComposite(){
 		this.previewComposite = new Composite(this.dialog,SWT.BORDER | SWT.V_SCROLL);
 		this.previewComposite.setLayout(new GridLayout());
@@ -130,13 +134,14 @@ private void initPreviewComposite(){
 		this.pageComposite.setLayout(new GridLayout());
 		this.pageComposite.setBackground(this.previewComposite.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.pageComposite.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				if(PrintPreview.this.currentPage >= 0){
 					updateScroll();
-					
+
 					int vScroll = PrintPreview.this.previewComposite.getVerticalBar().getSelection();
-					
-					TGImage page = new TGImageImpl((Image)PrintPreview.this.pages.get(PrintPreview.this.currentPage));
+
+					TGImage page = new TGImageImpl(PrintPreview.this.pages.get(PrintPreview.this.currentPage));
 					TGPainter painter = new TGPainterImpl(e.gc);
 					painter.drawImage(page, MARGIN_LEFT, MARGIN_TOP - vScroll);
 				}
@@ -152,19 +157,20 @@ public void paintControl(PaintEvent e) {
 		this.pageComposite.setLayoutData(pageData);
 		this.previewComposite.getVerticalBar().setIncrement(SCROLL_INCREMENT);
 		this.previewComposite.getVerticalBar().addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event e) {
 				PrintPreview.this.pageComposite.redraw();
 			}
 		});
 	}
-	
+
 	protected void updateScroll(){
 		ScrollBar vBar = this.previewComposite.getVerticalBar();
 		Rectangle client = this.pageComposite.getClientArea();
 		vBar.setMaximum((this.bounds.getHeight() - this.bounds.getY()) + (MARGIN_TOP + MARGIN_BOTTOM));
 		vBar.setThumb(Math.min((this.bounds.getHeight() - this.bounds.getY()) + (MARGIN_TOP + MARGIN_BOTTOM), client.height));
 	}
-	
+
 	protected void changePage(int index){
 		if(!this.pages.isEmpty()){
 			int pageCount = this.pages.size();
@@ -184,7 +190,7 @@ protected void changePage(int index){
 			this.previous.setEnabled(false);
 			this.next.setEnabled(false);
 		}
-		
+
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintStyles.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintStyles.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintStyles.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintStyles.java
index 4d900705..d481f61f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintStyles.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintStyles.java
@@ -3,21 +3,21 @@
 import org.herac.tuxguitar.graphics.control.TGLayout;
 
 public class PrintStyles {
-	
+
 	private int trackNumber;
-	
+
 	private int fromMeasure;
-	
+
 	private int toMeasure;
-	
+
 	private int style;
-	
+
 	private boolean blackAndWhite;
-	
+
 	public PrintStyles() {
 		this(-1,-1,-1,TGLayout.DISPLAY_TABLATURE, true);
 	}
-	
+
 	public PrintStyles(int trackNumber,int fromMeasure, int toMeasure, int style , boolean blackAndWhite) {
 		this.trackNumber = trackNumber;
 		this.fromMeasure = fromMeasure;
@@ -25,43 +25,43 @@ public PrintStyles(int trackNumber,int fromMeasure, int toMeasure, int style , b
 		this.style = style;
 		this.blackAndWhite = blackAndWhite;
 	}
-	
+
 	public int getFromMeasure() {
 		return this.fromMeasure;
 	}
-	
+
 	public void setFromMeasure(int fromMeasure) {
 		this.fromMeasure = fromMeasure;
 	}
-	
+
 	public int getStyle() {
 		return this.style;
 	}
-	
+
 	public void setStyle(int style) {
 		this.style = style;
 	}
-	
+
 	public int getToMeasure() {
 		return this.toMeasure;
 	}
-	
+
 	public void setToMeasure(int toMeasure) {
 		this.toMeasure = toMeasure;
 	}
-	
+
 	public int getTrackNumber() {
 		return this.trackNumber;
 	}
-	
+
 	public void setTrackNumber(int trackNumber) {
 		this.trackNumber = trackNumber;
 	}
-	
+
 	public boolean isBlackAndWhite() {
 		return this.blackAndWhite;
 	}
-	
+
 	public void setBlackAndWhite(boolean blackAndWhite) {
 		this.blackAndWhite = blackAndWhite;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintStylesDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintStylesDialog.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintStylesDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintStylesDialog.java
index 77da5572..44e10901 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/printer/PrintStylesDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/printer/PrintStylesDialog.java
@@ -23,32 +23,32 @@ public static PrintStyles open(Shell shell) {
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("options"));
-		
+
 		//------------------TRACK SELECTION------------------
 		Group track = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		track.setLayout(new GridLayout(2,false));
 		track.setLayoutData(getGroupData());
 		track.setText(TuxGuitar.getProperty("track"));
-		
+
 		Label trackLabel = new Label(track, SWT.NULL);
 		trackLabel.setText(TuxGuitar.getProperty("track"));
-		
+
 		final Combo tracks = new Combo(track, SWT.DROP_DOWN | SWT.READ_ONLY);
 		tracks.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		for(int number = 1; number <= TuxGuitar.instance().getSongManager().getSong().countTracks(); number ++){
 			tracks.add(TuxGuitar.instance().getSongManager().getTrack(number).getName());
 		}
 		tracks.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber() - 1);
-		
+
 		//------------------MEASURE RANGE------------------
 		Group range = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		range.setLayout(new GridLayout(2,false));
 		range.setLayoutData(getGroupData());
 		range.setText(TuxGuitar.getProperty("print.range"));
-		
+
 		final int minSelection = 1;
 		final int maxSelection = TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders();
-		
+
 		Label fromLabel = new Label(range, SWT.NULL);
 		fromLabel.setText(TuxGuitar.getProperty("edit.from"));
 		final Spinner fromSpinner = new Spinner(range, SWT.BORDER);
@@ -56,7 +56,7 @@ public static PrintStyles open(Shell shell) {
 		fromSpinner.setMaximum(maxSelection);
 		fromSpinner.setMinimum(minSelection);
 		fromSpinner.setSelection(minSelection);
-		
+
 		Label toLabel = new Label(range, SWT.NULL);
 		toLabel.setText(TuxGuitar.getProperty("edit.to"));
 		final Spinner toSpinner = new Spinner(range, SWT.BORDER);
@@ -64,12 +64,13 @@ public static PrintStyles open(Shell shell) {
 		toSpinner.setMinimum(minSelection);
 		toSpinner.setMaximum(maxSelection);
 		toSpinner.setSelection(maxSelection);
-		
+
 		fromSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int fromSelection = fromSpinner.getSelection();
 				int toSelection = toSpinner.getSelection();
-				
+
 				if(fromSelection < minSelection){
 					fromSpinner.setSelection(minSelection);
 				}else if(fromSelection > toSelection){
@@ -78,6 +79,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		toSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int toSelection = toSpinner.getSelection();
 				int fromSelection = fromSpinner.getSelection();
@@ -93,28 +95,29 @@ public void widgetSelected(SelectionEvent e) {
 		options.setLayout(new GridLayout());
 		options.setLayoutData(getGroupData());
 		options.setText(TuxGuitar.getProperty("options"));
-		
+
 		final Button tablatureEnabled = new Button(options,SWT.CHECK);
 		tablatureEnabled.setText(TuxGuitar.getProperty("export.tablature-enabled"));
 		tablatureEnabled.setSelection(true);
-		
+
 		final Button scoreEnabled = new Button(options,SWT.CHECK);
 		scoreEnabled.setText(TuxGuitar.getProperty("export.score-enabled"));
 		scoreEnabled.setSelection(true);
-		
+
 		final Button chordNameEnabled = new Button(options,SWT.CHECK);
 		chordNameEnabled.setText(TuxGuitar.getProperty("export.chord-name-enabled"));
 		chordNameEnabled.setSelection(true);
-		
+
 		final Button chordDiagramEnabled = new Button(options,SWT.CHECK);
 		chordDiagramEnabled.setText(TuxGuitar.getProperty("export.chord-diagram-enabled"));
 		chordDiagramEnabled.setSelection(true);
-		
+
 		final Button blackAndWhite = new Button(options,SWT.CHECK);
 		blackAndWhite.setText(TuxGuitar.getProperty("export.black-and-white"));
 		blackAndWhite.setSelection(true);
-		
+
 		tablatureEnabled.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!tablatureEnabled.getSelection()){
 					scoreEnabled.setSelection(true);
@@ -122,22 +125,24 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		scoreEnabled.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!scoreEnabled.getSelection()){
 					tablatureEnabled.setSelection(true);
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int style = 0;
 				style |= (scoreEnabled.getSelection() ? TGLayout.DISPLAY_SCORE : 0);
@@ -152,36 +157,37 @@ public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return ((styles.getTrackNumber() > 0)?styles:null);
 	}
-	
+
 	private static GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private static GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 60;
 		return data;
 	}
-	
+
 	private static GridData getGroupData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 300;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigDefaults.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigDefaults.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigDefaults.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigDefaults.java
index e2adaf7b..c05ddd00 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigDefaults.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigDefaults.java
@@ -1,8 +1,5 @@
 /*
  * Created on 27-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.system.config;
 
@@ -19,24 +16,21 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGConfigDefaults{
-	
+
 	private static final String DEFAULT_FILE = "config.dist";
-	
+
 	private static final String DEFAULT_FONT_NAME = getDefaultFontName();
-	
-	private Properties properties;
-	
+
+	private final Properties properties;
+
 	public TGConfigDefaults(){
 		this.properties = new Properties();
 		this.loadDefaults();
 		this.loadDefaultFile();
 	}
-	
+
 	public void loadDefaultFile() {
 		try {
 			InputStream is = TGFileUtils.getResourceAsStream(DEFAULT_FILE);
@@ -47,7 +41,7 @@ public void loadDefaultFile() {
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void loadDefaults(){
 		this.loadProperty(TGConfigKeys.SKIN,"Lavender");
 		this.loadProperty(TGConfigKeys.WINDOW_TITLE,"${appname} - ${filename}");
@@ -122,24 +116,27 @@ private void loadDefaults(){
 		this.loadProperty(TGConfigKeys.TABLE_AUTO_SIZE,true);
 		this.loadProperty(TGConfigKeys.BROWSER_LINES_VISIBLE,true);
 	}
-	
+
 	public Properties getProperties() {
 		return this.properties;
 	}
-	
+
 	private void loadProperty(String key,String value){
 		this.properties.setProperty(key,value);
 	}
-	
+
 	private void loadProperty(String key,int value){
 		this.properties.setProperty(key,Integer.toString(value));
 	}
-	
+
 	private void loadProperty(String key,boolean value){
 		this.properties.setProperty(key,Boolean.toString(value));
 	}
-	
+
 	private static String getDefaultFontName(){
+		if (!TuxGuitar.instance().isInitialized()) {
+			return "";
+		}
 		Font font = TuxGuitar.instance().getDisplay().getSystemFont();
 		if( font != null ){
 			FontData[] fd = font.getFontData();
@@ -147,7 +144,7 @@ private static String getDefaultFontName(){
 				return fd[0].getName();
 			}
 		}
-		return new String();
+		return "";
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigEditor.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigEditor.java
index 18015f18..f0bcbfda 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigEditor.java
@@ -1,8 +1,5 @@
 /*
  * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.system.config;
 
@@ -38,46 +35,44 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGConfigEditor{
-	
+
 	protected Shell dialog;
 	protected TGConfigManager config;
-	protected List options;
+	protected List<Option> options;
 	protected Properties defaults;
 	protected boolean accepted;
-	
-	protected List runnables;
-	
+
+	protected List<Runnable> runnables;
+
 	public TGConfigEditor() {
 		this.config = TuxGuitar.instance().getConfig();
 	}
-	
+
 	public void showDialog(Shell shell) {
 		this.accepted = false;
-		
+
 		this.dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setText(TuxGuitar.getProperty("settings.config"));
-		
+
 		//-------main-------------------------------------
 		Composite mainComposite = new Composite(this.dialog,SWT.NONE);
 		mainComposite.setLayout(new GridLayout(2,false));
 		mainComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true , true));
 		createComposites(mainComposite);
-		
+
 		//-------buttons-------------------------------------
 		Composite buttonComposite = new Composite(this.dialog,SWT.NONE);
 		buttonComposite.setLayout(new GridLayout(3,true));
 		buttonComposite.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		Button buttonDefaults = new Button(buttonComposite, SWT.PUSH);
-		buttonDefaults.setLayoutData(getButtonData()); 
+		buttonDefaults.setLayoutData(getButtonData());
 		buttonDefaults.setText(TuxGuitar.getProperty("defaults"));
 		buttonDefaults.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TGConfigEditor.this.accepted = true;
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -93,11 +88,12 @@ public void widgetSelected(SelectionEvent arg0) {
 				applyConfig(true);
 			}
 		});
-		
+
 		Button buttonOK = new Button(buttonComposite, SWT.PUSH);
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TGConfigEditor.this.accepted = true;
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
@@ -113,67 +109,68 @@ public void widgetSelected(SelectionEvent arg0) {
 				applyConfig(false);
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttonComposite, SWT.PUSH);
-		buttonCancel.setLayoutData(getButtonData()); 
+		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 				dispose();
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
 			}
 		});
-		
+
 		this.dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		if(!this.accepted){
 			ActionLock.unlock();
 		}
 	}
-	
+
 	private void createComposites(Composite parent) {
 		ToolBar toolBar = new ToolBar(parent, SWT.VERTICAL | SWT.FLAT | SWT.WRAP);
 		toolBar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true , true));
-		
+
 		Composite option = new Composite(parent,SWT.NONE);
 		option.setLayout(new FormLayout());
-		
+
 		initOptions(toolBar,option);
-		
+
 		Point optionSize = computeOptionsSize( 0 , toolBar.computeSize(SWT.DEFAULT,SWT.DEFAULT).y );
 		option.setLayoutData(new GridData(optionSize.x,optionSize.y));
-		
+
 		if(this.options.size() > 0){
-			select((Option)this.options.get(0));
+			select(this.options.get(0));
 		}
 	}
-	
+
 	private void initOptions(ToolBar toolBar,Composite parent){
-		this.options = new ArrayList();
+		this.options = new ArrayList<Option>();
 		this.options.add(new MainOption(this,toolBar,parent));
 		this.options.add(new StylesOption(this,toolBar,parent));
 		this.options.add(new LanguageOption(this,toolBar,parent));
 		this.options.add(new ToolBarsOption(this,toolBar,parent));
 		this.options.add(new SkinOption(this,toolBar,parent));
 		this.options.add(new SoundOption(this,toolBar,parent));
-		
-		Iterator it = this.options.iterator();
+
+		Iterator<Option> it = this.options.iterator();
 		while(it.hasNext()){
-			Option option = (Option)it.next();
+			Option option = it.next();
 			option.createOption();
 		}
 	}
-	
+
 	private Point computeOptionsSize(int minimumWidth, int minimumHeight){
 		int width = minimumWidth;
 		int height = minimumHeight;
-		
-		Iterator it = this.options.iterator();
+
+		Iterator<Option> it = this.options.iterator();
 		while(it.hasNext()){
-			Option option = (Option)it.next();
+			Option option = it.next();
 			Point size = option.computeSize();
 			if(size.x > width){
 				width = size.x;
@@ -184,18 +181,18 @@ private Point computeOptionsSize(int minimumWidth, int minimumHeight){
 		}
 		return new Point(width, height);
 	}
-	
+
 	public void pack(){
 		this.dialog.pack();
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	public GridData makeGridData(int with,int height,int minWith,int minHeight){
 		GridData data = new GridData();
 		data.minimumWidth = minWith;
@@ -212,63 +209,66 @@ public GridData makeGridData(int with,int height,int minWith,int minHeight){
 			data.verticalAlignment = SWT.FILL;
 			data.grabExcessVerticalSpace = true;
 		}
-		
+
 		return data;
 	}
-	
+
 	public void select(Option option){
 		hideAll();
 		option.setVisible(true);
 		//this.dialog.layout();
 		this.dialog.redraw();
 	}
-	
+
 	private void hideAll(){
-		Iterator it = this.options.iterator();
+		Iterator<Option> it = this.options.iterator();
 		while(it.hasNext()){
-			Option option = (Option)it.next();
+			Option option = it.next();
 			option.setVisible(false);
 		}
 	}
-	
+
 	protected void updateOptions(){
-		Iterator it = this.options.iterator();
+		Iterator<Option> it = this.options.iterator();
 		while(it.hasNext()){
-			Option option = (Option)it.next();
+			Option option = it.next();
 			option.updateConfig();
 		}
 		this.config.save();
 	}
-	
+
 	protected void setDefaults(){
-		Iterator it = this.options.iterator();
+		Iterator<Option> it = this.options.iterator();
 		while(it.hasNext()){
-			Option option = (Option)it.next();
+			Option option = it.next();
 			option.updateDefaults();
 		}
 		this.config.save();
 	}
-	
+
 	protected void applyConfig(final boolean force){
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
-				TGConfigEditor.this.runnables = new ArrayList();
-				
-				Iterator it = TGConfigEditor.this.options.iterator();
+				TGConfigEditor.this.runnables = new ArrayList<Runnable>();
+
+				Iterator<Option> it = TGConfigEditor.this.options.iterator();
 				while(it.hasNext()){
-					Option option = (Option)it.next();
+					Option option = it.next();
 					option.applyConfig(force);
 				}
 				try {
 					TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+						@Override
 						public void run() throws Throwable {
-							Iterator it = TGConfigEditor.this.runnables.iterator();
+							Iterator<Runnable> it = TGConfigEditor.this.runnables.iterator();
 							while(it.hasNext()){
-								Runnable current = (Runnable)it.next();
+								Runnable current = it.next();
 								current.run();
 							}
 							new Thread(new Runnable() {
+								@Override
 								public void run() {
 									TuxGuitar.instance().fireUpdate();
 									TuxGuitar.instance().updateCache(true);
@@ -288,35 +288,35 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	protected void dispose(){
-		Iterator it = this.options.iterator();
+		Iterator<Option> it = this.options.iterator();
 		while(it.hasNext()){
-			Option option = (Option)it.next();
+			Option option = it.next();
 			option.dispose();
 		}
 		getDialog().dispose();
 	}
-	
+
 	public Properties getDefaults(){
 		if(this.defaults == null){
 			this.defaults = new TGConfigDefaults().getProperties();
 		}
 		return this.defaults;
 	}
-	
+
 	public TGConfigManager getConfig(){
 		return this.config;
 	}
-	
+
 	public TablatureEditor getEditor(){
 		return TuxGuitar.instance().getTablatureEditor();
 	}
-	
+
 	public Shell getDialog(){
 		return this.dialog;
 	}
-	
+
 	public void addSyncThread(Runnable runnable){
 		this.runnables.add( runnable );
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigKeys.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigKeys.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigKeys.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigKeys.java
index f51974f5..6da8af99 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigKeys.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigKeys.java
@@ -1,16 +1,10 @@
 /*
  * Created on 27-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.system.config;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGConfigKeys {
 	public static final String SKIN = "skin";
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigManager.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigManager.java
index 014c774c..032b7497 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigManager.java
@@ -1,8 +1,5 @@
 /*
  * Created on 09-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.system.config;
 
@@ -12,7 +9,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
@@ -24,26 +20,24 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public abstract class TGConfigManager {
-	
+
 	private Properties properties;
-	
+
 	public TGConfigManager() {
 		super();
 	}
-	
+
 	public void init(){
 		this.properties = new Properties(getDefaults());
 		this.load();
 	}
-	
+
 	private String getProperty(String key) {
 		return this.properties.getProperty(key);
 	}
-	
+
 	public String getStringConfigValue(String key,String defaultValue) {
 		try{
 			String property = getProperty(key);
@@ -53,11 +47,11 @@ public String getStringConfigValue(String key,String defaultValue) {
 		}
 		return defaultValue;
 	}
-	
+
 	public String getStringConfigValue(String key) {
 		return this.getStringConfigValue(key,null);
 	}
-	
+
 	public int getIntConfigValue(String key,int defaultValue) {
 		try{
 			String value = getProperty(key);
@@ -67,11 +61,11 @@ public int getIntConfigValue(String key,int defaultValue) {
 		}
 		return defaultValue;
 	}
-	
+
 	public int getIntConfigValue(String key) {
 		return this.getIntConfigValue(key,0);
 	}
-	
+
 	public float getFloatConfigValue(String key,float defaultValue) {
 		try{
 			String value = getProperty(key);
@@ -81,11 +75,11 @@ public float getFloatConfigValue(String key,float defaultValue) {
 		}
 		return defaultValue;
 	}
-	
+
 	public float getFloatConfigValue(String key) {
 		return this.getFloatConfigValue(key,0f);
 	}
-	
+
 	public double getDoubleConfigValue(String key,double defaultValue) {
 		try{
 			String value = getProperty(key);
@@ -95,11 +89,11 @@ public double getDoubleConfigValue(String key,double defaultValue) {
 		}
 		return defaultValue;
 	}
-	
+
 	public double getDoubleConfigValue(String key) {
 		return this.getDoubleConfigValue(key,0.0);
 	}
-	
+
 	public boolean getBooleanConfigValue(String key,boolean defaultValue) {
 		try{
 			String value = getProperty(key);
@@ -109,11 +103,11 @@ public boolean getBooleanConfigValue(String key,boolean defaultValue) {
 		}
 		return defaultValue;
 	}
-	
+
 	public boolean getBooleanConfigValue(String key) {
 		return this.getBooleanConfigValue(key,false);
 	}
-	
+
 	public FontData getFontDataConfigValue(String key){
 		try{
 			String value = getProperty(key);
@@ -135,7 +129,7 @@ public FontData getFontDataConfigValue(String key){
 		}
 		return new FontData();
 	}
-	
+
 	public RGB getRGBConfigValue(String key){
 		try{
 			String value = getProperty(key);
@@ -146,7 +140,7 @@ public RGB getRGBConfigValue(String key){
 						int red = Integer.parseInt(values[0].trim());
 						int green = Integer.parseInt(values[1].trim());
 						int blue = Integer.parseInt(values[2].trim());
-						
+
 						return new RGB(red,green,blue);
 					}catch(NumberFormatException e){
 						e.printStackTrace();
@@ -158,7 +152,7 @@ public RGB getRGBConfigValue(String key){
 		}
 		return null;
 	}
-	
+
 	public TGFontModel getFontModelConfigValue(String key){
 		try{
 			String value = getProperty(key);
@@ -180,7 +174,7 @@ public TGFontModel getFontModelConfigValue(String key){
 		}
 		return null;
 	}
-	
+
 	public TGColorModel getColorModelConfigValue(String key){
 		try{
 			String value = getProperty(key);
@@ -191,7 +185,7 @@ public TGColorModel getColorModelConfigValue(String key){
 						int red = Integer.parseInt(values[0].trim());
 						int green = Integer.parseInt(values[1].trim());
 						int blue = Integer.parseInt(values[2].trim());
-						
+
 						return new TGColorModel(red,green,blue);
 					}catch(NumberFormatException e){
 						e.printStackTrace();
@@ -203,53 +197,51 @@ public TGColorModel getColorModelConfigValue(String key){
 		}
 		return null;
 	}
-	
+
 	public void setProperty(String key,String value){
 		this.properties.setProperty(key, (value != null ? value : new String()) );
 	}
-	
+
 	public void setProperty(String key,int value){
 		this.setProperty(key,Integer.toString(value));
 	}
-	
+
 	public void setProperty(String key,float value){
 		this.setProperty(key,Float.toString(value));
 	}
-	
+
 	public void setProperty(String key,double value){
 		this.setProperty(key,Double.toString(value));
 	}
-	
+
 	public void setProperty(String key,boolean value){
 		this.setProperty(key,Boolean.toString(value));
 	}
-	
+
 	public void setProperty(String key,RGB rgb){
 		this.setProperty(key,(rgb.red + "," + rgb.green + "," + rgb.blue));
 	}
-	
+
 	public void setProperty(String key,FontData fd){
 		this.setProperty(key,(fd.getName() + "," + fd.getHeight() + "," + fd.getStyle()));
 	}
-	
+
 	public void setDefaults(){
 		Properties defaults = new TGConfigDefaults().getProperties();
-		Iterator it = defaults.entrySet().iterator();
-		while(it.hasNext()){
-			Map.Entry property = (Map.Entry)it.next();
+		for (Map.Entry<Object,Object> property: defaults.entrySet()) {
 			setProperty((String)property.getKey(),(String)property.getValue());
 		}
 		this.save();
 	}
-	
+
 	public void removeProperty(String key){
 		this.properties.remove(key);
 	}
-	
+
 	public void clear(){
 		this.properties.clear();
 	}
-	
+
 	public void load() {
 		try {
 			if(new File(getFileName()).exists()){
@@ -263,7 +255,7 @@ public void load() {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void save(){
 		try {
 			File file = new File(getFileName());
@@ -280,11 +272,11 @@ public void save(){
 			e1.printStackTrace();
 		}
 	}
-	
+
 	public abstract String getName();
-	
+
 	public abstract String getFileName();
-	
+
 	public abstract Properties getDefaults();
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigManagerImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigManagerImpl.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigManagerImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigManagerImpl.java
index a3c0590d..edd7473a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/TGConfigManagerImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/TGConfigManagerImpl.java
@@ -6,21 +6,24 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class TGConfigManagerImpl extends TGConfigManager{
-	
+
 	public TGConfigManagerImpl(){
 		super();
 	}
-	
+
+	@Override
 	public String getName() {
 		return "System Configuration";
 	}
-	
+
+	@Override
 	public String getFileName(){
 		return TGFileUtils.PATH_USER_CONFIG + File.separator + "config.properties";
 	}
-	
+
+	@Override
 	public Properties getDefaults() {
 		return new TGConfigDefaults().getProperties();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/LanguageOption.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/LanguageOption.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/LanguageOption.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/LanguageOption.java
index 4e1e9228..da309463 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/LanguageOption.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/LanguageOption.java
@@ -23,35 +23,36 @@ public class LanguageOption extends Option{
 	protected boolean initialized;
 	protected Table table;
 	protected TableColumn column;
-	
+
 	public LanguageOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent){
 		super(configEditor,toolBar,parent,TuxGuitar.getProperty("settings.config.language"), SWT.FILL, SWT.FILL);
 		this.initialized = false;
 	}
-	
+
+	@Override
 	public void createOption(){
 		getToolItem().setText(TuxGuitar.getProperty("settings.config.language"));
 		getToolItem().setImage(TuxGuitar.instance().getIconManager().getOptionLanguage());
 		getToolItem().addSelectionListener(this);
-		
+
 		showLabel(getComposite(),SWT.FILL,SWT.TOP, true, false,SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.language.choose"));
-		
+
 		Composite composite = new Composite(getComposite(),SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(getTabbedData(SWT.FILL, SWT.FILL));
-		
+
 		this.table = new Table(composite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
 		this.table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.table.setHeaderVisible(true);
 		this.table.setLinesVisible(false);
-		
+
 		this.column = new TableColumn(this.table, SWT.LEFT);
 		this.column.setText(TuxGuitar.getProperty("settings.config.language.choose"));
 		this.column.pack();
-		
+
 		this.loadConfig();
 	}
-	
+
 	protected void loadTableItem(String text, String data, boolean selected){
 		TableItem item = new TableItem(this.table, SWT.NONE);
 		item.setText(text);
@@ -60,43 +61,41 @@ protected void loadTableItem(String text, String data, boolean selected){
 			this.table.setSelection(item);
 		}
 	}
-	
-	protected List getLanguageItems(String[] languages){
-		List list = new ArrayList();
+
+	protected List<LanguageItem> getLanguageItems(String[] languages){
+		List<LanguageItem> list = new ArrayList<LanguageItem>();
 		if( languages != null ){
 			for(int i = 0;i < languages.length; i ++){
 				list.add( new LanguageItem(languages[i],TuxGuitar.getProperty("locale." + languages[i] ) ) );
 			}
-			Collections.sort(list, new Comparator() {
-				public int compare(Object o1, Object o2) {
-					if( o1 instanceof LanguageItem && o2 instanceof LanguageItem){
-						LanguageItem l1 = (LanguageItem)o1;
-						LanguageItem l2 = (LanguageItem)o2;
-						return l1.getValue().compareTo( l2.getValue() );
-					}
-					return 0;
+			Collections.sort(list, new Comparator<LanguageItem>() {
+				@Override
+				public int compare(LanguageItem l1, LanguageItem l2) {
+					return l1.getValue().compareTo( l2.getValue() );
 				}
 			} );
 		}
 		return list;
 	}
-	
+
 	protected void loadConfig(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				final String language = getConfig().getStringConfigValue(TGConfigKeys.LANGUAGE);
-				final List languages = getLanguageItems( TuxGuitar.instance().getLanguageManager().getLanguages() );
+				final List<LanguageItem> languages = getLanguageItems( TuxGuitar.instance().getLanguageManager().getLanguages() );
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							// Load default item
 							loadTableItem(TuxGuitar.getProperty("locale.default"), new String(), true);
-							
+
 							for(int i = 0;i < languages.size(); i ++){
-								LanguageItem item = (LanguageItem)languages.get( i );
+								LanguageItem item = languages.get( i );
 								loadTableItem(item.getValue(),item.getKey(),(language != null && item.getKey().equals( language )));
 							}
-							
+
 							LanguageOption.this.initialized = true;
 							LanguageOption.this.column.pack();
 							LanguageOption.this.pack();
@@ -106,7 +105,8 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void updateConfig(){
 		if(this.initialized){
 			String language = null;
@@ -119,17 +119,19 @@ public void updateConfig(){
 			getConfig().setProperty(TGConfigKeys.LANGUAGE, language );
 		}
 	}
-	
+
+	@Override
 	public void updateDefaults(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.LANGUAGE,getDefaults().getProperty(TGConfigKeys.LANGUAGE));
 		}
 	}
-	
+
+	@Override
 	public void applyConfig(boolean force){
 		if(force || this.initialized){
 			boolean changed = force;
-			
+
 			if(!changed){
 				String languageLoaded = TuxGuitar.instance().getLanguageManager().getLanguage();
 				String languageConfigured = getConfig().getStringConfigValue(TGConfigKeys.LANGUAGE);
@@ -143,9 +145,10 @@ else if(languageLoaded != null && languageConfigured != null){
 					changed = true;
 				}
 			}
-			
+
 			if(changed){
 				addSyncThread(new Runnable() {
+					@Override
 					public void run() {
 						TuxGuitar.instance().loadLanguage();
 					}
@@ -153,24 +156,25 @@ public void run() {
 			}
 		}
 	}
-	
+
+	@Override
 	public Point computeSize(){
 		return this.computeSize(SWT.DEFAULT,SWT.NONE);
 	}
-	
+
 	private class LanguageItem {
-		private String key;
-		private String value;
-		
+		private final String key;
+		private final String value;
+
 		public LanguageItem(String key, String value){
 			this.key = key;
 			this.value = value;
 		}
-		
+
 		public String getKey(){
 			return this.key;
 		}
-		
+
 		public String getValue(){
 			return this.value;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/MainOption.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/MainOption.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/MainOption.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/MainOption.java
index c74739ff..8120cf3a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/MainOption.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/MainOption.java
@@ -18,84 +18,87 @@ public class MainOption  extends Option{
 	protected Button showSplash;
 	protected Button autoSizeTable;
 	protected Text windowTitle;
-	
+
 	public MainOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent){
 		super(configEditor,toolBar,parent,TuxGuitar.getProperty("settings.config.main"));
 		this.initialized = false;
 	}
-	
+
+	@Override
 	public void createOption(){
 		getToolItem().setText(TuxGuitar.getProperty("settings.config.main"));
 		getToolItem().setImage(TuxGuitar.instance().getIconManager().getOptionMain());
 		getToolItem().addSelectionListener(this);
-		
+
 		showLabel(getComposite(),SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.main.window-title"));
-		
+
 		Composite windowTitleComposite = new Composite(getComposite(),SWT.NONE);
 		windowTitleComposite.setLayout(new GridLayout());
 		windowTitleComposite.setLayoutData(getTabbedData());
-		
+
 		this.windowTitle = new Text(windowTitleComposite,SWT.BORDER);
 		this.windowTitle.setLayoutData(new GridData(SWT.FILL, SWT.FILL , true, true));
 		this.windowTitle.setTextLimit(80);
-		
+
 		Composite infoHeader = new Composite(windowTitleComposite,SWT.NONE);
 		infoHeader.setLayout(new GridLayout(2,false));
 		infoHeader.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		showImageLabel(infoHeader,SWT.NONE,infoHeader.getDisplay().getSystemImage(SWT.ICON_INFORMATION));
 		showLabel(infoHeader,SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.help"));
-		
+
 		Composite infoBody = new Composite(windowTitleComposite,SWT.NONE);
 		infoBody.setLayout(new GridLayout(2,false));
 		infoBody.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_APP_NAME));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_APP_NAME ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_APP_VERSION));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_APP_VERSION ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_FILE_NAME));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_FILE_NAME ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_FILE_PATH));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_FILE_PATH ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_SONG_NAME));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_SONG_NAME ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_SONG_ALBUM));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_SONG_ALBUM ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_SONG_ARTIST));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_SONG_ARTIST ));
-		
+
 		showLabel(infoBody, SWT.NONE,SWT.BOLD,-1,WindowTitleUtil.getVar(WindowTitleUtil.VAR_SONG_AUTHOR));
 		showLabel(infoBody,SWT.TOP | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.main.window-title.var.description." + WindowTitleUtil.VAR_SONG_AUTHOR ));
-		
+
 		showLabel(getComposite(),SWT.BOTTOM | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.main.options"));
-		
+
 		Composite options = new Composite(getComposite(),SWT.NONE);
 		options.setLayout(new GridLayout());
 		options.setLayoutData(getTabbedData());
-		
+
 		this.autoSizeTable = new Button(options,SWT.CHECK);
 		this.autoSizeTable.setText(TuxGuitar.getProperty("settings.config.main.table.auto-size.enabled"));
-		
+
 		this.showSplash = new Button(options,SWT.CHECK);
 		this.showSplash.setText(TuxGuitar.getProperty("settings.config.main.splash-enabled"));
-		
+
 		this.loadConfig();
 	}
-	
+
 	protected void loadConfig(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				final String windowTitle = getConfig().getStringConfigValue(TGConfigKeys.WINDOW_TITLE);
 				final boolean showSplash = getConfig().getBooleanConfigValue(TGConfigKeys.SHOW_SPLASH);
 				final boolean autoSizeTable = getConfig().getBooleanConfigValue(TGConfigKeys.TABLE_AUTO_SIZE);
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							MainOption.this.windowTitle.setText(windowTitle);
@@ -109,7 +112,8 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void updateConfig(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.WINDOW_TITLE,this.windowTitle.getText());
@@ -117,7 +121,8 @@ public void updateConfig(){
 			getConfig().setProperty(TGConfigKeys.TABLE_AUTO_SIZE,this.autoSizeTable.getSelection());
 		}
 	}
-	
+
+	@Override
 	public void updateDefaults(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.WINDOW_TITLE,getDefaults().getProperty(TGConfigKeys.WINDOW_TITLE));
@@ -125,7 +130,8 @@ public void updateDefaults(){
 			getConfig().setProperty(TGConfigKeys.TABLE_AUTO_SIZE,getDefaults().getProperty(TGConfigKeys.TABLE_AUTO_SIZE));
 		}
 	}
-	
+
+	@Override
 	public void applyConfig(boolean force){
 		if(force || this.initialized){
 			TuxGuitar.instance().showTitle();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/Option.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/Option.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/Option.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/Option.java
index 905e5d39..0ef40396 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/Option.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/Option.java
@@ -28,15 +28,15 @@
 import org.herac.tuxguitar.app.system.config.TGConfigManager;
 
 public abstract class Option extends SelectionAdapter{
-	
+
 	protected static final int DEFAULT_INDENT = 20;
-	
+
 	private TGConfigEditor configEditor ;
 	private ToolBar toolBar;
 	private Group group;
 	private Composite composite;
 	private ToolItem toolItem;
-	
+
 	public Option(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent,String text, int horizontalAlignment,int verticalAlignment){
 		this.configEditor = configEditor;
 		this.toolBar = toolBar;
@@ -49,48 +49,49 @@ public Option(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent
 		this.composite.setLayout(new GridLayout());
 		this.composite.setLayoutData(new GridData(horizontalAlignment,verticalAlignment,true ,true));
 	}
-	
+
 	public Option(TGConfigEditor configEditor,ToolBar toolBar, Composite parent,String text){
 		this(configEditor, toolBar, parent, text, SWT.FILL,SWT.TOP);
 	}
-	
+
 	public abstract void createOption();
-	
+
 	public abstract void updateConfig();
-	
+
 	public abstract void updateDefaults();
-	
+
 	public abstract void applyConfig(boolean force);
-	
+
 	public void setVisible(boolean visible){
 		this.toolItem.setSelection(visible);
 		this.group.setVisible(visible);
 		this.group.setFocus();
 		this.group.redraw();
 	}
-	
+
 	public void dispose(){
 		//Override me
 	}
-	
+
 	protected Label showLabel(Composite parent,int labelStyle,int fontStyle,int fontScale,String text){
 		return showLabel(parent,SWT.FILL,SWT.CENTER, labelStyle, fontStyle, fontScale, text);
 	}
-	
+
 	protected Label showLabel(Composite parent,int hAlign,int vAlign,int labelStyle,int fontStyle,int fontScale,String text){
 		return showLabel(parent, hAlign, vAlign, true, true, labelStyle, fontStyle, fontScale, text);
 	}
-	
+
 	protected Label showLabel(Composite parent,int hAlign,int vAlign,boolean grabExcessHSpace,boolean grabExcessVSpace,int labelStyle,int fontStyle,int fontScale,String text){
 		Label label = new Label(parent,labelStyle);
 		label.setText(text);
 		label.setLayoutData(new GridData(hAlign,vAlign,grabExcessHSpace,grabExcessVSpace));
-		
+
 		FontData[] fontDatas = label.getFont().getFontData();
 		if(fontDatas.length > 0){
 			final Font font = new Font(label.getDisplay(),fontDatas[0].getName(),(fontDatas[0].getHeight() + fontScale),fontStyle);
 			label.setFont(font);
 			label.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent arg0) {
 					font.dispose();
 				}
@@ -98,13 +99,13 @@ public void widgetDisposed(DisposeEvent arg0) {
 		}
 		return label;
 	}
-	
+
 	protected Label showImageLabel(Composite parent,int labelStyle,Image image){
 		Label label = new Label(parent,labelStyle);
 		label.setImage(image);
 		return label;
 	}
-	
+
 	protected FormData getGroupData(){
 		FormData data = new FormData();
 		data.top = new FormAttachment(0,0);
@@ -113,71 +114,72 @@ protected FormData getGroupData(){
 		data.right = new FormAttachment(100,0);
 		return data;
 	}
-	
+
+	@Override
 	public void widgetSelected(SelectionEvent e) {
 		this.configEditor.select(this);
 	}
-	
+
 	public Composite getComposite(){
 		return this.composite;
 	}
-	
+
 	public ToolItem getToolItem(){
 		return this.toolItem;
 	}
-	
+
 	public Point computeSize(){
 		return this.computeSize(SWT.DEFAULT,SWT.DEFAULT);
 	}
-	
+
 	protected Point computeSize(int wHint,int hHint){
 		return this.group.computeSize(wHint, hHint);
 	}
-	
+
 	public TGConfigManager getConfig(){
 		return this.configEditor.getConfig();
 	}
-	
+
 	public Properties getDefaults(){
 		return this.configEditor.getDefaults();
 	}
-	
+
 	public TablatureEditor getEditor(){
 		return this.configEditor.getEditor();
 	}
-	
+
 	public Display getDisplay(){
 		return this.toolBar.getDisplay();
 	}
-	
+
 	public Shell getShell(){
 		return this.toolBar.getShell();
 	}
-	
+
 	protected boolean isDisposed(){
 		return (this.toolBar.isDisposed() || this.toolBar.getShell().isDisposed());
 	}
-	
+
 	public  GridData makeGridData(int with,int height,int minWith,int minHeight){
 		return this.configEditor.makeGridData(with, height, minWith, minHeight);
 	}
-	
+
 	protected GridData getTabbedData(){
 		return getTabbedData(DEFAULT_INDENT,SWT.FILL,SWT.CENTER);
 	}
-	
+
 	protected GridData getTabbedData(int horizontalAlignment,int verticalAlignment, boolean grabExcessHorizontalSpace, boolean grabExcessVerticalSpace){
 		return getTabbedData(DEFAULT_INDENT,horizontalAlignment,verticalAlignment,grabExcessHorizontalSpace,grabExcessVerticalSpace);
 	}
-	
+
 	protected GridData getTabbedData(int horizontalAlignment,int verticalAlignment){
 		return getTabbedData(DEFAULT_INDENT,horizontalAlignment,verticalAlignment);
 	}
-	
+
 	protected GridData getTabbedData(int indent,int horizontalAlignment,int verticalAlignment){
 		return getTabbedData(indent, horizontalAlignment, verticalAlignment, true, true);
 	}
-	
+
 	protected GridData getTabbedData(int indent,int horizontalAlignment,int verticalAlignment, boolean grabExcessHorizontalSpace, boolean grabExcessVerticalSpace){
 		GridData data = new GridData();
 		data.horizontalAlignment = horizontalAlignment;
@@ -187,7 +189,7 @@ protected GridData getTabbedData(int indent,int horizontalAlignment,int vertical
 		data.horizontalIndent = indent;
 		return data;
 	}
-	
+
 	public GridData makeGridData(int widthHint,
 								 int heightHint,
 								 int minimumWidth,
@@ -209,20 +211,20 @@ public GridData makeGridData(int widthHint,
 		data.grabExcessVerticalSpace = grabExcessVerticalSpace;
 		data.horizontalSpan = horizontalSpan;
 		data.verticalSpan = verticalSpan;
-		
+
 		return data;
 	}
-	
+
 	public void pack(){
 		this.configEditor.pack();
 	}
-	
+
 	public void loadCursor(int style){
 		TuxGuitar.instance().loadCursor(this.configEditor.getDialog(),style);
 	}
-	
+
 	protected void addSyncThread(Runnable runnable){
 		this.configEditor.addSyncThread(runnable);
 	}
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/SkinOption.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/SkinOption.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/SkinOption.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/SkinOption.java
index 3d61b50e..35d393c9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/SkinOption.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/SkinOption.java
@@ -24,9 +24,9 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class SkinOption extends Option{
-	
+
 	protected boolean initialized;
-	protected List skins;
+	protected List<SkinInfo> skins;
 	protected Combo combo;
 	protected Label nameLabel;
 	protected Label authorLabel;
@@ -34,26 +34,27 @@ public class SkinOption extends Option{
 	protected Label descriptionLabel;
 	protected Image preview;
 	protected Composite previewArea;
-	
+
 	public SkinOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent){
 		super(configEditor,toolBar,parent,TuxGuitar.getProperty("settings.config.skin"), SWT.FILL,SWT.FILL);
 		this.initialized = false;
 	}
-	
+
+	@Override
 	public void createOption() {
 		getToolItem().setText(TuxGuitar.getProperty("settings.config.skin"));
 		getToolItem().setImage(TuxGuitar.instance().getIconManager().getOptionSkin());
 		getToolItem().addSelectionListener(this);
-		
+
 		showLabel(getComposite(),SWT.FILL,SWT.TOP,true, false, SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.skin.choose"));
-		
+
 		Composite composite = new Composite(getComposite(),SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(getTabbedData(SWT.FILL, SWT.FILL, true, false));
-		
+
 		this.combo = new Combo(composite,SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.combo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite skinInfoComposite = new Composite(getComposite(),SWT.NONE);
 		skinInfoComposite.setLayout(new GridLayout(2,false));
 		skinInfoComposite.setLayoutData(getTabbedData(SWT.FILL, SWT.FILL, true, false));
@@ -65,28 +66,30 @@ public void createOption() {
 		this.versionLabel = showLabel(skinInfoComposite,SWT.FILL,SWT.CENTER,SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.NONE,0,"");
 		showLabel(skinInfoComposite,SWT.FILL,SWT.CENTER,false,true,SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("description")+": ");
 		this.descriptionLabel = showLabel(skinInfoComposite,SWT.FILL,SWT.CENTER,SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.NONE,0,"");
-		
+
 		Composite skinPreviewComposite = new Composite(getComposite(),SWT.NONE);
 		skinPreviewComposite.setLayout(new GridLayout());
 		skinPreviewComposite.setLayoutData(getTabbedData(SWT.FILL, SWT.FILL ,true, true));
-		
+
 		this.previewArea = new Composite(skinPreviewComposite,SWT.DOUBLE_BUFFERED);
 		this.previewArea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		this.previewArea.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				if(SkinOption.this.preview != null && !SkinOption.this.preview.isDisposed()){
 					e.gc.drawImage(SkinOption.this.preview, 0, 0);
 				}
 			}
 		});
-		
+
 		this.loadConfig();
 	}
-	
+
 	protected void loadConfig(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
-				SkinOption.this.skins = new ArrayList();
+				SkinOption.this.skins = new ArrayList<SkinInfo>();
 				String[] skinNames = TGFileUtils.getFileNames("skins");
 				if( skinNames != null ){
 					for(int i = 0;i < skinNames.length;i++){
@@ -110,27 +113,29 @@ public void run() {
 					}
 				}
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							for(int i = 0;i < SkinOption.this.skins.size();i++){
-								SkinInfo info = (SkinInfo)SkinOption.this.skins.get(i);
+								SkinInfo info = SkinOption.this.skins.get(i);
 								SkinOption.this.combo.add(info.getName());
 								if(info.getSkin().equals(getConfig().getStringConfigValue(TGConfigKeys.SKIN))){
 									SkinOption.this.combo.select(i);
 								}
 							}
 							SkinOption.this.combo.addSelectionListener(new SelectionAdapter() {
+								@Override
 								public void widgetSelected(SelectionEvent e) {
 									int selection = SkinOption.this.combo.getSelectionIndex();
 									if(selection >= 0 && selection < SkinOption.this.skins.size()){
-										showSkinInfo((SkinInfo)SkinOption.this.skins.get(selection));
+										showSkinInfo(SkinOption.this.skins.get(selection));
 									}
 								}
 							});
-							
+
 							int selection = SkinOption.this.combo.getSelectionIndex();
 							if(selection >= 0 && selection < SkinOption.this.skins.size()){
-								showSkinInfo((SkinInfo)SkinOption.this.skins.get(selection));
+								showSkinInfo(SkinOption.this.skins.get(selection));
 							}
 							SkinOption.this.initialized = true;
 							SkinOption.this.pack();
@@ -140,10 +145,11 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		}).start();
 	}
-	
+
 	protected void showSkinInfo(final SkinInfo info){
 		loadCursor(SWT.CURSOR_WAIT);
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				if(!isDisposed()){
 					disposePreview();
@@ -160,43 +166,48 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void updateConfig() {
 		if(this.initialized){
 			int selection = this.combo.getSelectionIndex();
 			if(selection >= 0 && selection < this.skins.size()){
-				SkinInfo info = (SkinInfo)this.skins.get(selection);
+				SkinInfo info = this.skins.get(selection);
 				getConfig().setProperty(TGConfigKeys.SKIN,info.getSkin());
 			}
 		}
 	}
-	
+
+	@Override
 	public void updateDefaults(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.SKIN,getDefaults().getProperty(TGConfigKeys.SKIN));
 		}
 	}
-	
+
+	@Override
 	public void applyConfig(boolean force){
 		if(force || (this.initialized && TuxGuitar.instance().getIconManager().shouldReload())){
 			addSyncThread(new Runnable() {
+				@Override
 				public void run() {
 					TuxGuitar.instance().loadSkin();
 				}
 			});
 		}
 	}
-	
+
+	@Override
 	public void dispose(){
 		this.disposePreview();
 	}
-	
+
 	public void disposePreview(){
 		if(this.preview != null && !this.preview.isDisposed()){
 			this.preview.dispose();
 		}
 	}
-	
+
 	private class SkinInfo{
 		private String skin;
 		private String name;
@@ -205,59 +216,59 @@ private class SkinInfo{
 		private String version;
 		private String description;
 		private String preview;
-		
+
 		public SkinInfo(String skin){
 			this.skin = skin;
 		}
-		
+
 		public String getAuthor() {
 			return this.author;
 		}
-		
+
 		public void setAuthor(String author) {
 			this.author = author;
 		}
-		
+
 		public String getDate() {
 			return this.date;
 		}
-		
+
 		public void setDate(String date) {
 			this.date = date;
 		}
-		
+
 		public String getDescription() {
 			return this.description;
 		}
-		
+
 		public void setDescription(String description) {
 			this.description = description;
 		}
-		
+
 		public String getName() {
 			return this.name;
 		}
-		
+
 		public void setName(String name) {
 			this.name = name;
 		}
-		
+
 		public String getVersion() {
 			return this.version;
 		}
-		
+
 		public void setVersion(String version) {
 			this.version = version;
 		}
-		
+
 		public String getSkin() {
 			return this.skin;
 		}
-		
+
 		public String getPreview() {
 			return this.preview;
 		}
-		
+
 		public void setPreview(String preview) {
 			this.preview = preview;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/SoundOption.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/SoundOption.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/SoundOption.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/SoundOption.java
index caabb920..38494d36 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/SoundOption.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/SoundOption.java
@@ -17,72 +17,75 @@
 
 public class SoundOption extends Option{
 	protected boolean initialized;
-	
+
 	//**MidiSequencer module**//
 	protected String msCurrentKey;
-	protected List msList;
+	protected List<MidiSequencer> msList;
 	protected Combo msCombo;
-	
+
 	//**MidiPort module**//
 	protected String mpCurrentKey;
-	protected List mpList;
+	protected List<MidiOutputPort> mpList;
 	protected Combo mpCombo;
-	
+
 	public SoundOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent){
 		super(configEditor,toolBar,parent,TuxGuitar.getProperty("settings.config.sound"));
 		this.initialized = false;
 	}
-	
+
+	@Override
 	public void createOption(){
 		getToolItem().setText(TuxGuitar.getProperty("settings.config.sound"));
 		getToolItem().setImage(TuxGuitar.instance().getIconManager().getOptionSound());
 		getToolItem().addSelectionListener(this);
-		
+
 		//---Midi Sequencer---//
 		showLabel(getComposite(),SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("midi.sequencer"));
-		
+
 		Composite msComposite = new Composite(getComposite(),SWT.NONE);
 		msComposite.setLayout(new GridLayout());
 		msComposite.setLayoutData(getTabbedData());
-		
+
 		this.msCombo = new Combo(msComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.msCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		//---Midi Port---//
 		showLabel(getComposite(),SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("midi.port"));
-		
+
 		Composite mpComposite = new Composite(getComposite(),SWT.NONE);
 		mpComposite.setLayout(new GridLayout());
 		mpComposite.setLayoutData(getTabbedData());
-		
+
 		this.mpCombo = new Combo(mpComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.mpCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.loadConfig();
 	}
-	
+
 	protected void loadConfig(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				SoundOption.this.mpList = TuxGuitar.instance().getPlayer().listOutputPorts();
 				SoundOption.this.msList = TuxGuitar.instance().getPlayer().listSequencers();
-				
+
 				SoundOption.this.mpCurrentKey = getConfig().getStringConfigValue(TGConfigKeys.MIDI_PORT);
 				SoundOption.this.msCurrentKey = getConfig().getStringConfigValue(TGConfigKeys.MIDI_SEQUENCER);
-				
+
 				MidiSequencer sequencer = TuxGuitar.instance().getPlayer().getSequencer();
 				MidiOutputPort outputPort = TuxGuitar.instance().getPlayer().getOutputPort();
-				
+
 				final String msLoaded = (sequencer != null ? sequencer.getKey() : null ) ;
 				final String mpLoaded = (outputPort != null ? outputPort.getKey() : null );
-				
+
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							//---Midi Sequencer---//
 							String loadedSequencer = msLoaded;
 							for (int i = 0; i < SoundOption.this.msList.size(); i++) {
-								MidiSequencer sequencer = (MidiSequencer)SoundOption.this.msList.get(i);
+								MidiSequencer sequencer = SoundOption.this.msList.get(i);
 								SoundOption.this.msCombo.add(sequencer.getName());
 								if(SoundOption.this.msCurrentKey != null && SoundOption.this.msCurrentKey.equals(sequencer.getKey())){
 									SoundOption.this.msCombo.select(i);
@@ -94,11 +97,11 @@ public void run() {
 							if(SoundOption.this.msCombo.getSelectionIndex() < 0 && SoundOption.this.msCombo.getItemCount() > 0){
 								SoundOption.this.msCombo.select(0);
 							}
-							
+
 							//---Midi Port---//
 							String loadedPort = mpLoaded;
 							for (int i = 0; i < SoundOption.this.mpList.size(); i++) {
-								MidiOutputPort port = (MidiOutputPort)SoundOption.this.mpList.get(i);
+								MidiOutputPort port = SoundOption.this.mpList.get(i);
 								SoundOption.this.mpCombo.add(port.getName());
 								if(SoundOption.this.mpCurrentKey != null && SoundOption.this.mpCurrentKey.equals(port.getKey())){
 									SoundOption.this.mpCombo.select(i);
@@ -110,7 +113,7 @@ public void run() {
 							if(SoundOption.this.mpCombo.getSelectionIndex() < 0 && SoundOption.this.mpCombo.getItemCount() > 0){
 								SoundOption.this.mpCombo.select(0);
 							}
-							
+
 							SoundOption.this.initialized = true;
 							SoundOption.this.pack();
 						}
@@ -119,28 +122,31 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void updateConfig(){
 		if(this.initialized){
 			int msIndex = this.msCombo.getSelectionIndex();
 			if(msIndex >= 0 && msIndex < this.msList.size()){
-				getConfig().setProperty(TGConfigKeys.MIDI_SEQUENCER, ((MidiSequencer)this.msList.get(msIndex)).getKey());
+				getConfig().setProperty(TGConfigKeys.MIDI_SEQUENCER, this.msList.get(msIndex).getKey());
 			}
 			int mpIndex = this.mpCombo.getSelectionIndex();
 			if(mpIndex >= 0 && mpIndex < this.mpList.size()){
-				MidiOutputPort midiPort = (MidiOutputPort)this.mpList.get(mpIndex);
+				MidiOutputPort midiPort = this.mpList.get(mpIndex);
 				getConfig().setProperty(TGConfigKeys.MIDI_PORT, midiPort.getKey());
 			}
 		}
 	}
-	
+
+	@Override
 	public void updateDefaults(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.MIDI_PORT,getDefaults().getProperty(TGConfigKeys.MIDI_PORT));
 			getConfig().setProperty(TGConfigKeys.MIDI_SEQUENCER,getDefaults().getProperty(TGConfigKeys.MIDI_SEQUENCER));
 		}
 	}
-	
+
+	@Override
 	public void applyConfig(final boolean force){
 		if(force || this.initialized){
 			String midiSequencer = getConfig().getStringConfigValue(TGConfigKeys.MIDI_SEQUENCER);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/StylesOption.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/StylesOption.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/StylesOption.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/StylesOption.java
index 167aa313..e73d3fdc 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/StylesOption.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/StylesOption.java
@@ -24,7 +24,7 @@
 public class StylesOption extends Option{
 	private static final int BUTTON_WIDTH = 200;
 	private static final int BUTTON_HEIGHT = 0;
-	
+
 	protected boolean initialized;
 	protected FontData defaultFontData;
 	protected FontData noteFontData;
@@ -36,24 +36,24 @@ public class StylesOption extends Option{
 	protected FontData printerTSFontData;
 	protected FontData printerTextFontData;
 	protected FontData printerLyricFontData;
-	
+
 	protected Button defaultFontButton;
 	protected Button noteFontButton;
 	protected Button timeSignatureFontButton;
 	protected Button textFontButton;
 	protected Button lyricFontButton;
-	
+
 	protected Button printerDefaultFontButton;
 	protected Button printerNoteFontButton;
 	protected Button printerTSFontButton;
 	protected Button printerTextFontButton;
 	protected Button printerLyricFontButton;
-	
+
 	protected ButtonColor scoreNoteColorButton;
 	protected ButtonColor tabNoteColorButton;
 	protected ButtonColor playNoteColorButton;
 	protected ButtonColor linesColorButton;
-	
+
 	public StylesOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent){
 		super(configEditor,toolBar,parent,TuxGuitar.getProperty("settings.config.styles"));
 		this.initialized = false;
@@ -68,93 +68,95 @@ public StylesOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite
 		this.printerTextFontData = new FontData();
 		this.printerLyricFontData = new FontData();
 	}
-	
+
+	@Override
 	public void createOption(){
 		getToolItem().setText(TuxGuitar.getProperty("settings.config.styles"));
 		getToolItem().setImage(TuxGuitar.instance().getIconManager().getOptionStyle());
 		getToolItem().addSelectionListener(this);
-		
+
 		//=================================================== EDITOR STYLES ===================================================//
 		showLabel(getComposite(),SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.styles.general"));
-		
+
 		Composite composite = new Composite(getComposite(),SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
 		composite.setLayoutData(getTabbedData());
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.default"));
 		this.defaultFontButton = new Button(composite, SWT.PUSH);
 		this.defaultFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.defaultFontButton,this.defaultFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.note"));
 		this.noteFontButton = new Button(composite, SWT.PUSH);
 		this.noteFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.noteFontButton,this.noteFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.lyric"));
 		this.lyricFontButton = new Button(composite, SWT.PUSH);
 		this.lyricFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.lyricFontButton,this.lyricFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.text"));
 		this.textFontButton = new Button(composite, SWT.PUSH);
 		this.textFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.textFontButton,this.textFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.time-signature"));
 		this.timeSignatureFontButton = new Button(composite, SWT.PUSH);
 		this.timeSignatureFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.timeSignatureFontButton,this.timeSignatureFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.color.score-note"));
 		this.scoreNoteColorButton = new ButtonColor(composite, SWT.PUSH, makeButtonData(), TuxGuitar.getProperty("choose"));
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.color.tab-note"));
 		this.tabNoteColorButton = new ButtonColor(composite, SWT.PUSH, makeButtonData(), TuxGuitar.getProperty("choose"));
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.color.play-note"));
 		this.playNoteColorButton = new ButtonColor(composite, SWT.PUSH, makeButtonData(), TuxGuitar.getProperty("choose"));
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.color.lines"));
 		this.linesColorButton = new ButtonColor(composite, SWT.PUSH, makeButtonData(), TuxGuitar.getProperty("choose"));
-		
+
 		//=================================================== PRINTER STYLES ===================================================//
 		showLabel(getComposite(),SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.styles.printer"));
-		
+
 		composite = new Composite(getComposite(),SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
 		composite.setLayoutData(getTabbedData());
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.default"));
 		this.printerDefaultFontButton = new Button(composite, SWT.PUSH);
 		this.printerDefaultFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.printerDefaultFontButton,this.printerDefaultFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.note"));
 		this.printerNoteFontButton = new Button(composite, SWT.PUSH);
 		this.printerNoteFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.printerNoteFontButton,this.printerNoteFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.lyric"));
 		this.printerLyricFontButton = new Button(composite, SWT.PUSH);
 		this.printerLyricFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.printerLyricFontButton,this.printerLyricFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.text"));
 		this.printerTextFontButton = new Button(composite, SWT.PUSH);
 		this.printerTextFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.printerTextFontButton,this.printerTextFontData);
-		
+
 		showLabel(composite,SWT.FILL,SWT.CENTER,SWT.LEFT | SWT.WRAP,SWT.NORMAL,0,TuxGuitar.getProperty("settings.config.styles.font.time-signature"));
 		this.printerTSFontButton = new Button(composite, SWT.PUSH);
 		this.printerTSFontButton.setLayoutData(makeButtonData());
 		this.addFontButtonListeners(this.printerTSFontButton,this.printerTSFontData);
-		
+
 		this.loadConfig();
 	}
-	
+
 	private void addFontButtonListeners(final Button button, final FontData fontData){
 		button.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(StylesOption.this.initialized){
 					Font font = new Font(getDisplay(),fontData);
@@ -170,16 +172,16 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 	}
-	
+
 	protected void loadFontData(FontData src, FontData dst, Button button){
 		copyFontData(src, dst);
 		setButtonFontData(button, dst);
 	}
-	
+
 	protected void loadColor(ButtonColor button, RGB rgb){
 		button.loadColor(rgb);
 	}
-	
+
 	protected void setButtonFontData(Button button,FontData fontData) {
 		String text = fontData.getName();
 		if( (fontData.getStyle() & SWT.BOLD) != 0 ){
@@ -191,21 +193,22 @@ protected void setButtonFontData(Button button,FontData fontData) {
 		text += (" " + fontData.getHeight());
 		button.setText(text);
 	}
-	
+
 	protected void copyFontData(FontData src, FontData dst){
 		dst.setName( src.getName() );
 		dst.setStyle( src.getStyle() );
 		dst.setHeight( src.getHeight() );
 	}
-	
+
 	protected void copyRGB(RGB src, RGB dst){
 		dst.red = src.red;
 		dst.green = src.green;
 		dst.blue = src.blue;
 	}
-	
+
 	protected void loadConfig(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				final FontData defaultFontData = getConfig().getFontDataConfigValue(TGConfigKeys.FONT_DEFAULT);
 				final FontData noteFontData = getConfig().getFontDataConfigValue(TGConfigKeys.FONT_NOTE);
@@ -222,6 +225,7 @@ public void run() {
 				final RGB playNoteRGB  = getConfig().getRGBConfigValue(TGConfigKeys.COLOR_PLAY_NOTE);
 				final RGB linesRGB  = getConfig().getRGBConfigValue(TGConfigKeys.COLOR_LINE);
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							loadFontData(defaultFontData,StylesOption.this.defaultFontData,StylesOption.this.defaultFontButton);
@@ -246,14 +250,15 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public GridData makeButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.CENTER, true, true);
 		data.minimumWidth = BUTTON_WIDTH;
 		data.minimumHeight = BUTTON_HEIGHT;
 		return data;
 	}
-	
+
+	@Override
 	public void updateConfig(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.FONT_DEFAULT,this.defaultFontData);
@@ -272,7 +277,8 @@ public void updateConfig(){
 			getConfig().setProperty(TGConfigKeys.COLOR_LINE,this.linesColorButton.getValue());
 		}
 	}
-	
+
+	@Override
 	public void updateDefaults(){
 		if(this.initialized){
 			getConfig().setProperty(TGConfigKeys.FONT_DEFAULT,getDefaults().getProperty(TGConfigKeys.FONT_DEFAULT));
@@ -291,22 +297,24 @@ public void updateDefaults(){
 			getConfig().setProperty(TGConfigKeys.COLOR_LINE,getDefaults().getProperty(TGConfigKeys.COLOR_LINE));
 		}
 	}
-	
+
+	@Override
 	public void applyConfig(boolean force){
 		if(force || this.initialized){
 			addSyncThread(new Runnable() {
+				@Override
 				public void run() {
 					TuxGuitar.instance().loadStyles();
 				}
 			});
 		}
 	}
-	
+
 	private class ButtonColor {
 		protected Button button;
 		protected Color color;
 		protected RGB value;
-		
+
 		public ButtonColor(Composite parent, int style, Object layoutData, String text){
 			this.value = new RGB(0,0,0);
 			this.button = new Button(parent, style);
@@ -314,27 +322,28 @@ public ButtonColor(Composite parent, int style, Object layoutData, String text){
 			this.button.setText(text);
 			this.addListeners();
 		}
-		
+
 		protected void loadColor(RGB rgb){
 			this.value.red = rgb.red;
 			this.value.green = rgb.green;
 			this.value.blue = rgb.blue;
-			
+
 			Color color = new Color(this.button.getDisplay(), this.value);
 			this.button.setForeground(color);
 			this.disposeColor();
 			this.color = color;
 		}
-		
+
 		protected void disposeColor(){
 			if(this.color != null && !this.color.isDisposed()){
 				this.color.dispose();
 				this.color = null;
 			}
 		}
-		
+
 		private void addListeners(){
 			this.button.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent event) {
 					if(StylesOption.this.initialized){
 						ColorDialog dlg = new ColorDialog(getShell());
@@ -348,12 +357,13 @@ public void widgetSelected(SelectionEvent event) {
 				}
 			});
 			this.button.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent e) {
 					ButtonColor.this.disposeColor();
 				}
 			});
 		}
-		
+
 		protected RGB getValue(){
 			return this.value;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/ToolBarsOption.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/ToolBarsOption.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/ToolBarsOption.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/ToolBarsOption.java
index a189d076..ddd59273 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/config/items/ToolBarsOption.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/config/items/ToolBarsOption.java
@@ -19,69 +19,72 @@
 
 public class ToolBarsOption extends Option{
 	protected boolean initialized;
-	
+
 	protected Table table;
 	protected TableColumn column;
 	protected Button moveUp;
 	protected Button moveDown;
-	
+
 	public ToolBarsOption(TGConfigEditor configEditor,ToolBar toolBar,final Composite parent){
 		super(configEditor,toolBar,parent,TuxGuitar.getProperty("settings.config.toolbars"), SWT.FILL,SWT.FILL);
 		this.initialized = false;
 	}
-	
+
+	@Override
 	public void createOption() {
 		getToolItem().setText(TuxGuitar.getProperty("settings.config.toolbars"));
 		getToolItem().setImage(TuxGuitar.instance().getIconManager().getOptionToolbars());
 		getToolItem().addSelectionListener(this);
-		
+
 		showLabel(getComposite(),SWT.FILL, SWT.TOP, true, false, SWT.TOP | SWT.LEFT | SWT.WRAP,SWT.BOLD,0,TuxGuitar.getProperty("settings.config.toolbars.tip"));
-		
+
 		Composite composite = new Composite(getComposite(),SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(getTabbedData(SWT.FILL, SWT.FILL));
-		
+
 		this.table = new Table(composite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.CHECK | SWT.H_SCROLL | SWT.V_SCROLL);
 		this.table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.table.setHeaderVisible(true);
 		this.table.setLinesVisible(false);
-		
+
 		this.column = new TableColumn(this.table, SWT.LEFT);
 		this.column.setText(TuxGuitar.getProperty("settings.config.toolbars.list"));
 		this.column.pack();
-		
+
 		Composite buttons = new Composite(getComposite(), SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
-		
+
 		this.moveUp = new Button(buttons,SWT.PUSH);
 		this.moveUp.setLayoutData(getButtonData());
 		this.moveUp.setText(TuxGuitar.getProperty("settings.config.toolbars.move-up"));
 		this.moveUp.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				moveUp();
 			}
 		});
-		
+
 		this.moveDown = new Button(buttons,SWT.PUSH);
 		this.moveDown.setLayoutData(getButtonData());
 		this.moveDown.setText(TuxGuitar.getProperty("settings.config.toolbars.move-down"));
 		this.moveDown.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				moveDown();
 			}
 		});
-		
+
 		this.loadConfig();
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void moveUp(){
 		if(this.initialized){
 			int count = this.table.getItemCount();
@@ -94,7 +97,7 @@ protected void moveUp(){
 			}
 		}
 	}
-	
+
 	protected void moveDown(){
 		if(this.initialized){
 			int count = this.table.getItemCount();
@@ -107,25 +110,27 @@ protected void moveDown(){
 			}
 		}
 	}
-	
+
 	protected void swapItems(TableItem item1, TableItem item2){
 		ToolItems data1 = (ToolItems)item1.getData();
 		ToolItems data2 = (ToolItems)item2.getData();
 		loadItem(item1, data2);
 		loadItem(item2, data1);
 	}
-	
+
 	protected void loadItem(TableItem item, ToolItems data){
 		item.setText( TuxGuitar.getProperty( data.getName() ));
 		item.setChecked( data.isEnabled() );
 		item.setData( data );
 	}
-	
+
 	protected void loadConfig(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				final ToolItems[] items = TuxGuitar.instance().getItemManager().getToolBars();
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							for(int i = 0;i < items.length; i ++){
@@ -140,7 +145,8 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void updateConfig() {
 		if(this.initialized){
 			for( int i = 0 ; i < this.table.getItemCount() ; i ++){
@@ -151,24 +157,28 @@ public void updateConfig() {
 			TuxGuitar.instance().getItemManager().writeToolBars();
 		}
 	}
-	
+
+	@Override
 	public void updateDefaults() {
 		if(this.initialized){
 			TuxGuitar.instance().getItemManager().setDefaultToolBars();
 			TuxGuitar.instance().getItemManager().writeToolBars();
 		}
 	}
-	
+
+	@Override
 	public void applyConfig(boolean force){
 		if(force || (this.initialized && TuxGuitar.instance().getItemManager().shouldReloadToolBars())){
 			addSyncThread(new Runnable() {
+				@Override
 				public void run() {
 					TuxGuitar.instance().loadToolBars();
 				}
 			});
 		}
 	}
-	
+
+	@Override
 	public Point computeSize(){
 		return this.computeSize(SWT.DEFAULT,SWT.NONE);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/icons/IconLoader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/icons/IconLoader.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/icons/IconLoader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/icons/IconLoader.java
index 49886fad..4c5e2ed4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/icons/IconLoader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/icons/IconLoader.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.app.system.icons;
 
 public interface IconLoader {
-	
+
 	public void loadIcons();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/icons/IconManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/icons/IconManager.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/icons/IconManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/icons/IconManager.java
index 0a4b41b6..45b1c3d2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/icons/IconManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/icons/IconManager.java
@@ -13,9 +13,9 @@
 
 public class IconManager {
 	private String theme;
-	private List loaders;
-	private List disposableIcons;
-	
+	private final List<IconLoader> loaders;
+	private final List<Image> disposableIcons;
+
 	private Image[] durations;
 	private Image editUndo;
 	private Image editRedo;
@@ -91,6 +91,7 @@ public class IconManager {
 	private Image fretboardFret;
 	private Image compositionTimeSignature;
 	private Image compositionTempo;
+	private Image compositionDoubleBar;
 	private Image compositionRepeatOpen;
 	private Image compositionRepeatClose;
 	private Image compositionRepeatAlternative;
@@ -141,40 +142,40 @@ public class IconManager {
 	private Image browserBack;
 	private Image browserRefresh;
 	private Image settings;
-	
+
 	public IconManager(){
-		this.loaders = new ArrayList();
-		this.disposableIcons = new ArrayList();
+		this.loaders = new ArrayList<IconLoader>();
+		this.disposableIcons = new ArrayList<Image>();
 		this.loadIcons();
 	}
-	
+
 	public void addLoader(IconLoader loader){
 		if( !this.loaders.contains( loader )){
 			this.loaders.add(loader);
 		}
 	}
-	
+
 	public void removeLoader(IconLoader loader){
 		if( this.loaders.contains( loader )){
 			this.loaders.remove(loader);
 		}
 	}
-	
+
 	private void fireChanges(){
-		Iterator it = this.loaders.iterator();
+		Iterator<IconLoader> it = this.loaders.iterator();
 		while(it.hasNext()){
-			IconLoader loader = (IconLoader)it.next();
+			IconLoader loader = it.next();
 			loader.loadIcons();
 		}
 	}
-	
+
 	public void reloadIcons(){
-		List disposableIcons = purgeDisposableIcons();
+		List<Resource> disposableIcons = purgeDisposableIcons();
 		this.loadIcons();
 		this.fireChanges();
 		this.disposeIcons(disposableIcons);
 	}
-	
+
 	public void loadIcons(){
 		this.theme = TuxGuitar.instance().getConfig().getStringConfigValue(TGConfigKeys.SKIN);
 		this.durations = new Image[]{
@@ -225,6 +226,7 @@ public void loadIcons(){
 		this.optionToolbars = loadIcon("option_toolbars.png");
 		this.compositionTimeSignature = loadIcon("timesignature.png");
 		this.compositionTempo = loadIcon("tempoicon.png");
+		this.compositionDoubleBar = loadIcon("doublebar.png");
 		this.compositionRepeatOpen = loadIcon("openrepeat.png");
 		this.compositionRepeatClose = loadIcon("closerepeat.png");
 		this.compositionRepeatAlternative = loadIcon("repeat_alternative.png");
@@ -311,40 +313,40 @@ public void loadIcons(){
 		this.browserRefresh = loadIcon("browser_refresh.png");
 		this.settings = loadIcon("settings.png");
 	}
-	
+
 	private Image loadIcon(String name){
 		Image image = TGFileUtils.loadImage(this.theme,name);
 		this.disposableIcons.add(image);
 		return image;
 	}
-	
-	private List purgeDisposableIcons(){
-		List disposableIcons = new ArrayList();
-		Iterator it = this.disposableIcons.iterator();
+
+	private List<Resource> purgeDisposableIcons(){
+		List<Resource> disposableIcons = new ArrayList<Resource>();
+		Iterator<Image> it = this.disposableIcons.iterator();
 		while( it.hasNext() ){
-			Resource resource = (Resource)it.next();
+			Resource resource = it.next();
 			disposableIcons.add( resource );
 		}
 		this.disposableIcons.clear();
 		return disposableIcons;
 	}
-	
-	public void disposeIcons(List resources){
-		Iterator it = resources.iterator();
+
+	public void disposeIcons(List<Resource> resources){
+		Iterator<Resource> it = resources.iterator();
 		while( it.hasNext() ){
 			Image image = (Image)it.next();
 			image.dispose();
 		}
 	}
-	
+
 	public void disposeIcons(){
 		this.disposeIcons(purgeDisposableIcons());
 	}
-	
+
 	public boolean shouldReload(){
 		return (!this.theme.equals(TuxGuitar.instance().getConfig().getStringConfigValue(TGConfigKeys.SKIN)));
 	}
-	
+
 	public Image getDuration(int value){
 		switch(value){
 		case TGDuration.WHOLE:
@@ -364,501 +366,505 @@ public Image getDuration(int value){
 		}
 		return null;
 	}
-	
+
 	public Image getAboutAuthors() {
 		return this.aboutAuthors;
 	}
-	
+
 	public Image getAboutDescription() {
 		return this.aboutDescription;
 	}
-	
+
 	public Image getAboutLicense() {
 		return this.aboutLicense;
 	}
-	
+
 	public Image getAppIcon() {
 		return this.appIcon;
 	}
-	
+
 	public Image getAppIcon16() {
 		return this.appIcon16;
 	}
-	
+
 	public Image getAppIcon24() {
 		return this.appIcon24;
 	}
-	
+
 	public Image getAppIcon32() {
 		return this.appIcon32;
 	}
-	
+
 	public Image getAppIcon48() {
 		return this.appIcon48;
 	}
-	
+
 	public Image getAppIcon64() {
 		return this.appIcon64;
 	}
-	
+
 	public Image getAppIcon96() {
 		return this.appIcon96;
 	}
-	
+
 	public Image getAppSplash() {
 		return this.appSplash;
 	}
-	
+
 	public Image getChord() {
 		return this.chord;
 	}
-	
+
 	public Image getCompositionRepeatClose() {
 		return this.compositionRepeatClose;
 	}
-	
+
+	public Image getCompositionDoubleBar() {
+		return this.compositionDoubleBar;
+	}
+
 	public Image getCompositionRepeatAlternative() {
 		return this.compositionRepeatAlternative;
 	}
-	
+
 	public Image getCompositionRepeatOpen() {
 		return this.compositionRepeatOpen;
 	}
-	
+
 	public Image getCompositionTempo() {
 		return this.compositionTempo;
 	}
-	
+
 	public Image getCompositionTimeSignature() {
 		return this.compositionTimeSignature;
 	}
-	
+
 	public Image getDurationDotted() {
 		return this.durationDotted;
 	}
-	
+
 	public Image getDurationDoubleDotted() {
 		return this.durationDoubleDotted;
 	}
-	
+
 	public Image getDivisionType() {
 		return this.divisionType;
 	}
-	
+
 	public Image getDynamicF() {
 		return this.dynamicF;
 	}
-	
+
 	public Image getDynamicFF() {
 		return this.dynamicFF;
 	}
-	
+
 	public Image getDynamicFFF() {
 		return this.dynamicFFF;
 	}
-	
+
 	public Image getDynamicMF() {
 		return this.dynamicMF;
 	}
-	
+
 	public Image getDynamicMP() {
 		return this.dynamicMP;
 	}
-	
+
 	public Image getDynamicP() {
 		return this.dynamicP;
 	}
-	
+
 	public Image getDynamicPP() {
 		return this.dynamicPP;
 	}
-	
+
 	public Image getDynamicPPP() {
 		return this.dynamicPPP;
 	}
-	
+
 	public Image getEditModeEdition() {
 		return this.editModeEdition;
 	}
-	
+
 	public Image getEditModeEditionNotNatural() {
 		return this.editModeEditionNotNatural;
 	}
-	
+
 	public Image getEditModeSelection() {
 		return this.editModeSelection;
 	}
-	
+
 	public Image getEditRedo() {
 		return this.editRedo;
 	}
-	
+
 	public Image getEditUndo() {
 		return this.editUndo;
 	}
-	
+
 	public Image getEditVoice1() {
 		return this.editVoice1;
 	}
-	
+
 	public Image getEditVoice2() {
 		return this.editVoice2;
 	}
-	
+
 	public Image getEffectAccentuated() {
 		return this.effectAccentuated;
 	}
-	
+
 	public Image getEffectBend() {
 		return this.effectBend;
 	}
-	
+
 	public Image getEffectDead() {
 		return this.effectDead;
 	}
-	
+
 	public Image getEffectFadeIn() {
 		return this.effectFadeIn;
 	}
-	
+
 	public Image getEffectGhost() {
 		return this.effectGhost;
 	}
-	
+
 	public Image getEffectGrace() {
 		return this.effectGrace;
 	}
-	
+
 	public Image getEffectHammer() {
 		return this.effectHammer;
 	}
-	
+
 	public Image getEffectHarmonic() {
 		return this.effectHarmonic;
 	}
-	
+
 	public Image getEffectHeavyAccentuated() {
 		return this.effectHeavyAccentuated;
 	}
-	
+
 	public Image getEffectPalmMute() {
 		return this.effectPalmMute;
 	}
-	
+
 	public Image getEffectPopping() {
 		return this.effectPopping;
 	}
-	
+
 	public Image getEffectSlapping() {
 		return this.effectSlapping;
 	}
-	
+
 	public Image getEffectSlide() {
 		return this.effectSlide;
 	}
-	
+
 	public Image getEffectStaccato() {
 		return this.effectStaccato;
 	}
-	
+
 	public Image getEffectTapping() {
 		return this.effectTapping;
 	}
-	
+
 	public Image getEffectTremoloBar() {
 		return this.effectTremoloBar;
 	}
-	
+
 	public Image getEffectTremoloPicking() {
 		return this.effectTremoloPicking;
 	}
-	
+
 	public Image getEffectTrill() {
 		return this.effectTrill;
 	}
-	
+
 	public Image getEffectVibrato() {
 		return this.effectVibrato;
 	}
-	
+
 	public Image getFileNew() {
 		return this.fileNew;
 	}
-	
+
 	public Image getFileOpen() {
 		return this.fileOpen;
 	}
-	
+
 	public Image getFilePrint() {
 		return this.filePrint;
 	}
-	
+
 	public Image getFilePrintPreview() {
 		return this.filePrintPreview;
 	}
-	
+
 	public Image getFileSave() {
 		return this.fileSave;
 	}
-	
+
 	public Image getFileSaveAs() {
 		return this.fileSaveAs;
 	}
-	
+
 	public Image getFretboard() {
 		return this.fretboard;
 	}
-	
+
 	public Image getFretboardFirstFret() {
 		return this.fretboardFirstFret;
 	}
-	
+
 	public Image getFretboardFret() {
 		return this.fretboardFret;
 	}
-	
+
 	public Image getLayoutLinear() {
 		return this.layoutLinear;
 	}
-	
+
 	public Image getLayoutMultitrack() {
 		return this.layoutMultitrack;
 	}
-	
+
 	public Image getLayoutPage() {
 		return this.layoutPage;
 	}
-	
+
 	public Image getLayoutScore() {
 		return this.layoutScore;
 	}
-	
+
 	public Image getLayoutCompact() {
 		return this.layoutCompact;
 	}
-	
+
 	public Image getMarkerAdd() {
 		return this.markerAdd;
 	}
-	
+
 	public Image getMarkerFirst() {
 		return this.markerFirst;
 	}
-	
+
 	public Image getMarkerLast() {
 		return this.markerLast;
 	}
-	
+
 	public Image getMarkerList() {
 		return this.markerList;
 	}
-	
+
 	public Image getMarkerNext() {
 		return this.markerNext;
 	}
-	
+
 	public Image getMarkerPrevious() {
 		return this.markerPrevious;
 	}
-	
+
 	public Image getMarkerRemove() {
 		return this.markerRemove;
 	}
-	
+
 	public Image getInstruments() {
 		return this.instruments;
 	}
-	
+
 	public Image getNoteTied() {
 		return this.noteTied;
 	}
-	
+
 	public Image getOptionLanguage() {
 		return this.optionLanguage;
 	}
-	
+
 	public Image getOptionMain() {
 		return this.optionMain;
 	}
-	
+
 	public Image getOptionSound() {
 		return this.optionSound;
 	}
-	
+
 	public Image getOptionStyle() {
 		return this.optionStyle;
 	}
-	
+
 	public Image getOptionToolbars() {
 		return this.optionToolbars;
 	}
-	
+
 	public Image getOptionSkin() {
 		return this.optionSkin;
 	}
-	
+
 	public Image getPaintableGrace() {
 		return this.paintableGrace;
 	}
-	
+
 	public Image getPaintableTempo() {
 		return this.paintableTempo;
 	}
-	
+
 	public Image getSongProperties() {
 		return this.songProperties;
 	}
-	
+
 	public Image getTrackAdd() {
 		return this.trackAdd;
 	}
-	
+
 	public Image getTrackRemove() {
 		return this.trackRemove;
 	}
-	
+
 	public Image getTransport() {
 		return this.transport;
 	}
-	
+
 	public Image getTransportFirst1() {
 		return this.transportFirst1;
 	}
-	
+
 	public Image getTransportFirst2() {
 		return this.transportFirst2;
 	}
-	
+
 	public Image getTransportIconFirst1() {
 		return this.transportIconFirst1;
 	}
-	
+
 	public Image getTransportIconFirst2() {
 		return this.transportIconFirst2;
 	}
-	
+
 	public Image getTransportIconLast1() {
 		return this.transportIconLast1;
 	}
-	
+
 	public Image getTransportIconLast2() {
 		return this.transportIconLast2;
 	}
-	
+
 	public Image getTransportIconNext1() {
 		return this.transportIconNext1;
 	}
-	
+
 	public Image getTransportIconNext2() {
 		return this.transportIconNext2;
 	}
-	
+
 	public Image getTransportIconPause() {
 		return this.transportIconPause;
 	}
-	
+
 	public Image getTransportIconPlay1() {
 		return this.transportIconPlay1;
 	}
-	
+
 	public Image getTransportIconPlay2() {
 		return this.transportIconPlay2;
 	}
-	
+
 	public Image getTransportIconPrevious1() {
 		return this.transportIconPrevious1;
 	}
-	
+
 	public Image getTransportIconPrevious2() {
 		return this.transportIconPrevious2;
 	}
-	
+
 	public Image getTransportIconStop1() {
 		return this.transportIconStop1;
 	}
-	
+
 	public Image getTransportIconStop2() {
 		return this.transportIconStop2;
 	}
-	
+
 	public Image getTransportLast1() {
 		return this.transportLast1;
 	}
-	
+
 	public Image getTransportLast2() {
 		return this.transportLast2;
 	}
-	
+
 	public Image getTransportNext1() {
 		return this.transportNext1;
 	}
-	
+
 	public Image getTransportNext2() {
 		return this.transportNext2;
 	}
-	
+
 	public Image getTransportPause() {
 		return this.transportPause;
 	}
-	
+
 	public Image getTransportPlay1() {
 		return this.transportPlay1;
 	}
-	
+
 	public Image getTransportPlay2() {
 		return this.transportPlay2;
 	}
-	
+
 	public Image getTransportPrevious1() {
 		return this.transportPrevious1;
 	}
-	
+
 	public Image getTransportPrevious2() {
 		return this.transportPrevious2;
 	}
-	
+
 	public Image getTransportStop1() {
 		return this.transportStop1;
 	}
-	
+
 	public Image getTransportStop2() {
 		return this.transportStop2;
 	}
-	
+
 	public Image getTransportMetronome() {
 		return this.transportMetronome;
 	}
-	
+
 	public Image getTransportMode() {
 		return this.transportMode;
 	}
-	
+
 	public Image getBrowserBack() {
 		return this.browserBack;
 	}
-	
+
 	public Image getBrowserFile() {
 		return this.browserFile;
 	}
-	
+
 	public Image getBrowserFolder() {
 		return this.browserFolder;
 	}
-	
+
 	public Image getBrowserRefresh() {
 		return this.browserRefresh;
 	}
-	
+
 	public Image getBrowserRoot() {
 		return this.browserRoot;
 	}
-	
+
 	public Image getBrowserNew() {
 		return this.browserNew;
 	}
-	
+
 	public Image getSettings() {
 		return this.settings;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
index 031e4c56..f3819afe 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBinding.java
@@ -1,35 +1,35 @@
 package org.herac.tuxguitar.app.system.keybindings;
 
 public class KeyBinding {
-	
+
 	private int mask;
 	private int key;
-	
+
 	public KeyBinding(int key,int mask){
 		this.key = key;
 		this.mask = mask;
 	}
-	
+
 	public KeyBinding(){
 		this(0,0);
 	}
-	
+
 	public int getKey() {
 		return this.key;
 	}
-	
+
 	public void setKey(int key) {
 		this.key = key;
 	}
-	
+
 	public int getMask() {
 		return this.mask;
 	}
-	
+
 	public void setMask(int mask) {
 		this.mask = mask;
 	}
-	
+
 	public boolean isSameAs(KeyBinding kb){
 		if( kb != null ){
 			if( this.getMask() == kb.getMask() ){
@@ -43,7 +43,8 @@ public boolean isSameAs(KeyBinding kb){
 		}
 		return false;
 	}
-	
+
+	@Override
 	public String toString(){
 		String mask = KeyBindingUtil.getConversionMask( this.getMask() );
 		String key = KeyBindingUtil.getConversionKey( this.getKey() );
@@ -52,7 +53,8 @@ public String toString(){
 		}
 		return (mask + key);
 	}
-	
+
+	@Override
 	public Object clone(){
 		return new KeyBinding(getKey(),getMask());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
index 75417029..ef252fd4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingAction.java
@@ -1,27 +1,27 @@
 package org.herac.tuxguitar.app.system.keybindings;
 
 public class KeyBindingAction {
-	
+
 	private String action;
 	private KeyBinding keyBinding;
-	
+
 	public KeyBindingAction(String action,KeyBinding keyBinding){
 		this.action = action;
 		this.keyBinding = keyBinding;
 	}
-	
+
 	public String getAction() {
 		return this.action;
 	}
-	
+
 	public void setAction(String action) {
 		this.action = action;
 	}
-	
+
 	public KeyBinding getKeyBinding() {
 		return this.keyBinding;
 	}
-	
+
 	public void setKeyBinding(KeyBinding keyBinding) {
 		this.keyBinding = keyBinding;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionDefaults.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionDefaults.java
similarity index 75%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionDefaults.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionDefaults.java
index 9408297c..21645837 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionDefaults.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionDefaults.java
@@ -11,12 +11,12 @@ public class KeyBindingActionDefaults {
 
 	private static final String DEFAULT_SHORTCUT_FILE = "shortcuts-default.xml";
 
-	public static List getDefaultKeyBindings() {
-		List list = new ArrayList();
+	public static List<KeyBindingAction> getDefaultKeyBindings() {
+		List<KeyBindingAction> list = new ArrayList<KeyBindingAction>();
 		try {
 			InputStream stream = TGFileUtils.getResourceAsStream(DEFAULT_SHORTCUT_FILE);
 			if (stream != null) {
-				List defaults = KeyBindingReader.getKeyBindings(stream);
+				List<KeyBindingAction> defaults = KeyBindingReader.getKeyBindings(stream);
 				if (defaults != null) {
 					list.addAll(defaults);
 				}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
similarity index 77%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
index 55ca853a..3bcfb940 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingActionManager.java
@@ -14,64 +14,64 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class KeyBindingActionManager {
-	
-	private List keyBindingsActions;
+
+	private final List<KeyBindingAction> keyBindingsActions;
 	private KeyBindingListener listener;
-	
+
 	public KeyBindingActionManager(){
-		this.keyBindingsActions = new ArrayList();
+		this.keyBindingsActions = new ArrayList<KeyBindingAction>();
 		this.init();
 	}
-	
+
 	public void init(){
-		List enabled = KeyBindingReader.getKeyBindings(getUserFileName());
+		List<KeyBindingAction> enabled = KeyBindingReader.getKeyBindings(getUserFileName());
 		this.keyBindingsActions.addAll( (enabled != null ? enabled : KeyBindingActionDefaults.getDefaultKeyBindings()) );
 		this.listener = new KeyBindingListener(this);
 	}
-	
+
 	private String getUserFileName(){
 		return TGFileUtils.PATH_USER_CONFIG + File.separator + "shortcuts.xml";
 	}
-	
+
 	public Action getActionForKeyBinding(KeyBinding kb){
-		Iterator it = this.keyBindingsActions.iterator();
+		Iterator<KeyBindingAction> it = this.keyBindingsActions.iterator();
 		while(it.hasNext()){
-			KeyBindingAction keyBindingAction = (KeyBindingAction)it.next();
+			KeyBindingAction keyBindingAction = it.next();
 			if(keyBindingAction.getKeyBinding() != null && kb.isSameAs( keyBindingAction.getKeyBinding() )){
 				return TuxGuitar.instance().getAction(keyBindingAction.getAction());
 			}
 		}
 		return null;
 	}
-	
+
 	public KeyBinding getKeyBindingForAction(String action){
-		Iterator it = this.keyBindingsActions.iterator();
+		Iterator<KeyBindingAction> it = this.keyBindingsActions.iterator();
 		while(it.hasNext()){
-			KeyBindingAction keyBindingAction = (KeyBindingAction)it.next();
+			KeyBindingAction keyBindingAction = it.next();
 			if(action.equals( keyBindingAction.getAction() )){
 				return keyBindingAction.getKeyBinding();
 			}
 		}
 		return null;
 	}
-	
-	public void reset(List keyBindings){
+
+	public void reset(List<KeyBindingAction> keyBindings){
 		this.keyBindingsActions.clear();
 		this.keyBindingsActions.addAll(keyBindings);
 	}
-	
-	public List getKeyBindingActions(){
+
+	public List<KeyBindingAction> getKeyBindingActions(){
 		return this.keyBindingsActions;
 	}
-	
+
 	public void saveKeyBindings(){
 		KeyBindingWriter.setBindings(getKeyBindingActions(),getUserFileName());
 	}
-	
+
 	public void appendListenersTo(Control control){
 		control.addKeyListener(this.listener);
 	}
-	
+
 	public void processKeyBinding(KeyBinding kb){
 		Action action = getActionForKeyBinding(kb);
 		if (action != null){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingListener.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingListener.java
index 8c2f759d..d3f69214 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingListener.java
@@ -4,20 +4,22 @@
 import org.eclipse.swt.events.KeyListener;
 
 public class KeyBindingListener implements KeyListener {
-	
+
 	private KeyBindingActionManager keyBindingActionManager;
-	
+
 	public KeyBindingListener(KeyBindingActionManager keyBindingActionManager){
 		this.keyBindingActionManager = keyBindingActionManager;
 	}
-	
+
+	@Override
 	public void keyPressed(KeyEvent event) {
 		KeyBinding keyBinding = new KeyBinding();
 		keyBinding.setKey(event.keyCode);
 		keyBinding.setMask(event.stateMask);
 		this.keyBindingActionManager.processKeyBinding(keyBinding);
 	}
-	
+
+	@Override
 	public void keyReleased(KeyEvent evt) {
 		//not implemented
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingUtil.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingUtil.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingUtil.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingUtil.java
index 0e068687..01354a4d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyBindingUtil.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyBindingUtil.java
@@ -3,7 +3,7 @@
 import org.eclipse.swt.SWT;
 
 public class KeyBindingUtil {
-	
+
 	public static final int F1 = SWT.F1;
 	public static final int F2 = SWT.F2;
 	public static final int F3 = SWT.F3;
@@ -50,16 +50,16 @@ public class KeyBindingUtil {
 	public static final int MULTIPLY = SWT.KEYPAD_MULTIPLY;
 	public static final int DIVIDE = SWT.KEYPAD_DIVIDE;
 	public static final int DECIMAL = SWT.KEYPAD_DECIMAL;
-	
+
 	public static final String MASK_SEPARATOR = "+";
-	
+
 	public static final KeyCode[] MASK_KEYS = new KeyCode[]{
 		new KeyCode(CONTROL, "Control"),
 		new KeyCode(SHIFT, "Shift"),
 		new KeyCode(ALT,"Alt"),
 		new KeyCode(COMMAND,"\u2318"),
 	};
-	
+
 	public static final KeyCode[] SPECIAL_KEYS = new KeyCode[]{
 		new KeyCode(F1, "F1"),
 		new KeyCode(F2, "F2"),
@@ -90,7 +90,7 @@ public class KeyBindingUtil {
 		new KeyCode(SPACE,"Space"),
 		new KeyCode(ENTER,"Enter"),
 	};
-	
+
 	public static boolean isSpecialKey( int code ){
 		for(int i = 0; i < KeyBindingUtil.SPECIAL_KEYS.length; i++){
 			if (code == KeyBindingUtil.SPECIAL_KEYS[i].getCode()){
@@ -99,7 +99,7 @@ public static boolean isSpecialKey( int code ){
 		}
 		return false;
 	}
-	
+
 	public static String getConversionKey( int code ){
 		for(int i = 0; i < KeyBindingUtil.SPECIAL_KEYS.length; i++){
 			if (code == KeyBindingUtil.SPECIAL_KEYS[i].getCode()){
@@ -108,7 +108,7 @@ public static String getConversionKey( int code ){
 		}
 		return null;
 	}
-	
+
 	public static String getConversionMask( int mask ){
 		String fullMask = new String();
 		for(int i = 0; i < KeyBindingUtil.MASK_KEYS.length; i++){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyCode.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyCode.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyCode.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyCode.java
index 00f22b6d..cc4fca98 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/KeyCode.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/KeyCode.java
@@ -1,19 +1,19 @@
 package org.herac.tuxguitar.app.system.keybindings;
 
 public class KeyCode {
-	
+
 	private int code;
 	private String key;
-	
+
 	public KeyCode(int code, String key){
 		this.code = code;
 		this.key = key;
 	}
-	
+
 	public int getCode(){
 		return this.code;
 	}
-	
+
 	public String getKey(){
 		return this.key;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingEditor.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingEditor.java
index 447d47f4..09491220 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingEditor.java
@@ -27,31 +27,32 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class KeyBindingEditor {
-	
+
 	private static final int ACTION_WIDTH = 400;
 	private static final int SHORTCUT_WIDTH = 100;
-	
+
 	protected Shell dialog;
 	protected Table table;
-	protected List items;
-	
+	protected List<TableItem> items;
+
 	public KeyBindingEditor(){
-		this.items = new ArrayList();
+		this.items = new ArrayList<TableItem>();
 	}
-	
+
 	public void show(Shell parent){
 		this.dialog = DialogUtils.newDialog(parent,SWT.DIALOG_TRIM |SWT.APPLICATION_MODAL);
 		this.dialog.setText(TuxGuitar.getProperty("key-bindings-editor"));
 		this.dialog.setLayout(new GridLayout());
-		
+
 		Composite composite = new Composite(this.dialog,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.NONE,true,true));
-		
+
 		this.table = new Table(composite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
 		this.table.setLayoutData(new GridData((ACTION_WIDTH + SHORTCUT_WIDTH) ,250));
 		this.table.setHeaderVisible(true);
 		this.table.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseDoubleClick(MouseEvent e) {
 				TableItem item = getSelectedItem();
 				if(item != null){
@@ -64,52 +65,55 @@ public void mouseDoubleClick(MouseEvent e) {
 				}
 			}
 		});
-		
+
 		TableColumn actionColumn = new TableColumn(this.table, SWT.LEFT);
 		actionColumn.setText(TuxGuitar.getProperty("key-bindings-editor-action-column"));
-		
+
 		TableColumn shortcutColumn = new TableColumn(this.table, SWT.LEFT);
 		shortcutColumn.setText(TuxGuitar.getProperty("key-bindings-editor-shortcut-column"));
-		
+
 		loadAvailableActionKeyBindings();
 		loadEnableActionKeyBindings(TuxGuitar.instance().getkeyBindingManager().getKeyBindingActions());
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		Button defaults = new Button(buttons,SWT.PUSH);
 		defaults.setText(TuxGuitar.getProperty("defaults"));
 		defaults.setLayoutData(getButtonData());
 		defaults.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				loadEnableActionKeyBindings(KeyBindingActionDefaults.getDefaultKeyBindings());
 			}
 		});
-		
+
 		Button close = new Button(buttons,SWT.PUSH);
 		close.setText(TuxGuitar.getProperty("close"));
 		close.setLayoutData(getButtonData());
 		close.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				KeyBindingEditor.this.dialog.dispose();
 			}
 		});
-		
+
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				save();
 			}
 		});
-		
+
 		this.table.setLayoutData(new GridData( (adjustWidth(actionColumn,ACTION_WIDTH) + adjustWidth(shortcutColumn,SHORTCUT_WIDTH)) ,250) );
-		
+
 		this.dialog.setDefaultButton( close );
-		
+
 		DialogUtils.openDialog(this.dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	protected int adjustWidth(TableColumn column, int defaultWidth){
 		column.pack();
 		int width = column.getWidth();
@@ -119,14 +123,14 @@ protected int adjustWidth(TableColumn column, int defaultWidth){
 		}
 		return width;
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void loadTableItemLabel(TableItem item){
 		if(item.getData() instanceof KeyBindingAction){
 			KeyBindingAction actionkeyBinding = (KeyBindingAction)item.getData();
@@ -135,29 +139,29 @@ protected void loadTableItemLabel(TableItem item){
 			item.setText(new String[] { TuxGuitar.getProperty(action),shortcut});
 		}
 	}
-	
+
 	protected void loadAvailableActionKeyBindings(){
-		List list = TuxGuitar.instance().getActionManager().getAvailableKeyBindingActions();
+		List<String> list = TuxGuitar.instance().getActionManager().getAvailableKeyBindingActions();
 		Collections.sort(list);
-		Iterator it = list.iterator();
+		Iterator<String> it = list.iterator();
 		while (it.hasNext()) {
-			String action = (String) it.next();
+			String action = it.next();
 			TableItem item = new TableItem(this.table, SWT.NONE);
 			item.setData(new KeyBindingAction(action,null));
 			this.items.add(item);
 		}
 	}
-	
-	protected void loadEnableActionKeyBindings(List list){
-		Iterator items = this.items.iterator();
+
+	protected void loadEnableActionKeyBindings(List<KeyBindingAction> list){
+		Iterator<TableItem> items = this.items.iterator();
 		while (items.hasNext()) {
-			TableItem item = (TableItem) items.next();
+			TableItem item = items.next();
 			if(item.getData() instanceof KeyBindingAction){
 				KeyBindingAction itemData = (KeyBindingAction)item.getData();
 				KeyBinding keyBinding = null;
-				Iterator it = list.iterator();
+				Iterator<KeyBindingAction> it = list.iterator();
 				while (it.hasNext()) {
-					KeyBindingAction keyBindingAction = (KeyBindingAction) it.next();
+					KeyBindingAction keyBindingAction = it.next();
 					if(keyBindingAction.getAction().equals(itemData.getAction())){
 						keyBinding =  (KeyBinding) keyBindingAction.getKeyBinding().clone();
 						break;
@@ -168,12 +172,12 @@ protected void loadEnableActionKeyBindings(List list){
 			}
 		}
 	}
-	
+
 	protected void removeKeyBindingAction(KeyBinding kb){
 		if(kb != null){
-			Iterator it = this.items.iterator();
+			Iterator<TableItem> it = this.items.iterator();
 			while(it.hasNext()){
-				TableItem item = (TableItem) it.next();
+				TableItem item = it.next();
 				if(item.getData() instanceof KeyBindingAction){
 					KeyBindingAction itemData = (KeyBindingAction)item.getData();
 					if(kb.isSameAs(itemData.getKeyBinding())){
@@ -184,7 +188,7 @@ protected void removeKeyBindingAction(KeyBinding kb){
 			}
 		}
 	}
-	
+
 	protected TableItem getSelectedItem(){
 		TableItem item = null;
 		int itemSelected = this.table.getSelectionIndex();
@@ -193,11 +197,11 @@ protected TableItem getSelectedItem(){
 		}
 		return item;
 	}
-	
+
 	public boolean exists(KeyBinding kb){
-		Iterator it = this.items.iterator();
+		Iterator<TableItem> it = this.items.iterator();
 		while(it.hasNext()){
-			TableItem item = (TableItem) it.next();
+			TableItem item = it.next();
 			if(item.getData() instanceof KeyBindingAction){
 				KeyBindingAction itemData = (KeyBindingAction)item.getData();
 				if(itemData.getKeyBinding() != null && kb.isSameAs(itemData.getKeyBinding())){
@@ -207,12 +211,12 @@ public boolean exists(KeyBinding kb){
 		}
 		return false;
 	}
-	
+
 	protected void save(){
-		List list = new ArrayList();
-		Iterator it = this.items.iterator();
+		List<KeyBindingAction> list = new ArrayList<KeyBindingAction>();
+		Iterator<TableItem> it = this.items.iterator();
 		while (it.hasNext()) {
-			TableItem item = (TableItem) it.next();
+			TableItem item = it.next();
 			if(item.getData() instanceof KeyBindingAction){
 				KeyBindingAction keyBindingAction = (KeyBindingAction)item.getData();
 				if(keyBindingAction.getAction() != null && keyBindingAction.getKeyBinding() != null){
@@ -224,11 +228,11 @@ protected void save(){
 		TuxGuitar.instance().getkeyBindingManager().saveKeyBindings();
 		TuxGuitar.instance().loadLanguage();
 	}
-	
+
 	public Shell getDialog(){
 		return this.dialog;
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.dialog == null || this.dialog.isDisposed() );
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingSelector.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingSelector.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingSelector.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingSelector.java
index 756e6eba..754d4578 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingSelector.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/editor/KeyBindingSelector.java
@@ -25,34 +25,35 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class KeyBindingSelector {
-	
+
 	protected Shell dialog;
 	protected KeyBindingEditor editor;
 	protected KeyBinding keyBinding;
 	protected String action;
-	
+
 	public KeyBindingSelector(KeyBindingEditor editor,KeyBindingAction keyBindingAction){
 		this.editor = editor;
 		this.keyBinding = keyBindingAction.getKeyBinding();
 		this.action = keyBindingAction.getAction();
 	}
-	
+
 	public KeyBinding select(Shell parent){
 		this.dialog = DialogUtils.newDialog(parent,SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.dialog.setText(TuxGuitar.getProperty("key-bindings-editor"));
-		
+
 		Group group = new Group(this.dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty(this.action));
-		
+
 		final Composite composite = new Composite(group,SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		composite.setFocus();
 		composite.addKeyListener(new KeyAdapter() {
+			@Override
 			public void keyReleased(KeyEvent e) {
 				KeyBinding kb = new KeyBinding(e.keyCode,e.stateMask);
 				if(kb.isSameAs(KeyBindingSelector.this.keyBinding) || isValid(kb)){
@@ -65,72 +66,77 @@ public void keyReleased(KeyEvent e) {
 				KeyBindingSelector.this.dialog.dispose();
 			}
 		});
-		
+
 		Label iconLabel = new Label(composite, SWT.CENTER );
 		iconLabel.setImage(iconLabel.getDisplay().getSystemImage(SWT.ICON_INFORMATION));
 		iconLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		Label textLabel = new Label(composite,SWT.CENTER);
 		textLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
 		textLabel.setText(TuxGuitar.getProperty("key-bindings-editor-push-a-key"));
-		
+
 		FontData[] fd = textLabel.getFont().getFontData();
 		if(fd != null && fd.length > 0){
 			final Font font = new Font(textLabel.getDisplay(),new FontData( fd[0].getName(), 14 , SWT.BOLD) );
 			textLabel.setFont(font);
 			textLabel.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent arg0) {
 					font.dispose();
 				}
 			});
 		}
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonClean = new Button(buttons, SWT.PUSH);
 		buttonClean.setText(TuxGuitar.getProperty("clean"));
 		buttonClean.setLayoutData(getButtonData());
 		buttonClean.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(MouseEvent e) {
 				composite.setFocus();
 			}
 		});
 		buttonClean.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				KeyBindingSelector.this.keyBinding = null;
 				KeyBindingSelector.this.dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseUp(MouseEvent e) {
 				composite.setFocus();
 			}
 		});
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				KeyBindingSelector.this.dialog.dispose();
 			}
 		});
-		
+
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return this.keyBinding;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected boolean isValid(KeyBinding kb){
 		if(this.editor.exists(kb)){
 			ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("key-bindings-editor-override"));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingReader.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingReader.java
index e267085f..dfea6e91 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingReader.java
@@ -23,8 +23,8 @@ public class KeyBindingReader {
 	private static final String SHORTCUT_ATTRIBUTE_ACTION = "action";
 	private static final String SHORTCUT_ATTRIBUTE_KEY = "key";
 	private static final String SHORTCUT_ATTRIBUTE_MASK = "mask";
-	
-	public static List getKeyBindings(String fileName) {
+
+	public static List<KeyBindingAction> getKeyBindings(String fileName) {
 		try{
 			File file = new File(fileName);
 			if (file.exists()){
@@ -35,8 +35,8 @@ public static List getKeyBindings(String fileName) {
 		}
 		return null;
 	}
-	
-	public static List getKeyBindings(InputStream is) {
+
+	public static List<KeyBindingAction> getKeyBindings(InputStream is) {
 		try{
 			if (is!=null){
 				return getBindings(getDocument(is).getFirstChild());
@@ -46,7 +46,7 @@ public static List getKeyBindings(InputStream is) {
 		}
 		return null;
 	}
-	
+
 	private static Document getDocument(InputStream is) {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -62,8 +62,8 @@ private static Document getDocument(InputStream is) {
 		}
 		return document;
 	}
-	
-	
+
+
 	private static Document getDocument(File file) {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -79,24 +79,24 @@ private static Document getDocument(File file) {
 		}
 		return document;
 	}
-	
+
 	/**
 	 * Read shortcuts from xml file
-	 * 
+	 *
 	 * @param shortcutsNode
 	 * @return
 	 */
-	private static List getBindings(Node shortcutsNode){
-		List list = new ArrayList();
-		
+	private static List<KeyBindingAction> getBindings(Node shortcutsNode){
+		List<KeyBindingAction> list = new ArrayList<KeyBindingAction>();
+
 		NodeList nodeList = shortcutsNode.getChildNodes();
 		for (int i = 0; i < nodeList.getLength(); i++) {
 			Node child = nodeList.item(i);
 			String nodeName = child.getNodeName();
-			
+
 			if (nodeName.equals(SHORTCUT_TAG)) {
 				NamedNodeMap params = child.getAttributes();
-				
+
 				Node nodeKey = params.getNamedItem(SHORTCUT_ATTRIBUTE_KEY);
 				Node nodeMask = params.getNamedItem(SHORTCUT_ATTRIBUTE_MASK);
 				Node nodeAction = params.getNamedItem(SHORTCUT_ATTRIBUTE_ACTION);
@@ -104,7 +104,7 @@ private static List getBindings(Node shortcutsNode){
 					String key = nodeKey.getNodeValue();
 					String mask = nodeMask.getNodeValue();
 					String action = nodeAction.getNodeValue();
-					
+
 					if (key != null && mask != null && action != null){
 						list.add(new KeyBindingAction(action, new KeyBinding(Integer.parseInt(key), Integer.parseInt(mask)) ));
 					}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingWriter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingWriter.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingWriter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingWriter.java
index dbbedb3e..1fcbf566 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingWriter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/keybindings/xml/KeyBindingWriter.java
@@ -21,14 +21,14 @@
 import org.w3c.dom.Node;
 
 public class KeyBindingWriter {
-	
+
 	private static final String SHORTCUT_ROOT = "shortcuts";
 	private static final String SHORTCUT_TAG = "shortcut";
 	private static final String SHORTCUT_ATTRIBUTE_ACTION = "action";
 	private static final String SHORTCUT_ATTRIBUTE_KEY = "key";
 	private static final String SHORTCUT_ATTRIBUTE_MASK = "mask";
-	
-	public static void setBindings(List list,String fileName) {
+
+	public static void setBindings(List<KeyBindingAction> list,String fileName) {
 		try{
 			File file = new File(fileName);
 			Document doc = createDocument();
@@ -38,7 +38,7 @@ public static void setBindings(List list,String fileName) {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public static Document createDocument() {
 		try {
 			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -50,11 +50,11 @@ public static Document createDocument() {
 		}
 		return null;
 	}
-	
+
 	public static void saveDocument(Document document,File file) {
 		try {
 			FileOutputStream fs = new FileOutputStream(file);
-			
+
 			// Write it out again
 			TransformerFactory xformFactory = TransformerFactory.newInstance();
 			Transformer idTransform = xformFactory.newTransformer();
@@ -66,36 +66,36 @@ public static void saveDocument(Document document,File file) {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * Write shortcuts to xml file
-	 * 
+	 *
 	 * @param shortcutsNode
 	 * @return
 	 */
-	private static void setBindings(List list,Document document){
+	private static void setBindings(List<KeyBindingAction> list,Document document){
 		Node shortcutsNode = document.createElement(SHORTCUT_ROOT);
-		
-		Iterator it = list.iterator();
+
+		Iterator<KeyBindingAction> it = list.iterator();
 		while(it.hasNext()){
-			KeyBindingAction keyBindingAction = (KeyBindingAction) it.next();
-			
+			KeyBindingAction keyBindingAction = it.next();
+
 			Node node = document.createElement(SHORTCUT_TAG);
 			shortcutsNode.appendChild(node);
-			
+
 			Attr attrKey = document.createAttribute(SHORTCUT_ATTRIBUTE_KEY);
 			Attr attrMask = document.createAttribute(SHORTCUT_ATTRIBUTE_MASK);
 			Attr attrAction = document.createAttribute(SHORTCUT_ATTRIBUTE_ACTION);
-			
+
 			attrKey.setNodeValue(Integer.toString(keyBindingAction.getKeyBinding().getKey()));
 			attrMask.setNodeValue(Integer.toString(keyBindingAction.getKeyBinding().getMask()));
 			attrAction.setNodeValue(keyBindingAction.getAction());
-			
+
 			node.getAttributes().setNamedItem(attrKey);
 			node.getAttributes().setNamedItem(attrMask);
 			node.getAttributes().setNamedItem(attrAction);
 		}
 		document.appendChild(shortcutsNode);
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/language/LanguageLoader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/LanguageLoader.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/language/LanguageLoader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/LanguageLoader.java
index 3e5b3f63..d700d89d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/language/LanguageLoader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/LanguageLoader.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.app.system.language;
 
 public interface LanguageLoader {
-	
+
 	public void loadProperties();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/language/LanguageManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/LanguageManager.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/language/LanguageManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/LanguageManager.java
index 6b6d1940..d483a779 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/language/LanguageManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/LanguageManager.java
@@ -1,8 +1,5 @@
 /*
  * Created on 09-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.system.language;
 
@@ -16,43 +13,43 @@
 
 /**
  * @author julian
- * 
+ *
  */
 public class LanguageManager {
-	
+
 	public static final String PACKAGE = "lang";
 	public static final String PREFIX = "messages";
 	public static final String EXTENSION = ".properties";
-	
+
 	private TGResourceBundle resources;
 	private String[] languages;
-	private List loaders;
-	
+	private List<LanguageLoader> loaders;
+
 	public LanguageManager() {
-		this.loaders = new ArrayList();
+		this.loaders = new ArrayList<LanguageLoader>();
 		this.loadLanguages();
 	}
-	
+
 	public void addLoader(LanguageLoader loader){
 		if( !this.loaders.contains( loader )){
 			this.loaders.add(loader);
 		}
 	}
-	
+
 	public void removeLoader(LanguageLoader loader){
 		if( this.loaders.contains( loader )){
 			this.loaders.remove(loader);
 		}
 	}
-	
+
 	private void fireChanges(){
-		Iterator it = this.loaders.iterator();
+		Iterator<LanguageLoader> it = this.loaders.iterator();
 		while(it.hasNext()){
-			LanguageLoader loader = (LanguageLoader)it.next();
+			LanguageLoader loader = it.next();
 			loader.loadProperties();
 		}
 	}
-	
+
 	public void setLanguage(String lang) {
 		try {
 			String baseName = (PACKAGE + "." + PREFIX);
@@ -63,7 +60,7 @@ public void setLanguage(String lang) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	private Locale getLocale(String lang){
 		if(this.isSupportedLanguage(lang)){
 			String[] locale = lang.split("_");
@@ -74,7 +71,7 @@ private Locale getLocale(String lang){
 		}
 		return Locale.getDefault();
 	}
-	
+
 	private boolean isSupportedLanguage(String lang){
 		if(lang != null && lang.length() > 0 && this.languages != null){
 			for(int i = 0 ; i < this.languages.length; i ++){
@@ -85,7 +82,7 @@ private boolean isSupportedLanguage(String lang){
 		}
 		return false;
 	}
-	
+
 	public String getProperty(String key,String value) {
 		try {
 			String property = this.resources.getString(key);
@@ -94,31 +91,31 @@ public String getProperty(String key,String value) {
 			return value;
 		}
 	}
-	
+
 	public String getProperty(String key) {
 		return this.getProperty(key,key);
 	}
-	
+
 	public String getProperty(String key, Object[] arguments) {
 		return getProperty(key,key,arguments);
 	}
-	
+
 	public String getProperty(String key,String value, Object[] arguments) {
 		String property = this.getProperty(key,value);
 		return ( arguments != null ? MessageFormat.format(property, arguments) : property );
 	}
-	
+
 	public String[] getLanguages() {
 		return this.languages;
 	}
-	
+
 	public String getLanguage() {
 		if(this.resources != null){
 			Locale locale = this.resources.getLocale();
 			boolean language = (locale.getLanguage() != null && locale.getLanguage().length() > 0);
 			boolean country = (locale.getCountry() != null && locale.getCountry().length() > 0);
 			boolean variant = (locale.getVariant() != null && locale.getVariant().length() > 0);
-			
+
 			String localeId = new String();
 			if( language ){
 				localeId += locale.getLanguage();
@@ -133,13 +130,13 @@ public String getLanguage() {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Load language files from lang folder
 	 *
 	 */
 	private void loadLanguages(){
-		List availableList = new ArrayList();
+		List<String> availableList = new ArrayList<String>();
 		String[] fileNames = TGFileUtils.getFileNames("lang");
 		if( fileNames != null ){
 			// now iterate over them
@@ -155,7 +152,7 @@ private void loadLanguages(){
 		}
 		this.languages = new String[availableList.size()];
 		for(int i = 0; i < this.languages.length; i++){
-			this.languages[i] = (String) availableList.get( i );
+			this.languages[i] = availableList.get( i );
 		}
 	}
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/language/TGResourceBundle.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/TGResourceBundle.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/language/TGResourceBundle.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/TGResourceBundle.java
index 14621ea3..533ad976 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/language/TGResourceBundle.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/language/TGResourceBundle.java
@@ -9,65 +9,65 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class TGResourceBundle {
-	
+
 	private Locale locale;
-	private Properties properties;
-	
+	private final Properties properties;
+
 	public TGResourceBundle(Locale locale, Properties properties){
 		this.locale = locale;
 		this.properties = properties;
 	}
-	
+
 	public Locale getLocale() {
 		return this.locale;
 	}
-	
+
 	public void setLocale(Locale locale) {
 		this.locale = locale;
 	}
-	
+
 	public String getString(String key) {
 		return this.properties.getProperty(key);
 	}
-	
+
 	public static TGResourceBundle getBundle(String baseName, Locale locale){
 		Properties properties = new Properties();
-		
+
 		String bundleName = baseName.replace('.','/');
 		String bundleExtension = ".properties";
-		
+
 		// load default
 		TGResourceBundle.loadResources( (bundleName + bundleExtension ), properties);
-		
+
 		// load language
 		bundleName += "_";
 		if(locale.getLanguage() != null && locale.getLanguage().length() > 0){
 			bundleName += locale.getLanguage();
 			TGResourceBundle.loadResources( (bundleName + bundleExtension ), properties);
 		}
-		
+
 		// load country
 		bundleName += "_";
 		if(locale.getCountry() != null && locale.getCountry().length() > 0){
 			bundleName += locale.getCountry();
 			TGResourceBundle.loadResources( (bundleName + bundleExtension ), properties);
 		}
-		
+
 		// load variant
 		bundleName += "_";
 		if(locale.getVariant() != null && locale.getVariant().length() > 0){
 			bundleName += locale.getVariant();
 			TGResourceBundle.loadResources( (bundleName + bundleExtension ), properties);
 		}
-		
+
 		return new TGResourceBundle(locale, properties);
 	}
-	
+
 	private static void loadResources(String name, Properties p){
 		try {
-			Enumeration enumeration = TGFileUtils.getResourceUrls(name);
+			Enumeration<URL> enumeration = TGFileUtils.getResourceUrls(name);
 			while (enumeration.hasMoreElements()) {
-				URL url = (URL) enumeration.nextElement();
+				URL url = enumeration.nextElement();
 				Properties properties = new Properties();
 				properties.load( url.openStream() );
 				p.putAll(properties);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPlugin.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPlugin.java
index d2839711..0bcf5b48 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPlugin.java
@@ -1,19 +1,19 @@
 package org.herac.tuxguitar.app.system.plugins;
 
 public interface TGPlugin {
-	
+
 	public void init() throws TGPluginException;
-	
+
 	public void close() throws TGPluginException;
-	
+
 	public void setEnabled(boolean enabled) throws TGPluginException;
-	
+
 	public String getName();
-	
+
 	public String getDescription();
-	
+
 	public String getVersion();
-	
+
 	public String getAuthor();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginConfigManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginConfigManager.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginConfigManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginConfigManager.java
index d419ed06..9f5d7ed4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginConfigManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginConfigManager.java
@@ -8,21 +8,24 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class TGPluginConfigManager extends TGConfigManager{
-	
+
 	private String name;
-	
+
 	public TGPluginConfigManager(String name){
 		this.name = name;
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Plugin Configuration";
 	}
-	
+
+	@Override
 	public String getFileName(){
 		return TGFileUtils.PATH_USER_PLUGINS_CONFIG + File.separator + this.name + ".cfg";
 	}
-	
+
+	@Override
 	public Properties getDefaults() {
 		Properties properties = new Properties();
 		try {
@@ -35,5 +38,5 @@ public Properties getDefaults() {
 		}
 		return properties;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginException.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginException.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginException.java
index edcdaa30..5b906ac8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginException.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginException.java
@@ -2,21 +2,21 @@
 
 
 public class TGPluginException extends Exception{
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public TGPluginException() {
 		super();
 	}
-	
+
 	public TGPluginException(String message, Throwable cause) {
 		super(message, cause);
 	}
-	
+
 	public TGPluginException(String message) {
 		super(message);
 	}
-	
+
 	public TGPluginException(Throwable cause) {
 		super(cause);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginManager.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginManager.java
index e17b2143..d586c02f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginManager.java
@@ -9,25 +9,25 @@
 import org.herac.tuxguitar.util.TGServiceReader;
 
 public class TGPluginManager {
-	
-	private List plugins;
-	
+
+	private final List<TGPlugin> plugins;
+
 	public TGPluginManager(){
-		this.plugins = new ArrayList();
+		this.plugins = new ArrayList<TGPlugin>();
 		this.initPlugins();
 	}
-	
-	public List getPlugins(){
+
+	public List<TGPlugin> getPlugins(){
 		return this.plugins;
 	}
-	
+
 	public void initPlugins(){
 		try{
 			//Search available providers
-			Iterator it = TGServiceReader.lookupProviders(TGPlugin.class,TGClassLoader.instance().getClassLoader());
+			Iterator<TGPlugin> it = TGServiceReader.lookupProviders(TGPlugin.class,TGClassLoader.instance().getClassLoader());
 			while(it.hasNext()){
 				try{
-					TGPlugin plugin = (TGPlugin)it.next();
+					TGPlugin plugin = it.next();
 					plugin.init();
 					this.plugins.add(plugin);
 				}catch(TGPluginException exception){
@@ -40,12 +40,12 @@ public void initPlugins(){
 			MessageDialog.errorMessage(new TGPluginException("An error ocurred when trying to init plugin",throwable));
 		}
 	}
-	
+
 	public void closePlugins(){
-		Iterator it = this.plugins.iterator();
+		Iterator<TGPlugin> it = this.plugins.iterator();
 		while(it.hasNext()){
 			try{
-				((TGPlugin)it.next()).close();
+				it.next().close();
 			}catch(TGPluginException exception){
 				MessageDialog.errorMessage(exception);
 			}catch(Throwable throwable){
@@ -53,12 +53,12 @@ public void closePlugins(){
 			}
 		}
 	}
-	
+
 	public void openPlugins(){
-		Iterator it = this.plugins.iterator();
+		Iterator<TGPlugin> it = this.plugins.iterator();
 		while(it.hasNext()){
 			try{
-				TGPlugin plugin = (TGPlugin)it.next();
+				TGPlugin plugin = it.next();
 				plugin.setEnabled(isEnabled(plugin));
 			}catch(TGPluginException exception){
 				MessageDialog.errorMessage(exception);
@@ -67,7 +67,7 @@ public void openPlugins(){
 			}
 		}
 	}
-	
+
 	public void setEnabled(TGPlugin plugin,boolean enabled){
 		try{
 			TGPluginProperties.instance().setProperty(getEnabledProperty(plugin),enabled);
@@ -79,7 +79,7 @@ public void setEnabled(TGPlugin plugin,boolean enabled){
 			MessageDialog.errorMessage(new TGPluginException("An error ocurred when trying to set plugin status",throwable));
 		}
 	}
-	
+
 	public boolean isEnabled(TGPlugin plugin){
 		try{
 			return TGPluginProperties.instance().getBooleanConfigValue(getEnabledProperty(plugin),true);
@@ -88,9 +88,9 @@ public boolean isEnabled(TGPlugin plugin){
 		}
 		return false;
 	}
-	
+
 	public String getEnabledProperty(TGPlugin plugin){
 		return (plugin.getClass().getName() + ".enabled");
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginProperties.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginProperties.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginProperties.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginProperties.java
index 2fb945bd..dc923096 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginProperties.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginProperties.java
@@ -1,8 +1,5 @@
 /*
  * Created on 09-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.system.plugins;
 
@@ -15,15 +12,13 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGPluginProperties  extends TGConfigManager{
-	
+
 	private static final String FILE_NAME = "plugin.properties";
-	
+
 	private static TGPluginProperties instance;
-	
+
 	public static TGPluginProperties instance(){
 		if(instance == null){
 			instance = new TGPluginProperties();
@@ -31,19 +26,22 @@ public static TGPluginProperties instance(){
 		}
 		return instance;
 	}
-	
+
 	private TGPluginProperties(){
 		super();
 	}
-	
+
+	@Override
 	public String getName() {
 		return "TuxGuitar Plugin Properties";
 	}
-	
+
+	@Override
 	public String getFileName(){
 		return TGFileUtils.PATH_USER_CONFIG + File.separator + FILE_NAME;
 	}
-	
+
+	@Override
 	public Properties getDefaults() {
 		Properties properties = new Properties();
 		try {
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginSetup.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginSetup.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginSetup.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginSetup.java
index 4e01de28..c82eb402 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/TGPluginSetup.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/TGPluginSetup.java
@@ -3,7 +3,7 @@
 import org.eclipse.swt.widgets.Shell;
 
 public interface TGPluginSetup {
-	
+
 	public void setupDialog(Shell parent);
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGBrowserPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGBrowserPlugin.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGBrowserPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGBrowserPlugin.java
index 8f894ed7..4068b58a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGBrowserPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGBrowserPlugin.java
@@ -7,18 +7,21 @@
 public abstract class TGBrowserPlugin extends TGPluginAdapter{
 	private boolean loaded;
 	private TGBrowserFactory factory;
-	
+
 	protected abstract TGBrowserFactory getFactory() throws TGPluginException;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.factory = getFactory();
 		this.loaded = false;
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		this.loaded = false;
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -26,14 +29,14 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			TGBrowserManager.instance().addFactory(this.factory);
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			TGBrowserManager.instance().removeFactory(this.factory);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGExporterPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGExporterPlugin.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGExporterPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGExporterPlugin.java
index 9896db20..1e977aad 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGExporterPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGExporterPlugin.java
@@ -6,20 +6,23 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public abstract class TGExporterPlugin extends TGPluginAdapter{
-	
+
 	private boolean loaded;
 	private TGRawExporter exporter;
-	
+
 	protected abstract TGRawExporter getExporter() throws TGPluginException;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.exporter = getExporter();
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		this.removePlugin();
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -27,7 +30,7 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded && this.exporter != null){
 			TGFileFormatManager.instance().addExporter(this.exporter);
@@ -35,12 +38,12 @@ protected void addPlugin() throws TGPluginException {
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded && this.exporter != null){
 			TGFileFormatManager.instance().removeExporter(this.exporter);
 			TuxGuitar.instance().getItemManager().createMenu();
 			this.loaded = false;
 		}
-	}	
+	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGImporterPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGImporterPlugin.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGImporterPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGImporterPlugin.java
index e39831b7..649da38b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGImporterPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGImporterPlugin.java
@@ -6,20 +6,23 @@
 import org.herac.tuxguitar.io.base.TGRawImporter;
 
 public abstract class TGImporterPlugin extends TGPluginAdapter{
-	
+
 	private boolean loaded;
 	private TGRawImporter importer;
-	
+
 	protected abstract TGRawImporter getImporter() throws TGPluginException;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.importer = getImporter();
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		this.removePlugin();
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -27,7 +30,7 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			TGFileFormatManager.instance().addImporter(this.importer);
@@ -35,7 +38,7 @@ protected void addPlugin() throws TGPluginException {
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			TGFileFormatManager.instance().removeImporter(this.importer);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGInputStreamPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGInputStreamPlugin.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGInputStreamPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGInputStreamPlugin.java
index 279bce19..87eda4ad 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGInputStreamPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGInputStreamPlugin.java
@@ -5,20 +5,23 @@
 import org.herac.tuxguitar.io.base.TGInputStreamBase;
 
 public abstract class TGInputStreamPlugin extends TGPluginAdapter{
-	
+
 	private boolean loaded;
 	private TGInputStreamBase stream;
-	
+
 	protected abstract TGInputStreamBase getInputStream() throws TGPluginException ;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.stream = getInputStream();
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		this.removePlugin();
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -26,14 +29,14 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			TGFileFormatManager.instance().addInputStream(this.stream);
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			TGFileFormatManager.instance().removeInputStream(this.stream);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGMidiOutputPortProviderPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGMidiOutputPortProviderPlugin.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGMidiOutputPortProviderPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGMidiOutputPortProviderPlugin.java
index 4dfec746..adb955e7 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGMidiOutputPortProviderPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGMidiOutputPortProviderPlugin.java
@@ -7,14 +7,16 @@
 public abstract class TGMidiOutputPortProviderPlugin extends TGPluginAdapter{
 	private boolean loaded;
 	private MidiOutputPortProvider provider;
-	
+
 	protected abstract MidiOutputPortProvider getProvider() throws TGPluginException;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.provider = getProvider();
 		this.loaded = false;
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		try {
 			this.provider.closeAll();
@@ -22,7 +24,8 @@ public void close() throws TGPluginException {
 			throw new TGPluginException(throwable.getMessage(),throwable);
 		}
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -30,7 +33,7 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			try {
@@ -41,7 +44,7 @@ protected void addPlugin() throws TGPluginException {
 			}
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			try {
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGMidiSequencerProviderPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGMidiSequencerProviderPlugin.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGMidiSequencerProviderPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGMidiSequencerProviderPlugin.java
index 9f52195e..15612592 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGMidiSequencerProviderPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGMidiSequencerProviderPlugin.java
@@ -7,14 +7,16 @@
 public abstract class TGMidiSequencerProviderPlugin extends TGPluginAdapter{
 	private boolean loaded;
 	private MidiSequencerProvider provider;
-	
+
 	protected abstract MidiSequencerProvider getProvider() throws TGPluginException;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.provider = getProvider();
 		this.loaded = false;
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		try {
 			this.provider.closeAll();
@@ -22,7 +24,8 @@ public void close() throws TGPluginException {
 			throw new TGPluginException(throwable.getMessage(),throwable);
 		}
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -30,7 +33,7 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			try {
@@ -41,7 +44,7 @@ protected void addPlugin() throws TGPluginException {
 			}
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			try {
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGOutputStreamPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGOutputStreamPlugin.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGOutputStreamPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGOutputStreamPlugin.java
index 3fbe1ced..9e7ef338 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGOutputStreamPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGOutputStreamPlugin.java
@@ -5,20 +5,23 @@
 import org.herac.tuxguitar.io.base.TGOutputStreamBase;
 
 public abstract class TGOutputStreamPlugin extends TGPluginAdapter{
-	
+
 	private boolean loaded;
 	private TGOutputStreamBase stream;
-	
+
 	protected abstract TGOutputStreamBase getOutputStream() throws TGPluginException ;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		this.stream = getOutputStream();
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		this.removePlugin();
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -26,14 +29,14 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			TGFileFormatManager.instance().addOutputStream(this.stream);
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			TGFileFormatManager.instance().removeOutputStream(this.stream);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGPluginAdapter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGPluginAdapter.java
similarity index 89%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGPluginAdapter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGPluginAdapter.java
index 82841a0d..0c6bacd4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGPluginAdapter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGPluginAdapter.java
@@ -3,19 +3,23 @@
 import org.herac.tuxguitar.app.system.plugins.TGPlugin;
 
 public abstract class TGPluginAdapter implements TGPlugin{
-	
+
+	@Override
 	public String getName() {
 		return "Untitled Plugin";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Unavailable";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Unavailable";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "Unavailable";
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGPluginList.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGPluginList.java
new file mode 100644
index 00000000..58d4518d
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGPluginList.java
@@ -0,0 +1,52 @@
+package org.herac.tuxguitar.app.system.plugins.base;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
+import org.herac.tuxguitar.app.system.plugins.TGPluginException;
+
+public abstract class TGPluginList extends TGPluginAdapter{
+
+	private List<TGPlugin> plugins;
+
+	public TGPluginList(){
+		super();
+	}
+
+	@Override
+	public void init() throws TGPluginException {
+		Iterator<TGPlugin> it = getIterator();
+		while(it.hasNext()){
+			TGPlugin plugin = it.next();
+			plugin.init();
+		}
+	}
+
+	@Override
+	public void close() throws TGPluginException {
+		Iterator<TGPlugin> it = getIterator();
+		while(it.hasNext()){
+			TGPlugin plugin = it.next();
+			plugin.close();
+		}
+	}
+
+	@Override
+	public void setEnabled(boolean enabled) throws TGPluginException {
+		Iterator<TGPlugin> it = getIterator();
+		while(it.hasNext()){
+			TGPlugin plugin = it.next();
+			plugin.setEnabled( enabled);
+		}
+	}
+
+	private Iterator<TGPlugin> getIterator() throws TGPluginException {
+		if(this.plugins == null){
+			this.plugins = getPlugins();
+		}
+		return this.plugins.iterator();
+	}
+
+	protected abstract List<TGPlugin> getPlugins() throws TGPluginException ;
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGToolItemPlugin.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGToolItemPlugin.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGToolItemPlugin.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGToolItemPlugin.java
index 6e22a7f5..250c5f8a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGToolItemPlugin.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/plugins/base/TGToolItemPlugin.java
@@ -8,25 +8,28 @@
 import org.herac.tuxguitar.app.tools.custom.TGCustomToolManager;
 
 public abstract class TGToolItemPlugin extends TGPluginAdapter{
-	
+
 	private boolean loaded;
 	private TGCustomTool tool;
 	private TGCustomToolAction toolAction;
-	
+
 	protected abstract void doAction();
-	
+
 	protected abstract String getItemName() throws TGPluginException ;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		String name = getItemName();
 		this.tool = new TGCustomTool(name,name);
 		this.toolAction = new TGCustomToolAction(this.tool.getName());
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		this.removePlugin();
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		if(enabled){
 			addPlugin();
@@ -34,7 +37,7 @@ public void setEnabled(boolean enabled) throws TGPluginException {
 			removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin() throws TGPluginException {
 		if(!this.loaded){
 			TuxGuitar.instance().getActionManager().addAction(this.toolAction);
@@ -43,7 +46,7 @@ protected void addPlugin() throws TGPluginException {
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin() throws TGPluginException {
 		if(this.loaded){
 			TGCustomToolManager.instance().removeCustomTool(this.tool);
@@ -52,13 +55,14 @@ protected void removePlugin() throws TGPluginException {
 			this.loaded = false;
 		}
 	}
-	
+
 	protected class TGCustomToolAction extends Action{
-		
+
 		public TGCustomToolAction(String name) {
 			super(name, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
 		}
-		
+
+		@Override
 		protected int execute(ActionData actionData) {
 			doAction();
 			return 0;
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplate.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplate.java
new file mode 100644
index 00000000..0e4ec7c8
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplate.java
@@ -0,0 +1,44 @@
+package org.herac.tuxguitar.app.system.tuning;
+
+import org.herac.tuxguitar.song.models.TGString;
+
+public class TuningTemplate {
+
+	/**
+	 * Name of the instrument
+	 */
+	private final String instrument;
+
+	/**
+	 * Name of the tuning
+	 */
+	private final String name;
+
+	/**
+	 * Strings of the tuning
+	 */
+	private final TGString strings[];
+
+	public TuningTemplate(String instrument, String name, TGString strings[]) {
+		this.instrument = instrument;
+		this.name = name;
+		this.strings = strings;
+	}
+
+	public String getInstrument() {
+		return instrument;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public TGString[] getStrings() {
+		return strings;
+	}
+
+	public int getStringCount() {
+		return strings.length;
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplateManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplateManager.java
new file mode 100644
index 00000000..1ac86e91
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplateManager.java
@@ -0,0 +1,50 @@
+package org.herac.tuxguitar.app.system.tuning;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.herac.tuxguitar.app.util.TGFileUtils;
+
+public class TuningTemplateManager {
+
+	private static final String DEFAULT_SHORTCUT_FILE = "tunings-default.xml";
+
+	private final List<TuningTemplate> templates;
+
+	public TuningTemplateManager() {
+		InputStream stream = TGFileUtils.getResourceAsStream(DEFAULT_SHORTCUT_FILE);
+		templates = new ArrayList<TuningTemplate>();
+		if (stream != null) {
+			templates.addAll(TuningTemplateReader.getTuningTemplates(stream));
+		}
+
+	}
+
+	public List<String> getAvailableInstruments() {
+		Set<String> instruments = new HashSet<String>();
+		for (TuningTemplate tuning: templates) {
+			instruments.add(tuning.getInstrument());
+		}
+		return new ArrayList<String>(instruments);
+	}
+
+	public List<Integer> getAvailableNumberOfStringsFromInstrument(String instrument) {
+		Set<Integer> strings = new HashSet<Integer>();
+		for (TuningTemplate tuning: templates) {
+			if (!tuning.getInstrument().equals(instrument)) {
+				continue;
+			}
+			strings.add(tuning.getStrings().length);
+		}
+		return new ArrayList<Integer>(strings);
+	}
+
+	public Iterator<TuningTemplate> getTuningTemplates() {
+		return templates.iterator();
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplateReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplateReader.java
new file mode 100644
index 00000000..5c8145d3
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/system/tuning/TuningTemplateReader.java
@@ -0,0 +1,127 @@
+package org.herac.tuxguitar.app.system.tuning;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.herac.tuxguitar.app.util.TGMusicKeyUtils;
+import org.herac.tuxguitar.song.models.TGString;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
+public class TuningTemplateReader {
+	private static final String TUNING_TAG = "tuning";
+	private static final String TUNING_ATTRIBUTE_NAME = "name";
+	private static final String TUNING_ATTRIBUTE_INSTRUMENT = "instrument";
+	private static final String TUNING_ATTRIBUTE_STRINGS = "strings";
+
+	public static List<TuningTemplate> getTuningTemplates(String fileName) {
+		try{
+			File file = new File(fileName);
+			if (file.exists()){
+				return getTunings(getDocument(new FileInputStream(file)).getFirstChild());
+			}
+		}catch(Throwable throwable){
+			throwable.printStackTrace();
+		}
+		return null;
+	}
+
+	public static List<TuningTemplate> getTuningTemplates(InputStream is) {
+		try{
+			if (is!=null){
+				return getTunings(getDocument(is).getFirstChild());
+			}
+		}catch(Throwable throwable){
+			throwable.printStackTrace();
+		}
+		return null;
+	}
+
+	private static Document getDocument(InputStream is) {
+		Document document = null;
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		try {
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			document = builder.parse(is);
+			document.normalize();
+		} catch (SAXException sxe) {
+			sxe.printStackTrace();
+		} catch (ParserConfigurationException pce) {
+			pce.printStackTrace();
+		} catch (IOException ioe) {
+			ioe.printStackTrace();
+		}
+		return document;
+	}
+
+	/**
+	 * Read tuning templates from XML file
+	 *
+	 * @param shortcutsNode
+	 * @return
+	 */
+	private static List<TuningTemplate> getTunings(Node tuningNode){
+		List<TuningTemplate> list = new ArrayList<TuningTemplate>();
+
+		NodeList nodeList = tuningNode.getChildNodes();
+		for (int i = 0; i < nodeList.getLength(); i++) {
+			Node child = nodeList.item(i);
+
+			if (child.getNodeName().equals(TUNING_TAG)) {
+				NamedNodeMap params = child.getAttributes();
+
+				try {
+					Node nodeInstrument = params.getNamedItem(TUNING_ATTRIBUTE_INSTRUMENT);
+					Node nodeName = params.getNamedItem(TUNING_ATTRIBUTE_NAME);
+					Node nodeStrings = params.getNamedItem(TUNING_ATTRIBUTE_STRINGS);
+					if( nodeInstrument == null ) {
+						throw new IllegalArgumentException("Atribute '" + TUNING_ATTRIBUTE_INSTRUMENT + "' expected");
+					}
+					if( nodeName == null ) {
+						throw new IllegalArgumentException("Atribute '" + TUNING_ATTRIBUTE_NAME + "' expected");
+					}
+					if( nodeStrings == null ) {
+						throw new IllegalArgumentException("Atribute '" + TUNING_ATTRIBUTE_STRINGS + "' expected");
+					}
+
+					String instrument = nodeInstrument.getNodeValue();
+					String name = nodeName.getNodeValue();
+					String stringsSyntax = nodeStrings.getNodeValue();
+
+					TGString[] strings = parseStrings(stringsSyntax);
+					if (strings != null) {
+						list.add(new TuningTemplate(instrument, name, strings));
+					}
+				} catch (IllegalArgumentException e) {
+					System.err.println("Invalid tuning template in XML file, element skiped");
+					e.printStackTrace();
+				}
+			}
+		}
+		return list;
+	}
+
+	private static TGString[] parseStrings(String rawInput) {
+		String rawStrings[] = rawInput.split("[ \t]+");
+		TGString[] strings = new TGString[rawStrings.length];
+		for (int i = 0; i < rawStrings.length; i++) {
+			int value = TGMusicKeyUtils.getTgValueFromName(rawStrings[i]);
+			TGString string = new TGString();
+			string.setNumber(i);
+			string.setValue(value);
+			strings[i] = string;
+		}
+		return strings;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserCollection.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserCollection.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserCollection.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserCollection.java
index 05013e06..d18b84e2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserCollection.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserCollection.java
@@ -3,28 +3,28 @@
 import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
 
 public class TGBrowserCollection {
-	
+
 	private String type;
 	private TGBrowserData data;
-	
+
 	public TGBrowserCollection(){
 		super();
 	}
-	
+
 	public TGBrowserData getData() {
 		return this.data;
 	}
-	
+
 	public void setData(TGBrowserData data) {
 		this.data = data;
 	}
-	
+
 	public String getType() {
 		return this.type;
 	}
-	
+
 	public void setType(String type) {
 		this.type = type;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserCollectionInfo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserCollectionInfo.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserCollectionInfo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserCollectionInfo.java
index ffcb07af..d0cccb81 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserCollectionInfo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserCollectionInfo.java
@@ -1,28 +1,28 @@
 package org.herac.tuxguitar.app.tools.browser;
 
 public class TGBrowserCollectionInfo {
-	
+
 	private String type;
 	private String data;
-	
+
 	public TGBrowserCollectionInfo(){
 		super();
 	}
-	
+
 	public String getData() {
 		return this.data;
 	}
-	
+
 	public void setData(String data) {
 		this.data = data;
 	}
-	
+
 	public String getType() {
 		return this.type;
 	}
-	
+
 	public void setType(String type) {
 		this.type = type;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserConnection.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserConnection.java
new file mode 100644
index 00000000..32d3e1b5
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserConnection.java
@@ -0,0 +1,232 @@
+package org.herac.tuxguitar.app.tools.browser;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserConnection {
+
+	private boolean locked;
+	private TGBrowser browser;
+	private final TGBrowserConnectionHandler handler;
+
+	public TGBrowserConnection(TGBrowserConnectionHandler handler){
+		this.handler = handler;
+	}
+
+	protected void lock(){
+		this.locked = true;
+		this.handler.notifyLockStatusChanged();
+	}
+
+	protected void unlock(){
+		this.locked = false;
+		this.handler.notifyLockStatusChanged();
+	}
+
+	public boolean isLocked(){
+		return this.locked;
+	}
+
+	public TGBrowser getBrowser(){
+		return this.browser;
+	}
+
+	public boolean isOpen(){
+		return (getBrowser() != null);
+	}
+
+	public void open(final int callId,final TGBrowser browser){
+		if(!isLocked()){
+			this.close(callId);
+			this.lock();
+			this.browser = browser;
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(getBrowser() != null){
+							getBrowser().open();
+							notifyOpened(callId);
+						}else{
+							notifyClosed(callId);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void close(final int callId){
+		if(!isLocked()){
+			this.lock();
+			final TGBrowser browser = getBrowser();
+			this.browser = null;
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(browser != null){
+							browser.close();
+							notifyClosed(callId);
+						}else{
+							notifyClosed(callId);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void cdRoot(final int callId){
+		if(!isLocked()){
+			this.lock();
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(isOpen()){
+							getBrowser().cdRoot();
+							notifyCd(callId);
+						}else{
+							notifyClosed(callId);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void cdUp(final int callId){
+		if(!isLocked()){
+			this.lock();
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(isOpen()){
+							getBrowser().cdUp();
+							notifyCd(callId);
+						}else{
+							notifyClosed(callId);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void cd(final int callId,final TGBrowserElement element){
+		if(!isLocked()){
+			this.lock();
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(isOpen()){
+							getBrowser().cdElement(element);
+							notifyCd(callId);
+						}else{
+							notifyClosed(callId);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void listElements(final int callId){
+		if(!isLocked()){
+			this.lock();
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(isOpen()){
+							List<TGBrowserElement> elements = getBrowser().listElements();
+							notifyElements(callId,elements);
+						}else{
+							notifyClosed(callId);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void openStream(final int callId,final TGBrowserElement element){
+		if(!isLocked()){
+			this.lock();
+			new Thread(new Runnable() {
+				@Override
+				public void run() {
+					try {
+						if(element == null){
+							release();
+							return;
+						}
+						if(element.isFolder()){
+							release();
+							cd(callId,element);
+						}
+						else{
+							InputStream stream = element.getInputStream();
+							notifyStream(callId,stream,element);
+						}
+					} catch (TGBrowserException e) {
+						notifyError(callId,e);
+						e.printStackTrace();
+					}
+				}
+			}).start();
+		}
+	}
+
+	public void release(){
+		this.unlock();
+	}
+
+	public void notifyCd(final int callId) {
+		this.handler.notifyCd(callId);
+	}
+
+	public void notifyClosed(final int callId) {
+		this.handler.notifyClosed(callId);
+	}
+
+	public void notifyElements(final int callId,List<TGBrowserElement> elements) {
+		this.handler.notifyElements(callId,elements);
+	}
+
+	public void notifyError(final int callId,Throwable throwable) {
+		this.handler.notifyError(callId,throwable);
+	}
+
+	public void notifyOpened(final int callId) {
+		this.handler.notifyOpened(callId);
+	}
+
+	public void notifyStream(final int callId,InputStream stream, TGBrowserElement element) {
+		this.handler.notifyStream(callId,stream,element);
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserConnectionHandler.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserConnectionHandler.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserConnectionHandler.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserConnectionHandler.java
index fe68f7d2..785473ae 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserConnectionHandler.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserConnectionHandler.java
@@ -6,18 +6,18 @@
 import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
 
 public interface TGBrowserConnectionHandler {
-	
+
 	public void notifyLockStatusChanged();
-	
+
 	public void notifyOpened(int callId);
-	
+
 	public void notifyClosed(int callId);
-	
+
 	public void notifyCd(int callId);
-	
-	public void notifyElements(int callId,List elements);
-	
+
+	public void notifyElements(int callId,List<TGBrowserElement> elements);
+
 	public void notifyStream(int callId,InputStream stream,TGBrowserElement element);
-	
+
 	public void notifyError(int callId,Throwable throwable);
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserException.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserException.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserException.java
index 5e42c50f..13fbe6e5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserException.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserException.java
@@ -1,23 +1,23 @@
 package org.herac.tuxguitar.app.tools.browser;
 
 public class TGBrowserException extends Exception{
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public TGBrowserException() {
 		super();
 	}
-	
+
 	public TGBrowserException(String message, Throwable cause) {
 		super(message, cause);
 	}
-	
+
 	public TGBrowserException(String message) {
 		super(message);
 	}
-	
+
 	public TGBrowserException(Throwable cause) {
 		super(cause);
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserFactoryHandler.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserFactoryHandler.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserFactoryHandler.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserFactoryHandler.java
index cef93872..744b0018 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserFactoryHandler.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserFactoryHandler.java
@@ -1,9 +1,9 @@
 package org.herac.tuxguitar.app.tools.browser;
 
 public interface TGBrowserFactoryHandler {
-	
+
 	public void notifyAdded();
-	
+
 	public void notifyRemoved();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserManager.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserManager.java
index 9bcaaaf7..c35c5a39 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/TGBrowserManager.java
@@ -13,56 +13,56 @@
 import org.herac.tuxguitar.app.util.TGFileUtils;
 
 public class TGBrowserManager {
-	
+
 	private static TGBrowserManager instance;
-	
-	private List factories;
-	private List collections;
-	private List collectionInfos;
+
+	private List<TGBrowserFactory> factories;
+	private List<TGBrowserCollection> collections;
+	private List<TGBrowserCollectionInfo> collectionInfos;
 	private boolean changes;
-	
+
 	private TGBrowserFactoryHandler handler;
-	
+
 	private TGBrowserManager(){
-		this.factories = new ArrayList();
-		this.collections = new ArrayList();
-		this.collectionInfos = new ArrayList();
+		this.factories = new ArrayList<TGBrowserFactory>();
+		this.collections = new ArrayList<TGBrowserCollection>();
+		this.collectionInfos = new ArrayList<TGBrowserCollectionInfo>();
 		this.readCollections();
 		this.addDefaultFactory();
 	}
-	
+
 	public static TGBrowserManager instance(){
 		if(instance == null){
 			instance = new TGBrowserManager();
 		}
 		return instance;
 	}
-	
+
 	public void setFactoryHandler(TGBrowserFactoryHandler handler){
 		this.handler = handler;
 	}
-	
-	public Iterator getFactories(){
+
+	public Iterator<TGBrowserFactory> getFactories(){
 		return this.factories.iterator();
 	}
-	
+
 	public TGBrowserFactory getFactory(String type){
-		Iterator factories = getFactories();
+		Iterator<TGBrowserFactory> factories = getFactories();
 		while(factories.hasNext()){
-			TGBrowserFactory factory = (TGBrowserFactory)factories.next();
+			TGBrowserFactory factory = factories.next();
 			if(factory.getType().equals(type)){
 				return factory;
 			}
 		}
 		return null;
 	}
-	
+
 	public void addFactory(TGBrowserFactory factory){
 		this.factories.add(factory);
-		
-		Iterator it = this.collectionInfos.iterator();
+
+		Iterator<TGBrowserCollectionInfo> it = this.collectionInfos.iterator();
 		while(it.hasNext()){
-			TGBrowserCollectionInfo info = (TGBrowserCollectionInfo)it.next();
+			TGBrowserCollectionInfo info = it.next();
 			if(info.getType().equals(factory.getType())){
 				TGBrowserCollection collection = new TGBrowserCollection();
 				collection.setType(factory.getType());
@@ -70,18 +70,18 @@ public void addFactory(TGBrowserFactory factory){
 				addCollection(collection);
 			}
 		}
-		
+
 		if(this.handler != null){
 			this.handler.notifyAdded();
 		}
 	}
-	
+
 	public void removeFactory(TGBrowserFactory factory){
 		this.factories.remove(factory);
-		
+
 		int index = 0;
 		while(index < this.collections.size()){
-			TGBrowserCollection collection = (TGBrowserCollection)this.collections.get(index);
+			TGBrowserCollection collection = this.collections.get(index);
 			if(collection.getType().equals(factory.getType())){
 				removeCollection(collection);
 				continue;
@@ -92,24 +92,24 @@ public void removeFactory(TGBrowserFactory factory){
 			this.handler.notifyRemoved();
 		}
 	}
-	
+
 	public void addInfo(TGBrowserCollectionInfo info){
 		this.collectionInfos.add(info);
 	}
-	
-	public Iterator getCollections(){
+
+	public Iterator<TGBrowserCollection> getCollections(){
 		return this.collections.iterator();
 	}
-	
+
 	public int countCollections(){
 		return this.collections.size();
 	}
-	
+
 	public void removeCollection(TGBrowserCollection collection){
 		this.collections.remove(collection);
 		this.changes = true;
 	}
-	
+
 	public TGBrowserCollection addCollection(TGBrowserCollection collection){
 		if(collection.getData() != null ){
 			TGBrowserCollection existent = getCollection(collection.getType(), collection.getData());
@@ -121,41 +121,41 @@ public TGBrowserCollection addCollection(TGBrowserCollection collection){
 		}
 		return collection;
 	}
-	
+
 	public TGBrowserCollection getCollection(String type, TGBrowserData data ){
-		Iterator it = this.getCollections();
+		Iterator<TGBrowserCollection> it = this.getCollections();
 		while( it.hasNext() ){
-			TGBrowserCollection collection = ( TGBrowserCollection ) it.next();
+			TGBrowserCollection collection = it.next();
 			if( collection.getType().equals(type) && collection.getData().equals(data) ){
 				return collection;
 			}
 		}
 		return null;
 	}
-	
+
 	public TGBrowserCollection getCollection(int index){
 		if(index >= 0 && index < countCollections()){
-			return (TGBrowserCollection)this.collections.get(index);
+			return this.collections.get(index);
 		}
 		return null;
 	}
-	
+
 	public void readCollections(){
 		new TGBrowserReader().loadCollections(this,new File(getCollectionsFileName()));
 		this.changes = false;
 	}
-	
+
 	public void writeCollections(){
 		if(this.changes){
 			new TGBrowserWriter().saveCollections(this,getCollectionsFileName());
 		}
 		this.changes = false;
 	}
-	
+
 	private String getCollectionsFileName(){
 		return TGFileUtils.PATH_USER_CONFIG + File.separator + "browser-collections.xml";
 	}
-	
+
 	private void addDefaultFactory(){
 		this.addFactory(new TGBrowserFactoryImpl());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowser.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowser.java
similarity index 85%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowser.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowser.java
index 37667a7b..158dd6ef 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowser.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowser.java
@@ -5,21 +5,21 @@
 import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
 
 public abstract class TGBrowser {
-	
+
 	public TGBrowser(){
 		super();
 	}
-	
+
 	public abstract void open() throws TGBrowserException;
-	
+
 	public abstract void close()throws TGBrowserException;
-	
+
 	public abstract void cdRoot()throws TGBrowserException;
-	
+
 	public abstract void cdUp()throws TGBrowserException;
-	
+
 	public abstract void cdElement(TGBrowserElement element)throws TGBrowserException;
-	
-	public abstract List listElements()throws TGBrowserException;
-	
+
+	public abstract List<TGBrowserElement> listElements()throws TGBrowserException;
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserData.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserData.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserData.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserData.java
index 3dcccd90..9746c460 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserData.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserData.java
@@ -1,9 +1,10 @@
 package org.herac.tuxguitar.app.tools.browser.base;
 
 public interface TGBrowserData {
-	
+
 	public String getTitle();
-	
+
+	@Override
 	public String toString();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserElement.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserElement.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserElement.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserElement.java
index b182d129..13e938e8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserElement.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserElement.java
@@ -5,19 +5,19 @@
 import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
 
 public abstract class TGBrowserElement {
-	
+
 	private String name;
-	
+
 	public TGBrowserElement(String name){
 		this.name = name;
 	}
-	
+
 	public String getName(){
 		return this.name;
 	}
-	
+
 	public abstract boolean isFolder();
-	
+
 	public abstract InputStream getInputStream() throws TGBrowserException;
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserFactory.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserFactory.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserFactory.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserFactory.java
index ecd79fa1..0e9ca8f8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/base/TGBrowserFactory.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/base/TGBrowserFactory.java
@@ -3,14 +3,14 @@
 import org.eclipse.swt.widgets.Shell;
 
 public interface TGBrowserFactory {
-	
+
 	public String getName();
-	
+
 	public String getType();
-	
+
 	public TGBrowserData parseData(String string);
-	
+
 	public TGBrowserData dataDialog(Shell parent);
-	
+
 	public TGBrowser newTGBrowser(TGBrowserData data);
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserBar.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserBar.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserBar.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserBar.java
index e019e7d3..1bf8d3ee 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserBar.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserBar.java
@@ -9,21 +9,21 @@
 
 public abstract class TGBrowserBar implements LanguageLoader{
 	private TGBrowserDialog browser;
-	
+
 	public TGBrowserBar(TGBrowserDialog browser){
 		this.browser = browser;
 	}
-	
+
 	public abstract void init(Shell shell);
-	
+
 	public abstract void updateItems();
-	
+
 	public abstract void updateCollections(TGBrowserCollection selection);
-	
+
 	protected TGBrowserDialog getBrowser(){
 		return this.browser;
 	}
-	
+
 	protected void newCollection(String type){
 		TGBrowserFactory factory = TGBrowserManager.instance().getFactory(type);
 		if(factory != null){
@@ -33,11 +33,11 @@ protected void newCollection(String type){
 			}
 		}
 	}
-	
+
 	protected TGBrowserCollection addCollection(TGBrowserFactory factory,String data){
 		return this.addCollection(factory,factory.parseData(data),false);
 	}
-	
+
 	protected TGBrowserCollection addCollection(TGBrowserFactory factory,TGBrowserData data,boolean reload){
 		TGBrowserCollection collection = new TGBrowserCollection();
 		collection.setType(factory.getType());
@@ -48,18 +48,18 @@ protected TGBrowserCollection addCollection(TGBrowserFactory factory,TGBrowserDa
 		}
 		return collection;
 	}
-	
+
 	protected void openCollection(TGBrowserCollection collection){
 		getBrowser().setCollection(collection);
 		getBrowser().openCollection();
 	}
-	
+
 	protected void removeCollection(TGBrowserCollection collection){
 		getBrowser().removeCollection(collection);
 	}
-	
+
 	protected void closeCollection(){
 		getBrowser().closeCollection();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserCollectionCombo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserCollectionCombo.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserCollectionCombo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserCollectionCombo.java
index 83e3952b..734d0b1f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserCollectionCombo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserCollectionCombo.java
@@ -10,56 +10,56 @@
 import org.herac.tuxguitar.app.tools.browser.TGBrowserCollection;
 
 public class TGBrowserCollectionCombo {
-	
+
 	private Combo combo;
-	private List collections;
-	
+	private List<TGBrowserCollection> collections;
+
 	public TGBrowserCollectionCombo(Composite parent, int style){
 		this.combo = new Combo(parent,style);
-		this.collections = new ArrayList();
+		this.collections = new ArrayList<TGBrowserCollection>();
 		this.addFirstElement();
 	}
-	
+
 	private void addFirstElement(){
 		this.combo.add(TuxGuitar.getProperty("browser.collection.select"));
 		this.combo.select(0);
 	}
-	
+
 	public void add(TGBrowserCollection collection) {
 		this.combo.add(collection.getData().getTitle());
 		this.collections.add(collection);
 	}
-	
+
 	public TGBrowserCollection getSelection(){
 		int index = ( this.combo.getSelectionIndex() - 1);
 		if(index >= 0 && index < this.collections.size()){
-			return ( (TGBrowserCollection)this.collections.get(index) );
+			return this.collections.get(index);
 		}
 		return null;
 	}
-	
+
 	public void addSelectionListener(SelectionListener listener) {
 		this.combo.addSelectionListener(listener);
 	}
-	
+
 	public void setLayoutData(Object layoutData) {
 		this.combo.setLayoutData(layoutData);
 	}
-	
+
 	public void removeAll() {
 		this.combo.removeAll();
 		this.collections.clear();
 		this.addFirstElement();
 	}
-	
+
 	public void select(int index) {
 		this.combo.select( ( index + 1 ) );
 	}
-	
+
 	public void setEnabled(boolean enabled){
 		this.combo.setEnabled(enabled);
 	}
-	
+
 	public boolean isEmpty(){
 		return this.collections.isEmpty();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserDialog.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserDialog.java
index f4fcccf4..41430b55 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserDialog.java
@@ -38,60 +38,60 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class TGBrowserDialog implements TGBrowserFactoryHandler,TGBrowserConnectionHandler,IconLoader,LanguageLoader{
-	
+
 	private static final int SHELL_WIDTH = 500;
 	private static final int SHELL_HEIGHT = 350;
-	
+
 	public static final int CALL_OPEN = 1;
 	public static final int CALL_CLOSE = 2;
 	public static final int CALL_CD_ROOT = 3;
 	public static final int CALL_CD_UP = 4;
 	public static final int CALL_LIST = 5;
 	public static final int CALL_ELEMENT = 6;
-	
+
 	private TGBrowserCollection collection;
-	private TGBrowserConnection connection;
+	private final TGBrowserConnection connection;
 	private Shell dialog;
 	protected Table table;
 	protected TableColumn column;
-	protected List elements;
+	protected List<TGBrowserElement> elements;
 	protected TGBrowserMenuBar menu;
 	protected TGBrowserToolBar toolBar;
-	
+
 	public TGBrowserDialog(){
 		this.connection = new TGBrowserConnection(this);
 		this.menu = new TGBrowserMenuBar(this);
 		this.toolBar = new TGBrowserToolBar(this);
 	}
-	
+
 	public TGBrowserConnection getConnection(){
 		return this.connection;
 	}
-	
+
 	public TGBrowserCollection getCollection() {
 		return this.collection;
 	}
-	
+
 	public void setCollection(TGBrowserCollection collection) {
 		this.collection = collection;
 	}
-	
+
 	public Shell getShell(){
 		return this.dialog;
 	}
-	
+
 	public void exit(){
 		this.getConnection().release();
 		this.getConnection().close(CALL_CLOSE);
 		TGBrowserManager.instance().writeCollections();
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 	}
-	
+
 	public void show(){
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(),SWT.DIALOG_TRIM | SWT.RESIZE);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
-		
+
 		this.menu.init(getShell());
 		this.toolBar.init(getShell());
 		this.initTable(this.dialog);
@@ -99,55 +99,58 @@ public void show(){
 		this.updateTable();
 		this.dialog.setSize(SHELL_WIDTH,SHELL_HEIGHT);
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				exit();
 			}
 		});
-		
+
 		this.loadProperties();
 		this.updateBars();
-		
+
 		TGBrowserManager.instance().setFactoryHandler(this);
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER);
 	}
-	
+
 	private void initTable(Composite parent){
 		this.table = new Table(parent, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION);
 		this.table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.table.setLinesVisible(TuxGuitar.instance().getConfig().getBooleanConfigValue(TGConfigKeys.BROWSER_LINES_VISIBLE));
 		this.table.setHeaderVisible(false);
-		
+
 		this.column = new TableColumn(this.table, SWT.LEFT);
-		
+
 		this.table.addListener (SWT.MouseDoubleClick, new Listener() {
+			@Override
 			public void handleEvent (Event event) {
 				openElement();
 			}
 		});
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			this.dialog.dispose();
 		}
 	}
-	
+
 	private void updateTable(){
 		if(!isDisposed()){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					if(!isDisposed()){
 						TGBrowserDialog.this.table.removeAll();
 						if(TGBrowserDialog.this.elements != null){
-							Iterator it = TGBrowserDialog.this.elements.iterator();
+							Iterator<TGBrowserElement> it = TGBrowserDialog.this.elements.iterator();
 							while(it.hasNext()){
-								TGBrowserElement element = (TGBrowserElement)it.next();
+								TGBrowserElement element = it.next();
 								TableItem item = new TableItem(TGBrowserDialog.this.table, SWT.NONE);
 								item.setImage(element.isFolder()?TuxGuitar.instance().getIconManager().getBrowserFolder():TuxGuitar.instance().getIconManager().getBrowserFile());
 								item.setText(element.getName());
@@ -159,23 +162,24 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 	protected void updateColumn(){
 		if(!isDisposed()){
 			this.column.pack();
 		}
 	}
-	
+
 	public void updateBars(){
 		if(!isDisposed()){
 			this.menu.updateItems();
 			this.toolBar.updateItems();
 		}
 	}
-	
+
 	public void updateCollections(final TGBrowserCollection selection){
 		if(!isDisposed()){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					if(!isDisposed()){
 						TGBrowserDialog.this.menu.updateCollections(selection);
@@ -185,37 +189,37 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 	public TGBrowserElement getSelection(int index){
 		if(!isDisposed() && getConnection().isOpen()){
 			if(this.elements != null && index >= 0 && index < this.elements.size()){
-				return (TGBrowserElement)this.elements.get(index);
+				return this.elements.get(index);
 			}
 		}
 		return null;
 	}
-	
+
 	protected void removeElements(){
 		this.elements = null;
 	}
-	
-	protected void addElements(List elements){
+
+	protected void addElements(List<TGBrowserElement> elements){
 		this.elements = elements;
 	}
-	
+
 	protected void openCollection(){
 		if(!isDisposed() && getCollection() != null){
 			TGBrowserFactory factory = TGBrowserManager.instance().getFactory(getCollection().getType());
 			getConnection().open(CALL_OPEN,factory.newTGBrowser(getCollection().getData()));
 		}
 	}
-	
+
 	protected void closeCollection(){
 		if(!isDisposed() && getCollection() != null){
 			this.getConnection().close(CALL_CLOSE);
 		}
 	}
-	
+
 	protected void removeCollection(TGBrowserCollection collection){
 		if(collection != null){
 			TGBrowserManager.instance().removeCollection(collection);
@@ -226,16 +230,18 @@ protected void removeCollection(TGBrowserCollection collection){
 			}
 		}
 	}
-	
+
 	public void openElement(){
 		TGBrowserElement element = getSelection(this.table.getSelectionIndex());
 		if(element != null){
 			this.getConnection().openStream(CALL_ELEMENT,element);
 		}
 	}
-	
+
+	@Override
 	public void notifyLockStatusChanged(){
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				if(!isDisposed()){
 					updateBars();
@@ -244,7 +250,8 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void notifyOpened(int callId) {
 		if(!isDisposed()){
 			this.removeElements();
@@ -254,7 +261,8 @@ public void notifyOpened(int callId) {
 			this.getConnection().listElements(CALL_LIST);
 		}
 	}
-	
+
+	@Override
 	public void notifyClosed(int callId) {
 		if(callId != CALL_OPEN){
 			this.setCollection(null);
@@ -266,7 +274,8 @@ public void notifyClosed(int callId) {
 			this.getConnection().release();
 		}
 	}
-	
+
+	@Override
 	public void notifyError(int callId,Throwable throwable){
 		if(!isDisposed()){
 			this.updateTable();
@@ -274,26 +283,30 @@ public void notifyError(int callId,Throwable throwable){
 			MessageDialog.errorMessage(getShell(),throwable);
 		}
 	}
-	
+
+	@Override
 	public void notifyCd(int callId) {
 		if(!isDisposed()){
 			this.getConnection().release();
 			this.getConnection().listElements(CALL_LIST);
 		}
 	}
-	
-	public void notifyElements(int callId,List elements) {
+
+	@Override
+	public void notifyElements(int callId,List<TGBrowserElement> elements) {
 		if(!isDisposed()){
 			this.addElements(elements);
 			this.updateTable();
 			this.getConnection().release();
 		}
 	}
-	
+
+	@Override
 	public void notifyStream(int callId,final InputStream stream,final TGBrowserElement element) {
 		if(!isDisposed()){
 			ActionLock.lock();
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					if(!TuxGuitar.isDisposed()){
 						TuxGuitar.instance().getPlayer().reset();
@@ -314,10 +327,12 @@ public void run() {
 									return;
 								}
 								new Thread(new Runnable() {
+									@Override
 									public void run() {
 										if(!TuxGuitar.isDisposed()){
 											FileActionUtils.save(fileName);
 											new SyncThread(new Runnable() {
+												@Override
 												public void run() {
 													if(!TuxGuitar.isDisposed()){
 														openStream(stream,element);
@@ -336,9 +351,10 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 	protected void openStream(final InputStream stream,final TGBrowserElement element){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					try {
@@ -354,14 +370,16 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void loadIcons() {
 		if(!isDisposed()){
 			this.getShell().setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 			this.reload();
 		}
 	}
-	
+
+	@Override
 	public void loadProperties() {
 		if(!isDisposed()){
 			this.dialog.setText(TuxGuitar.getProperty("browser.dialog"));
@@ -369,18 +387,20 @@ public void loadProperties() {
 			this.toolBar.loadProperties();
 		}
 	}
-	
+
+	@Override
 	public void notifyAdded() {
 		reload();
 	}
-	
+
+	@Override
 	public void notifyRemoved() {
 		if(getCollection() != null){
 			closeCollection();
 		}
 		reload();
 	}
-	
+
 	protected void reload(){
 		if(!isDisposed()){
 			this.menu.reload(getShell());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserMenuBar.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserMenuBar.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserMenuBar.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserMenuBar.java
index 317b8922..1d13d06a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserMenuBar.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserMenuBar.java
@@ -18,7 +18,7 @@ public class TGBrowserMenuBar extends TGBrowserBar{
 	private Menu newCollection;
 	private Menu openCollection;
 	private Menu removeCollection;
-	
+
 	private MenuItem menuFileItem;
 	private MenuItem menuCollectionItem;
 	private MenuItem menuGoItem;
@@ -31,99 +31,107 @@ public class TGBrowserMenuBar extends TGBrowserBar{
 	private MenuItem root;
 	private MenuItem back;
 	private MenuItem refresh;
-	
+
 	public TGBrowserMenuBar(TGBrowserDialog browser){
 		super(browser);
 	}
-	
+
+	@Override
 	public void init(Shell shell){
 		this.menu = new Menu(shell, SWT.BAR);
-		
+
 		//---File menu------------------------------------------------------
 		Menu menuFile = new Menu(shell,SWT.DROP_DOWN);
 		this.menuFileItem = new MenuItem(this.menu, SWT.CASCADE);
 		this.menuFileItem.setMenu(menuFile);
-		
+
 		this.open = new MenuItem(menuFile,SWT.PUSH);
 		this.open.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
 		this.open.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().openElement();
 			}
 		});
-		
+
 		new MenuItem(menuFile,SWT.SEPARATOR);
-		
+
 		this.exit = new MenuItem(menuFile,SWT.PUSH);
 		this.exit.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getShell().dispose();
 			}
 		});
-		
+
 		//---Collection menu------------------------------------------------------
 		Menu menuCollection = new Menu(shell,SWT.DROP_DOWN);
 		this.menuCollectionItem = new MenuItem(this.menu, SWT.CASCADE);
 		this.menuCollectionItem.setMenu(menuCollection);
-		
+
 		this.newCollection = new Menu(menuCollection.getShell(), SWT.DROP_DOWN);
 		this.newItem = new MenuItem(menuCollection,SWT.CASCADE);
 		this.newItem.setImage(TuxGuitar.instance().getIconManager().getBrowserNew());
 		this.newItem.setMenu(this.newCollection);
 		this.updateTypes();
-		
+
 		this.openCollection = new Menu(menuCollection.getShell(), SWT.DROP_DOWN);
 		this.openItem = new MenuItem(menuCollection,SWT.CASCADE);
 		this.openItem.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
 		this.openItem.setMenu(this.openCollection);
-		
+
 		this.removeCollection = new Menu(menuCollection.getShell(), SWT.DROP_DOWN);
 		this.removeItem = new MenuItem(menuCollection,SWT.CASCADE);
 		this.removeItem.setMenu(this.removeCollection);
-		
+
 		new MenuItem(menuCollection,SWT.SEPARATOR);
-		
+
 		this.close = new MenuItem(menuCollection,SWT.PUSH);
 		this.close.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				closeCollection();
 			}
 		});
-		
+
 		//---Go menu------------------------------------------------------
-		final Menu menuGo = new Menu(shell,SWT.DROP_DOWN);  
+		final Menu menuGo = new Menu(shell,SWT.DROP_DOWN);
 		this.menuGoItem = new MenuItem(this.menu, SWT.CASCADE);
 		this.menuGoItem.setMenu(menuGo);
-		
+
 		this.root = new MenuItem(menuGo,SWT.PUSH);
 		this.root.setImage(TuxGuitar.instance().getIconManager().getBrowserRoot());
 		this.root.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getConnection().cdRoot(TGBrowserDialog.CALL_CD_ROOT);
 			}
 		});
-		
+
 		//---Back Folder------------------------------------------------------
 		this.back = new MenuItem(menuGo,SWT.PUSH);
 		this.back.setImage(TuxGuitar.instance().getIconManager().getBrowserBack());
 		this.back.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getConnection().cdUp(TGBrowserDialog.CALL_CD_UP);
 			}
 		});
-		
+
 		//---Refresh Folder------------------------------------------------------
 		this.refresh = new MenuItem(menuGo,SWT.PUSH);
 		this.refresh.setImage(TuxGuitar.instance().getIconManager().getBrowserRefresh());
 		this.refresh.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getConnection().listElements(TGBrowserDialog.CALL_LIST);
 			}
 		});
-		
+
 		shell.setMenuBar(this.menu);
 	}
-	
+
+	@Override
 	public void updateItems(){
 		this.open.setEnabled(!getBrowser().getConnection().isLocked() && getBrowser().getConnection().isOpen());
 		this.root.setEnabled(!getBrowser().getConnection().isLocked() && getBrowser().getConnection().isOpen());
@@ -134,7 +142,8 @@ public void updateItems(){
 		this.removeItem.setEnabled(!getBrowser().getConnection().isLocked());
 		this.close.setEnabled(!getBrowser().getConnection().isLocked());
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.menuFileItem.setText(TuxGuitar.getProperty("browser.menu.file"));
 		this.menuCollectionItem.setText(TuxGuitar.getProperty("browser.menu.collection"));
@@ -149,7 +158,8 @@ public void loadProperties(){
 		this.back.setText(TuxGuitar.getProperty("browser.go-back"));
 		this.refresh.setText(TuxGuitar.getProperty("browser.refresh"));
 	}
-	
+
+	@Override
 	public void updateCollections(TGBrowserCollection selection){
 		MenuItem[] openItems = this.openCollection.getItems();
 		for(int i = 0;i < openItems.length; i ++){
@@ -159,13 +169,14 @@ public void updateCollections(TGBrowserCollection selection){
 		for(int i = 0;i < removeItems.length; i ++){
 			removeItems[i].dispose();
 		}
-		Iterator it = TGBrowserManager.instance().getCollections();
+		Iterator<TGBrowserCollection> it = TGBrowserManager.instance().getCollections();
 		while(it.hasNext()){
-			final TGBrowserCollection collection = (TGBrowserCollection)it.next();
+			final TGBrowserCollection collection = it.next();
 			if(collection.getData() != null){
 				MenuItem openItem = new MenuItem(this.openCollection,SWT.PUSH);
 				openItem.setText(collection.getData().getTitle());
 				openItem.addSelectionListener(new SelectionAdapter() {
+					@Override
 					public void widgetSelected(SelectionEvent e) {
 						openCollection(collection);
 					}
@@ -173,10 +184,11 @@ public void widgetSelected(SelectionEvent e) {
 				if(selection != null && selection.equals(collection)){
 					openItem.setSelection(true);
 				}
-				
+
 				MenuItem removeItem = new MenuItem(this.removeCollection,SWT.PUSH);
 				removeItem.setText(collection.getData().getTitle());
 				removeItem.addSelectionListener(new SelectionAdapter() {
+					@Override
 					public void widgetSelected(SelectionEvent e) {
 						removeCollection(collection);
 					}
@@ -187,25 +199,26 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		}
 	}
-	
+
 	public void updateTypes(){
 		MenuItem[] items = this.newCollection.getItems();
 		for(int i = 0;i < items.length; i ++){
 			items[i].dispose();
 		}
-		Iterator bookTypes = TGBrowserManager.instance().getFactories();
+		Iterator<TGBrowserFactory> bookTypes = TGBrowserManager.instance().getFactories();
 		while(bookTypes.hasNext()){
-			final TGBrowserFactory bookType = (TGBrowserFactory)bookTypes.next();
+			final TGBrowserFactory bookType = bookTypes.next();
 			MenuItem item = new MenuItem(this.newCollection,SWT.PUSH);
 			item.setText(bookType.getName());
 			item.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					newCollection( bookType.getType());
 				}
 			});
 		}
 	}
-	
+
 	public void reload(Shell shell){
 		if(this.menu != null && !this.menu.isDisposed()){
 			this.menu.dispose();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserToolBar.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserToolBar.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserToolBar.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserToolBar.java
index f9176cbb..301ecd3f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserToolBar.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/dialog/TGBrowserToolBar.java
@@ -30,30 +30,32 @@ public class TGBrowserToolBar extends TGBrowserBar{
 	private ToolItem refresh;
 	protected Menu newBrowserMenu;
 	protected TGBrowserCollectionCombo collections;
-	
+
 	public TGBrowserToolBar(TGBrowserDialog browser){
 		super(browser);
 	}
-	
+
+	@Override
 	public void init(Shell shell){
 		this.composite = new Composite(shell,SWT.NONE);
 		this.composite.setLayout(getLayout());
 		this.composite.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
 		this.initItems();
 	}
-	
+
 	public void initItems(){
 		this.toolBar = new ToolBar(this.composite,SWT.FLAT | SWT.WRAP);
-		
+
 		//---New Book----------------------------------------------------------
 		this.newBrowserMenu = new Menu(this.composite);
-		Iterator bookTypes = TGBrowserManager.instance().getFactories();
+		Iterator<TGBrowserFactory> bookTypes = TGBrowserManager.instance().getFactories();
 		while(bookTypes.hasNext()) {
-			final TGBrowserFactory bookType = (TGBrowserFactory)bookTypes.next();
+			final TGBrowserFactory bookType = bookTypes.next();
 			MenuItem item = new MenuItem(this.newBrowserMenu, SWT.PUSH);
 			item.setText(bookType.getName());
 			item.setData(bookType);
 			item.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent e) {
 					newCollection( bookType.getType());
 				}
@@ -62,6 +64,7 @@ public void widgetSelected(SelectionEvent e) {
 		this.newBrowser = new ToolItem(this.toolBar,SWT.DROP_DOWN);
 		this.newBrowser.setImage(TuxGuitar.instance().getIconManager().getBrowserNew());
 		this.newBrowser.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent event) {
 				if (event.detail == SWT.ARROW) {
 					ToolItem item = (ToolItem) event.widget;
@@ -72,48 +75,53 @@ public void widgetSelected(SelectionEvent event) {
 				}
 			}
 		});
-		
+
 		new ToolItem(this.toolBar, SWT.SEPARATOR);
 		//---Root Folder------------------------------------------------------
 		this.root = new ToolItem(this.toolBar,SWT.PUSH);
 		this.root.setImage(TuxGuitar.instance().getIconManager().getBrowserRoot());
 		this.root.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getConnection().cdRoot(TGBrowserDialog.CALL_CD_ROOT);
 			}
 		});
-		
+
 		//---Back Folder------------------------------------------------------
 		this.back = new ToolItem(this.toolBar,SWT.PUSH);
 		this.back.setImage(TuxGuitar.instance().getIconManager().getBrowserBack());
 		this.back.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getConnection().cdUp(TGBrowserDialog.CALL_CD_UP);
 			}
 		});
-		
+
 		//---Refresh Folder------------------------------------------------------
 		this.refresh = new ToolItem(this.toolBar,SWT.PUSH);
 		this.refresh.setImage(TuxGuitar.instance().getIconManager().getBrowserRefresh());
 		this.refresh.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				getBrowser().getConnection().listElements(TGBrowserDialog.CALL_LIST);
 			}
 		});
-		
+
 		//---Finish tool bar
 		new ToolItem(this.toolBar, SWT.SEPARATOR);
-		
+
 		//---Collections-------------------------------------------------------------
 		this.collections = new TGBrowserCollectionCombo(this.composite, SWT.READ_ONLY);
 		this.collections.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
 		this.collections.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateCollection();
 			}
 		});
 	}
-	
+
+	@Override
 	public void updateItems(){
 		this.newBrowser.setEnabled(!getBrowser().getConnection().isLocked());
 		this.collections.setEnabled(!getBrowser().getConnection().isLocked());
@@ -121,14 +129,15 @@ public void updateItems(){
 		this.back.setEnabled(!getBrowser().getConnection().isLocked() && getBrowser().getConnection().isOpen());
 		this.refresh.setEnabled(!getBrowser().getConnection().isLocked() && getBrowser().getConnection().isOpen());
 	}
-	
+
+	@Override
 	public void updateCollections(TGBrowserCollection selection){
 		int index = 0;
 		this.collections.removeAll();
-		
-		Iterator it = TGBrowserManager.instance().getCollections();
+
+		Iterator<TGBrowserCollection> it = TGBrowserManager.instance().getCollections();
 		while(it.hasNext()){
-			TGBrowserCollection collection = (TGBrowserCollection)it.next();
+			TGBrowserCollection collection = it.next();
 			if(collection.getData() != null){
 				this.collections.add(collection);
 				if(selection != null && selection.equals(collection)){
@@ -138,7 +147,7 @@ public void updateCollections(TGBrowserCollection selection){
 			}
 		}
 	}
-	
+
 	public void reload(){
 		this.disposeItems();
 		this.initItems();
@@ -146,7 +155,8 @@ public void reload(){
 		this.updateItems();
 		this.composite.layout(true,true);
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.newBrowser.setToolTipText(TuxGuitar.getProperty("browser.collection.new"));
 		this.root.setToolTipText(TuxGuitar.getProperty("browser.go-root"));
@@ -154,7 +164,7 @@ public void loadProperties(){
 		this.refresh.setToolTipText(TuxGuitar.getProperty("browser.refresh"));
 		this.updateCollections(getBrowser().getCollection());
 	}
-	
+
 	protected void updateCollection(){
 		TGBrowserCollection collection = this.collections.getSelection();
 		if(collection == null){
@@ -163,14 +173,14 @@ protected void updateCollection(){
 			openCollection(collection);
 		}
 	}
-	
+
 	private void disposeItems(){
 		Control[] controls = this.composite.getChildren();
 		for(int i = 0; i < controls.length; i ++){
 			controls[i].dispose();
 		}
 	}
-	
+
 	private GridLayout getLayout(){
 		GridLayout layout = new GridLayout(2,false);
 		layout.marginWidth = 0;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataDialog.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataDialog.java
index 1a951869..e4c11ee5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataDialog.java
@@ -20,48 +20,49 @@
 import org.herac.tuxguitar.app.util.MessageDialog;
 
 public class TGBrowserDataDialog {
-	
+
 	private TGBrowserData data;
-	
+
 	public TGBrowserData getData() {
 		return this.data;
 	}
-	
+
 	public void setData(TGBrowserData data) {
 		this.data = data;
 	}
-	
+
 	public TGBrowserData open(Shell parent) {
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("browser.collection.fs.editor-title"));
-		
+
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("browser.collection.fs.editor-tip"));
-		
+
 		Composite composite = new Composite(group,SWT.NONE);
 		composite.setLayout(new GridLayout(3,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		final Label titleLabel = new Label(composite,SWT.LEFT);
 		titleLabel.setText(TuxGuitar.getProperty("browser.collection.fs.name"));
 		titleLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
+
 		final Text titleValue = new Text(composite,SWT.BORDER);
 		titleValue.setLayoutData(getTextData(2));
-		
+
 		final Label pathLabel = new Label(composite,SWT.LEFT);
 		pathLabel.setText(TuxGuitar.getProperty("browser.collection.fs.path"));
 		pathLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
+
 		final Text pathValue = new Text(composite,SWT.BORDER);
 		pathValue.setLayoutData(getTextData(1));
-		
+
 		final Button pathChooser = new Button(composite,SWT.PUSH);
 		pathChooser.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
 		pathChooser.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				DirectoryDialog directoryDialog = new DirectoryDialog(dialog);
 				String selection = directoryDialog.open();
@@ -70,16 +71,17 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				String selectedTitle = titleValue.getText();
 				String selectedPath = pathValue.getText();
@@ -94,40 +96,41 @@ public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return getData();
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private GridData getTextData(int span){
 		GridData data = new GridData(SWT.LEFT, SWT.CENTER, true, true,span,1);
 		data.minimumWidth = 350;
 		return data;
 	}
-	
+
 	protected boolean isBlank(String s){
 		return (s == null || s.length() == 0);
 	}
-	
+
 	protected boolean isValidPath(String path){
 		if(!isBlank(path)){
 			File file = new File(path);
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataImpl.java
new file mode 100644
index 00000000..e6844b9a
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataImpl.java
@@ -0,0 +1,38 @@
+package org.herac.tuxguitar.app.tools.browser.filesystem;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
+
+public class TGBrowserDataImpl implements TGBrowserData{
+
+	private static final String STRING_SEPARATOR = ";";
+
+	private String title;
+	private String path;
+
+	public TGBrowserDataImpl(String title,String path){
+		this.title = title;
+		this.path = path;
+	}
+
+	@Override
+	public String getTitle(){
+		return this.title;
+	}
+
+	public String getPath(){
+		return this.path;
+	}
+
+	@Override
+	public String toString(){
+		return (getTitle() + STRING_SEPARATOR + getPath());
+	}
+
+	public static TGBrowserData fromString(String string) {
+		String[] data = string.split(STRING_SEPARATOR);
+		if(data.length == 2){
+			return new TGBrowserDataImpl(data[0],data[1]);
+		}
+		return null;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementComparator.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementComparator.java
new file mode 100644
index 00000000..ec6f8a11
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementComparator.java
@@ -0,0 +1,29 @@
+package org.herac.tuxguitar.app.tools.browser.filesystem;
+
+import java.util.Comparator;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserElementComparator implements Comparator<TGBrowserElement> {
+
+	private static final int RESULT_LESS = -1;
+
+	private static final int RESULT_GREATER = 1;
+
+	private static final int DIRECTION = 1;
+
+	private static final int DIRECTION_FOLDER = 1;
+
+	@Override
+	public int compare(TGBrowserElement element1, TGBrowserElement element2) {
+			if(element1.isFolder() && !element2.isFolder()){
+				return (DIRECTION_FOLDER * RESULT_LESS);
+			}
+			if(element2.isFolder() && !element1.isFolder()){
+				return (DIRECTION_FOLDER * RESULT_GREATER);
+			}
+
+			return (DIRECTION * (element1.getName().compareTo(element2.getName())));
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementImpl.java
new file mode 100644
index 00000000..789c05ad
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementImpl.java
@@ -0,0 +1,47 @@
+package org.herac.tuxguitar.app.tools.browser.filesystem;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserElementImpl extends TGBrowserElement{
+
+	private TGBrowserElementImpl parent;
+	private File file;
+
+	public TGBrowserElementImpl(TGBrowserElementImpl parent,File file) {
+		super(file.getName());
+		this.parent = parent;
+		this.file = file;
+	}
+
+	public File getFile() {
+		return this.file;
+	}
+
+	public TGBrowserElementImpl getParent() {
+		return this.parent;
+	}
+
+	@Override
+	public boolean isFolder(){
+		return getFile().isDirectory();
+	}
+
+	@Override
+	public InputStream getInputStream() throws TGBrowserException {
+		if(!isFolder()){
+			try {
+				return new FileInputStream(getFile());
+			} catch (FileNotFoundException e) {
+				throw new TGBrowserException(e);
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserFactoryImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserFactoryImpl.java
new file mode 100644
index 00000000..dc9cd81b
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserFactoryImpl.java
@@ -0,0 +1,43 @@
+package org.herac.tuxguitar.app.tools.browser.filesystem;
+
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
+
+public class TGBrowserFactoryImpl implements TGBrowserFactory{
+
+	public TGBrowserFactoryImpl() {
+		super();
+	}
+
+	@Override
+	public String getType(){
+		return "file.system";
+	}
+
+	@Override
+	public String getName(){
+		return TuxGuitar.getProperty("browser.factory.fs.name");
+	}
+
+	@Override
+	public TGBrowser newTGBrowser(TGBrowserData data) {
+		if(data instanceof TGBrowserDataImpl){
+			return new TGBrowserImpl((TGBrowserDataImpl)data);
+		}
+		return null;
+	}
+
+	@Override
+	public TGBrowserData parseData(String string) {
+		return TGBrowserDataImpl.fromString(string);
+	}
+
+	@Override
+	public TGBrowserData dataDialog(Shell parent) {
+		TGBrowserDataDialog dialog = new TGBrowserDataDialog();
+		return dialog.open(parent);
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserImpl.java
new file mode 100644
index 00000000..9be5f0c8
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserImpl.java
@@ -0,0 +1,64 @@
+package org.herac.tuxguitar.app.tools.browser.filesystem;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserImpl extends TGBrowser{
+
+	private File root;
+	private TGBrowserElementImpl element;
+	private final TGBrowserDataImpl data;
+
+	public TGBrowserImpl(TGBrowserDataImpl data){
+		this.data = data;
+	}
+
+	@Override
+	public void open(){
+		this.root = new File(this.data.getPath());
+	}
+
+	@Override
+	public void close(){
+		this.root = null;
+	}
+
+	@Override
+	public void cdElement(TGBrowserElement element) {
+		this.element = (TGBrowserElementImpl)element;
+	}
+
+	@Override
+	public void cdRoot() {
+		this.element = null;
+	}
+
+	@Override
+	public void cdUp() {
+		if(this.element != null){
+			this.element = this.element.getParent();
+		}
+	}
+
+	@Override
+	public List<TGBrowserElement> listElements() {
+		List<TGBrowserElement> elements = new ArrayList<TGBrowserElement>();
+		File file = ((this.element != null)?this.element.getFile():this.root);
+		if(file.exists() && file.isDirectory()){
+			File[] files = file.listFiles();
+			for(int i = 0; i < files.length;i ++){
+				elements.add(new TGBrowserElementImpl(this.element,files[i]));
+			}
+		}
+		if( !elements.isEmpty() ){
+			Collections.sort(elements,new TGBrowserElementComparator());
+		}
+		return elements;
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserReader.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserReader.java
index 8c80d2e7..817bb6c6 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserReader.java
@@ -19,7 +19,7 @@ public class TGBrowserReader {
 	private static final String ITEM_TAG = "browser-collection";
 	private static final String ATTRIBUTE_TYPE = "type";
 	private static final String ATTRIBUTE_DATA = "data";
-	
+
 	public void loadCollections(TGBrowserManager manager,File file){
 		if (file.exists()){
 			try {
@@ -30,7 +30,7 @@ public void loadCollections(TGBrowserManager manager,File file){
 			}
 		}
 	}
-	
+
 	private static void loadCollections(TGBrowserManager manager,Node node){
 		NodeList listNode = node.getChildNodes();
 		for (int i = 0; i < listNode.getLength(); i++) {
@@ -38,7 +38,7 @@ private static void loadCollections(TGBrowserManager manager,Node node){
 			String nameNode = child.getNodeName();
 			if (nameNode.equals(ITEM_TAG)) {
 				NamedNodeMap params = child.getAttributes();
-				
+
 				String type = params.getNamedItem(ATTRIBUTE_TYPE).getNodeValue();
 				String data = params.getNamedItem(ATTRIBUTE_DATA).getNodeValue();
 				if(type != null){
@@ -50,15 +50,15 @@ private static void loadCollections(TGBrowserManager manager,Node node){
 			}
 		}
 	}
-	
+
 	private static Document getDocument(File file) throws ParserConfigurationException, SAXException, IOException {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		
+
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		document = builder.parse(file);
-		
+
 		return document;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserWriter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserWriter.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserWriter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserWriter.java
index 73cb58d7..1638610e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserWriter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/browser/xml/TGBrowserWriter.java
@@ -26,12 +26,12 @@
 import org.w3c.dom.Node;
 
 public class TGBrowserWriter {
-	
+
 	private static final String ITEM_LIST_TAG = "browser-collections";
 	private static final String ITEM_TAG = "browser-collection";
 	private static final String ATTRIBUTE_TYPE = "type";
 	private static final String ATTRIBUTE_DATA = "data";
-	
+
 	public void saveCollections(TGBrowserManager manager,String fileName) {
 		try{
 			Document doc = createDocument();
@@ -41,34 +41,34 @@ public void saveCollections(TGBrowserManager manager,String fileName) {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	private static void saveCollections(TGBrowserManager manager,Document document){
 		//chords tag
 		Node listNode = document.createElement(ITEM_LIST_TAG);
-		
-		Iterator collections = manager.getCollections();
+
+		Iterator<TGBrowserCollection> collections = manager.getCollections();
 		while(collections.hasNext()){
-			TGBrowserCollection collection = (TGBrowserCollection)collections.next();
-			
+			TGBrowserCollection collection = collections.next();
+
 			//chord tag
 			Node node = document.createElement(ITEM_TAG);
 			listNode.appendChild(node);
-			
+
 			//name attribute
 			Attr typeAttr = document.createAttribute(ATTRIBUTE_TYPE);
 			typeAttr.setNodeValue(collection.getType());
-			
+
 			//name attribute
 			Attr dataAttr = document.createAttribute(ATTRIBUTE_DATA);
 			dataAttr.setNodeValue(collection.getData().toString());
-			
+
 			node.getAttributes().setNamedItem(typeAttr);
 			node.getAttributes().setNamedItem(dataAttr);
 		}
-		
+
 		document.appendChild(listNode);
 	}
-	
+
 	public static Document createDocument() {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -80,11 +80,11 @@ public static Document createDocument() {
 		}
 		return document;
 	}
-	
+
 	public static void saveDocument(Document document,File file) {
 		try {
 			FileOutputStream fs = new FileOutputStream(file);
-			
+
 			// Write it out again
 			TransformerFactory xformFactory = TransformerFactory.newInstance();
 			Transformer idTransform = xformFactory.newTransformer();
@@ -92,7 +92,7 @@ public static void saveDocument(Document document,File file) {
 			Result output = new StreamResult(fs);
 			idTransform.setOutputProperty(OutputKeys.INDENT, "yes");
 			idTransform.transform(input, output);
-			
+
 		} catch (FactoryConfigurationError e) {
 			e.printStackTrace();
 		} catch (TransformerConfigurationException e) {
@@ -103,5 +103,5 @@ public static void saveDocument(Document document,File file) {
 			e.printStackTrace();
 		}
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/custom/TGCustomTool.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/custom/TGCustomTool.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/custom/TGCustomTool.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/custom/TGCustomTool.java
index 61cb8d7a..3d51df54 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/custom/TGCustomTool.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/custom/TGCustomTool.java
@@ -1,22 +1,22 @@
 package org.herac.tuxguitar.app.tools.custom;
 
 public class TGCustomTool {
-	
+
 	private String name;
 	private String action;
-	
+
 	public TGCustomTool(String name, String action) {
 		super();
 		this.name = name;
 		this.action = action;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public String getAction() {
 		return this.action;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/custom/TGCustomToolManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/custom/TGCustomToolManager.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/custom/TGCustomToolManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/custom/TGCustomToolManager.java
index 6ef984a0..5665fead 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/custom/TGCustomToolManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/custom/TGCustomToolManager.java
@@ -5,32 +5,32 @@
 import java.util.List;
 
 public class TGCustomToolManager {
-	
+
 	private static TGCustomToolManager instance;
-	
-	private List tools;
-	
+
+	private List<TGCustomTool> tools;
+
 	public TGCustomToolManager(){
-		this.tools = new ArrayList();
+		this.tools = new ArrayList<TGCustomTool>();
 	}
-	
+
 	public static TGCustomToolManager instance(){
 		if(instance == null){
 			instance = new TGCustomToolManager();
 		}
 		return instance;
 	}
-	
+
 	public void addCustomTool(TGCustomTool tool){
 		this.tools.add(tool);
 	}
-	
+
 	public void removeCustomTool(TGCustomTool tool){
 		this.tools.remove(tool);
 	}
-	
-	public Iterator getCustomTools(){
+
+	public Iterator<TGCustomTool> getCustomTools(){
 		return this.tools.iterator();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleEditor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleEditor.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleEditor.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleEditor.java
index 790765c3..f212cc34 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleEditor.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleEditor.java
@@ -13,7 +13,7 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class ScaleEditor {
-	
+
 	public void show() {
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
@@ -23,7 +23,7 @@ public void show() {
 		Composite composite = new Composite(dialog, SWT.NONE);
 		composite.setLayout(new GridLayout(2,false));
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		final List keys = new List(composite,SWT.BORDER | SWT.V_SCROLL);
 		keys.setLayoutData(new GridData(50,200));
 		String[] keyNames = TuxGuitar.instance().getScaleManager().getKeyNames();
@@ -31,7 +31,7 @@ public void show() {
 			keys.add(keyNames[i]);
 		}
 		keys.select(TuxGuitar.instance().getScaleManager().getSelectionKey());
-		
+
 		final List scales = new List(composite,SWT.BORDER | SWT.V_SCROLL);
 		scales.setLayoutData(new GridData(SWT.DEFAULT,200));
 		scales.add("None");
@@ -40,36 +40,38 @@ public void show() {
 			scales.add(scaleNames[i]);
 		}
 		scales.select(TuxGuitar.instance().getScaleManager().getSelectionIndex() + 1);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TuxGuitar.instance().getScaleManager().selectScale((scales.getSelectionIndex() - 1), keys.getSelectionIndex());
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleInfo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleInfo.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleInfo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleInfo.java
index 3f97d0e8..1dcea5eb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleInfo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleInfo.java
@@ -3,16 +3,16 @@
 public class ScaleInfo {
 	private String name;
 	private String keys;
-	
+
 	public ScaleInfo(String name,String keys){
 		this.name = name;
 		this.keys = keys;
 	}
-	
+
 	public String getKeys() {
 		return this.keys;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleListener.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleListener.java
index 75b44455..f55f69d4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleListener.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.app.tools.scale;
 
 public interface ScaleListener {
-	
+
 	public void loadScale();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleManager.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleManager.java
index 1c6439e3..01d1816d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/ScaleManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/ScaleManager.java
@@ -11,56 +11,56 @@
 
 public class ScaleManager {
 	private static final String[] KEY_NAMES = TGMusicKeyUtils.getSharpKeyNames(TGMusicKeyUtils.PREFIX_SCALE);
-	
+
 	private static final String KEY_SEPARATOR = ",";
-	
+
 	public static final int NONE_SELECTION = -1;
-	
-	private List scales;
-	
-	private List scaleListeners;
-	
-	private TGScale scale;
-	
+
+	private final List<ScaleInfo> scales;
+
+	private final List<ScaleListener> scaleListeners;
+
+	private final TGScale scale;
+
 	private int selectionIndex;
-	
+
 	private int selectionKey;
-	
+
 	public ScaleManager(){
-		this.scales = new ArrayList();
-		this.scaleListeners = new ArrayList();
+		this.scales = new ArrayList<ScaleInfo>();
+		this.scaleListeners = new ArrayList<ScaleListener>();
 		this.scale = TuxGuitar.instance().getSongManager().getFactory().newScale();
 		this.selectionKey = 0;
 		this.selectionIndex = NONE_SELECTION;
 		this.loadScales();
 	}
-	
+
 	public void addListener( ScaleListener listener){
 		if(!this.scaleListeners.contains( listener )){
 			this.scaleListeners.add( listener );
 		}
 	}
-	
+
 	public void removeListener( ScaleListener listener){
 		if(this.scaleListeners.contains( listener )){
 			this.scaleListeners.remove( listener );
 		}
 	}
-	
+
 	public void fireListeners(){
 		for(int i = 0; i < this.scaleListeners.size(); i ++){
-			ScaleListener listener = (ScaleListener) this.scaleListeners.get( i );
+			ScaleListener listener = this.scaleListeners.get( i );
 			listener.loadScale();
 		}
 	}
-		
+
 	public void selectScale(int index,int key){
 		if(index == NONE_SELECTION){
 			getScale().clear();
 		}
 		else if(index >= 0 && index < this.scales.size()){
 			getScale().clear();
-			ScaleInfo info = (ScaleInfo)this.scales.get(index);
+			ScaleInfo info = this.scales.get(index);
 			String[] keys = info.getKeys().split(KEY_SEPARATOR);
 			for (int i = 0; i < keys.length; i ++){
 				int note = (Integer.parseInt(keys[i]) - 1);
@@ -74,62 +74,62 @@ else if(index >= 0 && index < this.scales.size()){
 		this.selectionKey = key;
 		this.fireListeners();
 	}
-	
+
 	public TGScale getScale() {
 		return this.scale;
 	}
-	
+
 	public int countScales() {
 		return this.scales.size();
 	}
-	
+
 	public String getScaleName(int index) {
 		if(index >= 0 && index < this.scales.size()) {
-			return (((ScaleInfo)this.scales.get(index)).getName());
+			return (this.scales.get(index).getName());
 		}
 		return null;
 	}
-	
+
 	public String getScaleKeys(int index) {
 		if(index >= 0 && index < this.scales.size()) {
-			return(((ScaleInfo)this.scales.get(index)).getKeys());
+			return(this.scales.get(index).getKeys());
 		}
 		return null;
 	}
-	
+
 	public String[] getScaleNames(){
 		String[] names = new String[this.scales.size()];
 		for(int i = 0;i < this.scales.size();i ++){
-			ScaleInfo info = (ScaleInfo)this.scales.get(i);
+			ScaleInfo info = this.scales.get(i);
 			names[i] = info.getName();
 		}
 		return names;
 	}
-	
+
 	public String getKeyName(int index){
 		if( index >=0 && index < KEY_NAMES.length){
 			return KEY_NAMES[ index ];
 		}
 		return null;
 	}
-	
+
 	public String[] getKeyNames(){
 		return KEY_NAMES;
 	}
-	
+
 	public int getSelectionIndex() {
 		return this.selectionIndex;
 	}
-	
+
 	public int getSelectionKey() {
 		return this.selectionKey;
 	}
-	
+
 	private void loadScales(){
 		try{
 			new ScaleReader().loadScales(this.scales, TGFileUtils.getResourceAsStream("scales/scales.xml") );
 		} catch (Throwable e) {
 			e.printStackTrace();
-		} 
+		}
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/xml/ScaleReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/xml/ScaleReader.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/xml/ScaleReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/xml/ScaleReader.java
index 03c61ba0..f41354bb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/scale/xml/ScaleReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/scale/xml/ScaleReader.java
@@ -19,8 +19,8 @@ public class ScaleReader {
 	private static final String SCALE_TAG = "scale";
 	private static final String NAME_ATTRIBUTE = "name";
 	private static final String KEYS_ATTRIBUTE = "keys";
-	
-	public void loadScales(List scales,InputStream stream){
+
+	public void loadScales(List<ScaleInfo> scales,InputStream stream){
 		try{
 			if ( stream != null ){
 				Document doc = getDocument(stream);
@@ -30,33 +30,33 @@ public void loadScales(List scales,InputStream stream){
 			e.printStackTrace();
 		}
 	}
-	
+
 	private static Document getDocument(InputStream stream) throws ParserConfigurationException, SAXException, IOException {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		
+
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		document = builder.parse(stream);
-		
+
 		return document;
 	}
-	
-	private static void loadScales(List scales,Node node){
+
+	private static void loadScales(List<ScaleInfo> scales,Node node){
 		NodeList nodeList = node.getChildNodes();
 		for (int i = 0; i < nodeList.getLength(); i++) {
 			Node child = nodeList.item(i);
 			String nodeName = child.getNodeName();
-			
+
 			if (nodeName.equals(SCALE_TAG)) {
 				NamedNodeMap params = child.getAttributes();
-				
+
 				String name = params.getNamedItem(NAME_ATTRIBUTE).getNodeValue();
 				String keys = params.getNamedItem(KEYS_ATTRIBUTE).getNodeValue();
-				
+
 				if (name == null || keys == null || name.trim().equals("") || keys.trim().equals("")){
 					throw new RuntimeException("Invalid Scale file format.");
 				}
-				
+
 				scales.add(new ScaleInfo(name,keys));
 			}
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplate.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplate.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplate.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplate.java
index bc41685c..78d80249 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplate.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplate.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.app.tools.template;
 
 public class TGTemplate {
-	
+
 	private String name;
 	private String resource;
-	
+
 	public TGTemplate(){
 		super();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplateManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplateManager.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplateManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplateManager.java
index 788bf094..e254fcc3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplateManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplateManager.java
@@ -11,27 +11,27 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class TGTemplateManager {
-	
+
 	private static final String TEMPLATE_DEFAULT_RESOURCE = "template-default.tg";
-	
+
 	private static final String TEMPLATES_PREFIX = "templates/";
 	private static final String TEMPLATES_CONFIG_PATH = (TEMPLATES_PREFIX + "templates.xml");
-	
-	private List templates;
-	
+
+	private final List<TGTemplate> templates;
+
 	public TGTemplateManager(){
-		this.templates = new ArrayList();
+		this.templates = new ArrayList<TGTemplate>();
 		this.loadTemplates();
 	}
-	
+
 	public int countTemplates(){
 		return this.templates.size();
 	}
-	
-	public Iterator getTemplates(){
+
+	public Iterator<TGTemplate> getTemplates(){
 		return this.templates.iterator();
 	}
-	
+
 	public void loadTemplates(){
 		try{
 			InputStream templateInputStream = TGFileUtils.getResourceAsStream(TEMPLATES_CONFIG_PATH);
@@ -43,14 +43,14 @@ public void loadTemplates(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public TGTemplate getDefatulTemplate(){
 		TGTemplate tgTemplate = new TGTemplate();
 		tgTemplate.setName(new String());
 		tgTemplate.setResource(TEMPLATE_DEFAULT_RESOURCE);
 		return tgTemplate;
 	}
-	
+
 	public TGSong getTemplateAsSong(TGTemplate tgTemplate){
 		try{
 			if( tgTemplate != null && tgTemplate.getResource() != null ){
@@ -62,5 +62,5 @@ public TGSong getTemplateAsSong(TGTemplate tgTemplate){
 		}
 		return null;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplateReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplateReader.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplateReader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplateReader.java
index 5fd7d41f..73149673 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/template/TGTemplateReader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tools/template/TGTemplateReader.java
@@ -12,49 +12,49 @@
 import org.w3c.dom.NodeList;
 
 public class TGTemplateReader {
-	
+
 	private static final String TAG_TEMPLATE = "template";
 	private static final String ATTRIBUTE_NAME = "name";
 	private static final String ATTRIBUTE_RESOURCE = "resource";
-	
-	public void loadTemplates(List templates,InputStream stream) throws Throwable{
+
+	public void loadTemplates(List<TGTemplate> templates,InputStream stream) throws Throwable{
 		if( stream != null ){
 			loadTemplates(templates,createDocument(stream).getFirstChild());
 		}
 	}
-	
-	private void loadTemplates(List templates,Node node) throws Throwable {
+
+	private void loadTemplates(List<TGTemplate> templates,Node node) throws Throwable {
 		NodeList nodeList = node.getChildNodes();
 		for (int i = 0; i < nodeList.getLength(); i++) {
 			Node child = nodeList.item(i);
 			String nodeName = child.getNodeName();
-			
+
 			if (nodeName.equals(TAG_TEMPLATE)) {
 				NamedNodeMap params = child.getAttributes();
-				
+
 				TGTemplate tgTemplate = new TGTemplate();
 				tgTemplate.setName(params.getNamedItem(ATTRIBUTE_NAME).getNodeValue());
 				tgTemplate.setResource(params.getNamedItem(ATTRIBUTE_RESOURCE).getNodeValue());
-				
+
 				if (tgTemplate.getName() == null || tgTemplate.getName().trim().length() == 0 ){
 					throw new RuntimeException("Invalid template name.");
 				}
 				if (tgTemplate.getResource() == null || tgTemplate.getResource().trim().length() == 0 ){
 					throw new RuntimeException("Invalid template resource.");
 				}
-				
+
 				templates.add(tgTemplate);
 			}
 		}
 	}
-	
+
 	private Document createDocument(InputStream stream) throws Throwable {
 		Document document = null;
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		
+
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		document = builder.parse(stream);
-		
+
 		return document;
 	}
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackCanvas.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackCanvas.java
new file mode 100644
index 00000000..f3851d7c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackCanvas.java
@@ -0,0 +1,224 @@
+package org.herac.tuxguitar.app.tracktable;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Composite;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.editors.TGColorImpl;
+import org.herac.tuxguitar.app.editors.TGPainterImpl;
+import org.herac.tuxguitar.graphics.TGColor;
+import org.herac.tuxguitar.graphics.TGPainter;
+import org.herac.tuxguitar.graphics.TGResourceFactory;
+import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+class TrackCanvas extends Composite implements PaintListener{
+
+	/**
+	 * Coefficient to compute the width of one measure according to the height of the component.
+	 */
+	private float widthMeasureCoef = 1.0f;
+
+	/**
+	 * Displayed track
+	 */
+	private TGTrack track;
+
+	/**
+	 * Horizontal scroll. Skip pixels from the left side of the component.
+	 */
+	private int hScroll;
+
+	public TrackCanvas(Composite parent, TGTrack track){
+		super(parent, SWT.DOUBLE_BUFFERED);
+		this.track = track;
+		this.addPaintListener(this);
+	}
+
+	@Override
+	public void paintControl(PaintEvent e) {
+		TGPainterImpl painter = new TGPainterImpl(e.gc);
+		paintTrack(painter);
+	}
+
+	protected void paintTrack(TGPainterImpl painter){
+		if (this.track == null)
+			return;
+
+		if(!TuxGuitar.instance().isLocked()){
+			TuxGuitar.instance().lock();
+
+			int x = -this.hScroll;
+			int y = 0;
+			int height = this.getSize().y;
+			int width = painter.getGC().getDevice().getBounds().width;
+			int measureWidth = (int)(height * this.widthMeasureCoef);
+			boolean playing = TuxGuitar.instance().getPlayer().isRunning();
+
+			painter.setBackground(new TGColorImpl(painter.getGC().getDevice().getSystemColor(SWT.COLOR_GRAY)));
+			painter.initPath(TGPainter.PATH_FILL);
+			painter.setAntialias(false);
+			painter.addRectangle(0,y,width,height);
+			painter.closePath();
+
+			TGColor trackColor = painter.createColor(this.track.getColor().getR(),this.track.getColor().getG(),this.track.getColor().getB());
+			TGColor trackColor2 = createAlternativeColor(painter, this.track.getColor());
+			TGColor selectedColor = createSelectionColor(painter, this.track.getColor());
+
+			boolean normal = true;
+			boolean hasChange = false;
+			int count = this.track.countMeasures();
+			for(int j = 0;j < count;j++){
+				TGMeasureImpl measure = (TGMeasureImpl)this.track.getMeasure(j);
+
+				// swap the color to show a structural change
+				if (measure.isRepeatOpen() && !hasChange) {
+					normal = !normal;
+				}
+
+				TGColor color = normal ? trackColor : trackColor2;
+				painter.setBackground(color);
+				painter.setForeground(color);
+
+				if(isRestMeasure(measure)){
+					painter.initPath();
+					painter.setAntialias(false);
+					painter.addRectangle(x,y,measureWidth - 2,height - 1);
+					painter.closePath();
+				}else{
+					painter.initPath(TGPainter.PATH_FILL);
+					painter.setAntialias(false);
+					painter.addRectangle(x,y,measureWidth - 1,height );
+					painter.closePath();
+				}
+
+				boolean hasCaret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure().equals(measure);
+				if((playing && measure.isPlaying(TuxGuitar.instance().getTablatureEditor().getTablature().getViewLayout())) || (!playing && hasCaret)){
+					painter.setBackground(selectedColor);
+					painter.initPath(TGPainter.PATH_FILL);
+					painter.setAntialias(false);
+					painter.addRectangle(x + 4,y + 4,measureWidth - 9,height - 8);
+					painter.closePath();
+				}
+				x += measureWidth;
+
+				// swap the color to show a structural change
+				if (measure.hasDoubleBar() || measure.getRepeatClose() != 0) {
+					hasChange = true;
+					normal = !normal;
+				} else {
+					hasChange = false;
+				}
+			}
+			trackColor.dispose();
+			trackColor2.dispose();
+			selectedColor.dispose();
+
+			TuxGuitar.instance().unlock();
+		}
+	}
+
+	/**
+	 * Create selected color according to dark/light of the trackColor
+	 */
+	private TGColor createSelectionColor(TGResourceFactory factory,
+			org.herac.tuxguitar.song.models.TGColor color) {
+		if (color.getR() + color.getG() + color.getB() < (255 * 3 / 2)) {
+			return factory.createColor(255,255,255);
+		} else {
+			return factory.createColor(0,0,0);
+		}
+	}
+
+	/**
+	 * Create an alternative color to highlight structural changes of the tracks
+	 */
+	private TGColor createAlternativeColor(TGResourceFactory factory,
+			org.herac.tuxguitar.song.models.TGColor color) {
+		RGB rgb = new RGB(color.getR(), color.getG(), color.getB());
+		float[] hsv = rgb.getHSB();
+		final float delta = 0.15f;
+		if (hsv[2] > 0.5) {
+			hsv[2] -= delta;
+		} else {
+			hsv[2] += delta;
+		}
+
+		rgb = new RGB(hsv[0], hsv[1], hsv[2]);
+		return factory.createColor(rgb.red, rgb.green, rgb.blue);
+	}
+
+	private boolean isRestMeasure(TGMeasureImpl measure){
+		int beatCount = measure.countBeats();
+		for(int i = 0; i < beatCount; i++){
+			if( !measure.getBeat(i).isRestBeat() ){
+				return false;
+			}
+		}
+		return true;
+	}
+
+	public void setTrack(TGTrack track) {
+		this.track = track;
+		redraw();
+	}
+
+	/**
+	 * Set the location of the client horizontal scroll
+	 */
+	public void setHScroll(int scroll) {
+		this.hScroll = scroll;
+		redraw();
+	}
+
+	/**
+	 * Size taken by the draw of the full track inside the component
+	 */
+	public int getRealWidth() {
+		if (this.track == null)
+			return 0;
+		int width = this.track.countMeasures() * (int)(this.getSize().y * this.widthMeasureCoef);
+		return width;
+	}
+
+	public float getWidthMeasureCoef() {
+		return this.widthMeasureCoef;
+	}
+
+	public void setWidthMeasureCoef(float widthMeasureCoef) {
+		// clamp
+		if (widthMeasureCoef > 1) {
+			widthMeasureCoef = 1;
+		} else if (this.getSize().y != 0){
+			int measureWidth = (int)(this.getSize().y * widthMeasureCoef);
+			if (measureWidth < 12){
+				widthMeasureCoef = 12.0f / this.getSize().y;
+			}
+		}
+		if (this.widthMeasureCoef != widthMeasureCoef) {
+			this.widthMeasureCoef = widthMeasureCoef;
+			redraw();
+		}
+	}
+
+	/**
+	 * Return the measure of the displayed track at the requested position.
+	 * @param x Position of the visible component
+	 * @return
+	 */
+	public TGMeasure getMeasureAtPosition(int x) {
+		if (this.track == null) {
+			return null;
+		}
+		int measureWidth = (int)(this.getSize().y * this.widthMeasureCoef);
+		int index = (x + this.hScroll) / measureWidth;
+		if (index < 0 || index >= this.track.countMeasures()) {
+			return null;
+		}
+		return this.track.getMeasure(index);
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTable.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTable.java
new file mode 100644
index 00000000..b042ed74
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTable.java
@@ -0,0 +1,174 @@
+package org.herac.tuxguitar.app.tracktable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
+class TrackTable {
+	private ScrolledComposite sComposite;
+	private Composite table;
+	private SashForm columnControl;
+	private Composite rowControl;
+	private TrackTableColumn columnNumber;
+	private TrackTableColumn columnSoloMute;
+	private TrackTableColumn columnName;
+	private TrackTableColumn columnInstrument;
+	private TrackTableColumn columnCanvas;
+	private final List<TrackTableRow> rows;
+	private int rowHeight;
+	private int scrollIncrement;
+
+	public TrackTable(Composite parent){
+		this.rows = new ArrayList<TrackTableRow>();
+		this.newTable(parent);
+	}
+
+	public void newTable(Composite parent){
+		this.sComposite = new ScrolledComposite(parent,SWT.BORDER | SWT.V_SCROLL);
+		this.sComposite.setLayout(new GridLayout());
+		this.sComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+		this.sComposite.setAlwaysShowScrollBars(true);
+		this.sComposite.setExpandHorizontal(true);
+		this.sComposite.setExpandVertical(true);
+		this.table = new Composite(this.sComposite,SWT.NONE);
+		this.table.setLayout(newGridLayout(1,0,0,0,0));
+		this.table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
+		this.columnControl = new SashForm(this.table,SWT.HORIZONTAL);
+		this.columnControl.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
+
+		this.columnNumber = new TrackTableColumn(this,SWT.LEFT);
+		this.columnSoloMute = new TrackTableColumn(this,SWT.LEFT);
+		this.columnName = new TrackTableColumn(this,SWT.LEFT);
+		this.columnInstrument = new TrackTableColumn(this,SWT.LEFT);
+		this.columnCanvas = new TrackTableColumn(this,SWT.CENTER);
+		this.columnControl.setWeights(new int[]{1,2,7,7,20});
+
+		this.rowControl = new Composite(this.table,SWT.NONE);
+		this.rowControl.setLayout(newGridLayout(1,0,1,0,1));
+		this.rowControl.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
+		this.sComposite.setContent(this.table);
+	}
+
+	public Composite getControl(){
+		return this.table;
+	}
+
+	public TrackTableRow newRow(){
+		TrackTableRow row = new TrackTableRow(this);
+		if (!this.rows.isEmpty()) {
+			row.getCanvas().setWidthMeasureCoef(rows.get(0).getCanvas().getWidthMeasureCoef());
+		}
+		this.rows.add(row);
+		return row;
+	}
+
+	private GridLayout newGridLayout(int cols,int marginWidth,int marginHeight,int horizontalSpacing,int verticalSpacing){
+		GridLayout layout = new GridLayout(cols,false);
+		layout.marginWidth = marginWidth;
+		layout.marginHeight = marginHeight;
+		layout.horizontalSpacing = horizontalSpacing;
+		layout.verticalSpacing = verticalSpacing;
+		return layout;
+	}
+
+	public void addRowItem(TrackTableColumn column,Control control,boolean computeSize){
+		if(computeSize){
+			this.rowHeight = Math.max(this.rowHeight,control.computeSize(SWT.DEFAULT,SWT.DEFAULT).y);
+			this.scrollIncrement = this.rowHeight;
+		}
+		column.addControl(control);
+	}
+
+	public int getMinHeight(){
+		return (this.sComposite.getMinHeight() + ( this.sComposite.getBorderWidth() * 2 ) );
+	}
+
+	public Composite getColumnControl(){
+		return this.columnControl;
+	}
+
+	public Composite getRowControl(){
+		return this.rowControl;
+	}
+
+	public int getRowHeight(){
+		return this.rowHeight;
+	}
+
+	public int getScrollIncrement(){
+		return this.scrollIncrement;
+	}
+
+	public TrackTableColumn getColumnInstrument() {
+		return this.columnInstrument;
+	}
+
+	public TrackTableColumn getColumnName() {
+		return this.columnName;
+	}
+
+	public TrackTableColumn getColumnNumber() {
+		return this.columnNumber;
+	}
+
+	public TrackTableColumn getColumnSoloMute() {
+		return this.columnSoloMute;
+	}
+
+	public TrackTableColumn getColumnCanvas() {
+		return this.columnCanvas;
+	}
+
+	public TrackTableRow getRow(int index){
+		if(index >= 0 && index < this.rows.size()){
+			return this.rows.get(index);
+		}
+		return null;
+	}
+
+	public void removeRowsAfter(int index){
+		while(index < this.rows.size()){
+			TrackTableRow row = this.rows.get(index);
+			row.dispose();
+			this.rows.remove(index);
+		}
+		this.notifyRemoved();
+	}
+
+	public int getRowCount(){
+		return this.rows.size();
+	}
+
+	public void update(){
+		this.layoutColumns();
+		this.table.layout(true,true);
+		this.sComposite.setMinHeight(this.table.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
+		this.sComposite.getVerticalBar().setIncrement( (getScrollIncrement() + this.sComposite.getBorderWidth() ) );
+	}
+
+	private void notifyRemoved(){
+		this.columnNumber.notifyRemoved();
+		this.columnSoloMute.notifyRemoved();
+		this.columnName.notifyRemoved();
+		this.columnInstrument.notifyRemoved();
+		this.columnCanvas.notifyRemoved();
+	}
+
+	private void layoutColumns(){
+		this.columnNumber.layout();
+		this.columnSoloMute.layout();
+		this.columnName.layout();
+		this.columnInstrument.layout();
+		this.columnCanvas.layout();
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableColumn.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableColumn.java
new file mode 100644
index 00000000..4438adc7
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableColumn.java
@@ -0,0 +1,74 @@
+package org.herac.tuxguitar.app.tracktable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.herac.tuxguitar.app.TuxGuitar;
+
+class TrackTableColumn {
+	private final TrackTable table;
+	private final CLabel column;
+	private final List<Control> controls;
+
+	public TrackTableColumn(TrackTable table,int align){
+		this.table = table;
+		this.controls = new ArrayList<Control>();
+		this.column = new CLabel(this.table.getColumnControl(),align | SWT.SHADOW_OUT);
+		this.column.setLayout(new GridLayout());
+		this.column.addListener(SWT.Resize,new Listener() {
+			@Override
+			public void handleEvent(Event arg0) {
+				layout();
+			}
+		});
+		this.column.pack();
+		this.appendListeners(this.column);
+	}
+
+	public CLabel getControl(){
+		return this.column;
+	}
+
+	public void setTitle(String title){
+		this.column.setText(title);
+	}
+
+	public void addControl(Control control){
+		this.controls.add(control);
+		this.appendListeners(control);
+	}
+
+	public void appendListeners(Control control){
+		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(control);
+	}
+
+	public void layout(){
+		Point location = this.column.getLocation();
+		Point size = this.column.getSize();
+
+		for(int i = 0; i < this.controls.size(); i ++){
+			Control control = this.controls.get(i);
+			if(!control.isDisposed()){
+				control.setSize(size.x,this.table.getRowHeight());
+				control.setLocation(location.x, 0);
+			}
+		}
+	}
+
+	public void notifyRemoved(){
+		for(int i = 0; i < this.controls.size(); i ++){
+			Control control = this.controls.get(i);
+			if(control.isDisposed()){
+				this.controls.remove(i --);
+			}
+		}
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableRow.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableRow.java
new file mode 100644
index 00000000..6a946b12
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableRow.java
@@ -0,0 +1,159 @@
+package org.herac.tuxguitar.app.tracktable;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+class TrackTableRow {
+	private final TrackTable table;
+	private TGTrack track;
+	private Composite row;
+	private CLabel number;
+	private CLabel soloMute;
+	private CLabel name;
+	private CLabel instrument;
+	private TrackCanvas canvas;
+
+	public TrackTableRow(TrackTable table){
+		this.table = table;
+		this.track = null;
+		this.init();
+	}
+
+	private void init(){
+		this.row = new Composite(this.table.getRowControl(),SWT.NONE );
+		this.row.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
+
+		this.number = new CLabel(this.row,SWT.LEFT);
+		this.table.addRowItem(this.table.getColumnNumber(),this.number,true);
+
+		this.soloMute = new CLabel(this.row,SWT.LEFT);
+		this.table.addRowItem(this.table.getColumnSoloMute(),this.soloMute,true);
+
+		this.name = new CLabel(this.row,SWT.LEFT);
+		this.table.addRowItem(this.table.getColumnName(),this.name,true);
+
+		this.instrument = new CLabel(this.row,SWT.LEFT);
+		this.table.addRowItem(this.table.getColumnInstrument(),this.instrument,true);
+
+		this.canvas = new TrackCanvas(this.row, this.track);
+		this.table.addRowItem(this.table.getColumnCanvas(),this.canvas,false);
+
+		this.row.pack();
+	}
+
+	public void setBackground(Color background){
+		this.number.setBackground(background);
+		this.soloMute.setBackground(background);
+		this.name.setBackground(background);
+		this.instrument.setBackground(background);
+	}
+
+	public void setForeground(Color foreground){
+		this.number.setForeground(foreground);
+		this.soloMute.setForeground(foreground);
+		this.name.setForeground(foreground);
+		this.instrument.setForeground(foreground);
+	}
+
+	public void dispose(){
+		this.row.dispose();
+	}
+
+	public TrackCanvas getCanvas() {
+		return this.canvas;
+	}
+
+	public CLabel getInstrument() {
+		return this.instrument;
+	}
+
+	public CLabel getName() {
+		return this.name;
+	}
+
+	public CLabel getNumber() {
+		return this.number;
+	}
+
+	public CLabel getSoloMute() {
+		return this.soloMute;
+	}
+
+	public void addMouseListenerLabel(MouseListener mouseListenerLabel) {
+		this.number.addMouseListener(mouseListenerLabel);
+		this.soloMute.addMouseListener(mouseListenerLabel);
+		this.name.addMouseListener(mouseListenerLabel);
+		this.instrument.addMouseListener(mouseListenerLabel);
+	}
+
+	public void addMouseListenerCanvas(MouseListener mouseListenerCanvas) {
+		this.canvas.addMouseListener(mouseListenerCanvas);
+	}
+
+	public void setMenu(Menu menu) {
+		number.setMenu(menu);
+		soloMute.setMenu(menu);
+		name.setMenu(menu);
+		instrument.setMenu(menu);
+	}
+
+	public void setTrack(TGTrack track) {
+		this.track = track;
+
+		//Number
+		number.setText(Integer.toString(track.getNumber()));
+		number.setData(track);
+
+		//Solo-Mute
+		soloMute.setText(getSoloMute(track));
+		soloMute.setData(track);
+
+		//Name
+		name.setText(track.getName());
+		name.setData(track);
+
+		//Instrument
+		instrument.setText(getInstrument(track));
+		instrument.setData(track);
+
+		canvas.setTrack(track);
+	}
+
+	private static String getInstrument(TGTrack track){
+		TGChannel channel = TuxGuitar.instance().getSongManager().getChannel(track.getChannelId());
+		if( channel != null ){
+			return ( channel.getName() != null ? channel.getName() : new String() );
+		}
+		return new String();
+	}
+
+	private static String getSoloMute(TGTrack track){
+		if( track.isSolo() ){
+			return TuxGuitar.getProperty("track.short-solo-mute.s");
+		}
+		if( track.isMute() ){
+			return TuxGuitar.getProperty("track.short-solo-mute.m");
+		}
+		return TuxGuitar.getProperty("track.short-solo-mute.none");
+	}
+
+	public void resetTextsValues() {
+		number.setText(Integer.toString(track.getNumber()));
+		soloMute.setText(getSoloMute(track));
+		name.setText(track.getName());
+		instrument.setText(getInstrument(track));
+	}
+
+	public TGTrack getTrack() {
+		return track;
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableViewer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableViewer.java
new file mode 100644
index 00000000..bfcb8827
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/tracktable/TrackTableViewer.java
@@ -0,0 +1,485 @@
+package org.herac.tuxguitar.app.tracktable;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.events.MouseWheelListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.ScrollBar;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.ActionData;
+import org.herac.tuxguitar.app.actions.ActionLock;
+import org.herac.tuxguitar.app.actions.composition.ChangeInfoAction;
+import org.herac.tuxguitar.app.actions.track.GoToTrackAction;
+import org.herac.tuxguitar.app.actions.track.TrackPropertiesAction;
+import org.herac.tuxguitar.app.editors.TGRedrawListener;
+import org.herac.tuxguitar.app.editors.TGUpdateListener;
+import org.herac.tuxguitar.app.editors.TablatureEditor;
+import org.herac.tuxguitar.app.items.menu.TrackMenu;
+import org.herac.tuxguitar.app.system.config.TGConfigKeys;
+import org.herac.tuxguitar.app.system.icons.IconLoader;
+import org.herac.tuxguitar.app.system.language.LanguageLoader;
+import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
+import org.herac.tuxguitar.graphics.control.TGTrackImpl;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+public class TrackTableViewer implements TGRedrawListener, TGUpdateListener, LanguageLoader {
+
+	private Composite composite;
+	private ScrollBar hScroll;
+	private Color[] backgrounds;
+	private Color[] foregrounds;
+	private TrackTable table;
+	private int selectedTrack;
+	private int selectedMeasure;
+	private int trackCount = 0;
+	private boolean autoSizeEnabled;
+	private boolean update;
+	private boolean followScroll;
+	private boolean resetTexts;
+	private final MouseWheelListener trackCanvasZoomMouseWheel;
+
+	public TrackTableViewer() {
+		TuxGuitar.instance().getLanguageManager().addLoader(this);
+		TuxGuitar.instance().getEditorManager().addRedrawListener(this);
+		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
+
+		trackCanvasZoomMouseWheel = new MouseWheelListener() {
+			@Override
+			public void mouseScrolled(MouseEvent e) {
+				// skip if CTRL key is not pressed
+				if ((e.stateMask & SWT.CTRL) == 0) {
+					return;
+				}
+				TrackCanvas canvas = (TrackCanvas) e.getSource();
+				float coef = canvas.getWidthMeasureCoef();
+				final float constante = 4;
+				if (e.count > 0) {
+					coef *= 1.0 + 1.0 / constante;
+				} else if (e.count < 0) {
+					coef *= (constante - 1) / constante;
+				} else {
+					return;
+				}
+				for (int i = 0; i < getTable().getRowCount(); i++) {
+					TrackTableRow row = getTable().getRow(i);
+					row.getCanvas().setWidthMeasureCoef(coef);
+				}
+				hScroll.setThumb(canvas.getSize().x);
+				hScroll.setMaximum(canvas.getRealWidth());
+				updateCanvasScroll(hScroll.getSelection());
+			}
+		};
+	}
+
+	public void init(Composite parent){
+		this.composite = new Composite(parent,SWT.H_SCROLL);
+		this.addColors();
+		this.addLayout();
+		this.addTable();
+		this.addHScroll();
+		this.loadConfig();
+	}
+
+	private void addColors(){
+		Display display = this.getComposite().getDisplay();
+
+		this.backgrounds = new Color[]{
+			new Color(display,255,255,255),
+			new Color(display,238,238,238),
+			new Color(display,192,192,192),
+		};
+		this.foregrounds = new Color[]{
+			new Color( display, 0, 0, 0 ),
+			new Color( display, 0, 0, 0 ),
+			new Color( display, 0, 0, 0 ),
+		};
+	}
+
+	private void addLayout(){
+		GridLayout layout = new GridLayout();
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+		layout.marginTop = 0;
+		layout.marginBottom = 0;
+		layout.horizontalSpacing = 0;
+		layout.verticalSpacing = 0;
+		getComposite().setLayout(layout);
+	}
+
+	private void addHScroll(){
+		this.hScroll = getComposite().getHorizontalBar();
+		this.hScroll.addListener(SWT.Selection, new Listener() {
+			@Override
+			public void handleEvent(Event e) {
+				updateCanvasScroll(hScroll.getSelection());
+			}
+		});
+	}
+
+	private void addTable(){
+		MouseListener listener = mouseFocusListener();
+		this.table = new TrackTable(getComposite());
+		this.table.getColumnNumber().getControl().addMouseListener(listener);
+		this.table.getColumnSoloMute().getControl().addMouseListener(listener);
+		this.table.getColumnName().getControl().addMouseListener(listener);
+		this.table.getColumnInstrument().getControl().addMouseListener(listener);
+		this.table.getColumnCanvas().getControl().addMouseListener(listener);
+		this.table.getColumnCanvas().getControl().addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseDoubleClick(MouseEvent e) {
+				TuxGuitar.instance().getAction(ChangeInfoAction.NAME).process(new ActionData());
+			}
+		});
+		this.fireUpdate(true);
+		this.loadProperties();
+	}
+
+	@Override
+	public void loadProperties() {
+		this.table.getColumnNumber().setTitle(TuxGuitar.getProperty("track.number"));
+		this.table.getColumnSoloMute().setTitle(TuxGuitar.getProperty("track.short-solo-mute"));
+		this.table.getColumnName().setTitle(TuxGuitar.getProperty("track.name"));
+		this.table.getColumnInstrument().setTitle(TuxGuitar.getProperty("track.instrument"));
+	}
+
+	public void fireUpdate(boolean newSong){
+		this.update = true;
+		if(newSong){
+			this.trackCount = 0;
+		}
+	}
+
+	public void updateItems(){
+		this.resetTexts = true;
+		this.followScroll = true;
+	}
+
+	public void updateHScroll(){
+		int width = 0;
+		int visibleSize = 0;
+		if (getTable().getRowCount() > 0) {
+			TrackCanvas canvas = getTable().getRow(0).getCanvas();
+			width = canvas.getRealWidth();
+			visibleSize = Math.min(width , canvas.getSize().x);
+		}
+		this.hScroll.setIncrement(this.table.getScrollIncrement());
+		this.hScroll.setMaximum(width);
+		this.hScroll.setThumb(visibleSize);
+	}
+
+	public TrackTable getTable(){
+		return this.table;
+	}
+
+	public int getHScrollSelection(){
+		return this.hScroll.getSelection();
+	}
+
+	public TablatureEditor getEditor(){
+		return TuxGuitar.instance().getTablatureEditor();
+	}
+
+	private void updateTable(){
+		if(this.update){
+			int count = TuxGuitar.instance().getSongManager().getSong().countTracks();
+			this.table.removeRowsAfter(count);
+			for(int i = this.table.getRowCount(); i < count; i ++){
+				final TrackTableRow row = this.table.newRow();
+				if (i == 0) {
+					row.getCanvas().addControlListener(new ControlListener() {
+						@Override
+						public void controlResized(ControlEvent arg0) {
+							updateHScroll();
+						}
+						@Override
+						public void controlMoved(ControlEvent arg0) {
+						}
+					});
+				}
+
+				row.getCanvas().addMouseWheelListener(trackCanvasZoomMouseWheel);
+				row.addMouseListenerLabel(new MouseAdapter() {
+
+					@Override
+					public void mouseUp(MouseEvent e) {
+						row.getCanvas().setFocus();
+					}
+
+					@Override
+					public void mouseDown(MouseEvent e) {
+						if(row.getTrack().getNumber() != getEditor().getTablature().getCaret().getTrack().getNumber()){
+							ActionData actionData = new ActionData();
+							actionData.put(GoToTrackAction.PROPERTY_TRACK, row.getTrack());
+
+							TuxGuitar.instance().getAction(GoToTrackAction.NAME).process(actionData);
+						}
+					}
+
+					@Override
+					public void mouseDoubleClick(final MouseEvent e) {
+						new Thread(new Runnable() {
+							@Override
+							public void run() {
+								ActionLock.waitFor();
+								TuxGuitar.instance().getAction(TrackPropertiesAction.NAME).process(new ActionData());
+							}
+						}).start();
+					}
+				});
+				row.addMouseListenerCanvas(new MouseAdapter() {
+
+					@Override
+					public void mouseUp(MouseEvent e) {
+						row.getCanvas().setFocus();
+					}
+
+					@Override
+					public void mouseDown(MouseEvent e) {
+						TGTrack track = row.getTrack();
+						TGMeasureImpl measure = (TGMeasureImpl) row.getCanvas().getMeasureAtPosition(e.x);
+						if(measure != null){
+							TGBeat beat = TuxGuitar.instance().getSongManager().getMeasureManager().getFirstBeat(measure.getBeats());
+							if(beat != null){
+								getEditor().getTablature().getCaret().moveTo((TGTrackImpl)track,measure,beat,1);
+								TuxGuitar.instance().updateCache(true);
+							}
+						}
+					}
+				});
+			}
+			for(int i = 0; i < count; i ++){
+				TGTrack track = TuxGuitar.instance().getSongManager().getSong().getTrack(i);
+				final TrackTableRow row = this.table.getRow(i);
+				if(row != null){
+					row.setTrack(track);
+					row.setMenu(createTrackMenu());
+				}
+			}
+			this.table.update();
+			this.selectedTrack = 0;
+			this.selectedMeasure = 0;
+
+			if(this.autoSizeEnabled && this.trackCount != count){
+				TuxGuitar.instance().setTableHeight( getHeight() );
+				this.trackCount = count;
+			}
+
+		}
+		this.update = false;
+	}
+
+	private int getHeight(){
+		Rectangle r1 = this.composite.getBounds();
+		Rectangle r2 = this.composite.getClientArea();
+		return ( this.table.getMinHeight() + (r1.height - r2.height) );
+	}
+
+	private void resetTextsValues(){
+		int rows = this.table.getRowCount();
+		for(int i = 0; i < rows; i ++){
+			TrackTableRow row = this.table.getRow(i);
+			row.resetTextsValues();
+		}
+	}
+
+	private void redrawRows(int selectedTrack){
+		int rows = this.table.getRowCount();
+		for(int i = 0; i < rows; i ++){
+			TrackTableRow row = this.table.getRow(i);
+			row.getCanvas().redraw();
+			if(this.selectedTrack != selectedTrack){
+				row.setBackground( this.backgrounds[ ((selectedTrack - 1) == i)? 2: ( i % 2 ) ] );
+				row.setForeground( this.foregrounds[ ((selectedTrack - 1) == i)? 2: ( i % 2 ) ] );
+			}
+		}
+	}
+
+	private void updateCanvasScroll(int scroll) {
+		for (int i = 0; i < getTable().getRowCount(); i++) {
+			TrackTableRow row = getTable().getRow(i);
+			row.getCanvas().setHScroll(scroll);
+		}
+	}
+
+	public void redraw(){
+		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
+			this.updateTable();
+			this.table.getColumnCanvas().setTitle(TuxGuitar.instance().getSongManager().getSong().getName());
+			int selectedTrack = getEditor().getTablature().getCaret().getTrack().getNumber();
+			this.redrawRows(selectedTrack);
+			this.selectedTrack = selectedTrack;
+			this.selectedMeasure = 0;
+			this.updateHScroll();
+
+			if( this.resetTexts ){
+				this.resetTextsValues();
+				this.resetTexts = false;
+			}
+			if( this.followScroll ){
+				this.followHorizontalScroll(getEditor().getTablature().getCaret().getMeasure().getNumber());
+				this.followScroll = false;
+			}
+			getComposite().redraw();
+		}
+	}
+
+	public void redrawPlayingMode(){
+		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
+			TGMeasure measure =  TuxGuitar.instance().getEditorCache().getPlayMeasure();
+			if(measure != null && measure.getTrack() != null){
+				this.updateTable();
+				int selectedTrack = measure.getTrack().getNumber();
+				int selectedMeasure = measure.getNumber();
+				if(this.selectedTrack != selectedTrack || this.selectedMeasure != selectedMeasure){
+					this.redrawRows(selectedTrack);
+					this.followHorizontalScroll(selectedMeasure);
+				}
+				this.selectedTrack = selectedTrack;
+				this.selectedMeasure = selectedMeasure;
+			}
+		}
+	}
+
+	private void followHorizontalScroll(int selectedMeasure){
+		int hScrollSelection = this.hScroll.getSelection();
+		int hScrollThumb = this.hScroll.getThumb();
+
+		int measureSize = this.table.getRowHeight();
+		int measurePosition = ( (selectedMeasure * measureSize) - measureSize );
+
+		if( (measurePosition - hScrollSelection) < 0 || (measurePosition + measureSize - hScrollSelection ) > hScrollThumb){
+			this.hScroll.setSelection(measurePosition);
+			// hScroll.setSelection can clamp measurePosition
+			updateCanvasScroll(this.hScroll.getSelection());
+		}
+	}
+
+	public void loadConfig(){
+		this.autoSizeEnabled = TuxGuitar.instance().getConfig().getBooleanConfigValue(TGConfigKeys.TABLE_AUTO_SIZE);
+		this.trackCount = 0;
+	}
+
+	public Composite getComposite(){
+		return this.composite;
+	}
+
+	public Menu createTrackMenu(){
+		final TrackMenu trackMenu = new TrackMenu(getComposite().getShell(),SWT.POP_UP);
+		trackMenu.showItems();
+		trackMenu.update();
+
+		final TGUpdateListener trackMenuUpdateListener = new TGUpdateListener() {
+			@Override
+			public void doUpdate(int type) {
+				if(!trackMenu.isDisposed() && type == TGUpdateListener.SELECTION ){
+					trackMenu.update();
+				}
+			}
+		};
+		final LanguageLoader trackMenuLanguageLoader = new LanguageLoader() {
+			@Override
+			public void loadProperties() {
+				if(!trackMenu.isDisposed()){
+					trackMenu.loadProperties();
+				}
+			}
+		};
+		final IconLoader trackMenuIconLoader = new IconLoader() {
+			@Override
+			public void loadIcons() {
+				if(!trackMenu.isDisposed()){
+					trackMenu.loadIcons();
+				}
+			}
+		};
+
+		TuxGuitar.instance().getEditorManager().addUpdateListener(trackMenuUpdateListener);
+		TuxGuitar.instance().getLanguageManager().addLoader(trackMenuLanguageLoader);
+		TuxGuitar.instance().getIconManager().addLoader(trackMenuIconLoader);
+
+		trackMenu.getMenu().addDisposeListener(new DisposeListener() {
+			@Override
+			public void widgetDisposed(DisposeEvent e) {
+				TuxGuitar.instance().getEditorManager().removeUpdateListener(trackMenuUpdateListener);
+				TuxGuitar.instance().getLanguageManager().removeLoader(trackMenuLanguageLoader);
+				TuxGuitar.instance().getIconManager().removeLoader(trackMenuIconLoader);
+			}
+		});
+
+		return trackMenu.getMenu();
+	}
+
+	public void disposeColors(){
+		for(int i = 0; i < this.backgrounds.length; i++){
+			this.backgrounds[i].dispose();
+		}
+		for(int i = 0; i < this.foregrounds.length; i++){
+			this.foregrounds[i].dispose();
+		}
+	}
+
+	public void dispose(){
+		if(!isDisposed()){
+			getComposite().dispose();
+			disposeColors();
+		}
+	}
+
+	public boolean isDisposed(){
+		return (getComposite() == null || getComposite().isDisposed());
+	}
+
+	protected int getSelectedTrack(){
+		return this.selectedTrack;
+	}
+
+	private MouseListener mouseFocusListener(){
+		return new MouseAdapter() {
+			@Override
+			public void mouseUp(MouseEvent e) {
+				TrackTable table = getTable();
+				if(table != null){
+					TrackTableRow row = table.getRow( ( getSelectedTrack() - 1 ) );
+					if(row != null){
+						row.getCanvas().setFocus();
+					}
+				}
+			}
+		};
+	}
+
+	@Override
+	public void doRedraw(int type) {
+		if( type == TGRedrawListener.NORMAL ){
+			this.redraw();
+		}else if( type == TGRedrawListener.PLAYING_NEW_BEAT ){
+			this.redrawPlayingMode();
+		}
+	}
+
+	@Override
+	public void doUpdate(int type) {
+		if( type == TGUpdateListener.SELECTION ){
+			this.updateItems();
+		}else if( type == TGUpdateListener.SONG_UPDATED ){
+			this.fireUpdate( false );
+		}else if( type == TGUpdateListener.SONG_LOADED ){
+			this.fireUpdate( true );
+		}
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/transport/TGTransport.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/transport/TGTransport.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/transport/TGTransport.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/transport/TGTransport.java
index 414ebfac..b0129a11 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/transport/TGTransport.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/transport/TGTransport.java
@@ -1,8 +1,5 @@
 /*
  * Created on 20-mar-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.transport;
 
@@ -44,17 +41,14 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
  */
 public class TGTransport implements TGRedrawListener, TGUpdateListener, IconLoader,LanguageLoader{
 	private static final int PLAY_MODE_DELAY = 250;
-	
+
 	public static final int STATUS_STOPPED = 1;
 	public static final int STATUS_PAUSED = 2;
 	public static final int STATUS_RUNNING = 3;
-	
+
 	protected Shell dialog;
 	protected Label label;
 	protected ProgressBar tickProgress;
@@ -70,11 +64,11 @@ public class TGTransport implements TGRedrawListener, TGUpdateListener, IconLoad
 	protected boolean editingTickScale;
 	protected long redrawTime;
 	protected int status;
-	
+
 	public TGTransport() {
 		super();
 	}
-	
+
 	public void show() {
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM);
 		this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
@@ -83,9 +77,10 @@ public void show() {
 		this.initComposites();
 		this.initToolBar();
 		this.redraw();
-		
+
 		this.addListeners();
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				removeListeners();
 				TuxGuitar.instance().updateCache(true);
@@ -93,61 +88,61 @@ public void widgetDisposed(DisposeEvent e) {
 		});
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	public void addListeners(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 		TuxGuitar.instance().getEditorManager().addRedrawListener(this);
 		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public void removeListeners(){
 		TuxGuitar.instance().getIconManager().removeLoader(this);
 		TuxGuitar.instance().getLanguageManager().removeLoader(this);
 		TuxGuitar.instance().getEditorManager().removeRedrawListener(this);
 		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
 	}
-	
+
 	private void initComposites(){
 		GridLayout layout = new GridLayout(2,false);
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
 		layout.horizontalSpacing = 0;
 		layout.verticalSpacing = 0;
-		
+
 		Composite composite = new Composite(this.dialog,SWT.BORDER);
 		composite.setLayout(layout);
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		initOptions(composite);
 		initProgress(composite);
 	}
-	
+
 	private void initOptions(Composite parent){
 		Composite composite = new Composite(parent,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,false,true));
-		
+
 		this.metronome = new Button(composite,SWT.TOGGLE);
 		this.metronome.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.metronome.addSelectionListener(TuxGuitar.instance().getAction(TransportMetronomeAction.NAME));
-		
+
 		this.mode = new Button(composite,SWT.PUSH);
 		this.mode.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		this.mode.addSelectionListener(TuxGuitar.instance().getAction(TransportModeAction.NAME));
-		
+
 		this.loadOptionIcons();
 	}
-	
+
 	private void initProgress(Composite parent){
 		Composite composite = new Composite(parent,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		initLabel(composite);
 		initScale(composite);
 	}
-	
+
 	private void initLabel(Composite parent){
 		final Font font = new Font(parent.getDisplay(),"Minisystem",36,SWT.NORMAL);
 		this.label = new Label(parent,SWT.RIGHT);
@@ -156,37 +151,41 @@ private void initLabel(Composite parent){
 		this.label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_BLUE));
 		this.label.setFont(font);
 		this.label.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				font.dispose();
 			}
 		});
 	}
-	
+
 	private void initScale(Composite parent){
 		GridData data = new GridData(SWT.FILL,SWT.CENTER,true,false);
 		data.heightHint = 10;
-		
+
 		this.tickProgress = new ProgressBar(parent, SWT.BORDER | SWT.HORIZONTAL | SWT.SMOOTH);
 		this.tickProgress.setCursor(this.tickProgress.getDisplay().getSystemCursor(SWT.CURSOR_HAND));
 		this.tickProgress.setLayoutData(data);
 		this.tickProgress.setSelection((int)TGDuration.QUARTER_TIME);
 		this.tickProgress.addMouseListener(new MouseAdapter() {
+			@Override
 			public void mouseDown(MouseEvent e) {
 				setEditingTickScale(true);
 				updateProgressBar(e.x);
 			}
+			@Override
 			public void mouseUp(MouseEvent e) {
 				gotoMeasure(getSongManager().getMeasureHeaderAt(TGTransport.this.tickProgress.getSelection()),true);
 				setEditingTickScale(false);
 			}
 		});
 		this.tickProgress.addMouseMoveListener(new MouseMoveListener() {
+			@Override
 			public void mouseMove(MouseEvent e) {
 				updateProgressBar(e.x);
 			}
 		});
 	}
-	
+
 	protected void updateProgressBar(int x){
 		if(isEditingTickScale()){
 			int selection = (this.tickProgress.getMinimum() + (( x * (this.tickProgress.getMaximum() - this.tickProgress.getMinimum())) / this.tickProgress.getSize().x) );
@@ -194,75 +193,81 @@ protected void updateProgressBar(int x){
 			this.redraw();
 		}
 	}
-	
+
 	private void initToolBar(){
 		if(this.toolBar != null){
 			this.toolBar.dispose();
 		}
 		this.toolBar = new ToolBar(this.dialog,SWT.FLAT);
-		
+
 		this.first = new ToolItem(this.toolBar,SWT.PUSH);
 		this.first.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				gotoFirst();
 			}
 		});
-		
+
 		this.previous = new ToolItem(this.toolBar,SWT.PUSH);
 		this.previous.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				gotoPrevious();
 			}
 		});
-		
+
 		this.stop = new ToolItem(this.toolBar,SWT.PUSH);
 		this.stop.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				stop();
 			}
 		});
-		
+
 		this.play = new ToolItem(this.toolBar,SWT.PUSH);
 		this.play.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				play();
 			}
 		});
-		
+
 		this.next = new ToolItem(this.toolBar,SWT.PUSH);
 		this.next.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				gotoNext();
 			}
 		});
-		
+
 		this.last = new ToolItem(this.toolBar,SWT.PUSH);
 		this.last.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				gotoLast();
 			}
 		});
-		
+
 		this.updateItems(true);
 		this.loadProperties();
 	}
-	
+
 	public int getStatus() {
 		return this.status;
 	}
-	
+
 	public void setStatus(int status) {
 		this.status = status;
 	}
-	
+
 	public void updateItems(){
 		this.updateItems(false);
 	}
-	
+
 	public void updateItems(boolean force){
 		if(!isDisposed()){
 			int lastStatus = getStatus();
-			
+
 			if(TuxGuitar.instance().getPlayer().isRunning()){
 				setStatus(STATUS_RUNNING);
 			}else if(TuxGuitar.instance().getPlayer().isPaused()){
@@ -270,7 +275,7 @@ public void updateItems(boolean force){
 			}else{
 				setStatus(STATUS_STOPPED);
 			}
-			
+
 			if(force || lastStatus != getStatus()){
 				if(getStatus() == STATUS_RUNNING){
 					this.first.setImage(TuxGuitar.instance().getIconManager().getTransportFirst2());
@@ -301,11 +306,12 @@ public void updateItems(boolean force){
 			this.tickProgress.setMinimum((int)first.getStart());
 			this.tickProgress.setMaximum((int)(last.getStart() + last.getLength()) -1);
 			this.metronome.setSelection(TuxGuitar.instance().getPlayer().isMetronomeEnabled());
-			
+
 			this.redraw();
 		}
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		if(!isDisposed()){
 			this.dialog.setText(TuxGuitar.getProperty("transport"));
@@ -319,12 +325,13 @@ public void loadProperties(){
 			this.loadPlayText();
 		}
 	}
-	
+
 	public void loadPlayText(){
 		String property = TuxGuitar.getProperty( (getStatus() == STATUS_RUNNING ? "transport.pause" : "transport.start") );
 		this.play.setToolTipText(property);
 	}
-	
+
+	@Override
 	public void loadIcons(){
 		if(!isDisposed()){
 			this.initToolBar();
@@ -334,42 +341,42 @@ public void loadIcons(){
 			this.dialog.pack(true);
 		}
 	}
-	
+
 	private void loadOptionIcons(){
 		this.metronome.setImage(TuxGuitar.instance().getIconManager().getTransportMetronome());
 		this.mode.setImage(TuxGuitar.instance().getIconManager().getTransportMode());
 	}
-	
+
 	public void dispose() {
 		if(!isDisposed()){
 			this.dialog.dispose();
 		}
 	}
-	
+
 	public boolean isDisposed() {
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	public boolean isEditingTickScale() {
 		return this.editingTickScale;
 	}
-	
+
 	public void setEditingTickScale(boolean editingTickScale) {
 		this.editingTickScale = editingTickScale;
 	}
-	
+
 	protected TGSongManager getSongManager(){
 		return TuxGuitar.instance().getSongManager();
 	}
-	
+
 	public void gotoFirst(){
 		gotoMeasure(getSongManager().getFirstMeasureHeader(),true);
 	}
-	
+
 	public void gotoLast(){
 		gotoMeasure(getSongManager().getLastMeasureHeader(),true) ;
 	}
-	
+
 	public void gotoNext(){
 		MidiPlayer player = TuxGuitar.instance().getPlayer();
 		TGMeasureHeader header = getSongManager().getMeasureHeaderAt(MidiTickUtil.getStart(player.getTickPosition()));
@@ -377,7 +384,7 @@ public void gotoNext(){
 			gotoMeasure(getSongManager().getNextMeasureHeader(header),true);
 		}
 	}
-	
+
 	public void gotoPrevious(){
 		MidiPlayer player = TuxGuitar.instance().getPlayer();
 		TGMeasureHeader header = getSongManager().getMeasureHeaderAt(MidiTickUtil.getStart(player.getTickPosition()));
@@ -385,11 +392,11 @@ public void gotoPrevious(){
 			gotoMeasure(getSongManager().getPrevMeasureHeader(header),true);
 		}
 	}
-	
+
 	public void gotoMeasure(TGMeasureHeader header){
 		gotoMeasure(header,false);
 	}
-	
+
 	public void gotoMeasure(TGMeasureHeader header,boolean moveCaret){
 		if(header != null){
 			TGMeasure playingMeasure = null;
@@ -407,10 +414,10 @@ public void gotoMeasure(TGMeasureHeader header,boolean moveCaret){
 			}
 		}
 	}
-	
+
 	public void gotoPlayerPosition(){
 		TuxGuitar.instance().lock();
-		
+
 		MidiPlayer player = TuxGuitar.instance().getPlayer();
 		TGMeasureHeader header = getSongManager().getMeasureHeaderAt(MidiTickUtil.getStart(player.getTickPosition()));
 		if(header != null){
@@ -418,10 +425,10 @@ public void gotoPlayerPosition(){
 		}
 		TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().goToTickPosition();
 		TuxGuitar.instance().unlock();
-		
+
 		TuxGuitar.instance().updateCache(true);
 	}
-	
+
 	public void play(){
 		MidiPlayer player = TuxGuitar.instance().getPlayer();
 		if(!player.isRunning()){
@@ -435,7 +442,7 @@ public void play(){
 			player.pause();
 		}
 	}
-	
+
 	public void stop(){
 		MidiPlayer player = TuxGuitar.instance().getPlayer();
 		if(!player.isRunning()){
@@ -445,11 +452,12 @@ public void stop(){
 			player.reset();
 		}
 	}
-	
+
 	public void redraw(){
 		if(!TuxGuitar.instance().isLocked()){
 			if(!isDisposed()){
 				new SyncThread(new Runnable() {
+					@Override
 					public void run() {
 						if(!isDisposed() && !TuxGuitar.instance().isLocked()){
 							if(isEditingTickScale()){
@@ -457,7 +465,7 @@ public void run() {
 							}
 							else if(!TuxGuitar.instance().getPlayer().isRunning()){
 								long tickPosition = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getPosition();
-								
+
 								TGTransport.this.label.setText(Long.toString(tickPosition));
 								TGTransport.this.tickProgress.setSelection((int)tickPosition);
 							}
@@ -467,7 +475,7 @@ else if(!TuxGuitar.instance().getPlayer().isRunning()){
 			}
 		}
 	}
-	
+
 	public void redrawPlayingMode(){
 		if(!TuxGuitar.instance().isLocked()){
 			//TuxGuitar.instance().lock();
@@ -485,13 +493,15 @@ public void redrawPlayingMode(){
 			//TuxGuitar.instance().unlock();
 		}
 	}
-	
+
+	@Override
 	public void doRedraw(int type) {
 		if( type == TGRedrawListener.PLAYING_THREAD || type == TGRedrawListener.PLAYING_NEW_BEAT ){
 			this.redrawPlayingMode();
 		}
 	}
-	
+
+	@Override
 	public void doUpdate(int type) {
 		if( type == TGUpdateListener.SELECTION ){
 			this.updateItems();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/transport/TGTransportListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/transport/TGTransportListener.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/app/transport/TGTransportListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/transport/TGTransportListener.java
index d658e244..d3eac111 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/transport/TGTransportListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/transport/TGTransportListener.java
@@ -5,19 +5,21 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class TGTransportListener implements MidiPlayerListener{
-	
+
 	protected Object sync;
 	protected TGSynchronizer.TGRunnable startedRunnable;
 	protected TGSynchronizer.TGRunnable stoppedRunnable;
-	
+
 	public TGTransportListener(){
 		this.sync = new Object();
 		this.startedRunnable = getStartedRunnable();
 		this.stoppedRunnable = getStoppedRunnable();
 	}
-	
+
+	@Override
 	public void notifyStarted() {
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try {
 					TuxGuitar.instance().updateCache(true);
@@ -34,7 +36,8 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void notifyStopped() {
 		try {
 			if(!TuxGuitar.instance().getDisplay().isDisposed()){
@@ -44,13 +47,15 @@ public void notifyStopped() {
 			throwable.printStackTrace();
 		}
 	}
-	
+
+	@Override
 	public void notifyLoop(){
 		// Not implemented
 	}
-	
+
 	private TGSynchronizer.TGRunnable getStartedRunnable(){
 		return new TGSynchronizer.TGRunnable() {
+			@Override
 			public void run() {
 				if(TuxGuitar.instance().getPlayer().isRunning()){
 					TuxGuitar.instance().redrawPlayingMode();
@@ -58,19 +63,22 @@ public void run() {
 			}
 		};
 	}
-	
+
 	private TGSynchronizer.TGRunnable getStoppedRunnable(){
 		return new TGSynchronizer.TGRunnable() {
+			@Override
 			public void run() {
 				TuxGuitar.instance().getTransport().gotoPlayerPosition();
 			}
 		};
 	}
 
+	@Override
 	public void notifyCountDownStarted() {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void notifyCountDownStopped() {
 		// Not implemented
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/CannotRedoException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/CannotRedoException.java
new file mode 100644
index 00000000..472d2dbc
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/CannotRedoException.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 05-dic-2005
+ */
+package org.herac.tuxguitar.app.undo;
+
+/**
+ * @author julian
+ */
+public class CannotRedoException extends Exception{
+
+	private static final long serialVersionUID = 1L;
+
+	public CannotRedoException() {
+		super();
+	}
+
+	public CannotRedoException(String message) {
+		super(message);
+	}
+
+	public CannotRedoException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public CannotRedoException(Throwable cause) {
+		super(cause);
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/CannotUndoException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/CannotUndoException.java
new file mode 100644
index 00000000..38f9080c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/CannotUndoException.java
@@ -0,0 +1,28 @@
+/*
+ * Created on 05-dic-2005
+ */
+package org.herac.tuxguitar.app.undo;
+
+/**
+ * @author julian
+ */
+public class CannotUndoException extends Exception{
+
+	private static final long serialVersionUID = 1L;
+
+	public CannotUndoException() {
+		super();
+	}
+
+	public CannotUndoException(String message) {
+		super(message);
+	}
+
+	public CannotUndoException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public CannotUndoException(Throwable cause) {
+		super(cause);
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/UndoableEdit.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/UndoableEdit.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/UndoableEdit.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/UndoableEdit.java
index 19b7fec4..1f495feb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/UndoableEdit.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/UndoableEdit.java
@@ -3,12 +3,12 @@
 public interface UndoableEdit {
 	public static final int UNDO_ACTION = 1;
 	public static final int REDO_ACTION = 2;
-	
+
 	public void redo() throws CannotRedoException;
-	
+
 	public void undo() throws CannotUndoException;
-	
+
 	public boolean canRedo();
-	
+
 	public boolean canUndo();
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/UndoableManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/UndoableManager.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/UndoableManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/UndoableManager.java
index 69b024b2..07fa4d08 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/UndoableManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/UndoableManager.java
@@ -1,8 +1,5 @@
 /*
  * Created on 08-ago-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.undo;
 
@@ -10,22 +7,20 @@
 import java.util.List;
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class UndoableManager {
 	private static final int LIMIT = 100;
 	private int indexOfNextAdd;
-	private List edits;
-	
+	private List<UndoableEdit> edits;
+
 	public UndoableManager() {
 		this.init();
 	}
-	
+
 	public void discardAllEdits() {
 		this.reset();
 	}
-	
+
 	public synchronized void undo() throws CannotUndoException {
 		UndoableEdit edit = editToBeUndone();
 		if (edit == null) {
@@ -38,7 +33,7 @@ public synchronized void undo() throws CannotUndoException {
 		}
 		this.indexOfNextAdd--;
 	}
-	
+
 	public synchronized void redo() throws CannotRedoException {
 		UndoableEdit edit = editToBeRedone();
 		if (edit == null) {
@@ -51,7 +46,7 @@ public synchronized void redo() throws CannotRedoException {
 		}
 		this.indexOfNextAdd++;
 	}
-	
+
 	public synchronized boolean canUndo() {
 		boolean canUndo = false;
 		UndoableEdit edit = editToBeUndone();
@@ -60,7 +55,7 @@ public synchronized boolean canUndo() {
 		}
 		return canUndo;
 	}
-	
+
 	public synchronized boolean canRedo() {
 		boolean canRedo = false;
 		UndoableEdit edit = editToBeRedone();
@@ -69,57 +64,57 @@ public synchronized boolean canRedo() {
 		}
 		return canRedo;
 	}
-	
+
 	public synchronized void addEdit(UndoableEdit anEdit) {
 		checkForUnused();
 		checkForLimit();
 		this.edits.add(this.indexOfNextAdd, anEdit);
 		this.indexOfNextAdd++;
 	}
-	
+
 	private void checkForUnused() {
 		while (this.edits.size() > this.indexOfNextAdd) {
-			UndoableEdit edit = (UndoableEdit) this.edits.get(this.indexOfNextAdd);
+			UndoableEdit edit = this.edits.get(this.indexOfNextAdd);
 			remove(edit);
 		}
 	}
-	
+
 	private void checkForLimit() {
 		while (this.edits.size() >= LIMIT) {
-			UndoableEdit edit = (UndoableEdit) this.edits.get(0);
+			UndoableEdit edit = this.edits.get(0);
 			remove(edit);
 			this.indexOfNextAdd--;
 		}
 	}
-	
+
 	private void remove(UndoableEdit edit) {
 		this.edits.remove(edit);
 	}
-	
+
 	private UndoableEdit editToBeUndone() {
 		int index = this.indexOfNextAdd - 1;
 		if (index >= 0 && index < this.edits.size()) {
-			return (UndoableEdit) this.edits.get(index);
+			return this.edits.get(index);
 		}
 		return null;
 	}
-	
+
 	private UndoableEdit editToBeRedone() {
 		int index = this.indexOfNextAdd;
 		if (index >= 0 && index < this.edits.size()) {
-			return (UndoableEdit) this.edits.get(index);
+			return this.edits.get(index);
 		}
 		return null;
 	}
-	
+
 	private void init() {
 		this.indexOfNextAdd = 0;
-		this.edits = new ArrayList();
+		this.edits = new ArrayList<UndoableEdit>();
 	}
-	
+
 	private void reset() {
 		this.indexOfNextAdd = 0;
 		this.edits.clear();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/UndoableCaretHelper.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/UndoableCaretHelper.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/UndoableCaretHelper.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/UndoableCaretHelper.java
index e862698b..9df19e17 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/UndoableCaretHelper.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/UndoableCaretHelper.java
@@ -11,7 +11,7 @@ public class UndoableCaretHelper {
 	private int string;
 	private int velocity;
 	private TGDuration duration;
-	
+
 	public UndoableCaretHelper(){
 		Caret caret = getCaret();
 		this.track = caret.getTrack().getNumber();
@@ -24,14 +24,14 @@ public UndoableCaretHelper(){
 			this.string = instrumentString.getNumber();
 		}
 	}
-	
+
 	public void update(){
 		getCaret().update(this.track,this.position,this.string,this.velocity);
 		getCaret().setSelectedDuration(this.duration.clone(TuxGuitar.instance().getSongManager().getFactory()));
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/UndoableJoined.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/UndoableJoined.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/UndoableJoined.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/UndoableJoined.java
index 56bfffbf..00ff0f36 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/UndoableJoined.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/UndoableJoined.java
@@ -11,51 +11,55 @@ public class UndoableJoined implements UndoableEdit{
 	private int doAction;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	private List undoables;
-	
+	private List<UndoableEdit> undoables;
+
 	public UndoableJoined(){
 		this.doAction = UNDO_ACTION;
 		this.undoCaret = new UndoableCaretHelper();
-		this.undoables = new ArrayList();
+		this.undoables = new ArrayList<UndoableEdit>();
 	}
-	
+
 	public void addUndoableEdit(UndoableEdit undoable){
 		this.undoables.add(undoable);
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		int count = this.undoables.size();
 		for(int i = 0;i < count;i++){
-			UndoableEdit undoable = (UndoableEdit)this.undoables.get(i);
+			UndoableEdit undoable = this.undoables.get(i);
 			undoable.redo();
 		}
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		int count = this.undoables.size();
 		for(int i = (count - 1);i >= 0;i--){
-			UndoableEdit undoable = (UndoableEdit)this.undoables.get(i);
+			UndoableEdit undoable = this.undoables.get(i);
 			undoable.undo();
 		}
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public UndoableJoined endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		return this;
 	}
-	
+
 	public boolean isEmpty(){
 		return this.undoables.isEmpty();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/channel/UndoableChannelGeneric.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/channel/UndoableChannelGeneric.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/channel/UndoableChannelGeneric.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/channel/UndoableChannelGeneric.java
index 3fc2ab43..753d92e4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/channel/UndoableChannelGeneric.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/channel/UndoableChannelGeneric.java
@@ -16,13 +16,14 @@ public class UndoableChannelGeneric implements UndoableEdit{
 	private int doAction;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	private List undoChannels;
-	private List redoChannels;
-	
+	private List<TGChannel> undoChannels;
+	private List<TGChannel> redoChannels;
+
 	private UndoableChannelGeneric(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -31,7 +32,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -40,15 +42,17 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChannelGeneric startUndo(){
 		UndoableChannelGeneric undoable = new UndoableChannelGeneric();
 		undoable.doAction = UNDO_ACTION;
@@ -56,35 +60,35 @@ public static UndoableChannelGeneric startUndo(){
 		undoable.undoChannels = undoable.getChannels();
 		return undoable;
 	}
-	
+
 	public UndoableChannelGeneric endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoChannels = getChannels();
 		return this;
 	}
-	
-	private List getChannels(){
-		List channels = new ArrayList();
-		Iterator it = TuxGuitar.instance().getSongManager().getChannels().iterator();
+
+	private List<TGChannel> getChannels(){
+		List<TGChannel> channels = new ArrayList<TGChannel>();
+		Iterator<TGChannel> it = TuxGuitar.instance().getSongManager().getChannels().iterator();
 		while( it.hasNext() ){
-			channels.add(cloneChannel((TGChannel)it.next()));
+			channels.add(cloneChannel(it.next()));
 		}
 		return channels;
 	}
-	
+
 	private TGChannel cloneChannel(TGChannel channel){
 		return channel.clone(TuxGuitar.instance().getSongManager().getFactory());
 	}
-	
-	private void updateSongChannels( List channels ){
+
+	private void updateSongChannels( List<TGChannel> channels ){
 		TGSongManager tgSongManager = TuxGuitar.instance().getSongManager();
 		tgSongManager.removeAllChannels();
-		
-		Iterator it = channels.iterator();
+
+		Iterator<TGChannel> it = channels.iterator();
 		while( it.hasNext() ){
-			tgSongManager.addChannel(cloneChannel((TGChannel)it.next()));
+			tgSongManager.addChannel(cloneChannel(it.next()));
 		}
-		
+
 		TuxGuitar.instance().updateCache(true);
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/channel/UndoableModifyChannel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/channel/UndoableModifyChannel.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/channel/UndoableModifyChannel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/channel/UndoableModifyChannel.java
index e04b7b53..6ed260e1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/channel/UndoableModifyChannel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/channel/UndoableModifyChannel.java
@@ -9,46 +9,50 @@
 import org.herac.tuxguitar.song.models.TGChannel;
 
 public class UndoableModifyChannel implements UndoableEdit{
-	
+
 	private int channelId;
 	private int doAction;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
 	private TGChannel undoChannel;
 	private TGChannel redoChannel;
-	
+
 	private UndoableModifyChannel(int channelId){
 		this.channelId = channelId;
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
 		}
 		this.updateSongChannel(this.redoChannel);
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		this.updateSongChannel(this.undoChannel);
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableModifyChannel startUndo(int channelId){
 		UndoableModifyChannel undoable = new UndoableModifyChannel(channelId);
 		undoable.doAction = UNDO_ACTION;
@@ -56,38 +60,38 @@ public static UndoableModifyChannel startUndo(int channelId){
 		undoable.undoChannel = undoable.cloneChannel(undoable.getChannel());
 		return undoable;
 	}
-	
+
 	public UndoableModifyChannel endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoChannel = cloneChannel(getChannel());
 		return this;
 	}
-	
+
 	private TGChannel cloneChannel(TGChannel channel){
 		return channel.clone(TuxGuitar.instance().getSongManager().getFactory());
 	}
-	
+
 	private TGChannel getChannel(){
 		return TuxGuitar.instance().getSongManager().getChannel(this.channelId);
 	}
-	
+
 	private void updateSongChannel(TGChannel channel){
 		TGSongManager tgSongManager = TuxGuitar.instance().getSongManager();
 		tgSongManager.updateChannel(
-			channel.getChannelId(), 
-			channel.getChannel(), 
-			channel.getEffectChannel(), 
-			channel.getBank(), 
-			channel.getProgram(), 
-			channel.getVolume(), 
-			channel.getBalance(), 
-			channel.getChorus(), 
-			channel.getReverb(), 
-			channel.getPhaser(), 
-			channel.getTremolo(), 
+			channel.getChannelId(),
+			channel.getChannel(),
+			channel.getEffectChannel(),
+			channel.getBank(),
+			channel.getProgram(),
+			channel.getVolume(),
+			channel.getBalance(),
+			channel.getChorus(),
+			channel.getReverb(),
+			channel.getPhaser(),
+			channel.getTremolo(),
 			channel.getName()
 		);
-		
+
 		TuxGuitar.instance().updateCache(true);
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeAlternativeRepeat.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeAlternativeRepeat.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeAlternativeRepeat.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeAlternativeRepeat.java
index fe9bdb68..455e22d5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeAlternativeRepeat.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeAlternativeRepeat.java
@@ -16,11 +16,12 @@ public class UndoableChangeAlternativeRepeat implements UndoableEdit{
 	private long position;
 	private int undoRepeatAlternative;
 	private int redoRepeatAlternative;
-	
+
 	private UndoableChangeAlternativeRepeat(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -30,10 +31,11 @@ public void redo() throws CannotRedoException {
 		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -43,18 +45,20 @@ public void undo() throws CannotUndoException {
 		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeAlternativeRepeat startUndo(){
 		UndoableChangeAlternativeRepeat undoable = new UndoableChangeAlternativeRepeat();
 		Caret caret = getCaret();
@@ -62,18 +66,18 @@ public static UndoableChangeAlternativeRepeat startUndo(){
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.position = caret.getPosition();
 		undoable.undoRepeatAlternative = caret.getMeasure().getHeader().getRepeatAlternative();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableChangeAlternativeRepeat endUndo(int redoRepeatAlternative){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoRepeatAlternative = redoRepeatAlternative;
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeClef.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeClef.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeClef.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeClef.java
index 3712d0df..aa7d089e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeClef.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeClef.java
@@ -11,6 +11,7 @@
 import org.herac.tuxguitar.app.undo.UndoableEdit;
 import org.herac.tuxguitar.app.undo.undoables.UndoableCaretHelper;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
+import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class UndoableChangeClef implements UndoableEdit{
@@ -20,14 +21,15 @@ public class UndoableChangeClef implements UndoableEdit{
 	private long position;
 	private int redoableClef;
 	private int undoableClef;
-	private List nextClefPositions;
+	private List<ClefPosition> nextClefPositions;
 	private boolean toEnd;
 	private TGTrack track;
-	
+
 	private UndoableChangeClef(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -35,36 +37,39 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().getTrackManager().changeClef(this.track,this.position,this.redoableClef,this.toEnd);
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		TuxGuitar.instance().getSongManager().getTrackManager().changeClef(this.track,this.position,this.undoableClef,this.toEnd);
 		if(this.toEnd){
-			Iterator it = this.nextClefPositions.iterator();
+			Iterator<ClefPosition> it = this.nextClefPositions.iterator();
 			while(it.hasNext()){
-				ClefPosition ksp = (ClefPosition)it.next();
+				ClefPosition ksp = it.next();
 				TuxGuitar.instance().getSongManager().getTrackManager().changeClef(this.track,ksp.getPosition(),ksp.getClef(),true);
 			}
 		}
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeClef startUndo(){
 		UndoableChangeClef undoable = new UndoableChangeClef();
 		Caret caret = getCaret();
@@ -73,10 +78,10 @@ public static UndoableChangeClef startUndo(){
 		undoable.position = caret.getPosition();
 		undoable.undoableClef = caret.getMeasure().getClef();
 		undoable.track = caret.getTrack();
-		undoable.nextClefPositions = new ArrayList();
-		
+		undoable.nextClefPositions = new ArrayList<ClefPosition>();
+
 		int prevClef = undoable.undoableClef;
-		Iterator it = caret.getTrack().getMeasures();
+		Iterator<TGMeasure> it = caret.getTrack().getMeasures();
 		while(it.hasNext()){
 			TGMeasureImpl measure = (TGMeasureImpl)it.next();
 			if(measure.getStart() > undoable.position){
@@ -88,34 +93,34 @@ public static UndoableChangeClef startUndo(){
 				prevClef = currClef;
 			}
 		}
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableChangeClef endUndo(int clef,boolean toEnd){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoableClef = clef;
 		this.toEnd = toEnd;
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 	private class ClefPosition{
-		private long position;
-		private int clef;
-		
+		private final long position;
+		private final int clef;
+
 		public ClefPosition(long position,int clef) {
 			this.position = position;
 			this.clef = clef;
 		}
-		
+
 		public long getPosition() {
 			return this.position;
 		}
-		
+
 		public int getClef() {
 			return this.clef;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeCloseRepeat.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeCloseRepeat.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeCloseRepeat.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeCloseRepeat.java
index 4f980ab0..0424fea2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeCloseRepeat.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeCloseRepeat.java
@@ -16,11 +16,12 @@ public class UndoableChangeCloseRepeat implements UndoableEdit{
 	private long position;
 	private int undoRepeatClose;
 	private int redoRepeatClose;
-	
+
 	private UndoableChangeCloseRepeat(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -30,10 +31,11 @@ public void redo() throws CannotRedoException {
 		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -43,39 +45,41 @@ public void undo() throws CannotUndoException {
 		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeCloseRepeat startUndo(){
 		Caret caret = getCaret();
 		return startUndo(caret.getPosition(),caret.getMeasure().getRepeatClose());
 	}
-	
+
 	public static UndoableChangeCloseRepeat startUndo(long position,int repeatClose){
 		UndoableChangeCloseRepeat undoable = new UndoableChangeCloseRepeat();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.position = position;
 		undoable.undoRepeatClose = repeatClose;
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableChangeCloseRepeat endUndo(int redoRepeatClose){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoRepeatClose = redoRepeatClose;
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeDoubleBar.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeDoubleBar.java
new file mode 100644
index 00000000..4263031f
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeDoubleBar.java
@@ -0,0 +1,79 @@
+package org.herac.tuxguitar.app.undo.undoables.custom;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.editors.tab.Caret;
+import org.herac.tuxguitar.app.undo.CannotRedoException;
+import org.herac.tuxguitar.app.undo.CannotUndoException;
+import org.herac.tuxguitar.app.undo.UndoableEdit;
+import org.herac.tuxguitar.app.undo.undoables.UndoableCaretHelper;
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.models.TGMeasure;
+
+public class UndoableChangeDoubleBar implements UndoableEdit{
+	private int doAction;
+	private UndoableCaretHelper undoCaret;
+	private UndoableCaretHelper redoCaret;
+	private long position;
+
+	private UndoableChangeDoubleBar(){
+		super();
+	}
+
+	@Override
+	public void redo() throws CannotRedoException {
+		if(!canRedo()){
+			throw new CannotRedoException();
+		}
+		TGSongManager manager = TuxGuitar.instance().getSongManager();
+		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
+		measure.getHeader().setDoubleBar(!measure.getHeader().hasDoubleBar());
+		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
+		this.redoCaret.update();
+
+		this.doAction = UNDO_ACTION;
+	}
+
+	@Override
+	public void undo() throws CannotUndoException {
+		if(!canUndo()){
+			throw new CannotUndoException();
+		}
+		TGSongManager manager = TuxGuitar.instance().getSongManager();
+		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
+		measure.getHeader().setDoubleBar(!measure.getHeader().hasDoubleBar());
+		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
+		this.undoCaret.update();
+
+		this.doAction = REDO_ACTION;
+	}
+
+	@Override
+	public boolean canRedo() {
+		return (this.doAction == REDO_ACTION);
+	}
+
+	@Override
+	public boolean canUndo() {
+		return (this.doAction == UNDO_ACTION);
+	}
+
+	public static UndoableChangeDoubleBar startUndo(){
+		UndoableChangeDoubleBar undoable = new UndoableChangeDoubleBar();
+		Caret caret = getCaret();
+		undoable.doAction = UNDO_ACTION;
+		undoable.undoCaret = new UndoableCaretHelper();
+		undoable.position = caret.getPosition();
+
+		return undoable;
+	}
+
+	public UndoableChangeDoubleBar endUndo(){
+		this.redoCaret = new UndoableCaretHelper();
+		return this;
+	}
+
+	private static Caret getCaret(){
+		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeInfo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeInfo.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeInfo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeInfo.java
index 245f6e84..c5f0b248 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeInfo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeInfo.java
@@ -29,11 +29,12 @@ public class UndoableChangeInfo implements UndoableEdit{
 	private String redoWriter;
 	private String redoTranscriber;
 	private String redoComments;
-	
+
 	private UndoableChangeInfo(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -41,10 +42,11 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().setProperties(this.redoName,this.redoArtist,this.redoAlbum,this.redoAuthor,this.redoDate,this.redoCopyright,this.redoWriter,this.redoTranscriber,this.redoComments);
 		TuxGuitar.instance().showTitle();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -52,18 +54,20 @@ public void undo() throws CannotUndoException {
 		TuxGuitar.instance().getSongManager().setProperties(this.undoName,this.undoArtist,this.undoAlbum,this.undoAuthor,this.undoDate,this.undoCopyright,this.undoWriter,this.undoTranscriber,this.undoComments);
 		TuxGuitar.instance().showTitle();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeInfo startUndo(){
 		TGSong song = TuxGuitar.instance().getSongManager().getSong();
 		UndoableChangeInfo undoable = new UndoableChangeInfo();
@@ -77,10 +81,10 @@ public static UndoableChangeInfo startUndo(){
 		undoable.undoCopyright = song.getCopyright();
 		undoable.undoWriter = song.getWriter();
 		undoable.undoTranscriber = song.getTranscriber();
-		undoable.undoComments = song.getComments();		
+		undoable.undoComments = song.getComments();
 		return undoable;
 	}
-	
+
 	public UndoableChangeInfo endUndo(){
 		TGSong song = TuxGuitar.instance().getSongManager().getSong();
 		this.redoCaret = new UndoableCaretHelper();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeKeySignature.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeKeySignature.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeKeySignature.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeKeySignature.java
index 7ad6e65f..6a2428ce 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeKeySignature.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeKeySignature.java
@@ -11,6 +11,7 @@
 import org.herac.tuxguitar.app.undo.UndoableEdit;
 import org.herac.tuxguitar.app.undo.undoables.UndoableCaretHelper;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
+import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class UndoableChangeKeySignature implements UndoableEdit{
@@ -20,14 +21,15 @@ public class UndoableChangeKeySignature implements UndoableEdit{
 	private long position;
 	private int redoableKeySignature;
 	private int undoableKeySignature;
-	private List nextKeySignaturePositions;
+	private List<KeySignaturePosition> nextKeySignaturePositions;
 	private boolean toEnd;
 	private TGTrack track;
-	
+
 	private UndoableChangeKeySignature(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -35,36 +37,39 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().getTrackManager().changeKeySignature(this.track,this.position,this.redoableKeySignature,this.toEnd);
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		TuxGuitar.instance().getSongManager().getTrackManager().changeKeySignature(this.track,this.position,this.undoableKeySignature,this.toEnd);
 		if(this.toEnd){
-			Iterator it = this.nextKeySignaturePositions.iterator();
+			Iterator<KeySignaturePosition> it = this.nextKeySignaturePositions.iterator();
 			while(it.hasNext()){
-				KeySignaturePosition ksp = (KeySignaturePosition)it.next();
+				KeySignaturePosition ksp = it.next();
 				TuxGuitar.instance().getSongManager().getTrackManager().changeKeySignature(this.track,ksp.getPosition(),ksp.getKeySignature(),true);
 			}
 		}
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeKeySignature startUndo(){
 		UndoableChangeKeySignature undoable = new UndoableChangeKeySignature();
 		Caret caret = getCaret();
@@ -73,10 +78,10 @@ public static UndoableChangeKeySignature startUndo(){
 		undoable.position = caret.getPosition();
 		undoable.undoableKeySignature = caret.getMeasure().getKeySignature();
 		undoable.track = caret.getTrack();
-		undoable.nextKeySignaturePositions = new ArrayList();
-		
+		undoable.nextKeySignaturePositions = new ArrayList<KeySignaturePosition>();
+
 		int prevKeySignature = undoable.undoableKeySignature;
-		Iterator it = caret.getTrack().getMeasures();
+		Iterator<TGMeasure> it = caret.getTrack().getMeasures();
 		while(it.hasNext()){
 			TGMeasureImpl measure = (TGMeasureImpl)it.next();
 			if(measure.getStart() > undoable.position){
@@ -88,34 +93,34 @@ public static UndoableChangeKeySignature startUndo(){
 				prevKeySignature = currKeySignature;
 			}
 		}
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableChangeKeySignature endUndo(int keySignature,boolean toEnd){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoableKeySignature = keySignature;
 		this.toEnd = toEnd;
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 	private class KeySignaturePosition{
-		private long position;
-		private int keySignature;
-		
+		private final long position;
+		private final int keySignature;
+
 		public KeySignaturePosition(long position,int keySignature) {
 			this.position = position;
 			this.keySignature = keySignature;
 		}
-		
+
 		public long getPosition() {
 			return this.position;
 		}
-		
+
 		public int getKeySignature() {
 			return this.keySignature;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeMarker.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeMarker.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeMarker.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeMarker.java
index 4a7df269..2bbda38b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeMarker.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeMarker.java
@@ -14,11 +14,12 @@ public class UndoableChangeMarker implements UndoableEdit{
 	private UndoableCaretHelper redoCaret;
 	private TGMarker undoMarker;
 	private TGMarker redoMarker;
-	
+
 	private UndoableChangeMarker(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -33,7 +34,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -48,24 +50,26 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeMarker startUndo(TGMarker marker){
 		UndoableChangeMarker undoable = new UndoableChangeMarker();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.undoMarker = (marker == null)?null:(TGMarker)marker.clone(TuxGuitar.instance().getSongManager().getFactory());
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableChangeMarker endUndo(TGMarker marker){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoMarker = (marker == null)?null:(TGMarker)marker.clone(TuxGuitar.instance().getSongManager().getFactory());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeOpenRepeat.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeOpenRepeat.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeOpenRepeat.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeOpenRepeat.java
index 2b585d63..a612b7fb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeOpenRepeat.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeOpenRepeat.java
@@ -14,11 +14,12 @@ public class UndoableChangeOpenRepeat implements UndoableEdit{
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
 	private long position;
-	
+
 	private UndoableChangeOpenRepeat(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -28,10 +29,11 @@ public void redo() throws CannotRedoException {
 		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -41,35 +43,37 @@ public void undo() throws CannotUndoException {
 		TGMeasure measure = manager.getTrackManager().getMeasureAt(manager.getFirstTrack(),this.position);
 		TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(measure.getNumber());
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeOpenRepeat startUndo(){
 		UndoableChangeOpenRepeat undoable = new UndoableChangeOpenRepeat();
 		Caret caret = getCaret();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.position = caret.getPosition();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableChangeOpenRepeat endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTempo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTempo.java
similarity index 78%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTempo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTempo.java
index 2fcc1848..a9f9304d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTempo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTempo.java
@@ -16,43 +16,47 @@ public class UndoableChangeTempo implements UndoableEdit{
 	private int doAction;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	private List undoableTempos;
-	private List redoableTempos;
-	
+	private final List<TGTempo> undoableTempos;
+	private final List<TGTempo> redoableTempos;
+
 	private UndoableChangeTempo(){
 		super();
-		this.undoableTempos = new ArrayList();
-		this.redoableTempos = new ArrayList();
+		this.undoableTempos = new ArrayList<TGTempo>();
+		this.redoableTempos = new ArrayList<TGTempo>();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
 		}
 		this.setTempos(this.redoableTempos);
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		this.setTempos(this.undoableTempos);
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeTempo startUndo(){
 		UndoableChangeTempo undoable = new UndoableChangeTempo();
 		undoable.doAction = UNDO_ACTION;
@@ -60,28 +64,28 @@ public static UndoableChangeTempo startUndo(){
 		undoable.getTempos(undoable.undoableTempos);
 		return undoable;
 	}
-	
+
 	public UndoableChangeTempo endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		this.getTempos(this.redoableTempos);
 		return this;
 	}
-	
-	private void getTempos(List list){
-		Iterator it = TuxGuitar.instance().getSongManager().getSong().getMeasureHeaders();
+
+	private void getTempos(List<TGTempo> list){
+		Iterator<TGMeasureHeader> it = TuxGuitar.instance().getSongManager().getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			list.add(header.getTempo().clone(TuxGuitar.instance().getSongManager().getFactory()));
 		}
 	}
-	
-	private void setTempos(List tempos){
+
+	private void setTempos(List<TGTempo> tempos){
 		int length = tempos.size();
 		if(length != TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders()){
 			return;
 		}
 		for(int i =0; i < length; i ++){
-			TGTempo tempo = ((TGTempo)tempos.get(i)).clone(TuxGuitar.instance().getSongManager().getFactory());
+			TGTempo tempo = tempos.get(i).clone(TuxGuitar.instance().getSongManager().getFactory());
 			TuxGuitar.instance().getSongManager().changeTempo(TuxGuitar.instance().getSongManager().getMeasureHeader(i + 1),tempo);
 		}
 		TuxGuitar.instance().fireUpdate();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTimeSignature.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTimeSignature.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTimeSignature.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTimeSignature.java
index 4fe555bf..35d853e2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTimeSignature.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTimeSignature.java
@@ -17,11 +17,12 @@ public class UndoableChangeTimeSignature implements UndoableEdit{
 	private long tsStart;
 	private boolean tsToEnd;
 	private TGTimeSignature ts;
-	
+
 	private UndoableChangeTimeSignature(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -31,7 +32,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -43,15 +45,17 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeTimeSignature startUndo(){
 		TGFactory factory = new TGFactory();
 		TGSong song = TuxGuitar.instance().getTablatureEditor().getTablature().getSongManager().getSong();
@@ -61,7 +65,7 @@ public static UndoableChangeTimeSignature startUndo(){
 		undoable.song = song.clone(factory);
 		return undoable;
 	}
-	
+
 	public UndoableChangeTimeSignature endUndo(TGTimeSignature timeSignature,long start, boolean toEnd){
 		this.ts = timeSignature;
 		this.tsStart = start;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTripletFeel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTripletFeel.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTripletFeel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTripletFeel.java
index aa907c20..06c9d3fc 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTripletFeel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/custom/UndoableChangeTripletFeel.java
@@ -11,6 +11,7 @@
 import org.herac.tuxguitar.app.undo.UndoableEdit;
 import org.herac.tuxguitar.app.undo.undoables.UndoableCaretHelper;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
+import org.herac.tuxguitar.song.models.TGMeasure;
 
 public class UndoableChangeTripletFeel implements UndoableEdit{
 	private int doAction;
@@ -19,13 +20,14 @@ public class UndoableChangeTripletFeel implements UndoableEdit{
 	private long position;
 	private int redoableTripletFeel;
 	private int undoableTripletFeel;
-	private List nextTripletFeelPositions;
+	private List<TripletFeelPosition> nextTripletFeelPositions;
 	private boolean toEnd;
-	
+
 	private UndoableChangeTripletFeel(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -33,36 +35,39 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().changeTripletFeel(this.position,this.redoableTripletFeel,this.toEnd);
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		TuxGuitar.instance().getSongManager().changeTripletFeel(this.position,this.undoableTripletFeel,this.toEnd);
 		if(this.toEnd){
-			Iterator it = this.nextTripletFeelPositions.iterator();
+			Iterator<TripletFeelPosition> it = this.nextTripletFeelPositions.iterator();
 			while(it.hasNext()){
-				TripletFeelPosition tfp = (TripletFeelPosition)it.next();
+				TripletFeelPosition tfp = it.next();
 				TuxGuitar.instance().getSongManager().changeTripletFeel(tfp.getPosition(),tfp.getTripletFeel(),true);
 			}
 		}
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableChangeTripletFeel startUndo(){
 		UndoableChangeTripletFeel undoable = new UndoableChangeTripletFeel();
 		Caret caret = getCaret();
@@ -70,10 +75,10 @@ public static UndoableChangeTripletFeel startUndo(){
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.position = caret.getPosition();
 		undoable.undoableTripletFeel = caret.getMeasure().getTripletFeel();
-		undoable.nextTripletFeelPositions = new ArrayList();
-		
+		undoable.nextTripletFeelPositions = new ArrayList<TripletFeelPosition>();
+
 		int prevTripletFeel = undoable.undoableTripletFeel;
-		Iterator it = TuxGuitar.instance().getSongManager().getFirstTrack().getMeasures();
+		Iterator<TGMeasure> it = TuxGuitar.instance().getSongManager().getFirstTrack().getMeasures();
 		while(it.hasNext()){
 			TGMeasureImpl measure = (TGMeasureImpl)it.next();
 			if(measure.getStart() > undoable.position){
@@ -87,23 +92,23 @@ public static UndoableChangeTripletFeel startUndo(){
 		}
 		return undoable;
 	}
-	
+
 	public UndoableChangeTripletFeel endUndo(int tripletFeel,boolean toEnd){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoableTripletFeel = tripletFeel;
 		this.toEnd = toEnd;
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
-	
+
+
 	private class TripletFeelPosition{
-		private long position;
-		private int tripletFeel;
-		
+		private final long position;
+		private final int tripletFeel;
+
 		public TripletFeelPosition(long position,int tripletFeel) {
 			this.position = position;
 			this.tripletFeel = tripletFeel;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableAddMeasure.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableAddMeasure.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableAddMeasure.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableAddMeasure.java
index 37c9df8f..020a0e05 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableAddMeasure.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableAddMeasure.java
@@ -11,11 +11,12 @@ public class UndoableAddMeasure implements UndoableEdit{
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
 	private int number;
-	
+
 	private UndoableAddMeasure(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -23,10 +24,11 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().addNewMeasure(this.number);
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -34,18 +36,20 @@ public void undo() throws CannotUndoException {
 		TuxGuitar.instance().getSongManager().removeMeasure(this.number);
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableAddMeasure startUndo(int number){
 		UndoableAddMeasure undoable = new UndoableAddMeasure();
 		undoable.undoCaret = new UndoableCaretHelper();
@@ -53,10 +57,10 @@ public static UndoableAddMeasure startUndo(int number){
 		undoable.number = number;
 		return undoable;
 	}
-	
+
 	public UndoableAddMeasure endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableInsertMeasure.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableInsertMeasure.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableInsertMeasure.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableInsertMeasure.java
index 76d3d837..022b94c4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableInsertMeasure.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableInsertMeasure.java
@@ -19,7 +19,7 @@ public class UndoableInsertMeasure implements UndoableEdit{
 	private int copyCount;
 	private int fromNumber;
 	private long theMove;
-	
+
 	public UndoableInsertMeasure(int toTrack){
 		Caret caret = getCaret();
 		this.doAction = UNDO_ACTION;
@@ -27,7 +27,8 @@ public UndoableInsertMeasure(int toTrack){
 		this.undoCaret = new UndoableCaretHelper();
 		this.insertPosition = caret.getPosition();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -36,10 +37,11 @@ public void redo() throws CannotRedoException {
 		helper.insertMeasures(this.tracksMeasures.clone(TuxGuitar.instance().getSongManager().getFactory()),this.fromNumber,this.theMove,this.toTrack);
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -49,18 +51,20 @@ public void undo() throws CannotUndoException {
 		}
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public UndoableInsertMeasure endUndo(TGSongSegment tracksMeasures,int copyCount,int fromNumber,long theMove){
 		this.redoCaret = new UndoableCaretHelper();
 		this.copyCount = copyCount;
@@ -69,9 +73,9 @@ public UndoableInsertMeasure endUndo(TGSongSegment tracksMeasures,int copyCount,
 		this.theMove = theMove;
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableMeasureGeneric.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableMeasureGeneric.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableMeasureGeneric.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableMeasureGeneric.java
index 43130dc7..6dd2928c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableMeasureGeneric.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableMeasureGeneric.java
@@ -17,11 +17,12 @@ public class UndoableMeasureGeneric implements UndoableEdit{
 	private UndoableCaretHelper redoCaret;
 	private TGMeasure undoMeasure;
 	private TGMeasure redoMeasure;
-	
+
 	private UndoableMeasureGeneric(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -30,7 +31,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -39,15 +41,17 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	private void replace(TGMeasure replace){
 		TGTrack track = TuxGuitar.instance().getSongManager().getTrack(this.trackNumber);
 		if(track != null && replace != null){
@@ -57,7 +61,7 @@ private void replace(TGMeasure replace){
 			TuxGuitar.instance().getTablatureEditor().getTablature().updateMeasure(header.getNumber());
 		}
 	}
-	
+
 	public static UndoableMeasureGeneric startUndo( TGMeasure measure ){
 		UndoableMeasureGeneric undoable = new UndoableMeasureGeneric();
 		undoable.doAction = UNDO_ACTION;
@@ -66,13 +70,13 @@ public static UndoableMeasureGeneric startUndo( TGMeasure measure ){
 		undoable.undoMeasure = measure.clone(TuxGuitar.instance().getSongManager().getFactory(),measure.getHeader().clone(TuxGuitar.instance().getSongManager().getFactory()));
 		return undoable;
 	}
-	
+
 	public UndoableMeasureGeneric endUndo( TGMeasure measure ){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoMeasure = measure.clone(TuxGuitar.instance().getSongManager().getFactory(),measure.getHeader().clone(TuxGuitar.instance().getSongManager().getFactory()));
 		return this;
 	}
-	
+
 	public static UndoableMeasureGeneric startUndo(){
 		/*
 		UndoableMeasureGeneric undoable = new UndoableMeasureGeneric();
@@ -85,7 +89,7 @@ public static UndoableMeasureGeneric startUndo(){
 		*/
 		return startUndo( getCaret().getMeasure() );
 	}
-	
+
 	public UndoableMeasureGeneric endUndo(){
 		/*
 		Caret caret = getCaret();
@@ -95,7 +99,7 @@ public UndoableMeasureGeneric endUndo(){
 		*/
 		return endUndo( getCaret().getMeasure() );
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableRemoveMeasure.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableRemoveMeasure.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableRemoveMeasure.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableRemoveMeasure.java
index 10e1e0dc..6d0b2ed9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableRemoveMeasure.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableRemoveMeasure.java
@@ -15,13 +15,13 @@
 
 public class UndoableRemoveMeasure implements UndoableEdit{
 	private int doAction;
-	private UndoableCaretHelper undoCaret;
+	private final UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	private TGSongSegment tracksMeasures;
-	private UndoMarkers undoMarkers;
-	private int n1;
-	private int n2;
-	
+	private final TGSongSegment tracksMeasures;
+	private final UndoMarkers undoMarkers;
+	private final int n1;
+	private final int n2;
+
 	public UndoableRemoveMeasure(int n1,int n2){
 		this.doAction = UNDO_ACTION;
 		this.undoCaret = new UndoableCaretHelper();
@@ -30,60 +30,64 @@ public UndoableRemoveMeasure(int n1,int n2){
 		this.tracksMeasures = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).copyMeasures(n1,n2);
 		this.undoMarkers = new UndoMarkers();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
 		}
 		TuxGuitar.instance().getSongManager().removeMeasureHeaders(this.n1,this.n2);
 		TuxGuitar.instance().fireUpdate();
-		
+
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).insertMeasures(this.tracksMeasures.clone(TuxGuitar.instance().getSongManager().getFactory()),this.n1,0,0);
-		
+
 		TuxGuitar.instance().fireUpdate();
 		this.undoMarkers.undo();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public UndoableRemoveMeasure endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		return this;
 	}
-	
+
 	private class UndoMarkers{
-		private List markers;
-		
+		private final List<TGMarker> markers;
+
 		public UndoMarkers(){
-			this.markers = new ArrayList();
-			Iterator it = TuxGuitar.instance().getSongManager().getMarkers().iterator();
+			this.markers = new ArrayList<TGMarker>();
+			Iterator<TGMarker> it = TuxGuitar.instance().getSongManager().getMarkers().iterator();
 			while(it.hasNext()){
-				this.markers.add(((TGMarker)it.next()).clone(TuxGuitar.instance().getSongManager().getFactory()));
+				this.markers.add(it.next().clone(TuxGuitar.instance().getSongManager().getFactory()));
 			}
 		}
-		
+
 		public void undo(){
 			TuxGuitar.instance().getSongManager().removeAllMarkers();
-			Iterator it = this.markers.iterator();
+			Iterator<TGMarker> it = this.markers.iterator();
 			while(it.hasNext()){
-				TGMarker marker = (TGMarker)it.next();
+				TGMarker marker = it.next();
 				TuxGuitar.instance().getSongManager().updateMarker(marker.clone(TuxGuitar.instance().getSongManager().getFactory()));
 			}
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableReplaceMeasures.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableReplaceMeasures.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableReplaceMeasures.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableReplaceMeasures.java
index 5e9ad1d0..933151a4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/measure/UndoableReplaceMeasures.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/measure/UndoableReplaceMeasures.java
@@ -15,16 +15,16 @@
 
 public class UndoableReplaceMeasures implements UndoableEdit{
 	private int doAction;
-	private UndoableCaretHelper undoCaret;
+	private final UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	private UndoMarkers undoMarkers;
-	private TGSongSegment undoTrackMeasures;
+	private final UndoMarkers undoMarkers;
+	private final TGSongSegment undoTrackMeasures;
 	private TGSongSegment redoTrackMeasures;
-	private int toTrack;
+	private final int toTrack;
 	private int count;
 	private int freeSpace;
 	private long theMove;
-	
+
 	public UndoableReplaceMeasures(int p1,int p2,int toTrack){
 		this.doAction = UNDO_ACTION;
 		this.toTrack = toTrack;
@@ -32,7 +32,8 @@ public UndoableReplaceMeasures(int p1,int p2,int toTrack){
 		this.undoMarkers = new UndoMarkers();
 		this.undoTrackMeasures = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).copyMeasures(p1,p2);
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -41,38 +42,41 @@ public void redo() throws CannotRedoException {
 			TuxGuitar.instance().getSongManager().addNewMeasureBeforeEnd();
 		}
 		new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).replaceMeasures(this.redoTrackMeasures.clone(TuxGuitar.instance().getSongManager().getFactory()),this.theMove,this.toTrack);
-		
+
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
-		
+
 		for(int i = this.freeSpace;i < this.count;i ++){
 			TuxGuitar.instance().getSongManager().removeLastMeasure();
 		}
 		new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).replaceMeasures(this.undoTrackMeasures.clone(TuxGuitar.instance().getSongManager().getFactory()),0,0);
-		
+
 		TuxGuitar.instance().fireUpdate();
 		this.undoMarkers.undo();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public UndoableReplaceMeasures endUndo(TGSongSegment tracksMeasures,int count,int freeSpace,long theMove){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoTrackMeasures = tracksMeasures;
@@ -81,23 +85,23 @@ public UndoableReplaceMeasures endUndo(TGSongSegment tracksMeasures,int count,in
 		this.theMove = theMove;
 		return this;
 	}
-	
+
 	private class UndoMarkers{
-		private List markers;
-		
+		private final List<TGMarker> markers;
+
 		public UndoMarkers(){
-			this.markers = new ArrayList();
-			Iterator it = TuxGuitar.instance().getSongManager().getMarkers().iterator();
+			this.markers = new ArrayList<TGMarker>();
+			Iterator<TGMarker> it = TuxGuitar.instance().getSongManager().getMarkers().iterator();
 			while(it.hasNext()){
-				this.markers.add(((TGMarker)it.next()).clone(TuxGuitar.instance().getSongManager().getFactory()));
+				this.markers.add(it.next().clone(TuxGuitar.instance().getSongManager().getFactory()));
 			}
 		}
-		
+
 		public void undo(){
 			TuxGuitar.instance().getSongManager().removeAllMarkers();
-			Iterator it = this.markers.iterator();
+			Iterator<TGMarker> it = this.markers.iterator();
 			while(it.hasNext()){
-				TGMarker marker = (TGMarker)it.next();
+				TGMarker marker = it.next();
 				TuxGuitar.instance().getSongManager().updateMarker(marker.clone(TuxGuitar.instance().getSongManager().getFactory()));
 			}
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableAddTrack.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableAddTrack.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableAddTrack.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableAddTrack.java
index 94b9040f..fe9b7f59 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableAddTrack.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableAddTrack.java
@@ -12,11 +12,12 @@ public class UndoableAddTrack implements UndoableEdit{
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
 	private TGTrack redoableTrack;
-	
+
 	private UndoableAddTrack(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -24,10 +25,11 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().addTrack(cloneTrack(this.redoableTrack));
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -35,34 +37,36 @@ public void undo() throws CannotUndoException {
 		TuxGuitar.instance().getSongManager().removeTrack(cloneTrack(this.redoableTrack));
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableAddTrack startUndo(){
 		UndoableAddTrack undoable = new UndoableAddTrack();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableAddTrack endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoableTrack = cloneTrack(track);
 		return this;
 	}
-	
+
 	private static TGTrack cloneTrack(TGTrack track){
 		return track.clone(TuxGuitar.instance().getSongManager().getFactory(), TuxGuitar.instance().getSongManager().getSong());
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableCloneTrack.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableCloneTrack.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableCloneTrack.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableCloneTrack.java
index 200a11c1..179abcab 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableCloneTrack.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableCloneTrack.java
@@ -12,11 +12,12 @@ public class UndoableCloneTrack implements UndoableEdit{
 	private int trackNumber;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	
+
 	private UndoableCloneTrack(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -24,10 +25,11 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().cloneTrack(TuxGuitar.instance().getSongManager().getTrack(this.trackNumber));
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -35,35 +37,37 @@ public void undo() throws CannotUndoException {
 		TuxGuitar.instance().getSongManager().removeTrack(TuxGuitar.instance().getSongManager().getLastTrack());
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableCloneTrack startUndo(){
 		UndoableCloneTrack undoable = new UndoableCloneTrack();
 		Caret caret = getCaret();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.trackNumber = caret.getTrack().getNumber();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableCloneTrack endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackDown.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackDown.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackDown.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackDown.java
index a4d80a02..862fa7d8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackDown.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackDown.java
@@ -13,11 +13,12 @@ public class UndoableMoveTrackDown implements UndoableEdit{
 	private int trackNumber;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	
+
 	private UndoableMoveTrackDown(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -28,7 +29,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -39,29 +41,31 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
-	
+
+
 	public static UndoableMoveTrackDown startUndo(){
 		UndoableMoveTrackDown undoable = new UndoableMoveTrackDown();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableMoveTrackDown endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.trackNumber = track.getNumber();
-		
+
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackUp.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackUp.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackUp.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackUp.java
index 6320e610..00a03246 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackUp.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableMoveTrackUp.java
@@ -13,11 +13,12 @@ public class UndoableMoveTrackUp implements UndoableEdit{
 	private int trackNumber;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	
+
 	private UndoableMoveTrackUp(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -28,7 +29,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -39,28 +41,30 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableMoveTrackUp startUndo(){
 		UndoableMoveTrackUp undoable = new UndoableMoveTrackUp();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableMoveTrackUp endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.trackNumber = track.getNumber();
-		
+
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableRemoveTrack.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableRemoveTrack.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableRemoveTrack.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableRemoveTrack.java
index 04df2e58..c3c8f266 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableRemoveTrack.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableRemoveTrack.java
@@ -13,11 +13,12 @@ public class UndoableRemoveTrack implements UndoableEdit{
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
 	private TGTrack undoableTrack;
-	
+
 	private UndoableRemoveTrack(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -25,10 +26,11 @@ public void redo() throws CannotRedoException {
 		TuxGuitar.instance().getSongManager().removeTrack(cloneTrack(this.undoableTrack));
 		TuxGuitar.instance().fireUpdate();
 		this.redoCaret.update();
-		
+
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -36,37 +38,39 @@ public void undo() throws CannotUndoException {
 		TuxGuitar.instance().getSongManager().addTrack(cloneTrack(this.undoableTrack));
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableRemoveTrack startUndo(){
 		UndoableRemoveTrack undoable = new UndoableRemoveTrack();
 		Caret caret = getCaret();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.undoableTrack = cloneTrack(caret.getTrack());
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableRemoveTrack endUndo(){
 		this.redoCaret = new UndoableCaretHelper();
 		return this;
 	}
-	
+
 	private static Caret getCaret(){
 		return TuxGuitar.instance().getTablatureEditor().getTablature().getCaret();
 	}
-	
+
 	private static TGTrack cloneTrack(TGTrack track){
 		return track.clone(TuxGuitar.instance().getSongManager().getFactory(), TuxGuitar.instance().getSongManager().getSong());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackChannel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackChannel.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackChannel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackChannel.java
index 19eaba1e..e32fda7a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackChannel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackChannel.java
@@ -20,11 +20,11 @@ public class UndoableTrackChannel implements UndoableEdit{
 	private UndoableCaretHelper redoCaret;
 	private List undoChannels;
 	private List redoChannels;
-	
+
 	private UndoableTrackChannel(){
 		super();
 	}
-	
+
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -41,11 +41,11 @@ public void redo() throws CannotRedoException {
 		if (TuxGuitar.instance().getPlayer().isRunning()) {
 			TuxGuitar.instance().getPlayer().updateControllers();
 		}
-		
+
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -62,45 +62,45 @@ public void undo() throws CannotUndoException {
 		if (TuxGuitar.instance().getPlayer().isRunning()) {
 			TuxGuitar.instance().getPlayer().updateControllers();
 		}
-		
+
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableTrackChannel startUndo(){
 		TGSong song = TuxGuitar.instance().getSongManager().getSong();
 		TGFactory factory = TuxGuitar.instance().getSongManager().getFactory();
 		int tracks = song.countTracks();
-		
+
 		UndoableTrackChannel undoable = new UndoableTrackChannel();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.undoChannels = new ArrayList();
-		
+
 		for( int i = 0; i < tracks; i ++){
 			TGTrack track = song.getTrack(i);
 			undoable.undoChannels.add( track.getChannel().clone(factory) );
 		}
 		return undoable;
 	}
-	
+
 	public UndoableTrackChannel endUndo(){
 		TGSong song = TuxGuitar.instance().getSongManager().getSong();
 		TGFactory factory = TuxGuitar.instance().getSongManager().getFactory();
 		int tracks = song.countTracks();
-		
+
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoChannels = new ArrayList();
-		
+
 		for( int i = 0; i < tracks; i ++){
 			TGTrack track = song.getTrack(i);
 			this.redoChannels.add( track.getChannel().clone(factory) );
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackGeneric.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackGeneric.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackGeneric.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackGeneric.java
index be252682..f25d86f7 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackGeneric.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackGeneric.java
@@ -13,11 +13,12 @@ public class UndoableTrackGeneric implements UndoableEdit{
 	private UndoableCaretHelper redoCaret;
 	private UndoTrack undoTrack;
 	private RedoTrack redoTrack;
-	
+
 	private UndoableTrackGeneric(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -26,7 +27,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -35,16 +37,18 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
-	
+
+
 	public static UndoableTrackGeneric startUndo(TGTrack track){
 		UndoableTrackGeneric undoable = new UndoableTrackGeneric();
 		undoable.doAction = UNDO_ACTION;
@@ -52,22 +56,22 @@ public static UndoableTrackGeneric startUndo(TGTrack track){
 		undoable.undoTrack = undoable.new UndoTrack(track);
 		return undoable;
 	}
-	
+
 	public UndoableTrackGeneric endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoTrack = new RedoTrack(track);
 		return this;
 	}
-	
+
 	private class UndoTrack{
 		private TGTrack track;
-		
+
 		public UndoTrack(TGTrack track){
 			if(track != null){
 				this.track = track.clone(TuxGuitar.instance().getSongManager().getFactory(),TuxGuitar.instance().getSongManager().getSong());
 			}
 		}
-		
+
 		public void undo(){
 			if(this.track != null){
 				while( TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders() < this.track.countMeasures() ){
@@ -81,16 +85,16 @@ public void undo(){
 			}
 		}
 	}
-	
+
 	private class RedoTrack{
 		private TGTrack track;
-		
+
 		public RedoTrack(TGTrack track){
 			if(track != null){
 				this.track = track.clone(TuxGuitar.instance().getSongManager().getFactory(),TuxGuitar.instance().getSongManager().getSong());
 			}
 		}
-		
+
 		public void redo(){
 			if(this.track != null){
 				while( TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders() < this.track.countMeasures() ){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInfo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInfo.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInfo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInfo.java
index 51c4d48c..b270fe89 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInfo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInfo.java
@@ -20,11 +20,12 @@ public class UndoableTrackInfo implements UndoableEdit{
 	private TGColor redoColor;
 	private int undoOffset;
 	private int redoOffset;
-	
+
 	private UndoableTrackInfo(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -35,7 +36,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -44,18 +46,20 @@ public void undo() throws CannotUndoException {
 		manager.getTrackManager().changeInfo(manager.getTrack(this.trackNumber),this.undoName,this.undoColor.clone(manager.getFactory()),this.undoOffset);
 		TuxGuitar.instance().fireUpdate();
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableTrackInfo startUndo(TGTrack track){
 		UndoableTrackInfo undoable = new UndoableTrackInfo();
 		undoable.doAction = UNDO_ACTION;
@@ -64,17 +68,17 @@ public static UndoableTrackInfo startUndo(TGTrack track){
 		undoable.undoName = track.getName();
 		undoable.undoColor = track.getColor().clone(TuxGuitar.instance().getSongManager().getFactory());
 		undoable.undoOffset = track.getOffset();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableTrackInfo endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoName = track.getName();
 		this.redoColor = track.getColor().clone(TuxGuitar.instance().getSongManager().getFactory());
 		this.redoOffset = track.getOffset();
-		
+
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInstrument.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInstrument.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInstrument.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInstrument.java
index 84890d49..0cedccdb 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInstrument.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackInstrument.java
@@ -15,61 +15,65 @@ public class UndoableTrackInstrument implements UndoableEdit{
 	private int redoChannelId;
 	private UndoableCaretHelper undoCaret;
 	private UndoableCaretHelper redoCaret;
-	
+
 	private UndoableTrackInstrument(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
 		}
 		TGSongManager tgSongManager = TuxGuitar.instance().getSongManager();
 		tgSongManager.getTrackManager().changeChannel(tgSongManager.getTrack(this.trackNumber),this.redoChannelId);
-		
+
 		TuxGuitar.instance().updateCache(true);
-		
+
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
 		}
 		TGSongManager tgSongManager = TuxGuitar.instance().getSongManager();
 		tgSongManager.getTrackManager().changeChannel(tgSongManager.getTrack(this.trackNumber),this.undoChannelId);
-		
+
 		TuxGuitar.instance().updateCache(true);
-		
+
 		this.undoCaret.update();
-		
+
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableTrackInstrument startUndo(TGTrack track){
 		UndoableTrackInstrument undoable = new UndoableTrackInstrument();
 		undoable.doAction = UNDO_ACTION;
 		undoable.undoCaret = new UndoableCaretHelper();
 		undoable.trackNumber = track.getNumber();
 		undoable.undoChannelId = track.getChannelId();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableTrackInstrument endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoChannelId = track.getChannelId();
-		
+
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackLyric.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackLyric.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackLyric.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackLyric.java
index 0bd3e4ff..d3190f69 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackLyric.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackLyric.java
@@ -17,12 +17,13 @@ public class UndoableTrackLyric implements UndoableEdit{
 	private TGLyric redoLyric;
 	private int undoCaretPosition;
 	private int redoCaretPosition;
-	
+
 	private UndoableTrackLyric(){
 		this.undoLyric = TuxGuitar.instance().getSongManager().getFactory().newLyric();
 		this.redoLyric = TuxGuitar.instance().getSongManager().getFactory().newLyric();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -35,7 +36,8 @@ public void redo() throws CannotRedoException {
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -48,15 +50,17 @@ public void undo() throws CannotUndoException {
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableTrackLyric startUndo(TGTrack track,int undoCaretPosition){
 		UndoableTrackLyric undoable = new UndoableTrackLyric();
 		undoable.doAction = UNDO_ACTION;
@@ -66,12 +70,12 @@ public static UndoableTrackLyric startUndo(TGTrack track,int undoCaretPosition){
 		track.getLyrics().copy( undoable.undoLyric );
 		return undoable;
 	}
-	
+
 	public UndoableTrackLyric endUndo(TGTrack track,int redoCaretPosition){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoCaretPosition = redoCaretPosition;
 		track.getLyrics().copy( this.redoLyric );
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackSoloMute.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackSoloMute.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackSoloMute.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackSoloMute.java
index f6f2995a..d130a1c2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackSoloMute.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/undo/undoables/track/UndoableTrackSoloMute.java
@@ -17,11 +17,12 @@ public class UndoableTrackSoloMute implements UndoableEdit{
 	private boolean undoMute;
 	private boolean redoSolo;
 	private boolean redoMute;
-	
+
 	private UndoableTrackSoloMute(){
 		super();
 	}
-	
+
+	@Override
 	public void redo() throws CannotRedoException {
 		if(!canRedo()){
 			throw new CannotRedoException();
@@ -37,11 +38,12 @@ public void redo() throws CannotRedoException {
 		if (TuxGuitar.instance().getPlayer().isRunning()) {
 			TuxGuitar.instance().getPlayer().updateControllers();
 		}
-		
+
 		this.redoCaret.update();
 		this.doAction = UNDO_ACTION;
 	}
-	
+
+	@Override
 	public void undo() throws CannotUndoException {
 		if(!canUndo()){
 			throw new CannotUndoException();
@@ -57,19 +59,21 @@ public void undo() throws CannotUndoException {
 		if (TuxGuitar.instance().getPlayer().isRunning()) {
 			TuxGuitar.instance().getPlayer().updateControllers();
 		}
-		
+
 		this.undoCaret.update();
 		this.doAction = REDO_ACTION;
 	}
-	
+
+	@Override
 	public boolean canRedo() {
 		return (this.doAction == REDO_ACTION);
 	}
-	
+
+	@Override
 	public boolean canUndo() {
 		return (this.doAction == UNDO_ACTION);
 	}
-	
+
 	public static UndoableTrackSoloMute startUndo(TGTrack track){
 		UndoableTrackSoloMute undoable = new UndoableTrackSoloMute();
 		undoable.doAction = UNDO_ACTION;
@@ -77,16 +81,16 @@ public static UndoableTrackSoloMute startUndo(TGTrack track){
 		undoable.track = track.getNumber();
 		undoable.undoSolo = track.isSolo();
 		undoable.undoMute = track.isMute();
-		
+
 		return undoable;
 	}
-	
+
 	public UndoableTrackSoloMute endUndo(TGTrack track){
 		this.redoCaret = new UndoableCaretHelper();
 		this.redoSolo = track.isSolo();
 		this.redoMute = track.isMute();
-		
+
 		return this;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/ArgumentParser.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ArgumentParser.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/ArgumentParser.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ArgumentParser.java
index 261ff8f0..7798759f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/ArgumentParser.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ArgumentParser.java
@@ -7,23 +7,23 @@
 import org.herac.tuxguitar.util.TGVersion;
 
 public class ArgumentParser {
-	
+
 	private static final String TG_DEFAULT_URL = "tuxguitar.default.url";
-	
+
 	private static final String[] OPTION_HELP = new String[]{"-h","--help"};
 	private static final String[] OPTION_VERSION = new String[]{"-v","--version"};
 	private static final String[] OPTION_JRE_INFO = new String[]{"-i","--system-info"};
-	
+
 	private String[] arguments;
 	private boolean processAndExit;
 	private URL url;
-	
+
 	public ArgumentParser(String[] arguments){
 		this.arguments = arguments;
 		this.processAndExit = false;
 		this.parse();
 	}
-	
+
 	private void parse(){
 		try{
 			checkHelp();
@@ -37,7 +37,7 @@ private void parse(){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	private void checkHelp(){
 		for(int i = 0;i < this.arguments.length;i++){
 			for(int j = 0;j < OPTION_HELP.length;j++){
@@ -48,25 +48,25 @@ private void checkHelp(){
 					print("	-v, --version              Show version information and exit");
 					print("	-i, --system-info          Show the JVM system information");
 					print("	-D<name>=<value>           Set a JVM system property");
-					
+
 					this.processAndExit = true;
 				}
 			}
 		}
 	}
-	
+
 	private void checkVersion(){
 		for(int i = 0;i < this.arguments.length;i++){
 			for(int j = 0;j < OPTION_VERSION.length;j++){
 				if(this.arguments[i].equals(OPTION_VERSION[j])){
 					print(TuxGuitar.APPLICATION_NAME + " - " + TGVersion.CURRENT.getVersion());
-					
+
 					this.processAndExit = true;
 				}
 			}
 		}
 	}
-	
+
 	private void checkSystemInfo(){
 		for(int i = 0;i < this.arguments.length;i++){
 			for(int j = 0;j < OPTION_JRE_INFO.length;j++){
@@ -83,13 +83,13 @@ private void checkSystemInfo(){
 					print("-> Java-Home:         " + System.getProperty("java.home"));
 					print("-> Java-Class-Path:   " + System.getProperty("java.class.path"));
 					print("-> Java-Library-Path: " + System.getProperty("java.library.path"));
-					
+
 					this.processAndExit = true;
 				}
 			}
 		}
 	}
-	
+
 	private void checkProperties(){
 		for(int i = 0;i < this.arguments.length;i++){
 			int indexKey = this.arguments[i].indexOf("-D");
@@ -103,7 +103,7 @@ private void checkProperties(){
 			}
 		}
 	}
-	
+
 	private void checkURL(){
 		String propertyUrl = System.getProperty(TG_DEFAULT_URL);
 		if( propertyUrl != null && makeURL( propertyUrl ) ){
@@ -115,7 +115,7 @@ private void checkURL(){
 			}
 		}
 	}
-	
+
 	private boolean makeURL(String spec){
 		try{
 			File file = new File(spec);
@@ -129,23 +129,23 @@ private boolean makeURL(String spec){
 		}
 		return (this.url != null);
 	}
-	
+
 	public boolean processAndExit(){
 		return this.processAndExit;
 	}
-	
+
 	public URL getURL() {
 		return this.url;
 	}
-	
+
 	protected void print(String s){
 		print(s, true);
 	}
-	
+
 	protected void print(String s, boolean ignoreNull){
 		if(!ignoreNull || s != null){
 			System.out.println( s );
 		}
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/ConfirmDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ConfirmDialog.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/ConfirmDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ConfirmDialog.java
index 519ae7f6..71909a68 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/ConfirmDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ConfirmDialog.java
@@ -12,46 +12,46 @@
 import org.herac.tuxguitar.app.TuxGuitar;
 
 public class ConfirmDialog {
-	
+
 	public static int BUTTON_CANCEL = 0x01;
 	public static int BUTTON_YES = 0x02;
 	public static int BUTTON_NO = 0x04;
-	
+
 	public static int STATUS_YES = 1;
 	public static int STATUS_NO = 2;
 	public static int STATUS_CANCEL = 3;
-	
+
 	protected Shell dialog;
 	protected int status;
 	private String message;
-	
-	
+
+
 	public ConfirmDialog(String message){
 		this.message = message;
 	}
-	
+
 	public int confirm(int style, int defaultButton){
 		Shell parent = TuxGuitar.instance().getShell();
 		this.dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		this.dialog.setLayout(new GridLayout(1, true));
-		
+
 		//========================================================================
 		Composite labelComposite = new Composite(this.dialog, SWT.NONE);
 		labelComposite.setLayout(new GridLayout(2, false));
 		labelComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Label icon = new Label(labelComposite, SWT.NONE);
 		Label message = new Label(labelComposite, SWT.NONE);
 		icon.setImage(parent.getDisplay().getSystemImage(SWT.ICON_QUESTION));
 		message.setText(this.message);
-		
-		
+
+
 		//========================================================================
 		GridLayout buttonsLayout = new GridLayout(0,false);
 		Composite buttonsComposite = new Composite(this.dialog, SWT.NONE);
 		buttonsComposite.setLayout(buttonsLayout);
 		buttonsComposite.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		if((style & BUTTON_YES)!= 0){
 			addCloseButton(TuxGuitar.getProperty("yes"),STATUS_YES,buttonsComposite, (defaultButton == BUTTON_YES) );
 			buttonsLayout.numColumns ++;
@@ -64,17 +64,18 @@ public int confirm(int style, int defaultButton){
 			addCloseButton(TuxGuitar.getProperty("cancel"),STATUS_CANCEL,buttonsComposite, (defaultButton == BUTTON_CANCEL) );
 			buttonsLayout.numColumns ++;
 		}
-		
+
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return this.status;
 	}
-	
+
 	private void addCloseButton(String text,final int value,Composite parent, boolean defaultButton){
 		Button button = new Button(parent, SWT.PUSH);
 		button.setLayoutData(getButtonData());
 		button.setText(text);
 		button.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				ConfirmDialog.this.dialog.dispose();
 				ConfirmDialog.this.status = value;
@@ -84,16 +85,16 @@ public void widgetSelected(SelectionEvent arg0) {
 			this.dialog.setDefaultButton(button);
 		}
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	public void setDefaultStatus(int status){
 		this.status = status;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/DialogUtils.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/DialogUtils.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/DialogUtils.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/DialogUtils.java
index 35555549..685d636f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/DialogUtils.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/DialogUtils.java
@@ -6,30 +6,30 @@
 import org.herac.tuxguitar.app.actions.ActionLock;
 
 public class DialogUtils {
-	
+
 	public static final int OPEN_STYLE_WAIT = 0x01;
-	
+
 	public static final int OPEN_STYLE_PACK = 0x02;
-	
+
 	public static final int OPEN_STYLE_LAYOUT = 0x04;
-	
+
 	public static final int OPEN_STYLE_CENTER = 0x08;
-	
+
 	public static final int OPEN_STYLE_MAXIMIZED = 0x10;
-	
+
 	public static final Shell newDialog(Display display,int style){
 		return new Shell(display, style);
 	}
-	
+
 	public static final Shell newDialog(Shell parent,int style){
 		parent.setCursor(parent.getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
 		return new Shell(parent, style);
 	}
-	
+
 	public static final void openDialog(Shell dialog,int style){
 		DialogUtils.openDialog(dialog,dialog.getParent().getShell(),style);
 	}
-	
+
 	public static final void openDialog(Shell dialog,Shell parent,int style){
 		Display display = dialog.getDisplay();
 		if((style & OPEN_STYLE_PACK) != 0){
@@ -47,9 +47,9 @@ else if((style & OPEN_STYLE_CENTER) != 0){
 			dialog.setLocation(x,y);
 		}
 		dialog.open();
-		
+
 		parent.setCursor(display.getSystemCursor(SWT.CURSOR_ARROW));
-		
+
 		if((style & OPEN_STYLE_WAIT) != 0){
 			if( (dialog.getStyle() & SWT.APPLICATION_MODAL) == 0 ){
 				ActionLock.unlock();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/FileChooser.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/FileChooser.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/FileChooser.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/FileChooser.java
index 2e1a358c..313d756d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/FileChooser.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/FileChooser.java
@@ -1,13 +1,12 @@
 /*
  * Created on 08-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.util;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
@@ -20,42 +19,40 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class FileChooser {
-	
+
 	public static final String DEFAULT_OPEN_FILENAME = null;
-	
+
 	public static final String DEFAULT_SAVE_FILENAME = ("Untitled" + TGFileFormatManager.DEFAULT_EXTENSION);
-	
+
 	public static TGFileFormat ALL_FORMATS = new TGFileFormat("All Files","*.*");
-	
+
 	private static FileChooser instance;
-	
+
 	public static FileChooser instance() {
 		if(instance == null){
 			instance = new FileChooser();
 		}
 		return instance;
 	}
-	
-	private List list(Object o){
-		List list = new ArrayList();
+
+	private List<TGFileFormat> list(TGFileFormat o){
+		List<TGFileFormat> list = new ArrayList<TGFileFormat>();
 		list.add(o);
 		return list;
 	}
-	
+
 	public String open(Shell parent,TGFileFormat format) {
 		return open(parent, list(format));
 	}
-	
-	public String open(Shell parent,List formats) {
+
+	public String open(Shell parent,List<TGFileFormat> formats) {
 		String currentPath = TuxGuitar.instance().getFileHistory().getCurrentFilePath();
 		String chooserPath = TuxGuitar.instance().getFileHistory().getOpenPath();
 		boolean localFile = TuxGuitar.instance().getFileHistory().isLocalFile();
 		boolean existentFile = (localFile && currentPath != null && chooserPath != null && currentPath.equals(chooserPath));
-		
+
 		FilterList filter = new FilterList(formats);
 		FileDialog dialog = new FileDialog(parent,SWT.OPEN);
 		dialog.setFileName((existentFile ? getFileName(formats, DEFAULT_OPEN_FILENAME, false) : null ));
@@ -64,14 +61,14 @@ public String open(Shell parent,List formats) {
 		dialog.setFilterExtensions(filter.getFilterExtensions());
 		return openDialog(dialog);
 	}
-	
+
 	public String save(Shell parent,TGFileFormat format) {
 		return save(parent, list(format));
 	}
-	
-	public String save(Shell parent,List formats) {
+
+	public String save(Shell parent,List<TGFileFormat> formats) {
 		String chooserPath = TuxGuitar.instance().getFileHistory().getSavePath();
-		
+
 		FilterList filter = new FilterList(formats);
 		FileDialog dialog = new FileDialog(parent,SWT.SAVE);
 		dialog.setFileName(getFileName(formats, DEFAULT_SAVE_FILENAME, true));
@@ -80,7 +77,7 @@ public String save(Shell parent,List formats) {
 		dialog.setFilterExtensions(filter.getFilterExtensions());
 		return openDialog(dialog);
 	}
-	
+
 	private String openDialog(FileDialog dialog){
 		String path = dialog.open();
 		if(path != null){
@@ -92,8 +89,8 @@ private String openDialog(FileDialog dialog){
 		}
 		return path;
 	}
-	
-	private String getFileName(List formats, String defaultName, boolean replaceExtension){
+
+	private String getFileName(List<TGFileFormat> formats, String defaultName, boolean replaceExtension){
 		if(formats == null || formats.isEmpty()){
 			return defaultName;
 		}
@@ -103,9 +100,9 @@ private String getFileName(List formats, String defaultName, boolean replaceExte
 			if(index > 0){
 				String fileName = file.substring(0,index);
 				String fileExtension = file.substring(index).toLowerCase();
-				Iterator it = formats.iterator();
+				Iterator<TGFileFormat> it = formats.iterator();
 				while(it.hasNext()){
-					TGFileFormat format = (TGFileFormat)it.next();
+					TGFileFormat format = it.next();
 					if(format.getSupportedFormats() != null){
 						String[] extensions = format.getSupportedFormats().split(TGFileFormat.EXTENSION_SEPARATOR);
 						if(extensions != null && extensions.length > 0){
@@ -118,7 +115,7 @@ private String getFileName(List formats, String defaultName, boolean replaceExte
 					}
 				}
 				if( replaceExtension ){
-					TGFileFormat format = (TGFileFormat)formats.get(0);
+					TGFileFormat format = formats.get(0);
 					if(format.getSupportedFormats() != null){
 						String[] extensions = format.getSupportedFormats().split(TGFileFormat.EXTENSION_SEPARATOR);
 						if(extensions != null && extensions.length > 0){
@@ -132,19 +129,26 @@ private String getFileName(List formats, String defaultName, boolean replaceExte
 		}
 		return defaultName;
 	}
-	
+
 	private class FilterList{
-		private String[] filterExtensions;
-		private String[] filterNames;
-		
-		public  FilterList(List formats) {
+		private final String[] filterExtensions;
+		private final String[] filterNames;
+
+		public  FilterList(List<TGFileFormat> formats) {
+			Collections.sort(formats, new Comparator<TGFileFormat>() {
+				@Override
+				public int compare(TGFileFormat a, TGFileFormat b) {
+					return a.getName().compareToIgnoreCase(b.getName());
+				}
+			});
+
 			int size = (formats.size() + 2);
 			this.filterNames = new String[size];
 			this.filterExtensions = new String[size];
 			this.filterNames[0] = new String("All Supported Formats");
 			this.filterExtensions[0] = new String();
 			for(int i = 1; i < (size - 1); i ++){
-				TGFileFormat format = (TGFileFormat)formats.get(i-1);
+				TGFileFormat format = formats.get(i-1);
 				this.filterNames[i] = format.getName();
 				this.filterExtensions[i] = format.getSupportedFormats();
 				this.filterExtensions[0] += (i > 1)?";":"";
@@ -153,14 +157,14 @@ public  FilterList(List formats) {
 			this.filterNames[(size - 1)] = new String("All Files");
 			this.filterExtensions[(size - 1)] = new String("*.*");
 		}
-		
+
 		public String[] getFilterExtensions() {
 			return this.filterExtensions;
 		}
-		
+
 		public String[] getFilterNames() {
 			return this.filterNames;
 		}
-		
+
 	}
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/ImageUtils.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ImageUtils.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/ImageUtils.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ImageUtils.java
index 5a74b50b..bd49735d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/ImageUtils.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/ImageUtils.java
@@ -20,7 +20,7 @@ public static void writeImage(ImageData data,OutputStream outputStream,int forma
 		loader.data = new ImageData[]{data};
 		loader.save(outputStream,format);
 	}
-	
+
 	/**
 	 * Convierte un ImageData en un array de bytes
 	 * @param data
@@ -32,10 +32,10 @@ public static byte[] imageToByteArray(ImageData data,int format){
 		writeImage(data,out,format);
 		return out.toByteArray();
 	}
-	
+
 	/**
 	 * Crea una mascara a partir de src.
-	 * 
+	 *
 	 * @param src
 	 * @param alpha
 	 * @param none
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/MessageDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/MessageDialog.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/MessageDialog.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/MessageDialog.java
index 626013a4..9df06954 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/MessageDialog.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/MessageDialog.java
@@ -1,8 +1,5 @@
 /*
  * Created on 20-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.app.util;
 
@@ -15,35 +12,33 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class MessageDialog {
-	
+
 	private int style;
 	private String name;
 	private String message;
-	
+
 	protected MessageDialog(String name,String message,int style){
 		this.name = name;
 		this.message = message;
 		this.style = style;
 	}
-	
+
 	protected void show(Shell parent){
 		MessageBox messageBox = new MessageBox(parent, this.style);
 		messageBox.setText(this.name);
 		messageBox.setMessage(this.message);
 		messageBox.open();
 	}
-	
+
 	public static void infoMessage(final String title,final String message){
 		MessageDialog.infoMessage(TuxGuitar.instance().getShell(), title, message);
 	}
-	
+
 	public static void infoMessage(final Shell shell,final String title,final String message){
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				if(!shell.isDisposed()){
 					new MessageDialog(title,message,SWT.ICON_INFORMATION).show(shell);
@@ -51,23 +46,25 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public static void errorMessage(final Throwable throwable){
 		MessageDialog.errorMessage(TuxGuitar.instance().getShell(),throwable);
 	}
-	
+
 	public static void errorMessage(final Shell shell,final Throwable throwable){
 		MessageDialog.errorMessage(shell, (throwable.getMessage() != null ? throwable.getMessage() : throwable.getClass().getName() ));
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				throwable.printStackTrace();
 			}
 		}).start();
 	}
-	
+
 	public static void errorMessage(final Shell shell,final String message){
 		if(!shell.isDisposed()){
 			new SyncThread(new Runnable() {
+				@Override
 				public void run() {
 					if(!shell.isDisposed()){
 						ActionLock.unlock();
@@ -79,5 +76,5 @@ public void run() {
 			}).start();
 		}
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/MidiTickUtil.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/MidiTickUtil.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/MidiTickUtil.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/MidiTickUtil.java
index 55b9e276..9c28c623 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/MidiTickUtil.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/MidiTickUtil.java
@@ -6,22 +6,22 @@
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 
 public class MidiTickUtil {
-	
+
 	public static long getStart(long tick){
 		long startPoint = getStartPoint();
 		long start = startPoint;
 		long length = 0;
-		
+
 		TGSongManager manager = TuxGuitar.instance().getSongManager();
 		MidiRepeatController controller = new MidiRepeatController(manager.getSong(), getSHeader() , getEHeader() );
 		while(!controller.finished()){
 			TGMeasureHeader header = manager.getSong().getMeasureHeader(controller.getIndex());
 			controller.process();
 			if(controller.shouldPlay()){
-				
+
 				start += length;
 				length = header.getLength();
-				
+
 				//verifico si es el compas correcto
 				if(tick >= start && tick < (start + length )){
 					return header.getStart() + (tick - start);
@@ -30,22 +30,22 @@ public static long getStart(long tick){
 		}
 		return ( tick < startPoint ? startPoint : start );
 	}
-	
+
 	public static long getTick(long start){
 		long startPoint = getStartPoint();
 		long tick = startPoint;
 		long length = 0;
-		
+
 		TGSongManager manager = TuxGuitar.instance().getSongManager();
 		MidiRepeatController controller = new MidiRepeatController(manager.getSong(), getSHeader() , getEHeader() );
 		while(!controller.finished()){
 			TGMeasureHeader header = manager.getSong().getMeasureHeader(controller.getIndex());
 			controller.process();
 			if(controller.shouldPlay()){
-				
+
 				tick += length;
 				length = header.getLength();
-				
+
 				//verifico si es el compas correcto
 				if(start >= header.getStart() && start < (header.getStart() + length )){
 					return tick;
@@ -54,16 +54,16 @@ public static long getTick(long start){
 		}
 		return ( start < startPoint ? startPoint : tick );
 	}
-	
+
 	private static long getStartPoint(){
 		TuxGuitar.instance().getPlayer().updateLoop( false );
 		return TuxGuitar.instance().getPlayer().getLoopSPosition();
 	}
-	
+
 	public static int getSHeader() {
 		return TuxGuitar.instance().getPlayer().getLoopSHeader();
 	}
-	
+
 	public static int getEHeader() {
 		return TuxGuitar.instance().getPlayer().getLoopEHeader();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/TGFileUtils.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGFileUtils.java
similarity index 93%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/TGFileUtils.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGFileUtils.java
index 833ec3c3..a26cdf9a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/TGFileUtils.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGFileUtils.java
@@ -21,7 +21,7 @@
 import org.herac.tuxguitar.util.TGVersion;
 
 public class TGFileUtils {
-	
+
 	private static final String TG_CONFIG_PATH = "tuxguitar.config.path";
 	private static final String TG_SHARE_PATH = "tuxguitar.share.path";
 	private static final String TG_USER_SHARE_PATH = "tuxguitar.user-share.path";
@@ -29,18 +29,19 @@ public class TGFileUtils {
 	private static final String TG_LIBRARY_PATH = "tuxguitar.library.path";
 	private static final String TG_LIBRARY_PREFIX = "tuxguitar.library.prefix";
 	private static final String TG_LIBRARY_EXTENSION = "tuxguitar.library.extension";
-	
+
 	public static final String PATH_USER_CONFIG = getUserConfigDir();
 	public static final String PATH_USER_PLUGINS_CONFIG = getUserPluginsConfigDir();
 	public static final String PATH_USER_SHARE_PATH = getUserSharedPath();
 	//writable
 	public static final String[] TG_STATIC_SHARED_PATHS = getStaticSharedPaths();
-	
+
 	public static InputStream getResourceAsStream(String resource) {
 		try {
 			if(TG_STATIC_SHARED_PATHS != null){
 				for( int i = 0; i < TG_STATIC_SHARED_PATHS.length ; i ++ ){
-					File file = new File(TG_STATIC_SHARED_PATHS[i] + File.separator + resource);
+					String s = TG_STATIC_SHARED_PATHS[i] + File.separator + resource;
+					File file = new File(s);
 					if( isExistentAndReadable( file ) ){
 						return new FileInputStream( file );
 					}
@@ -52,7 +53,7 @@ public static InputStream getResourceAsStream(String resource) {
 		}
 		return null;
 	}
-	
+
 	public static URL getResourceUrl(String resource) {
 		try {
 			if(TG_STATIC_SHARED_PATHS != null){
@@ -69,10 +70,10 @@ public static URL getResourceUrl(String resource) {
 		}
 		return null;
 	}
-	
-	public static Enumeration getResourceUrls(String resource) {
+
+	public static Enumeration<URL> getResourceUrls(String resource) {
 		try {
-			Vector vector = new Vector();
+			Vector<URL> vector = new Vector<URL>();
 			if(TG_STATIC_SHARED_PATHS != null){
 				for( int i = 0; i < TG_STATIC_SHARED_PATHS.length ; i ++ ){
 					File file = new File(TG_STATIC_SHARED_PATHS[i] + File.separator + resource);
@@ -81,9 +82,9 @@ public static Enumeration getResourceUrls(String resource) {
 					}
 				}
 			}
-			Enumeration resources = TGClassLoader.instance().getClassLoader().getResources(resource);
+			Enumeration<URL> resources = TGClassLoader.instance().getClassLoader().getResources(resource);
 			while( resources.hasMoreElements() ){
-				URL url = (URL)resources.nextElement();
+				URL url = resources.nextElement();
 				if( !vector.contains(url) ){
 					vector.addElement( url );
 				}
@@ -94,7 +95,7 @@ public static Enumeration getResourceUrls(String resource) {
 		}
 		return null;
 	}
-	
+
 	private static String getResourcePath(String resource) {
 		try {
 			if(TG_STATIC_SHARED_PATHS != null){
@@ -114,15 +115,15 @@ private static String getResourcePath(String resource) {
 		}
 		return null;
 	}
-	
+
 	public static void loadClasspath(){
 		try {
-			Enumeration plugins = getResourceUrls("plugins");
+			Enumeration<URL> plugins = getResourceUrls("plugins");
 			while( plugins.hasMoreElements() ){
-				URL url = (URL)plugins.nextElement();
+				URL url = plugins.nextElement();
 				TGClassLoader.instance().addPaths(new File(url.getFile()));
 			}
-			
+
 			String custompath = System.getProperty(TG_CLASS_PATH);
 			if(custompath != null){
 				String[] paths = custompath.split(File.pathSeparator);
@@ -134,7 +135,7 @@ public static void loadClasspath(){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public static void loadLibraries(){
 		String libraryPath = System.getProperty(TG_LIBRARY_PATH);
 		if(libraryPath != null){
@@ -146,7 +147,7 @@ public static void loadLibraries(){
 			}
 		}
 	}
-	
+
 	public static String[] getFileNames( String resource ){
 		try {
 			String path = getResourcePath(resource);
@@ -159,14 +160,14 @@ public static String[] getFileNames( String resource ){
 			InputStream stream = getResourceAsStream(resource + "/list.properties" );
 			if( stream != null ){
 				BufferedReader reader = new BufferedReader( new InputStreamReader(stream) );
-				List fileNameList = new ArrayList();
+				List<String> fileNameList = new ArrayList<String>();
 				String fileName = null;
 				while( (fileName = reader.readLine()) != null ){
 					fileNameList.add( fileName );
 				}
 				String[] fileNames = new String[ fileNameList.size() ];
 				for (int i = 0 ; i < fileNames.length ; i ++ ){
-					fileNames[ i ] = (String)fileNameList.get( i );
+					fileNames[ i ] = fileNameList.get( i );
 				}
 				return fileNames;
 			}
@@ -175,15 +176,15 @@ public static String[] getFileNames( String resource ){
 		}
 		return null;
 	}
-	
+
 	public static Image loadImage(String name){
 		return loadImage(TuxGuitar.instance().getConfig().getStringConfigValue(TGConfigKeys.SKIN),name);
 	}
-	
+
 	public static Image loadImage(String skin,String name){
 		try{
 			InputStream stream = getResourceAsStream("skins/" + skin + "/" + name);
-			if(stream != null){			
+			if(stream != null){
 				return new Image(TuxGuitar.instance().getDisplay(),new ImageData(stream));
 			}
 			System.err.println(name + ": not found");
@@ -192,7 +193,7 @@ public static Image loadImage(String skin,String name){
 		}
 		return new Image(TuxGuitar.instance().getDisplay(),16,16);
 	}
-	
+
 	public static boolean isLocalFile(URL url){
 		try {
 			if(url.getProtocol().equals( new File(url.getFile()).toURI().toURL().getProtocol() ) ){
@@ -203,20 +204,20 @@ public static boolean isLocalFile(URL url){
 		}
 		return false;
 	}
-	
+
 	private static String getDefaultUserAppDir(){
 		return ((System.getProperty("user.home") + File.separator + ".tuxguitar-" + TGVersion.CURRENT.getVersion()));
 	}
-	
+
 	private static String getUserConfigDir(){
 		// Look for the system property
 		String configPath = System.getProperty(TG_CONFIG_PATH);
-		
+
 		// Default System User Home
 		if(configPath == null){
 			configPath = (getDefaultUserAppDir() + File.separator + "config");
 		}
-		
+
 		// Check if the path exists
 		File file = new File(configPath);
 		if(!isExistentAndReadable( file )){
@@ -224,28 +225,28 @@ private static String getUserConfigDir(){
 		}
 		return configPath;
 	}
-	
+
 	private static String getUserPluginsConfigDir(){
 		String configPluginsPath = (getUserConfigDir() + File.separator + "plugins");
-		
+
 		//Check if the path exists
 		File file = new File(configPluginsPath);
 		if(!isExistentAndReadable( file )){
 			tryCreateDirectory( file );
 		}
-		
+
 		return configPluginsPath;
 	}
-	
+
 	private static String getUserSharedPath(){
 		// Look for the system property
 		String userSharePath = System.getProperty(TG_USER_SHARE_PATH);
-		
+
 		// Use configuration path as default.
 		if( userSharePath == null){
 			userSharePath = (getDefaultUserAppDir() + File.separator + "cache");
 		}
-		
+
 		// Check if the path exists
 		File file = new File(userSharePath);
 		if(!isExistentAndReadable( file )){
@@ -253,7 +254,7 @@ private static String getUserSharedPath(){
 		}
 		return userSharePath;
 	}
-	
+
 	private static String[] getStaticSharedPaths(){
 		String staticSharedPaths = new String(PATH_USER_SHARE_PATH);
 		String staticSharedPathsProperty = System.getProperty(TG_SHARE_PATH);
@@ -262,7 +263,7 @@ private static String[] getStaticSharedPaths(){
 		}
 		return staticSharedPaths.split(File.pathSeparator);
 	}
-	
+
 	private static boolean isExistentAndReadable( File file ){
 		try{
 			return file.exists();
@@ -270,7 +271,7 @@ private static boolean isExistentAndReadable( File file ){
 			return false;
 		}
 	}
-	
+
 	private static boolean isDirectoryAndReadable( File file ){
 		try{
 			return file.isDirectory();
@@ -278,7 +279,7 @@ private static boolean isDirectoryAndReadable( File file ){
 			return false;
 		}
 	}
-	
+
 	private static boolean tryCreateDirectory( File file ){
 		try{
 			return file.mkdirs();
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGMusicKeyUtils.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGMusicKeyUtils.java
new file mode 100644
index 00000000..3efbd261
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGMusicKeyUtils.java
@@ -0,0 +1,182 @@
+package org.herac.tuxguitar.app.util;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.system.language.LanguageLoader;
+
+public class TGMusicKeyUtils {
+
+	public static final String PREFIX_CHORD = "chord";
+
+	public static final String PREFIX_SCALE = "scale";
+
+	public static final String PREFIX_TUNING = "tuning";
+
+	public static final String PREFIX_FRETBOARD = "fretboard";
+
+	public static final String PREFIX_MATRIX = "matrix";
+
+	public static final int MAX_NOTES = 12;
+
+	private static final String[][] DEFAULT_KEY_NAMES = new String[][]{
+		{"C","C#","Cb"},
+		{"D","D#","Db"},
+		{"E","E#","Eb"},
+		{"F","F#","Fb"},
+		{"G","G#","Gb"},
+		{"A","A#","Ab"},
+		{"B","B#","Bb"}
+	};
+
+	private static final String[] NOTE_NAMES = TGMusicKeyUtils.getSharpKeyNames(PREFIX_TUNING);
+
+	public static String[] getSharpKeyNames(String prefix){
+		return new TGMusicKeyNames(true,prefix).getNames();
+	}
+
+	public static String[] getFlatKeyNames(String prefix){
+		return new TGMusicKeyNames(false,prefix).getNames();
+	}
+
+	protected static void loadKeyNames(String[] names,String prefix,boolean sharp){
+		if(sharp){
+			loadSharpKeyNames(names, prefix);
+		}else{
+			loadFlatKeyNames(names, prefix);
+		}
+	}
+
+	private static void loadSharpKeyNames(String[] names,String prefix){
+		names[0] = getName(prefix,0,0);
+		names[1] = getName(prefix,0,1);
+		names[2] = getName(prefix,1,0);
+		names[3] = getName(prefix,1,1);
+		names[4] = getName(prefix,2,0);
+		names[5] = getName(prefix,3,0);
+		names[6] = getName(prefix,3,1);
+		names[7] = getName(prefix,4,0);
+		names[8] = getName(prefix,4,1);
+		names[9] = getName(prefix,5,0);
+		names[10] = getName(prefix,5,1);
+		names[11] = getName(prefix,6,0);
+	}
+
+	private static void loadFlatKeyNames(String[] names,String prefix){
+		names[0] = getName(prefix,0,0);
+		names[1] = getName(prefix,1,2);
+		names[2] = getName(prefix,1,0);
+		names[3] = getName(prefix,2,2);
+		names[4] = getName(prefix,2,0);
+		names[5] = getName(prefix,3,0);
+		names[6] = getName(prefix,4,2);
+		names[7] = getName(prefix,4,0);
+		names[8] = getName(prefix,5,2);
+		names[9] = getName(prefix,5,0);
+		names[10] = getName(prefix,6,2);
+		names[11] = getName(prefix,6,0);
+	}
+
+	/**
+	 * Convert an English notation note into TG value. For example "C0" became 0
+	 * @return Value of the note
+	 * @throws IllegalArgumentException
+	 */
+	public static int getTgValueFromName(String name) {
+		return getMidiValueFromName(name) - 24;
+	}
+
+	/**
+	 * Convert an English notation note into MIDI value. For example "C4" became 72, or "A0" became 33.
+	 * @param name An English notation name ("C4", "Bb4"...)
+	 * @return Value of the note
+	 * @throws IllegalArgumentException
+	 */
+	public static int getMidiValueFromName(String name) {
+		if (name == null || name.length() <= 1 || name.length() > 4) {
+			throw new IllegalArgumentException("Note '" + name + "' is not valid");
+		}
+
+		char note = name.charAt(0);
+		if (note >= 'a') {
+			// upper char
+			note -= ('a' - 'A');
+		}
+
+		if (note < 'A' || note > 'G') {
+			throw new IllegalArgumentException("Note '" + name + "' is not valid");
+		}
+
+		byte noteValue = (byte) ((note - 'A') * 2);
+		// half-tone between B-C and E-F
+		if (noteValue >= 10) noteValue -= 2;
+		else if (noteValue >= 4) noteValue -= 1;
+		// C is the first note of the octave
+		noteValue = (byte) ((noteValue + 9) % 12);
+
+		char octave = name.charAt(name.length() - 1);
+		if (octave < '0' || octave > '9') {
+			throw new IllegalArgumentException("Note '" + name + "' is not valid");
+		}
+		byte octaveValue = (byte) (octave - '0');
+
+		if (name.length() >= 3) {
+			char alteration = name.charAt(1);
+			if (alteration == 'b') {
+				noteValue -= 1;
+			} else if (alteration == '#') {
+				noteValue += 1;
+			} else if (alteration == '-' && name.length() == 3) {
+				// negative sign of the octave
+				octaveValue = (byte) -octaveValue;
+			} else {
+				throw new IllegalArgumentException("Note '" + name + "' is not valid");
+			}
+		}
+		if (name.length() == 4) {
+			char neg = name.charAt(2);
+			if (neg != '-') {
+				throw new IllegalArgumentException("Note '" + name + "' is not valid");
+			}
+			octaveValue = (byte) -octaveValue;
+		}
+
+		int value = 24 + noteValue + octaveValue * 12;
+		if (value < 0 || value >= 128) {
+			throw new IllegalArgumentException("Note value '" + name + "' is out of range. Found '" + value + "'");
+		}
+		return value;
+	}
+
+	private static String getName(String prefix,int key,int signature){
+		String resource = ("key." + prefix + "." + key + "." + signature);
+		return TuxGuitar.instance().getLanguageManager().getProperty(resource,DEFAULT_KEY_NAMES[key][signature]);
+	}
+
+	public static String getNoteName(int value) {
+		return NOTE_NAMES[ value % MAX_NOTES ] + (value / MAX_NOTES);
+	}
+}
+
+class TGMusicKeyNames implements LanguageLoader{
+
+	private final boolean sharp;
+	private final String prefix;
+	private final String[] names;
+
+	public TGMusicKeyNames(boolean sharp,String prefix){
+		this.sharp = sharp;
+		this.prefix = prefix;
+		this.names = new String[12];
+		this.loadProperties();
+
+		TuxGuitar.instance().getLanguageManager().addLoader(this);
+	}
+
+	public String[] getNames(){
+		return this.names;
+	}
+
+	@Override
+	public void loadProperties() {
+		TGMusicKeyUtils.loadKeyNames(this.names, this.prefix, this.sharp);
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/TGSplash.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGSplash.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/TGSplash.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGSplash.java
index 6b55cf92..d1ff77c2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/TGSplash.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/TGSplash.java
@@ -14,32 +14,33 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGSplash {
-	
+
 	private static TGSplash instance;
-	
+
 	private Shell shell;
-	
+
 	private TGSplash(){
 		super();
 	}
-	
+
 	public static TGSplash instance(){
 		if(instance == null){
 			instance = new TGSplash();
 		}
 		return instance;
 	}
-	
+
 	public void init() {
 		if(TuxGuitar.instance().getConfig().getBooleanConfigValue(TGConfigKeys.SHOW_SPLASH)){
 			final Image image = TuxGuitar.instance().getIconManager().getAppSplash();
-			
+
 			this.shell = new Shell(TuxGuitar.instance().getDisplay(), SWT.NO_TRIM | SWT.NO_BACKGROUND);
 			this.shell.setLayout(new FillLayout());
 			this.shell.setBounds(getBounds(image));
 			this.shell.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 			this.shell.setText(TuxGuitar.APPLICATION_NAME);
 			this.shell.addPaintListener(new PaintListener() {
+				@Override
 				public void paintControl(PaintEvent e) {
 					TGPainter painter = new TGPainterImpl(e.gc);
 					painter.drawImage(new TGImageImpl(image), 0, 0);
@@ -50,7 +51,7 @@ public void paintControl(PaintEvent e) {
 			this.shell.update();
 		}
 	}
-	
+
 	public void finish(){
 		if(this.shell != null && !this.shell.isDisposed()){
 			this.shell.close();
@@ -58,7 +59,7 @@ public void finish(){
 		}
 		instance = null;
 	}
-	
+
 	private Rectangle getBounds(Image image){
 		Rectangle iBounds = image.getBounds();
 		Rectangle mBounds = this.shell.getMonitor().getClientArea();
@@ -68,5 +69,5 @@ private Rectangle getBounds(Image image){
 		int height = iBounds.height;
 		return new Rectangle( x , y , width , height);
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/WindowTitleUtil.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/WindowTitleUtil.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/app/util/WindowTitleUtil.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/WindowTitleUtil.java
index 26421861..570f9891 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/WindowTitleUtil.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/util/WindowTitleUtil.java
@@ -7,7 +7,7 @@
 public class WindowTitleUtil {
 	private static final String VAR_START = "${";
 	private static final String VAR_END = "}";
-	
+
 	public static final String VAR_APP_NAME = "appname";
 	public static final String VAR_APP_VERSION = "appversion";
 	public static final String VAR_FILE_NAME = "filename";
@@ -16,12 +16,12 @@ public class WindowTitleUtil {
 	public static final String VAR_SONG_AUTHOR = "songauthor";
 	public static final String VAR_SONG_ALBUM = "songalbum";
 	public static final String VAR_SONG_ARTIST = "songartist";
-	
+
 	public static String parseTitle(){
 		String title = parseString(TuxGuitar.instance().getConfig().getStringConfigValue(TGConfigKeys.WINDOW_TITLE));
 		return ((title == null)?TuxGuitar.APPLICATION_NAME:title);
 	}
-	
+
 	private static String parseString(String src){
 		try{
 			if(src != null){
@@ -51,7 +51,7 @@ private static String parseString(String src){
 		}
 		return null;
 	}
-	
+
 	private static String parseVar(String var){
 		String varName = var.substring((VAR_START.length()),(var.length() - 1));
 		String varValue = var;
@@ -74,7 +74,7 @@ private static String parseVar(String var){
 		}
 		return varValue;
 	}
-	
+
 	public static String getVar(String varName){
 		return (VAR_START + varName + VAR_END);
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/ColorButton.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/ColorButton.java
new file mode 100644
index 00000000..0ebc1126
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/ColorButton.java
@@ -0,0 +1,113 @@
+package org.herac.tuxguitar.app.widgets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.ColorDialog;
+import org.eclipse.swt.widgets.Composite;
+import org.herac.tuxguitar.app.TuxGuitar;
+
+/**
+ * Button to display and select a color.
+ *
+ * The code override the SelectionListeners to allow to catch changes
+ * of color from UI. Maybe we should use an own event for that.
+ *
+ * @author bayo
+ */
+public class ColorButton extends Button {
+
+	private final static int ICON_SIZE = 16;
+
+	/**
+	 * Icon used to display the current color
+	 */
+	private Image icon;
+
+	/**
+	 * Current selected color
+	 */
+	private RGB color;
+
+	private final List<SelectionListener> selectionListeners;
+
+	public ColorButton(Composite parent) {
+		super(parent, SWT.PUSH);
+		this.selectionListeners = new ArrayList<SelectionListener>();
+		super.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent event) {
+				ColorDialog dialog = new ColorDialog(ColorButton.this.getParent().getShell());
+				dialog.setRGB(getColor());
+				dialog.setText(TuxGuitar.getProperty("choose-color"));
+				RGB rgb = dialog.open();
+				if (rgb != null) {
+					setColor(rgb);
+					for (SelectionListener listener: selectionListeners) {
+						listener.widgetSelected(event);
+					}
+				}
+			}
+		});
+	}
+
+	@Override
+	protected void checkSubclass() {
+		// Allow to inherit SWT components... I would like to cook OOP thanks
+	}
+
+	@Override
+	public void addSelectionListener(SelectionListener listener) {
+		this.selectionListeners.add(listener);
+	}
+
+	@Override
+	public void removeSelectionListener(SelectionListener listener) {
+		this.selectionListeners.remove(listener);
+	}
+
+	public void setColor(RGB color){
+		if (color == null) {
+			throw new IllegalArgumentException("Initialized color expected");
+		}
+		if (color.equals(this.color)) {
+			return;
+		}
+
+		if (icon == null) {
+			icon = new Image(TuxGuitar.instance().getDisplay(), ICON_SIZE, ICON_SIZE);
+		}
+
+		this.color = color;
+		Color c = new Color(this.getDisplay(), color.red, color.green, color.blue);
+		GC gc = new GC(icon);
+		gc.setBackground(c);
+		gc.fillRectangle(0, 0, ICON_SIZE, ICON_SIZE);
+		gc.dispose();
+		c.dispose();
+
+		setImage(icon);
+	}
+
+	public RGB getColor() {
+		return color;
+	}
+
+	@Override
+	public void dispose(){
+		if(icon != null && !icon.isDisposed()){
+			icon.dispose();
+		}
+		super.dispose();
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/ComboValue.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/ComboValue.java
new file mode 100644
index 00000000..a9329e6a
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/ComboValue.java
@@ -0,0 +1,84 @@
+package org.herac.tuxguitar.app.widgets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+
+public class ComboValue<V> extends Combo {
+
+	private List<V> values;
+
+	public ComboValue(Composite parent, int style) {
+		super(parent, style);
+		values = new ArrayList<V>();
+	}
+
+//	iv got calling from custom "add" which create problems
+//
+//	@Override
+//	public void add(String string) {
+//		values.add(null);
+//		super.add(string);
+//	}
+//	@Override
+//	public void add(String string, int index) {
+//		values.add(index, null);
+//		super.add(string, index);
+//	}
+//
+//	@Override
+//	public void remove(int index) {
+//		values.remove(index);
+//		super.remove(index);
+//	}
+//
+//	@Override
+//	public void remove(String string) {
+//		int i = indexOf(string);
+//		if (i != -1) {
+//			values.remove(i);
+//			super.remove(string);
+//		}
+//	}
+//
+//	@Override
+//	public void remove(int start, int end) {
+//		for (int i = start; i < end; i++) {
+//			values.remove(start);
+//		}
+//		super.remove(start, end);
+//	}
+
+	@Override
+	public void removeAll() {
+		values.clear();
+		super.removeAll();
+	}
+
+	public void add(String string, V value) {
+		values.add(value);
+		super.add(string);
+	}
+
+	public V getSelectionValue() {
+		int i = getSelectionIndex();
+		if (i == -1) {
+			return null;
+		}
+		return values.get(i);
+	}
+
+	@Override
+	protected void checkSubclass() {
+		// Allow to inherit SWT components... I would like to cook OOP thanks
+	}
+
+	@Override
+	public void dispose() {
+		values.clear();
+		values = null;
+		super.dispose();
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/StringLabel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/StringLabel.java
new file mode 100644
index 00000000..5400b8cd
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/StringLabel.java
@@ -0,0 +1,81 @@
+package org.herac.tuxguitar.app.widgets;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CLabel;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.herac.tuxguitar.app.util.TGMusicKeyUtils;
+import org.herac.tuxguitar.song.models.TGString;
+
+public class StringLabel extends CLabel {
+
+	private final static int ICON_SIZE = 10;
+
+	/**
+	 * Icon used to display the string
+	 */
+	private Image icon;
+
+	private int min = 40;
+	private int max = 70;
+	private int value;
+
+	public StringLabel(Composite parent) {
+		super(parent, 0);
+	}
+
+	@Override
+	protected void checkSubclass() {
+		// Allow to inherit SWT components... I would like to cook OOP thanks
+	}
+
+	public void setString(TGString string) {
+		String text = TGMusicKeyUtils.getNoteName(string.getValue());
+		setText(text);
+		value = string.getValue();
+		updateIcon();
+	}
+
+	public void setMinMax(int min, int max) {
+		this.min = min;
+		this.max = max;
+	}
+
+	private void updateIcon() {
+		if (value == 0) {
+			return;
+		}
+
+		double coef = (value - min) / (double)(max - min);
+		if (coef < 0) coef = 0;
+		if (coef > 1) coef = 1;
+		coef = 1-coef;
+		coef = 0.5 + coef * 0.5;
+
+		if (icon == null) {
+			icon = new Image(getDisplay(), ICON_SIZE,ICON_SIZE);
+		}
+
+		GC gc = new GC(icon);
+		gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
+		gc.fillRectangle(0, 0, ICON_SIZE, ICON_SIZE);
+		gc.setAdvanced(true);
+		gc.setAntialias(SWT.ON);
+		gc.setAlpha(255);
+		gc.setBackground(gc.getDevice().getSystemColor(SWT.COLOR_BLACK));
+		int radius = (int) (ICON_SIZE * coef * 0.5);
+		gc.fillOval(ICON_SIZE/2-radius, ICON_SIZE/2-radius, radius*2, radius*2);
+		gc.dispose();
+
+		setImage(icon);
+	}
+
+	@Override
+	public void dispose() {
+		if(icon != null && !icon.isDisposed()){
+			icon.dispose();
+		}
+		super.dispose();
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/TrackPropertiesDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/TrackPropertiesDialog.java
new file mode 100644
index 00000000..6abc1d5c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/TrackPropertiesDialog.java
@@ -0,0 +1,718 @@
+package org.herac.tuxguitar.app.widgets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Spinner;
+import org.eclipse.swt.widgets.Text;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.actions.ActionLock;
+import org.herac.tuxguitar.app.editors.TGUpdateListener;
+import org.herac.tuxguitar.app.helper.SyncThread;
+import org.herac.tuxguitar.app.undo.undoables.UndoableJoined;
+import org.herac.tuxguitar.app.undo.undoables.track.UndoableTrackGeneric;
+import org.herac.tuxguitar.app.undo.undoables.track.UndoableTrackInfo;
+import org.herac.tuxguitar.app.undo.undoables.track.UndoableTrackInstrument;
+import org.herac.tuxguitar.app.util.DialogUtils;
+import org.herac.tuxguitar.app.util.TGMusicKeyUtils;
+import org.herac.tuxguitar.graphics.control.TGTrackImpl;
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.util.TGSynchronizer;
+
+/**
+ * @author julian
+ */
+public class TrackPropertiesDialog extends Shell implements TGUpdateListener {
+
+	private static final int MINIMUM_LEFT_CONTROLS_WIDTH = 180;
+	private static final int MINIMUM_BUTTON_WIDTH = 80;
+	private static final int MINIMUM_BUTTON_HEIGHT = 25;
+	private static final int MAX_STRINGS = 7;
+	private static final int MIN_STRINGS = 4;
+	private static final int MAX_OCTAVES = 10;
+
+	private Text nameText;
+	private final TGColor trackColor;
+	private List<TGString> tempStrings;
+	private Button stringTransposition;
+	private Button stringTranspositionTryKeepString;
+	private Button stringTranspositionApplyToChords;
+	private Spinner stringCountSpinner;
+	private final Combo[] stringCombos = new Combo[MAX_STRINGS];
+	private Button loadTunningButton;
+	private Combo offsetCombo;
+	private int stringCount;
+	private Combo instrumentCombo;
+	private boolean percussionChannel;
+
+	TGTrackImpl selectedTrack;
+
+	public TrackPropertiesDialog(Shell parent, TGTrackImpl track) {
+		super(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+
+		if (track == null) {
+			throw new IllegalArgumentException("Initialized track expected");
+		}
+
+		selectedTrack = track;
+
+		this.stringCount = track.getStrings().size();
+		this.trackColor = track.getColor().clone(TuxGuitar.instance().getSongManager().getFactory());
+		this.percussionChannel = TuxGuitar.instance().getSongManager().isPercussionChannel(track.getChannelId());
+		this.initTempStrings(track.getStrings());
+
+		this.setLayout(new GridLayout(2,false));
+		this.setText(TuxGuitar.getProperty("track.properties"));
+
+		this.addListeners();
+
+		Composite left = new Composite(this,SWT.NONE);
+		left.setLayout(new GridLayout());
+		left.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
+		Composite right = new Composite(this,SWT.NONE);
+		right.setLayout(new GridLayout());
+		right.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
+		Composite bottom = new Composite(this, SWT.NONE);
+		bottom.setLayout(new GridLayout(2,false));
+		bottom.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true,2,1));
+
+		//GENERAL
+		initTrackInfo(makeGroup(left,1,TuxGuitar.getProperty("track.properties.general")), track);
+
+		//INSTRUMENT
+		initInstrumentFields(makeGroup(left,1,TuxGuitar.getProperty("instrument")), track);
+
+		//TUNING
+		initTuningInfo(makeGroup(right,2,TuxGuitar.getProperty("tuning")), track);
+
+		//BUTTONS
+		initButtons(bottom);
+
+		updateTuningGroup(!this.percussionChannel);
+	}
+
+	@Override
+	protected void checkSubclass() {
+		// Allow to inherit SWT components... I would like to cook OOP thanks
+	}
+
+	private Group makeGroup(Composite parent,int horizontalSpan,String text){
+		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
+		group.setLayoutData(makeGridData(horizontalSpan));
+		group.setText(text);
+
+		return group;
+	}
+
+	private GridData makeGridData(int horizontalSpan){
+		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
+		data.horizontalSpan = horizontalSpan;
+		return data;
+	}
+
+	private GridData getButtonsData(){
+		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
+		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
+		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
+		return data;
+	}
+
+	private void initTrackInfo(Composite composite,TGTrackImpl track) {
+		composite.setLayout(new GridLayout(/*2,false*/));
+		Composite top = new Composite(composite, SWT.NONE);
+		top.setLayout(new GridLayout(/*2,false*/));
+		top.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+		Composite bottom = new Composite(composite, SWT.NONE);
+		bottom.setLayout(new GridLayout(/*2,false*/));
+		bottom.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,true));
+
+		//-----------------------NAME---------------------------------
+		Label nameLabel = new Label(top, SWT.NONE);
+		nameLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
+		nameLabel.setText(TuxGuitar.getProperty("track.name") + ":");
+
+		this.nameText = new Text(top, SWT.BORDER);
+		this.nameText.setLayoutData(getAlignmentData(MINIMUM_LEFT_CONTROLS_WIDTH,SWT.FILL));
+		this.nameText.setText(track.getName());
+
+		//-----------------------COLOR---------------------------------
+		Label colorLabel = new Label(bottom, SWT.NONE);
+		colorLabel.setText(TuxGuitar.getProperty("track.color") + ":");
+		colorLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
+
+		final ColorButton colorButton = new ColorButton(bottom);
+		colorButton.setLayoutData(getAlignmentData(MINIMUM_LEFT_CONTROLS_WIDTH,SWT.FILL));
+		colorButton.setAlignment(SWT.RIGHT);
+		colorButton.setText(TuxGuitar.getProperty("color"));
+		colorButton.setColor(trackColor.getRGB());
+
+		colorButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent event) {
+				RGB rgb = colorButton.getColor();
+				if (rgb != null) {
+					TrackPropertiesDialog.this.trackColor.setR(rgb.red);
+					TrackPropertiesDialog.this.trackColor.setG(rgb.green);
+					TrackPropertiesDialog.this.trackColor.setB(rgb.blue);
+				}
+			}
+		});
+	}
+
+	private void initTuningInfo(Composite composite,TGTrackImpl track) {
+		composite.setLayout(new GridLayout(2,false));
+		initTuningData(composite,track);
+		initTuningCombos(composite);
+	}
+
+	private void initTuningCombos(Composite parent) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		composite.setLayout(new GridLayout(/*MAX_STRINGS+1, false*/));
+		composite.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,false,true));
+
+		loadTunningButton = new Button(composite, SWT.PUSH);
+		loadTunningButton.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
+		loadTunningButton.setText(TuxGuitar.getProperty("tuning.load"));
+		loadTunningButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				final TuningTemplateDialog dialog = new TuningTemplateDialog(TrackPropertiesDialog.this);
+				DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
+				TGString[] strings = dialog.getSelectedStrings();
+				if (strings != null) {
+					TrackPropertiesDialog.this.stringCountSpinner.setSelection(strings.length);
+					TrackPropertiesDialog.this.stringCount = strings.length;
+					tempStrings.clear();
+					tempStrings.addAll(Arrays.asList(strings));
+					updateTuningGroup(!TrackPropertiesDialog.this.percussionChannel);
+				}
+			}
+		});
+
+		String[] tuningTexts = getAllValueNames();
+		for (int i = 0; i < MAX_STRINGS; i++) {
+			this.stringCombos[i] = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
+			this.stringCombos[i].setItems(tuningTexts);
+		}
+	}
+
+	private void initTuningData(Composite parent,TGTrackImpl track) {
+		Composite composite = new Composite(parent, SWT.NONE);
+		composite.setLayout(new GridLayout());
+		composite.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+
+		Composite top = new Composite(composite, SWT.NONE);
+		top.setLayout(new GridLayout());
+		top.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+
+		Composite middle = new Composite(composite, SWT.NONE);
+		middle.setLayout(new GridLayout());
+		middle.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+
+		Composite bottom = new Composite( composite , SWT.NONE );
+		bottom.setLayout( new GridLayout() );
+		bottom.setLayoutData( new GridData(SWT.FILL,SWT.TOP,true,true) );
+
+		//---------------------------------STRING--------------------------------
+		Label stringCountLabel = new Label(top, SWT.NONE);
+		stringCountLabel.setText(TuxGuitar.getProperty("tuning.strings") + ":");
+		stringCountLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
+
+		this.stringCountSpinner = new Spinner(top, SWT.BORDER);
+		this.stringCountSpinner.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+		this.stringCountSpinner.setMinimum(MIN_STRINGS);
+		this.stringCountSpinner.setMaximum(MAX_STRINGS);
+		this.stringCountSpinner.setSelection(this.stringCount);
+		this.stringCountSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				TrackPropertiesDialog.this.stringCount = TrackPropertiesDialog.this.stringCountSpinner.getSelection();
+				setDefaultTuning(TrackPropertiesDialog.this.percussionChannel);
+				updateTuningGroup(!TrackPropertiesDialog.this.percussionChannel);
+			}
+		});
+
+		//---------------------------------OFFSET--------------------------------
+		Label offsetLabel = new Label(middle, SWT.NONE);
+		offsetLabel.setText(TuxGuitar.getProperty("tuning.offset") + ":");
+		offsetLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
+
+		this.offsetCombo = new Combo(middle, SWT.DROP_DOWN | SWT.READ_ONLY);
+		this.offsetCombo.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+		for(int i = TGTrack.MIN_OFFSET;i <= TGTrack.MAX_OFFSET;i ++){
+			this.offsetCombo.add(Integer.toString(i));
+			if(i == track.getOffset()){
+				this.offsetCombo.select(i - TGTrack.MIN_OFFSET);
+			}
+		}
+
+		//---------------------------------OPTIONS----------------------------------
+		this.stringTransposition = new Button( bottom , SWT.CHECK );
+		this.stringTransposition.setLayoutData( new GridData(SWT.FILL,SWT.CENTER,true,true) );
+		this.stringTransposition.setText(TuxGuitar.getProperty("tuning.strings.transpose"));
+		this.stringTransposition.setSelection( true );
+
+		this.stringTranspositionApplyToChords = new Button( bottom , SWT.CHECK );
+		this.stringTranspositionApplyToChords.setLayoutData( new GridData(SWT.FILL,SWT.CENTER,true,true) );
+		this.stringTranspositionApplyToChords.setText(TuxGuitar.getProperty("tuning.strings.transpose.apply-to-chords"));
+		this.stringTranspositionApplyToChords.setSelection( true );
+
+		this.stringTranspositionTryKeepString = new Button( bottom , SWT.CHECK );
+		this.stringTranspositionTryKeepString.setLayoutData( new GridData(SWT.FILL,SWT.CENTER,true,true) );
+		this.stringTranspositionTryKeepString.setText(TuxGuitar.getProperty("tuning.strings.transpose.try-keep-strings"));
+		this.stringTranspositionTryKeepString.setSelection( true );
+
+		this.stringTransposition.addSelectionListener( new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Button stringTransposition = TrackPropertiesDialog.this.stringTransposition;
+				Button stringTranspositionApplyToChords = TrackPropertiesDialog.this.stringTranspositionApplyToChords;
+				Button stringTranspositionTryKeepString = TrackPropertiesDialog.this.stringTranspositionTryKeepString;
+				stringTranspositionApplyToChords.setEnabled( ( stringTransposition.isEnabled() && stringTransposition.getSelection() ) );
+				stringTranspositionTryKeepString.setEnabled( ( stringTransposition.isEnabled() && stringTransposition.getSelection() ) );
+			}
+		});
+	}
+
+	private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
+		GridData data = new GridData();
+		data.minimumWidth = minimumWidth;
+		data.horizontalAlignment = horizontalAlignment;
+		data.verticalAlignment = SWT.DEFAULT;
+		data.grabExcessHorizontalSpace = true;
+		data.grabExcessVerticalSpace = true;
+		return data;
+	}
+
+	private void initButtons(final Composite parent) {
+		Button buttonOK = new Button(parent, SWT.PUSH);
+		buttonOK.setText(TuxGuitar.getProperty("ok"));
+		buttonOK.setLayoutData(getButtonsData());
+		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				updateTrackProperties();
+				TrackPropertiesDialog.this.dispose();
+			}
+		});
+
+		Button buttonCancel = new Button(parent, SWT.PUSH);
+		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
+		buttonCancel.setLayoutData(getButtonsData());
+		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				TrackPropertiesDialog.this.dispose();
+			}
+		});
+
+		this.setDefaultButton( buttonOK );
+	}
+
+	private void initInstrumentFields(Composite composite,TGTrackImpl track) {
+		composite.setLayout(new GridLayout());
+
+		Composite top = new Composite(composite, SWT.NONE);
+		top.setLayout(new GridLayout(2,false));
+		top.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
+
+		//------------Instrument Combo-------------------------------------
+		Label instrumentLabel = new Label(top, SWT.NONE);
+		instrumentLabel.setText(TuxGuitar.getProperty("instrument") + ":");
+		instrumentLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true,2,1));
+
+		this.instrumentCombo = new Combo(top, SWT.DROP_DOWN | SWT.READ_ONLY);
+		this.instrumentCombo.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,false));
+		this.instrumentCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				checkPercussionChannel();
+			}
+		});
+		this.loadChannels(track.getChannelId());
+
+		Button settings = new Button(top, SWT.PUSH);
+		settings.setImage(TuxGuitar.instance().getIconManager().getSettings());
+		settings.setToolTipText(TuxGuitar.getProperty("settings"));
+		settings.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,false));
+		settings.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				if(!TuxGuitar.instance().getChannelManager().isDisposed()){
+					TuxGuitar.instance().getChannelManager().dispose();
+				}
+				TuxGuitar.instance().getChannelManager().show(TrackPropertiesDialog.this);
+			}
+		});
+	}
+
+	private void loadChannels(int selectedChannelId){
+		List<Integer> tgChannelsData = new ArrayList<Integer>();
+		List<TGChannel> tgChannelsAvailable = getSongManager().getChannels();
+
+		Combo tgChannelsCombo = this.instrumentCombo;
+		tgChannelsCombo.removeAll();
+		tgChannelsCombo.add(TuxGuitar.getProperty("track.instrument.default-select-option"));
+		tgChannelsCombo.select(0);
+		tgChannelsData.add(new Integer(-1));
+
+		for( int i = 0 ; i < tgChannelsAvailable.size() ; i ++) {
+			TGChannel tgChannel = tgChannelsAvailable.get(i);
+			tgChannelsData.add(new Integer(tgChannel.getChannelId()));
+			tgChannelsCombo.add(tgChannel.getName());
+
+			if( tgChannel.getChannelId() == selectedChannelId ){
+				tgChannelsCombo.select(tgChannelsCombo.getItemCount() - 1);
+			}
+
+		}
+		tgChannelsCombo.setData(tgChannelsData);
+	}
+
+	private void reloadChannels(){
+		loadChannels(getSelectedChannelId());
+	}
+
+	private void checkPercussionChannel(){
+		boolean percussionChannel = getSongManager().isPercussionChannel( getSelectedChannelId() );
+		if( this.percussionChannel != percussionChannel ){
+			this.setDefaultTuning(percussionChannel);
+			this.updateTuningGroup(!percussionChannel);
+		}
+		this.percussionChannel = percussionChannel;
+	}
+
+	private int getSelectedChannelId(){
+		int index = this.instrumentCombo.getSelectionIndex();
+		if( index >= 0 ){
+			Object data = this.instrumentCombo.getData();
+			if( data instanceof List ){
+				List<?> list = (List<?>) data;
+				if ( list.size() > index ) {
+					return ((Integer)list.get(index)).intValue();
+				}
+			}
+		}
+		return -1;
+	}
+
+	private void updateTrackProperties() {
+		final TGSongManager songManager = getSongManager();
+
+		final TGTrackImpl track = selectedTrack;
+
+		final String trackName = this.nameText.getText();
+
+		final List<TGString> strings = new ArrayList<TGString>();
+		for (int i = 0; i < this.stringCount; i++) {
+			strings.add(TGSongManager.newString(getSongManager().getFactory(),(i + 1), this.stringCombos[i].getSelectionIndex()));
+		}
+
+		final int channelId = getSelectedChannelId();
+		final int offset = ((songManager.isPercussionChannel(channelId))?0:TGTrack.MIN_OFFSET + this.offsetCombo.getSelectionIndex());
+
+
+		final TGColor trackColor = this.trackColor;
+		final boolean infoChanges = hasInfoChanges(track,trackName,trackColor,offset);
+		final boolean tuningChanges = hasTuningChanges(track,strings);
+		final boolean channelChanges = hasChannelChanges(track, channelId);
+		final boolean transposeStrings = shouldTransposeStrings(track, channelId);
+		final boolean transposeApplyToChords = (transposeStrings && this.stringTranspositionApplyToChords.getSelection());
+		final boolean transposeTryKeepString = (transposeStrings && this.stringTranspositionTryKeepString.getSelection());
+
+		try {
+			if(infoChanges || tuningChanges || channelChanges){
+				ActionLock.lock();
+				TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+					@Override
+					public void run() throws Throwable {
+						TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
+						new Thread( new Runnable() {
+							@Override
+							public void run() {
+								TuxGuitar.instance().getFileHistory().setUnsavedFile();
+								UndoableJoined undoable = new UndoableJoined();
+
+								UndoableTrackGeneric undoableGeneric = null;
+								if(tuningChanges){
+									undoableGeneric = UndoableTrackGeneric.startUndo(track);
+								}
+
+								//--------------------------------------info---------------------------------------
+								if(infoChanges){
+									UndoableTrackInfo undoableInfo = null;
+									if(!tuningChanges){
+										undoableInfo = UndoableTrackInfo.startUndo(track);
+									}
+									songManager.getTrackManager().changeInfo(track,trackName,trackColor,offset);
+									if(!tuningChanges && undoableInfo != null){
+										undoable.addUndoableEdit(undoableInfo.endUndo(track));
+									}
+								}
+								//--------------------------------------tuning---------------------------------------
+								if(tuningChanges){
+									updateTrackTunings(track, strings, transposeStrings, transposeTryKeepString, transposeApplyToChords);
+								}
+								//-----------------------------instrument----------------------------------------------
+								if(channelChanges){
+									UndoableTrackInstrument undoableInstrument = null;
+									if(!tuningChanges){
+										undoableInstrument = UndoableTrackInstrument.startUndo(track);
+									}
+									songManager.getTrackManager().changeChannel(track,channelId);
+									if(!tuningChanges && undoableInstrument != null){
+										undoable.addUndoableEdit(undoableInstrument.endUndo(track));
+									}
+								}
+								if(tuningChanges && undoableGeneric != null){
+									undoable.addUndoableEdit(undoableGeneric.endUndo(track));
+								}
+								TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo());
+
+								new SyncThread(new Runnable() {
+									@Override
+									public void run() {
+										if(!TuxGuitar.isDisposed()){
+											TuxGuitar.instance().fireUpdate();
+											TuxGuitar.instance().updateCache( true );
+											TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
+											ActionLock.unlock();
+										}
+									}
+								}).start();
+							}
+						}).start();
+					}
+				});
+			}
+		} catch (Throwable throwable) {
+			TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
+			ActionLock.unlock();
+			throwable.printStackTrace();
+		}
+	}
+
+	private boolean shouldTransposeStrings(TGTrackImpl track, int selectedChannelId){
+		if(this.stringTransposition.getSelection()){
+			boolean percussionChannelNew = getSongManager().isPercussionChannel(selectedChannelId);
+			boolean percussionChannelOld = getSongManager().isPercussionChannel(track.getChannelId());
+
+			return (!percussionChannelNew && !percussionChannelOld);
+		}
+		return false;
+	}
+
+	private boolean hasInfoChanges(TGTrackImpl track,String name,TGColor color,int offset){
+		if(!name.equals(track.getName())){
+			return true;
+		}
+		if(!color.isEqual(track.getColor())){
+			return true;
+		}
+		if(offset != track.getOffset()){
+			return true;
+		}
+		return false;
+	}
+
+	private boolean hasChannelChanges(TGTrackImpl track,int channelId){
+		return ( track.getChannelId() != channelId );
+	}
+
+	private boolean hasTuningChanges(TGTrackImpl track,List<TGString> newStrings){
+		List<TGString> oldStrings = track.getStrings();
+		//check the number of strings
+		if(oldStrings.size() != newStrings.size()){
+			return true;
+		}
+		//check the tuning of strings
+		for(int i = 0;i < oldStrings.size();i++){
+			TGString oldString = oldStrings.get(i);
+			boolean stringExists = false;
+			for(int j = 0;j < newStrings.size();j++){
+				TGString newString = newStrings.get(j);
+				if(newString.isEqual(oldString)){
+					stringExists = true;
+				}
+			}
+			if(!stringExists){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void updateTrackTunings(TGTrackImpl track, List<TGString> strings, boolean transposeStrings , boolean transposeTryKeepString , boolean transposeApplyToChords ){
+		int[] transpositions = getStringTranspositions(track, strings);
+		getSongManager().getTrackManager().changeInstrumentStrings(track,strings);
+		if( transposeStrings ){
+			getSongManager().getTrackManager().transposeNotes(track, transpositions, transposeTryKeepString, transposeApplyToChords );
+		}
+	}
+
+	private int[] getStringTranspositions(TGTrackImpl track, List<TGString> newStrings ){
+		int[] transpositions = new int[ newStrings.size() ];
+
+		TGString newString = null;
+		TGString oldString = null;
+		for( int index = 0; index < transpositions.length ; index ++ ){
+			for( int i = 0; i < track.stringCount() ; i ++ ){
+				TGString string = track.getString( i + 1 );
+				if( string.getNumber() == (index + 1) ){
+					oldString = string;
+					break;
+				}
+			}
+			for( int i = 0; i < newStrings.size() ; i ++ ){
+				TGString string = newStrings.get( i );
+				if( string.getNumber() == (index + 1) ){
+					newString = string;
+					break;
+				}
+			}
+			if( oldString != null && newString != null ){
+				transpositions[ index ] = (oldString.getValue() - newString.getValue());
+			}else{
+				transpositions[ index ] = 0;
+			}
+
+			newString = null;
+			oldString = null;
+		}
+
+		return transpositions;
+	}
+
+	private void updateTuningGroup(boolean enabled) {
+		for (int i = 0; i < this.tempStrings.size(); i++) {
+			TGString string = this.tempStrings.get(i);
+			this.stringCombos[i].select(string.getValue());
+			this.stringCombos[i].setVisible(true);
+			this.stringCombos[i].setEnabled(enabled);
+		}
+		this.loadTunningButton.setEnabled(enabled);
+
+		for (int i = this.tempStrings.size(); i < MAX_STRINGS; i++) {
+			this.stringCombos[i].select(0);
+			this.stringCombos[i].setVisible(false);
+		}
+		this.offsetCombo.setEnabled(enabled);
+		this.stringTransposition.setEnabled(enabled);
+		this.stringTranspositionApplyToChords.setEnabled(enabled && this.stringTransposition.getSelection());
+		this.stringTranspositionTryKeepString.setEnabled(enabled && this.stringTransposition.getSelection());
+	}
+
+	private void initTempStrings(List<TGString> realStrings) {
+		this.tempStrings = new ArrayList<TGString>();
+		for (int i = 0; i < realStrings.size(); i++) {
+			TGString realString = realStrings.get(i);
+			this.tempStrings.add(realString.clone(getSongManager().getFactory()));
+		}
+	}
+
+	private void setDefaultTuning( boolean percussionChannel ) {
+		this.tempStrings.clear();
+		if( percussionChannel ) {
+			for (int i = 1; i <= this.stringCount; i++) {
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),i, 0));
+			}
+		}
+		else {
+			switch (this.stringCount) {
+			case 7:
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 64));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 59));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 55));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 50));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),5, 45));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),6, 40));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),7, 35));
+				break;
+			case 6:
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 64));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 59));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 55));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 50));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),5, 45));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),6, 40));
+				break;
+			case 5:
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 43));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 38));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 33));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 28));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),5, 23));
+				break;
+			case 4:
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 43));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 38));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 33));
+				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 28));
+				break;
+			default:
+				for( int i = 1 ; i <= this.stringCount ; i ++ ){
+					this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),i,0));
+				}
+				break;
+			}
+		}
+	}
+
+	private TGSongManager getSongManager() {
+		return TuxGuitar.instance().getSongManager();
+	}
+
+	private String[] getAllValueNames() {
+		String[] valueNames = new String[TGMusicKeyUtils.MAX_NOTES * MAX_OCTAVES];
+		for (int i = 0; i < valueNames.length; i++) {
+			valueNames[i] =  TGMusicKeyUtils.getNoteName(i);
+		}
+		return valueNames;
+	}
+
+	private void addListeners(){
+		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
+	}
+
+	private void removeListeners(){
+		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
+	}
+
+	private void updateItems(){
+		if( this != null && !this.isDisposed() ){
+			this.reloadChannels();
+		}
+	}
+
+	@Override
+	public void doUpdate(int type) {
+		if( type == TGUpdateListener.SELECTION ){
+			this.updateItems();
+		}
+	}
+
+	@Override
+	public void dispose() {
+		removeListeners();
+		super.dispose();
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/TuningTemplateDialog.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/TuningTemplateDialog.java
new file mode 100644
index 00000000..90dad268
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/app/widgets/TuningTemplateDialog.java
@@ -0,0 +1,250 @@
+package org.herac.tuxguitar.app.widgets;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.system.tuning.TuningTemplate;
+import org.herac.tuxguitar.app.system.tuning.TuningTemplateManager;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.util.MapComparator;
+import org.herac.tuxguitar.util.StringUtil;
+
+public class TuningTemplateDialog extends Shell {
+
+	private static final int MINIMUM_BUTTON_WIDTH = 80;
+	private static final int MINIMUM_BUTTON_HEIGHT = 25;
+
+	final ComboValue<TGString[]> comboTuning;
+	final Composite stringsZone;
+	private TGString[] strings;
+
+	private static class Key {
+		String instrument;
+		int stringCount;
+	}
+
+	public TuningTemplateDialog(Shell parent) {
+		super(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+
+		this.setLayout(new GridLayout(1,false));
+		this.setText(TuxGuitar.getProperty("tuning.dialog.properties"));
+
+		Composite body = new Composite(this,SWT.NONE);
+		body.setLayout(new GridLayout());
+		body.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
+		Composite bottom = new Composite(this, SWT.NONE);
+		bottom.setLayout(new GridLayout(2,false));
+		bottom.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true,2,1));
+
+		initButtons(bottom);
+
+		ComboValue<Key> comboFilter = createComboFilter(body);
+
+		comboTuning = new ComboValue<TGString[]>(body, SWT.DROP_DOWN);
+		comboTuning.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				updateStrings(comboTuning.getSelectionValue());
+			}
+		});
+
+		stringsZone = new Composite(body, 0);
+		stringsZone.setLayout(new RowLayout(SWT.HORIZONTAL));
+
+		// initialize default selected elements
+		comboFilter.select(0);
+		updateTuningList(comboFilter.getSelectionValue());
+		comboTuning.select(0);
+		updateStrings(comboTuning.getSelectionValue());
+	}
+
+	private ComboValue<Key> createComboFilter(Composite body) {
+		// compute list of tuning filters
+		TuningTemplateManager manager = TuxGuitar.instance().getTuningTemplateManager();
+		Map<Key, String> filters = new HashMap<TuningTemplateDialog.Key, String>();
+		final ComboValue<Key> comboFilter = new ComboValue<Key>(body, SWT.DROP_DOWN);
+		for (String instrument: manager.getAvailableInstruments()) {
+			for (Integer stringCount: manager.getAvailableNumberOfStringsFromInstrument(instrument)) {
+				String label = TuxGuitar.getProperty("tuning.string-instrument", new String[]{instrument, "" + stringCount});
+				label = StringUtil.toUpperFirstChar(label);
+				Key key = new Key();
+				key.instrument = instrument;
+				key.stringCount = stringCount;
+				filters.put(key, label);
+			}
+		}
+
+		// sort labels
+		List<Key> keys = new ArrayList<Key>(filters.keySet());
+		Collections.sort(keys, new MapComparator<Key,String>(keys, filters));
+		for (Key key: keys) {
+			comboFilter.add(filters.get(key), key);
+		}
+
+		comboFilter.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				int i = comboFilter.getSelectionIndex();
+				if (i != -1) {
+					Key key = comboFilter.getSelectionValue();
+					updateTuningList(key);
+					// update default selected elements
+					comboTuning.select(0);
+					updateStrings(comboTuning.getSelectionValue());
+				} else {
+					updateTuningList("", 0);
+				}
+			}
+		});
+
+		return comboFilter;
+	}
+
+	/**
+	 * Update preview of the strings
+	 */
+	private void updateStrings(TGString[] strings) {
+		this.strings = strings;
+
+		// clean up
+		for (Control control : stringsZone.getChildren()) {
+			control.dispose();
+		}
+		if (strings == null || strings.length == 0) {
+			return;
+		}
+
+		int min = 500;
+		int max = -500;
+		for (TGString string: strings) {
+			int v = string.getValue();
+			if (v < min) {
+				min = v;
+			}
+			if (v > max) {
+				max = v;
+			}
+		}
+
+		for (TGString string: strings) {
+			StringLabel label = new StringLabel(stringsZone);
+			label.setMinMax(min, max);
+			label.setString(string);
+		}
+		stringsZone.layout(true);
+		stringsZone.pack();
+		pack(true);
+	}
+
+	/**
+	 * Update the combo displaying tuning names
+	 */
+	private void updateTuningList(Key key) {
+		if (key == null) {
+			return;
+		}
+		updateTuningList(key.instrument, key.stringCount);
+	}
+
+	/**
+	 * Update the combo displaying tuning names
+	 */
+	private void updateTuningList(String instrument, int stringCount) {
+		comboTuning.removeAll();
+		Iterator<TuningTemplate> i = TuxGuitar.instance().getTuningTemplateManager().getTuningTemplates();
+		List<TuningTemplate> list = new ArrayList<TuningTemplate>();
+		while (i.hasNext()) {
+			TuningTemplate template = i.next();
+			if (template.getInstrument().equals(instrument) && template.getStringCount() == stringCount) {
+				list.add(template);
+			}
+		}
+		Collections.sort(list, new Comparator<TuningTemplate>() {
+			@Override
+			public int compare(TuningTemplate t1, TuningTemplate t2) {
+				return t1.getName().compareTo(t2.getName());
+			}
+		});
+		for (TuningTemplate template: list) {
+			if (template.getInstrument().equals(instrument) && template.getStringCount() == stringCount) {
+				String label = StringUtil.toUpperFirstChar(template.getName());
+				comboTuning.add(label, template.getStrings());
+			}
+		}
+	}
+
+	private void initButtons(Composite parent) {
+		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
+		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
+		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
+
+		Button buttonOK = new Button(parent, SWT.PUSH);
+		buttonOK.setText(TuxGuitar.getProperty("ok"));
+		buttonOK.setLayoutData(data);
+		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				TuningTemplateDialog.this.dispose();
+			}
+		});
+
+		Button buttonCancel = new Button(parent, SWT.PUSH);
+		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
+		buttonCancel.setLayoutData(data);
+		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				strings = null;
+				TuningTemplateDialog.this.dispose();
+			}
+		});
+
+		this.setDefaultButton( buttonOK );
+		this.addShellListener(new ShellAdapter() {
+			@Override
+			public void shellClosed(ShellEvent e) {
+				strings = null;
+			}
+		});
+	}
+
+	/**
+	 * Get strings (i.e. loudest string in classical guitar is on last)
+	 */
+	public TGString[] getSelectedStrings() {
+		if (strings == null) {
+			return null;
+		}
+		// TuxGuitar use strings in reverse order;
+		TGString[] reverse = new TGString[strings.length];
+		for (int i = 0; i < strings.length; i++) {
+			reverse[strings.length - 1 - i] = strings[i];
+		}
+		return reverse;
+	}
+
+	@Override
+	protected void checkSubclass() {
+		// Allow to inherit SWT components... I would like to cook OOP thanks
+	}
+
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGColor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGColor.java
new file mode 100644
index 00000000..49e23f41
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGColor.java
@@ -0,0 +1,10 @@
+package org.herac.tuxguitar.graphics;
+
+public interface TGColor extends TGResource {
+
+	public int getRed();
+
+	public int getGreen();
+
+	public int getBlue();
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGColorModel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGColorModel.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGColorModel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGColorModel.java
index 61143c57..cc9cb9a8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGColorModel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGColorModel.java
@@ -1,41 +1,41 @@
 package org.herac.tuxguitar.graphics;
 
 public class TGColorModel {
-	
+
 	private int red;
 	private int green;
 	private int blue;
-	
+
 	public TGColorModel(){
 		this(0,0,0);
 	}
-	
+
 	public TGColorModel(int red, int green, int blue){
 		this.red = red;
 		this.green = green;
 		this.blue = blue;
 	}
-	
+
 	public int getRed() {
 		return this.red;
 	}
-	
+
 	public void setRed(int red) {
 		this.red = red;
 	}
-	
+
 	public int getGreen() {
 		return this.green;
 	}
-	
+
 	public void setGreen(int green) {
 		this.green = green;
 	}
-	
+
 	public int getBlue() {
 		return this.blue;
 	}
-	
+
 	public void setBlue(int blue) {
 		this.blue = blue;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGDimension.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGDimension.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGDimension.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGDimension.java
index ea565425..83f87cfd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGDimension.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGDimension.java
@@ -1,31 +1,31 @@
 package org.herac.tuxguitar.graphics;
 
 public class TGDimension {
-	
+
 	private int width;
 	private int height;
-	
+
 	public TGDimension(int width,int height){
 		this.width = width;
 		this.height = height;
 	}
-	
+
 	public TGDimension(){
 		this(0,0);
 	}
-	
+
 	public int getWidth() {
 		return this.width;
 	}
-	
+
 	public void setWidth(int width) {
 		this.width = width;
 	}
-	
+
 	public int getHeight() {
 		return this.height;
 	}
-	
+
 	public void setHeight(int height) {
 		this.height = height;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGFont.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGFont.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGFont.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGFont.java
index 5b66c357..f3a5dd02 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGFont.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGFont.java
@@ -1,13 +1,13 @@
 package org.herac.tuxguitar.graphics;
 
 public interface TGFont extends TGResource {
-	
+
 	public String getName();
-	
+
 	public int getHeight();
-	
+
 	public boolean isBold();
-	
+
 	public boolean isItalic();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGFontModel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGFontModel.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGFontModel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGFontModel.java
index 80aedbd9..2e5eb7fa 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGFontModel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGFontModel.java
@@ -1,51 +1,51 @@
 package org.herac.tuxguitar.graphics;
 
 public class TGFontModel {
-	
+
 	private String name;
 	private int height;
 	private boolean bold;
 	private boolean italic;
-	
+
 	public TGFontModel(){
 		this(null,0,false,false);
 	}
-	
+
 	public TGFontModel(String name, int height, boolean bold, boolean italic){
 		this.name = name;
 		this.height = height;
 		this.bold = bold;
 		this.italic = italic;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public int getHeight() {
 		return this.height;
 	}
-	
+
 	public void setHeight(int height) {
 		this.height = height;
 	}
-	
+
 	public boolean isBold() {
 		return this.bold;
 	}
-	
+
 	public void setBold(boolean bold) {
 		this.bold = bold;
 	}
-	
+
 	public boolean isItalic() {
 		return this.italic;
 	}
-	
+
 	public void setItalic(boolean italic) {
 		this.italic = italic;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGImage.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGImage.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGImage.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGImage.java
index 5048162b..b5c6c3db 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGImage.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGImage.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.graphics;
 
 public interface TGImage extends TGResource,TGPainterFactory {
-	
+
 	public int getWidth();
-	
+
 	public int getHeight();
-	
+
 	public void applyTransparency( TGColor background );
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGPainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPainter.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGPainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPainter.java
index abe72ea2..49a82685 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGPainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPainter.java
@@ -1,75 +1,75 @@
 package org.herac.tuxguitar.graphics;
 
 public interface TGPainter extends TGResourceFactory, TGResource {
-	
+
 	public static final int PATH_DRAW = 0x01;
-	
+
 	public static final int PATH_FILL = 0x02;
-	
+
 	public void initPath(int style);
-	
+
 	public void initPath();
-	
+
 	public void closePath();
-	
+
 	public void copyArea(TGImage image, int x, int y);
-	
+
 	public void drawString(String string, int x, int y);
-	
+
 	public void drawString(String string, int x, int y, boolean isTransparent);
-	
+
 	public void drawImage(TGImage image, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight);
-	
+
 	public void drawImage(TGImage image, int x, int y);
-	
+
 	public void drawPolygon(int[] arg0);
-	
+
 	public void fillPolygon(int[] arg0);
-	
+
 	public void cubicTo(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5);
-	
+
 	public void lineTo(float arg0, float arg1);
-	
+
 	public void moveTo(float arg0, float arg1);
-	
+
 	public void addString(String arg0, float arg1, float arg2, TGFont arg3);
-	
+
 	public void addArc(float arg0, float arg1, float arg2, float arg3, float arg4, float arg5);
-	
+
 	public void addOval(float arg0, float arg1, float arg2, float arg3);
-	
+
 	public void addRectangle(float x,float y,float width,float height);
-	
+
 	public void setFont(TGFont font);
-	
+
 	public void setForeground(TGColor color);
-	
+
 	public void setBackground(TGColor color);
-	
+
 	public void setLineWidth(int lineWidth);
-	
+
 	public void setLineStyleSolid();
-	
+
 	public void setLineStyleDot();
-	
+
 	public void setLineStyleDash();
-	
+
 	public void setLineStyleDashDot();
-	
+
 	public void setAlpha(int alpha);
-	
+
 	public void setAntialias(boolean enabled);
-	
+
 	public void setAdvanced(boolean advanced);
-	
+
 	public int getFontSize();
-	
+
 	public int getFMHeight();
-	
+
 	public int getFMAscent();
-	
+
 	public int getFMDescent();
-	
+
 	public int getFMWidth( String text );
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGPainterFactory.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPainterFactory.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGPainterFactory.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPainterFactory.java
index 7982d473..08f8cffc 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGPainterFactory.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPainterFactory.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.graphics;
 
 public interface TGPainterFactory {
-	
+
 	public TGPainter createPainter();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGPoint.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPoint.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGPoint.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPoint.java
index 4cf4b834..4cd64264 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGPoint.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGPoint.java
@@ -1,31 +1,31 @@
 package org.herac.tuxguitar.graphics;
 
 public class TGPoint {
-	
+
 	private int x;
 	private int y;
-	
+
 	public TGPoint(int x,int y){
 		this.x = x;
 		this.y = y;
 	}
-	
+
 	public TGPoint(){
 		this(0,0);
 	}
-	
+
 	public int getX() {
 		return this.x;
 	}
-	
+
 	public void setX(int x) {
 		this.x = x;
 	}
-	
+
 	public int getY() {
 		return this.y;
 	}
-	
+
 	public void setY(int y) {
 		this.y = y;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGRectangle.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGRectangle.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGRectangle.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGRectangle.java
index ce461f6a..f4e5bd5c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGRectangle.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGRectangle.java
@@ -1,47 +1,47 @@
 package org.herac.tuxguitar.graphics;
 
 public class TGRectangle {
-	
+
 	private TGPoint location;
 	private TGDimension size;
-	
+
 	public TGRectangle(int x, int y, int width, int height){
 		this.location = new TGPoint(x,y);
 		this.size = new TGDimension(width,height);
 	}
-	
+
 	public TGRectangle(){
 		this(0,0,0,0);
 	}
-	
+
 	public int getX() {
 		return this.location.getX();
 	}
-	
+
 	public void setX(int x) {
 		this.location.setX(x);
 	}
-	
+
 	public int getY() {
 		return this.location.getY();
 	}
-	
+
 	public void setY(int y) {
 		this.location.setY(y);
 	}
-	
+
 	public int getWidth() {
 		return this.size.getWidth();
 	}
-	
+
 	public void setWidth(int width) {
 		this.size.setWidth(width);
 	}
-	
+
 	public int getHeight() {
 		return this.size.getHeight();
 	}
-	
+
 	public void setHeight(int height) {
 		this.size.setHeight(height);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGResource.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGResource.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGResource.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGResource.java
index bda9047b..c4299bb7 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGResource.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGResource.java
@@ -1,9 +1,9 @@
 package org.herac.tuxguitar.graphics;
 
 public interface TGResource {
-	
+
 	public void dispose();
-	
+
 	public boolean isDisposed();
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGResourceFactory.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGResourceFactory.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/TGResourceFactory.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGResourceFactory.java
index 7f69e6bb..5a5aca09 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGResourceFactory.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/TGResourceFactory.java
@@ -1,15 +1,15 @@
 package org.herac.tuxguitar.graphics;
 
 public interface TGResourceFactory {
-	
+
 	public TGImage createImage( int width, int height );
-	
+
 	public TGColor createColor(TGColorModel colorModel);
-	
+
 	public TGColor createColor( int red, int green, int blue);
-	
+
 	public TGFont createFont(TGFontModel fontModel);
-	
+
 	public TGFont createFont(String name, int height, boolean bold, boolean italic);
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatGroup.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
index 2e81cd8f..8a5d2c5b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatGroup.java
@@ -9,27 +9,27 @@ public class TGBeatGroup {
 	private static final int SCORE_MIDDLE_KEYS[] = new int[]{55,40,40,50};
 	private static final int SCORE_SHARP_POSITIONS[] = new int[]{7,7,6,6,5,4,4,3,3,2,2,1};
 	private static final int SCORE_FLAT_POSITIONS[] = new int[]{7,6,6,5,5,4,3,3,2,2,1,1};
-	
+
 	public static final int DIRECTION_NOT_SETTED = 0;
 	public static final int DIRECTION_UP = 1;
 	public static final int DIRECTION_DOWN = 2;
-	
+
 	private static final int UP_OFFSET = 28;
 	private static final int DOWN_OFFSET = 35;
-	
+
 	private int voice;
 	private int direction;
-	private List voices;
+	private List<TGVoiceImpl> voices;
 	private TGNoteImpl firstMinNote;
 	private TGNoteImpl firstMaxNote;
 	private TGNoteImpl lastMinNote;
 	private TGNoteImpl lastMaxNote;
 	private TGNoteImpl maxNote;
 	private TGNoteImpl minNote;
-	
+
 	public TGBeatGroup(int voice){
 		this.voice = voice;
-		this.voices = new ArrayList();
+		this.voices = new ArrayList<TGVoiceImpl>();
 		this.direction = DIRECTION_NOT_SETTED;
 		this.firstMinNote = null;
 		this.firstMaxNote = null;
@@ -38,7 +38,7 @@ public TGBeatGroup(int voice){
 		this.maxNote = null;
 		this.minNote = null;
 	}
-	
+
 	public void check(TGVoiceImpl voice){
 		this.check(voice.getMaxNote());
 		this.check(voice.getMinNote());
@@ -52,10 +52,10 @@ else if( voice.getDirection() == TGVoice.DIRECTION_DOWN ){
 			}
 		}
 	}
-	
+
 	private void check(TGNoteImpl note){
 		int value = note.getRealValue();
-		
+
 		//FIRST MIN NOTE
 		if(this.firstMinNote == null || note.getVoice().getBeat().getStart() < this.firstMinNote.getVoice().getBeat().getStart()){
 			this.firstMinNote = note;
@@ -72,7 +72,7 @@ private void check(TGNoteImpl note){
 				this.firstMaxNote = note;
 			}
 		}
-		
+
 		//LAST MIN NOTE
 		if(this.lastMinNote == null || note.getVoice().getBeat().getStart() > this.lastMinNote.getVoice().getBeat().getStart()){
 			this.lastMinNote = note;
@@ -89,7 +89,7 @@ private void check(TGNoteImpl note){
 				this.lastMaxNote = note;
 			}
 		}
-		
+
 		if(this.maxNote == null || value > this.maxNote.getRealValue()){
 			this.maxNote = note;
 		}
@@ -97,7 +97,7 @@ private void check(TGNoteImpl note){
 			this.minNote = note;
 		}
 	}
-	
+
 	public void finish(TGLayout layout, TGMeasureImpl measure){
 		if( this.direction == DIRECTION_NOT_SETTED ){
 			if (measure.getNotEmptyVoices() > 1 ){
@@ -115,27 +115,27 @@ public void finish(TGLayout layout, TGMeasureImpl measure){
 			}
 		}
 	}
-	
-	public List getVoices(){
+
+	public List<TGVoiceImpl> getVoices(){
 		return this.voices;
 	}
-	
+
 	public int getY1(TGLayout layout,TGNoteImpl note,int key,int clef){
 		double scale = (layout.getScoreLineSpacing() / 2.00);
 		int noteValue = note.getRealValue();
-		
+
 		int scoreLineY = 0;
 		if(key <= 7){
 			scoreLineY = (int)((SCORE_SHARP_POSITIONS[noteValue % 12]) * scale - (7 * (noteValue / 12)) * scale);
 		}else{
 			scoreLineY = (int)((SCORE_FLAT_POSITIONS[noteValue % 12]) * scale - (7 * (noteValue / 12)) * scale);
 		}
-		
+
 		scoreLineY += TGMeasureImpl.SCORE_KEY_OFFSETS[clef - 1] * scale;
-		
+
 		return scoreLineY;
 	}
-	
+
 	public int getY2(TGLayout layout,int x,int key,int clef){
 		int maxDistance = 10;
 		float upOffset = TGBeatGroup.getUpOffset(layout);
@@ -144,16 +144,16 @@ public int getY2(TGLayout layout,int x,int key,int clef){
 			if(this.minNote != this.firstMinNote && this.minNote != this.lastMinNote){
 				return (int) (getY1(layout,this.minNote,key,clef) + downOffset);
 			}
-			
+
 			int y = 0;
 			int x1 = this.firstMinNote.getPosX() + this.firstMinNote.getBeatImpl().getSpacing();
 			int x2 = this.lastMinNote.getPosX() + this.lastMinNote.getBeatImpl().getSpacing();
 			int y1 =  (int) (getY1(layout,this.firstMinNote,key,clef) +  downOffset);
 			int y2 =  (int) (getY1(layout,this.lastMinNote,key,clef) +  downOffset);
-			
+
 			if(y1 > y2 && (y1 - y2) > maxDistance) y2 = (y1 - maxDistance);
 			if(y2 > y1 && (y2 - y1) > maxDistance) y1 = (y2 - maxDistance);
-			
+
 			//int y = (int)((((double)y1 -(double)y2) / ((double)x1 - (double)x2)) * ((double)x1 - (double)x));
 			if( (y1 - y2) != 0 && (x1 - x2) != 0 && (x1 - x) != 0){
 				y = (int)((((double)y1 -(double)y2) / ((double)x1 - (double)x2)) * ((double)x1 - (double)x));
@@ -167,34 +167,34 @@ public int getY2(TGLayout layout,int x,int key,int clef){
 			int x2 = this.lastMaxNote.getPosX() + this.lastMaxNote.getBeatImpl().getSpacing();
 			int y1 = (int)(getY1(layout,this.firstMaxNote,key,clef) - upOffset);
 			int y2 = (int)(getY1(layout,this.lastMaxNote,key,clef) - upOffset);
-			
+
 			if(y1 < y2 && (y2 - y1) > maxDistance) y2 = (y1 + maxDistance);
 			if(y2 < y1 && (y1 - y2) > maxDistance) y1 = (y2 + maxDistance);
-			
+
 			if( (y1 - y2) != 0 && (x1 - x2) != 0 && (x1 - x) != 0){
 				y = (int)((((double)y1 -(double)y2) / ((double)x1 - (double)x2)) * ((double)x1 - (double)x));
 			}
 			return y1 - y;
 		}
 	}
-	
+
 	public int getDirection() {
 		return this.direction;
 	}
-	
+
 	public TGNoteImpl getMinNote(){
 		return this.minNote;
 	}
-	
+
 	public TGNoteImpl getMaxNote(){
 		return this.maxNote;
 	}
-	
+
 	public static float getUpOffset(TGLayout layout){
 		float scale = (layout.getScoreLineSpacing() / 8.0f);
 		return (UP_OFFSET * scale);
 	}
-	
+
 	public static float getDownOffset(TGLayout layout){
 		float scale = (layout.getScoreLineSpacing() / 8.0f);
 		return (DOWN_OFFSET * scale);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
index a7e19a9a..2cc88951 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatImpl.java
@@ -8,6 +8,7 @@
 import org.herac.tuxguitar.song.models.TGVoice;
 
 public class TGBeatImpl extends TGBeat{
+	private static final long serialVersionUID = 1L;
 	/**
 	 * desviacion a la izquierda
 	 */
@@ -24,7 +25,7 @@ public class TGBeatImpl extends TGBeat{
 	 * Union a la derecha
 	 */
 	public static final int JOINED_TYPE_RIGHT = 4;
-	
+
 	private int posX;
 	private int width;
 	private TGNoteImpl maxNote;
@@ -37,9 +38,9 @@ public class TGBeatImpl extends TGBeat{
 	private TGBeatImpl previous;
 	private TGBeatImpl next;
 	private TGBeatGroup group;
-	
+
 	private TGBeatSpacing bs;
-	
+
 	private boolean accentuated;
 	private boolean heavyAccentuated;
 	private boolean harmonic;
@@ -51,78 +52,78 @@ public class TGBeatImpl extends TGBeat{
 	private boolean vibrato;
 	private boolean trill;
 	private boolean fadeIn;
-	
+
 	public TGBeatImpl(TGFactory factory){
 		super(factory);
 	}
-	
+
 	public int getPosX() {
 		return this.posX;
 	}
-	
+
 	public void setPosX(int posX) {
 		this.posX = posX;
 	}
-	
+
 	public int getMinimumWidth() {
 		return this.width;
 	}
-	
+
 	public void setWidth(int width) {
 		this.width = width;
 	}
-	
+
 	public TGNoteImpl getMinNote(){
 		return this.minNote;
 	}
-	
+
 	public TGNoteImpl getMaxNote(){
 		return this.maxNote;
 	}
-	
+
 	public TGMeasureImpl getMeasureImpl() {
 		return (TGMeasureImpl)getMeasure();
 	}
-	
+
 	public boolean[] getUsedStrings() {
 		if(this.usedStrings == null){
 			this.usedStrings = new boolean[getMeasure().getTrack().stringCount()];
 		}
 		return this.usedStrings;
 	}
-	
+
 	public TGBeatImpl getJoin1() {
 		return this.join1;
 	}
-	
+
 	public void setJoin1(TGBeatImpl join1) {
 		this.join1 = join1;
 	}
-	
+
 	public TGBeatImpl getJoin2() {
 		return this.join2;
 	}
-	
+
 	public void setJoin2(TGBeatImpl join2) {
 		this.join2 = join2;
 	}
-	
+
 	public boolean isJoinedGreaterThanQuarter() {
 		return this.joinedGreaterThanQuarter;
 	}
-	
+
 	public void setJoinedGreaterThanQuarter(boolean joinedGreaterThanQuarter) {
 		this.joinedGreaterThanQuarter = joinedGreaterThanQuarter;
 	}
-	
+
 	public int getJoinedType() {
 		return this.joinedType;
 	}
-	
+
 	public void setJoinedType(int joinedType) {
 		this.joinedType = joinedType;
 	}
-	
+
 	public TGBeatImpl getPreviousBeat() {
 		return this.previous;
 	}
@@ -142,19 +143,19 @@ public void setNextBeat(TGBeatImpl next) {
 	public TGBeatGroup getBeatGroup() {
 		return this.group;
 	}
-	
+
 	public void setBeatGroup(TGBeatGroup group) {
 		this.group = group;
 	}
-	
+
 	public int getSpacing(){
 		return getMeasureImpl().getBeatSpacing(this);
 	}
-	
+
 	public boolean isPlaying(TGLayout layout){
 		return layout.getComponent().isRunning(this);
 	}
-	
+
 	public TGVoiceImpl getVoiceImpl(int index){
 		TGVoice voice = super.getVoice(index);
 		if(voice instanceof TGVoiceImpl){
@@ -162,13 +163,13 @@ public TGVoiceImpl getVoiceImpl(int index){
 		}
 		return null;
 	}
-	
+
 	public void reset(){
 		this.maxNote = null;
 		this.minNote = null;
 		this.usedStrings = new boolean[getMeasure().getTrack().stringCount()];
 	}
-	
+
 	public void check( TGLayout layout , TGNoteImpl note){
 		int value = note.getRealValue();
 		if(this.maxNote == null || value > this.maxNote.getRealValue()){
@@ -180,7 +181,7 @@ public void check( TGLayout layout , TGNoteImpl note){
 		this.getUsedStrings();
 		this.usedStrings[note.getString() - 1] = true;
 	}
-	
+
 	public void resetEffectsSpacing( TGLayout layout ){
 		this.bs = new TGBeatSpacing( layout );
 		this.accentuated = false;
@@ -195,7 +196,7 @@ public void resetEffectsSpacing( TGLayout layout ){
 		this.vibrato = false;
 		this.trill = false;
 	}
-	
+
 	public void updateEffectsSpacing(TGLayout layout,TGNoteEffect effect){
 		if(effect.isAccentuatedNote()){
 			this.accentuated = true;
@@ -231,7 +232,7 @@ public void updateEffectsSpacing(TGLayout layout,TGNoteEffect effect){
 			this.trill = true;
 		}
 	}
-	
+
 	public int getEffectsSpacing(TGLayout layout){
 		if(this.accentuated){
 			this.bs.setSize(TGBeatSpacing.POSITION_ACCENTUATED_EFFECT,layout.getEffectSpacing());
@@ -268,7 +269,7 @@ public int getEffectsSpacing(TGLayout layout){
 		}
 		return this.bs.getSize();
 	}
-	
+
 	public void paint(TGLayout layout,TGPainter painter, int fromX, int fromY/*,boolean playMode*/) {
 		if(!layout.isPlayModeEnabled() && (layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0 ){
 			paintExtraLines(painter, layout,fromX, fromY);
@@ -286,7 +287,7 @@ public void paint(TGLayout layout,TGPainter painter, int fromX, int fromY/*,bool
 			}
 		}
 	}
-	
+
 	public void paintExtraLines(TGPainter painter,TGLayout layout,int fromX, int fromY){
 		if(!isRestBeat()){
 			int scoreY = (fromY + getMeasureImpl().getTs().getPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES));
@@ -294,16 +295,16 @@ public void paintExtraLines(TGPainter painter,TGLayout layout,int fromX, int fro
 			paintExtraLines(painter,layout,getMaxNote(), fromX, scoreY);
 		}
 	}
-	
+
 	private void paintExtraLines(TGPainter painter,TGLayout layout,TGNoteImpl note,int fromX,int fromY){
 		float scale = layout.getScale();
 		int y = fromY + note.getScorePosY();
 		int x = fromX + getPosX() + getSpacing();
 		float x1 = x - (4 * scale);
 		float x2 = x + (12 * scale);
-		
+
 		int scoreLineSpacing = layout.getScoreLineSpacing();
-		
+
 		layout.setLineStyle(painter);
 		if(y < fromY){
 			for(int i = fromY;i > y;i -= scoreLineSpacing){
@@ -323,7 +324,7 @@ private void paintExtraLines(TGPainter painter,TGLayout layout,TGNoteImpl note,i
 			}
 		}
 	}
-	
+
 	public void paintStroke(TGLayout layout,TGPainter painter, int fromX, int fromY){
 		int style = layout.getStyle();
 		float scale = layout.getScale();
@@ -331,7 +332,7 @@ public void paintStroke(TGLayout layout,TGPainter painter, int fromX, int fromY)
 		float y1 = 0;
 		float y2 = 0;
 		if((style & TGLayout.DISPLAY_SCORE) != 0){
-			float y = (fromY + getPaintPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES)); 
+			float y = (fromY + getPaintPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES));
 			y1 = (y + layout.getScoreLineSpacing());
 			y2 = (y + (getMeasureImpl().getTrackImpl().getScoreHeight() - layout.getScoreLineSpacing()));
 		}
@@ -341,7 +342,7 @@ public void paintStroke(TGLayout layout,TGPainter painter, int fromX, int fromY)
 			y2 = (y + (getMeasureImpl().getTrackImpl().getTabHeight() - layout.getStringSpacing()));
 		}
 		else if((style & TGLayout.DISPLAY_SCORE) != 0){
-			float y = (fromY + getPaintPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES)); 
+			float y = (fromY + getPaintPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES));
 			y1 = (y + layout.getScoreLineSpacing());
 			y2 = (y + (getMeasureImpl().getTrackImpl().getScoreHeight() - layout.getScoreLineSpacing()));
 		}else{
@@ -367,15 +368,16 @@ else if((style & TGLayout.DISPLAY_SCORE) != 0){
 			painter.closePath();
 		}
 	}
-	
+
 	public int getPaintPosition(int index){
 		return getMeasureImpl().getTs().getPosition(index);
 	}
-	
+
 	public TGBeatSpacing getBs(){
 		return this.bs;
 	}
-	
+
+	@Override
 	public void removeChord(){
 		if(isChordBeat()){
 			TGChordImpl chord = (TGChordImpl)getChord();
@@ -383,7 +385,7 @@ public void removeChord(){
 		}
 		super.removeChord();
 	}
-	
+
 	public void dispose(){
 		if(isChordBeat()){
 			TGChordImpl chord = (TGChordImpl)getChord();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
index 798a4442..856dc984 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGBeatSpacing.java
@@ -2,7 +2,7 @@
 
 
 public class TGBeatSpacing extends TGSpacing {
-	
+
 	/***     POSITIONS ARRAY INDICES     ***/
 	public static final int POSITION_ACCENTUATED_EFFECT = 0;
 	public static final int POSITION_HEAVY_ACCENTUATED_EFFECT = 1;
@@ -15,7 +15,7 @@ public class TGBeatSpacing extends TGSpacing {
 	public static final int POSITION_VIBRATO_EFFEC = 8;
 	public static final int POSITION_TRILL_EFFEC = 9;
 	public static final int POSITION_FADE_IN = 10;
-	
+
 	private static final int[] EFFECT_POSITIONS = new int[]{
 		POSITION_ACCENTUATED_EFFECT,
 		POSITION_HEAVY_ACCENTUATED_EFFECT,
@@ -29,7 +29,7 @@ public class TGBeatSpacing extends TGSpacing {
 		POSITION_TRILL_EFFEC,
 		POSITION_FADE_IN,
 	};
-	
+
 	private static final int[][] POSITIONS = new int[][]{
 		/** SCORE **/
 		EFFECT_POSITIONS ,
@@ -38,7 +38,7 @@ public class TGBeatSpacing extends TGSpacing {
 		/** SCORE | TABLATURE **/
 		EFFECT_POSITIONS ,
 	};
-	
+
 	public TGBeatSpacing(TGLayout layout) {
 		super(layout, POSITIONS, EFFECT_POSITIONS.length );
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGChordImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGChordImpl.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGChordImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGChordImpl.java
index dc823977..3848b5a0 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGChordImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGChordImpl.java
@@ -1,8 +1,5 @@
 /*
  * Created on 01-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
@@ -15,13 +12,12 @@
 import org.herac.tuxguitar.song.models.TGString;
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGChordImpl extends TGChord {
-	
+	private static final long serialVersionUID = 1L;
+
 	public static final int MAX_FRETS = 6;
-	
+
 	private int style;
 	private int posX;
 	private int posY;
@@ -44,173 +40,173 @@ public class TGChordImpl extends TGChord {
 	private int stringSpacing;
 	private int fretSpacing;
 	private int noteSize;
-	
+
 	private boolean editing;
-	
+
 	public TGChordImpl(int length) {
 		super(length);
 	}
-	
+
 	public boolean isEditing() {
 		return this.editing;
 	}
-	
+
 	public void setEditing(boolean editing) {
 		this.editing = editing;
 	}
-	
+
 	public void setPosX(int posX){
 		this.posX = posX;
 	}
-	
+
 	public void setPosY(int posY){
 		this.posY = posY;
 	}
-	
+
 	public int getPosY() {
 		return this.posY;
 	}
-	
+
 	public int getWidth(){
 		return this.width;
 	}
-	
+
 	public int getHeight(){
 		return this.height;
 	}
-	
+
 	public void setStyle(int style) {
 		this.style = style;
 	}
-	
+
 	public void setTonic(int tonic){
 		if(!isDisposed() && this.tonic != tonic){
 			this.dispose();
 		}
 		this.tonic = tonic;
 	}
-	
+
 	public TGColor getForegroundColor() {
 		return this.foregroundColor;
 	}
-	
+
 	public void setForegroundColor(TGColor foregroundColor) {
 		if(!isDisposed() && !isSameColor(this.foregroundColor, foregroundColor)){
 			this.dispose();
 		}
 		this.foregroundColor = foregroundColor;
 	}
-	
+
 	public TGColor getBackgroundColor() {
 		return this.backgroundColor;
 	}
-	
+
 	public void setBackgroundColor(TGColor backgroundColor) {
 		if(!isDisposed() && !isSameColor(this.backgroundColor, backgroundColor)){
 			this.dispose();
 		}
 		this.backgroundColor = backgroundColor;
 	}
-	
+
 	public TGColor getColor() {
 		return this.color;
 	}
-	
+
 	public void setColor(TGColor color) {
 		if(!isDisposed() && !isSameColor(this.color, color)){
 			this.dispose();
 		}
 		this.color = color;
 	}
-	
+
 	public TGColor getNoteColor() {
 		return this.noteColor;
 	}
-	
+
 	public void setNoteColor(TGColor noteColor) {
 		if(!isDisposed() && !isSameColor(this.noteColor, noteColor)){
 			this.dispose();
 		}
 		this.noteColor = noteColor;
 	}
-	
+
 	public TGColor getTonicColor() {
 		return this.tonicColor;
 	}
-	
+
 	public void setTonicColor(TGColor tonicColor) {
 		if(!isDisposed() && !isSameColor(this.tonicColor, tonicColor)){
 			this.dispose();
 		}
 		this.tonicColor = tonicColor;
 	}
-	
+
 	public int getFirstFretSpacing() {
 		return this.firstFretSpacing;
 	}
-	
+
 	public void setFirstFretSpacing(int firstFretSpacing) {
 		if(!isDisposed() && this.firstFretSpacing != firstFretSpacing){
 			this.dispose();
 		}
 		this.firstFretSpacing = firstFretSpacing;
 	}
-	
+
 	public int getFretSpacing() {
 		return this.fretSpacing;
 	}
-	
+
 	public void setFretSpacing(int fretSpacing) {
 		if(!isDisposed() && this.fretSpacing != fretSpacing){
 			this.dispose();
 		}
 		this.fretSpacing = fretSpacing;
 	}
-	
+
 	public int getStringSpacing() {
 		return this.stringSpacing;
 	}
-	
+
 	public void setStringSpacing(int stringSpacing) {
 		if(!isDisposed() && this.stringSpacing != stringSpacing){
 			this.dispose();
 		}
 		this.stringSpacing = stringSpacing;
 	}
-	
+
 	public int getNoteSize() {
 		return this.noteSize;
 	}
-	
+
 	public void setNoteSize(int noteSize) {
 		if(!isDisposed() && this.noteSize != noteSize){
 			this.dispose();
 		}
 		this.noteSize = noteSize;
 	}
-	
+
 	public TGFont getFont() {
 		return this.font;
 	}
-	
+
 	public void setFont(TGFont font) {
 		if(!isDisposed() && !isSameFont(this.font, font)){
 			this.dispose();
 		}
 		this.font = font;
 	}
-	
+
 	public TGFont getFirstFretFont() {
 		return this.firstFretFont;
 	}
-	
+
 	public void setFirstFretFont(TGFont firstFretFont) {
 		if(!isDisposed() && !isSameFont(this.firstFretFont, firstFretFont)){
 			this.dispose();
 		}
 		this.firstFretFont = firstFretFont;
 	}
-	
+
 	public void paint(TGLayout layout, TGPainter painter, int fromX, int fromY) {
 		layout.setChordStyle(this);
 		this.setPosY(getPaintPosition(TGTrackSpacing.POSITION_CHORD));
@@ -218,7 +214,7 @@ public void paint(TGLayout layout, TGPainter painter, int fromX, int fromY) {
 		this.update(painter, layout.isBufferEnabled());
 		this.paint(painter,getBeatImpl().getSpacing() + fromX + Math.round(4f * layout.getScale()), fromY);
 	}
-	
+
 	public void paint(TGPainter painter, int fromX, int fromY){
 		int x = (fromX + getPosX());
 		int y = (fromY + getPosY());
@@ -236,7 +232,7 @@ public void paint(TGPainter painter, int fromX, int fromY){
 			painter.drawString(getName(),x - (this.nameWidth / 2) , y + (this.height - this.nameHeight ) );
 		}
 	}
-	
+
 	public void update(TGPainter painter, boolean makeBuffer) {
 		this.width = 0;
 		this.height = 0;
@@ -254,7 +250,7 @@ public void update(TGPainter painter, boolean makeBuffer) {
 			this.height += this.diagramHeight;
 		}
 	}
-	
+
 	protected void updateName(TGPainter painter){
 		String name = getName();
 		if(painter == null || name == null || name.length() == 0){
@@ -265,7 +261,7 @@ protected void updateName(TGPainter painter){
 		this.nameWidth = painter.getFMWidth(name);
 		this.nameHeight = painter.getFMHeight();
 	}
-	
+
 	protected void updateDiagram(TGResourceFactory bufferFactory){
 		TGFont font = getFirstFretFont();
 		this.diagramWidth = getStringSpacing() + (getStringSpacing() * countStrings()) + ((font != null)?getFirstFretSpacing():0);
@@ -277,7 +273,7 @@ protected void updateDiagram(TGResourceFactory bufferFactory){
 			painterBuffer.dispose();
 		}
 	}
-	
+
 	protected void paintDiagram(TGPainter painter, int fromX, int fromY){
 		TGFont font = getFirstFretFont();
 		painter.setBackground(getBackgroundColor());
@@ -285,18 +281,18 @@ protected void paintDiagram(TGPainter painter, int fromX, int fromY){
 		painter.addRectangle(fromX, fromY, this.diagramWidth, this.diagramHeight);
 		painter.closePath();
 		painter.setForeground(getColor());
-		
+
 		//dibujo las cuerdas
 		int x = fromX + getStringSpacing();
 		int y = fromY + getFretSpacing();
-		
+
 		if(font != null){
 			String firstFretString = Integer.toString(getFirstFret());
 			painter.setFont(font);
 			painter.drawString(firstFretString,fromX + (getFirstFretSpacing() - painter.getFMWidth(firstFretString)),Math.round(y + ((getFretSpacing() / 2f) - (painter.getFMHeight() / 2f))));
 			x += getFirstFretSpacing();
 		}
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		for(int i = 0;i < getStrings().length;i++){
@@ -308,7 +304,7 @@ protected void paintDiagram(TGPainter painter, int fromX, int fromY){
 			painter.lineTo(x2,y2);
 		}
 		painter.closePath();
-		
+
 		//dibujo las cegillas
 		painter.initPath();
 		painter.setAntialias(false);
@@ -321,7 +317,7 @@ protected void paintDiagram(TGPainter painter, int fromX, int fromY){
 			painter.lineTo(x2,y2);
 		}
 		painter.closePath();
-		
+
 		painter.setLineWidth(1);
 		//dibujo las notas
 		for(int i = 0;i < getStrings().length;i++){
@@ -350,7 +346,7 @@ else if(fret == 0){
 			}
 		}
 	}
-	
+
 	public void calculateFirstFret(){
 		int minimum = -1;
 		int maximum = -1;
@@ -366,34 +362,34 @@ public void calculateFirstFret(){
 		int firstFret = (zero && maximum < MAX_FRETS)?1:minimum;
 		setFirstFret( Math.max(firstFret,1) );
 	}
-	
+
 	private int getStringValue(int number){
 		TGString string = getBeat().getMeasure().getTrack().getString(number);
 		return string.getValue();
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.diagram == null || this.diagram.isDisposed());
 	}
-	
+
 	public void dispose(){
 		if(!isDisposed()){
 			this.diagram.dispose();
 		}
 	}
-	
+
 	public int getPosX() {
 		return (isEditing())?this.posX:getBeatImpl().getPosX();
 	}
-	
+
 	public int getPaintPosition(int index){
 		return getBeatImpl().getMeasureImpl().getTs().getPosition(index);
 	}
-	
+
 	public TGBeatImpl getBeatImpl(){
 		return (TGBeatImpl)getBeat();
 	}
-	
+
 	private boolean isSameFont(TGFont f1, TGFont f2){
 		if( f1 == null && f2 == null ){
 			return true;
@@ -403,12 +399,12 @@ private boolean isSameFont(TGFont f1, TGFont f2){
 			boolean sameBold = (f1.isBold() == f2.isBold());
 			boolean sameItalic = (f1.isItalic() == f2.isItalic());
 			boolean sameHeight = (f1.getHeight() == f2.getHeight());
-			
+
 			return (sameName && sameBold && sameItalic && sameHeight);
 		}
 		return false;
 	}
-	
+
 	private boolean isSameColor(TGColor c1, TGColor c2){
 		if( c1 == null && c2 == null ){
 			return true;
@@ -418,14 +414,16 @@ private boolean isSameColor(TGColor c1, TGColor c2){
 		}
 		return false;
 	}
-	
+
+	@Override
 	public void addFretValue(int string,int fret){
 		if(!isDisposed() && this.getFretValue(string) != fret){
 			this.dispose();
 		}
 		super.addFretValue(string, fret);
 	}
-	
+
+	@Override
 	public void setFirstFret(int firstFret) {
 		if(!isDisposed() && this.getFirstFret() != firstFret){
 			this.dispose();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGController.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGController.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGController.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGController.java
index f81763a1..54ba9f8d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGController.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGController.java
@@ -7,20 +7,20 @@
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 
 public interface TGController {
-	
+
 	public TGResourceFactory getResourceFactory();
-	
+
 	public TGSongManager getSongManager();
-	
+
 	public void configureStyles( TGLayoutStyles styles );
-	
+
 	public int getTrackSelection();
-	
+
 	public boolean isRunning(TGBeat beat);
-	
+
 	public boolean isRunning(TGMeasure measure);
-	
+
 	public boolean isLoopSHeader(TGMeasureHeader measureHeader);
-	
+
 	public boolean isLoopEHeader(TGMeasureHeader measureHeader);
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
index a0d8d436..e73df6a3 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGFactoryImpl.java
@@ -12,43 +12,52 @@
 import org.herac.tuxguitar.song.models.TGVoice;
 
 public class TGFactoryImpl extends TGFactory{
-	
+
 	public TGFactoryImpl(){
 		super();
 	}
-	
+
+	@Override
 	public TGMeasureHeader newHeader(){
 		return new TGMeasureHeaderImpl(this);
 	}
-	
+
+	@Override
 	public TGTrack newTrack(){
 		return new TGTrackImpl(this);
 	}
-	
+
+	@Override
 	public TGMeasure newMeasure(TGMeasureHeader header){
 		return new TGMeasureImpl(header);
 	}
-	
+
+	@Override
 	public TGNote newNote(){
 		return new TGNoteImpl(this);
 	}
-	
+
+	@Override
 	public TGBeat newBeat(){
 		return new TGBeatImpl(this);
 	}
-	
+
+	@Override
 	public TGVoice newVoice(int index){
 		return new TGVoiceImpl(this, index);
 	}
-	
+
+	@Override
 	public TGLyric newLyric(){
 		return new TGLyricImpl();
 	}
-	
+
+	@Override
 	public TGChord newChord(int length){
 		return new TGChordImpl(length);
 	}
-	
+
+	@Override
 	public TGText newText(){
 		return new TGTextImpl();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayout.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayout.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayout.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayout.java
index 3efaaec1..e42d892a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayout.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayout.java
@@ -1,8 +1,5 @@
 /*
  * Created on 04-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
@@ -22,29 +19,26 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public abstract class TGLayout {
-	
+
 	public static final int MODE_VERTICAL = 1;
 	public static final int MODE_HORIZONTAL = 2;
 	public static final int DEFAULT_MODE = MODE_HORIZONTAL;
-	
+
 	public static final int DISPLAY_COMPACT = 0x01;
 	public static final int DISPLAY_MULTITRACK = 0x02;
 	public static final int DISPLAY_SCORE = 0x04;
 	public static final int DISPLAY_TABLATURE = 0x08;
 	public static final int DISPLAY_CHORD_NAME = 0x10;
 	public static final int DISPLAY_CHORD_DIAGRAM = 0x20;
-	
+
 	private float scale;
 	private float fontScale;
 	private int style;
 	private int width;
 	private int height;
-	
+
 	private int minBufferSeparator;
 	private int minTopSpacing;
 	private int minScoreTabSpacing;
@@ -65,16 +59,16 @@ public abstract class TGLayout {
 	private int loopMarkerSpacing;
 	private boolean bufferEnabled;
 	private boolean playModeEnabled;
-	
-	private List trackPositions;
-	
+
+	private List<TrackPosition> trackPositions;
+
 	private TGController controller;
 	private TGResources resources;
 	private TGLayoutStyles styles;
-	
+
 	public TGLayout(TGController controller,int style){
 		this.controller = controller;
-		this.trackPositions = new ArrayList();
+		this.trackPositions = new ArrayList<TrackPosition>();
 		this.playModeEnabled = false;
 		this.resources = new TGResources(this);
 		this.styles = new TGLayoutStyles();
@@ -83,16 +77,16 @@ public TGLayout(TGController controller,int style){
 			this.style |= DISPLAY_TABLATURE;
 		}
 	}
-	
+
 	public void loadStyles(){
 		this.loadStyles(1f);
 	}
-	
+
 	public void loadStyles(float scale){
 		this.setScale(scale);
 		this.setFontScale(scale);
 		this.getComponent().configureStyles(this.styles);
-		
+
 		this.setBufferEnabled( this.styles.isBufferEnabled() );
 		this.setStringSpacing( (int)(this.styles.getStringSpacing() * getScale() ) );
 		this.setScoreLineSpacing( (int)(this.styles.getScoreLineSpacing() * getScale() ) );
@@ -112,39 +106,39 @@ public void loadStyles(float scale){
 		this.setLoopMarkerSpacing( Math.round( this.styles.getLoopMarkerSpacing() * getScale() ) );
 		this.setDivisionTypeSpacing( Math.round( this.styles.getDivisionTypeSpacing() * getScale() ) );
 		this.setEffectSpacing( Math.round( this.styles.getEffectSpacing() * getScale() ) );
-		
+
 		this.getResources().load(this.styles);
 	}
-	
+
 	public abstract void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fromY);
-	
+
 	public abstract int getMode();
-	
+
 	public void paint(TGPainter painter,TGRectangle clientArea,int fromX,int fromY){
 		this.playModeEnabled = false;
 		paintSong(painter,clientArea,fromX,fromY);
 	}
-	
+
 	public void paintMeasure(TGMeasureImpl measure,TGPainter painter,int spacing) {
 		measure.setSpacing(spacing);
 		measure.paintMeasure(this,painter);
 	}
-	
+
 	public void updateSong(){
 		updateMeasures();
 	}
-	
+
 	public void updateMeasures() {
 		int measureCount = getSongManager().getSong().countMeasureHeaders();
 		for (int measureIdx = 0; measureIdx < measureCount; measureIdx++) {
 			this.updateMeasureIndex( measureIdx );
 		}
 	}
-	
+
 	private void updateMeasureIndex(int index) {
 		if( index >= 0 && index < getSongManager().getSong().countMeasureHeaders() ){
 			((TGMeasureHeaderImpl)getSongManager().getSong().getMeasureHeader( index )).update(this, index);
-			
+
 			int trackCount = getSongManager().getSong().countTracks();
 			for (int trackIdx = 0; trackIdx < trackCount; trackIdx++) {
 				TGTrackImpl track = (TGTrackImpl)getSongManager().getSong().getTrack(trackIdx);
@@ -159,7 +153,7 @@ private void updateMeasureIndex(int index) {
 			}
 		}
 	}
-	
+
 	public void updateMeasureNumber(int number) {
 		TGMeasureHeader header = getSongManager().getMeasureHeader(number);
 		if( header != null ){
@@ -169,7 +163,7 @@ public void updateMeasureNumber(int number) {
 			}
 		}
 	}
-	
+
 	/**
 	 * Pinta las lineas
 	 */
@@ -178,11 +172,11 @@ public void paintLines(TGTrackImpl track,TGTrackSpacing ts,TGPainter painter,int
 			setLineStyle(painter);
 			int tempX = ((x < 0)?0:x);
 			int tempY = y;
-			
+
 			//partitura
 			if( (this.style & DISPLAY_SCORE) != 0 ){
 				int posY = tempY + ts.getPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES);
-				
+
 				painter.initPath();
 				painter.setAntialias(false);
 				for(int i = 1;i <= 5;i ++){
@@ -195,7 +189,7 @@ public void paintLines(TGTrackImpl track,TGTrackSpacing ts,TGPainter painter,int
 			//tablatura
 			if((this.style & DISPLAY_TABLATURE) != 0){
 				tempY += ts.getPosition(TGTrackSpacing.POSITION_TABLATURE);
-				
+
 				painter.initPath();
 				painter.setAntialias(false);
 				for(int i = 0; i < track.stringCount();i++){
@@ -207,13 +201,13 @@ public void paintLines(TGTrackImpl track,TGTrackSpacing ts,TGPainter painter,int
 			}
 		}
 	}
-	
+
 	/**
 	 * Pinta el compas y las notas que estan sonando
 	 */
 	public void paintPlayMode(TGPainter painter,TGMeasureImpl measure,TGBeatImpl beat,boolean paintMeasure){
 		this.playModeEnabled = true;
-		
+
 		//pinto el compas
 		if(paintMeasure){
 			measure.paintMeasure(this,painter);
@@ -222,20 +216,20 @@ public void paintPlayMode(TGPainter painter,TGMeasureImpl measure,TGBeatImpl bea
 		if( beat != null ){
 			beat.paint(this,painter,measure.getPosX()  + measure.getHeaderImpl().getLeftSpacing(this), measure.getPosY());
 		}
-		
+
 		//pinto los lyrics
 		((TGLyricImpl)measure.getTrackImpl().getLyrics()).paintCurrentNoteBeats(painter,this,measure,measure.getPosX(), measure.getPosY());
-		
+
 		this.playModeEnabled = false;
 	}
-	
+
 	protected float checkScale(){
 		float v1 = ((this.style & DISPLAY_SCORE) != 0 ? (getScoreLineSpacing() * 1.25f ) : 0 );
 		float v2 = ((this.style & DISPLAY_TABLATURE) != 0 ? getStringSpacing() : 0 );
 		float scale = (Math.max(v1,v2) / 10.0f);
 		return scale;
 	}
-	
+
 	protected void checkDefaultSpacing(TGTrackSpacing ts){
 		int checkPosition = -1;
 		int minBufferSeparator = getMinBufferSeparator();
@@ -253,20 +247,20 @@ else if((this.style & DISPLAY_TABLATURE) != 0){
 			}
 			checkPosition = ts.getPosition(TGTrackSpacing.POSITION_TABLATURE);
 		}
-		
+
 		if(checkPosition >= 0 && checkPosition < getMinTopSpacing()){
 			ts.setSize(TGTrackSpacing.POSITION_TOP, (getMinTopSpacing() - checkPosition));
 		}
 	}
-	
+
 	/**
-	 * Calcula el espacio minimo entre negras, dependiendo de la duracion de la nota 
+	 * Calcula el espacio minimo entre negras, dependiendo de la duracion de la nota
 	 */
 	public int getSpacingForQuarter(TGDuration duration){
 		double spacing = (((double)TGDuration.QUARTER_TIME / (double)duration.getTime()) * getMinSpacing(duration));
 		return  (int)spacing;
 	}
-	
+
 	/**
 	 * Calcula el Espacio minimo que quedara entre nota y nota
 	 */
@@ -285,7 +279,7 @@ protected float getMinSpacing(TGDuration duration){
 				return (18.0f * scale);
 		}
 	}
-	
+
 	/**
 	 * Calcula el Espacio que ocupara el pulso
 	 */
@@ -312,7 +306,7 @@ public float getBeatWidth(TGVoice voice){
 		}
 		return (20.0f * scale);
 	}
-	
+
 	/**
 	 * Calcula el Espacio que ocupara el pulso
 	 */
@@ -339,152 +333,152 @@ public float getVoiceWidth(TGVoiceImpl voice){
 		}
 		return (20.0f * scale);
 	}
-	
+
 	public boolean isPlayModeEnabled(){
 		return this.playModeEnabled;
 	}
-	
+
 	public void setMeasureNumberStyle(TGPainter painter){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setForeground(getResources().getColorRed());
 	}
-	
+
 	public void setDivisionsStyle(TGPainter painter, boolean fill){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setBackground( (fill ? getResources().getColorBlack() :getResources().getBackgroundColor() ));
 		painter.setForeground(getResources().getColorBlack());
 	}
-	
+
 	public void setTempoStyle(TGPainter painter, boolean fontStyle){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground( ( fontStyle ? getResources().getBackgroundColor() : getResources().getColorBlack() ));
 	}
-	
+
 	public void setTripletFeelStyle(TGPainter painter, boolean fontStyle){
 		painter.setFont(getResources().getDefaultFont());
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground( ( fontStyle ? getResources().getBackgroundColor() : getResources().getColorBlack() ));
 	}
-	
+
 	public void setMeasurePlayingStyle(TGPainter painter){
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setForeground(getResources().getColorBlack());
 	}
-	
+
 	public void setLyricStyle(TGPainter painter,boolean playMode){
 		painter.setFont(getResources().getLyricFont());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setForeground( (playMode ? getResources().getPlayNoteColor() : getResources().getColorBlack()) );
 	}
-	
+
 	public void setMarkerStyle(TGPainter painter, TGColor color){
 		painter.setFont(getResources().getMarkerFont());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setForeground(color);
 	}
-	
+
 	public void setTextStyle(TGPainter painter){
 		painter.setFont(getResources().getTextFont());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setForeground(getResources().getColorBlack());
 	}
-	
+
 	public void setTimeSignatureStyle(TGPainter painter){
 		painter.setFont(getResources().getTimeSignatureFont());
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground(getResources().getBackgroundColor());
 	}
-	
+
 	public void setKeySignatureStyle(TGPainter painter){
 		painter.setBackground(getResources().getColorBlack());
 	}
-	
+
 	public void setClefStyle(TGPainter painter){
 		painter.setBackground(getResources().getColorBlack());
 	}
-	
+
 	public void setLineStyle(TGPainter painter){
 		painter.setLineWidth(1);
 		painter.setForeground(getResources().getLineColor());
 	}
-	
+
 	public void setScoreSilenceStyle(TGPainter painter,boolean playMode){
 		painter.setForeground( (playMode ? getResources().getPlayNoteColor() : getResources().getScoreNoteColor() ));
 		painter.setBackground( (playMode ? getResources().getPlayNoteColor() : getResources().getScoreNoteColor() ));
 	}
-	
+
 	public void setTabSilenceStyle(TGPainter painter,boolean playMode){
 		painter.setForeground( (playMode ? getResources().getPlayNoteColor() : getResources().getTabNoteColor() ));
 		painter.setBackground( (playMode ? getResources().getPlayNoteColor() : getResources().getTabNoteColor() ));
 	}
-	
+
 	public void setScoreNoteStyle(TGPainter painter,boolean playing){
 		painter.setForeground( (playing ? getResources().getPlayNoteColor() : getResources().getScoreNoteColor() ));
 		painter.setBackground( (playing ? getResources().getPlayNoteColor() : getResources().getScoreNoteColor() ));
 	}
-	
+
 	public void setScoreNoteFooterStyle(TGPainter painter){
 		painter.setForeground( getResources().getScoreNoteColor());
 		painter.setBackground( getResources().getScoreNoteColor());
 	}
-	
+
 	public void setScoreEffectStyle(TGPainter painter){
 		painter.setForeground( getResources().getScoreNoteColor());
 		painter.setBackground( getResources().getScoreNoteColor());
 	}
-	
+
 	public void setTabNoteStyle(TGPainter painter,boolean playMode){
 		painter.setForeground( (playMode ? getResources().getPlayNoteColor() : getResources().getTabNoteColor() ));
 		painter.setBackground( getResources().getBackgroundColor() );
 		painter.setFont(getResources().getNoteFont());
 	}
-	
+
 	public void setTabNoteFooterStyle(TGPainter painter){
 		painter.setForeground( getResources().getTabNoteColor());
 		painter.setBackground( getResources().getTabNoteColor());
 	}
-	
+
 	public void setTabEffectStyle(TGPainter painter){
 		painter.setForeground( getResources().getTabNoteColor());
 		painter.setBackground( getResources().getTabNoteColor());
 	}
-	
+
 	public void setTabGraceStyle(TGPainter painter){
 		painter.setFont(getResources().getGraceFont());
 		painter.setForeground(getResources().getTabNoteColor());
 		painter.setBackground(getResources().getBackgroundColor());
 	}
-	
+
 	public void setPlayNoteColor(TGPainter painter){
 		painter.setForeground(getResources().getPlayNoteColor());
 		painter.setBackground(getResources().getPlayNoteColor());
 	}
-	
+
 	public void setOfflineEffectStyle(TGPainter painter){
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setFont(getResources().getDefaultFont());
 	}
-	
+
 	public void setDotStyle(TGPainter painter){
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground(getResources().getColorBlack());
 	}
-	
+
 	public void setDivisionTypeStyle(TGPainter painter){
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setFont(getResources().getDefaultFont());
 	}
-	
+
 	public void setRepeatEndingStyle(TGPainter painter){
 		painter.setForeground(getResources().getColorBlack());
 		painter.setBackground(getResources().getBackgroundColor());
 		painter.setFont(getResources().getDefaultFont());
 	}
-	
+
 	public void setChordStyle(TGChordImpl chord){
 		chord.setFont(getResources().getChordFont());
 		chord.setForegroundColor(getResources().getColorBlack());
@@ -499,15 +493,15 @@ public void setChordStyle(TGChordImpl chord){
 		chord.setFirstFretSpacing(getChordFretIndexSpacing());
 		chord.setFirstFretFont(getResources().getChordFretFont());
 	}
-	
+
 	public void setLoopSMarkerStyle(TGPainter painter){
 		painter.setBackground(getResources().getLoopSMarkerColor());
 	}
-	
+
 	public void setLoopEMarkerStyle(TGPainter painter){
 		painter.setBackground(getResources().getLoopEMarkerColor());
 	}
-	
+
 	public TGRectangle getNoteOrientation(TGPainter painter,int x,int y,TGNote note){
 		String noteAsString = null;
 		if (note.isTiedNote()){
@@ -522,7 +516,7 @@ public TGRectangle getNoteOrientation(TGPainter painter,int x,int y,TGNote note)
 		}
 		return getOrientation(painter,x,y,noteAsString);
 	}
-	
+
 	public TGRectangle getOrientation(TGPainter painter,int x,int y,String s){
 		int fmWidth = painter.getFMWidth(s);
 		int fmAscent = painter.getFMAscent();
@@ -531,215 +525,215 @@ public TGRectangle getOrientation(TGPainter painter,int x,int y,String s){
 		//TGDimension size = painter.getStringExtent(s);
 		//return new TGRectangle((x - (size.getWidth() / 2)),(y - (size.getHeight() / 2)),size.getWidth(), size.getHeight() );
 	}
-	
+
 	public TGSongManager getSongManager() {
 		return getComponent().getSongManager();
 	}
-	
+
 	public void setComponent(TGController controller){
 		this.controller = controller;
 	}
-	
+
 	public TGController getComponent(){
 		return this.controller;
 	}
-	
+
 	public TGResources getResources(){
 		return this.resources;
 	}
-	
+
 	public int getHeight() {
 		return this.height;
 	}
-	
+
 	public void setHeight(int height) {
 		this.height = height;
 	}
-	
+
 	public int getWidth() {
 		return this.width;
 	}
-	
+
 	public void setWidth(int width) {
 		this.width = width;
 	}
-	
+
 	public int getStyle(){
 		return this.style;
 	}
-	
+
 	public void setStyle(int style){
 		this.style = style;
 	}
-	
+
 	public float getScale() {
 		return this.scale;
 	}
-	
+
 	public void setScale(float scale) {
 		this.scale = scale;
 	}
-	
+
 	public float getFontScale() {
 		return this.fontScale;
 	}
-	
+
 	public void setFontScale(float fontScale) {
 		this.fontScale = fontScale;
 	}
-	
+
 	public boolean isBufferEnabled() {
 		return this.bufferEnabled;
 	}
-	
+
 	public void setBufferEnabled(boolean bufferEnabled) {
 		this.bufferEnabled = bufferEnabled;
 	}
-	
+
 	public int getFirstMeasureSpacing() {
 		return this.firstMeasureSpacing;
 	}
-	
+
 	public void setFirstMeasureSpacing(int firstMeasureSpacing) {
 		this.firstMeasureSpacing = firstMeasureSpacing;
 	}
-	
+
 	public int getMinBufferSeparator() {
 		return this.minBufferSeparator;
 	}
-	
+
 	public void setMinBufferSeparator(int minBufferSeparator) {
 		this.minBufferSeparator = minBufferSeparator;
 	}
-	
+
 	public int getMinTopSpacing() {
 		return this.minTopSpacing;
 	}
-	
+
 	public void setMinTopSpacing(int minTopSpacing) {
 		this.minTopSpacing = minTopSpacing;
 	}
-	
+
 	public int getMinScoreTabSpacing() {
 		return this.minScoreTabSpacing;
 	}
-	
+
 	public void setMinScoreTabSpacing(int minScoreTabSpacing) {
 		this.minScoreTabSpacing = minScoreTabSpacing;
 	}
-	
+
 	public int getScoreLineSpacing() {
 		return this.scoreLineSpacing;
 	}
-	
+
 	public void setScoreLineSpacing(int scoreLineSpacing) {
 		this.scoreLineSpacing = scoreLineSpacing;
 	}
-	
+
 	public int getFirstTrackSpacing() {
 		return this.firstTrackSpacing;
 	}
-	
+
 	public void setFirstTrackSpacing(int firstTrackSpacing) {
 		this.firstTrackSpacing = firstTrackSpacing;
 	}
-	
+
 	public int getTrackSpacing() {
 		return this.trackSpacing;
 	}
-	
+
 	public void setTrackSpacing(int trackSpacing) {
 		this.trackSpacing = trackSpacing;
 	}
-	
+
 	public int getStringSpacing() {
 		return this.stringSpacing;
 	}
-	
+
 	public void setStringSpacing(int stringSpacing) {
 		this.stringSpacing = stringSpacing;
 	}
-	
+
 	public int getChordFretIndexSpacing() {
 		return this.chordFretIndexSpacing;
 	}
-	
+
 	public void setChordFretIndexSpacing(int chordFretIndexSpacing) {
 		this.chordFretIndexSpacing = chordFretIndexSpacing;
 	}
-	
+
 	public int getChordStringSpacing() {
 		return this.chordStringSpacing;
 	}
-	
+
 	public void setChordStringSpacing(int chordStringSpacing) {
 		this.chordStringSpacing = chordStringSpacing;
 	}
-	
+
 	public int getChordFretSpacing() {
 		return this.chordFretSpacing;
 	}
-	
+
 	public void setChordFretSpacing(int chordFretSpacing) {
 		this.chordFretSpacing = chordFretSpacing;
 	}
-	
+
 	public int getChordNoteSize() {
 		return this.chordNoteSize;
 	}
-	
+
 	public void setChordNoteSize(int chordNoteSize) {
 		this.chordNoteSize = chordNoteSize;
 	}
-	
+
 	public int getRepeatEndingSpacing() {
 		return this.repeatEndingSpacing;
 	}
-	
+
 	public void setRepeatEndingSpacing(int repeatEndingSpacing) {
 		this.repeatEndingSpacing = repeatEndingSpacing;
 	}
-	
+
 	public int getDivisionTypeSpacing() {
 		return this.divisionTypeSpacing;
 	}
-	
+
 	public void setDivisionTypeSpacing(int divisionTypeSpacing) {
 		this.divisionTypeSpacing = divisionTypeSpacing;
 	}
-	
+
 	public int getTextSpacing() {
 		return this.textSpacing;
 	}
-	
+
 	public void setTextSpacing(int textSpacing) {
 		this.textSpacing = textSpacing;
 	}
-	
+
 	public int getMarkerSpacing() {
 		return this.markerSpacing;
 	}
-	
+
 	public void setMarkerSpacing(int markerSpacing) {
 		this.markerSpacing = markerSpacing;
 	}
-	
+
 	public int getLoopMarkerSpacing() {
 		return this.loopMarkerSpacing;
 	}
-	
+
 	public void setLoopMarkerSpacing(int loopMarkerSpacing) {
 		this.loopMarkerSpacing = loopMarkerSpacing;
 	}
-	
+
 	public int getEffectSpacing() {
 		return this.effectSpacing;
 	}
-	
+
 	public void setEffectSpacing(int effectSpacing) {
 		this.effectSpacing = effectSpacing;
 	}
-	
+
 	public int getDefaultChordSpacing(){
 		int spacing = 0;
 		if( (this.style & DISPLAY_CHORD_DIAGRAM) != 0 ){
@@ -750,51 +744,51 @@ public int getDefaultChordSpacing(){
 		}
 		return spacing;
 	}
-	
+
 	public boolean isFirstMeasure(TGMeasureHeader mh){
 		return (mh.getNumber() == 1);
 	}
-	
+
 	public boolean isFirstMeasure(TGMeasure measure){
 		return (isFirstMeasure(measure.getHeader()));
 	}
-	
+
 	public boolean isLastMeasure(TGMeasureHeader mh){
 		return (mh.getNumber() == getSongManager().getSong().countMeasureHeaders());
 	}
-	
+
 	public boolean isLastMeasure(TGMeasure measure){
 		return (isLastMeasure(measure.getHeader()));
 	}
-	
+
 	public boolean hasLoopMarker(TGMeasureHeader mh){
 		return (getComponent().isLoopSHeader(mh) || getComponent().isLoopEHeader(mh));
 	}
-	
+
 	public boolean hasLoopMarker(TGMeasure measure){
 		return (hasLoopMarker(measure.getHeader()));
 	}
-	
+
 	protected void clearTrackPositions(){
 		this.trackPositions.clear();
 	}
-	
+
 	protected void addTrackPosition(int track,int posY,int height){
 		this.trackPositions.add(new TrackPosition(track,posY,height));
 	}
-	
+
 	public int getTrackNumberAt(int y){
 		TrackPosition trackPos = getTrackPositionAt(y);
 		return ((trackPos != null)?trackPos.getTrack():-1);
 	}
-	
+
 	public TrackPosition getTrackPositionAt(int y){
 		TrackPosition trackPos = null;
 		int minorDistance = 0;
-		
-		Iterator it = this.trackPositions.iterator();
+
+		Iterator<TrackPosition> it = this.trackPositions.iterator();
 		while(it.hasNext()){
-			TrackPosition pos = (TrackPosition)it.next();
+			TrackPosition pos = it.next();
 			int distanceY = Math.min(Math.abs(y - (pos.getPosY())), Math.abs(y - (pos.getPosY() + pos.getHeight() - 10)));
 			if(trackPos == null || distanceY < minorDistance){
 				trackPos = pos;
@@ -803,30 +797,30 @@ public TrackPosition getTrackPositionAt(int y){
 		}
 		return trackPos;
 	}
-	
+
 	public void disposeLayout(){
 		this.getResources().dispose();
 	}
-	
+
 	public class TrackPosition{
 		private int track;
 		private int posY;
 		private int height;
-		
+
 		public TrackPosition(int track,int posY,int height){
 			this.track = track;
 			this.posY = posY;
 			this.height = height;
 		}
-		
+
 		public int getPosY() {
 			return this.posY;
 		}
-		
+
 		public int getHeight() {
 			return this.height;
 		}
-		
+
 		public int getTrack() {
 			return this.track;
 		}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
index 20a1ad46..7e060592 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutHorizontal.java
@@ -1,8 +1,5 @@
 /*
  * Created on 04-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
@@ -10,42 +7,43 @@
 
 import org.herac.tuxguitar.graphics.TGPainter;
 import org.herac.tuxguitar.graphics.TGRectangle;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGTrack;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGLayoutHorizontal extends TGLayout{
-	
+
 	public TGLayoutHorizontal(TGController controller,int style){
 		super(controller,style);
 	}
-	
+
+	@Override
 	public int getMode(){
 		return MODE_HORIZONTAL;
 	}
-	
+
+	@Override
 	public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fromY) {
 		this.setWidth(0);
 		this.setHeight(0);
 		this.clearTrackPositions();
-		
+
 		int style = getStyle();
 		int number = getComponent().getTrackSelection();
 		int posY = fromY + getFirstTrackSpacing();
 		int height = getFirstTrackSpacing();
 		int trackHeight;
-		Iterator tracks = getSongManager().getSong().getTracks();
+		Iterator<TGTrack> tracks = getSongManager().getSong().getTracks();
 		while(tracks.hasNext()){
 			TGTrackImpl track = (TGTrackImpl) tracks.next();
 			if(number < 0 || track.getNumber() == number){
-				
+
 				TGTrackSpacing ts = new TGTrackSpacing(this) ;
 				ts.setSize(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES, ((style & DISPLAY_SCORE) != 0 ?( (getScoreLineSpacing() * 5) ):0));
 				((TGLyricImpl)track.getLyrics()).start();
-				
+
 				//------AUTO_SPACING---------------------------------------
 				int maxY = 0;
 				int minY = 0;
@@ -54,8 +52,8 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 					maxY = ((getScoreLineSpacing() * 4) + (getScoreLineSpacing() * 4));
 					minY = -(getScoreLineSpacing() * 3);
 				}
-				
-				Iterator measures = track.getMeasures();
+
+				Iterator<TGMeasure> measures = track.getMeasures();
 				while(measures.hasNext()){
 					TGMeasureImpl measure = (TGMeasureImpl)measures.next();
 					maxY = (measure.getMaxY() > maxY)?measure.getMaxY():maxY;
@@ -72,14 +70,14 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 				}
 				ts.setSize(TGTrackSpacing.POSITION_LYRIC,10);
 				checkDefaultSpacing(ts);
-				
+
 				//----------------------------------------------------
 				paintMeasures(track,painter,fromX,posY,ts,clientArea);
 				paintLines(track,ts,painter,fromX + (getWidth() + 2),posY,(clientArea.getWidth() - (fromX + getWidth()) ));
-				
+
 				trackHeight = ts.getSize();
 				addTrackPosition(track.getNumber(),posY,trackHeight);
-				
+
 				posY += trackHeight + getTrackSpacing();
 				height += trackHeight + getTrackSpacing();
 			}
@@ -90,23 +88,23 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 		}
 		this.setHeight(height);
 	}
-	
+
 	public void paintMeasures(TGTrackImpl track,TGPainter painter,int fromX, int fromY,TGTrackSpacing ts,TGRectangle clientArea) {
 		int posX = (fromX + getFirstMeasureSpacing());
 		int posY = fromY;
 		int width = getFirstMeasureSpacing();
-		
-		Iterator measures = track.getMeasures();
+
+		Iterator<TGMeasure> measures = track.getMeasures();
 		while(measures.hasNext()){
 			TGMeasureImpl measure = (TGMeasureImpl)measures.next();
-			
+
 			//asigno la posicion dentro del compas
 			measure.setPosX(posX);
 			measure.setPosY(posY);
 			measure.setTs(ts);
-			
+
 			((TGLyricImpl)track.getLyrics()).setCurrentMeasure(measure);
-			
+
 			//Solo pinto lo que entre en pantalla
 			boolean isAtX = ((posX + measure.getWidth(this)) > clientArea.getX() - 100 && posX < clientArea.getX() + clientArea.getWidth() + measure.getWidth(this) + 100);
 			boolean isAtY = (posY + ts.getSize() > clientArea.getY() && posY < clientArea.getY() + clientArea.getHeight() + 80);
@@ -116,7 +114,7 @@ public void paintMeasures(TGTrackImpl track,TGPainter painter,int fromX, int fro
 			}else{
 				measure.setOutOfBounds(true);
 			}
-			
+
 			int measureWidth = measure.getWidth(this);
 			posX += measureWidth;
 			width += measureWidth;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
index bb36d26f..0459890e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutStyles.java
@@ -4,7 +4,7 @@
 import org.herac.tuxguitar.graphics.TGFontModel;
 
 public class TGLayoutStyles {
-	
+
 	private boolean bufferEnabled;
 	private int minBufferSeparator;
 	private int minTopSpacing;
@@ -40,283 +40,283 @@ public class TGLayoutStyles {
 	private TGColorModel playNoteColor;
 	private TGColorModel loopSMarkerColor;
 	private TGColorModel loopEMarkerColor;
-	
+
 	public boolean isBufferEnabled() {
 		return this.bufferEnabled;
 	}
-	
+
 	public void setBufferEnabled(boolean bufferEnabled) {
 		this.bufferEnabled = bufferEnabled;
 	}
-	
+
 	public int getMinBufferSeparator() {
 		return this.minBufferSeparator;
 	}
-	
+
 	public void setMinBufferSeparator(int minBufferSeparator) {
 		this.minBufferSeparator = minBufferSeparator;
 	}
-	
+
 	public int getMinTopSpacing() {
 		return this.minTopSpacing;
 	}
-	
+
 	public void setMinTopSpacing(int minTopSpacing) {
 		this.minTopSpacing = minTopSpacing;
 	}
-	
+
 	public int getMinScoreTabSpacing() {
 		return this.minScoreTabSpacing;
 	}
-	
+
 	public void setMinScoreTabSpacing(int minScoreTabSpacing) {
 		this.minScoreTabSpacing = minScoreTabSpacing;
 	}
-	
+
 	public int getStringSpacing() {
 		return this.stringSpacing;
 	}
-	
+
 	public void setStringSpacing(int stringSpacing) {
 		this.stringSpacing = stringSpacing;
 	}
-	
+
 	public int getScoreLineSpacing() {
 		return this.scoreLineSpacing;
 	}
-	
+
 	public void setScoreLineSpacing(int scoreLineSpacing) {
 		this.scoreLineSpacing = scoreLineSpacing;
 	}
-	
+
 	public int getTrackSpacing() {
 		return this.trackSpacing;
 	}
-	
+
 	public void setTrackSpacing(int trackSpacing) {
 		this.trackSpacing = trackSpacing;
 	}
-	
+
 	public int getFirstTrackSpacing() {
 		return this.firstTrackSpacing;
 	}
-	
+
 	public void setFirstTrackSpacing(int firstTrackSpacing) {
 		this.firstTrackSpacing = firstTrackSpacing;
 	}
-	
+
 	public int getFirstMeasureSpacing() {
 		return this.firstMeasureSpacing;
 	}
-	
+
 	public void setFirstMeasureSpacing(int firstMeasureSpacing) {
 		this.firstMeasureSpacing = firstMeasureSpacing;
 	}
-	
+
 	public int getChordFretIndexSpacing() {
 		return this.chordFretIndexSpacing;
 	}
-	
+
 	public void setChordFretIndexSpacing(int chordFretIndexSpacing) {
 		this.chordFretIndexSpacing = chordFretIndexSpacing;
 	}
-	
+
 	public int getChordStringSpacing() {
 		return this.chordStringSpacing;
 	}
-	
+
 	public void setChordStringSpacing(int chordStringSpacing) {
 		this.chordStringSpacing = chordStringSpacing;
 	}
-	
+
 	public int getChordFretSpacing() {
 		return this.chordFretSpacing;
 	}
-	
+
 	public void setChordFretSpacing(int chordFretSpacing) {
 		this.chordFretSpacing = chordFretSpacing;
 	}
-	
+
 	public int getChordNoteSize() {
 		return this.chordNoteSize;
 	}
-	
+
 	public void setChordNoteSize(int chordNoteSize) {
 		this.chordNoteSize = chordNoteSize;
 	}
-	
+
 	public int getRepeatEndingSpacing() {
 		return this.repeatEndingSpacing;
 	}
-	
+
 	public void setRepeatEndingSpacing(int repeatEndingSpacing) {
 		this.repeatEndingSpacing = repeatEndingSpacing;
 	}
-	
+
 	public int getEffectSpacing() {
 		return this.effectSpacing;
 	}
-	
+
 	public void setEffectSpacing(int effectSpacing) {
 		this.effectSpacing = effectSpacing;
 	}
-	
+
 	public int getDivisionTypeSpacing() {
 		return this.divisionTypeSpacing;
 	}
-	
+
 	public void setDivisionTypeSpacing(int divisionTypeSpacing) {
 		this.divisionTypeSpacing = divisionTypeSpacing;
 	}
-	
+
 	public int getTextSpacing() {
 		return this.textSpacing;
 	}
-	
+
 	public void setTextSpacing(int textSpacing) {
 		this.textSpacing = textSpacing;
 	}
-	
+
 	public int getMarkerSpacing() {
 		return this.markerSpacing;
 	}
-	
+
 	public void setMarkerSpacing(int markerSpacing) {
 		this.markerSpacing = markerSpacing;
 	}
-	
+
 	public int getLoopMarkerSpacing() {
 		return this.loopMarkerSpacing;
 	}
-	
+
 	public void setLoopMarkerSpacing(int loopMarkerSpacing) {
 		this.loopMarkerSpacing = loopMarkerSpacing;
 	}
-	
+
 	public TGFontModel getDefaultFont() {
 		return this.defaultFont;
 	}
-	
+
 	public void setDefaultFont(TGFontModel defaultFont) {
 		this.defaultFont = defaultFont;
 	}
-	
+
 	public TGFontModel getNoteFont() {
 		return this.noteFont;
 	}
-	
+
 	public void setNoteFont(TGFontModel noteFont) {
 		this.noteFont = noteFont;
 	}
-	
+
 	public TGFontModel getTimeSignatureFont() {
 		return this.timeSignatureFont;
 	}
-	
+
 	public void setTimeSignatureFont(TGFontModel timeSignatureFont) {
 		this.timeSignatureFont = timeSignatureFont;
 	}
-	
+
 	public TGFontModel getLyricFont() {
 		return this.lyricFont;
 	}
-	
+
 	public void setLyricFont(TGFontModel lyricFont) {
 		this.lyricFont = lyricFont;
 	}
-	
+
 	public TGFontModel getTextFont() {
 		return this.textFont;
 	}
-	
+
 	public void setTextFont(TGFontModel textFont) {
 		this.textFont = textFont;
 	}
-	
+
 	public TGFontModel getMarkerFont() {
 		return this.markerFont;
 	}
-	
+
 	public void setMarkerFont(TGFontModel markerFont) {
 		this.markerFont = markerFont;
 	}
-	
+
 	public TGFontModel getGraceFont() {
 		return this.graceFont;
 	}
-	
+
 	public void setGraceFont(TGFontModel graceFont) {
 		this.graceFont = graceFont;
 	}
-	
+
 	public TGFontModel getChordFont() {
 		return this.chordFont;
 	}
-	
+
 	public void setChordFont(TGFontModel chordFont) {
 		this.chordFont = chordFont;
 	}
-	
+
 	public TGFontModel getChordFretFont() {
 		return this.chordFretFont;
 	}
-	
+
 	public void setChordFretFont(TGFontModel chordFretFont) {
 		this.chordFretFont = chordFretFont;
 	}
-	
+
 	public TGColorModel getBackgroundColor() {
 		return this.backgroundColor;
 	}
-	
+
 	public void setBackgroundColor(TGColorModel backgroundColor) {
 		this.backgroundColor = backgroundColor;
 	}
-	
+
 	public TGColorModel getLineColor() {
 		return this.lineColor;
 	}
-	
+
 	public void setLineColor(TGColorModel lineColor) {
 		this.lineColor = lineColor;
 	}
-	
+
 	public TGColorModel getScoreNoteColor() {
 		return this.scoreNoteColor;
 	}
-	
+
 	public void setScoreNoteColor(TGColorModel scoreNoteColor) {
 		this.scoreNoteColor = scoreNoteColor;
 	}
-	
+
 	public TGColorModel getTabNoteColor() {
 		return this.tabNoteColor;
 	}
-	
+
 	public void setTabNoteColor(TGColorModel tabNoteColor) {
 		this.tabNoteColor = tabNoteColor;
 	}
-	
+
 	public TGColorModel getPlayNoteColor() {
 		return this.playNoteColor;
 	}
-	
+
 	public void setPlayNoteColor(TGColorModel playNoteColor) {
 		this.playNoteColor = playNoteColor;
 	}
-	
+
 	public TGColorModel getLoopSMarkerColor() {
 		return this.loopSMarkerColor;
 	}
-	
+
 	public void setLoopSMarkerColor(TGColorModel loopSMarkerColor) {
 		this.loopSMarkerColor = loopSMarkerColor;
 	}
-	
+
 	public TGColorModel getLoopEMarkerColor() {
 		return this.loopEMarkerColor;
 	}
-	
+
 	public void setLoopEMarkerColor(TGColorModel loopEMarkerColor) {
 		this.loopEMarkerColor = loopEMarkerColor;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
index debe68f0..514b736d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLayoutVertical.java
@@ -1,8 +1,5 @@
 /*
  * Created on 04-ene-2006
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
@@ -16,24 +13,23 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGLayoutVertical extends TGLayout{
-	
+
 	private int maximumWidth;
 	private int marginLeft;
 	private int marginRight;
-	
+
 	public TGLayoutVertical(TGController controller,int style){
 		super(controller,style);
 	}
-	
+
+	@Override
 	public int getMode(){
 		return MODE_VERTICAL;
 	}
-	
+
+	@Override
 	public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fromY) {
 		this.marginLeft = getFirstMeasureSpacing();
 		this.marginRight = 10;
@@ -41,29 +37,29 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 		this.setHeight(0);
 		this.setWidth(0);
 		this.clearTrackPositions();
-		
+
 		int style = getStyle();
 		int number = getComponent().getTrackSelection();
 		int posY = fromY + getFirstTrackSpacing();
 		int height = getFirstTrackSpacing();
 		int lineHeight = 0;
-		
+
 		int measureCount = getSongManager().getSong().countMeasureHeaders();
 		int nextMeasureIndex = 0;
 		while(measureCount > nextMeasureIndex){
 			TempLine line = null;
-			Iterator tracks = getSongManager().getSong().getTracks();
+			Iterator<TGTrack> tracks = getSongManager().getSong().getTracks();
 			while(tracks.hasNext()){
 				TGTrackImpl track = (TGTrackImpl) tracks.next();
 				if(number < 0 || track.getNumber() == number){
-					
+
 					TGTrackSpacing ts = new TGTrackSpacing(this) ;
 					ts.setSize(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES, ((style & DISPLAY_SCORE) != 0 ?( (getScoreLineSpacing() * 5) ):0));
-					
+
 					if(nextMeasureIndex == 0){
 						((TGLyricImpl)track.getLyrics()).start();
 					}
-					
+
 					line = getTempLines(track,nextMeasureIndex,ts);
 					if( (style & DISPLAY_SCORE) != 0 ){
 						ts.setSize(TGTrackSpacing.POSITION_SCORE_UP_LINES, Math.abs(line.minY));
@@ -77,12 +73,12 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 					}
 					ts.setSize(TGTrackSpacing.POSITION_LYRIC,10);
 					checkDefaultSpacing(ts);
-					
+
 					paintLine(track,line,painter,fromX,posY,ts,clientArea);
-					
+
 					lineHeight = ts.getSize();
 					addTrackPosition(track.getNumber(),posY,lineHeight);
-					
+
 					int emptyX = (this.marginLeft + fromX + line.tempWith + 2);
 					int emptyWith = ( this.maximumWidth - emptyX );
 					if((emptyWith - 20) > 0 && (line.lastIndex + 1) >= measureCount){
@@ -92,7 +88,7 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 							paintLines(track,ts,painter, emptyX ,posY, emptyWith);
 						}
 					}
-					
+
 					posY += lineHeight + getTrackSpacing();
 					height += lineHeight + getTrackSpacing();
 				}
@@ -101,19 +97,19 @@ public void paintSong(TGPainter painter,TGRectangle clientArea,int fromX,int fro
 				nextMeasureIndex = line.lastIndex + 1;
 			}
 		}
-		
+
 		this.setHeight(height);
 		this.setWidth( getWidth() + this.marginRight );
 	}
-	
+
 	public void paintLine(TGTrackImpl track,TempLine line,TGPainter painter,int fromX, int fromY,TGTrackSpacing ts,TGRectangle clientArea) {
 		int posX = (this.marginLeft + fromX);
 		int posY = fromY;
 		int width = this.marginLeft;
-		
+
 		//verifico si esta en el area de cliente
 		boolean isAtY = (posY + ts.getSize() > clientArea.getY() && posY < clientArea.getY() + clientArea.getHeight() + 80);
-		
+
 		int measureSpacing = 0;
 		if(line.fullLine){
 			int diff = ( this.maximumWidth - line.tempWith);
@@ -121,20 +117,20 @@ public void paintLine(TGTrackImpl track,TempLine line,TGPainter painter,int from
 				measureSpacing = diff / line.measures.size();
 			}
 		}
-		
+
 		for(int i = 0;i < line.measures.size();i ++){
-			int index = ((Integer)line.measures.get(i)).intValue();
+			int index = line.measures.get(i).intValue();
 			TGMeasureImpl currMeasure = (TGMeasureImpl)track.getMeasure(index);
-			
+
 			//asigno la posicion dentro del compas
 			currMeasure.setPosX(posX);
 			currMeasure.setPosY(posY);
 			currMeasure.setTs(ts);
-			
+
 			((TGLyricImpl)track.getLyrics()).setCurrentMeasure(currMeasure);
-			
+
 			currMeasure.setFirstOfLine(i == 0);
-			
+
 			int measureWidth = ( currMeasure.getWidth(this) + measureSpacing );
 			boolean isAtX = ( posX + measureWidth > clientArea.getX() && posX < clientArea.getX() + clientArea.getWidth());
 			if(isAtX && isAtY){
@@ -143,30 +139,30 @@ public void paintLine(TGTrackImpl track,TempLine line,TGPainter painter,int from
 			}else{
 				currMeasure.setOutOfBounds(true);
 			}
-			
+
 			posX += measureWidth;
 			width += measureWidth;
 		}
 		this.setWidth(Math.max(getWidth(),width));
 	}
-	
+
 	public TempLine getTempLines(TGTrack track,int fromIndex,TGTrackSpacing ts) {
 		int style = getStyle();
-		
+
 		TempLine line = new TempLine();
 		line.maxY = 0;
 		line.minY = 0;
-		
+
 		// Need to score extra-lines in edition mode
 		if( (style & DISPLAY_TABLATURE) == 0 && (style & DISPLAY_SCORE) != 0 ){
 			line.maxY = ((getScoreLineSpacing() * 4) + (getScoreLineSpacing() * 4));
 			line.minY = -(getScoreLineSpacing() * 3);
 		}
-		
+
 		int measureCount = track.countMeasures();
 		for (int measureIdx = fromIndex; measureIdx < measureCount; measureIdx++) {
 			TGMeasureImpl measure = (TGMeasureImpl)track.getMeasure(measureIdx);
-			
+
 			//verifico si tengo que bajar de linea
 			if((line.tempWith + measure.getWidth(this)) >= this.maximumWidth && !line.measures.isEmpty()){
 				line.fullLine = true;
@@ -175,28 +171,28 @@ public TempLine getTempLines(TGTrack track,int fromIndex,TGTrackSpacing ts) {
 			line.tempWith +=  measure.getWidth(this);
 			line.maxY = (measure.getMaxY() > line.maxY)?measure.getMaxY():line.maxY;
 			line.minY = (measure.getMinY() < line.minY)?measure.getMinY():line.minY;
-			
+
 			line.addMeasure(measureIdx);
 			measure.registerSpacing(this,ts);
 		}
-		
+
 		return line;
 	}
-	
+
 	private class TempLine{
 		protected int tempWith;
 		protected int lastIndex;
 		protected boolean fullLine;
 		protected int maxY = 0;
 		protected int minY = 0;
-		protected List measures;
-		
+		protected List<Integer> measures;
+
 		public TempLine(){
-			this.measures = new ArrayList();
+			this.measures = new ArrayList<Integer>();
 		}
-		
+
 		protected void addMeasure(int index){
-			this.measures.add(new Integer(index));
+			this.measures.add(index);
 			this.lastIndex = index;
 		}
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLyricImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
index f39c3f12..2452a3a2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGLyricImpl.java
@@ -4,36 +4,39 @@
 import org.herac.tuxguitar.song.models.TGLyric;
 
 public class TGLyricImpl extends TGLyric{
-	
+	private static final long serialVersionUID = 1L;
+
 	private int height;
 	private int nextIndex = 0;
-	
+
 	public TGLyricImpl(){
 		this.height = 0;
 	}
-	
+
+	@Override
 	public void setFrom(int from) {
 		super.setFrom(from);
 		this.update();
 	}
-	
+
+	@Override
 	public void setLyrics(String lyrics) {
 		super.setLyrics(lyrics);
 		this.update();
 	}
-	
+
 	private void update(){
 		this.height = (this.isEmpty()?0:10);
 	}
-	
+
 	public void start(){
 		this.start(0);
 	}
-	
+
 	public void start(int index){
 		this.nextIndex = index;
 	}
-	
+
 	public void setCurrentMeasure(TGMeasureImpl measure){
 		if(measure.getNumber() >= getFrom()){
 			measure.setLyricBeatIndex(this.nextIndex);
@@ -43,7 +46,7 @@ public void setCurrentMeasure(TGMeasureImpl measure){
 			this.start();
 		}
 	}
-	
+
 	public void paintCurrentNoteBeats(TGPainter painter,TGLayout layout,TGMeasureImpl currentMeasure ,int fromX,int fromY){
 		int from = currentMeasure.getLyricBeatIndex();
 		String[] beats = getLyricBeats();
@@ -65,7 +68,7 @@ public void paintCurrentNoteBeats(TGPainter painter,TGLayout layout,TGMeasureImp
 			}
 		}
 	}
-	
+
 	public int getHeight(){
 		return this.height;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
index fcb2a3c1..4b9488e9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureBuffer.java
@@ -5,19 +5,19 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGMeasureBuffer {
-	
+
 	private TGImage buffer;
-	
+
 	private TGPainter painter;
-	
+
 	private int width;
-	
+
 	private int height;
-	
+
 	public TGMeasureBuffer(){
 		super();
 	}
-	
+
 	public void createBuffer(TGPainter painter, int width,int height,TGColor background){
 		this.dispose();
 		this.width = width;
@@ -25,53 +25,53 @@ public void createBuffer(TGPainter painter, int width,int height,TGColor backgro
 		this.buffer = painter.createImage(this.width, this.height);
 		this.fillBuffer(background);
 	}
-	
+
 	public void disposeBuffer(){
 		if(this.buffer != null && !this.buffer.isDisposed()){
 			this.buffer.dispose();
 		}
 	}
-	
+
 	private void fillBuffer(TGColor background){
 		getPainter().setBackground(background);
 		getPainter().initPath(TGPainter.PATH_FILL);
 		getPainter().addRectangle(0,0,this.width,this.height);
 		getPainter().closePath();
 	}
-	
+
 	public void paintBuffer(TGPainter painter,int x,int y,int srcY){
 		painter.drawImage(this.buffer,0,srcY, this.width, (this.height - srcY), x, (y + srcY), this.width, (this.height - srcY));
 	}
-	
+
 	public void createPainter(){
 		this.disposePainter();
 		//this.painter = new TGPainterImpl(this.buffer);
 		this.painter = this.buffer.createPainter();
 	}
-	
+
 	public void disposePainter(){
 		if(this.painter != null && !this.painter.isDisposed()){
 			this.painter.dispose();
 			this.painter = null;
 		}
 	}
-	
+
 	public TGPainter getPainter(){
 		if(this.painter == null || this.painter.isDisposed()){
 			this.createPainter();
 		}
 		return this.painter;
 	}
-	
+
 	public TGImage getImage(){
 		return this.buffer;
 	}
-	
+
 	public void dispose(){
 		this.disposePainter();
 		this.disposeBuffer();
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.buffer == null || this.buffer.isDisposed());
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
index c04ee275..5453b784 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureHeaderImpl.java
@@ -4,6 +4,7 @@
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 
 public class TGMeasureHeaderImpl extends TGMeasureHeader{
+	private static final long serialVersionUID = 1L;
 	/**
 	 * Espacio por defecto del timeSignature
 	 */
@@ -16,27 +17,27 @@ public class TGMeasureHeaderImpl extends TGMeasureHeader{
 	 * Espacio por defecto a la derecha
 	 */
 	private static final int DEFAULT_RIGHT_SPACING = 15;
-	
+
 	private static final int PAINT_TEMPO = 0x01;
-	
+
 	private static final int PAINT_TRIPLET_FEEL = 0x02;
-	
+
 	private static final int PAINT_TIME_SIGNATURE = 0x04;
-	
+
 	private int paintFlags;
-	
+
 	private int maxQuarterSpacing;
-	
+
 	private int maxClefSpacing;
-	
+
 	private int maxKeySignatureSpacing;
-	
+
 	private int maxWidth;
-	
+
 	public TGMeasureHeaderImpl(TGFactory factory){
 		super(factory);
 	}
-	
+
 	public void reset() {
 		this.maxWidth = 0;
 		this.paintFlags = 0;
@@ -44,11 +45,11 @@ public void reset() {
 		this.maxClefSpacing = 0;
 		this.maxKeySignatureSpacing = 0;
 	}
-	
+
 	public void update(TGLayout layout, int index) {
 		this.reset();
 		this.calculateMeasureChanges(layout);
-		
+
 		int trackCount = getSong().countTracks();
 		for (int trackIdx = 0; trackIdx < trackCount; trackIdx++) {
 			TGTrackImpl track = (TGTrackImpl)getSong().getTrack(trackIdx);
@@ -56,17 +57,17 @@ public void update(TGLayout layout, int index) {
 			measure.calculateMeasureChanges(layout);
 		}
 	}
-	
+
 	public void calculateMeasureChanges(TGLayout layout) {
 		TGMeasureHeader previous = layout.getSongManager().getPrevMeasureHeader(this);
 		if(previous == null){
-			this.paintFlags |= PAINT_TEMPO; 
+			this.paintFlags |= PAINT_TEMPO;
 			this.paintFlags |= ((this.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE)?PAINT_TRIPLET_FEEL:0);
 			this.paintFlags |= PAINT_TIME_SIGNATURE;
 		}else{
 			//Tempo
 			if(this.getTempo().getValue() != previous.getTempo().getValue()){
-				this.paintFlags |= PAINT_TEMPO; 
+				this.paintFlags |= PAINT_TEMPO;
 			}
 			//Triplet Feel
 			if(this.getTripletFeel() != previous.getTripletFeel()){
@@ -82,74 +83,74 @@ public void calculateMeasureChanges(TGLayout layout) {
 			}
 		}
 	}
-	
+
 	public boolean shouldPaintTempo(){
 		return ( (this.paintFlags & PAINT_TEMPO) != 0 );
 	}
-	
+
 	public boolean shouldPaintTripletFeel(){
 		return ( (this.paintFlags & PAINT_TRIPLET_FEEL) != 0 );
 	}
-	
+
 	public boolean shouldPaintTimeSignature(){
 		return ( (this.paintFlags & PAINT_TIME_SIGNATURE) != 0 );
 	}
-	
+
 	public int getMaxQuarterSpacing() {
 		return this.maxQuarterSpacing;
 	}
-	
+
 	public void notifyQuarterSpacing(int spacing) {
 		this.maxQuarterSpacing = ((spacing > this.maxQuarterSpacing) ? spacing : this.maxQuarterSpacing );
 	}
-	
+
 	public int getClefSpacing(TGLayout layout, TGMeasureImpl measure){
 		return (!measure.isPaintClef() && (layout.getStyle() & TGLayout.DISPLAY_MULTITRACK) == 0 ? 0 : this.maxClefSpacing );
 	}
-	
+
 	public int getKeySignatureSpacing(TGLayout layout, TGMeasureImpl measure){
 		return (!measure.isPaintKeySignature() && (layout.getStyle() & TGLayout.DISPLAY_MULTITRACK) == 0 ? 0 : this.maxKeySignatureSpacing );
 	}
-	
+
 	public int getTempoSpacing(TGLayout layout){
 		return (shouldPaintTempo()? Math.round( 45 * layout.getScale() ):0);
 	}
-	
+
 	public int getTripletFeelSpacing(TGLayout layout){
 		return (shouldPaintTripletFeel()? Math.round( 55 * layout.getScale() ):0);
 	}
-	
+
 	public int getTimeSignatureSpacing(TGLayout layout){
 		return (shouldPaintTimeSignature()? Math.round( DEFAULT_TIME_SIGNATURE_SPACING * layout.getScale() ):0);
 	}
-	
+
 	public int getLeftSpacing(TGLayout layout){
 		return Math.round( DEFAULT_LEFT_SPACING * layout.getScale() );
 	}
-	
+
 	public int getRightSpacing(TGLayout layout){
 		return Math.round( DEFAULT_RIGHT_SPACING * layout.getScale() );
 	}
-	
+
 	public int getFirstNoteSpacing(TGLayout layout, TGMeasureImpl measure){
 		int topSpacing = getTempoSpacing(layout) + getTripletFeelSpacing(layout);
 		int middleSpacing = getClefSpacing(layout,measure) + getKeySignatureSpacing(layout,measure) + getTimeSignatureSpacing(layout);
-		
+
 		return Math.round(Math.max( topSpacing , middleSpacing) + (10f * layout.getScale()));
 	}
-	
+
 	public void notifyClefSpacing(int spacing){
 		this.maxClefSpacing = ((spacing > this.maxClefSpacing)?spacing:this.maxClefSpacing);
 	}
-	
+
 	public void notifyKeySignatureSpacing(int spacing){
 		this.maxKeySignatureSpacing = ((spacing > this.maxKeySignatureSpacing) ? spacing : this.maxKeySignatureSpacing);
 	}
-	
+
 	public void notifyWidth(int width){
 		this.maxWidth = ((width > this.maxWidth)?width:this.maxWidth);
 	}
-	
+
 	public int getMaxWidth(){
 		return this.maxWidth;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
index 42439263..34552e9f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGMeasureImpl.java
@@ -1,8 +1,5 @@
 /*
  * Created on 26-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
@@ -24,18 +21,18 @@
 import org.herac.tuxguitar.song.models.TGMarker;
 import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGMeasureImpl extends TGMeasure{
-	
+	private static final long serialVersionUID = 1L;
+
 	public static final int NATURAL = 1;
 	public static final int SHARP = 2;
 	public static final int FLAT = 3;
-	
+
 	public static final int KEY_SIGNATURES[][] = new int[][]{
 		//------------NATURAL------------------------------------
 		{NATURAL,NATURAL,NATURAL,NATURAL,NATURAL,NATURAL,NATURAL}, // NATURAL
@@ -56,27 +53,27 @@ public class TGMeasureImpl extends TGMeasure{
 		{FLAT,FLAT,FLAT,NATURAL,FLAT,FLAT,FLAT},                   // 6 FLATS
 		{FLAT,FLAT,FLAT,FLAT,FLAT,FLAT,FLAT},                      // 7 FLATS
 	};
-	
+
 	public static final int ACCIDENTAL_SHARP_NOTES[] = new int[]{0,0,1,1,2,3,3,4,4,5,5,6};
 	public static final int ACCIDENTAL_FLAT_NOTES [] = new int[]{0,1,1,2,2,3,4,4,5,5,6,6};
 	public static final boolean ACCIDENTAL_NOTES[] = new boolean[]{false,true,false,true,false,false,true,false,true,false,true,false};
-	
+
 	public static final int SCORE_KEY_OFFSETS[] = new int[]{30,18,22,24};
-	
-	public static final int SCORE_KEY_SHARP_POSITIONS[][] = new int[][]{ 
+
+	public static final int SCORE_KEY_SHARP_POSITIONS[][] = new int[][]{
 		new int[] { 1 , 4, 0, 3, 6, 2 , 5 } ,
 		new int[] { 3 , 6, 2, 5, 8, 4 , 7 } ,
 		new int[] { 7 , 3, 6, 2, 5, 1 , 4 } ,
 		new int[] { 2 , 5, 1, 4, 7, 3 , 6 } ,
 	};
-	
-	public static final int SCORE_KEY_FLAT_POSITIONS[][] = new int[][]{ 
+
+	public static final int SCORE_KEY_FLAT_POSITIONS[][] = new int[][]{
 		new int[] { 5, 2, 6, 3, 7, 4, 8 } ,
 		new int[] { 7, 4, 8, 5, 9, 6, 10 } ,
 		new int[] { 4, 1, 5, 2, 6, 3, 7 } ,
 		new int[] { 6, 3, 7, 4, 8, 5, 9 } ,
 	};
-	
+
 	/**
 	 * Espacio por defecto de la clave
 	 */
@@ -89,7 +86,7 @@ public class TGMeasureImpl extends TGMeasure{
 	 * Posicion X
 	 */
 	private int posX;
-	/** 
+	/**
 	 * Posicion Y
 	 */
 	private int posY;
@@ -121,50 +118,51 @@ public class TGMeasureImpl extends TGMeasure{
 	 * Boolean para saber si el compas es el primero de la linea
 	 */
 	private boolean firstOfLine;
-	
+
 	private boolean compactMode;
-	
+
 	private int spacing;
-	
+
 	private TGTrackSpacing ts;
-	
+
 	private int maxY;
-	
+
 	private int minY;
-	
+
 	private int notEmptyVoices;
-	
+
 	private int notEmptyBeats;
-	
+
 	private int widthBeats = 0;
-	
-	private List[] voiceGroups;
-	
+
+	private final List<List<TGBeatGroup>> voiceGroups;
+
 	private TGMeasureBuffer buffer;
-	
+
 	private boolean bufferCreated;
-	
+
 	private TGColor markerColor;
-	
+
 	private int lyricBeatIndex;
 	private int width;
-	
+
 	private int beatEffectSpacing;
 	private boolean text;
 	private boolean chord;
 	private boolean division;
-	
-	private boolean[][] registeredAccidentals;
-	
+
+	private final boolean[][] registeredAccidentals;
+
 	public TGMeasureImpl(TGMeasureHeader header) {
 		super(header);
+
 		this.registeredAccidentals = new boolean[11][7];
-		this.voiceGroups = new List[TGBeat.MAX_VOICES];
+		this.voiceGroups = new ArrayList<List<TGBeatGroup>>(TGBeat.MAX_VOICES);
 		for(int v = 0 ; v < TGBeat.MAX_VOICES; v ++){
-			this.voiceGroups[v] = new ArrayList();
+			this.voiceGroups.add(new ArrayList<TGBeatGroup>());
 		}
 	}
-	
+
 	/**
 	 * Crea los valores necesarios
 	 */
@@ -179,7 +177,7 @@ public void create(TGLayout layout) {
 		this.calculateWidth(layout);
 		this.setFirstOfLine(false);
 	}
-	
+
 	/**
 	 * Actualiza los valores para dibujar
 	 */
@@ -188,7 +186,7 @@ public void update(TGLayout layout) {
 		setOutOfBounds(true);
 		setBufferCreated(false);
 	}
-	
+
 	private void checkCompactMode(TGLayout layout){
 		boolean compactMode = ( (layout.getStyle() & TGLayout.DISPLAY_COMPACT) != 0 );
 		if(compactMode && (layout.getStyle() & TGLayout.DISPLAY_MULTITRACK) != 0){
@@ -196,7 +194,7 @@ private void checkCompactMode(TGLayout layout){
 		}
 		this.compactMode = compactMode;
 	}
-	
+
 	private void clearRegisteredAccidentals(){
 		for( int i = 0 ; i < 11 ; i ++ ){
 			for( int n = 0 ; n < 7 ; n ++ ){
@@ -204,7 +202,7 @@ private void clearRegisteredAccidentals(){
 			}
 		}
 	}
-	
+
 	public void calculateWidth(TGLayout layout) {
 		if(this.compactMode){
 			this.width = this.widthBeats;
@@ -213,38 +211,38 @@ public void calculateWidth(TGLayout layout) {
 			double quartersInSignature = ((1.00 / this.getTimeSignature().getDenominator().getValue()) * 4.00) * this.getTimeSignature().getNumerator();
 			this.width = (int)(getQuarterSpacing() * quartersInSignature);
 		}
-		
+
 		this.width += getFirstNoteSpacing(layout);
 		this.width += (this.getRepeatClose() > 0)?20:0;
 		this.width += getHeaderImpl().getLeftSpacing(layout);
 		this.width += getHeaderImpl().getRightSpacing(layout);
-		
+
 		this.getHeaderImpl().notifyWidth(this.width);
 	}
-	
+
 	private void calculateBeats(TGLayout layout) {
 		TGChord previousChord = null;
 		TGDuration minDuration = null;
 		TGBeatImpl previousBeat = null;
 		TGVoiceImpl[] previousVoices = new TGVoiceImpl[TGBeat.MAX_VOICES];
 		TGBeatGroup[] groups = new TGBeatGroup[TGBeat.MAX_VOICES];
-		
+
 		int style = layout.getStyle();
 		int minimumChordLength = 0;
-		
+
 		boolean[] notEmptyVoicesChecked = new boolean[TGBeat.MAX_VOICES];
 		boolean chordEnabled = ((style & (TGLayout.DISPLAY_CHORD_DIAGRAM | TGLayout.DISPLAY_CHORD_NAME)) != 0);
 		this.widthBeats = 0;
 		this.notEmptyBeats = 0;
 		this.notEmptyVoices = 0;
 		for(int v = 0 ; v < TGBeat.MAX_VOICES; v ++){
-			this.voiceGroups[v].clear();
+			this.voiceGroups.get(v).clear();
 		}
-		
+
 		for (int i = 0; i < countBeats(); i++) {
 			TGBeatImpl beat = (TGBeatImpl)getBeat(i);
 			beat.reset();
-			
+
 			if(chordEnabled && beat.getChord() != null){
 				if(previousChord != null){
 					int length = (int) (beat.getStart() - previousChord.getBeat().getStart());
@@ -257,7 +255,7 @@ private void calculateBeats(TGLayout layout) {
 				TGVoiceImpl voice = (TGVoiceImpl)beat.getVoice(v);
 				if(!voice.isEmpty()){
 					emptyBeat = false;
-					
+
 					voice.reset();
 					if (minDuration == null || voice.getDuration().getTime() <= minDuration.getTime()) {
 						minDuration = voice.getDuration();
@@ -266,19 +264,19 @@ private void calculateBeats(TGLayout layout) {
 						notEmptyVoicesChecked[v] = true;
 						this.notEmptyVoices ++;
 					}
-					
-					Iterator it = voice.getNotes().iterator();
+
+					Iterator<TGNote> it = voice.getNotes().iterator();
 					while(it.hasNext()){
 						TGNoteImpl note = (TGNoteImpl)it.next();
 						voice.check(note);
 					}
-					
+
 					if(!voice.isRestVoice()){
 						beat.check( layout, voice.getMinNote() );
 						beat.check( layout, voice.getMaxNote() );
 						if( ( groups[v] == null ) || !canJoin(layout.getSongManager(),voice,previousVoices[v]) ){
 							groups[v] = new TGBeatGroup(v);
-							this.voiceGroups[v].add(groups[v]);
+							this.voiceGroups.get(v).add(groups[v]);
 						}
 						groups[v].check(voice);
 					}else{
@@ -301,19 +299,19 @@ private void calculateBeats(TGLayout layout) {
 			if (emptyBeat){
 				System.out.println( "Empty Beat !!!!!! " + beat.getStart() + "  " + i);
 			}
-			
+
 			makeBeat(layout,beat,previousBeat,chordEnabled);
 			previousBeat = beat;
 		}
-		
-		for(int v = 0; v < this.voiceGroups.length; v ++){
-			Iterator voiceGroups = this.voiceGroups[v].iterator();
+
+		for(int v = 0; v < this.voiceGroups.size(); v ++){
+			Iterator<TGBeatGroup> voiceGroups = this.voiceGroups.get(v).iterator();
 			while (voiceGroups.hasNext()) {
-				TGBeatGroup group = (TGBeatGroup)voiceGroups.next();
+				TGBeatGroup group = voiceGroups.next();
 				group.finish(layout,this);
 			}
 		}
-		
+
 		if(!this.compactMode){
 			this.quarterSpacing = (minDuration != null)?layout.getSpacingForQuarter(minDuration): Math.round(DEFAULT_QUARTER_SPACING * layout.getScale());
 			if(chordEnabled && minimumChordLength > 0){
@@ -324,37 +322,37 @@ private void calculateBeats(TGLayout layout) {
 			this.getHeaderImpl().notifyQuarterSpacing(this.quarterSpacing);
 		}
 	}
-	
+
 	public boolean canJoin(TGSongManager manager,TGVoiceImpl b1,TGVoiceImpl b2){
 		if( b1 == null || b2 == null || b1.isRestVoice() || b2.isRestVoice() ){
 			return false;
 		}
-		
+
 		long divisionLength = getDivisionLength();
 		long start = getStart();
 		long start1 = (manager.getMeasureManager().getRealStart(this, b1.getBeat().getStart()) - start);
 		long start2 = (manager.getMeasureManager().getRealStart(this, b2.getBeat().getStart()) - start);
-		
+
 		if(b1.getDuration().getValue() < TGDuration.EIGHTH || b2.getDuration().getValue() < TGDuration.EIGHTH ){
 			return ( start1 == start2);
 		}
-		
+
 		long p1 = ((divisionLength + start1) / divisionLength);
 		long p2 = ((divisionLength + start2) / divisionLength);
-		
+
 		return  (   p1 == p2  );
 	}
-	
+
 	private void makeVoice(TGLayout layout,TGVoiceImpl voice,TGVoiceImpl previousVoice,TGBeatGroup group){
 		voice.setWidth((int)layout.getVoiceWidth(voice));
 		voice.setBeatGroup( group );
-		
+
 		if(previousVoice != null){
 			voice.setPreviousBeat(previousVoice);
 			previousVoice.setNextBeat(voice);
 		}
 	}
-	
+
 	private void makeBeat(TGLayout layout,TGBeatImpl beat,TGBeatImpl previousBeat, boolean chordEnabled){
 		int minimumWidth = -1;
 		boolean restBeat = true;
@@ -369,15 +367,15 @@ private void makeBeat(TGLayout layout,TGBeatImpl beat,TGBeatImpl previousBeat, b
 				}
 			}
 		}
-		
+
 		beat.setWidth( minimumWidth );
 		this.notEmptyBeats += (restBeat ? 0 : 1);
 		this.widthBeats += beat.getMinimumWidth();
-		
+
 		if(previousBeat != null){
 			beat.setPreviousBeat(previousBeat);
 			previousBeat.setNextBeat(beat);
-			
+
 			if(chordEnabled && beat.isChordBeat() && previousBeat.isChordBeat()){
 				int previousWidth = previousBeat.getMinimumWidth();
 				int chordWidth = (layout.getChordFretIndexSpacing() + layout.getChordStringSpacing() + (getTrack().stringCount() * layout.getChordStringSpacing()));
@@ -387,7 +385,7 @@ private void makeBeat(TGLayout layout,TGBeatImpl beat,TGBeatImpl previousBeat, b
 			}
 		}
 	}
-	
+
 	/**
 	 * Calcula si debe pintar el TimeSignature
 	 */
@@ -406,27 +404,27 @@ public void calculateMeasureChanges(TGLayout layout) {
 			}
 		}
 	}
-	
+
 	/**
 	 * Calcula si hay espacios libres. y crea nuevos silencios
 	 */
 	private void autoCompleteSilences(TGSongManager manager){
 		manager.getMeasureManager().autoCompleteSilences(this);
 	}
-	
+
 	/**
 	 * Llama a update de todas las notas del compas
 	 */
 	private void updateComponents(TGLayout layout) {
 		this.maxY = 0;
 		this.minY = 0;
-		
+
 		int spacing = getFirstNoteSpacing(layout);
 		int tmpX = spacing;
 		for (int i = 0; i < countBeats(); i++) {
 			TGBeatImpl beat = (TGBeatImpl) getBeat(i);
 			beat.resetEffectsSpacing(layout);
-			
+
 			if(this.compactMode){
 				beat.setPosX(tmpX);
 				tmpX += beat.getMinimumWidth();
@@ -449,18 +447,18 @@ private void updateComponents(TGLayout layout) {
 				beat.setPosX( x1 );
 				beat.setWidth( minimumWidth );
 			}
-			
+
 			for(int v = 0 ; v < beat.countVoices(); v ++){
 				TGVoiceImpl voice = beat.getVoiceImpl(v);
 				if(!voice.isEmpty()){
-					Iterator notes = voice.getNotes().iterator();
+					Iterator<TGNote> notes = voice.getNotes().iterator();
 					while(notes.hasNext()){
 						TGNoteImpl note = (TGNoteImpl)notes.next();
 						beat.updateEffectsSpacing(layout, note.getEffect());
 						note.update(layout);
 					}
 					voice.update(layout);
-					
+
 					if(!this.division && !voice.getDuration().getDivision().isEqual(TGDivisionType.NORMAL)){
 						this.division = true;
 					}
@@ -474,33 +472,33 @@ private void updateComponents(TGLayout layout) {
 					}
 				}
 			}
-			
+
 			int bsSize = beat.getEffectsSpacing(layout);
 			if( bsSize > this.beatEffectSpacing ){
 				this.beatEffectSpacing = bsSize;
 			}
-			
+
 			if(!this.chord && beat.isChordBeat()){
 				this.chord = true;
 			}
-			
+
 			if(!this.text && beat.isTextBeat()){
 				this.text = true;
 			}
 		}
-		
+
 		if( (layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0){
-			for(int i = 0; i < this.voiceGroups.length; i ++){
-				Iterator groups = this.voiceGroups[i].iterator();
+			for(int i = 0; i < this.voiceGroups.size(); i ++){
+				Iterator<TGBeatGroup> groups = this.voiceGroups.get(i).iterator();
 				while (groups.hasNext()) {
-					TGBeatGroup group = (TGBeatGroup)groups.next();
+					TGBeatGroup group = groups.next();
 					checkValue(layout,group.getMinNote(),group.getDirection());
 					checkValue(layout,group.getMaxNote(),group.getDirection());
 				}
 			}
 		}
 	}
-	
+
 	public int getDisplayPosition(long start, int quarterWidth){
 		double newStart = (double)start - (double)this.getStart();
 		double displayPosition = 0.0;
@@ -510,7 +508,7 @@ public int getDisplayPosition(long start, int quarterWidth){
 		}
 		return (int)displayPosition;
 	}
-	
+
 	public int getNoteAccidental(int noteValue){
 		if( noteValue >= 0 && noteValue < 128 ){
 			int key = getKeySignature();
@@ -520,12 +518,12 @@ public int getNoteAccidental(int noteValue){
 			int [] accidentalNotes = (key <= 7 ? ACCIDENTAL_SHARP_NOTES : ACCIDENTAL_FLAT_NOTES );
 			boolean isAccidentalNote = ACCIDENTAL_NOTES[ note ];
 			boolean isAccidentalKey = KEY_SIGNATURES[key][accidentalNotes[ note ]] == accidentalValue;
-			
+
 			if(isAccidentalKey != isAccidentalNote && !this.registeredAccidentals[ octave ][ accidentalNotes[ note ] ]){
 				this.registeredAccidentals[ octave ][ accidentalNotes[note ]  ] = true;
 				return (isAccidentalNote ? accidentalValue : NATURAL);
 			}
-			
+
 			if(isAccidentalKey == isAccidentalNote && this.registeredAccidentals[ octave ][ accidentalNotes[ note ] ]){
 				this.registeredAccidentals[ octave ][ accidentalNotes[ note ]  ] = false;
 				return (isAccidentalNote ? accidentalValue : NATURAL);
@@ -533,32 +531,32 @@ public int getNoteAccidental(int noteValue){
 		}
 		return 0;
 	}
-	
+
 	private void checkValue(TGLayout layout,TGNoteImpl note,int direction){
 		int y = note.getScorePosY();
 		float upOffset = TGBeatGroup.getUpOffset(layout);
 		float downOffset = TGBeatGroup.getDownOffset(layout);
-		
+
 		if(direction == TGBeatGroup.DIRECTION_UP && y > this.maxY ){
 			this.maxY = y;
 		}else if(direction == TGBeatGroup.DIRECTION_DOWN && (y + downOffset) > this.maxY ){
 			this.maxY = (int)(y + downOffset + 2);
 		}
-		
+
 		if(direction == TGBeatGroup.DIRECTION_UP && (y - upOffset) < this.minY ){
 			this.minY = (int)(y - upOffset - 2);
 		}else if(direction == TGBeatGroup.DIRECTION_DOWN && y < this.minY ){
 			this.minY = y;
 		}
 	}
-	
+
 	private void resetSpacing(){
 		this.text = false;
 		this.chord = false;
 		this.division = false;
 		this.beatEffectSpacing = 0;
 	}
-	
+
 	public void registerSpacing(TGLayout layout,TGTrackSpacing ts){
 		if(layout.hasLoopMarker( this.getHeader() )){
 			ts.setSize(TGTrackSpacing.POSITION_LOOP_MARKER,layout.getLoopMarkerSpacing());
@@ -582,16 +580,16 @@ public void registerSpacing(TGLayout layout,TGTrackSpacing ts){
 			ts.setSize(TGTrackSpacing.POSITION_EFFECTS, this.beatEffectSpacing );
 		}
 	}
-	
+
 	private void orderBeats(TGSongManager manager){
 		manager.getMeasureManager().orderBeats(this);
 	}
-	
+
 	public void paintMeasure(TGLayout layout,TGPainter painter) {
 		this.setOutOfBounds(false);
-		
+
 		boolean bufferEnabled = layout.isBufferEnabled();
-		
+
 		if(shouldRepaintBuffer() || !bufferEnabled ){
 			TGPainter bufferPainter = painter;
 			int x = (bufferEnabled ? 0 : getPosX());
@@ -614,7 +612,7 @@ public void paintMeasure(TGLayout layout,TGPainter painter) {
 			painter.setBackground(layout.getResources().getBackgroundColor());
 			getBuffer().paintBuffer(painter,getPosX(),getPosY(),getTs().getPosition(TGTrackSpacing.POSITION_BUFFER_SEPARATOR));
 		}
-		
+
 		this.paintMarker(layout, painter);
 		this.paintTexts(layout,painter);
 		this.paintTempo(layout,painter);
@@ -624,11 +622,11 @@ public void paintMeasure(TGLayout layout,TGPainter painter) {
 		this.paintPlayMode(layout,painter);
 		this.paintLoopMarker(layout, painter);
 	}
-	
+
 	private boolean shouldRepaintBuffer(){
 		return (isDisposed() || !isBufferCreated());
 	}
-	
+
 	public void paintRepeatEnding(TGLayout layout,TGPainter painter){
 		if(getHeader().getRepeatAlternative() > 0){
 			float scale = layout.getScale();
@@ -653,18 +651,18 @@ public void paintRepeatEnding(TGLayout layout,TGPainter painter){
 			painter.drawString(string,Math.round( x1 + (5.0f * scale) ),Math.round( y1 + (2.0f * scale) ));
 		}
 	}
-	
+
 	/**
 	 * Pinta las notas
 	 */
 	public void paintComponents(TGLayout layout,TGPainter painter, int fromX, int fromY) {
-		Iterator it = getBeats().iterator();
+		Iterator<TGBeat> it = getBeats().iterator();
 		while(it.hasNext()){
 			TGBeatImpl beat = (TGBeatImpl)it.next();
 			beat.paint(layout, painter, fromX + getHeaderImpl().getLeftSpacing(layout) ,fromY);
 		}
 	}
-	
+
 	/**
 	 * Pinta las divisiones del compas
 	 */
@@ -695,21 +693,21 @@ private void paintDivisions(TGLayout layout,TGPainter painter) {
 			paintDivisions(layout, painter, x1, y1, x2, y2, offsetY, addInfo );
 		}
 	}
-	
+
 	private void paintDivisions(TGLayout layout,TGPainter painter,int x1, int y1, int x2, int y2, int offsetY, boolean addInfo) {
 		float scale = layout.getScale();
 		int lineWidthSmall = 1;
 		int lineWidthBig = Math.max(lineWidthSmall,Math.round(3f * scale));
-		
+
 		//numero de compas
 		if(addInfo){
 			String number = Integer.toString(this.getNumber());
 			layout.setMeasureNumberStyle(painter);
 			painter.drawString(number,getPosX() + Math.round(scale),(y1 - painter.getFMHeight()) - Math.round(scale));
 		}
-		
+
 		layout.setDivisionsStyle(painter,true);
-		
+
 		//principio
 		if(this.isRepeatOpen() || layout.isFirstMeasure(this)){
 			painter.initPath(TGPainter.PATH_DRAW | TGPainter.PATH_FILL);
@@ -717,19 +715,19 @@ private void paintDivisions(TGLayout layout,TGPainter painter,int x1, int y1, in
 			painter.setLineWidth(lineWidthSmall);
 			painter.addRectangle( x1, y1, lineWidthBig, (y2 + offsetY) - y1);
 			painter.closePath();
-			
+
 			painter.initPath();
 			painter.setAntialias(false);
 			painter.setLineWidth(lineWidthSmall);
 			painter.moveTo(x1 + lineWidthBig + scale + lineWidthSmall, y1);
 			painter.lineTo(x1 + lineWidthBig + scale + lineWidthSmall, (y2 + offsetY));
 			painter.closePath();
-			
+
 			if(this.isRepeatOpen()){
 				int size = Math.max(1,Math.round(4f * scale));
 				float xMove = ((lineWidthBig + scale + lineWidthSmall) + (2f * scale));
 				float yMove = ((lineWidthBig + scale + lineWidthSmall) + (2f * scale));
-				
+
 				painter.setLineWidth(lineWidthSmall);
 				painter.initPath(TGPainter.PATH_FILL);
 				painter.moveTo(x1 + xMove, y1 + ((y2 - y1) / 2) - (yMove + (size / 2)));
@@ -746,7 +744,7 @@ private void paintDivisions(TGLayout layout,TGPainter painter,int x1, int y1, in
 			painter.lineTo(x1, (y2 + offsetY));
 			painter.closePath();
 		}
-		
+
 		//fin
 		if(this.getRepeatClose() > 0 || layout.isLastMeasure(this)){
 			painter.initPath();
@@ -755,18 +753,18 @@ private void paintDivisions(TGLayout layout,TGPainter painter,int x1, int y1, in
 			painter.moveTo( (x2 + getSpacing()) - (lineWidthBig + scale + lineWidthSmall) , y1);
 			painter.lineTo( (x2 + getSpacing()) - (lineWidthBig + scale + lineWidthSmall) , y2);
 			painter.closePath();
-			
+
 			painter.initPath(TGPainter.PATH_DRAW | TGPainter.PATH_FILL);
 			painter.setAntialias(false);
 			painter.setLineWidth(lineWidthSmall);
 			painter.addRectangle( (x2 + getSpacing()) - lineWidthBig, y1, lineWidthBig, y2 - y1);
 			painter.closePath();
-			
+
 			if(this.getRepeatClose() > 0){
 				int size = Math.max(1,Math.round(4f * scale));
 				float xMove = (((lineWidthBig + scale + lineWidthSmall) + (2f * scale)) + size);
 				float yMove = ( (lineWidthBig + scale + lineWidthSmall) + (2f * scale) );
-				
+
 				painter.setLineWidth(lineWidthSmall);
 				painter.initPath(TGPainter.PATH_FILL);
 				painter.moveTo((x2 - xMove) + getSpacing(), y1 + ((y2 - y1) / 2) - (yMove + (size / 2)));
@@ -782,6 +780,16 @@ private void paintDivisions(TGLayout layout,TGPainter painter,int x1, int y1, in
 					//painter.drawString(repetitions,x2 - numberSize.getWidth() + getSpacing() - size,(y1 - numberSize.getHeight()) - Math.round(scale));
 				}
 			}
+		}else if (this.hasDoubleBar()){
+			int width = Math.round(3f * scale);
+			painter.initPath();
+			painter.setAntialias(false);
+			painter.setLineWidth(lineWidthSmall);
+			painter.moveTo(x2 + getSpacing() - width, y1);
+			painter.lineTo(x2 + getSpacing() - width, y2);
+			painter.moveTo(x2 + getSpacing(), y1);
+			painter.lineTo(x2 + getSpacing(), y2);
+			painter.closePath();
 		}else{
 			painter.initPath();
 			painter.setAntialias(false);
@@ -792,7 +800,7 @@ private void paintDivisions(TGLayout layout,TGPainter painter,int x1, int y1, in
 		}
 		painter.setLineWidth(lineWidthSmall);
 	}
-	
+
 	/**
 	 * Pinta la Clave
 	 */
@@ -818,7 +826,7 @@ else if(this.getClef() == TGMeasure.CLEF_ALTO){
 			painter.closePath();
 		}
 	}
-	
+
 	/**
 	 * Pinta la Armadura de Clave
 	 */
@@ -830,9 +838,9 @@ private void paintKeySignature(TGLayout layout,TGPainter painter, int fromX, int
 			int clefIndex = (this.getClef() - 1);
 			int currentKey = this.getKeySignature();
 			int previousKey = (this.prevMeasure != null ? this.prevMeasure.getKeySignature() : 0);
-			
+
 			layout.setKeySignatureStyle(painter);
-			
+
 			//natural
 			if(previousKey >= 1 && previousKey <= 7){
 				int naturalFrom =  (currentKey >= 1 && currentKey <= 7) ? currentKey : 0;
@@ -854,7 +862,7 @@ else if(previousKey >= 8 && previousKey <= 14){
 					x += (scale - (scale / 4));
 				}
 			}
-			
+
 			//sharps
 			if(currentKey >= 1 && currentKey <= 7){
 				for(int i = 0; i < currentKey; i ++ ){
@@ -877,7 +885,7 @@ else if(currentKey >= 8 && currentKey <= 14){
 			}
 		}
 	}
-	
+
 	private void paintTimeSignature(TGLayout layout,TGPainter painter, int fromX, int fromY){
 		if(this.getHeaderImpl().shouldPaintTimeSignature()){
 			layout.setTimeSignatureStyle(painter);
@@ -904,10 +912,10 @@ private void paintTimeSignature(TGLayout layout,TGPainter painter, int fromX, in
 			}
 		}
 	}
-	
+
 	private void paintTempo(TGLayout layout,TGPainter painter){
 		if(this.getHeaderImpl().shouldPaintTempo()){
-			float scale = 5f * layout.getScale(); 
+			float scale = 5f * layout.getScale();
 			int x = (getPosX() + getHeaderImpl().getLeftSpacing(layout));
 			int y = getPosY();
 			int lineSpacing = (Math.max(layout.getScoreLineSpacing() , layout.getStringSpacing()));
@@ -917,7 +925,7 @@ private void paintTempo(TGLayout layout,TGPainter painter){
 			}else if( (style & TGLayout.DISPLAY_TABLATURE) != 0 ){
 				y += ( getTs().getPosition(TGTrackSpacing.POSITION_TABLATURE) - lineSpacing ) ;
 			}
-			
+
 			layout.setTempoStyle(painter, false);
 			int imgX = x;
 			int imgY = (y - (Math.round(scale * 3.5f ) + 2));
@@ -926,7 +934,7 @@ private void paintTempo(TGLayout layout,TGPainter painter){
 			} else {
 				TGTempoPainter.paintTempo(painter, imgX, imgY, scale);
 			}
-			
+
 			layout.setTempoStyle(painter, true);
 			String value = (" = " + getTempo().getValue());
 			int fontX = x + (Math.round( (1.33f * scale) ) + 1 );
@@ -934,7 +942,7 @@ private void paintTempo(TGLayout layout,TGPainter painter){
 			painter.drawString(value , fontX, fontY, true);
 		}
 	}
-	
+
 	private void paintTripletFeel(TGLayout layout,TGPainter painter){
 		if(this.getHeaderImpl().shouldPaintTripletFeel()){
 			float scale = (5f * layout.getScale());
@@ -947,19 +955,19 @@ private void paintTripletFeel(TGLayout layout,TGPainter painter){
 			}else if( (style & TGLayout.DISPLAY_TABLATURE) != 0 ){
 				y += ( getTs().getPosition(TGTrackSpacing.POSITION_TABLATURE) - lineSpacing );
 			}
-			
+
 			layout.setTripletFeelStyle(painter, true);
 			String equal = (" = ");
 			int fontX = x + (Math.round( (1.33f * scale) + (1.5f * scale) ));
 			int fontY = Math.round(y - painter.getFMHeight() - (1.0f * layout.getScale()));
 			painter.drawString(equal, fontX , fontY, true);
-			
+
 			layout.setTripletFeelStyle(painter, false);
 			int x1 = x;
 			int x2 = x + (Math.round( (1.33f * scale) + (1.5f * scale) ) + painter.getFMWidth(equal));
 			int y1 = y - (Math.round( (1.0f * scale) + (2.5f * scale) ) + 2);
 			int y2 = y - (Math.round( (1.0f * scale) + (2.5f * scale) + (1.0f * scale)) + 2);
-			
+
 			if(getTripletFeel() == TGMeasureHeader.TRIPLET_FEEL_NONE && this.prevMeasure != null){
 				int previous = this.prevMeasure.getTripletFeel();
 				if(previous == TGMeasureHeader.TRIPLET_FEEL_EIGHTH){
@@ -1005,7 +1013,7 @@ else if(getTripletFeel() == TGMeasureHeader.TRIPLET_FEEL_SIXTEENTH){
 			}
 		}
 	}
-	
+
 	private void paintLoopMarker(TGLayout layout,TGPainter painter){
 		if( layout.hasLoopMarker( this ) ){
 			int size = Math.round( layout.getLoopMarkerSpacing() - (1f * layout.getScale()));
@@ -1023,34 +1031,34 @@ private void paintLoopMarker(TGLayout layout,TGPainter painter){
 			}
 		}
 	}
-	
+
 	private void paintLoopMarker(TGPainter painter, float x, float y, float size){
 		painter.initPath( TGPainter.PATH_FILL );
 		painter.addRectangle(x, y, size, size);
 		painter.closePath();
 	}
-	
+
 	private void paintMarker(TGLayout layout,TGPainter painter){
 		if( this.hasMarker() ){
 			int x = (getPosX() + getHeaderImpl().getLeftSpacing(layout) + getFirstNoteSpacing(layout));
 			int y = (getPosY() + getTs().getPosition(TGTrackSpacing.POSITION_MARKER));
-			
+
 			layout.setMarkerStyle(painter,getMarkerColor(painter));
 			painter.drawString(getMarker().getTitle(), x, y);
 		}
 	}
-	
+
 	private void paintTexts(TGLayout layout,TGPainter painter){
-		Iterator it = getBeats().iterator();
+		Iterator<TGBeat> it = getBeats().iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			if( beat.isTextBeat() ){
 				TGTextImpl text = (TGTextImpl)beat.getText();
 				text.paint(layout, painter,(getPosX() + getHeaderImpl().getLeftSpacing(layout) ),getPosY());
 			}
 		}
 	}
-	
+
 	private void paintPlayMode(TGLayout layout,TGPainter painter){
 		if(layout.isPlayModeEnabled() && isPlaying(layout)){
 			float scale = layout.getScale();
@@ -1080,29 +1088,29 @@ private void paintPlayMode(TGLayout layout,TGPainter painter){
 			//painter.setLineStyle(SWT.LINE_SOLID);
 		}
 	}
-	
+
 	/**
 	 * Retorna true si se esta reproduciendo y la posicion del player esta en este compas.
 	 */
 	public boolean isPlaying(TGLayout layout){
 		return layout.getComponent().isRunning(this);
 	}
-	
+
 	public int getBeatSpacing(TGBeat beat){
 		return  (int)((beat.getStart() - getStart())  * getSpacing() / getLength());
 	}
-	
+
 	public boolean hasTrack(int number){
 		return (getTrack().getNumber() == number);
 	}
-	
+
 	/**
 	 * Retorna el ancho del Compas
 	 */
 	public int getWidth(TGLayout layout) {
 		return ((layout.getStyle() & TGLayout.DISPLAY_MULTITRACK) != 0 ?this.getHeaderImpl().getMaxWidth():this.width);
 	}
-	
+
 	private int calculateKeySignatureSpacing(TGLayout layout){
 		int spacing = 0;
 		if(this.paintKeySignature){
@@ -1121,112 +1129,112 @@ private int calculateKeySignatureSpacing(TGLayout layout){
 		}
 		return spacing;
 	}
-	
+
 	public int getFirstNoteSpacing(TGLayout layout){
 		return getHeaderImpl().getFirstNoteSpacing(layout,this);
 	}
-	
+
 	public int getClefSpacing(TGLayout layout){
 		return getHeaderImpl().getClefSpacing(layout, this);
 	}
-	
+
 	public int getKeySignatureSpacing(TGLayout layout){
 		return getHeaderImpl().getKeySignatureSpacing(layout, this);
 	}
-	
+
 	public long getDivisionLength(){
 		return this.divisionLength;
 	}
-	
+
 	public boolean isBufferCreated() {
 		return this.bufferCreated;
 	}
-	
+
 	public void setBufferCreated(boolean bufferCreated) {
 		this.bufferCreated = bufferCreated;
 	}
-	
+
 	/**
 	 * Retorna la posicion X dentro del compas
 	 */
 	public int getPosX() {
 		return this.posX;
 	}
-	
+
 	/**
 	 * Asigna la posicion X dentro del compas
 	 */
 	public void setPosX(int posX) {
 		this.posX = posX;
 	}
-	
+
 	/**
 	 * Retorna la posicion Y dentro del compas
 	 */
 	public int getPosY() {
 		return this.posY;
 	}
-	
+
 	/**
 	 * Asigna la posicion Y dentro del compas
 	 */
 	public void setPosY(int posY) {
 		this.posY = posY;
 	}
-	
+
 	/**
 	 * Retorna el spacing de negras
 	 */
 	private int getQuarterSpacing(){
 		return this.quarterSpacing;
 	}
-	
+
 	/**
 	 * Retorna el spacing de negras
 	 */
 	private int getMaxQuarterSpacing(TGLayout layout){
 		return (((layout.getStyle() & TGLayout.DISPLAY_MULTITRACK) != 0)?getHeaderImpl().getMaxQuarterSpacing():this.quarterSpacing);
 	}
-	
+
 	public TGMeasureHeaderImpl getHeaderImpl(){
 		return (TGMeasureHeaderImpl)super.getHeader();
 	}
-	
+
 	public int getSpacing() {
 		return this.spacing;
 	}
-	
+
 	public void setSpacing(int spacing) {
 		if(spacing != this.spacing){
 			setBufferCreated(false);
 		}
 		this.spacing = spacing;
 	}
-	
+
 	public boolean isOutOfBounds() {
 		return this.outOfBounds;
 	}
-	
+
 	public void setOutOfBounds(boolean outOfBounds) {
 		this.outOfBounds = outOfBounds;
 	}
-	
+
 	public boolean isFirstOfLine() {
 		return this.firstOfLine;
 	}
-	
+
 	public void setFirstOfLine(boolean firstOfLine) {
 		this.firstOfLine = firstOfLine;
 	}
-	
+
 	public TGTrackImpl getTrackImpl(){
 		return (TGTrackImpl)super.getTrack();
 	}
-	
+
 	public TGTrackSpacing getTs() {
 		return this.ts;
 	}
-	
+
 	public void setTs(TGTrackSpacing ts) {
 		if(getTs() == null){
 			setBufferCreated(false);
@@ -1239,57 +1247,57 @@ public void setTs(TGTrackSpacing ts) {
 		}
 		this.ts = ts;
 	}
-	
+
 	public int getMaxY() {
 		return this.maxY;
 	}
-	
+
 	public int getMinY() {
 		return this.minY;
 	}
-	
+
 	public int getNotEmptyBeats(){
 		return this.notEmptyBeats;
 	}
-	
+
 	public int getNotEmptyVoices(){
 		return this.notEmptyVoices;
 	}
-	
+
 	public int getLyricBeatIndex() {
 		return this.lyricBeatIndex;
 	}
-	
+
 	public void setLyricBeatIndex(int lyricBeatIndex) {
 		this.lyricBeatIndex = lyricBeatIndex;
 	}
-	
+
 	public boolean isPaintClef() {
 		return this.paintClef;
 	}
-	
+
 	public boolean isPaintKeySignature() {
 		return this.paintKeySignature;
 	}
-	
+
 	public boolean isDisposed(){
 		return getBuffer().isDisposed();
 	}
-	
+
 	public TGMeasureBuffer getBuffer(){
 		if(this.buffer == null){
 			this.buffer = new TGMeasureBuffer();
 		}
 		return this.buffer;
 	}
-	
+
 	public void disposeBuffer(){
 		if(this.buffer != null && !this.buffer.isDisposed() ){
 			this.buffer.dispose();
 			this.buffer = null;
 		}
 	}
-	
+
 	public TGColor getMarkerColor( TGPainter painter ){
 		TGMarker m = getMarker();
 		if(this.markerColor != null && !this.markerColor.isDisposed()){
@@ -1302,22 +1310,22 @@ public TGColor getMarkerColor( TGPainter painter ){
 		}
 		return this.markerColor;
 	}
-	
+
 	public void disposeMarkerColor(){
 		if(this.markerColor != null && !this.markerColor.isDisposed()){
 			this.markerColor.dispose();
 			this.markerColor = null;
 		}
 	}
-	
+
 	public void disposeBeats(){
-		Iterator it = getBeats().iterator();
+		Iterator<TGBeat> it = getBeats().iterator();
 		while(it.hasNext()){
 			TGBeatImpl beat = (TGBeatImpl)it.next();
 			beat.dispose();
 		}
 	}
-	
+
 	public void dispose(){
 		this.disposeBuffer();
 		this.disposeMarkerColor();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGNoteImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
index 197e3588..52abcff4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGNoteImpl.java
@@ -1,8 +1,5 @@
 /*
  * Created on 29-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
@@ -22,24 +19,23 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGNoteImpl extends TGNote {
-	
-	private TGRectangle noteOrientation;
-	
+	private static final long serialVersionUID = 1L;
+
+	private final TGRectangle noteOrientation;
+
 	private int tabPosY;
-	
+
 	private int scorePosY;
-	
+
 	private int accidental;
-	
+
 	public TGNoteImpl(TGFactory factory) {
 		super(factory);
 		this.noteOrientation = new TGRectangle();
 	}
-	
+
 	/**
 	 * Actualiza los valores para dibujar
 	 */
@@ -48,7 +44,7 @@ public void update(TGLayout layout) {
 		this.tabPosY = ( (getString() * layout.getStringSpacing()) - layout.getStringSpacing() );
 		this.scorePosY = getVoiceImpl().getBeatGroup().getY1(layout,this,getMeasureImpl().getKeySignature(),getMeasureImpl().getClef());
 	}
-	
+
 	/**
 	 * Pinta la nota
 	 */
@@ -60,15 +56,15 @@ public void paint(TGLayout layout,TGPainter painter, int fromX, int fromY) {
 		}
 		paintTablatureNote(layout, painter, fromX, fromY + getPaintPosition(TGTrackSpacing.POSITION_TABLATURE),spacing);
 	}
-	
-	private void paintOfflineEffects(TGLayout layout,TGPainter painter,int fromX, int fromY, int spacing){		
+
+	private void paintOfflineEffects(TGLayout layout,TGPainter painter,int fromX, int fromY, int spacing){
 		TGSpacing bs = getBeatImpl().getBs();
 		TGSpacing ts = getMeasureImpl().getTs();
 		TGNoteEffect effect = getEffect();
-		
+
 		int tsY = (fromY + ts.getPosition(TGTrackSpacing.POSITION_EFFECTS));
 		int bsY = (tsY + (ts.getSize(TGTrackSpacing.POSITION_EFFECTS) - bs.getSize( )));
-		
+
 		layout.setOfflineEffectStyle(painter);
 		if(effect.isAccentuatedNote()){
 			int x = fromX + getPosX() + spacing;
@@ -132,7 +128,7 @@ private void paintOfflineEffects(TGLayout layout,TGPainter painter,int fromX, in
 			paintTrill(layout, painter,x,y);
 		}
 	}
-	
+
 	/**
 	 * Pinta la nota en la tablatura
 	 */
@@ -142,12 +138,12 @@ public void paintTablatureNote(TGLayout layout,TGPainter painter, int fromX, int
 			int stringSpacing = layout.getStringSpacing();
 			int x = fromX + getPosX() + spacing + 2;
 			int y = fromY + getTabPosY();
-			
+
 			this.noteOrientation.setX(x);
 			this.noteOrientation.setY(y);
 			this.noteOrientation.setWidth(1);
 			this.noteOrientation.setHeight(1);
-			
+
 			layout.setTabNoteStyle(painter, (layout.isPlayModeEnabled() && getBeatImpl().isPlaying(layout)));
 			//-------------ligadura--------------------------------------
 			if (isTiedNote() && (style & TGLayout.DISPLAY_SCORE) == 0) {
@@ -169,7 +165,7 @@ public void paintTablatureNote(TGLayout layout,TGPainter painter, int fromX, int
 				painter.initPath();
 				painter.addArc(tX, (tY - tHeight ), tWidth, tHeight, 225,90);
 				painter.closePath();
-				
+
 			//-------------nota--------------------------------------
 			} else if(!isTiedNote()){
 				TGRectangle r = layout.getNoteOrientation(painter,x,y,this);
@@ -179,18 +175,24 @@ public void paintTablatureNote(TGLayout layout,TGPainter painter, int fromX, int
 				this.noteOrientation.setHeight(r.getHeight());
 				String visualNote = (getEffect().isDeadNote())?"X":Integer.toString(getValue());
 				visualNote = (getEffect().isGhostNote())?"(" + visualNote + ")":visualNote;
-				painter.drawString(visualNote, this.noteOrientation.getX(), this.noteOrientation.getY());
+
+				final int fmWidth = painter.getFMWidth(visualNote);
+				final int fmHeight = painter.getFMHeight();
+				painter.initPath(TGPainter.PATH_FILL);
+				painter.addRectangle(this.noteOrientation.getX(),this.noteOrientation.getY()+(int)(fmHeight*0.2),fmWidth, (int)(fmHeight*0.60));
+				painter.closePath();
+				painter.drawString(visualNote, this.noteOrientation.getX(), this.noteOrientation.getY(), true);
 			}
-			
+
 			//-------------efectos--------------------------------------
 			if(! layout.isPlayModeEnabled() ){
-				
+
 				paintEffects(layout,painter,fromX,fromY,spacing);
-				
+
 				if((style & TGLayout.DISPLAY_SCORE) == 0){
 					int y1 = (fromY + getMeasureImpl().getTrackImpl().getTabHeight() + (stringSpacing / 2));
 					int y2 = (fromY + getMeasureImpl().getTrackImpl().getTabHeight() + ((stringSpacing / 2) * 5));
-					
+
 					//-------------tremolo picking--------------------------------------
 					if(getEffect().isTremoloPicking()){
 						layout.setTabEffectStyle(painter);
@@ -209,7 +211,7 @@ public void paintTablatureNote(TGLayout layout,TGPainter painter, int fromX, int
 			}
 		}
 	}
-	
+
 	/**
 	 * Pinta la nota en la partitura
 	 */
@@ -219,15 +221,15 @@ private void paintScoreNote(TGLayout layout,TGPainter painter, int fromX, int fr
 			int direction = getVoiceImpl().getBeatGroup().getDirection();
 			int key = getMeasureImpl().getKeySignature();
 			int clef = getMeasureImpl().getClef();
-			
+
 			int x = ( fromX + getPosX() + spacing );
 			int y1 = ( fromY + getScorePosY() ) ;
-			
+
 			//-------------foreground--------------------------------------
 			boolean playing = (layout.isPlayModeEnabled() && getBeatImpl().isPlaying(layout));
-			
+
 			layout.setScoreNoteStyle(painter,playing);
-			
+
 			//----------ligadura---------------------------------------
 			if (isTiedNote()) {
 				TGNoteImpl noteForTie = getNoteForTie();
@@ -284,24 +286,24 @@ else if(this.accidental == TGMeasureImpl.FLAT){
 					painter.closePath();
 				}
 			}
-			
+
 			if(! layout.isPlayModeEnabled() ){
-				
+
 				if(getEffect().isGrace()){
 					paintGrace(layout, painter,x ,y1);
 				}
-				
+
 				//PUNTILLO y DOBLE PUNTILLO
 				if (getVoice().getDuration().isDotted() || getVoice().getDuration().isDoubleDotted()) {
 					getVoiceImpl().paintDot(layout, painter,( x + (12.0f * (scale / 8.0f) ) ), ( y1 + (layout.getScoreLineSpacing()/ 2)), (scale / 10.0f) );
 				}
-				
+
 				//dibujo el pie
 				if(getVoice().getDuration().getValue() >= TGDuration.HALF){
 					layout.setScoreNoteFooterStyle(painter);
 					int xMove = (direction == TGBeatGroup.DIRECTION_UP ? layout.getResources().getScoreNoteWidth() : 0);
 					int y2 = fromY + getVoiceImpl().getBeatGroup().getY2(layout,getPosX() + spacing,key,clef);
-					
+
 					//staccato
 					if (getEffect().isStaccato()) {
 						int size = 3;
@@ -363,7 +365,7 @@ else if(this.accidental == TGMeasureImpl.FLAT){
 			}
 		}
 	}
-	
+
 	/**
 	 * Encuentra la nota a la que esta ligada
 	 */
@@ -372,7 +374,7 @@ private TGNoteImpl getNoteForTie() {
 			TGBeat beat = getMeasureImpl().getBeat(i);
 			TGVoice voice = beat.getVoice( getVoice().getIndex() );
 			if (beat.getStart() < getBeatImpl().getStart() && !voice.isRestVoice()) {
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while(it.hasNext()){
 					TGNoteImpl note = (TGNoteImpl)it.next();
 					if (note.getString() == getString()) {
@@ -383,7 +385,7 @@ private TGNoteImpl getNoteForTie() {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Pinta los efectos
 	 */
@@ -410,14 +412,14 @@ private void paintEffects(TGLayout layout,TGPainter painter, int fromX, int from
 			}
 		}
 	}
-	
+
 	private void paintBend(TGLayout layout,TGPainter painter,int fromX,int fromY){
 		float scale = layout.getScale();
 		float x = (fromX + (1.0f * scale));
 		float y = (fromY - (2.0f * scale));
-		
+
 		layout.setTabEffectStyle(painter);
-		
+
 		painter.initPath();
 		painter.moveTo( x, y );
 		painter.lineTo( x + (1.0f * scale), y );
@@ -430,7 +432,7 @@ private void paintBend(TGLayout layout,TGPainter painter,int fromX,int fromY){
 		painter.lineTo( x + (5.0f * scale), y - (10.0f * scale));
 		painter.closePath();
 	}
-	
+
 	private void paintTremoloBar(TGLayout layout,TGPainter painter,int fromX,int fromY){
 		float scale = layout.getScale();
 		float x1 = fromX + (1.0f * scale);
@@ -445,7 +447,7 @@ private void paintTremoloBar(TGLayout layout,TGPainter painter,int fromX,int fro
 		painter.lineTo(x2,y1);
 		painter.closePath();
 	}
-	
+
 	private void paintSlide(TGLayout layout,TGPainter painter,TGNoteImpl nextNote,int fromX,int fromY,int nextFromX){
 		float xScale = layout.getScale();
 		float yScale = (layout.getStringSpacing() / 10.0f);
@@ -456,7 +458,7 @@ private void paintSlide(TGLayout layout,TGPainter painter,TGNoteImpl nextNote,in
 		if(nextNote != null){
 			float nextX = nextNote.getPosX() + nextFromX + nextNote.getBeatImpl().getSpacing();
 			float nextY = y;
-			
+
 			if(nextNote.getValue() < getValue()){
 				y -= yMove;
 				nextY += yMove;
@@ -478,14 +480,14 @@ private void paintSlide(TGLayout layout,TGPainter painter,TGNoteImpl nextNote,in
 			painter.closePath();
 		}
 	}
-	
+
 	private void paintHammer(TGLayout layout,TGPainter painter,TGNoteImpl nextNote,int fromX,int fromY,int nextFromX){
 		float xScale = layout.getScale();
 		float yScale = (layout.getStringSpacing() / 10.0f);
-		
+
 		float x = (fromX + (7.0f * xScale));
 		float y = (fromY - (5.0f * yScale));
-		
+
 		float width = (nextNote != null)?( (nextNote.getPosX() + nextFromX + nextNote.getBeatImpl().getSpacing()) - (4.0f * xScale) - x ):(10.0f * xScale);
 		float height = (15.0f * yScale);
 		layout.setTabEffectStyle(painter);
@@ -493,39 +495,39 @@ private void paintHammer(TGLayout layout,TGPainter painter,TGNoteImpl nextNote,i
 		painter.addArc(x,y, width, height, 45,90);
 		painter.closePath();
 	}
-	
+
 	private void paintGrace(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		float scale = ( layout.getScoreLineSpacing() / 2.25f );
-		
+
 		float x = fromX - (2f * scale);
 		float y = fromY + (scale / 3);
-		
+
 		layout.setScoreEffectStyle(painter);
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintFooter(painter,x, y , -1 , scale);
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.moveTo(x, y - (2f * scale));
 		painter.lineTo(x, y + (2f * scale) - (scale / 4f));
 		painter.closePath();
-		
+
 		painter.initPath(TGPainter.PATH_DRAW | TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x - scale*1.33f, y + scale + (scale / 4f),  scale);
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.moveTo(x - scale, y );
 		painter.lineTo(x + scale, y - scale);
 		painter.closePath();
 	}
-	
+
 	private void paintVibrato(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		float scale = layout.getScale();
 		float x = fromX;
 		float y = fromY + (2.0f * scale);
 		float width = ( getVoiceImpl().getWidth() - (2.0f * scale) );
-		
+
 		int loops = (int)(width / (6.0f * scale) );
 		if(loops > 0 ){
 			layout.setTabEffectStyle(painter);
@@ -537,10 +539,10 @@ private void paintVibrato(TGLayout layout, TGPainter painter,int fromX,int fromY
 				painter.cubicTo(( x + (2.0f * scale) ),( y + (1.0f * scale) ),( x + (3.0f * scale) ), y ,( x + (4.0f * scale) ),( y + (1.0f * scale) ));
 				painter.lineTo(( x + (6.0f * scale) ),( y + (3.0f * scale) ));
 			}
-			
+
 			painter.lineTo(( x + (7.0f * scale) ),( y + (2.0f * scale) ));
 			painter.cubicTo(( x + (7.0f * scale) ),( y + (2.0f * scale) ),( x + (8.0f * scale) ),( y + (2.0f * scale) ),( x + (7.0f * scale) ),( y + (3.0f * scale) ));
-			
+
 			for( int i = (loops - 1); i >= 0 ; i -- ){
 				x = (fromX + ( (6.0f * scale) * i ) );
 				painter.lineTo(( x + (6.0f * scale) ),( y + (4.0f * scale) ));
@@ -553,7 +555,7 @@ private void paintVibrato(TGLayout layout, TGPainter painter,int fromX,int fromY
 			painter.closePath();
 		}
 	}
-	
+
 	private void paintTrill(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		String string = "Tr";
 		int fmWidth = painter.getFMWidth( string );
@@ -562,11 +564,11 @@ private void paintTrill(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		float x = fromX + fmWidth;
 		float y = fromY + ( (fmHeight - (5.0f * scale)) / 2.0f );
 		float width = ( getVoiceImpl().getWidth() - fmWidth - (2.0f * scale) );
-		
+
 		int loops = (int)(width / (6.0f * scale) );
 		if(loops > 0 ){
 			painter.drawString(string, fromX, fromY);
-			
+
 			layout.setTabEffectStyle(painter);
 			painter.initPath(TGPainter.PATH_FILL);
 			painter.moveTo(( x + (2.0f * scale) ),( y + (1.0f * scale) ));
@@ -576,10 +578,10 @@ private void paintTrill(TGLayout layout, TGPainter painter,int fromX,int fromY){
 				painter.cubicTo(( x + (2.0f * scale) ),( y + (1.0f * scale) ),( x + (3.0f * scale) ), y ,( x + (4.0f * scale) ),( y + (1.0f * scale) ));
 				painter.lineTo(( x + (6.0f * scale) ),( y + (3.0f * scale) ));
 			}
-			
+
 			painter.lineTo(( x + (7.0f * scale) ),( y + (2.0f * scale) ));
 			painter.cubicTo(( x + (7.0f * scale) ),( y + (2.0f * scale) ),( x + (8.0f * scale) ),( y + (2.0f * scale) ),( x + (7.0f * scale) ),( y + (3.0f * scale) ));
-			
+
 			for( int i = (loops - 1); i >= 0 ; i -- ){
 				x = (fromX + fmWidth + ( (6.0f * scale) * i ) );
 				painter.lineTo(( x + (6.0f * scale) ),( y + (4.0f * scale) ));
@@ -592,7 +594,7 @@ private void paintTrill(TGLayout layout, TGPainter painter,int fromX,int fromY){
 			painter.closePath();
 		}
 	}
-	
+
 	private void paintFadeIn(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		float scale = layout.getScale();
 		float x = fromX;
@@ -606,7 +608,7 @@ private void paintFadeIn(TGLayout layout, TGPainter painter,int fromX,int fromY)
 		painter.moveTo ( x + width, y + (4.0f * scale ) );
 		painter.closePath();
 	}
-	
+
 	private void paintAccentuated(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		float scale = layout.getScale();
 		float x = fromX;
@@ -618,7 +620,7 @@ private void paintAccentuated(TGLayout layout, TGPainter painter,int fromX,int f
 		painter.lineTo( x , y + (5.0f * scale ));
 		painter.closePath();
 	}
-	
+
 	private void paintHeavyAccentuated(TGLayout layout, TGPainter painter,int fromX,int fromY){
 		float scale = layout.getScale();
 		float x = fromX;
@@ -630,35 +632,35 @@ private void paintHeavyAccentuated(TGLayout layout, TGPainter painter,int fromX,
 		painter.lineTo( x + (6.0f * scale ) , y + (5.0f * scale ) );
 		painter.closePath();
 	}
-	
+
 	public int getRealValue(){
 		return (getValue() + getMeasureImpl().getTrack().getString(getString()).getValue());
 	}
-	
+
 	public int getScorePosY() {
 		return this.scorePosY;
 	}
-	
+
 	public int getTabPosY() {
 		return this.tabPosY;
 	}
-	
+
 	public TGMeasureImpl getMeasureImpl(){
 		return getBeatImpl().getMeasureImpl();
 	}
-	
+
 	public int getPaintPosition(int index){
 		return getMeasureImpl().getTs().getPosition(index);
 	}
-	
+
 	public TGBeatImpl getBeatImpl() {
 		return getVoiceImpl().getBeatImpl();
 	}
-	
+
 	public TGVoiceImpl getVoiceImpl() {
 		return (TGVoiceImpl)super.getVoice();
 	}
-	
+
 	public int getPosX() {
 		return getBeatImpl().getPosX();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGResources.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGResources.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGResources.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGResources.java
index 2db7f8c0..2531bb79 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGResources.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGResources.java
@@ -18,15 +18,15 @@
 import org.herac.tuxguitar.song.models.TGDuration;
 
 public class TGResources {
-	
+
 	private static final int SCORE_NOTE_EMPTY_NORMAL_MODE = 0;
 	private static final int SCORE_NOTE_EMPTY_PLAY_MODE = 1;
 	private static final int SCORE_NOTE_FULL_NORMAL_MODE = 2;
 	private static final int SCORE_NOTE_FULL_PLAY_MODE = 3;
-	
-	private List resources;
+
+	private List<TGResource> resources;
 	private TGLayout layout;
-	
+
 	private TGFont defaultFont;
 	private TGFont noteFont;
 	private TGFont timeSignatureFont;
@@ -53,139 +53,139 @@ public class TGResources {
 	private TGImage tripletFeelNone8;
 	private TGImage tripletFeel16;
 	private TGImage tripletFeelNone16;
-	
+
 	private int scoreNoteWidth;
-	
+
 	public TGResources(TGLayout layout){
 		this.layout = layout;
-		this.resources = new ArrayList();
+		this.resources = new ArrayList<TGResource>();
 	}
-	
+
 	public void load(TGLayoutStyles styles){
 		this.dispose();
 		this.initFonts(styles);
 		this.initColors(styles);
 		this.initImages();
 	}
-	
+
 	public TGLayout getLayout(){
 		return this.layout;
 	}
-	
+
 	public TGFont getDefaultFont() {
 		return this.defaultFont;
 	}
-	
+
 	public TGFont getNoteFont() {
 		return this.noteFont;
 	}
-	
+
 	public TGFont getTimeSignatureFont() {
 		return this.timeSignatureFont;
 	}
-	
+
 	public TGFont getLyricFont(){
 		return this.lyricFont;
 	}
-	
+
 	public TGFont getTextFont(){
 		return this.textFont;
 	}
-	
+
 	public TGFont getMarkerFont(){
 		return this.markerFont;
 	}
-	
+
 	public TGFont getChordFont(){
 		return this.chordFont;
 	}
-	
+
 	public TGFont getChordFretFont(){
 		return this.chordFretFont;
 	}
-	
+
 	public TGFont getGraceFont() {
 		return this.graceFont;
 	}
-	
+
 	public TGColor getBackgroundColor() {
 		return this.backgroundColor;
 	}
-	
+
 	public TGColor getLineColor() {
 		return this.lineColor;
 	}
-	
+
 	public TGColor getPlayNoteColor() {
 		return this.playNoteColor;
 	}
-	
+
 	public TGColor getScoreNoteColor() {
 		return this.scoreNoteColor;
 	}
-	
+
 	public TGColor getTabNoteColor() {
 		return this.tabNoteColor;
 	}
-	
+
 	public TGColor getColorWhite() {
 		return this.colorWhite;
 	}
-	
+
 	public TGColor getColorBlack() {
 		return this.colorBlack;
 	}
-	
+
 	public TGColor getColorRed() {
 		return this.colorRed;
 	}
-	
+
 	public TGColor getLoopSMarkerColor() {
 		return this.loopSMarkerColor;
 	}
-	
+
 	public TGColor getLoopEMarkerColor() {
 		return this.loopEMarkerColor;
 	}
-	
+
 	public TGImage getTempoImage() {
 		return this.tempoImage;
 	}
-	
+
 	public TGImage getTripletFeel8(){
 		return this.tripletFeel8;
 	}
-	
+
 	public TGImage getTripletFeelNone8(){
 		return this.tripletFeelNone8;
 	}
-	
+
 	public TGImage getTripletFeel16(){
 		return this.tripletFeel16;
 	}
-	
+
 	public TGImage getTripletFeelNone16(){
 		return this.tripletFeelNone16;
 	}
-	
+
 	public TGImage getScoreNote(int value,boolean playing) {
 		int index = 0;
 		index += ((playing)?1:0);
 		index += ((value >= TGDuration.QUARTER)?2:0);
 		return this.scoreNotes[index];
 	}
-	
+
 	public TGImage getHarmonicNote(int value,boolean playing) {
 		int index = 0;
 		index += ((playing)?1:0);
 		index += ((value >= TGDuration.QUARTER)?2:0);
 		return this.harmonicNotes[index];
 	}
-	
+
 	public int getScoreNoteWidth(){
 		return this.scoreNoteWidth;
 	}
-	
+
 	private void initFonts(TGLayoutStyles style){
 		float scale = this.layout.getFontScale() ;
 		this.defaultFont = getFont(style.getDefaultFont(),scale);
@@ -198,7 +198,7 @@ private void initFonts(TGLayoutStyles style){
 		this.chordFont = getFont(style.getChordFont(), scale);
 		this.chordFretFont = getFont(style.getChordFretFont(), scale);
 	}
-	
+
 	private void initColors(TGLayoutStyles style){
 		this.backgroundColor = getColor(style.getBackgroundColor());
 		this.lineColor = getColor(style.getLineColor());
@@ -212,55 +212,55 @@ private void initColors(TGLayoutStyles style){
 		this.colorBlack = getColor(new TGColorModel(0x00,0x00,0x00));
 		this.colorRed = getColor(new TGColorModel(0xff,0x00,0x00));
 	}
-	
+
 	private void initImages(){
 		this.scoreNotes = new TGImage[4];
 		this.scoreNotes[SCORE_NOTE_EMPTY_NORMAL_MODE] = getScoreNoteImage( getScoreNoteColor(),false);
 		this.scoreNotes[SCORE_NOTE_EMPTY_PLAY_MODE] = getScoreNoteImage( getPlayNoteColor(),false);
 		this.scoreNotes[SCORE_NOTE_FULL_NORMAL_MODE] = getScoreNoteImage( getScoreNoteColor(),true);
 		this.scoreNotes[SCORE_NOTE_FULL_PLAY_MODE] = getScoreNoteImage( getPlayNoteColor(),true);
-		
+
 		this.harmonicNotes = new TGImage[4];
 		this.harmonicNotes[SCORE_NOTE_EMPTY_NORMAL_MODE] = getHarmonicImage( getScoreNoteColor(),false);
 		this.harmonicNotes[SCORE_NOTE_EMPTY_PLAY_MODE] = getHarmonicImage( getPlayNoteColor(),false);
 		this.harmonicNotes[SCORE_NOTE_FULL_NORMAL_MODE] = getHarmonicImage( getScoreNoteColor(),true);
 		this.harmonicNotes[SCORE_NOTE_FULL_PLAY_MODE] = getHarmonicImage( getPlayNoteColor(),true);
-		
+
 		this.tempoImage = getTempoImage(this.getColorBlack());
-		
+
 		this.tripletFeel8 = getTripletFeel8(this.getColorBlack());
 		this.tripletFeelNone8 = getTripletFeelNone8(this.getColorBlack());
 		this.tripletFeel16 = getTripletFeel16(this.getColorBlack());
 		this.tripletFeelNone16 = getTripletFeelNone16(this.getColorBlack());
 	}
-	
+
 	private TGFont getFont(TGFontModel model, float scale){
 		TGResourceFactory factory = getLayout().getComponent().getResourceFactory();
 		TGFontModel fm = new TGFontModel();
 		if(model != null){
 			float height = ( model.getHeight() * scale );
-			
+
 			fm.setHeight( ( height > 1 ? Math.round(height) : 1 ) );
 			fm.setName( model.getName() );
 			fm.setBold( model.isBold() );
 			fm.setItalic( model.isItalic() );
 		}
-		
+
 		return (TGFont)addResource(factory.createFont(fm));
 	}
-	
+
 	private TGColor getColor(TGColorModel model){
 		TGResourceFactory factory = getLayout().getComponent().getResourceFactory();
 		TGColorModel cm = (model != null ? model : new TGColorModel() );
-		
+
 		return (TGColor)addResource(factory.createColor(cm));
 	}
-	
+
 	private TGImage getScoreNoteImage(TGColor color,boolean full) {
 		float scale = (full ? getLayout().getScoreLineSpacing() + 1 : getLayout().getScoreLineSpacing() ) - 2;
 		int width = Math.round(scale * 1.33f);
 		int height = Math.round(scale * 1.0f);
-		
+
 		TGImage image = getImage(width + 1, height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setBackground(color);
@@ -270,20 +270,20 @@ private TGImage getScoreNoteImage(TGColor color,boolean full) {
 		painter.closePath();
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		this.scoreNoteWidth = width;
-		
+
 		return ((TGImage)addResource(image));
 	}
-	
+
 	private TGImage getHarmonicImage(TGColor color,boolean full) {
 		int size = getLayout().getScoreLineSpacing();
-		
+
 		int x = 0;
 		int y = 1;
 		int width = getScoreNoteWidth() - 1;
 		int height = size - 2;
-		
+
 		TGImage image = getImage(x + width + 2,y + height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setForeground(color);
@@ -293,15 +293,15 @@ private TGImage getHarmonicImage(TGColor color,boolean full) {
 		painter.closePath();
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		return ((TGImage)addResource(image));
 	}
-	
+
 	private TGImage getTempoImage(TGColor color) {
 		float scale = 5f * getLayout().getScale();
 		int width = Math.round(scale * 1.33f);
 		int height = Math.round(scale * (1.0f + 2.5f));
-		
+
 		TGImage image = getImage(width + 1, height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setBackground(color);
@@ -309,21 +309,21 @@ private TGImage getTempoImage(TGColor color) {
 		TGTempoPainter.paintTempo(painter,0,0, scale);
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		return ((TGImage)addResource(image));
 	}
-	
+
 	private TGImage getTripletFeelNone8(TGColor color) {
 		float scale = 5f * getLayout().getScale();
-		
+
 		float horizontalSpacing = (1.5f * scale);
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
 		float ovalHeight = (1.0f * scale);
-		
+
 		int width = Math.round( ovalWidth + horizontalSpacing );
 		int height = Math.round( ovalHeight + verticalSpacing );
-		
+
 		TGImage image = getImage(width + 1, height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setBackground(color);
@@ -331,10 +331,10 @@ private TGImage getTripletFeelNone8(TGColor color) {
 		TGTripletFeelPainter.paintTripletFeelNone8(painter,0,0, scale);
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		return ((TGImage)addResource(image));
 	}
-	
+
 	private TGImage getTripletFeel8(TGColor color) {
 		float scale = 5f * getLayout().getScale();
 		float topSpacing = (1.0f * scale);
@@ -342,10 +342,10 @@ private TGImage getTripletFeel8(TGColor color) {
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
 		float ovalHeight = (1.0f * scale);
-		
+
 		int width = Math.round( (ovalWidth * 2f) + horizontalSpacing );
 		int height = Math.round((topSpacing + ovalHeight + verticalSpacing));
-		
+
 		TGImage image = getImage(width + 1, height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setBackground(color);
@@ -353,21 +353,21 @@ private TGImage getTripletFeel8(TGColor color) {
 		TGTripletFeelPainter.paintTripletFeel8(painter,0,0, scale);
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		return ((TGImage)addResource(image));
-	}	
-	
+	}
+
 	private TGImage getTripletFeelNone16(TGColor color) {
 		float scale = 5f * getLayout().getScale();
-		
+
 		float horizontalSpacing = (1.5f * scale);
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
 		float ovalHeight = (1.0f * scale);
-		
+
 		int width = Math.round( ovalWidth + horizontalSpacing );
 		int height = Math.round( ovalHeight + verticalSpacing );
-		
+
 		TGImage image = getImage(width + 1, height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setBackground(color);
@@ -375,10 +375,10 @@ private TGImage getTripletFeelNone16(TGColor color) {
 		TGTripletFeelPainter.paintTripletFeelNone16(painter,0,0, scale);
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		return ((TGImage)addResource(image));
 	}
-	
+
 	private TGImage getTripletFeel16(TGColor color) {
 		float scale = 5f * getLayout().getScale();
 		float topSpacing = (1.0f * scale);
@@ -386,10 +386,10 @@ private TGImage getTripletFeel16(TGColor color) {
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
 		float ovalHeight = (1.0f * scale);
-		
+
 		int width = Math.round( (ovalWidth * 2f) + horizontalSpacing );
 		int height = Math.round( topSpacing + ovalHeight + verticalSpacing );
-		
+
 		TGImage image = getImage(width + 1, height + 2);
 		TGPainter painter = image.createPainter();
 		painter.setBackground(color);
@@ -397,10 +397,10 @@ private TGImage getTripletFeel16(TGColor color) {
 		TGTripletFeelPainter.paintTripletFeel16(painter,0,0, scale);
 		painter.dispose();
 		image.applyTransparency(getBackgroundColor());
-		
+
 		return ((TGImage)addResource(image));
 	}
-	
+
 	private TGImage getImage(int width, int height){
 		TGResourceFactory factory = getLayout().getComponent().getResourceFactory();
 		TGImage image = factory.createImage(width, height);
@@ -412,16 +412,16 @@ private TGImage getImage(int width, int height){
 		painter.dispose();
 		return image;
 	}
-	
+
 	private TGResource addResource(TGResource resource){
 		this.resources.add(resource);
 		return resource;
 	}
-	
+
 	public void dispose(){
-		Iterator it = this.resources.iterator();
+		Iterator<TGResource> it = this.resources.iterator();
 		while( it.hasNext() ){
-			TGResource resource = (TGResource)it.next();
+			TGResource resource = it.next();
 			resource.dispose();
 		}
 		this.resources.clear();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGSpacing.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGSpacing.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGSpacing.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGSpacing.java
index 307ac9fc..c94e5c72 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGSpacing.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGSpacing.java
@@ -2,14 +2,14 @@
 
 
 public abstract class TGSpacing {
-	
+
 	public static final int SCORE = 0x01;
 	public static final int TABLATURE = 0x02;
-	
+
 	private int flags;
 	private int[] spacing;
 	private int[][] positions;
-	
+
 	public TGSpacing(TGLayout layout, int[][] positions, int len){
 		this.flags = 0;
 		this.flags |= ((layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0 ? SCORE : 0 );
@@ -17,23 +17,23 @@ public TGSpacing(TGLayout layout, int[][] positions, int len){
 		this.positions = positions;
 		this.spacing = new int[len];
 	}
-	
+
 	public void clear(){
 		for(int i = 0; i < this.spacing.length; i ++){
 			this.spacing[i] = 0;
 		}
 	}
-	
+
 	public void setSize(int index,int size){
 		if( size > this.spacing[ this.positions [this.flags -1] [index] ] ){
 			this.spacing[ this.positions [this.flags -1] [index] ] = size;
 		}
 	}
-	
+
 	public int getSize(int index){
 		return this.spacing[ this.positions [this.flags -1] [index] ];
 	}
-	
+
 	public int getSize(){
 		int spacing = 0;
 		for(int i = 0;i < this.spacing.length; i ++){
@@ -41,7 +41,7 @@ public int getSize(){
 		}
 		return spacing;
 	}
-	
+
 	public int getPosition(int index){
 		int spacing = 0;
 		for(int i = 0;i < this.positions[this.flags -1][index]; i ++){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTextImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTextImpl.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTextImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTextImpl.java
index 55d315b9..be486a2b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTextImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTextImpl.java
@@ -4,7 +4,8 @@
 import org.herac.tuxguitar.song.models.TGText;
 
 public class TGTextImpl extends TGText{
-	
+	private static final long serialVersionUID = 1L;
+
 	public void paint(TGLayout layout,TGPainter painter,int fromX, int fromY){
 		TGBeatImpl beat = (TGBeatImpl)getBeat();
 		TGMeasureImpl measure = beat.getMeasureImpl();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTrackImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
similarity index 83%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
index 6bdf5e19..ffe93947 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackImpl.java
@@ -1,30 +1,27 @@
 /*
  * Created on 29-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.graphics.control;
 
 import java.util.Iterator;
 
 import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGTrack;
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGTrackImpl extends TGTrack{
-	
+	private static final long serialVersionUID = 1L;
+
 	private int tabHeight;
 	private int scoreHeight;
-	
+
 	public TGTrackImpl(TGFactory factory) {
 		super(factory);
 	}
-	
+
 	public void update(TGLayout layout){
 		this.calculateTabHeight(layout);
 		this.calculateScoreHeight(layout);
@@ -35,28 +32,29 @@ public void update(TGLayout layout){
 	public void calculateTabHeight(TGLayout layout) {
 		this.tabHeight = ((layout.getStyle() & TGLayout.DISPLAY_TABLATURE) != 0 ?((stringCount() - 1) * layout.getStringSpacing()):0);
 	}
-	
+
 	/**
 	 * Calcula el el ancho de la partitura
 	 */
 	public void calculateScoreHeight(TGLayout layout) {
 		this.scoreHeight = ((layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0 ?(layout.getScoreLineSpacing() * 4):0);
 	}
-	
+
 	public int getTabHeight() {
 		return this.tabHeight;
 	}
-	
+
 	public int getScoreHeight() {
 		return this.scoreHeight;
 	}
-	
+
 	public void setTabHeight(int tabHeight) {
 		this.tabHeight = tabHeight;
 	}
-	
+
+	@Override
 	public void clear(){
-		Iterator measures = getMeasures();
+		Iterator<TGMeasure> measures = getMeasures();
 		while(measures.hasNext()){
 			TGMeasureImpl measure = (TGMeasureImpl)measures.next();
 			if(!measure.isDisposed()){
@@ -65,7 +63,8 @@ public void clear(){
 		}
 		super.clear();
 	}
-	
+
+	@Override
 	public void removeMeasure(int index){
 		TGMeasureImpl measure = (TGMeasureImpl)getMeasure(index);
 		if(!measure.isDisposed()){
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
index 4bceb5e7..b3990965 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGTrackSpacing.java
@@ -2,7 +2,7 @@
 
 
 public class TGTrackSpacing extends TGSpacing {
-	
+
 	/***     POSITIONS ARRAY INDICES     ***/
 	public static final int POSITION_TOP = 0;
 	public static final int POSITION_LOOP_MARKER = 1;
@@ -20,7 +20,7 @@ public class TGTrackSpacing extends TGSpacing {
 	public static final int POSITION_TABLATURE = 13;
 	public static final int POSITION_LYRIC = 14;
 	public static final int POSITION_BOTTOM = 15;
-	
+
 	private static final int[][] POSITIONS = new int[][]{
 		/** SCORE **/
 		new int[]{
@@ -41,7 +41,7 @@ public class TGTrackSpacing extends TGSpacing {
 				14, //POSITION_LYRIC
 				15, //POSITION_BOTTOM
 			},
-			
+
 		/** TABLATURE **/
 		new int[]{
 				0,  //POSITION_TOP
@@ -61,7 +61,7 @@ public class TGTrackSpacing extends TGSpacing {
 				11, //POSITION_LYRIC
 				12, //POSITION_BOTTOM
 			},
-			
+
 		/** SCORE | TABLATURE **/
 		new int[]{
 				0,  //POSITION_TOP
@@ -82,7 +82,7 @@ public class TGTrackSpacing extends TGSpacing {
 				15, //POSITION_BOTTOM
 			},
 	};
-	
+
 	public TGTrackSpacing(TGLayout layout){
 		super( layout , POSITIONS , 16);
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
index fc150266..0fb67f23 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/TGVoiceImpl.java
@@ -6,11 +6,13 @@
 import org.herac.tuxguitar.graphics.control.painters.TGNotePainter;
 import org.herac.tuxguitar.graphics.control.painters.TGSilencePainter;
 import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGNote;
 import org.herac.tuxguitar.song.models.TGVoice;
 
 public class TGVoiceImpl extends TGVoice{
+	private static final long serialVersionUID = 1L;
 	/**
 	 * desviacion a la izquierda
 	 */
@@ -27,7 +29,7 @@ public class TGVoiceImpl extends TGVoice{
 	 * Union a la derecha
 	 */
 	public static final int JOINED_TYPE_RIGHT = 4;
-	
+
 	private int width;
 	private TGNoteImpl maxNote;
 	private TGNoteImpl minNote;
@@ -39,109 +41,109 @@ public class TGVoiceImpl extends TGVoice{
 	private TGVoiceImpl previous;
 	private TGVoiceImpl next;
 	private TGBeatGroup group;
-	
+
 	private boolean hiddenSilence;
-	
+
 	private int maxY;
 	private int minY;
 	private float silenceY;
 	private float silenceHeight;
-	
+
 	private int maxString;
 	private int minString;
-	
+
 	public TGVoiceImpl(TGFactory factory,int index){
 		super(factory, index);
 	}
-	
+
 	public int getPosX() {
 		return this.getBeatImpl().getPosX();
 	}
-	
+
 	public int getWidth() {
 		return this.width;
 	}
-	
+
 	public void setWidth(int width) {
 		this.width = width;
 	}
-	
+
 	public TGNoteImpl getMinNote(){
 		return this.minNote;
 	}
-	
+
 	public TGNoteImpl getMaxNote(){
 		return this.maxNote;
 	}
-	
+
 	public TGBeatImpl getBeatImpl() {
 		return (TGBeatImpl)getBeat();
 	}
-	
+
 	public TGMeasureImpl getMeasureImpl() {
 		return (TGMeasureImpl)getBeat().getMeasure();
 	}
-	
+
 	public boolean[] getUsedStrings() {
 		if(this.usedStrings == null){
 			this.usedStrings = new boolean[getBeat().getMeasure().getTrack().stringCount()];
 		}
 		return this.usedStrings;
 	}
-	
+
 	public TGVoiceImpl getJoin1() {
 		return this.join1;
 	}
-	
+
 	public void setJoin1(TGVoiceImpl join1) {
 		this.join1 = join1;
 	}
-	
+
 	public TGVoiceImpl getJoin2() {
 		return this.join2;
 	}
-	
+
 	public void setJoin2(TGVoiceImpl join2) {
 		this.join2 = join2;
 	}
-	
+
 	public boolean isJoinedGreaterThanQuarter() {
 		return this.joinedGreaterThanQuarter;
 	}
-	
+
 	public void setJoinedGreaterThanQuarter(boolean joinedGreaterThanQuarter) {
 		this.joinedGreaterThanQuarter = joinedGreaterThanQuarter;
 	}
-	
+
 	public int getJoinedType() {
 		return this.joinedType;
 	}
-	
+
 	public void setJoinedType(int joinedType) {
 		this.joinedType = joinedType;
 	}
-	
+
 	public void setPreviousBeat(TGVoiceImpl previous){
 		this.previous = previous;
 	}
-	
+
 	public void setNextBeat(TGVoiceImpl next){
 		this.next = next;
 	}
-	
+
 	public TGBeatGroup getBeatGroup() {
 		return this.group;
 	}
-	
+
 	public void setBeatGroup(TGBeatGroup group) {
 		this.group = group;
 	}
-	
+
 	public boolean isPlaying(TGLayout layout){
 		//return (getMeasureImpl().isPlaying(layout) && TuxGuitar.instance().getEditorCache().isPlaying(getBeat().getMeasure(),getBeat()));
 		return layout.getComponent().isRunning(this.getBeat());
 	}
-	
+
 	public void reset(){
 		this.maxNote = null;
 		this.minNote = null;
@@ -153,7 +155,7 @@ public void reset(){
 		this.previous = null;
 		this.next = null;
 	}
-	
+
 	public void check(TGNoteImpl note){
 		int value = note.getRealValue();
 		if(this.maxNote == null || value > this.maxNote.getRealValue()){
@@ -164,7 +166,7 @@ public void check(TGNoteImpl note){
 		}
 		this.getUsedStrings();
 		this.usedStrings[note.getString() - 1] = true;
-		
+
 		if( note.getString() > this.maxString ){
 			this.maxString = note.getString();
 		}
@@ -172,7 +174,7 @@ public void check(TGNoteImpl note){
 			this.minString = note.getString();
 		}
 	}
-	
+
 	public void update(TGLayout layout) {
 		this.minY = 0;
 		this.maxY = 0;
@@ -183,16 +185,16 @@ public void update(TGLayout layout) {
 			this.updateNoteVoice(layout);
 		}
 	}
-	
+
 	public void updateNoteVoice(TGLayout layout) {
 		this.joinedType = JOINED_TYPE_NONE_RIGHT;
 		this.joinedGreaterThanQuarter = false;
 		this.setJoin1(this);
 		this.setJoin2(this);
-		
+
 		boolean noteJoined = false;
 		boolean withPrev = false;
-		
+
 		//trato de unir con el componente anterior
 		if (this.previous != null && !this.previous.isRestVoice()) {
 			if (getMeasureImpl().canJoin(layout.getSongManager(),this, this.previous)) {
@@ -208,7 +210,7 @@ public void updateNoteVoice(TGLayout layout) {
 				}
 			}
 		}
-		
+
 		//trato de unir con el componente que le sigue
 		if (this.next != null && !this.next.isRestVoice() ) {
 			if (getMeasureImpl().canJoin(layout.getSongManager(),this, this.next)) {
@@ -225,12 +227,12 @@ public void updateNoteVoice(TGLayout layout) {
 				}
 			}
 		}
-		
+
 		//si no hubo union decido para que lado girar la figura
 		if (!noteJoined && withPrev) {
 			this.joinedType = JOINED_TYPE_NONE_LEFT;
 		}
-		
+
 		if( (layout.getStyle() & TGLayout.DISPLAY_TABLATURE) != 0 && (layout.getStyle() & TGLayout.DISPLAY_SCORE) == 0){
 			this.minY = 0;
 			this.maxY = getBeatImpl().getMeasureImpl().getTrackImpl().getTabHeight();
@@ -241,11 +243,11 @@ public void updateNoteVoice(TGLayout layout) {
 			}
 		}
 	}
-	
+
 	public void updateSilenceSpacing(TGLayout layout) {
 		this.silenceY = 0;
 		this.silenceHeight = 0;
-		
+
 		if(!isHiddenSilence()){
 			int style = layout.getStyle();
 			int lineSpacing = 0;
@@ -260,7 +262,7 @@ public void updateSilenceSpacing(TGLayout layout) {
 				lineCount = getBeat().getMeasure().getTrack().stringCount();
 				scale = (lineSpacing / 10.0f);
 			}
-			
+
 			int duration = getDuration().getValue();
 			if(duration == TGDuration.WHOLE){
 				this.silenceHeight = (scale * 3.6513581f);
@@ -290,7 +292,7 @@ else if(duration == TGDuration.SIXTY_FOURTH){
 				this.silenceHeight = (scale * 28);
 				this.silenceY = ((lineSpacing * (lineCount - 1)) / 2) - (this.silenceHeight / 2);
 			}
-			
+
 			for( int v = 0; v < getBeat().countVoices(); v ++){
 				if( v != getIndex() ){
 					TGVoiceImpl voice = getBeatImpl().getVoiceImpl( v );
@@ -306,7 +308,7 @@ else if((layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0 ){
 							int direction = voice.getBeatGroup().getDirection();
 							int y1 = voice.getBeatGroup().getY1(layout,voice.getMinNote(),getMeasureImpl().getKeySignature(),getMeasureImpl().getClef());
 							int y2 = voice.getBeatGroup().getY1(layout,voice.getMaxNote(),getMeasureImpl().getKeySignature(),getMeasureImpl().getClef());
-							
+
 							if(direction == TGBeatGroup.DIRECTION_UP){
 								float position = (y1 + (lineSpacing * 2));
 								if( position > this.silenceY ){
@@ -340,14 +342,14 @@ else if(direction == TGBeatGroup.DIRECTION_DOWN){
 			this.maxY = (int)(this.silenceY + this.silenceHeight);
 		}
 	}
-	
+
 	public void paint(TGLayout layout,TGPainter painter, int fromX, int fromY) {
 		if(!isEmpty()){
 			if(isRestVoice() && !isHiddenSilence()){
 				paintSilence(layout, painter, fromX, fromY);
 			}
 			else{
-				Iterator notes = getNotes().iterator();
+				Iterator<TGNote> notes = getNotes().iterator();
 				while (notes.hasNext()) {
 					TGNoteImpl note = (TGNoteImpl)notes.next();
 					note.paint(layout,painter,fromX ,fromY);
@@ -358,7 +360,7 @@ public void paint(TGLayout layout,TGPainter painter, int fromX, int fromY) {
 			}
 		}
 	}
-	
+
 	//----silence
 	public void paintSilence(TGLayout layout,TGPainter painter, int fromX, int fromY) {
 		int style = layout.getStyle();
@@ -366,7 +368,7 @@ public void paintSilence(TGLayout layout,TGPainter painter, int fromX, int fromY
 		int lineSpacing = 0;
 		float y = 0;
 		float scale = 0;
-		
+
 		if((style & TGLayout.DISPLAY_SCORE) != 0 ){
 			x = fromX + getPosX() + getBeatImpl().getSpacing();
 			y = fromY + getPaintPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES) + this.silenceY;
@@ -378,10 +380,10 @@ public void paintSilence(TGLayout layout,TGPainter painter, int fromX, int fromY
 			lineSpacing = layout.getStringSpacing();
 			scale = (lineSpacing / 10.0f);
 		}
-		
+
 		setStyle(layout, painter,(layout.isPlayModeEnabled() && isPlaying(layout)));
 		painter.initPath(TGPainter.PATH_FILL);
-		
+
 		int duration = getDuration().getValue();
 		if(duration == TGDuration.WHOLE){
 			TGSilencePainter.paintWhole(painter, x, y , scale);
@@ -404,9 +406,9 @@ else if(duration == TGDuration.THIRTY_SECOND){
 		else if(duration == TGDuration.SIXTY_FOURTH){
 			TGSilencePainter.paintSixtyFourth(painter, x, y, scale);
 		}
-		
+
 		painter.closePath();
-		
+
 		if(getDuration().isDotted() || getDuration().isDoubleDotted()){
 			layout.setDotStyle(painter);
 			painter.initPath();
@@ -427,7 +429,7 @@ else if(duration == TGDuration.SIXTY_FOURTH){
 			}
 		}
 	}
-	
+
 	public void setStyle(TGLayout layout, TGPainter painter, boolean playMode){
 		if((layout.getStyle() & TGLayout.DISPLAY_SCORE) != 0 ){
 			layout.setScoreSilenceStyle(painter, playMode);
@@ -435,12 +437,12 @@ public void setStyle(TGLayout layout, TGPainter painter, boolean playMode){
 			layout.setTabSilenceStyle(painter, playMode);
 		}
 	}
-	
+
 	public void paintBeat(TGLayout layout,TGPainter painter, int fromX, int fromY){
 		if(!isRestVoice() ){
 			int style = layout.getStyle();
 			int spacing = getBeatImpl().getSpacing();
-			
+
 			if((style & TGLayout.DISPLAY_SCORE) != 0){
 				paintScoreBeat(layout, painter, fromX, fromY+getPaintPosition(TGTrackSpacing.POSITION_SCORE_MIDDLE_LINES), spacing);
 			}
@@ -449,7 +451,7 @@ public void paintBeat(TGLayout layout,TGPainter painter, int fromX, int fromY){
 			}
 		}
 	}
-	
+
 	public void paintTablatureBeat(TGLayout layout,TGPainter painter, int fromX, int fromY, int spacing){
 		if(!isRestVoice() ){
 			float scale = layout.getScale();
@@ -512,7 +514,7 @@ public void paintTablatureBeat(TGLayout layout,TGPainter painter, int fromX, int
 				painter.lineTo(x, y2);
 				painter.closePath();
 			}
-			
+
 			//-------------puntillo--------------------------------------
 			if (getDuration().isDotted() || getDuration().isDoubleDotted()) {
 				int joinedType = getJoinedType();
@@ -520,7 +522,7 @@ public void paintTablatureBeat(TGLayout layout,TGPainter painter, int fromX, int
 				float posY = (y2 - ((getDuration().getValue() >= TGDuration.EIGHTH)? ((stringSpacing / 2) * (getDuration().getIndex() - 2)):(1.0f * scale)));
 				paintDot(layout, painter, posX, posY,scale);
 			}
-			
+
 			//-------------tresillo--------------------------------------
 			if (!getDuration().getDivision().isEqual(TGDivisionType.NORMAL)) {
 				layout.setDivisionTypeStyle(painter);
@@ -528,10 +530,10 @@ public void paintTablatureBeat(TGLayout layout,TGPainter painter, int fromX, int
 			}
 		}
 	}
-	
+
 	public void paintScoreBeat(TGLayout layout,TGPainter painter, int fromX, int fromY, int spacing){
 		int vX = ( fromX + getPosX() + spacing );
-		
+
 		//division type
 		if (!getDuration().getDivision().isEqual(TGDivisionType.NORMAL)) {
 			layout.setDivisionTypeStyle(painter);
@@ -540,32 +542,32 @@ public void paintScoreBeat(TGLayout layout,TGPainter painter, int fromX, int fro
 		//dibujo el pie
 		if(getDuration().getValue() >= TGDuration.HALF){
 			layout.setScoreNoteFooterStyle(painter);
-			
+
 			float scale = layout.getScale();
 			float lineSpacing = layout.getScoreLineSpacing();
 			int direction = this.group.getDirection();
 			int key = getBeat().getMeasure().getKeySignature();
 			int clef = getBeat().getMeasure().getClef();
-			
+
 			int xMove = (direction == TGBeatGroup.DIRECTION_UP ? layout.getResources().getScoreNoteWidth() : 0);
 			int yMove = (direction == TGBeatGroup.DIRECTION_UP ? ((layout.getScoreLineSpacing() / 3) + 1) : ((layout.getScoreLineSpacing() / 3) * 2));
-			
+
 			int vY1 = fromY + ( direction == TGBeatGroup.DIRECTION_DOWN ? this.maxNote.getScorePosY() : this.minNote.getScorePosY() );
 			int vY2 = fromY + this.group.getY2(layout,getPosX() + spacing,key,clef);
-			
+
 			painter.initPath();
 			painter.setAntialias(false);
 			painter.moveTo(vX + xMove, vY1 + yMove);
 			painter.lineTo(vX + xMove, vY2);
 			painter.closePath();
-			
+
 			if (getDuration().getValue() >= TGDuration.EIGHTH) {
 				int index =  ( getDuration().getIndex() - 3);
 				if(index >= 0){
 					int dir = (direction == TGBeatGroup.DIRECTION_DOWN)?1:-1;
 					int joinedType = getJoinedType();
 					boolean joinedGreaterThanQuarter = isJoinedGreaterThanQuarter();
-					
+
 					if((joinedType == TGVoiceImpl.JOINED_TYPE_NONE_LEFT || joinedType == TGVoiceImpl.JOINED_TYPE_NONE_RIGHT) && !joinedGreaterThanQuarter){
 						float hX = (fromX + xMove + getPosX() + spacing);
 						float hY = ( (fromY + this.group.getY2(layout,getPosX() + spacing,key,clef)) - ( (lineSpacing * 2)* dir )) ;
@@ -602,7 +604,7 @@ public void paintScoreBeat(TGLayout layout,TGPainter painter, int fromX, int fro
 			}
 		}
 	}
-	
+
 	public void paintDot(TGLayout layout,TGPainter painter,float fromX, float fromY,float scale){
 		float dotSize = (3.0f * scale);
 		float posX = fromX;
@@ -617,31 +619,31 @@ public void paintDot(TGLayout layout,TGPainter painter,float fromX, float fromY,
 		}
 		painter.closePath();
 	}
-	
+
 	public int getPaintPosition(int index){
 		return getMeasureImpl().getTs().getPosition(index);
 	}
-	
+
 	public int getMaxString() {
 		return this.maxString;
 	}
-	
+
 	public int getMinString() {
 		return this.minString;
 	}
-	
+
 	public int getMaxY() {
 		return this.maxY;
 	}
-	
+
 	public int getMinY() {
 		return this.minY;
 	}
-	
+
 	public boolean isHiddenSilence() {
 		return this.hiddenSilence;
 	}
-	
+
 	public void setHiddenSilence(boolean hiddenSilence) {
 		this.hiddenSilence = hiddenSilence;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
index 63a38fd6..c60fa61f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGClefPainter.java
@@ -3,7 +3,7 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGClefPainter {
-	
+
 	public static void paintTreble(TGPainter painter, int x, int y,float scale){
 		painter.moveTo((x + (0.9706216f * scale)),(y + (-0.9855771f * scale)));
 		painter.cubicTo((x + (0.99023926f * scale)),(y + (-0.99538594f * scale)),(x + (0.99350905f * scale)),(y + (-0.99538594f * scale)),(x + (1.0131269f * scale)),(y + (-0.99538594f * scale)));
@@ -101,7 +101,7 @@ public static void paintTreble(TGPainter painter, int x, int y,float scale){
 		painter.cubicTo((x + (1.8174533f * scale)),(y + (2.9510455f * scale)),(x + (1.7389826f * scale)),(y + (2.8235304f * scale)),(x + (1.6278152f * scale)),(y + (2.735251f * scale)));
 		painter.cubicTo((x + (1.5591533f * scale)),(y + (2.6829367f * scale)),(x + (1.4676039f * scale)),(y + (2.6371622f * scale)),(x + (1.3924028f * scale)),(y + (2.617545f * scale)));
 	}
-	
+
 	public static void paintBass(TGPainter painter, int x, int y,float scale){
 		painter.moveTo((x + (0.71937084f * scale)),(y + (0.16147426f * scale)));
 		painter.cubicTo((x + (0.75454587f * scale)),(y + (0.15827677f * scale)),(x + (0.8920496f * scale)),(y + (0.16147426f * scale)),(x + (0.94321334f * scale)),(y + (0.16467176f * scale)));
@@ -144,7 +144,7 @@ public static void paintBass(TGPainter painter, int x, int y,float scale){
 		painter.cubicTo((x + (1.9153309f * scale)),(y + (1.5684855f * scale)),(x + (1.8449808f * scale)),(y + (1.4981354f * scale)),(x + (1.8449808f * scale)),(y + (1.4117955f * scale)));
 		painter.cubicTo((x + (1.8449808f * scale)),(y + (1.338248f * scale)),(x + (1.8929471f * scale)),(y + (1.2774905f * scale)),(x + (1.9632971f * scale)),(y + (1.2583042f * scale)));
 	}
-	
+
 	public static void paintAlto(TGPainter painter, int x, int y,float scale){
 		painter.moveTo((x + (0.026545623f * scale)),(y + (0.5470838f * scale)));
 		painter.cubicTo((x + (0.03553187f * scale)),(y + (0.5410925f * scale)),(x + (0.053504374f * scale)),(y + (0.5410925f * scale)),(x + (0.21525937f * scale)),(y + (0.5410925f * scale)));
@@ -243,7 +243,7 @@ public static void paintAlto(TGPainter painter, int x, int y,float scale){
 		painter.lineTo((x + (0.58369815f * scale)),(y + (0.56206f * scale)));
 		painter.cubicTo((x + (0.5896894f * scale)),(y + (0.55607f * scale)),(x + (0.59568065f * scale)),(y + (0.55007875f * scale)),(x + (0.6016719f * scale)),(y + (0.5470838f * scale)));
 	}
-	
+
 	public static void paintTenor(TGPainter painter, int x, int y,float scale){
 		painter.moveTo((x + (0.026545623f * scale)),(y + (-0.45291623f * scale)));
 		painter.cubicTo((x + (0.03553187f * scale)),(y + (-0.45890749f * scale)),(x + (0.053504374f * scale)),(y + (-0.45890749f * scale)),(x + (0.21525937f * scale)),(y + (-0.45890749f * scale)));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
index 5436c48e..ce60e8b4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGKeySignaturePainter.java
@@ -3,7 +3,7 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGKeySignaturePainter {
-	
+
 	public static void paintSharp(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (0.4330491f * scale)),(y + (-0.7961011300329119f * scale)));
 		painter.cubicTo((x + (0.44892004f * scale)),(y + (-0.8051702223718167f * scale)),(x + (0.47386006f * scale)),(y + (-0.7983684030594305f * scale)),(x + (0.48292914f * scale)),(y + (-0.7779629465192557f * scale)));
@@ -75,7 +75,7 @@ public static void paintSharp(TGPainter painter, float x, float y,float scale){
 		painter.lineTo((x + (0.40810916f * scale)),(y + (0.19469715356826778f * scale)));
 		painter.lineTo((x + (0.40810916f * scale)),(y + (0.008780729770660356f * scale)));
 	}
-	
+
 	public static void paintFlat(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (0.036081146f * scale)),(y + (-1.2279010191746056f * scale)));
 		painter.cubicTo((x + (0.066563375f * scale)),(y + (-1.2334432420507073f * scale)),(x + (0.11644338f * scale)),(y + (-1.2279010191746056f * scale)),(x + (0.13584116f * scale)),(y + (-1.2140454626828432f * scale)));
@@ -108,7 +108,7 @@ public static void paintFlat(TGPainter painter, float x, float y,float scale){
 		painter.cubicTo((x + (0.41849452f * scale)),(y + (-0.02523873329162596f * scale)),(x + (0.41018116f * scale)),(y + (-0.09728751659393309f * scale)),(x + (0.38524118f * scale)),(y + (-0.1527098226547241f * scale)));
 		painter.cubicTo((x + (0.37138563f * scale)),(y + (-0.18042085647583006f * scale)),(x + (0.35475895f * scale)),(y + (-0.19981859207153319f * scale)),(x + (0.32981896f * scale)),(y + (-0.21090314865112303f * scale)));
 	}
-	
+
 	public static void paintNatural(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (0.038880464f * scale)),(y + (-0.99784582760185f * scale)));
 		painter.cubicTo((x + (0.061049357f * scale)),(y + (-1.0033880504779518f * scale)),(x + (0.11092936f * scale)),(y + (-0.99784582760185f * scale)),(x + (0.13032715f * scale)),(y + (-0.9839902706444263f * scale)));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
index d60f119d..7acdcbdd 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGNotePainter.java
@@ -3,7 +3,7 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGNotePainter {
-	
+
 	public static void paintFooter(TGPainter painter, float x, float y,int dir,float scale){
 		painter.moveTo(( x + (0.64375f * scale) ),( y + ((0.00625f * scale) * dir) ));
 		painter.cubicTo(( x + (0.659375f * scale) ),( y + ((0.0f * scale) * dir) ),( x + (0.69375f * scale) ),( y + ((0.00625f * scale) * dir) ),( x + (0.70625f * scale) ),( y + ((0.0125f * scale) * dir) ));
@@ -28,7 +28,7 @@ public static void paintFooter(TGPainter painter, float x, float y,int dir,float
 		painter.cubicTo(( x + (0.584375f * scale) ),( y + ((0.10625f * scale) * dir) ),( x + (0.58125f * scale) ),( y + ((0.096875f * scale) * dir) ),( x + (0.58125f * scale) ),( y + ((0.0875f * scale) * dir) ));
 		painter.cubicTo(( x + (0.58125f * scale) ),( y + ((0.05f * scale) * dir) ),( x + (0.60625f * scale) ),( y + ((0.01875f * scale) * dir) ),( x + (0.64375f * scale) ),( y + ((0.00625f * scale) * dir) ));
 	}
-	
+
 	public static void paintNote(TGPainter painter, float x, float y,float scale){
 		painter.moveTo( x ,( y + (0.66f * scale) ));
 		painter.cubicTo( x,( y + (0.83f * scale) ),( x + (0.166f * scale) ),( y + (1.0f * scale) ),( x + (0.33f * scale) ),( y + (1.0f * scale) ));
@@ -36,7 +36,7 @@ public static void paintNote(TGPainter painter, float x, float y,float scale){
 		painter.cubicTo(( x + (1.33f * scale) ),( y + (0.166f * scale) ),( x + (1.16f * scale) ), y ,( x + (1.0f * scale) ), y );
 		painter.cubicTo(( x + (0.5f * scale) ), y , x ,( y + (0.33f * scale) ), x ,( y + (0.66f * scale) ));
 	}
-	
+
 	public static void paintHarmonic(TGPainter painter, float x, float y,float scale){
 		painter.moveTo(x ,(y + (0.5f * scale)));
 		painter.lineTo((x + (0.665f * scale )) ,(y + (1.0f * scale)));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
index 17f965dc..257bbb7a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGSilencePainter.java
@@ -3,7 +3,7 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGSilencePainter {
-	
+
 	public static void paintWhole(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (0.04681015f * scale)),(y + (0.046812057f * scale)));
 		painter.lineTo((x + (0.1170311f * scale)),(y + (0.0f * scale)));
@@ -23,7 +23,7 @@ public static void paintWhole(TGPainter painter, float x, float y,float scale){
 		painter.lineTo((x + (0.0f * scale)),(y + (0.11703062f * scale)));
 		painter.lineTo((x + (0.04681015f * scale)),(y + (0.046812057f * scale)));
 	}
-	
+
 	public static void paintHalf(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (0.04681015f * scale)),(y + (0.046812057f * scale)));
 		painter.lineTo((x + (0.1170311f * scale)),(y + (0.0f * scale)));
@@ -43,7 +43,7 @@ public static void paintHalf(TGPainter painter, float x, float y,float scale){
 		painter.lineTo((x + (0.0f * scale)),(y + (0.11703062f * scale)));
 		painter.lineTo((x + (0.04681015f * scale)),(y + (0.046812057f * scale)));
 	}
-	
+
 	public static void paintQuarter(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (2.1034088f * scale)),(y + (0.047267675f * scale)));
 		painter.cubicTo((x + (2.1979485f * scale)),(y + (0.0f * scale)),(x + (2.2924728f * scale)),(y + (0.0f * scale)),(x + (2.387024f * scale)),(y + (0.023633957f * scale)));
@@ -79,7 +79,7 @@ public static void paintQuarter(TGPainter painter, float x, float y,float scale)
 		painter.cubicTo((x + (2.2215881f * scale)),(y + (0.8035486f * scale)),(x + (1.9616127f * scale)),(y + (0.49630952f * scale)),(x + (1.9379692f * scale)),(y + (0.44904137f * scale)));
 		painter.cubicTo((x + (1.8670654f * scale)),(y + (0.30723906f * scale)),(x + (1.9379692f * scale)),(y + (0.11816859f * scale)),(x + (2.1034088f * scale)),(y + (0.047267675f * scale)));
 	}
-	
+
 	public static void paintEighth(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (1.6779978f * scale)),(y + (0.070901394f * scale)));
 		painter.cubicTo((x + (2.1979408f * scale)),(y + (0.0f * scale)),(x + (2.6469831f * scale)),(y + (0.14180231f * scale)),(x + (3.0014887f * scale)),(y + (0.47267532f * scale)));
@@ -104,7 +104,7 @@ public static void paintEighth(TGPainter painter, float x, float y,float scale){
 		painter.cubicTo((x + (0.3545066f * scale)),(y + (2.88332f * scale)),(x + (0.0f * scale)),(y + (1.6779974f * scale)),(x + (0.5908443f * scale)),(y + (0.7799146f * scale)));
 		painter.cubicTo((x + (0.85081583f * scale)),(y + (0.4254074f * scale)),(x + (1.2525895f * scale)),(y + (0.14180231f * scale)),(x + (1.6779978f * scale)),(y + (0.070901394f * scale)));
 	}
-	
+
 	public static void paintSixteenth(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (3.5214243f * scale)),(y + (0.070901394f * scale)));
 		painter.cubicTo((x + (4.041381f * scale)),(y + (0.0f * scale)),(x + (4.490409f * scale)),(y + (0.14180231f * scale)),(x + (4.8449125f * scale)),(y + (0.4726758f * scale)));
@@ -141,7 +141,7 @@ public static void paintSixteenth(TGPainter painter, float x, float y,float scal
 		painter.cubicTo((x + (2.197935f * scale)),(y + (2.8833203f * scale)),(x + (1.8434324f * scale)),(y + (1.6779971f * scale)),(x + (2.43427f * scale)),(y + (0.77991486f * scale)));
 		painter.cubicTo((x + (2.69425f * scale)),(y + (0.4254074f * scale)),(x + (3.096015f * scale)),(y + (0.14180231f * scale)),(x + (3.5214243f * scale)),(y + (0.070901394f * scale)));
 	}
-	
+
 	public static void paintThirtySecond(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (4.939474f * scale)),(y + (0.070901155f * scale)));
 		painter.cubicTo((x + (5.459408f * scale)),(y + (0.0f * scale)),(x + (5.9084606f * scale)),(y + (0.14180207f * scale)),(x + (6.2629623f * scale)),(y + (0.4726758f * scale)));
@@ -190,7 +190,7 @@ public static void paintThirtySecond(TGPainter painter, float x, float y,float s
 		painter.cubicTo((x + (3.6159801f * scale)),(y + (2.88332f * scale)),(x + (3.2614594f * scale)),(y + (1.6779974f * scale)),(x + (3.8523216f * scale)),(y + (0.7799146f * scale)));
 		painter.cubicTo((x + (4.112276f * scale)),(y + (0.4254074f * scale)),(x + (4.5140667f * scale)),(y + (0.14180207f * scale)),(x + (4.939474f * scale)),(y + (0.070901155f * scale)));
 	}
-	
+
 	public static void paintSixtyFourth(TGPainter painter, float x, float y,float scale){
 		painter.moveTo((x + (5.908436f * scale)),(y + (0.07090092f * scale)));
 		painter.cubicTo((x + (6.4283676f * scale)),(y + (0.0f * scale)),(x + (6.8774185f * scale)),(y + (0.14180303f * scale)),(x + (7.231926f * scale)),(y + (0.4726758f * scale)));
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
index e3942d04..1d5230cf 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTempoPainter.java
@@ -3,15 +3,15 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGTempoPainter {
-	
+
 	public static void paintTempo(TGPainter painter, int x, int y,float scale) {
 		int width = Math.round(scale * 1.33f);
 		int height = Math.round(scale * (1.0f + 2.5f));
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x + (width - (scale * 1.33f)),y + ( height - (1.0f * scale) ), scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo(x + width,y);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
index 4c86f611..0dd42fb1 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/graphics/control/painters/TGTripletFeelPainter.java
@@ -3,53 +3,53 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class TGTripletFeelPainter {
-	
+
 	public static void paintTripletFeel8(TGPainter painter, int x, int y,float scale) {
 		float topSpacing = (1.0f * scale);
 		float horizontalSpacing = (1.5f * scale);
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x, y + (topSpacing + verticalSpacing) , scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo( x + Math.round(ovalWidth) ,y + Math.round(topSpacing + verticalSpacing + (0.33f * scale)) );
 		painter.lineTo( x + Math.round(ovalWidth) ,y + topSpacing);
 		painter.closePath();
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x + horizontalSpacing,y + (topSpacing + verticalSpacing)  , scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo(x + Math.round(ovalWidth + horizontalSpacing) ,y +Math.round(topSpacing + verticalSpacing + (0.33f * scale)) );
 		painter.lineTo(x + Math.round(ovalWidth + horizontalSpacing) ,y +topSpacing);
 		painter.closePath();
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintFooter(painter,x + Math.round(ovalWidth + horizontalSpacing),y + (topSpacing + (scale * 2.3f)), -1 , scale);
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.moveTo( x, y + (1.2f * scale) );
 		painter.cubicTo(x + (horizontalSpacing / 2f), y, x + ( (ovalWidth * 2f) + (horizontalSpacing / 2f)), y, x + ( (ovalWidth * 2f) + horizontalSpacing), y + (1.2f * scale));
 		painter.moveTo( x + ( (ovalWidth * 2f) + horizontalSpacing),y + (1.2f * scale) );
 		painter.closePath();
 	}
-	
+
 	public static void paintTripletFeelNone8(TGPainter painter, int x, int y,float scale) {
 		float horizontalSpacing = (1.5f * scale);
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x, y + verticalSpacing , scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo( x + Math.round(ovalWidth) ,y + Math.round(verticalSpacing + (0.33f * scale)) );
@@ -57,22 +57,22 @@ public static void paintTripletFeelNone8(TGPainter painter, int x, int y,float s
 		painter.lineTo( x + Math.round(ovalWidth + horizontalSpacing) ,y);
 		painter.lineTo( x + Math.round(ovalWidth + horizontalSpacing) ,y + Math.round(verticalSpacing + (0.33f * scale)) );
 		painter.closePath();
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x + horizontalSpacing,y + verticalSpacing , scale );
 		painter.closePath();
 	}
-	
+
 	public static int paintTripletFeel16(TGPainter painter, int x, int y,float scale) {
 		float topSpacing = (1.0f * scale);
 		float horizontalSpacing = (1.5f * scale);
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x,y + (topSpacing + verticalSpacing) , scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo(x + Math.round(ovalWidth) ,y + Math.round(topSpacing + verticalSpacing + (0.33f * scale)) );
@@ -82,29 +82,29 @@ public static int paintTripletFeel16(TGPainter painter, int x, int y,float scale
 		painter.moveTo(x + Math.round(ovalWidth + horizontalSpacing - (0.55f * scale) ) ,y + Math.round(topSpacing + (0.5f * scale)));
 		painter.lineTo(x + Math.round(ovalWidth + horizontalSpacing) ,y + Math.round(topSpacing + (0.5f * scale)));
 		painter.closePath();
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x + horizontalSpacing,y + (topSpacing + verticalSpacing) , scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.moveTo( x, y + (1.2f * scale) );
 		painter.cubicTo(x + (horizontalSpacing / 2f), y, x + ( (ovalWidth * 2f) + (horizontalSpacing / 2f)), y, x + ( (ovalWidth * 2f) + horizontalSpacing), y + (1.2f * scale));
 		painter.moveTo( x + ( (ovalWidth * 2f) + horizontalSpacing),y + (1.2f * scale) );
 		painter.closePath();
-		
+
 		return Math.round( (ovalWidth * 2f) + horizontalSpacing );
 	}
-	
+
 	public static int paintTripletFeelNone16(TGPainter painter, int x, int y,float scale) {
 		float horizontalSpacing = (1.5f * scale);
 		float verticalSpacing = (2.5f * scale);
 		float ovalWidth = (1.33f * scale);
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x,y + verticalSpacing , scale );
 		painter.closePath();
-		
+
 		painter.initPath();
 		painter.setAntialias(false);
 		painter.moveTo(x + Math.round(ovalWidth) ,y + Math.round(verticalSpacing + (0.33f * scale)) );
@@ -114,11 +114,11 @@ public static int paintTripletFeelNone16(TGPainter painter, int x, int y,float s
 		painter.moveTo(x + Math.round(ovalWidth) ,y + Math.round(0.5f * scale));
 		painter.lineTo(x + Math.round(ovalWidth + horizontalSpacing) ,y + Math.round(0.5f * scale));
 		painter.closePath();
-		
+
 		painter.initPath(TGPainter.PATH_FILL);
 		TGNotePainter.paintNote(painter,x + horizontalSpacing,y + verticalSpacing , scale );
 		painter.closePath();
-		
+
 		return Math.round( ovalWidth + horizontalSpacing );
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormat.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormat.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormat.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormat.java
index a30fbb43..96e116c2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormat.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormat.java
@@ -1,21 +1,21 @@
 package org.herac.tuxguitar.io.base;
 
 public class TGFileFormat {
-	
+
 	public static final String EXTENSION_SEPARATOR = new String(";");
-	
+
 	private String name;
 	private String supportedFormats;
-	
+
 	public TGFileFormat(String name, String supportedFormats) {
 		this.name = name;
 		this.supportedFormats = supportedFormats;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public String getSupportedFormats() {
 		return this.supportedFormats;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatException.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatException.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatException.java
index 80765d7d..6d00545b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatException.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatException.java
@@ -1,23 +1,23 @@
 package org.herac.tuxguitar.io.base;
 
 public class TGFileFormatException extends Exception{
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public TGFileFormatException() {
 		super();
 	}
-	
+
 	public TGFileFormatException(String message, Throwable cause) {
 		super(message, cause);
 	}
-	
+
 	public TGFileFormatException(String message) {
 		super(message);
 	}
-	
+
 	public TGFileFormatException(Throwable cause) {
 		super(cause);
 	}
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatManager.java
new file mode 100644
index 00000000..fcdf3abe
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGFileFormatManager.java
@@ -0,0 +1,154 @@
+package org.herac.tuxguitar.io.base;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.io.tg.TGInputStream;
+import org.herac.tuxguitar.io.tg.TGOutputStream;
+import org.herac.tuxguitar.io.tg.TGStream;
+
+public class TGFileFormatManager {
+
+	public static final String DEFAULT_EXTENSION = TGStream.TG_FORMAT_EXTENSION;
+
+	private static TGFileFormatManager instance;
+
+	private final TGSongLoader loader;
+	private final TGSongWriter writer;
+	private final List<TGInputStreamBase> inputStreams;
+	private final List<TGOutputStreamBase> outputStreams;
+	private final List<TGRawExporter> exporters;
+	private final List<TGRawImporter> importers;
+
+	private TGFileFormatManager(){
+		this.loader = new TGSongLoader();
+		this.writer = new TGSongWriter();
+		this.inputStreams = new ArrayList<TGInputStreamBase>();
+		this.outputStreams = new ArrayList<TGOutputStreamBase>();
+		this.exporters = new ArrayList<TGRawExporter>();
+		this.importers = new ArrayList<TGRawImporter>();
+		this.addDefaultStreams();
+	}
+
+	public static TGFileFormatManager instance(){
+		if(instance == null){
+			instance = new TGFileFormatManager();
+		}
+		return instance;
+	}
+
+	public TGSongLoader getLoader(){
+		return this.loader;
+	}
+
+	public TGSongWriter getWriter(){
+		return this.writer;
+	}
+
+	public void addInputStream(TGInputStreamBase stream){
+		this.inputStreams.add(stream);
+	}
+
+	public void removeInputStream(TGInputStreamBase stream){
+		this.inputStreams.remove(stream);
+	}
+
+	public int countInputStreams(){
+		return this.inputStreams.size();
+	}
+
+	public void addOutputStream(TGOutputStreamBase stream){
+		this.outputStreams.add(stream);
+	}
+
+	public void removeOutputStream(TGOutputStreamBase stream){
+		this.outputStreams.remove(stream);
+	}
+
+	public int countOutputStreams(){
+		return this.outputStreams.size();
+	}
+
+	public void addImporter(TGRawImporter importer){
+		this.importers.add(importer);
+	}
+
+	public void removeImporter(TGRawImporter importer){
+		this.importers.remove(importer);
+	}
+
+	public int countImporters(){
+		return this.importers.size();
+	}
+
+	public void addExporter(TGRawExporter exporter){
+		this.exporters.add(exporter);
+	}
+
+	public void removeExporter(TGRawExporter exporter){
+		this.exporters.remove(exporter);
+	}
+
+	public int countExporters(){
+		return this.exporters.size();
+	}
+
+	public Iterator<TGInputStreamBase> getInputStreams(){
+		return this.inputStreams.iterator();
+	}
+
+	public Iterator<TGOutputStreamBase> getOutputStreams(){
+		return this.outputStreams.iterator();
+	}
+
+	public Iterator<TGRawImporter> getImporters(){
+		return this.importers.iterator();
+	}
+
+	public Iterator<TGRawExporter> getExporters(){
+		return this.exporters.iterator();
+	}
+
+	public List<TGFileFormat> getInputFormats(){
+		List<TGFileFormat> formats = new ArrayList<TGFileFormat>();
+		Iterator<TGInputStreamBase> it = getInputStreams();
+		while(it.hasNext()){
+			TGInputStreamBase stream = it.next();
+			TGFileFormat format = stream.getFileFormat();
+			if(!existsFormat(format, formats)){
+				formats.add(format);
+			}
+		}
+		return formats;
+	}
+
+	public List<TGFileFormat> getOutputFormats(){
+		List<TGFileFormat> formats = new ArrayList<TGFileFormat>();
+		Iterator<TGOutputStreamBase> it = getOutputStreams();
+		while(it.hasNext()){
+			TGOutputStreamBase stream = it.next();
+			TGFileFormat format = stream.getFileFormat();
+			if(!existsFormat(format, formats)){
+				formats.add(format);
+			}
+		}
+		return formats;
+	}
+
+	private boolean existsFormat(TGFileFormat format,List<TGFileFormat> formats){
+		Iterator<TGFileFormat> it = formats.iterator();
+		while(it.hasNext()){
+			TGFileFormat comparator = it.next();
+			if(comparator.getName().equals(format.getName()) || comparator.getSupportedFormats().equals(format.getSupportedFormats())){
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private void addDefaultStreams(){
+		this.addInputStream(new TGInputStream());
+		this.addOutputStream(new TGOutputStream());
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGInputStreamBase.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGInputStreamBase.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGInputStreamBase.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGInputStreamBase.java
index 67c5a143..c413824d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGInputStreamBase.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGInputStreamBase.java
@@ -7,12 +7,12 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public interface TGInputStreamBase {
-	
+
 	public void init(TGFactory factory,InputStream stream);
-	
+
 	public boolean isSupportedVersion();
-	
+
 	public TGFileFormat getFileFormat();
-	
+
 	public TGSong readSong() throws TGFileFormatException,IOException;
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileExporter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGLocalFileExporter.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileExporter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGLocalFileExporter.java
index 76efc2e0..165cabaf 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileExporter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGLocalFileExporter.java
@@ -5,11 +5,11 @@
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 public interface TGLocalFileExporter extends TGRawExporter {
-	
+
 	public TGFileFormat getFileFormat();
-	
+
 	public boolean configure(boolean setDefaults);
-	
+
 	public void init(TGFactory factory,OutputStream stream);
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileImporter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGLocalFileImporter.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileImporter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGLocalFileImporter.java
index 311ab89e..436abadc 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGLocalFileImporter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGLocalFileImporter.java
@@ -5,11 +5,11 @@
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 public interface TGLocalFileImporter extends TGRawImporter {
-	
+
 	public TGFileFormat getFileFormat();
-	
+
 	public boolean configure(boolean setDefaults);
-	
+
 	public void init(TGFactory factory,InputStream stream);
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGOutputStreamBase.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGOutputStreamBase.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGOutputStreamBase.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGOutputStreamBase.java
index 2d84dc41..01512485 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGOutputStreamBase.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGOutputStreamBase.java
@@ -7,12 +7,12 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public interface TGOutputStreamBase {
-	
+
 	public void init(TGFactory factory,OutputStream stream);
-	
+
 	public boolean isSupportedExtension(String extension);
-	
+
 	public TGFileFormat getFileFormat();
-	
+
 	public void writeSong(TGSong song) throws TGFileFormatException,IOException;
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawExporter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGRawExporter.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawExporter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGRawExporter.java
index 28552c72..e78dac27 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawExporter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGRawExporter.java
@@ -3,8 +3,8 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public interface TGRawExporter {
-	
+
 	public String getExportName();
-	
+
 	public void exportSong(TGSong song) throws TGFileFormatException;
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawImporter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGRawImporter.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawImporter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGRawImporter.java
index 1c45a759..3101bad5 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGRawImporter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGRawImporter.java
@@ -3,9 +3,9 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public interface TGRawImporter {
-	
+
 	public String getImportName();
-	
+
 	public TGSong importSong() throws TGFileFormatException;
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGSongLoader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGSongLoader.java
new file mode 100644
index 00000000..343dc5ee
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGSongLoader.java
@@ -0,0 +1,45 @@
+/*
+ * Created on 19-dic-2005
+ */
+package org.herac.tuxguitar.io.base;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGSong;
+
+/**
+ * @author julian
+ */
+public class TGSongLoader {
+
+	public TGSongLoader(){
+		super();
+	}
+
+	/**
+	 * @return TGSong
+	 * @throws TGFileFormatException
+	 */
+	public TGSong load(TGFactory factory,InputStream is) throws TGFileFormatException{
+		try{
+			BufferedInputStream stream = new BufferedInputStream(is);
+			stream.mark(1);
+			Iterator<TGInputStreamBase> it = TGFileFormatManager.instance().getInputStreams();
+			while(it.hasNext()){
+				TGInputStreamBase reader = it.next();
+				reader.init(factory,stream);
+				if(reader.isSupportedVersion()){
+					return reader.readSong();
+				}
+				stream.reset();
+			}
+			stream.close();
+		}catch(Throwable t){
+			throw new TGFileFormatException(t);
+		}
+		throw new TGFileFormatException("Unsupported file format");
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGSongWriter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGSongWriter.java
new file mode 100644
index 00000000..94407ed5
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/base/TGSongWriter.java
@@ -0,0 +1,48 @@
+/*
+ * Created on 19-dic-2005
+ */
+package org.herac.tuxguitar.io.base;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGSong;
+
+/**
+ * @author julian
+ */
+public class TGSongWriter {
+
+	public TGSongWriter(){
+		super();
+	}
+
+	public void write(TGFactory factory,TGSong song,String path) throws TGFileFormatException{
+		try {
+			Iterator<TGOutputStreamBase> it = TGFileFormatManager.instance().getOutputStreams();
+			while(it.hasNext()){
+				TGOutputStreamBase writer = it.next();
+				if(isSupportedExtension(writer,path)){
+					writer.init(factory,new BufferedOutputStream(new FileOutputStream(new File(path))));
+					writer.writeSong(song);
+					return;
+				}
+			}
+		} catch (Throwable t) {
+			throw new TGFileFormatException(t);
+		}
+		throw new TGFileFormatException("Unsupported file format");
+	}
+
+	private boolean isSupportedExtension(TGOutputStreamBase writer,String path){
+		int index = path.lastIndexOf(".");
+		if(index > 0){
+			return writer.isSupportedExtension(path.substring(index));
+		}
+		return false;
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGInputStream.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGInputStream.java
new file mode 100644
index 00000000..402205b0
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGInputStream.java
@@ -0,0 +1,783 @@
+/*
+ * Created on 16-dic-2005
+ */
+package org.herac.tuxguitar.io.tg;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+
+/**
+ * @author julian
+ */
+public class TGInputStream extends TGStream implements TGInputStreamBase{
+
+	private DataInputStream dataInputStream;
+	private String version;
+	private TGFactory factory;
+
+	public TGInputStream() {
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_FORMAT_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Throwable throwable){
+			return false;
+		}
+	}
+
+	@Override
+	public TGSong readSong() throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		} catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readUnsignedByteString();
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readUnsignedByteString());
+
+		//leo el artista
+		song.setArtist(readUnsignedByteString());
+
+		//leo el album
+		song.setAlbum(readUnsignedByteString());
+
+		//leo el autor
+		song.setAuthor(readUnsignedByteString());
+
+		//leo la fecha
+		song.setDate(readUnsignedByteString());
+
+		//leo el copyright
+		song.setCopyright(readUnsignedByteString());
+
+		//leo el creador
+		song.setWriter(readUnsignedByteString());
+
+		//leo el transcriptor
+		song.setTranscriber(readUnsignedByteString());
+
+		//leo los comentarios
+		song.setComments(readIntegerString());
+
+		//leo la cantidad de canales
+		int channelCount = readByte();
+
+		//leo las canales
+		for(int i = 0;i < channelCount;i++){
+			TGChannel channel = this.factory.newChannel();
+			readChannel(channel);
+			song.addChannel(channel);
+		}
+
+		//leo la cantidad de measure headers
+		int headerCount = readShort();
+
+		//leo las pistas
+		TGMeasureHeader lastHeader = null;
+		long headerStart = TGDuration.QUARTER_TIME;
+		for(int i = 0;i < headerCount;i++){
+			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
+			song.addMeasureHeader(header);
+			headerStart += header.getLength();
+			lastHeader = header;
+		}
+
+		//leo la cantidad de pistas
+		int trackCount = readByte();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(i + 1,song));
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(int number,TGSong song){
+		//header
+		int header = readHeader();
+
+		TGTrack track = this.factory.newTrack();
+
+		track.setNumber(number);
+
+		//leo el nombre
+		track.setName(readUnsignedByteString());
+
+		//leo el solo
+		track.setSolo((header & TRACK_SOLO) != 0);
+
+		//leo el mute
+		track.setMute((header & TRACK_MUTE) != 0);
+
+		//leo el id del canal
+		track.setChannelId(readShort());
+
+		//leo la cantidad de compases
+		int measureCount = song.countMeasureHeaders();
+
+		//leo los compases
+		TGMeasure lastMeasure = null;
+		for(int i = 0;i < measureCount;i++){
+			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
+			track.addMeasure(measure);
+			lastMeasure = measure;
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readByte();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString(i + 1));
+		}
+
+		//leo el offset
+		track.setOffset(TGTrack.MIN_OFFSET + readByte());
+
+		//leo el color
+		readRGBColor(track.getColor());
+
+		//leo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			readLyrics(track.getLyrics());
+		}
+
+		return track;
+	}
+
+	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
+		int header = readHeader();
+
+		TGMeasureHeader measureHeader = this.factory.newHeader();
+		measureHeader.setNumber(number);
+		measureHeader.setStart(start);
+
+		//leo el time signature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			readTimeSignature(measureHeader.getTimeSignature());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
+		}
+
+		//leo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			readTempo(measureHeader.getTempo());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
+		}
+
+		//leo el comienzo de la repeticion
+		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
+
+		//leo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			 measureHeader.setRepeatClose(readShort());
+		}
+
+		//leo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			 measureHeader.setRepeatAlternative(readByte());
+		}
+
+		//leo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			measureHeader.setMarker(readMarker(number));
+		}
+
+		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			measureHeader.setTripletFeel(readByte());
+		}
+
+		return measureHeader;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
+		int header = readHeader();
+
+		TGMeasure measure = this.factory.newMeasure(measureHeader);
+		TGBeatData data = new TGBeatData(measure);
+
+		//leo la los beats
+		readBeats(measure, data);
+
+		//leo la clave
+		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
+		if(((header & MEASURE_CLEF) != 0)){
+			measure.setClef(readByte());
+		}
+
+		//leo el key signature
+		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			measure.setKeySignature(readByte());
+		}
+
+		return measure;
+	}
+
+	private void readChannel(TGChannel channel){
+		//leo el id
+		channel.setChannelId(readShort());
+
+		//leo el canal
+		channel.setChannel(readByte());
+
+		//leo el canal de efectos
+		channel.setEffectChannel(readByte());
+
+		//leo el banco de sonidos
+		channel.setBank(readByte());
+
+		//leo el programa
+		channel.setProgram(readByte());
+
+		//leo el volumen
+		channel.setVolume(readByte());
+
+		//leo el balance
+		channel.setBalance(readByte());
+
+		//leo el chorus
+		channel.setChorus(readByte());
+
+		//leo el reverb
+		channel.setReverb(readByte());
+
+		//leo el phaser
+		channel.setPhaser(readByte());
+
+		//leo el tremolo
+		channel.setTremolo(readByte());
+
+		//leo el nombre
+		channel.setName(readUnsignedByteString());
+	}
+
+	private void readBeats(TGMeasure measure,TGBeatData data){
+		int header = BEAT_HAS_NEXT;
+		while(((header & BEAT_HAS_NEXT) != 0)){
+			header = readHeader();
+			readBeat(header, measure, data);
+		}
+	}
+
+	private void readBeat(int header, TGMeasure measure,TGBeatData data){
+		TGBeat beat = this.factory.newBeat();
+
+		beat.setStart(data.getCurrentStart());
+
+		readVoices(header, beat, data);
+
+		//leo el stroke
+		if(((header & BEAT_HAS_STROKE) != 0)){
+			readStroke(beat.getStroke());
+		}
+
+		//leo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			readChord(beat);
+		}
+
+		//leo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			readText(beat);
+		}
+
+		measure.addBeat(beat);
+	}
+
+	private void readVoices(int header, TGBeat beat, TGBeatData data){
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+
+			beat.getVoice(i).setEmpty(true);
+
+			if(((header & (BEAT_HAS_VOICE << shift)) != 0)){
+				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
+					data.getVoice(i).setFlags( readHeader() );
+				}
+
+				int flags = data.getVoice(i).getFlags();
+
+				//leo la duracion
+				if(((flags & VOICE_NEXT_DURATION) != 0)){
+					readDuration(data.getVoice(i).getDuration());
+				}
+
+				//leo las notas
+				if(((flags & VOICE_HAS_NOTES) != 0)){
+					readNotes(beat.getVoice(i), data);
+				}
+
+				//leo la direccion
+				if(((flags & VOICE_DIRECTION_UP) != 0)){
+					beat.getVoice(i).setDirection( TGVoice.DIRECTION_UP );
+				}
+				else if(((flags & VOICE_DIRECTION_DOWN) != 0)){
+					beat.getVoice(i).setDirection( TGVoice.DIRECTION_DOWN );
+				}
+				data.getVoice(i).getDuration().copy(beat.getVoice(i).getDuration());
+				data.getVoice(i).setStart(data.getVoice(i).getStart() + beat.getVoice(i).getDuration().getTime());
+
+				beat.getVoice(i).setEmpty(false);
+			}
+		}
+	}
+
+	private void readNotes(TGVoice voice,TGBeatData data){
+		int header = NOTE_HAS_NEXT;
+		while(((header & NOTE_HAS_NEXT) != 0)){
+			header = readHeader();
+			readNote(header, voice, data);
+		}
+	}
+
+	private void readNote(int header,TGVoice voice,TGBeatData data){
+		TGNote note = this.factory.newNote();
+
+		//leo el valor
+		note.setValue(readByte());
+
+		//leo la cuerda
+		note.setString(readByte());
+
+		//leo la ligadura
+		note.setTiedNote((header & NOTE_TIED) != 0);
+
+		//leo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			data.getVoice(voice.getIndex()).setVelocity(readByte());
+		}
+		note.setVelocity(data.getVoice(voice.getIndex()).getVelocity());
+
+		//leo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			readNoteEffect(note.getEffect());
+		}
+
+		voice.addNote(note);
+	}
+
+	private void readChord(TGBeat beat){
+		TGChord chord = this.factory.newChord(readByte());
+
+		//leo el nombre
+		chord.setName( readUnsignedByteString() );
+
+		//leo el primer fret
+		chord.setFirstFret(readByte());
+
+		//leo las cuerdas
+		for(int string = 0; string < chord.countStrings(); string ++){
+			chord.addFretValue(string, readByte());
+		}
+		beat.setChord(chord);
+	}
+
+	private void readText(TGBeat beat){
+		TGText text = this.factory.newText();
+
+		//leo el texto
+		text.setValue(readUnsignedByteString());
+
+		beat.setText(text);
+	}
+
+	private TGString readInstrumentString(int number){
+		TGString string = this.factory.newString();
+
+		string.setNumber(number);
+
+		//leo el valor
+		string.setValue(readByte());
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readShort());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readByte());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		int header = readHeader();
+
+		// leo el puntillo
+		duration.setDotted((header & DURATION_DOTTED) != 0);
+
+		//leo el doble puntillo
+		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
+
+		//leo el valor
+		duration.setValue(readByte());
+
+		//leo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			readDivisionType(duration.getDivision());
+		}
+		else{
+			TGDivisionType.NORMAL.copy(duration.getDivision());
+		}
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readByte());
+
+		//leo los tiempos
+		divisionType.setTimes(readByte());
+	}
+
+	private void readStroke(TGStroke stroke){
+		//leo la direccion
+		stroke.setDirection( readByte() );
+
+		//leo el valor
+		stroke.setValue( readByte() );
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		int header = readHeader(3);
+
+		//leo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			effect.setBend(readBendEffect());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			effect.setTremoloBar(readTremoloBarEffect());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			effect.setHarmonic(readHarmonicEffect());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			effect.setGrace(readGraceEffect());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			effect.setTrill(readTrillEffect());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			effect.setTremoloPicking(readTremoloPickingEffect());
+		}
+
+		//vibrato
+		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
+
+		//dead note
+		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
+
+		//slide
+		effect.setSlide(((header & EFFECT_SLIDE) != 0));
+
+		//hammer-on/pull-off
+		effect.setHammer(((header & EFFECT_HAMMER) != 0));
+
+		//ghost note
+		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
+
+		//accentuated note
+		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
+
+		//heavy accentuated note
+		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
+
+		//palm mute
+		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
+
+		//staccato
+		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
+
+		//tapping
+		effect.setTapping(((header & EFFECT_TAPPING) != 0));
+
+		//slapping
+		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
+
+		//popping
+		effect.setPopping(((header & EFFECT_POPPING) != 0));
+
+		//fade in
+		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
+
+		//let ring
+		effect.setLetRing(((header & EFFECT_LET_RING) != 0));
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value = readByte();
+
+			//agrego el punto
+			bend.addPoint(position,value);
+		}
+		return bend;
+	}
+
+	private TGEffectTremoloBar readTremoloBarEffect(){
+		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
+
+			//agrego el punto
+			tremoloBar.addPoint(position,value);
+		}
+		return tremoloBar;
+	}
+
+	private TGEffectHarmonic readHarmonicEffect(){
+		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
+
+		//leo el tipo
+		effect.setType(readByte());
+
+		//leo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			effect.setData(readByte());
+		}
+		return effect;
+	}
+
+	private TGEffectGrace readGraceEffect(){
+		int header = readHeader();
+
+		TGEffectGrace effect = this.factory.newEffectGrace();
+
+		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
+
+		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.setDuration(readByte());
+
+		//leo el velocity
+		effect.setDynamic(readByte());
+
+		//leo la transicion
+		effect.setTransition(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTremoloPicking readTremoloPickingEffect(){
+		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTrill readTrillEffect(){
+		TGEffectTrill effect = this.factory.newEffectTrill();
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGMarker readMarker(int measure){
+		TGMarker marker = this.factory.newMarker();
+
+		marker.setMeasure(measure);
+
+		//leo el titulo
+		marker.setTitle(readUnsignedByteString());
+
+		//leo el color
+		readRGBColor(marker.getColor());
+
+		return marker;
+	}
+
+	private void readRGBColor(TGColor color){
+		//leo el RGB
+		color.setR((readByte() & 0xff));
+		color.setG((readByte() & 0xff));
+		color.setB((readByte() & 0xff));
+	}
+
+	private void readLyrics(TGLyric lyrics){
+		//leo el compas de comienzo
+		lyrics.setFrom(readShort());
+
+		//leo el texto
+		lyrics.setLyrics(readIntegerString());
+	}
+
+	private byte readByte(){
+		try {
+			return (byte)this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(int bCount){
+		int header = 0;
+		for(int i = bCount; i > 0; i --){
+			header += ( readHeader() << ( (8 * i) - 8 ) );
+		}
+		return header;
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readUnsignedByteString(){
+		try {
+			return readString( (this.dataInputStream.read() & 0xFF ));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readIntegerString(){
+		try {
+			return readString(this.dataInputStream.readInt());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readString(int length){
+		try {
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGOutputStream.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGOutputStream.java
new file mode 100644
index 00000000..787c1db3
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGOutputStream.java
@@ -0,0 +1,724 @@
+/*
+ * Created on 16-dic-2005
+ */
+package org.herac.tuxguitar.io.tg;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGOutputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend.BendPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar.TremoloBarPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+/**
+ * @author julian
+ */
+public class TGOutputStream extends TGStream implements TGOutputStreamBase{
+
+	private DataOutputStream dataOutputStream;
+
+	@Override
+	public boolean isSupportedExtension(String extension) {
+		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
+	}
+
+	@Override
+	public void init(TGFactory factory,OutputStream stream) {
+		this.dataOutputStream = new DataOutputStream(stream);
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	@Override
+	public void writeSong(TGSong song) throws IOException{
+		this.writeVersion();
+		this.write(song);
+		this.dataOutputStream.flush();
+		this.dataOutputStream.close();
+	}
+
+	private void writeVersion(){
+		writeUnsignedByteString(TG_FORMAT_VERSION);
+	}
+
+	private void write(TGSong song){
+		//escribo el nombre
+		writeUnsignedByteString(song.getName());
+
+		//escribo el artista
+		writeUnsignedByteString(song.getArtist());
+
+		//escribo el album
+		writeUnsignedByteString(song.getAlbum());
+
+		//escribo el autor
+		writeUnsignedByteString(song.getAuthor());
+
+		//escribo la fecha
+		writeUnsignedByteString(song.getDate());
+
+		//escribo el copyright
+		writeUnsignedByteString(song.getCopyright());
+
+		//escribo el creador
+		writeUnsignedByteString(song.getWriter());
+
+		//escribo el transcriptor
+		writeUnsignedByteString(song.getTranscriber());
+
+		//escribo los comentarios
+		writeIntegerString(song.getComments());
+
+		//escribo la cantidad de canales
+		writeByte(song.countChannels());
+
+		//escribo las canales
+		for(int i = 0;i < song.countChannels();i++){
+			writeChannel(song.getChannel(i));
+		}
+
+		//escribo la cantidad de measure headers
+		writeShort((short)song.countMeasureHeaders());
+
+		//escribo las pistas
+		TGMeasureHeader lastHeader = null;
+		Iterator<TGMeasureHeader> headers = song.getMeasureHeaders();
+		while(headers.hasNext()){
+			TGMeasureHeader header = headers.next();
+			writeMeasureHeader(header,lastHeader);
+			lastHeader = header;
+		}
+
+		//escribo la cantidad de pistas
+		writeByte(song.countTracks());
+
+		//escribo las pistas
+		for(int i = 0;i < song.countTracks();i++){
+			writeTrack(song.getTrack(i));
+		}
+	}
+
+	private void writeTrack(TGTrack track){
+		//header
+		int header = 0;
+		if (track.isSolo()) {
+			header |= TRACK_SOLO;
+		}
+		if (track.isMute()) {
+			header |= TRACK_MUTE;
+		}
+		if(!track.getLyrics().isEmpty()){
+			header |= TRACK_LYRICS;
+		}
+		writeHeader(header);
+
+		//escribo el nombre
+		writeUnsignedByteString(track.getName());
+
+		//escribo el id del canal
+		writeShort((short)track.getChannelId());
+
+		//escribo los compases
+		TGMeasure lastMeasure = null;
+		Iterator<TGMeasure> measures  = track.getMeasures();
+		while(measures.hasNext()){
+			TGMeasure measure = measures.next();
+			writeMeasure(measure,lastMeasure);
+			lastMeasure = measure;
+		}
+
+		//escribo la cantidad de cuerdas
+		writeByte(track.getStrings().size());
+
+		//escribo las cuerdas
+		Iterator<TGString> stringIt  = track.getStrings().iterator();
+		while(stringIt.hasNext()){
+			TGString string = stringIt.next();
+			writeInstrumentString(string);
+		}
+
+		//escribo el offset
+		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
+
+		//escribo el color
+		writeRGBColor(track.getColor());
+
+		//escribo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			writeLyrics(track.getLyrics());
+		}
+	}
+
+	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
+		int header = 0;
+		if(lastMeasureHeader == null){
+			header |= MEASURE_HEADER_TIMESIGNATURE;
+			header |= MEASURE_HEADER_TEMPO;
+			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}else{
+			//Time Signature
+			int numerator = measureheader.getTimeSignature().getNumerator();
+			int value = measureheader.getTimeSignature().getDenominator().getValue();
+			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
+			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
+			if(numerator != prevNumerator || value != prevValue){
+				header |= MEASURE_HEADER_TIMESIGNATURE;
+			}
+			//Tempo
+			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
+				header |= MEASURE_HEADER_TEMPO;
+			}
+			//Triplet Feel
+			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}
+		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
+		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
+		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
+		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
+
+		writeHeader(header);
+
+		//escribo el timeSignature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			writeTimeSignature(measureheader.getTimeSignature());
+		}
+
+		//escribo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			writeTempo(measureheader.getTempo());
+		}
+
+		//escribo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			writeShort((short)measureheader.getRepeatClose());
+		}
+
+		//escribo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			writeByte(measureheader.getRepeatAlternative());
+		}
+
+		//escribo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			writeMarker(measureheader.getMarker());
+		}
+
+		//escribo el triplet feel
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			writeByte(measureheader.getTripletFeel());
+		}
+	}
+
+	private void writeMeasure(TGMeasure measure,TGMeasure lastMeasure){
+		int header = 0;
+		if(lastMeasure == null){
+			header |= MEASURE_CLEF;
+			header |= MEASURE_KEYSIGNATURE;
+		}else{
+			//Clef
+			if(measure.getClef() != lastMeasure.getClef()){
+				header |= MEASURE_CLEF;
+			}
+			//KeySignature
+			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
+				header |= MEASURE_KEYSIGNATURE;
+			}
+		}
+		//escribo la cabecera
+		writeHeader(header);
+
+		//escribo los beats
+		TGBeatData data = new TGBeatData(measure);
+		writeBeats(measure, data);
+
+		//escribo la clave
+		if(((header & MEASURE_CLEF) != 0)){
+			writeByte(measure.getClef());
+		}
+
+		//escribo el key signature
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			writeByte(measure.getKeySignature());
+		}
+	}
+
+	private void writeChannel(TGChannel channel){
+		//escribo el id
+		writeShort((short)channel.getChannelId());
+
+		//escribo el canal
+		writeByte(channel.getChannel());
+
+		//escribo el canal de efectos
+		writeByte(channel.getEffectChannel());
+
+		//escribo el banco de sonidos
+		writeByte(channel.getBank());
+
+		//escribo el programa
+		writeByte(channel.getProgram());
+
+		//escribo el volumen
+		writeByte(channel.getVolume());
+
+		//escribo el balance
+		writeByte(channel.getBalance());
+
+		//escribo el chorus
+		writeByte(channel.getChorus());
+
+		//escribo el reverb
+		writeByte(channel.getReverb());
+
+		//escribo el phaser
+		writeByte(channel.getPhaser());
+
+		//escribo el tremolo
+		writeByte(channel.getTremolo());
+
+		//escribo el nombre
+		writeUnsignedByteString(channel.getName());
+	}
+
+	private void writeBeats(TGMeasure measure,TGBeatData data){
+		int count = measure.countBeats();
+		for(int i = 0; i < count; i ++){
+			TGBeat beat = measure.getBeat(i);
+			writeBeat(beat,data, (i + 1 < count ));
+		}
+	}
+
+	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
+		int header = hasNext ? BEAT_HAS_NEXT : 0;
+
+		//Berifico si hay cambios en las voces
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+			if(!beat.getVoice(i).isEmpty()){
+				header |= ( BEAT_HAS_VOICE << shift );
+
+				int flags = ( beat.getVoice(i).isRestVoice() ? 0 : VOICE_HAS_NOTES );
+				if(!beat.getVoice(i).getDuration().isEqual(data.getVoice(i).getDuration())){
+					flags |= VOICE_NEXT_DURATION;
+					data.getVoice(i).setDuration(beat.getVoice(i).getDuration());
+				}
+				if(beat.getVoice(i).getDirection() != TGVoice.DIRECTION_NONE ){
+					if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_UP ){
+						flags |= VOICE_DIRECTION_UP;
+					}
+					else if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_DOWN ){
+						flags |= VOICE_DIRECTION_DOWN;
+					}
+				}
+				if( data.getVoice(i).getFlags() != flags ){
+					header |= ( BEAT_HAS_VOICE_CHANGES << shift );
+					data.getVoice(i).setFlags( flags );
+				}
+			}
+
+		}
+		//Berifico si tiene stroke
+		if(beat.getStroke().getDirection() != TGStroke.STROKE_NONE){
+			header |= BEAT_HAS_STROKE;
+		}
+		//Berifico si tiene acorde
+		if(beat.getChord() != null){
+			header |= BEAT_HAS_CHORD;
+		}
+		//Berifico si tiene texto
+		if(beat.getText() != null){
+			header |= BEAT_HAS_TEXT;
+		}
+
+		// escribo la cabecera
+		writeHeader(header);
+
+		//escribo las voces
+		writeVoices(header, beat, data);
+
+		//escribo el stroke
+		if(((header & BEAT_HAS_STROKE) != 0)){
+			writeStroke(beat.getStroke());
+		}
+
+		//escribo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			writeChord(beat.getChord());
+		}
+
+		//escribo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			writeText(beat.getText());
+		}
+	}
+
+	private void writeVoices(int header, TGBeat beat,TGBeatData data){
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+			if((( header & (BEAT_HAS_VOICE << shift)) != 0)){
+
+				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
+					writeHeader( data.getVoice(i).getFlags() );
+				}
+
+				//escribo la duracion
+				if((( data.getVoice(i).getFlags() & VOICE_NEXT_DURATION) != 0)){
+					writeDuration(beat.getVoice(i).getDuration());
+				}
+
+				//escribo las notas
+				if((( data.getVoice(i).getFlags() & VOICE_HAS_NOTES) != 0)){
+					writeNotes(beat.getVoice(i), data);
+				}
+			}
+		}
+	}
+
+	private void writeNotes(TGVoice voice,TGBeatData data){
+		for( int i = 0 ; i < voice.countNotes() ; i ++){
+			TGNote note = voice.getNote(i);
+
+			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
+			header = (note.isTiedNote())?header |= NOTE_TIED:header;
+			if(note.getVelocity() != data.getVoice(voice.getIndex()).getVelocity()){
+				data.getVoice(voice.getIndex()).setVelocity(note.getVelocity());
+				header |= NOTE_VELOCITY;
+			}
+			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
+
+			writeHeader(header);
+
+			writeNote(header,note);
+		}
+	}
+
+	private void writeNote(int header,TGNote note){
+		//escribo el valor
+		writeByte(note.getValue());
+
+		//escribo la cuerda
+		writeByte(note.getString());
+
+		//escribo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			writeByte(note.getVelocity());
+		}
+
+		//escribo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			writeNoteEffect(note.getEffect());
+		}
+	}
+
+	private void writeStroke(TGStroke stroke){
+		//escribo la direccion
+		writeByte(stroke.getDirection());
+
+		//escribo el valor
+		writeByte(stroke.getValue());
+	}
+
+	private void writeChord(TGChord chord){
+		//escribo la cantidad de cuerdas
+		writeByte(chord.countStrings());
+
+		//escribo el nombre
+		writeUnsignedByteString(chord.getName());
+
+		//escribo el primer fret
+		writeByte(chord.getFirstFret());
+
+		//escribo el valor de cada cuerda
+		for(int string = 0; string < chord.countStrings(); string ++){
+			writeByte(chord.getFretValue(string));
+		}
+	}
+
+	private void writeText(TGText text){
+		//escribo el texto
+		writeUnsignedByteString(text.getValue());
+	}
+
+	private void writeInstrumentString(TGString string){
+		//escribo el valor
+		writeByte(string.getValue());
+	}
+
+	private void writeTempo(TGTempo tempo){
+		//escribo el valor
+		writeShort((short)tempo.getValue());
+	}
+
+	private void writeTimeSignature(TGTimeSignature timeSignature){
+		//escribo el numerador
+		writeByte(timeSignature.getNumerator());
+
+		//escribo el denominador
+		writeDuration(timeSignature.getDenominator());
+	}
+
+	private void writeDuration(TGDuration duration){
+		int header = 0;
+		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
+		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
+		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLET:header;
+		writeHeader(header);
+
+		//escribo el valor
+		writeByte(duration.getValue());
+
+		//escribo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			writeDivisionType(duration.getDivision());
+		}
+	}
+
+	private void writeDivisionType(TGDivisionType divisionType){
+		//escribo los enters
+		writeByte(divisionType.getEnters());
+
+		//escribo los tiempos
+		writeByte(divisionType.getTimes());
+	}
+
+	private void writeNoteEffect(TGNoteEffect effect){
+		int header = 0;
+
+		header = (effect.isBend())?header |= EFFECT_BEND:header;
+		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
+		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
+		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
+		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
+		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
+		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
+		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
+		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
+		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
+		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
+		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
+		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
+		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
+		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
+		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
+		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
+		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
+		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
+		header = (effect.isLetRing())?header |= EFFECT_LET_RING:header;
+
+		writeHeader(header,3);
+
+		//escribo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			writeBendEffect(effect.getBend());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			writeTremoloBarEffect(effect.getTremoloBar());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			writeHarmonicEffect(effect.getHarmonic());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			writeGraceEffect(effect.getGrace());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			writeTrillEffect(effect.getTrill());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			writeTremoloPickingEffect(effect.getTremoloPicking());
+		}
+	}
+
+	private void writeBendEffect(TGEffectBend effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<BendPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectBend.BendPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte(point.getValue());
+		}
+	}
+
+	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<TremoloBarPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectTremoloBar.TremoloBarPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
+		}
+	}
+
+	private void writeHarmonicEffect(TGEffectHarmonic effect){
+		//excribo el tipo
+		writeByte(effect.getType());
+
+		//excribo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			writeByte(effect.getData());
+		}
+	}
+
+	private void writeGraceEffect(TGEffectGrace effect){
+		int header = 0;
+		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
+		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
+
+		//excribo el header
+		writeHeader(header);
+
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration());
+
+		//excribo el velocity
+		writeByte(effect.getDynamic());
+
+		//excribo la transicion
+		writeByte(effect.getTransition());
+	}
+
+	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeTrillEffect(TGEffectTrill effect){
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeMarker(TGMarker marker){
+		//escribo el titulo
+		writeUnsignedByteString(marker.getTitle());
+
+		//escribo el color
+		writeRGBColor(marker.getColor());
+	}
+
+	private void writeRGBColor(TGColor color){
+		//escribo el RGB
+		writeByte(color.getR());
+		writeByte(color.getG());
+		writeByte(color.getB());
+	}
+
+	private void writeLyrics(TGLyric lyrics){
+		//escribo el compas de comienzo
+		writeShort((short)lyrics.getFrom());
+
+		//escribo el texto
+		writeIntegerString(lyrics.getLyrics());
+	}
+
+	public void writeByte(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeUnsignedByteString(String v){
+		try {
+			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
+			this.dataOutputStream.write(byteString.length());
+			this.dataOutputStream.writeChars(byteString);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeIntegerString(String v){
+		try {
+			this.dataOutputStream.writeInt(v.length());
+			this.dataOutputStream.writeChars(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v,int bCount){
+		for(int i = bCount; i > 0; i --){
+			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
+		}
+	}
+
+	public void writeShort(short v){
+		try {
+			this.dataOutputStream.writeShort(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGStream.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGStream.java
new file mode 100644
index 00000000..4a1be260
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/io/tg/TGStream.java
@@ -0,0 +1,205 @@
+package org.herac.tuxguitar.io.tg;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGVelocities;
+import org.herac.tuxguitar.util.TGVersion;
+
+public class TGStream {
+
+	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
+
+	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + TGVersion.CURRENT.getVersion() );
+
+	public static final String TG_FORMAT_EXTENSION = (".tg");
+
+	protected static final int TRACK_SOLO = 0x01;
+
+	protected static final int TRACK_MUTE = 0x02;
+
+	protected static final int TRACK_LYRICS = 0x04;
+
+	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
+
+	protected static final int MEASURE_HEADER_TEMPO = 0x02;
+
+	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
+
+	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
+
+	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
+
+	protected static final int MEASURE_HEADER_MARKER = 0x20;
+
+	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
+
+	protected static final int MEASURE_CLEF = 0x01;
+
+	protected static final int MEASURE_KEYSIGNATURE = 0x02;
+
+	protected static final int BEAT_HAS_NEXT = 0x01;
+
+	protected static final int BEAT_HAS_STROKE = 0x02;
+
+	protected static final int BEAT_HAS_CHORD = 0x04;
+
+	protected static final int BEAT_HAS_TEXT = 0x08;
+
+	protected static final int BEAT_HAS_VOICE = 0x10;
+
+	protected static final int BEAT_HAS_VOICE_CHANGES = 0x20;
+
+	protected static final int VOICE_HAS_NOTES = 0x01;
+
+	protected static final int VOICE_NEXT_DURATION = 0x02;
+
+	protected static final int VOICE_DIRECTION_UP = 0x04;
+
+	protected static final int VOICE_DIRECTION_DOWN = 0x08;
+
+	protected static final int NOTE_HAS_NEXT = 0x01;
+
+	protected static final int NOTE_TIED = 0x02;
+
+	protected static final int NOTE_EFFECT = 0x04;
+
+	protected static final int NOTE_VELOCITY = 0x08;
+
+	protected static final int DURATION_DOTTED = 0x01;
+
+	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
+
+	protected static final int DURATION_NO_TUPLET = 0x04;
+
+	protected static final int EFFECT_BEND = 0x000001;
+
+	protected static final int EFFECT_TREMOLO_BAR = 0x000002;
+
+	protected static final int EFFECT_HARMONIC = 0x000004;
+
+	protected static final int EFFECT_GRACE = 0x000008;
+
+	protected static final int EFFECT_TRILL = 0x000010;
+
+	protected static final int EFFECT_TREMOLO_PICKING = 0x000020;
+
+	protected static final int EFFECT_VIBRATO = 0x000040;
+
+	protected static final int EFFECT_DEAD = 0x000080;
+
+	protected static final int EFFECT_SLIDE = 0x000100;
+
+	protected static final int EFFECT_HAMMER = 0x000200;
+
+	protected static final int EFFECT_GHOST = 0x000400;
+
+	protected static final int EFFECT_ACCENTUATED = 0x000800;
+
+	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x001000;
+
+	protected static final int EFFECT_PALM_MUTE = 0x002000;
+
+	protected static final int EFFECT_STACCATO = 0x004000;
+
+	protected static final int EFFECT_TAPPING = 0x008000;
+
+	protected static final int EFFECT_SLAPPING = 0x010000;
+
+	protected static final int EFFECT_POPPING = 0x020000;
+
+	protected static final int EFFECT_FADE_IN = 0x040000;
+
+	protected static final int EFFECT_LET_RING = 0x080000;
+
+	protected static final int GRACE_FLAG_DEAD = 0x01;
+
+	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
+
+	protected class TGBeatData {
+		private long currentStart;
+		private TGVoiceData[] voices;
+
+		protected TGBeatData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.currentStart = measure.getStart();
+			this.voices = new TGVoiceData[TGBeat.MAX_VOICES];
+			for(int i = 0 ; i < this.voices.length ; i ++ ){
+				this.voices[i] = new TGVoiceData(measure);
+			}
+		}
+
+		protected TGVoiceData getVoice(int index){
+			return this.voices[index];
+		}
+
+		public long getCurrentStart(){
+			long minimumStart = -1;
+			for(int i = 0 ; i < this.voices.length ; i ++ ){
+				if( this.voices[i].getStart() > this.currentStart ){
+					if( minimumStart < 0 || this.voices[i].getStart() < minimumStart ){
+						minimumStart = this.voices[i].getStart();
+					}
+				}
+			}
+			if( minimumStart > this.currentStart ){
+				this.currentStart = minimumStart;
+			}
+			return this.currentStart;
+		}
+	}
+
+	protected class TGVoiceData {
+		private long start;
+		private int velocity;
+		private int flags;
+		private TGDuration duration;
+
+		protected TGVoiceData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.flags = 0;
+			this.setStart(measure.getStart());
+			this.setVelocity(TGVelocities.DEFAULT);
+			this.setDuration(new TGFactory().newDuration());
+		}
+
+		public TGDuration getDuration() {
+			return this.duration;
+		}
+
+		public void setDuration(TGDuration duration) {
+			this.duration = duration;
+		}
+
+		public long getStart() {
+			return this.start;
+		}
+
+		public void setStart(long start) {
+			this.start = start;
+		}
+
+		public int getVelocity() {
+			return this.velocity;
+		}
+
+		public void setVelocity(int velocity) {
+			this.velocity = velocity;
+		}
+
+		public int getFlags() {
+			return this.flags;
+		}
+
+		public void setFlags(int flags) {
+			this.flags = flags;
+		}
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MeasureSequencer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MeasureSequencer.java
new file mode 100644
index 00000000..1f5760cb
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MeasureSequencer.java
@@ -0,0 +1,219 @@
+package org.herac.tuxguitar.player.base;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGSong;
+
+/**
+ * Provide a sequence of measure headers according to the music notation.
+ * @author bayo
+ */
+public class MeasureSequencer implements Iterator<TGMeasureHeader> {
+
+	private final TGSong song;
+
+	private final Integer startMeasure;
+	private final Integer endMeasure;
+	private TGMeasureHeader next;
+
+	private int index;
+
+	private int repeatStart;
+	private int repeatEnd;
+	private int repeatCount;
+	private int repeatNumber;
+
+	private Map<Integer, Integer> repeatAlternates;
+
+
+	public MeasureSequencer(TGSong song) {
+		this(song, null, null);
+	}
+
+	public MeasureSequencer(TGSong song, Integer startMeasure, Integer endMeasure) {
+		this.song = song;
+		this.startMeasure = startMeasure;
+		this.endMeasure = endMeasure;
+		this.index = (this.startMeasure != null) ? this.startMeasure : 0;
+		if (this.index < 0) {
+			throw new IllegalArgumentException("Start measure header index must be positive");
+		}
+		this.next = first();
+	}
+
+	/**
+	 * Return the very first element, else null if no element exists
+	 * @return A measure header, else null if not found.
+	 */
+	private TGMeasureHeader first() {
+		if (this.song == null) {
+			return null;
+		}
+		if (this.index < 0) {
+			return null;
+		}
+		if (this.index >= this.song.countMeasureHeaders()) {
+			return null;
+		}
+		return this.song.getMeasureHeader(this.index);
+	}
+
+	/**
+	 * Extract first index of each alternative repeat between 2 measure header index
+	 * @param begin
+	 * @param end
+	 * @return A map from alternative number to index
+	 */
+	private Map<Integer, Integer> extractRepeatAlternate(int begin, int end) {
+		Map<Integer, Integer> result = new HashMap<Integer, Integer>();
+
+		for (int i = begin; i < end; i++) {
+			TGMeasureHeader header = this.song.getMeasureHeader(i);
+			int alternateFlag = header.getRepeatAlternative();
+			if (i == begin && alternateFlag == 0) {
+				result.put(0, begin);
+			}
+			int alternative = 0;
+			while (alternateFlag != 0) {
+				alternative++;
+				if ((alternateFlag & 1) != 0) {
+					if (!result.containsKey(alternative)) {
+						result.put(alternative, i);
+					}
+				}
+				alternateFlag >>= 1;
+			}
+		}
+
+		return result;
+	}
+
+	private int findRepeatEnd(int index) {
+		int current = index;
+		while (current < this.song.countMeasureHeaders()) {
+			TGMeasureHeader header = this.song.getMeasureHeader(current);
+			if (header.getRepeatClose() > 0) {
+				break;
+			}
+			current++;
+		}
+		return current;
+	}
+
+	/**
+	 * Find last index measure header containing alternate loop after the end of the loop
+	 * @param first index which can contain alternate
+	 * @param count number of repeat
+	 * @return index after last alternate (if result = index there is no alternates)
+	 */
+	private int findAlternateEnd(int index, int count) {
+		int current = index;
+		while (current < this.song.countMeasureHeaders()) {
+			TGMeasureHeader header = this.song.getMeasureHeader(current);
+			if (header.isRepeatOpen()) {
+				break;
+			}
+			if (header.getRepeatAlternative() == 0) {
+				break;
+			}
+			current++;
+		}
+		return current;
+	}
+
+	private TGMeasureHeader internalNext() {
+
+		// initialize repeat
+		TGMeasureHeader header = this.song.getMeasureHeader(this.index);
+		if (header.isRepeatOpen() && this.repeatAlternates == null) {
+			this.repeatStart = this.index;
+			this.repeatNumber = 0;
+			this.repeatEnd = findRepeatEnd(this.index);
+			if (this.repeatEnd < this.song.countMeasureHeaders()) {
+				TGMeasureHeader end = this.song.getMeasureHeader(this.repeatEnd);
+				this.repeatCount = end.getRepeatClose();
+				this.repeatEnd++;
+				this.repeatEnd = findAlternateEnd(this.repeatEnd, this.repeatCount);
+				this.repeatAlternates = extractRepeatAlternate(this.repeatStart, this.repeatEnd);
+			} else {
+				// ignore loop
+				this.repeatAlternates = null;
+			}
+		}
+
+		if (this.repeatAlternates != null) {
+			// it is a loop
+			Integer index = null;
+			if (this.index == this.repeatEnd - 1) {
+				// end of this alternate
+				this.repeatNumber++;
+				index = this.repeatAlternates.get(0);
+				if (index == null) {
+					index = this.repeatAlternates.get(this.repeatNumber+1);
+				}
+			} else {
+				int currentAlternate = header.getRepeatAlternative();
+				TGMeasureHeader next = this.song.getMeasureHeader(this.index + 1);
+				if (currentAlternate == next.getRepeatAlternative()) {
+					index = this.index + 1;
+				} else if (currentAlternate == 0) {
+					// begin of the alternate
+					index = this.repeatAlternates.get(this.repeatNumber+1);
+				} else {
+					// end of this alternate
+					this.repeatNumber++;
+					index = this.repeatAlternates.get(0);
+					if (index == null) {
+						index = this.repeatAlternates.get(this.repeatNumber+1);
+					}
+				}
+			}
+
+			if (index == null || this.repeatNumber > this.repeatCount) {
+				// reset the loop
+				this.index = this.repeatEnd;
+				this.repeatAlternates = null;
+			} else {
+				this.index = index;
+			}
+		} else {
+			// it is not a loop
+			this.index++;
+		}
+
+		if (this.endMeasure != null && this.index >= this.endMeasure) {
+			return null;
+		}
+
+		if (this.index >= this.song.countMeasureHeaders()) {
+			return null;
+		} else {
+			return this.song.getMeasureHeader(this.index);
+		}
+	}
+
+	@Override
+	public boolean hasNext() {
+		return this.next != null;
+	}
+
+	@Override
+	public TGMeasureHeader next() {
+		TGMeasureHeader tmp = this.next;
+		this.next = internalNext();
+		return tmp;
+	}
+
+	@Override
+	public void remove() {
+		throw new UnsupportedOperationException();
+	}
+
+	public TGSong getTGSong() {
+		return this.song;
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiControllers.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiControllers.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiControllers.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiControllers.java
index 09871b06..a0dd6d91 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiControllers.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiControllers.java
@@ -1,31 +1,31 @@
 package org.herac.tuxguitar.player.base;
 
 public class MidiControllers {
-	
+
 	public static final int BANK_SELECT = 0x00;
-	
+
 	public static final int VOLUME = 0x07;
-	
+
 	public static final int BALANCE = 0x0A;
-	
+
 	public static final int EXPRESSION = 0x0B;
-	
+
 	public static final int REVERB = 0x5B;
-	
+
 	public static final int TREMOLO = 0x5C;
-	
+
 	public static final int CHORUS = 0x5D;
-	
+
 	public static final int PHASER = 0x5F;
-	
+
 	public static final int DATA_ENTRY_MSB = 0x06;
-	
+
 	public static final int DATA_ENTRY_LSB = 0x26;
-	
+
 	public static final int RPN_LSB = 0x64 ;
-	
+
 	public static final int RPN_MSB = 0x65 ;
-	
+
 	public static final int ALL_NOTES_OFF = 0x7B;
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiDevice.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiDevice.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiDevice.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiDevice.java
index e93601ad..c8d02656 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiDevice.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiDevice.java
@@ -1,14 +1,14 @@
 package org.herac.tuxguitar.player.base;
 
 public interface MidiDevice {
-	
+
 	public String getKey();
-	
+
 	public String getName();
-	
+
 	public void open() throws MidiPlayerException;
-	
+
 	public void close() throws MidiPlayerException;
-	
+
 	public void check() throws MidiPlayerException;
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiInstrument.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiInstrument.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiInstrument.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiInstrument.java
index 648a0eb8..879f2a37 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiInstrument.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiInstrument.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.player.base;
 
 public class MidiInstrument {
-	
+
 	public static final MidiInstrument[] INSTRUMENT_LIST = new MidiInstrument[]{
 		new MidiInstrument("Piano"),
 		new MidiInstrument("Bright Piano"),
@@ -132,13 +132,13 @@ public class MidiInstrument {
 		new MidiInstrument("Applause"),
 		new MidiInstrument("Gunshot")
 	};
-	
+
 	private String name;
-	
+
 	public MidiInstrument(String name){
 		this.name = name;
 	}
-	
+
 	public String getName(){
 		return this.name;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPort.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPort.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPort.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPort.java
index bcb1f798..f023bd5f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPort.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPort.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.player.base;
 
 public interface MidiOutputPort extends MidiDevice {
-	
+
 	public MidiReceiver getReceiver() throws MidiPlayerException;
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
new file mode 100644
index 00000000..bda9f7a7
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
@@ -0,0 +1,11 @@
+package org.herac.tuxguitar.player.base;
+
+import java.util.List;
+
+public interface MidiOutputPortProvider {
+
+	public List<MidiOutputPort> listPorts() throws MidiPlayerException;
+
+	public void closeAll() throws MidiPlayerException;
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPercussion.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPercussion.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPercussion.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPercussion.java
index 66040606..7acec2f7 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPercussion.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPercussion.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.player.base;
 
 public class MidiPercussion {
-	
+
 	public static final MidiPercussion[] PERCUSSION_LIST = new MidiPercussion[]{
 		new MidiPercussion(35,"Acoustic Bass Drum"),
 		new MidiPercussion(36,"Bass Drum 1"),
@@ -51,19 +51,19 @@ public class MidiPercussion {
 		new MidiPercussion(80,"Mute Triangle"),
 		new MidiPercussion(81,"Open Triangle"),
 	};
-	
+
 	private int value;
 	private String name;
-	
+
 	public MidiPercussion(int value,String name){
 		this.value = value;
 		this.name = name;
 	}
-	
+
 	public int getValue(){
 		return this.value;
 	}
-	
+
 	public String getName(){
 		return this.name;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayer.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayer.java
index 1aebbcf0..2bac438a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayer.java
@@ -10,91 +10,90 @@
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGString;
 import org.herac.tuxguitar.song.models.TGTrack;
 import org.herac.tuxguitar.util.TGLock;
 
 public class MidiPlayer{
-	
+
 	private static final int MAX_CHANNELS = 16;
-	
+
 	public static final int MAX_VOLUME = 10;
-	
+
 	private static final int TIMER_DELAY = 10;
-	
+
 	private TGSongManager songManager;
-	
+
 	private MidiSequencer sequencer;
-	
+
 	private MidiTransmitter outputTransmitter;
-	
+
 	private MidiOutputPort outputPort;
-	
+
 	private MidiPlayerMode mode;
-	
+
 	private MidiPlayerCountDown countDown;
-	
+
 	private String sequencerKey;
-	
+
 	private String outputPortKey;
-	
-	private List outputPortProviders;
-	
-	private List sequencerProviders;
-	
-	private List listeners;
-	
+
+	private List<MidiOutputPortProvider> outputPortProviders;
+
+	private List<MidiSequencerProvider> sequencerProviders;
+
+	private List<MidiPlayerListener> listeners;
+
 	private int volume;
-	
+
 	private boolean running;
-	
+
 	private boolean paused;
-	
+
 	private boolean changeTickPosition;
-	
+
 	private boolean metronomeEnabled;
-	
+
 	private int metronomeTrack;
-	
+
 	private int infoTrack;
-	
+
 	private int loopSHeader;
-	
+
 	private int loopEHeader;
-	
+
 	private long loopSPosition;
-	
+
 	private boolean anySolo;
-	
+
 	protected long tickLength;
-	
+
 	protected long tickPosition;
-	
+
 	protected TGLock lock = new TGLock();
-	
+
 	public MidiPlayer() {
 		this.lock = new TGLock();
 		this.volume = MAX_VOLUME;
 	}
-	
+
 	public void init(TGSongManager songManager) {
 		this.songManager = songManager;
-		this.outputPortProviders = new ArrayList();
-		this.sequencerProviders = new ArrayList();
-		this.listeners = new ArrayList();
+		this.outputPortProviders = new ArrayList<MidiOutputPortProvider>();
+		this.sequencerProviders = new ArrayList<MidiSequencerProvider>();
+		this.listeners = new ArrayList<MidiPlayerListener>();
 		this.getSequencer();
 		this.getMode();
 		this.reset();
 	}
-	
+
 	public MidiInstrument[] getInstruments(){
 		return MidiInstrument.INSTRUMENT_LIST;
 	}
-	
+
 	public MidiPercussion[] getPercussions(){
 		return MidiPercussion.PERCUSSION_LIST;
 	}
-	
+
 	public void reset(){
 		this.stop();
 		this.lock.lock();
@@ -102,7 +101,7 @@ public void reset(){
 		this.setChangeTickPosition(false);
 		this.lock.unlock();
 	}
-	
+
 	public void close(){
 		try {
 			this.closeSequencer();
@@ -111,7 +110,7 @@ public void close(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void stopSequencer() {
 		try{
 			if( this.getSequencer().isRunning() ){
@@ -121,25 +120,25 @@ public void stopSequencer() {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void stop(boolean paused) {
 		this.setPaused(paused);
 		this.stopSequencer();
 		this.setRunning(false);
 	}
-	
+
 	public void stop() {
 		this.stop(false);
 	}
-	
+
 	public void pause(){
 		this.stop(true);
 	}
-	
+
 	public synchronized void play() throws MidiPlayerException{
 		try {
 			this.lock.lock();
-			
+
 			final boolean notifyStarted = (!this.isRunning());
 			this.setRunning(true);
 			this.stopSequencer();
@@ -152,32 +151,33 @@ public synchronized void play() throws MidiPlayerException{
 			this.updateDefaultControllers();
 			this.setMetronomeEnabled(isMetronomeEnabled());
 			this.changeTickPosition();
-			
+
 			new Thread(new Runnable() {
+				@Override
 				public synchronized void run() {
 					try {
 						MidiPlayer.this.lock.lock();
-						
+
 						if( notifyStarted ){
 							MidiPlayer.this.notifyStarted();
 						}
-						
+
 						if( MidiPlayer.this.getCountDown().isEnabled() ){
 							MidiPlayer.this.notifyCountDownStarted();
 							MidiPlayer.this.getCountDown().start();
 							MidiPlayer.this.notifyCountDownStopped();
 						}
-						
+
 						if( MidiPlayer.this.isRunning() ){
 							if( MidiPlayer.this.isChangeTickPosition() ){
 								MidiPlayer.this.changeTickPosition();
 							}
 							MidiPlayer.this.getSequencer().start();
 						}
-						
+
 						MidiPlayer.this.tickLength = getSequencer().getTickLength();
 						MidiPlayer.this.tickPosition = getSequencer().getTickPosition();
-						
+
 						Object sequencerLock = new Object();
 						while (getSequencer().isRunning() && isRunning()) {
 							synchronized(sequencerLock) {
@@ -185,11 +185,11 @@ public synchronized void run() {
 									changeTickPosition();
 								}
 								MidiPlayer.this.tickPosition = getSequencer().getTickPosition();
-								
+
 								sequencerLock.wait( TIMER_DELAY );
 							}
 						}
-						
+
 						//FINISH
 						if(isRunning()){
 							if(MidiPlayer.this.tickPosition >= (MidiPlayer.this.tickLength - (TGDuration.QUARTER_TIME / 2) )){
@@ -198,7 +198,7 @@ public synchronized void run() {
 								stop(isPaused());
 							}
 						}
-						
+
 						if( !isRunning() ){
 							MidiPlayer.this.notifyStopped();
 						}
@@ -217,7 +217,7 @@ public synchronized void run() {
 			this.lock.unlock();
 		}
 	}
-	
+
 	protected void finish(){
 		try {
 			if(this.getMode().isLoop()){
@@ -233,7 +233,7 @@ protected void finish(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void updateLoop( boolean force ){
 		if( force || !this.isRunning() ){
 			this.loopSHeader = -1;
@@ -252,41 +252,41 @@ public void updateLoop( boolean force ){
 			}
 		}
 	}
-	
+
 	public int getLoopSHeader() {
 		return this.loopSHeader;
 	}
-	
+
 	public int getLoopEHeader() {
 		return this.loopEHeader;
 	}
-	
+
 	public long getLoopSPosition() {
 		return this.loopSPosition;
 	}
-	
+
 	public void checkDevices() throws Throwable {
 		this.getSequencer().check();
 		if( this.getOutputPort() != null ){
 			this.getOutputPort().check();
 		}
 	}
-	
+
 	public int getVolume() {
 		return this.volume;
 	}
-	
+
 	public void setVolume(int volume) {
 		this.volume = volume;
 		if (this.isRunning()) {
 			this.updateControllers();
 		}
 	}
-	
+
 	public void setRunning(boolean running) {
 		this.running = running;
 	}
-	
+
 	public boolean isRunning() {
 		try {
 			return (this.running || this.getSequencer().isRunning());
@@ -295,32 +295,32 @@ public boolean isRunning() {
 		}
 		return false;
 	}
-	
+
 	public boolean isPaused() {
 		return this.paused;
 	}
-	
+
 	public void setPaused(boolean paused) {
 		this.paused = paused;
 	}
-	
+
 	protected boolean isChangeTickPosition() {
 		return this.changeTickPosition;
 	}
-	
+
 	private void setChangeTickPosition(boolean changeTickPosition) {
 		this.changeTickPosition = changeTickPosition;
 	}
-	
+
 	public void setTickPosition(long position) {
 		this.tickPosition = position;
 		this.setChangeTickPosition(true);
 	}
-	
+
 	public long getTickPosition() {
 		return this.tickPosition;
 	}
-	
+
 	protected void changeTickPosition(){
 		try{
 			if(isRunning()){
@@ -334,10 +334,10 @@ protected void changeTickPosition(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void addSequence() {
 		try{
-			MidiSequenceParser parser = new MidiSequenceParser(this.songManager,MidiSequenceParser.DEFAULT_PLAY_FLAGS,getMode().getCurrentPercent(),0);		
+			MidiSequenceParser parser = new MidiSequenceParser(this.songManager,MidiSequenceParser.DEFAULT_PLAY_FLAGS,getMode().getCurrentPercent(),0);
 			MidiSequenceHandler sequence = getSequencer().createSequence(this.songManager.getSong().countTracks() + 2);
 			parser.setSHeader( getLoopSHeader() );
 			parser.setEHeader( getLoopEHeader() );
@@ -348,7 +348,7 @@ public void addSequence() {
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void updateDefaultControllers(){
 		try{
 			for(int channel = 0; channel < MAX_CHANNELS;channel ++){
@@ -362,22 +362,22 @@ private void updateDefaultControllers(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void updatePrograms() {
-		Iterator it = this.songManager.getSong().getChannels();
+		Iterator<TGChannel> it = this.songManager.getSong().getChannels();
 		while(it.hasNext()){
-			updateProgram((TGChannel)it.next());
+			updateProgram(it.next());
 		}
 	}
-	
+
 	private void updateProgram(TGChannel channel) {
 		this.updateProgram(channel.getChannel(), channel.getBank(), channel.getProgram());
-		
+
 		if( channel.getChannel() != channel.getEffectChannel()){
 			this.updateProgram(channel.getEffectChannel(), channel.getBank(), channel.getProgram());
 		}
 	}
-	
+
 	private void updateProgram(int channel, int bank, int program) {
 		try{
 			if( bank >= 0 && bank <= 127 ){
@@ -390,13 +390,13 @@ private void updateProgram(int channel, int bank, int program) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void updateControllers() {
 		boolean percussionUpdated = false;
-		
-		Iterator channelsIt = this.songManager.getSong().getChannels();
+
+		Iterator<TGChannel> channelsIt = this.songManager.getSong().getChannels();
 		while( channelsIt.hasNext() ){
-			TGChannel channel = (TGChannel) channelsIt.next();
+			TGChannel channel = channelsIt.next();
 			this.updateController(channel);
 			percussionUpdated = (percussionUpdated || channel.isPercussionChannel());
 		}
@@ -411,7 +411,7 @@ public void updateControllers() {
 		}
 		this.afterUpdate();
 	}
-	
+
 	private void updateController(TGChannel channel) {
 		int volume = (int)((this.getVolume() / 10.00) * channel.getVolume());
 		int balance = channel.getBalance();
@@ -419,13 +419,13 @@ private void updateController(TGChannel channel) {
 		int reverb = channel.getReverb();
 		int phaser = channel.getPhaser();
 		int tremolo = channel.getTremolo();
-		
+
 		updateController(channel.getChannel(),volume,balance,chorus,reverb,phaser,tremolo,127);
 		if(channel.getChannel() != channel.getEffectChannel()){
 			updateController(channel.getEffectChannel(),volume,balance,chorus,reverb,phaser,tremolo,127);
 		}
 	}
-	
+
 	private void updateController(int channel,int volume,int balance,int chorus, int reverb,int phaser, int tremolo, int expression) {
 		try{
 			getOutputTransmitter().sendControlChange(channel,MidiControllers.VOLUME,volume);
@@ -439,20 +439,20 @@ private void updateController(int channel,int volume,int balance,int chorus, int
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void updateTracks() {
 		this.anySolo = false;
-		
-		Iterator tracksIt = this.songManager.getSong().getTracks();
+
+		Iterator<TGTrack> tracksIt = this.songManager.getSong().getTracks();
 		while( tracksIt.hasNext() ){
-			TGTrack track = (TGTrack)tracksIt.next();
+			TGTrack track = tracksIt.next();
 			this.updateTrack(track);
 			this.anySolo = ((!this.anySolo)?track.isSolo():this.anySolo);
 		}
-		
+
 		this.afterUpdate();
 	}
-	
+
 	private void updateTrack(TGTrack track) {
 		try{
 			getSequencer().setMute(track.getNumber(),track.isMute());
@@ -461,7 +461,7 @@ private void updateTrack(TGTrack track) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void afterUpdate(){
 		try{
 			getSequencer().setSolo(this.infoTrack,this.anySolo);
@@ -470,11 +470,11 @@ private void afterUpdate(){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public boolean isMetronomeEnabled() {
 		return this.metronomeEnabled;
 	}
-	
+
 	public void setMetronomeEnabled(boolean metronomeEnabled) {
 		try{
 			this.metronomeEnabled = metronomeEnabled;
@@ -484,16 +484,16 @@ public void setMetronomeEnabled(boolean metronomeEnabled) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void playBeat(TGBeat beat) {
-		List notes = new ArrayList();
+		List<TGNote> notes = new ArrayList<TGNote>();
 		for( int v = 0; v < beat.countVoices(); v ++){
 			notes.addAll( beat.getVoice(v).getNotes() );
 		}
 		playBeat(beat.getMeasure().getTrack(), notes);
 	}
-	
-	public void playBeat(TGTrack track,final List notes) {
+
+	public void playBeat(TGTrack track,final List<TGNote> notes) {
 		TGChannel tgChannel = this.songManager.getChannel(track.getChannelId());
 		if( tgChannel != null ){
 			int channel = tgChannel.getChannel();
@@ -508,18 +508,18 @@ public void playBeat(TGTrack track,final List notes) {
 			int size = notes.size();
 			int[][] beat = new int[size][2];
 			for(int i = 0; i < size; i ++){
-				TGNote note = (TGNote)notes.get(i);
-				beat[i][0] = track.getOffset() + (note.getValue() + ((TGString)track.getStrings().get(note.getString() - 1)).getValue());
+				TGNote note = notes.get(i);
+				beat[i][0] = track.getOffset() + (note.getValue() + track.getStrings().get(note.getString() - 1).getValue());
 				beat[i][1] = note.getVelocity();
 			}
 			playBeat(channel,bank,program,volume,balance,chorus,reverb,phaser,tremolo,beat);
 		}
 	}
-	
+
 	public void playBeat(int channel,int bank,int program,int volume,int balance,int chorus, int reverb,int phaser,int tremolo,int[][] beat) {
 		playBeat(channel, bank, program, volume, balance, chorus, reverb, phaser, tremolo, beat,500,0);
 	}
-	
+
 	public void playBeat(int channel,int bank,int program,int volume,int balance,int chorus, int reverb,int phaser,int tremolo,int[][] beat,long duration,int interval) {
 		try {
 			getOutputTransmitter().sendControlChange(channel,MidiControllers.BANK_SELECT,bank);
@@ -530,7 +530,7 @@ public void playBeat(int channel,int bank,int program,int volume,int balance,int
 			getOutputTransmitter().sendControlChange(channel,MidiControllers.PHASER,phaser);
 			getOutputTransmitter().sendControlChange(channel,MidiControllers.TREMOLO,tremolo);
 			getOutputTransmitter().sendProgramChange(channel,program);
-			
+
 			for(int i = 0; i < beat.length; i ++){
 				getOutputTransmitter().sendNoteOn(channel,beat[i][0], beat[i][1]);
 				if(interval > 0){
@@ -545,43 +545,43 @@ public void playBeat(int channel,int bank,int program,int volume,int balance,int
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public TGSongManager getSongManager(){
 		return this.songManager;
 	}
-	
+
 	public MidiPlayerMode getMode(){
 		if(this.mode == null){
 			this.mode = new MidiPlayerMode();
 		}
 		return this.mode;
 	}
-	
+
 	public MidiPlayerCountDown getCountDown(){
 		if( this.countDown == null ){
 			this.countDown = new MidiPlayerCountDown(this);
 		}
 		return this.countDown;
 	}
-	
+
 	public MidiTransmitter getOutputTransmitter(){
 		if (this.outputTransmitter == null) {
 			this.outputTransmitter = new MidiTransmitter();
 		}
 		return this.outputTransmitter;
 	}
-	
+
 	public MidiOutputPort getOutputPort(){
 		return this.outputPort;
 	}
-	
+
 	public MidiSequencer getSequencer(){
 		if (this.sequencer == null) {
 			this.sequencer = new MidiSequencerEmpty();
 		}
 		return this.sequencer;
 	}
-	
+
 	public boolean loadSequencer(MidiSequencer sequencer){
 		try{
 			this.closeSequencer();
@@ -594,7 +594,7 @@ public boolean loadSequencer(MidiSequencer sequencer){
 		}
 		return true;
 	}
-	
+
 	public boolean loadOutputPort(MidiOutputPort port){
 		try{
 			this.closeOutputPort();
@@ -607,22 +607,22 @@ public boolean loadOutputPort(MidiOutputPort port){
 		}
 		return true;
 	}
-	
+
 	public void openOutputPort(String key) {
 		this.openOutputPort(key, false);
 	}
-	
+
 	public void openOutputPort(String key, boolean tryFirst) {
 		this.outputPortKey = key;
 		this.openOutputPort(listOutputPorts(),tryFirst);
 	}
-	
-	public void openOutputPort(List ports, boolean tryFirst) {
+
+	public void openOutputPort(List<MidiOutputPort> ports, boolean tryFirst) {
 		try{
 			if(this.outputPortKey != null && !this.isOutputPortOpen(this.outputPortKey)){
 				this.closeOutputPort();
 				for(int i = 0; i < ports.size(); i ++){
-					MidiOutputPort port = (MidiOutputPort)ports.get(i);
+					MidiOutputPort port = ports.get(i);
 					if(port.getKey().equals(this.outputPortKey)){
 						if(this.loadOutputPort(port)){
 							return;
@@ -631,17 +631,17 @@ public void openOutputPort(List ports, boolean tryFirst) {
 				}
 			}
 			if(getOutputPort() == null && !ports.isEmpty() && tryFirst){
-				this.loadOutputPort( (MidiOutputPort)ports.get(0) );
+				this.loadOutputPort( ports.get(0) );
 			}
 		}catch(Throwable throwable){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public void openSequencer(String key) {
 		this.openSequencer(key, false);
 	}
-	
+
 	public void openSequencer(String key, boolean tryFirst) {
 		try{
 			this.sequencerKey = key;
@@ -650,13 +650,13 @@ public void openSequencer(String key, boolean tryFirst) {
 			throwable.printStackTrace();
 		}
 	}
-	
-	public void openSequencer(List sequencers ,boolean tryFirst) throws MidiPlayerException {
+
+	public void openSequencer(List<MidiSequencer> sequencers ,boolean tryFirst) throws MidiPlayerException {
 		try{
 			if(this.sequencerKey != null && !this.isSequencerOpen(this.sequencerKey)){
 				this.closeSequencer();
 				for(int i = 0; i < sequencers.size(); i ++){
-					MidiSequencer sequencer = (MidiSequencer)sequencers.get(i);
+					MidiSequencer sequencer = sequencers.get(i);
 					if(sequencer.getKey().equals(this.sequencerKey)){
 						if(this.loadSequencer(sequencer)){
 							return;
@@ -664,22 +664,22 @@ public void openSequencer(List sequencers ,boolean tryFirst) throws MidiPlayerEx
 					}
 				}
 			}
-			
+
 			if(getSequencer() instanceof MidiSequencerEmpty && !sequencers.isEmpty() && tryFirst){
-				this.loadSequencer( (MidiSequencer) sequencers.get(0));
+				this.loadSequencer( sequencers.get(0));
 			}
-			
+
 		}catch(Throwable throwable){
 			throw new MidiPlayerException(throwable.getMessage(),throwable);
 		}
 	}
-	
-	public List listOutputPorts() {
-		List ports = new ArrayList();
-		Iterator it = this.outputPortProviders.iterator();
+
+	public List<MidiOutputPort> listOutputPorts() {
+		List<MidiOutputPort> ports = new ArrayList<MidiOutputPort>();
+		Iterator<MidiOutputPortProvider> it = this.outputPortProviders.iterator();
 		while(it.hasNext()){
 			try{
-				MidiOutputPortProvider provider = (MidiOutputPortProvider)it.next();
+				MidiOutputPortProvider provider = it.next();
 				ports.addAll(provider.listPorts());
 			}catch(Throwable throwable){
 				throwable.printStackTrace();
@@ -687,13 +687,13 @@ public List listOutputPorts() {
 		}
 		return ports;
 	}
-	
-	public List listSequencers(){
-		List sequencers = new ArrayList();
-		Iterator it = this.sequencerProviders.iterator();
+
+	public List<MidiSequencer> listSequencers(){
+		List<MidiSequencer> sequencers = new ArrayList<MidiSequencer>();
+		Iterator<MidiSequencerProvider> it = this.sequencerProviders.iterator();
 		while(it.hasNext()){
 			try{
-				MidiSequencerProvider provider = (MidiSequencerProvider)it.next();
+				MidiSequencerProvider provider = it.next();
 				sequencers.addAll(provider.listSequencers());
 			}catch(Throwable throwable){
 				throwable.printStackTrace();
@@ -701,7 +701,7 @@ public List listSequencers(){
 		}
 		return sequencers;
 	}
-	
+
 	public void closeSequencer() throws MidiPlayerException{
 		try{
 			if(this.isRunning()){
@@ -717,7 +717,7 @@ public void closeSequencer() throws MidiPlayerException{
 			throw new MidiPlayerException(throwable.getMessage(),throwable);
 		}
 	}
-	
+
 	public void closeOutputPort(){
 		try{
 			if(this.isRunning()){
@@ -734,7 +734,7 @@ public void closeOutputPort(){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public boolean isSequencerOpen(String key){
 		if(key != null){
 			String currentKey = getSequencer().getKey();
@@ -745,7 +745,7 @@ public boolean isSequencerOpen(String key){
 		}
 		return false;
 	}
-	
+
 	public boolean isOutputPortOpen(String key){
 		if(key != null && getOutputPort() != null ){
 			String currentKey = getOutputPort().getKey();
@@ -756,33 +756,33 @@ public boolean isOutputPortOpen(String key){
 		}
 		return false;
 	}
-	
+
 	public void addOutputPortProvider(MidiOutputPortProvider provider) throws MidiPlayerException {
 		this.addOutputPortProvider(provider, false);
 	}
-	
+
 	public void addOutputPortProvider(MidiOutputPortProvider provider, boolean tryFirst) throws MidiPlayerException {
 		this.outputPortProviders.add(provider);
 		this.openOutputPort(provider.listPorts(),tryFirst);
 	}
-	
+
 	public void addSequencerProvider(MidiSequencerProvider provider) throws MidiPlayerException {
 		this.addSequencerProvider(provider, false);
 	}
-	
+
 	public void addSequencerProvider(MidiSequencerProvider provider, boolean tryFirst) throws MidiPlayerException {
 		this.sequencerProviders.add(provider);
 		this.openSequencer(provider.listSequencers(), tryFirst);
 	}
-	
+
 	public void removeOutputPortProvider(MidiOutputPortProvider provider) throws MidiPlayerException {
 		this.outputPortProviders.remove(provider);
-		
+
 		MidiOutputPort current = getOutputPort();
 		if( current != null ){
-			Iterator it = provider.listPorts().iterator();
+			Iterator<MidiOutputPort> it = provider.listPorts().iterator();
 			while(it.hasNext()){
-				MidiOutputPort port = (MidiOutputPort)it.next();
+				MidiOutputPort port = it.next();
 				if(port.getKey().equals(current.getKey())){
 					closeOutputPort();
 					break;
@@ -790,15 +790,15 @@ public void removeOutputPortProvider(MidiOutputPortProvider provider) throws Mid
 			}
 		}
 	}
-	
+
 	public void removeSequencerProvider(MidiSequencerProvider provider) throws MidiPlayerException {
 		this.sequencerProviders.remove(provider);
-		
+
 		MidiSequencer current = getSequencer();
 		if(!(current instanceof MidiSequencerEmpty) && current != null){
-			Iterator it = provider.listSequencers().iterator();
+			Iterator<MidiSequencer> it = provider.listSequencers().iterator();
 			while(it.hasNext()){
-				MidiSequencer sequencer = (MidiSequencer)it.next();
+				MidiSequencer sequencer = it.next();
 				if(current.getKey().equals(sequencer.getKey())){
 					closeSequencer();
 					break;
@@ -806,55 +806,55 @@ public void removeSequencerProvider(MidiSequencerProvider provider) throws MidiP
 			}
 		}
 	}
-	
+
 	public void addListener( MidiPlayerListener listener ){
 		if( !this.listeners.contains( listener ) ){
 			this.listeners.add( listener );
 		}
 	}
-	
+
 	public void removeListener( MidiPlayerListener listener ){
 		if( this.listeners.contains( listener ) ){
 			this.listeners.remove( listener );
 		}
 	}
-	
+
 	public void notifyStarted(){
-		Iterator it = this.listeners.iterator();
+		Iterator<MidiPlayerListener> it = this.listeners.iterator();
 		while( it.hasNext() ){
-			MidiPlayerListener listener = (MidiPlayerListener) it.next();
+			MidiPlayerListener listener = it.next();
 			listener.notifyStarted();
 		}
 	}
-	
+
 	public void notifyStopped(){
-		Iterator it = this.listeners.iterator();
+		Iterator<MidiPlayerListener> it = this.listeners.iterator();
 		while( it.hasNext() ){
-			MidiPlayerListener listener = (MidiPlayerListener) it.next();
+			MidiPlayerListener listener = it.next();
 			listener.notifyStopped();
 		}
 	}
-	
+
 	public void notifyCountDownStarted(){
-		Iterator it = this.listeners.iterator();
+		Iterator<MidiPlayerListener> it = this.listeners.iterator();
 		while( it.hasNext() ){
-			MidiPlayerListener listener = (MidiPlayerListener) it.next();
+			MidiPlayerListener listener = it.next();
 			listener.notifyCountDownStarted();
 		}
 	}
-	
+
 	public void notifyCountDownStopped(){
-		Iterator it = this.listeners.iterator();
+		Iterator<MidiPlayerListener> it = this.listeners.iterator();
 		while( it.hasNext() ){
-			MidiPlayerListener listener = (MidiPlayerListener) it.next();
+			MidiPlayerListener listener = it.next();
 			listener.notifyCountDownStopped();
 		}
 	}
-	
+
 	public void notifyLoop(){
-		Iterator it = this.listeners.iterator();
+		Iterator<MidiPlayerListener> it = this.listeners.iterator();
 		while( it.hasNext() ){
-			MidiPlayerListener listener = (MidiPlayerListener) it.next();
+			MidiPlayerListener listener = it.next();
 			listener.notifyLoop();
 		}
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerCountDown.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerCountDown.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerCountDown.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerCountDown.java
index 0c56bc1d..4f28eeb4 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerCountDown.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerCountDown.java
@@ -6,32 +6,32 @@
 import org.herac.tuxguitar.song.models.TGVelocities;
 
 public class MidiPlayerCountDown {
-	
+
 	private MidiPlayer player;
 	private boolean enabled;
 	private boolean running;
-	
+
 	public MidiPlayerCountDown(MidiPlayer player){
 		this.player = player;
 		this.enabled = false;
 	}
-	
+
 	public void start(){
 		try {
 			this.running = true;
-			
+
 			TGMeasureHeader header = this.findMeasureHeader();
 			if( header != null ){
 				Object timerLock = new Object();
-				
+
 				int  tgTempo = header.getTempo().getValue();
 				long tgLength = header.getTimeSignature().getDenominator().getTime();
 				long tickLength = (long)(1000.00 * (60.00 / tgTempo * tgLength) / TGDuration.QUARTER_TIME);
 				long tickStart = System.currentTimeMillis();
-				
+
 				int tickIndex = 0;
 				int tickCount = header.getTimeSignature().getNumerator();
-				
+
 				while( this.isRunning() && tickIndex <= tickCount ){
 						long currentTime = System.currentTimeMillis();
 						if( tickStart <= currentTime ){
@@ -50,29 +50,29 @@ public void start(){
 					}
 				}
 			}
-			
+
 			this.running = false;
 		} catch (Throwable throwable) {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public TGMeasureHeader findMeasureHeader(){
 		long tick = this.player.getTickPosition();
 		long startPoint = this.player.getLoopSPosition();
 		long start = startPoint;
 		long length = 0;
-		
+
 		TGSong song = this.player.getSongManager().getSong();
 		MidiRepeatController controller = new MidiRepeatController(song, this.player.getLoopSHeader() , this.player.getLoopEHeader() );
 		while(!controller.finished()){
 			TGMeasureHeader header = song.getMeasureHeader(controller.getIndex());
 			controller.process();
 			if(controller.shouldPlay()){
-				
+
 				start += length;
 				length = header.getLength();
-				
+
 				//verifico si es el compas correcto
 				if(tick >= start && tick < (start + length )){
 					return header;
@@ -81,15 +81,15 @@ public TGMeasureHeader findMeasureHeader(){
 		}
 		return null;
 	}
-	
+
 	public boolean isRunning() {
 		return (this.enabled && this.running && this.player.isRunning() && !this.player.isChangeTickPosition());
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerException.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerException.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerException.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerException.java
index 84a03564..9b14f4c8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerException.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerException.java
@@ -1,15 +1,15 @@
 package org.herac.tuxguitar.player.base;
 
 public class MidiPlayerException extends Exception{
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public MidiPlayerException(String message) {
 		super(message);
 	}
-	
+
 	public MidiPlayerException(String message, Throwable cause) {
 		super(message, cause);
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerListener.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerListener.java
similarity index 96%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerListener.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerListener.java
index a7b0f2ce..a8b65725 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerListener.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerListener.java
@@ -1,14 +1,14 @@
 package org.herac.tuxguitar.player.base;
 
 public interface MidiPlayerListener {
-	
+
 	public void notifyStarted();
-	
+
 	public void notifyStopped();
-	
+
 	public void notifyCountDownStarted();
-	
+
 	public void notifyCountDownStopped();
-	
+
 	public void notifyLoop();
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerMode.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerMode.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerMode.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerMode.java
index c33c910c..b181ed44 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiPlayerMode.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiPlayerMode.java
@@ -1,12 +1,12 @@
 package org.herac.tuxguitar.player.base;
 
 public class MidiPlayerMode{
-	
+
 	public static final int DEFAULT_TEMPO_PERCENT = 100;
-	
+
 	public static final int TYPE_SIMPLE = 1;
 	public static final int TYPE_CUSTOM = 2;
-	
+
 	private int type;
 	private boolean loop;
 	private int loopSHeader;
@@ -16,11 +16,11 @@ public class MidiPlayerMode{
 	private int customPercentTo;
 	private int customPercentIncrement;
 	private int currentPercent;
-	
+
 	public MidiPlayerMode(){
 		this.clear();
 	}
-	
+
 	public void clear(){
 		this.loop = false;
 		this.type = TYPE_SIMPLE;
@@ -32,7 +32,7 @@ public void clear(){
 		this.loopEHeader = -1;
 		this.reset();
 	}
-	
+
 	public void reset(){
 		if(getType() == TYPE_SIMPLE){
 			this.setCurrentPercent(getSimplePercent());
@@ -41,7 +41,7 @@ else if(getType() == TYPE_CUSTOM){
 			this.setCurrentPercent(getCustomPercentFrom());
 		}
 	}
-	
+
 	public void notifyLoop(){
 		if(getType() == TYPE_SIMPLE){
 			this.setCurrentPercent(getSimplePercent());
@@ -50,75 +50,75 @@ else if(getType() == TYPE_CUSTOM){
 			this.setCurrentPercent(Math.min(getCustomPercentTo(),(getCurrentPercent() + getCustomPercentIncrement())));
 		}
 	}
-	
+
 	public int getCurrentPercent(){
 		return this.currentPercent;
 	}
-	
+
 	public void setCurrentPercent(int currentPercent){
 		this.currentPercent = currentPercent;
 	}
-	
+
 	public boolean isLoop() {
 		return this.loop;
 	}
-	
+
 	public void setLoop(boolean loop) {
 		this.loop = loop;
 	}
-	
+
 	public int getType() {
 		return this.type;
 	}
-	
+
 	public void setType(int type) {
 		this.type = type;
 	}
-	
+
 	public int getCustomPercentFrom() {
 		return this.customPercentFrom;
 	}
-	
+
 	public void setCustomPercentFrom(int customPercentFrom) {
 		this.customPercentFrom = customPercentFrom;
 	}
-	
+
 	public int getCustomPercentIncrement() {
 		return this.customPercentIncrement;
 	}
-	
+
 	public void setCustomPercentIncrement(int customPercentIncrement) {
 		this.customPercentIncrement = customPercentIncrement;
 	}
-	
+
 	public int getCustomPercentTo() {
 		return this.customPercentTo;
 	}
-	
+
 	public void setCustomPercentTo(int customPercentTo) {
 		this.customPercentTo = customPercentTo;
 	}
-	
+
 	public int getSimplePercent() {
 		return this.simplePercent;
 	}
-	
+
 	public void setSimplePercent(int simplePercent) {
 		this.simplePercent = simplePercent;
 	}
-	
+
 	public int getLoopSHeader() {
 		return this.loopSHeader;
 	}
-	
+
 	public void setLoopSHeader(int loopSHeader) {
 		this.loopSHeader = loopSHeader;
 	}
-	
+
 	public int getLoopEHeader() {
 		return this.loopEHeader;
 	}
-	
+
 	public void setLoopEHeader(int loopEHeader) {
 		this.loopEHeader = loopEHeader;
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiReceiver.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiReceiver.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiReceiver.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiReceiver.java
index 880e8a3d..ca177821 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiReceiver.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiReceiver.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.player.base;
 
 public interface MidiReceiver {
-	
+
 	public void sendAllNotesOff() throws MidiPlayerException;
-	
+
 	public void sendNoteOn(int channel, int key, int velocity) throws MidiPlayerException;
-	
+
 	public void sendNoteOff(int channel, int key, int velocity) throws MidiPlayerException;
-	
+
 	public void sendProgramChange(int channel, int value) throws MidiPlayerException;
-	
+
 	public void sendControlChange(int channel, int controller, int value) throws MidiPlayerException;
-	
+
 	public void sendPitchBend(int channel, int value) throws MidiPlayerException;
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiRepeatController.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiRepeatController.java
new file mode 100644
index 00000000..e57c08f4
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiRepeatController.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.player.base;
+
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGSong;
+
+public class MidiRepeatController {
+
+	private final TGSong song;
+	private TGMeasureHeader header;
+	private TGMeasureHeader previous;
+	private final MeasureSequencer sequencer;
+	private int repeatMove;
+
+	public MidiRepeatController(TGSong song, int startHeader , int endHeader){
+		this.song = song;
+		this.sequencer = new MeasureSequencer(song, startHeader==-1?null:startHeader, endHeader==-1?null:endHeader);
+		if (this.sequencer.hasNext()) {
+			this.header = this.sequencer.next();
+		}
+		this.repeatMove = 0;
+	}
+
+	/**
+	 * Find next index measure
+	 */
+	public void process() {
+		if (this.sequencer.hasNext()) {
+			this.previous = this.header;
+			this.header = this.sequencer.next();
+			if (this.previous != null && this.header != null && this.previous.getNumber() != this.header.getNumber() - 1) {
+				this.repeatMove -= this.header.getStart() - this.header.getLength() - this.previous.getStart();
+			}
+		} else {
+			this.header = null;
+		}
+	}
+
+	public boolean finished(){
+		return this.header == null;
+	}
+
+	public boolean shouldPlay(){
+		return true;
+	}
+
+	public int getIndex(){
+		return this.header.getNumber() - 1;
+	}
+
+	public long getRepeatMove(){
+		return this.repeatMove;
+	}
+
+	public TGSong getTGSong() {
+		return this.song;
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceHandler.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
index b4df3942..01f39d53 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceHandler.java
@@ -3,30 +3,30 @@
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 
 public abstract class MidiSequenceHandler {
-	
+
 	private int tracks;
-	
+
 	public MidiSequenceHandler(int tracks){
 		this.tracks = tracks;
 	}
-	
+
 	public int getTracks() {
 		return this.tracks;
 	}
-	
+
 	public abstract void addNoteOn(long tick,int track,int channel,int note,int velocity);
-	
+
 	public abstract void addNoteOff(long tick,int track,int channel,int note,int velocity);
-	
+
 	public abstract void addControlChange(long tick,int track,int channel,int controller,int value);
-	
+
 	public abstract void addProgramChange(long tick,int track,int channel,int instrument);
-	
+
 	public abstract void addPitchBend(long tick,int track,int channel,int value);
-	
+
 	public abstract void addTempoInUSQ(long tick,int track,int usq);
-	
+
 	public abstract void addTimeSignature(long tick,int track,TGTimeSignature ts);
-	
+
 	public abstract void notifyFinish();
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceParser.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceParser.java
similarity index 94%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceParser.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceParser.java
index c77d3c1a..f8169016 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequenceParser.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequenceParser.java
@@ -1,8 +1,5 @@
 /*
  * Created on 13-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.player.base;
 
@@ -16,35 +13,34 @@
 import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
 import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGString;
 import org.herac.tuxguitar.song.models.TGStroke;
 import org.herac.tuxguitar.song.models.TGTempo;
 import org.herac.tuxguitar.song.models.TGTrack;
 import org.herac.tuxguitar.song.models.TGVelocities;
 import org.herac.tuxguitar.song.models.TGVoice;
 import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend.BendPoint;
 import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
 import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar.TremoloBarPoint;
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class MidiSequenceParser {
-	
+
 	private static final int DEFAULT_METRONOME_KEY = 37;
-	
+
 	private static final int DEFAULT_DURATION_PM = 60;
-	
+
 	private static final int DEFAULT_DURATION_DEAD = 30;
-	
+
 	private static final int DEFAULT_BEND = 64;
-	
+
 	private static final float DEFAULT_BEND_SEMI_TONE = 2.75f;
-	
+
 	/**
-	 * flag para agregar los controles por defecto, 
+	 * flag para agregar los controles por defecto,
 	 * no se recomienda usar este flag si el reproductor asigna estos controles en tiempo real.
 	 */
 	public static final int ADD_DEFAULT_CONTROLS = 0x01;
@@ -63,19 +59,19 @@ public class MidiSequenceParser {
 	 * asignando este flag, es posible crear el primer tick en cero.
 	 */
 	public static final int ADD_FIRST_TICK_MOVE = 0x08;
-	
+
 	public static final int DEFAULT_PLAY_FLAGS = (ADD_METRONOME);
-	
+
 	public static final int DEFAULT_EXPORT_FLAGS = (ADD_FIRST_TICK_MOVE | ADD_DEFAULT_CONTROLS | ADD_MIXER_MESSAGES);
-	
+
 	/**
 	 * Song Manager
 	 */
-	private TGSongManager manager;
+	private final TGSongManager manager;
 	/**
 	 * flags
 	 */
-	private int flags;
+	private final int flags;
 	/**
 	 * Index of info track
 	 */
@@ -84,17 +80,17 @@ public class MidiSequenceParser {
 	 * Index of metronome track
 	 */
 	private int metronomeTrack;
-	
-	private int firstTickMove;
-	
-	private int tempoPercent;
-	
-	private int transpose;
-	
+
+	private final int firstTickMove;
+
+	private final int tempoPercent;
+
+	private final int transpose;
+
 	private int sHeader;
-	
+
 	private int eHeader;
-	
+
 	public MidiSequenceParser(TGSongManager manager,int flags,int tempoPercent,int transpose) {
 		this.manager = manager;
 		this.flags = flags;
@@ -104,18 +100,18 @@ public MidiSequenceParser(TGSongManager manager,int flags,int tempoPercent,int t
 		this.sHeader = -1;
 		this.eHeader = -1;
 	}
-	
+
 	public MidiSequenceParser(TGSongManager manager,int flags) {
 		this(manager,flags,100,0);
 	}
-	
+
 	/**
 	 * Crea la cancion
 	 */
 	public void parse(MidiSequenceHandler sequence) {
 		this.infoTrack = 0;
 		this.metronomeTrack = (sequence.getTracks() - 1);
-		
+
 		MidiSequenceHelper helper = new MidiSequenceHelper(sequence);
 		MidiRepeatController controller = new MidiRepeatController(this.manager.getSong(),this.sHeader,this.eHeader);
 		while(!controller.finished()){
@@ -126,36 +122,36 @@ public void parse(MidiSequenceHandler sequence) {
 				helper.addMeasureHelper( new MidiMeasureHelper(index,move) );
 			}
 		}
-		
+
 		this.addDefaultMessages(helper);
-		
+
 		for (int i = 0; i < this.manager.getSong().countTracks(); i++) {
 			TGTrack songTrack = this.manager.getSong().getTrack(i);
 			createTrack(helper, songTrack);
 		}
 		sequence.notifyFinish();
 	}
-	
+
 	public int getInfoTrack(){
 		return this.infoTrack;
 	}
-	
+
 	public int getMetronomeTrack(){
 		return this.metronomeTrack;
 	}
-	
+
 	private long getTick(long tick){
 		return (tick + this.firstTickMove);
 	}
-	
+
 	public void setSHeader(int header) {
 		this.sHeader = header;
 	}
-	
+
 	public void setEHeader(int header) {
 		this.eHeader = header;
 	}
-	
+
 	private int fix( int value ){
 		return ( value >= 0 ? value <= 127 ? value : 127 : 0 );
 	}
@@ -166,14 +162,14 @@ private void createTrack(MidiSequenceHelper sh, TGTrack track) {
 		TGChannel tgChannel = this.manager.getChannel( track.getChannelId() );
 		if( tgChannel != null ){
 			TGMeasure previous = null;
-			
+
 			this.addBend(sh,track.getNumber(),TGDuration.QUARTER_TIME,DEFAULT_BEND, tgChannel.getChannel());
 			this.makeChannel(sh, tgChannel, track.getNumber());
-			
+
 			int mCount = sh.getMeasureHelpers().size();
 			for( int mIndex = 0 ; mIndex < mCount ; mIndex++ ){
 				MidiMeasureHelper mh = sh.getMeasureHelper( mIndex );
-				
+
 				TGMeasure measure = track.getMeasure(mh.getIndex());
 				if(track.getNumber() == 1){
 					addTimeSignature(sh,measure, previous, mh.getMove());
@@ -182,12 +178,12 @@ private void createTrack(MidiSequenceHelper sh, TGTrack track) {
 				}
 				//agrego los pulsos
 				makeBeats( sh, tgChannel, track, measure, mIndex, mh.getMove() );
-				
+
 				previous = measure;
 			}
 		}
 	}
-	
+
 	private void makeBeats(MidiSequenceHelper sh, TGChannel channel, TGTrack track, TGMeasure measure, int mIndex, long startMove) {
 		int[] stroke = new int[track.stringCount()];
 		TGBeat previous = null;
@@ -197,27 +193,27 @@ private void makeBeats(MidiSequenceHelper sh, TGChannel channel, TGTrack track,
 			previous = beat;
 		}
 	}
-	
+
 	/**
 	 * Crea las notas del compas
 	 */
 	private void makeNotes( MidiSequenceHelper sh, TGChannel tgChannel, TGTrack track, TGBeat beat, TGTempo tempo, int mIndex,int bIndex, long startMove, int[] stroke) {
 		for( int vIndex = 0; vIndex < beat.countVoices(); vIndex ++ ){
 			TGVoice voice = beat.getVoice(vIndex);
-			
+
 			MidiTickHelper th = checkTripletFeel(voice,bIndex);
 			for (int noteIdx = 0; noteIdx < voice.countNotes(); noteIdx++) {
 				TGNote note = voice.getNote(noteIdx);
 				if (!note.isTiedNote()) {
-					int key = (this.transpose + track.getOffset() + note.getValue() + ((TGString)track.getStrings().get(note.getString() - 1)).getValue());
-					
+					int key = (this.transpose + track.getOffset() + note.getValue() + track.getStrings().get(note.getString() - 1).getValue());
+
 					long start = applyStrokeStart(note, (th.getStart() + startMove) , stroke);
 					long duration = applyStrokeDuration(note, getRealNoteDuration(sh, track, note, tempo, th.getDuration(), mIndex,bIndex), stroke);
-					
+
 					int velocity = getRealVelocity(sh, note, track, tgChannel, mIndex, bIndex);
 					int channel = tgChannel.getChannel();
 					int effectChannel = tgChannel.getEffectChannel();
-					
+
 					boolean percussionChannel = tgChannel.isPercussionChannel();
 					//---Fade In---
 					if(note.getEffect().isFadeIn()){
@@ -227,23 +223,23 @@ private void makeNotes( MidiSequenceHelper sh, TGChannel tgChannel, TGTrack trac
 					//---Grace---
 					if(note.getEffect().isGrace() && effectChannel >= 0 && !percussionChannel ){
 						channel = effectChannel;
-						int graceKey = track.getOffset() + note.getEffect().getGrace().getFret() + ((TGString)track.getStrings().get(note.getString() - 1)).getValue();
+						int graceKey = track.getOffset() + note.getEffect().getGrace().getFret() + track.getStrings().get(note.getString() - 1).getValue();
 						int graceLength = note.getEffect().getGrace().getDurationTime();
 						int graceVelocity = note.getEffect().getGrace().getDynamic();
 						long graceDuration = ((note.getEffect().getGrace().isDead())?applyStaticDuration(tempo, DEFAULT_DURATION_DEAD, graceLength):graceLength);
-						
+
 						if(note.getEffect().getGrace().isOnBeat() || (start - graceLength) < TGDuration.QUARTER_TIME){
 							start += graceLength;
 							duration -= graceLength;
 						}
 						makeNote(sh,track.getNumber(), graceKey,start - graceLength,graceDuration,graceVelocity,channel);
-						
+
 					}
 					//---Trill---
 					if(note.getEffect().isTrill() && effectChannel >= 0 && !percussionChannel ){
-						int trillKey = track.getOffset() + note.getEffect().getTrill().getFret() + ((TGString)track.getStrings().get(note.getString() - 1)).getValue();
+						int trillKey = track.getOffset() + note.getEffect().getTrill().getFret() + track.getStrings().get(note.getString() - 1).getValue();
 						long trillLength = note.getEffect().getTrill().getDuration().getTime();
-						
+
 						boolean realKey = true;
 						long tick = start;
 						while(true){
@@ -273,7 +269,7 @@ private void makeNotes( MidiSequenceHelper sh, TGChannel tgChannel, TGTrack trac
 						}
 						continue;
 					}
-					
+
 					//---Bend---
 					if(note.getEffect().isBend() && effectChannel >= 0 && !percussionChannel ){
 						channel = effectChannel;
@@ -297,7 +293,7 @@ else if(note.getEffect().isVibrato() && effectChannel >= 0 && !percussionChannel
 					//---Harmonic---
 					if(note.getEffect().isHarmonic() && !percussionChannel){
 						int orig = key;
-						
+
 						//Natural
 						if(note.getEffect().getHarmonic().isNatural()){
 							for(int i = 0;i < TGEffectHarmonic.NATURAL_FREQUENCIES.length;i ++){
@@ -313,21 +309,21 @@ else if(note.getEffect().isVibrato() && effectChannel >= 0 && !percussionChannel
 								makeNote(sh,track.getNumber(),Math.min(127,orig), start, duration,Math.max(TGVelocities.MIN_VELOCITY,velocity - (TGVelocities.VELOCITY_INCREMENT * 3)),channel);
 							}
 							key = (orig + TGEffectHarmonic.NATURAL_FREQUENCIES[note.getEffect().getHarmonic().getData()][1]);
-							
+
 						}
 						if( (key - 12) > 0 ){
 							int hVelocity = Math.max(TGVelocities.MIN_VELOCITY,velocity - (TGVelocities.VELOCITY_INCREMENT * 4));
 							makeNote(sh,track.getNumber(),(key - 12), start, duration,hVelocity,channel);
 						}
 					}
-					
+
 					//---Normal Note---
 					makeNote(sh,track.getNumber(), Math.min(127,key), start, duration, velocity,channel);
 				}
 			}
 		}
 	}
-	
+
 	/**
 	 * Crea una nota en la posicion start
 	 */
@@ -337,7 +333,7 @@ private void makeNote(MidiSequenceHelper sh,int track, int key, long start, long
 			sh.getSequence().addNoteOff(getTick(start + duration),track,channel,fix(key),fix(velocity));
 		}
 	}
-	
+
 	private void makeChannel(MidiSequenceHelper sh,TGChannel channel,int track) {
 		if( (this.flags & ADD_MIXER_MESSAGES) != 0){
 			makeChannel(sh, channel, track,true);
@@ -346,7 +342,7 @@ private void makeChannel(MidiSequenceHelper sh,TGChannel channel,int track) {
 			}
 		}
 	}
-	
+
 	private void makeChannel(MidiSequenceHelper sh,TGChannel channel,int track,boolean primary) {
 		int number = (primary?channel.getChannel():channel.getEffectChannel());
 		sh.getSequence().addControlChange(getTick(TGDuration.QUARTER_TIME),track,number,MidiControllers.VOLUME,fix(channel.getVolume()));
@@ -381,7 +377,7 @@ private void addTimeSignature(MidiSequenceHelper sh,TGMeasure currMeasure, TGMea
 			sh.getSequence().addTimeSignature(getTick(currMeasure.getStart() + startMove), getInfoTrack(), currMeasure.getTimeSignature());
 		}
 	}
-	
+
 	/**
 	 * Agrega un Tempo si es distinto al anterior
 	 */
@@ -399,7 +395,7 @@ private void addTempo(MidiSequenceHelper sh,TGMeasure currMeasure, TGMeasure pre
 			sh.getSequence().addTempoInUSQ(getTick(currMeasure.getStart() + startMove), getInfoTrack(), usq);
 		}
 	}
-	
+
 	/**
 	 * Retorna la Duracion real de una nota, verificando si tiene otras ligadas
 	 */
@@ -413,7 +409,7 @@ private long getRealNoteDuration(MidiSequenceHelper sh, TGTrack track, TGNote no
 		for (int m = mIndex; m < mCount; m++) {
 			MidiMeasureHelper mh = sh.getMeasureHelper( m );
 			TGMeasure measure = track.getMeasure( mh.getIndex() );
-			
+
 			int beatCount = measure.countBeats();
 			for (int b = nextBIndex; b < beatCount; b++) {
 				TGBeat beat = measure.getBeat(b);
@@ -448,7 +444,7 @@ private long getRealNoteDuration(MidiSequenceHelper sh, TGTrack track, TGNote no
 		}
 		return applyDurationEffects(note, tempo, realDuration);
 	}
-	
+
 	private long applyDurationEffects(TGNote note, TGTempo tempo, long duration){
 		//dead note
 		if(note.getEffect().isDeadNote()){
@@ -464,15 +460,15 @@ private long applyDurationEffects(TGNote note, TGTempo tempo, long duration){
 		}
 		return duration;
 	}
-	
+
 	private long applyStaticDuration(TGTempo tempo, long duration, long maximum ){
 		long value = ( tempo.getValue() * duration / 60 );
 		return (value < maximum ? value : maximum );
 	}
-	
+
 	private int getRealVelocity(MidiSequenceHelper sh, TGNote note, TGTrack tgTrack, TGChannel tgChannel, int mIndex,int bIndex){
 		int velocity = note.getVelocity();
-		
+
 		//Check for Hammer effect
 		if(!tgChannel.isPercussionChannel()){
 			MidiNoteHelper previousNote = getPreviousNote(sh, note,tgTrack,mIndex,bIndex,false);
@@ -480,7 +476,7 @@ private int getRealVelocity(MidiSequenceHelper sh, TGNote note, TGTrack tgTrack,
 				velocity = Math.max(TGVelocities.MIN_VELOCITY,(velocity - 25));
 			}
 		}
-		
+
 		//Check for GhostNote effect
 		if(note.getEffect().isGhostNote()){
 			velocity = Math.max(TGVelocities.MIN_VELOCITY,(velocity - TGVelocities.VELOCITY_INCREMENT));
@@ -489,13 +485,13 @@ private int getRealVelocity(MidiSequenceHelper sh, TGNote note, TGTrack tgTrack,
 		}else if(note.getEffect().isHeavyAccentuatedNote()){
 			velocity = Math.max(TGVelocities.MIN_VELOCITY,(velocity + (TGVelocities.VELOCITY_INCREMENT * 2)));
 		}
-		
+
 		return ((velocity > 127)?127:velocity);
 	}
-	
+
 	public void addMetronome(MidiSequenceHelper sh,TGMeasureHeader header, long startMove){
 		if( (this.flags & ADD_METRONOME) != 0) {
-		
+
 			long start = (startMove + header.getStart());
 			long length = header.getTimeSignature().getDenominator().getTime();
 			for(int i = 1; i <= header.getTimeSignature().getNumerator();i ++){
@@ -504,7 +500,7 @@ public void addMetronome(MidiSequenceHelper sh,TGMeasureHeader header, long star
 			}
 		}
 	}
-	
+
 	public void addDefaultMessages(MidiSequenceHelper sh) {
 		if( (this.flags & ADD_DEFAULT_CONTROLS) != 0) {
 			for(int i = 0; i < 16; i ++){
@@ -515,15 +511,15 @@ public void addDefaultMessages(MidiSequenceHelper sh) {
 			}
 		}
 	}
-	
+
 	private void addBend(MidiSequenceHelper sh,int track, long tick,int bend, int channel) {
 		sh.getSequence().addPitchBend(getTick(tick),track,channel,fix(bend));
 	}
-	
+
 	public void makeVibrato(MidiSequenceHelper sh,int track,long start, long duration,int channel){
 		long nextStart = start;
 		long end = nextStart + duration;
-		
+
 		while(nextStart < end){
 			nextStart = ((nextStart + 160 > end)?end:nextStart + 160);
 			addBend(sh,track,nextStart,DEFAULT_BEND,channel);
@@ -532,19 +528,19 @@ public void makeVibrato(MidiSequenceHelper sh,int track,long start, long duratio
 		}
 		addBend(sh,track,nextStart,DEFAULT_BEND,channel);
 	}
-	
+
 	public void makeBend(MidiSequenceHelper sh,int track,long start, long duration, TGEffectBend bend, int channel){
-		List points = bend.getPoints();
+		List<BendPoint> points = bend.getPoints();
 		for(int i=0;i<points.size();i++){
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint)points.get(i);
+			TGEffectBend.BendPoint point = points.get(i);
 			long bendStart = start + point.getTime(duration);
 			int value = DEFAULT_BEND + (int)(point.getValue() * DEFAULT_BEND_SEMI_TONE / TGEffectBend.SEMITONE_LENGTH);
 			value = ((value <= 127)?value:127);
 			value = ((value >= 0)?value:0);
 			addBend(sh,track,bendStart,value,channel);
-			
+
 			if(points.size() > i + 1){
-				TGEffectBend.BendPoint nextPoint = (TGEffectBend.BendPoint)points.get(i + 1);
+				TGEffectBend.BendPoint nextPoint = points.get(i + 1);
 				int nextValue = DEFAULT_BEND + (int)(nextPoint.getValue() * DEFAULT_BEND_SEMI_TONE / TGEffectBend.SEMITONE_LENGTH);
 				long nextBendStart = start + nextPoint.getTime(duration);
 				if(nextValue != value){
@@ -569,18 +565,18 @@ public void makeBend(MidiSequenceHelper sh,int track,long start, long duration,
 		}
 		addBend(sh,track,start + duration,DEFAULT_BEND,channel);
 	}
-	
+
 	public void makeTremoloBar(MidiSequenceHelper sh,int track,long start, long duration, TGEffectTremoloBar effect, int channel){
-		List points = effect.getPoints();
+		List<TremoloBarPoint> points = effect.getPoints();
 		for(int i=0;i<points.size();i++){
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint)points.get(i);
+			TGEffectTremoloBar.TremoloBarPoint point = points.get(i);
 			long pointStart = start + point.getTime(duration);
 			int value = DEFAULT_BEND + (int)(point.getValue() * (DEFAULT_BEND_SEMI_TONE * 2) );
 			value = ((value <= 127)?value:127);
 			value = ((value >= 0)?value:0);
 			addBend(sh,track,pointStart,value,channel);
 			if(points.size() > i + 1){
-				TGEffectTremoloBar.TremoloBarPoint nextPoint = (TGEffectTremoloBar.TremoloBarPoint)points.get(i + 1);
+				TGEffectTremoloBar.TremoloBarPoint nextPoint = points.get(i + 1);
 				int nextValue = DEFAULT_BEND + (int)(nextPoint.getValue() * (DEFAULT_BEND_SEMI_TONE * 2));
 				long nextPointStart = start + nextPoint.getTime(duration);
 				if(nextValue != value){
@@ -605,23 +601,23 @@ public void makeTremoloBar(MidiSequenceHelper sh,int track,long start, long dura
 		}
 		addBend(sh,track,start + duration,DEFAULT_BEND,channel);
 	}
-	
+
 	private void makeSlide(MidiSequenceHelper sh, TGNote note,TGTrack track, int mIndex, int bIndex, long startMove,int channel){
 		MidiNoteHelper nextNote = this.getNextNote(sh, note, track, mIndex, bIndex, true);
 		if( nextNote != null ){
 			int value1 = note.getValue();
 			int value2 = nextNote.getNote().getValue();
-			
+
 			long tick1 = note.getVoice().getBeat().getStart() + startMove;
 			long tick2 = nextNote.getNote().getVoice().getBeat().getStart() + nextNote.getMeasure().getMove();
-			
+
 			// Make the Slide
 			this.makeSlide(sh, track.getNumber(), tick1, value1, tick2, value2, channel);
 			// Normalize the Bend
 			this.addBend(sh,track.getNumber(), tick2 ,DEFAULT_BEND,channel);
 		}
 	}
-	
+
 	public void makeSlide(MidiSequenceHelper sh,int track,long tick1,int value1,long tick2,int value2,int channel){
 		long distance = (value2 - value1);
 		long length = (tick2 - tick1);
@@ -632,7 +628,7 @@ public void makeSlide(MidiSequenceHelper sh,int track,long tick1,int value1,long
 			addBend(sh,track,tick1 + ( (length / points) * i),bend,channel);
 		}
 	}
-	
+
 	private void makeFadeIn(MidiSequenceHelper sh,int track,long start,long duration,int volume3,int channel){
 		int expression = 31;
 		int expressionIncrement = 1;
@@ -645,7 +641,7 @@ private void makeFadeIn(MidiSequenceHelper sh,int track,long start,long duration
 		}
 		sh.getSequence().addControlChange(getTick((start + duration)),track,channel, MidiControllers.EXPRESSION, 127);
 	}
-	
+
 	private int[] getStroke(TGBeat beat, TGBeat previous, int[] stroke){
 		int direction = beat.getStroke().getDirection();
 		if( previous == null || !(direction == TGStroke.STROKE_NONE && previous.getStroke().getDirection() == TGStroke.STROKE_NONE)){
@@ -681,15 +677,15 @@ private int[] getStroke(TGBeat beat, TGBeat previous, int[] stroke){
 		}
 		return stroke;
 	}
-	
+
 	private long applyStrokeStart( TGNote note, long start , int[] stroke){
 		return (start + stroke[ note.getString() - 1 ]);
 	}
-	
+
 	private long applyStrokeDuration( TGNote note, long duration , int[] stroke){
 		return (duration > stroke[note.getString() - 1] ? (duration - stroke[ note.getString() - 1 ]) : duration );
 	}
-	
+
 	private MidiTickHelper checkTripletFeel(TGVoice voice,int bIndex){
 		long bStart = voice.getBeat().getStart();
 		long bDuration =  voice.getDuration().getTime();
@@ -744,13 +740,13 @@ else if( (bStart % (TGDuration.QUARTER_TIME / 4)) == 0){
 		}
 		return new MidiTickHelper(bStart, bDuration);
 	}
-	
+
 	private TGDuration newDuration(int value){
 		TGDuration duration = this.manager.getFactory().newDuration();
 		duration.setValue(value);
 		return duration;
 	}
-	
+
 	private TGVoice getPreviousBeat(TGVoice beat,int bIndex){
 		TGVoice previous = null;
 		for (int b = bIndex - 1; b >= 0; b--) {
@@ -763,7 +759,7 @@ private TGVoice getPreviousBeat(TGVoice beat,int bIndex){
 		}
 		return previous;
 	}
-	
+
 	private TGVoice getNextBeat(TGVoice beat,int bIndex){
 		TGVoice next = null;
 		for (int b = bIndex + 1; b < beat.getBeat().getMeasure().countBeats(); b++) {
@@ -776,13 +772,13 @@ private TGVoice getNextBeat(TGVoice beat,int bIndex){
 		}
 		return next;
 	}
-	
-	private MidiNoteHelper getNextNote(MidiSequenceHelper sh, TGNote note,TGTrack track, int mIndex, int bIndex, boolean breakAtRest){ 
+
+	private MidiNoteHelper getNextNote(MidiSequenceHelper sh, TGNote note,TGTrack track, int mIndex, int bIndex, boolean breakAtRest){
 		int nextBIndex = (bIndex + 1);
 		int measureCount = sh.getMeasureHelpers().size();
 		for (int m = mIndex; m < measureCount; m++) {
 			MidiMeasureHelper mh = sh.getMeasureHelper( m );
-			
+
 			TGMeasure measure = track.getMeasure( mh.getIndex() );
 			int beatCount = measure.countBeats();
 			for (int b = nextBIndex; b < beatCount; b++) {
@@ -805,12 +801,12 @@ private MidiNoteHelper getNextNote(MidiSequenceHelper sh, TGNote note,TGTrack tr
 		}
 		return null;
 	}
-	
+
 	private MidiNoteHelper getPreviousNote(MidiSequenceHelper pHelper, TGNote note,TGTrack track, int mIndex, int bIndex, boolean breakAtRest){
 		int nextBIndex = bIndex;
 		for (int m = mIndex; m >= 0; m--) {
 			MidiMeasureHelper mh = pHelper.getMeasureHelper( m );
-			
+
 			TGMeasure measure = track.getMeasure( mh.getIndex() );
 			if( this.sHeader == -1 || this.sHeader <= measure.getNumber() ){
 				nextBIndex = (nextBIndex < 0 ? measure.countBeats() : nextBIndex);
@@ -835,87 +831,87 @@ private MidiNoteHelper getPreviousNote(MidiSequenceHelper pHelper, TGNote note,T
 		}
 		return null;
 	}
-	
+
 	private class MidiTickHelper{
-		private long start;
-		private long duration;
-		
+		private final long start;
+		private final long duration;
+
 		public MidiTickHelper(long start,long duration){
 			this.start = start;
 			this.duration = duration;
 		}
-		
+
 		public long getDuration() {
 			return this.duration;
 		}
-		
+
 		public long getStart() {
 			return this.start;
 		}
 	}
-	
+
 	private class MidiNoteHelper {
-		
-		private MidiMeasureHelper measure;
-		private TGNote note;
-		
+
+		private final MidiMeasureHelper measure;
+		private final TGNote note;
+
 		public MidiNoteHelper(MidiMeasureHelper measure, TGNote note){
 			this.measure = measure;
 			this.note = note;
 		}
-		
+
 		public MidiMeasureHelper getMeasure() {
 			return this.measure;
 		}
-		
+
 		public TGNote getNote() {
 			return this.note;
 		}
 	}
-	
+
 	private class MidiMeasureHelper {
-		
-		private int index;
-		private long move;
-		
+
+		private final int index;
+		private final long move;
+
 		public MidiMeasureHelper(int index,long move){
 			this.index = index;
 			this.move = move;
 		}
-		
+
 		public int getIndex() {
 			return this.index;
 		}
-		
+
 		public long getMove() {
 			return this.move;
 		}
 	}
-	
+
 	private class MidiSequenceHelper {
-		
-		private List measureHeaderHelpers;
-		private MidiSequenceHandler sequence;
-		
+
+		private final List<MidiMeasureHelper> measureHeaderHelpers;
+		private final MidiSequenceHandler sequence;
+
 		public MidiSequenceHelper(MidiSequenceHandler sequence){
 			this.sequence = sequence;
-			this.measureHeaderHelpers = new ArrayList();
+			this.measureHeaderHelpers = new ArrayList<MidiMeasureHelper>();
 		}
-		
+
 		public MidiSequenceHandler getSequence(){
 			return this.sequence;
 		}
-		
+
 		public void addMeasureHelper( MidiMeasureHelper helper ){
 			this.measureHeaderHelpers.add( helper );
 		}
-		
-		public List getMeasureHelpers(){
+
+		public List<MidiMeasureHelper> getMeasureHelpers(){
 			return this.measureHeaderHelpers;
 		}
-		
+
 		public MidiMeasureHelper getMeasureHelper( int index ){
-			return (MidiMeasureHelper)this.measureHeaderHelpers.get( index );
+			return this.measureHeaderHelpers.get( index );
 		}
 
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencer.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencer.java
index e1f654a8..09c6b5c0 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencer.java
@@ -2,25 +2,25 @@
 
 
 public interface MidiSequencer extends MidiDevice{
-	
+
 	public void start() throws MidiPlayerException;
-	
+
 	public void stop() throws MidiPlayerException;
-	
+
 	public boolean isRunning() throws MidiPlayerException;
-	
+
 	public void setTickPosition(long tickPosition) throws MidiPlayerException;
-	
+
 	public long getTickPosition() throws MidiPlayerException;
-	
+
 	public long getTickLength() throws MidiPlayerException;
-	
+
 	public void setTransmitter( MidiTransmitter transmitter) throws MidiPlayerException;
-	
+
 	public MidiSequenceHandler createSequence(int tracks) throws MidiPlayerException;
-	
+
 	public void setSolo(int index,boolean solo) throws MidiPlayerException;
-	
+
 	public void setMute(int index,boolean mute) throws MidiPlayerException;
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
index 9614fc41..825cfc21 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerEmpty.java
@@ -3,100 +3,123 @@
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 
 public class MidiSequencerEmpty implements MidiSequencer{
-	
+
+	@Override
 	public void open() {
 		// Not implemented
-	}	
-	
+	}
+
+	@Override
 	public void close() {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void check() {
 		// Not implemented
 	}
-	
+
+	@Override
 	public MidiSequenceHandler createSequence(int tracks) {
 		return new MidiSequenceHandler(tracks) {
-			
+
+			@Override
 			public void notifyFinish() {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addTimeSignature(long tick, int track, TGTimeSignature ts) {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addTempoInUSQ(long tick, int track, int usq) {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addProgramChange(long tick, int track, int channel,int instrument) {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addPitchBend(long tick, int track, int channel, int value) {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addNoteOn(long tick, int track, int channel, int note,int velocity) {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addNoteOff(long tick, int track, int channel, int note,int velocity) {
 				// Not implemented
 			}
-			
+
+			@Override
 			public void addControlChange(long tick, int track, int channel,int controller, int value) {
 				// Not implemented
 			}
 		};
 	}
-	
+
+	@Override
 	public void setTransmitter(MidiTransmitter transmitter) throws MidiPlayerException {
 		// Not implemented
 	}
-	
+
+	@Override
 	public long getTickLength() {
 		// Not implemented
 		return 0;
 	}
-	
+
+	@Override
 	public long getTickPosition() {
 		// Not implemented
 		return 0;
 	}
-	
+
+	@Override
 	public boolean isRunning() {
 		// Not implemented
 		return false;
 	}
-	
+
+	@Override
 	public void setMute(int index, boolean mute) {
 		//not implemented
 	}
-	
+
+	@Override
 	public void setSolo(int index, boolean solo) {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void setTickPosition(long tickPosition) {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void start() {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void stop() {
 		// Not implemented
 	}
-	
+
+	@Override
 	public String getKey() {
 		return null;
 	}
-	
+
+	@Override
 	public String getName() {
 		return null;
-	}	
+	}
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerProvider.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
new file mode 100644
index 00000000..e275f9fb
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
@@ -0,0 +1,11 @@
+package org.herac.tuxguitar.player.base;
+
+import java.util.List;
+
+public interface MidiSequencerProvider {
+
+	public List<MidiSequencer> listSequencers() throws MidiPlayerException;
+
+	public void closeAll() throws MidiPlayerException;
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiTransmitter.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiTransmitter.java
similarity index 76%
rename from TuxGuitar/src/org/herac/tuxguitar/player/base/MidiTransmitter.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiTransmitter.java
index 3bffa912..903d804e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiTransmitter.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/base/MidiTransmitter.java
@@ -4,73 +4,73 @@
 import java.util.List;
 
 public class MidiTransmitter {
-	
-	private List receivers;
-	
+
+	private final List<MidiReceiverItem> receivers;
+
 	public MidiTransmitter(){
-		this.receivers = new ArrayList();
+		this.receivers = new ArrayList<MidiReceiverItem>();
 	}
-	
+
 	public void sendAllNotesOff() throws MidiPlayerException {
 		for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-			MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+			MidiReceiverItem receiver = this.receivers.get( i );
 			receiver.getReceiver().sendAllNotesOff();
 		}
 	}
-	
+
 	public void sendNoteOn(int channel, int key, int velocity) throws MidiPlayerException {
 		for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-			MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+			MidiReceiverItem receiver = this.receivers.get( i );
 			receiver.getReceiver().sendNoteOn(channel, key, velocity);
 		}
 	}
-	
+
 	public void sendNoteOff(int channel, int key, int velocity) throws MidiPlayerException {
 		for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-			MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+			MidiReceiverItem receiver = this.receivers.get( i );
 			receiver.getReceiver().sendNoteOff(channel, key, velocity);
 		}
 	}
-	
+
 	public void sendProgramChange(int channel, int value) throws MidiPlayerException {
 		for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-			MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+			MidiReceiverItem receiver = this.receivers.get( i );
 			receiver.getReceiver().sendProgramChange(channel, value);
 		}
 	}
-	
+
 	public void sendControlChange(int channel, int controller, int value) throws MidiPlayerException {
 		for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-			MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+			MidiReceiverItem receiver = this.receivers.get( i );
 			receiver.getReceiver().sendControlChange(channel, controller, value);
 		}
 	}
-	
+
 	public void sendPitchBend(int channel, int value) throws MidiPlayerException {
 		for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-			MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+			MidiReceiverItem receiver = this.receivers.get( i );
 			receiver.getReceiver().sendPitchBend(channel, value);
 		}
 	}
-	
+
 	public void addReceiver(String id, MidiReceiver receiver){
 		MidiReceiverItem item = getReceiver( id );
 		if( item == null ){
 			this.receivers.add( new MidiReceiverItem( id , receiver ) );
 		}
 	}
-	
+
 	public void removeReceiver(String id){
 		MidiReceiverItem item = getReceiver( id );
 		if( item != null ){
 			this.receivers.remove( item );
 		}
 	}
-	
+
 	private MidiReceiverItem getReceiver(String id){
 		if( id != null ){
 			for( int i = 0 ; i < this.receivers.size() ; i ++ ){
-				MidiReceiverItem receiver = (MidiReceiverItem) this.receivers.get( i );
+				MidiReceiverItem receiver = this.receivers.get( i );
 				if( receiver.getId() != null && receiver.getId().equals( id ) ){
 					return receiver;
 				}
@@ -78,20 +78,20 @@ private MidiReceiverItem getReceiver(String id){
 		}
 		return null;
 	}
-	
+
 	private class MidiReceiverItem {
-		private String id;
-		private MidiReceiver receiver;
-		
+		private final String id;
+		private final MidiReceiver receiver;
+
 		public MidiReceiverItem(String id, MidiReceiver receiver){
 			this.id = id;
 			this.receiver = receiver;
 		}
-		
+
 		public String getId() {
 			return this.id;
 		}
-		
+
 		public MidiReceiver getReceiver() {
 			return this.receiver;
 		}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
new file mode 100644
index 00000000..0b941c32
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
@@ -0,0 +1,73 @@
+package org.herac.tuxguitar.player.impl.sequencer;
+
+public class MidiEvent {
+
+	public static final int ALL_TRACKS = -1;
+
+	public static final int MIDI_SYSTEM_EVENT = 1;
+	public static final int MIDI_EVENT_NOTEON = 2;
+	public static final int MIDI_EVENT_NOTEOFF = 3;
+	public static final int MIDI_EVENT_PROGRAM_CHANGE = 4;
+	public static final int MIDI_EVENT_CONTROL_CHANGE = 5;
+	public static final int MIDI_EVENT_PITCH_BEND = 6;
+
+	private long tick;
+	private int type;
+	private int track;
+	private byte[] data;
+
+	public MidiEvent(long tick,int type,byte[] data){
+		this(tick,type,ALL_TRACKS,data);
+	}
+
+	public MidiEvent(long tick,int type,int track,byte[] data){
+		this.tick = tick;
+		this.type = type;
+		this.track = track;
+		this.data = data;
+	}
+
+	public long getTick() {
+		return this.tick;
+	}
+
+	public int getType() {
+		return this.type;
+	}
+
+	public int getTrack() {
+		return this.track;
+	}
+
+	public byte[] getData() {
+		return this.data;
+	}
+
+	public static MidiEvent systemReset(final long tick){
+		return new MidiEvent(tick,MIDI_SYSTEM_EVENT,ALL_TRACKS,null);
+	}
+
+	public static MidiEvent noteOn(final long tick,final int track,final int channel,final int key,final int velocity){
+		return new MidiEvent(tick,MIDI_EVENT_NOTEON,track,new byte[]{(byte)channel,(byte)key,(byte)velocity});
+	}
+
+	public static MidiEvent noteOff(final long tick,final int track,final int channel,final int key,final int velocity){
+		return new MidiEvent(tick,MIDI_EVENT_NOTEOFF,track,new byte[]{(byte)channel,(byte)key,(byte)velocity});
+	}
+
+	public static MidiEvent controlChange(final long tick,final int track,final int channel,final int controller,final int value){
+		return new MidiEvent(tick,MIDI_EVENT_CONTROL_CHANGE,track,new byte[]{(byte)channel,(byte)controller,(byte)value});
+	}
+
+	public static MidiEvent programChange(final long tick,final int track,final int channel,final int value){
+		return new MidiEvent(tick,MIDI_EVENT_PROGRAM_CHANGE,track,new byte[]{(byte)channel,(byte)value});
+	}
+
+	public static MidiEvent pitchBend(final long tick,final int track,final int channel,final int value){
+		return new MidiEvent(tick,MIDI_EVENT_PITCH_BEND,track,new byte[]{(byte)channel,(byte)value});
+	}
+
+	public static MidiEvent tempoInUSQ(final long tick,final int usq){
+		return new MidiEvent(tick,MIDI_SYSTEM_EVENT,new byte[]{0x51,(byte) (usq & 0xff),(byte) ((usq >> 8) & 0xff),(byte) ((usq >> 16) & 0xff)});
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
similarity index 99%
rename from TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
index 38049198..3b3f40e6 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventDispacher.java
@@ -4,11 +4,11 @@
 
 public class MidiEventDispacher{
 	private MidiSequencerImpl sequencer;
-	
+
 	public MidiEventDispacher(MidiSequencerImpl sequencer){
 		this.sequencer = sequencer;
 	}
-	
+
 	public void dispatch(MidiEvent event) throws MidiPlayerException{
 		if(event.getType() == MidiEvent.MIDI_EVENT_NOTEON){
 			this.sequencer.getTransmitter().sendNoteOn(event.getData()[0],event.getData()[1],event.getData()[2]);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
index c004ce80..889e3222 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiEventPlayer.java
@@ -7,30 +7,30 @@
 
 public class MidiEventPlayer{
 	private MidiSequencerImpl sequencer;
-	private List events;
-	
+	private List<MidiEvent> events;
+
 	private long tick;
 	private long lastTick;
 	private boolean reset;
-	
+
 	public MidiEventPlayer(MidiSequencerImpl sequencer){
 		this.sequencer = sequencer;
-		this.events = new ArrayList();
+		this.events = new ArrayList<MidiEvent>();
 		this.reset();
 	}
-	
+
 	public void process() throws MidiPlayerException {
 		this.lastTick = this.tick;
 		this.tick = this.sequencer.getTickPosition();
 		for(int i = 0;i < this.events.size();i ++){
-			MidiEvent event = (MidiEvent)this.events.get(i);
+			MidiEvent event = this.events.get(i);
 			if(shouldSend(event,this.tick,this.lastTick)){
 				this.sequencer.sendEvent(event);
 			}
 		}
 		this.reset = false;
 	}
-	
+
 	private boolean shouldSend(MidiEvent event,long tick,long lastTick){
 		if(event.getTick() > tick){
 			return false;
@@ -56,18 +56,18 @@ private boolean shouldSend(MidiEvent event,long tick,long lastTick){
 		}
 		return (event.getTick() > lastTick);
 	}
-	
+
 	public void addEvent(MidiEvent event){
 		this.events.add(event);
 	}
-	
+
 	public void clearEvents(){
 		this.events.clear();
 	}
-	
+
 	public void reset(){
 		this.tick = (this.sequencer.getTickPosition() - 1);
 		this.reset = true;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
new file mode 100644
index 00000000..6c9d2475
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
@@ -0,0 +1,55 @@
+package org.herac.tuxguitar.player.impl.sequencer;
+
+import org.herac.tuxguitar.player.base.MidiSequenceHandler;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
+
+	private MidiSequencerImpl seq;
+
+	public MidiSequenceHandlerImpl(MidiSequencerImpl seq,int tracks) {
+		super(tracks);
+		this.seq = seq;
+		this.seq.getMidiTrackController().init(getTracks());
+	}
+
+	@Override
+	public void addControlChange(long tick,int track,int channel, int controller, int value) {
+		this.seq.addEvent(MidiEvent.controlChange(tick, track, channel, controller, value));
+	}
+
+	@Override
+	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
+		this.seq.addEvent(MidiEvent.noteOff(tick, track, channel, note, velocity));
+	}
+
+	@Override
+	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
+		this.seq.addEvent(MidiEvent.noteOn(tick, track, channel, note, velocity));
+	}
+
+	@Override
+	public void addPitchBend(long tick,int track,int channel, int value) {
+		this.seq.addEvent(MidiEvent.pitchBend(tick, track, channel, value));
+	}
+
+	@Override
+	public void addProgramChange(long tick,int track,int channel, int instrument) {
+		this.seq.addEvent(MidiEvent.programChange(tick, track, channel, instrument));
+	}
+
+	@Override
+	public void addTempoInUSQ(long tick,int track,int usq) {
+		this.seq.addEvent(MidiEvent.tempoInUSQ(tick, usq));
+	}
+
+	@Override
+	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
+		//not implemented
+	}
+
+	@Override
+	public void notifyFinish(){
+		//not implemented
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
new file mode 100644
index 00000000..c51d5f0f
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
@@ -0,0 +1,194 @@
+package org.herac.tuxguitar.player.impl.sequencer;
+
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+import org.herac.tuxguitar.player.base.MidiSequenceHandler;
+import org.herac.tuxguitar.player.base.MidiSequencer;
+import org.herac.tuxguitar.player.base.MidiTransmitter;
+
+public class MidiSequencerImpl implements MidiSequencer{
+
+	private boolean reset;
+	private boolean running;
+	private boolean stopped;
+	private MidiTransmitter transmitter;
+	private MidiTickPlayer midiTickPlayer;
+	private MidiEventPlayer midiEventPlayer;
+	private MidiEventDispacher midiEventDispacher;
+	private MidiTrackController midiTrackController;
+
+	public MidiSequencerImpl(){
+		this.running = false;
+		this.stopped = true;
+		this.midiTickPlayer = new MidiTickPlayer();
+		this.midiEventPlayer = new MidiEventPlayer(this);
+		this.midiEventDispacher = new MidiEventDispacher(this);
+		this.midiTrackController = new MidiTrackController(this);
+	}
+
+	public synchronized MidiTrackController getMidiTrackController(){
+		return this.midiTrackController;
+	}
+
+	public synchronized void setTempo(int tempo){
+		this.midiTickPlayer.setTempo(tempo);
+	}
+
+	@Override
+	public synchronized long getTickPosition(){
+		return this.midiTickPlayer.getTick();
+	}
+
+	@Override
+	public synchronized void setTickPosition(long tickPosition){
+		this.reset = true;
+		this.midiTickPlayer.setTick(tickPosition);
+	}
+
+	@Override
+	public synchronized long getTickLength(){
+		return this.midiTickPlayer.getTickLength();
+	}
+
+	public synchronized void sendEvent(MidiEvent event) throws MidiPlayerException{
+		if(!this.reset){
+			this.midiEventDispacher.dispatch(event);
+		}
+	}
+
+	public synchronized void addEvent(MidiEvent event){
+		this.midiEventPlayer.addEvent(event);
+		this.midiTickPlayer.notifyTick(event.getTick());
+	}
+
+	@Override
+	public synchronized boolean isRunning() {
+		return this.running;
+	}
+
+	public synchronized void setRunning(boolean running) throws MidiPlayerException {
+		this.running = running;
+		if(this.running){
+			this.setTempo(120);
+			this.setTickPosition( this.getTickPosition() );
+			new MidiTimer(this).start();
+		}else{
+			this.process();
+		}
+	}
+
+	@Override
+	public synchronized void stop() throws MidiPlayerException{
+		this.setRunning(false);
+	}
+
+	@Override
+	public synchronized void start() throws MidiPlayerException{
+		this.setRunning(true);
+	}
+
+	public synchronized void reset()  throws MidiPlayerException{
+		this.getTransmitter().sendAllNotesOff();
+		for(int channel = 0; channel < 16;channel ++){
+			this.getTransmitter().sendPitchBend(channel, 64);
+		}
+	}
+
+	protected synchronized boolean process() throws MidiPlayerException{
+		boolean running = this.isRunning();
+		if(running){
+			if(this.reset){
+				this.reset();
+				this.reset = false;
+				this.midiEventPlayer.reset();
+			}
+			this.stopped = false;
+			this.midiTickPlayer.process();
+			this.midiEventPlayer.process();
+			if(this.getTickPosition() > this.getTickLength()){
+				this.stop();
+			}
+		}
+		else if( !this.stopped ){
+			this.stopped = true;
+			this.midiEventPlayer.clearEvents();
+			this.midiTickPlayer.clearTick();
+			this.reset();
+		}
+		return running;
+	}
+
+	public synchronized MidiTransmitter getTransmitter() {
+		return this.transmitter;
+	}
+
+	@Override
+	public synchronized void setTransmitter(MidiTransmitter transmitter) {
+		this.transmitter = transmitter;
+	}
+
+	@Override
+	public void check() {
+		// Not implemented
+	}
+
+	@Override
+	public synchronized void open() {
+		//not implemented
+	}
+
+	@Override
+	public synchronized void close() throws MidiPlayerException {
+		if(isRunning()){
+			this.stop();
+		}
+	}
+
+	@Override
+	public synchronized MidiSequenceHandler createSequence(int tracks) throws MidiPlayerException{
+		return new MidiSequenceHandlerImpl(this,tracks);
+	}
+
+	@Override
+	public synchronized void setSolo(int index,boolean solo) throws MidiPlayerException{
+		this.getMidiTrackController().setSolo(index, solo);
+	}
+
+	@Override
+	public synchronized void setMute(int index,boolean mute) throws MidiPlayerException{
+		this.getMidiTrackController().setMute(index, mute);
+	}
+
+	@Override
+	public String getKey() {
+		return "tuxguitar.sequencer";
+	}
+
+	@Override
+	public String getName() {
+		return "TuxGuitar Sequencer";
+	}
+
+	private class MidiTimer extends Thread{
+
+		private static final int TIMER_DELAY = 15;
+
+		private MidiSequencerImpl sequencer;
+
+		public MidiTimer(MidiSequencerImpl sequencer){
+			this.sequencer = sequencer;
+		}
+
+		@Override
+		public void run() {
+			try {
+				synchronized(this.sequencer) {
+					while( this.sequencer.process() ){
+						this.sequencer.wait( TIMER_DELAY );
+					}
+				}
+			} catch (Throwable throwable) {
+				throwable.printStackTrace();
+			}
+		}
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
new file mode 100644
index 00000000..37a7ee62
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
@@ -0,0 +1,37 @@
+package org.herac.tuxguitar.player.impl.sequencer;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+import org.herac.tuxguitar.player.base.MidiSequencer;
+import org.herac.tuxguitar.player.base.MidiSequencerProvider;
+
+public class MidiSequencerProviderImpl implements MidiSequencerProvider{
+
+	private List<MidiSequencer> sequencers;
+
+	public MidiSequencerProviderImpl(){
+		super();
+	}
+
+	@Override
+	public List<MidiSequencer> listSequencers() throws MidiPlayerException {
+		if(this.sequencers == null){
+			this.sequencers = new ArrayList<MidiSequencer>();
+			this.sequencers.add(new MidiSequencerImpl());
+		}
+		return this.sequencers;
+	}
+
+	@Override
+	public void closeAll() throws MidiPlayerException {
+		Iterator<MidiSequencer> it = listSequencers().iterator();
+		while(it.hasNext()){
+			MidiSequencer sequencer = it.next();
+			sequencer.close();
+		}
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
index 39e31890..9d272072 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTickPlayer.java
@@ -3,20 +3,20 @@
 import org.herac.tuxguitar.song.models.TGDuration;
 
 public class MidiTickPlayer {
-	
+
 	private static final int SECOND_IN_MILLIS = 1000;
-	
+
 	private int tempo;
 	private long tick;
 	private long time;
 	private long lastTime;
 	private long tickLength;
 	private boolean tickChanged;
-	
+
 	public MidiTickPlayer(){
 		super();
 	}
-	
+
 	public void process() {
 		this.lastTime = this.time;
 		this.time = System.currentTimeMillis();
@@ -25,32 +25,32 @@ public void process() {
 		}
 		this.tickChanged = false;
 	}
-	
+
 	public void clearTick(){
 		this.tickLength = 0;
 	}
-	
+
 	public int getTempo() {
 		return this.tempo;
 	}
-	
+
 	public void setTempo(int tempo) {
 		this.tempo = tempo;
 	}
-	
+
 	public long getTick() {
 		return this.tick;
 	}
-	
+
 	public void setTick(long tick) {
 		this.tick = tick;
 		this.tickChanged = true;
 	}
-	
+
 	public long getTickLength() {
 		return this.tickLength;
 	}
-	
+
 	public void notifyTick(long tick){
 		this.tickLength = Math.max(this.tickLength,tick);
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
new file mode 100644
index 00000000..ef9c9797
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
@@ -0,0 +1,28 @@
+package org.herac.tuxguitar.player.impl.sequencer;
+
+public class MidiTrack {
+
+	private boolean solo;
+	private boolean mute;
+
+	public MidiTrack(){
+		this.solo = false;
+		this.mute = false;
+	}
+
+	public boolean isMute() {
+		return this.mute;
+	}
+
+	public void setMute(boolean mute) {
+		this.mute = mute;
+	}
+
+	public boolean isSolo() {
+		return this.solo;
+	}
+
+	public void setSolo(boolean solo) {
+		this.solo = solo;
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
index df131a60..1f8ea050 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/player/impl/sequencer/MidiTrackController.java
@@ -6,43 +6,43 @@
 import org.herac.tuxguitar.player.base.MidiPlayerException;
 
 public class MidiTrackController {
-	
-	
-	private List tracks;
+
+
+	private List<MidiTrack> tracks;
 	private MidiSequencerImpl sequencer;
 	private boolean anySolo;
-	
+
 	public MidiTrackController(MidiSequencerImpl sequencer){
 		this.sequencer = sequencer;
-		this.tracks = new ArrayList();
+		this.tracks = new ArrayList<MidiTrack>();
 		this.anySolo = false;
 	}
-	
+
 	public void init(int count){
 		this.tracks.clear();
 		for(int i = 0; i < count; i ++){
 			this.tracks.add(new MidiTrack());
 		}
 	}
-	
+
 	public void clearTracks(){
 		this.tracks.clear();
 	}
-	
+
 	public void checkAnySolo(){
 		this.anySolo = false;
 		for(int i = 0; i < this.tracks.size(); i ++){
-			MidiTrack track = (MidiTrack)this.tracks.get(i);
+			MidiTrack track = this.tracks.get(i);
 			if(track.isSolo()){
 				this.anySolo = true;
 				break;
 			}
 		}
 	}
-	
+
 	public void setSolo(int index,boolean solo) throws MidiPlayerException{
 		if(index >= 0 && index < this.tracks.size()){
-			MidiTrack track = (MidiTrack)this.tracks.get(index);
+			MidiTrack track = this.tracks.get(index);
 			track.setSolo(solo);
 			checkAnySolo();
 			if(track.isSolo()){
@@ -51,10 +51,10 @@ public void setSolo(int index,boolean solo) throws MidiPlayerException{
 			}
 		}
 	}
-	
+
 	public void setMute(int index,boolean mute) throws MidiPlayerException{
 		if(index >= 0 && index < this.tracks.size()){
-			MidiTrack track = (MidiTrack)this.tracks.get(index);
+			MidiTrack track = this.tracks.get(index);
 			track.setMute(mute);
 			if(track.isMute()){
 				setSolo(index,false);
@@ -62,23 +62,23 @@ public void setMute(int index,boolean mute) throws MidiPlayerException{
 			}
 		}
 	}
-	
+
 	public boolean isSolo(int index){
 		if(index >= 0 && index < this.tracks.size()){
-			MidiTrack track = (MidiTrack)this.tracks.get(index);
+			MidiTrack track = this.tracks.get(index);
 			return track.isSolo();
 		}
 		return false;
 	}
-	
+
 	public boolean isMute(int index){
 		if(index >= 0 && index < this.tracks.size()){
-			MidiTrack track = (MidiTrack)this.tracks.get(index);
+			MidiTrack track = this.tracks.get(index);
 			return track.isMute();
 		}
 		return false;
 	}
-	
+
 	public boolean isAnySolo(){
 		return this.anySolo;
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/factory/TGFactory.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/factory/TGFactory.java
new file mode 100644
index 00000000..7e744cff
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/factory/TGFactory.java
@@ -0,0 +1,140 @@
+package org.herac.tuxguitar.song.factory;
+
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGScale;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+
+public class TGFactory {
+
+	public TGSong newSong(){
+		return new TGSong();
+	}
+
+	public TGLyric newLyric(){
+		return new TGLyric();
+	}
+
+	public TGMarker newMarker(){
+		return new TGMarker(this);
+	}
+
+	public TGChord newChord(int length){
+		return new TGChord(length);
+	}
+
+	public TGScale newScale(){
+		return new TGScale();
+	}
+
+	public TGColor newColor(){
+		return new TGColor();
+	}
+
+	public TGDuration newDuration(){
+		return new TGDuration(this);
+	}
+
+	public TGDivisionType newDivisionType(){
+		return new TGDivisionType();
+	}
+
+	public TGTimeSignature newTimeSignature(){
+		return new TGTimeSignature(this);
+	}
+
+	public TGTempo newTempo(){
+		return new TGTempo();
+	}
+
+	public TGChannel newChannel(){
+		return new TGChannel();
+	}
+
+	public TGTrack newTrack(){
+		return new TGTrack(this);
+	}
+
+	public TGMeasureHeader newHeader(){
+		return new TGMeasureHeader(this);
+	}
+
+	public TGMeasure newMeasure(TGMeasureHeader header){
+		return new TGMeasure(header);
+	}
+
+	public TGBeat newBeat(){
+		return new TGBeat(this);
+	}
+
+	public TGVoice newVoice(int index){
+		return new TGVoice(this, index);
+	}
+
+	public TGNote newNote(){
+		return new TGNote(this);
+	}
+
+	public TGString newString(){
+		return new TGString();
+	}
+
+	public TGStroke newStroke(){
+		return new TGStroke();
+	}
+
+	public TGText newText(){
+		return new TGText();
+	}
+
+	public TGNoteEffect newEffect(){
+		return new TGNoteEffect();
+	}
+
+	public TGEffectBend newEffectBend(){
+		return new TGEffectBend();
+	}
+
+	public TGEffectTremoloBar newEffectTremoloBar(){
+		return new TGEffectTremoloBar();
+	}
+
+	public TGEffectGrace newEffectGrace(){
+		return new TGEffectGrace();
+	}
+
+	public TGEffectHarmonic newEffectHarmonic(){
+		return new TGEffectHarmonic();
+	}
+
+	public TGEffectTrill newEffectTrill(){
+		return new TGEffectTrill(this);
+	}
+
+	public TGEffectTremoloPicking newEffectTremoloPicking(){
+		return new TGEffectTremoloPicking(this);
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegment.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegment.java
new file mode 100644
index 00000000..ac970d4c
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegment.java
@@ -0,0 +1,50 @@
+package org.herac.tuxguitar.song.helpers;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+
+public class TGSongSegment implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private final List<TGMeasureHeader> headers;
+	private final List<TGTrackSegment> tracks;
+
+	public TGSongSegment(){
+		this.headers = new ArrayList<TGMeasureHeader>();
+		this.tracks = new ArrayList<TGTrackSegment>();
+	}
+
+	public List<TGMeasureHeader> getHeaders() {
+		return this.headers;
+	}
+
+	public List<TGTrackSegment> getTracks() {
+		return this.tracks;
+	}
+
+	public void addTrack(int track,List<TGMeasure> measures){
+		this.tracks.add(new TGTrackSegment(track,measures));
+	}
+
+	public boolean isEmpty(){
+		return (this.headers.isEmpty() || this.tracks.isEmpty());
+	}
+
+	public TGSongSegment clone(TGFactory factory){
+		TGSongSegment segment = new TGSongSegment();
+		for(int i = 0;i < getHeaders().size();i++){
+			TGMeasureHeader header = getHeaders().get(i);
+			segment.getHeaders().add(header.clone(factory));
+		}
+		for(int i = 0;i < getTracks().size();i++){
+			TGTrackSegment trackMeasure = getTracks().get(i);
+			segment.getTracks().add((TGTrackSegment)trackMeasure.clone(factory,segment.getHeaders()));
+		}
+		return segment;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
new file mode 100644
index 00000000..5f6344c2
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
@@ -0,0 +1,196 @@
+package org.herac.tuxguitar.song.helpers;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.managers.TGTrackManager;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+public class TGSongSegmentHelper {
+
+	private final TGSongManager sm;
+
+	public TGSongSegmentHelper(TGSongManager sm){
+		this.sm = sm;
+	}
+
+	public TGSongSegment copyMeasures(int m1, int m2){
+		TGSongSegment segment = new TGSongSegment();
+		int number1 = Math.max(1,m1);
+		int number2 = Math.min(this.sm.getSong().countMeasureHeaders(),m2);
+		for(int number = number1; number <= number2;number ++){
+			segment.getHeaders().add( this.sm.getMeasureHeader(number) );
+		}
+		Iterator<TGTrack> it = this.sm.getSong().getTracks();
+		while(it.hasNext()){
+			TGTrack track = it.next();
+			List<TGMeasure> measures = new ArrayList<TGMeasure>();
+			for(int number = number1; number <= number2;number ++){
+				measures.add(this.sm.getTrackManager().getMeasure(track, number));
+			}
+			segment.addTrack(track.getNumber(),measures);
+		}
+		return segment.clone(this.sm.getFactory());
+	}
+
+	public TGSongSegment copyMeasures(int m1, int m2,TGTrack track){
+		TGSongSegment segment = new TGSongSegment();
+		List<TGMeasure> measures = new ArrayList<TGMeasure>();
+		int number1 = Math.max(1,m1);
+		int number2 = Math.min(this.sm.getSong().countMeasureHeaders(),m2);
+		for(int number = number1; number <= number2;number ++){
+			segment.getHeaders().add( this.sm.getMeasureHeader(number) );
+			measures.add(this.sm.getTrackManager().getMeasure(track, number));
+		}
+		segment.addTrack(track.getNumber(),measures);
+		return segment.clone(this.sm.getFactory());
+	}
+
+	public void insertMeasures(TGSongSegment segment,int fromNumber,long move, int track){
+		List<TGMeasureHeader> headers = new ArrayList<TGMeasureHeader>();
+		this.sm.moveMeasureHeaders(segment.getHeaders(),move,0,false);
+
+		int headerNumber = fromNumber;
+		Iterator<TGMeasureHeader> it = segment.getHeaders().iterator();
+		while(it.hasNext()){
+			TGMeasureHeader header = it.next();
+			header.setNumber(headerNumber);
+			headers.add(header);
+			headerNumber ++;
+		}
+		long start = headers.get(0).getStart();
+		long end = headers.get(headers.size() - 1).getStart() + headers.get(headers.size() - 1).getLength();
+		List<TGMeasureHeader> headersBeforeEnd = this.sm.getMeasureHeadersBeforeEnd(start);
+		this.sm.moveMeasureHeaders(headersBeforeEnd,end - start,headers.size(),true);
+
+		it = segment.getHeaders().iterator();
+		while(it.hasNext()){
+			TGMeasureHeader header = it.next();
+			this.sm.addMeasureHeader(header.getNumber() - 1,header);
+		}
+
+		Iterator<TGTrack> it2 = this.sm.getSong().getTracks();
+		while (it2.hasNext()) {
+			TGTrack currTrack = it2.next();
+			List<TGMeasure> measures = null;
+
+			Iterator<TGTrackSegment> tracks = segment.getTracks().iterator();
+			while(tracks.hasNext()){
+				TGTrackSegment tSegment = tracks.next();
+
+				if(  ((track > 0 && segment.getTracks().size() == 1)?track:tSegment.getTrack()) == currTrack.getNumber()){
+					measures = tSegment.getMeasures();
+					break;
+				}
+			}
+			if(measures == null){
+				TGTrackManager tm = this.sm.getTrackManager();
+				TGMeasure measure = (fromNumber > 1 ? tm.getMeasure(currTrack , (fromNumber - 1) ) : tm.getMeasure(currTrack, headerNumber ));
+				int clef = ( measure != null ? measure.getClef() : TGMeasure.DEFAULT_CLEF );
+				int keySignature = ( measure != null ? measure.getKeySignature() : TGMeasure.DEFAULT_KEY_SIGNATURE );
+				measures = getEmptyMeasures(segment.getHeaders().size(), clef, keySignature);
+			}
+
+			for(int i = 0;i < measures.size();i++){
+				TGMeasure measure = measures.get(i);
+				measure.setHeader(headers.get(i));
+				this.sm.getMeasureManager().moveAllBeats(measure,move);
+			}
+
+			insertMeasures(currTrack,measures);
+		}
+	}
+
+	public void insertMeasures(TGTrack track,List<TGMeasure> measures){
+		if(!measures.isEmpty()){
+			Iterator<TGMeasure> it = measures.iterator();
+			while(it.hasNext()){
+				TGMeasure measure = it.next();
+				this.sm.getMeasureManager().removeNotesAfterString(measure, track.stringCount());
+				this.sm.getTrackManager().addMeasure(track,(measure.getNumber() - 1),measure);
+			}
+		}
+	}
+
+	public void replaceMeasures(TGSongSegment segment,long move, int track) {
+		boolean replaceHeader = ( track == 0 || this.sm.getSong().countTracks() == 1 );
+
+		List<TGMeasureHeader> measureHeaders = new ArrayList<TGMeasureHeader>();
+		this.sm.moveMeasureHeaders(segment.getHeaders(),move,0,false);
+		Iterator<TGMeasureHeader> sHeaders = segment.getHeaders().iterator();
+		while(sHeaders.hasNext()){
+			TGMeasureHeader header = sHeaders.next();
+			TGMeasureHeader replace = (replaceHeader ? this.sm.replaceMeasureHeader(header) : this.sm.getMeasureHeaderAt(header.getStart()));
+
+			Iterator<TGMeasureHeader> nextHeaders = this.sm.getMeasureHeadersAfter(replace.getNumber()).iterator();
+			long nextStart =  (replace.getStart() + replace.getLength());
+			while(nextHeaders.hasNext()){
+				TGMeasureHeader next = nextHeaders.next();
+				this.sm.moveMeasureComponents(next, (nextStart - next.getStart() ));
+				this.sm.moveMeasureHeader(next, (nextStart - next.getStart() ) , 0);
+				nextStart = (next.getStart() + next.getLength());
+			}
+			measureHeaders.add(replace);
+		}
+
+		Iterator<TGTrackSegment> sTracks = segment.getTracks().iterator();
+		while(sTracks.hasNext()){
+			TGTrackSegment tSegment = sTracks.next();
+			TGTrack currTrack = this.sm.getTrack( (track > 0 && segment.getTracks().size() == 1)?track:tSegment.getTrack());
+			if(currTrack != null){
+				for(int i = 0;i < tSegment.getMeasures().size();i++){
+					TGMeasure measure = tSegment.getMeasures().get(i);
+					measure.setHeader(measureHeaders.get(i));
+					//this.sm.getMeasureManager().removeNotesAfterString(measure, currTrack.stringCount());
+					//this.sm.getMeasureManager().moveAllBeats(measure,move);
+					this.sm.getMeasureManager().moveAllBeats(measure,move);
+					this.sm.getMeasureManager().removeVoicesOutOfTime(measure);
+					this.sm.getMeasureManager().removeNotesAfterString(measure, currTrack.stringCount());
+					this.sm.getTrackManager().replaceMeasure(currTrack,measure);
+				}
+			}
+		}
+	}
+
+	private List<TGMeasure> getEmptyMeasures(int count, int clef, int keySignature) {
+		List<TGMeasure> measures = new ArrayList<TGMeasure>();
+		for(int i = 0 ; i < count ; i ++ ){
+			TGMeasure measure = this.sm.getFactory().newMeasure(null);
+			measure.setClef(clef);
+			measure.setKeySignature(keySignature);
+			measures.add(measure);
+		}
+		return measures;
+	}
+
+	public TGSongSegment createSegmentCopies( TGSongSegment srcSegment , int count ){
+		TGSongSegment segment = srcSegment.clone( this.sm.getFactory() );
+
+		int mCount = segment.getHeaders().size();
+		int tCount = segment.getTracks().size();
+
+		TGMeasureHeader fMeasure = segment.getHeaders().get( 0 );
+		TGMeasureHeader lMeasure = segment.getHeaders().get( mCount - 1 );
+
+		long mMove = ( ( lMeasure.getStart() + lMeasure.getLength() ) - fMeasure.getStart() );
+		for( int i = 1 ; i < count ; i ++ ){
+			for(int m = 0; m < mCount; m++ ){
+				TGMeasureHeader header = segment.getHeaders().get(m).clone( this.sm.getFactory() );
+				segment.getHeaders().add( header );
+				this.sm.moveMeasureHeader(header,(mMove * i),(mCount * i));
+				for( int t = 0 ; t < tCount ; t ++ ){
+					TGTrackSegment track = segment.getTracks().get( t );
+					TGMeasure measure = track.getMeasures().get( m ).clone(this.sm.getFactory(), header );
+					track.getMeasures().add( measure );
+					this.sm.getMeasureManager().moveAllBeats(measure, (mMove * i));
+				}
+			}
+		}
+
+		return segment;
+	}
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGTrackSegment.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
new file mode 100644
index 00000000..ea05967b
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
@@ -0,0 +1,38 @@
+package org.herac.tuxguitar.song.helpers;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+
+public class TGTrackSegment implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private final int track;
+	private final List<TGMeasure> measures;
+
+	public TGTrackSegment(int track,List<TGMeasure> measures){
+		this.track = track;
+		this.measures = measures;
+	}
+
+	public List<TGMeasure> getMeasures() {
+		return this.measures;
+	}
+
+	public int getTrack() {
+		return this.track;
+	}
+
+	public Object clone(TGFactory factory,List<TGMeasureHeader> headers){
+		List<TGMeasure> measures = new ArrayList<TGMeasure>();
+		for(int i = 0;i < getMeasures().size();i++){
+			TGMeasure measure = getMeasures().get(i);
+			measures.add(measure.clone(factory,headers.get(i)));
+		}
+		return new TGTrackSegment(getTrack(),measures);
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/managers/TGMeasureManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGMeasureManager.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/song/managers/TGMeasureManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGMeasureManager.java
index c7c612dc..cab3fb32 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/managers/TGMeasureManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGMeasureManager.java
@@ -25,16 +25,16 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
 
 public class TGMeasureManager {
-	private TGSongManager songManager;
-	
+	private final TGSongManager songManager;
+
 	public TGMeasureManager(TGSongManager songManager){
 		this.songManager = songManager;
 	}
-	
+
 	public TGSongManager getSongManager(){
 		return this.songManager;
 	}
-	
+
 	public void orderBeats(TGMeasure measure){
 		for(int i = 0;i < measure.countBeats();i++){
 			TGBeat minBeat = null;
@@ -47,30 +47,30 @@ public void orderBeats(TGMeasure measure){
 			measure.moveBeat(i, minBeat);
 		}
 	}
-	
+
 	/**
 	 * Agrega un beat al compas
 	 */
 	public void addBeat(TGMeasure measure,TGBeat beat){
 		//Verifico si entra en el compas
 		//if(validateDuration(measure,beat,false,false)){
-			
+
 			//Agrego el beat
 			measure.addBeat(beat);
 		//}
 	}
-	
+
 	public void removeBeat(TGBeat beat){
 		beat.getMeasure().removeBeat(beat);
 	}
-	
+
 	public void removeBeat(TGMeasure measure,long start,boolean moveNextComponents){
 		TGBeat beat = getBeat(measure, start);
 		if(beat != null){
 			removeBeat(beat, moveNextComponents);
 		}
 	}
-	
+
 	/**
 	 * Elimina un silencio del compas.
 	 * si se asigna moveNextComponents = true. los componentes que le siguen
@@ -78,13 +78,13 @@ public void removeBeat(TGMeasure measure,long start,boolean moveNextComponents){
 	 */
 	public void removeBeat(TGBeat beat,boolean moveNextBeats){
 		TGMeasure measure = beat.getMeasure();
-		
+
 		removeBeat(beat);
 		if(moveNextBeats){
 			TGDuration minimumDuration = getMinimumDuration(beat);
 			long start = beat.getStart();
 			long length = (minimumDuration != null ? minimumDuration.getTime() : 0);
-			
+
 			TGBeat next = getNextBeat(measure.getBeats(),beat);
 			if(next != null){
 				length = next.getStart() - start;
@@ -92,12 +92,12 @@ public void removeBeat(TGBeat beat,boolean moveNextBeats){
 			moveBeatsInMeasure(beat.getMeasure(),start + length,-length, minimumDuration);
 		}
 	}
-	
+
 	public void removeEmptyBeats(TGMeasure measure){
-		List beats = new ArrayList();
-		Iterator it = measure.getBeats().iterator();
+		List<TGBeat> beats = new ArrayList<TGBeat>();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			boolean emptyBeat = true;
 			for( int v = 0; v < beat.countVoices() ; v ++){
 				TGVoice voice = beat.getVoice( v );
@@ -109,61 +109,61 @@ public void removeEmptyBeats(TGMeasure measure){
 				beats.add( beat );
 			}
 		}
-		
+
 		it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			this.removeBeat( beat );
 		}
 	}
-		
+
 	public void removeBeatsBeforeEnd(TGMeasure measure,long fromStart){
-		List beats = getBeatsBeforeEnd( measure.getBeats() , fromStart);
-		Iterator it = beats.iterator();
+		List<TGBeat> beats = getBeatsBeforeEnd( measure.getBeats() , fromStart);
+		Iterator<TGBeat> it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat) it.next();
+			TGBeat beat = it.next();
 			removeBeat(beat);
 		}
 	}
-	
+
 	public void removeBeatsBeetween(TGMeasure measure,long p1, long p2){
-		List beats = getBeatsBeetween( measure.getBeats() , p1, p2 );
-		Iterator it = beats.iterator();
+		List<TGBeat> beats = getBeatsBeetween( measure.getBeats() , p1, p2 );
+		Iterator<TGBeat> it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat) it.next();
+			TGBeat beat = it.next();
 			removeBeat(beat);
 		}
 	}
-	
+
 	public void addNote(TGMeasure measure,long start, TGNote note, TGDuration duration, int voice){
 		TGBeat beat = getBeat(measure, start);
 		if(beat != null){
 			addNote(beat, note, duration, voice);
 		}
 	}
-	
+
 	public void addNote(TGBeat beat, TGNote note, TGDuration duration, int voice){
 		addNote(beat, note, duration, beat.getStart(),voice);
 	}
-	
+
 	public void addNote(TGBeat beat, TGNote note, TGDuration duration, long start, int voice){
 		boolean emptyVoice = beat.getVoice( voice ).isEmpty();
 		if( emptyVoice ){
 			beat.getVoice( voice ).setEmpty( false );
 		}
-		
+
 		//Verifico si entra en el compas
 		if(validateDuration(beat.getMeasure(),beat, voice, duration,true,true)){
 			//Borro lo que haya en la misma posicion
 			for( int v = 0 ; v < beat.countVoices() ; v ++ ){
 				removeNote(beat.getMeasure(),beat.getStart(), v, note.getString(), false);
 			}
-			
+
 			duration.copy(beat.getVoice(voice).getDuration());
-			
+
 			//trato de agregar un silencio similar al lado
 			tryChangeSilenceAfter(beat.getMeasure(),beat.getVoice(voice));
-			
+
 			// Despues de cambiar la duracion, verifico si hay un beat mejor para agregar la nota.
 			TGVoice realVoice = beat.getVoice(voice);
 			if(realVoice.getBeat().getStart() != start){
@@ -177,19 +177,19 @@ public void addNote(TGBeat beat, TGNote note, TGDuration duration, long start, i
 			beat.getVoice( voice ).setEmpty( emptyVoice );
 		}
 	}
-	
+
 	public void removeNote(TGNote note, boolean checkRestBeat){
 		//note.getVoice().removeNote(note);
 		TGVoice voice = note.getVoice();
 		if( voice != null ){
 			// Remove the note
 			voice.removeNote(note);
-			
+
 			TGBeat beat = voice.getBeat();
 			if(checkRestBeat && beat.isRestBeat()){
 				//Anulo un posible stroke
 				beat.getStroke().setDirection( TGStroke.STROKE_NONE );
-				
+
 				//Borro un posible acorde
 				if( beat.getMeasure() != null ){
 					removeChord(beat.getMeasure(), beat.getStart());
@@ -197,15 +197,15 @@ public void removeNote(TGNote note, boolean checkRestBeat){
 			}
 		}
 	}
-	
+
 	public void removeNote(TGNote note){
 		this.removeNote(note, true);
 	}
-	
+
 	public void removeNote(TGMeasure measure,long start, int voiceIndex,int string){
 		this.removeNote(measure, start, voiceIndex, string, true);
 	}
-	
+
 	/**
 	 * Elimina los Componentes que empiecen en Start y esten en la misma cuerda
 	 * Si hay un Silencio lo borra sin importar la cuerda
@@ -223,64 +223,64 @@ public void removeNote(TGMeasure measure,long start, int voiceIndex,int string,
 			}
 		}
 	}
-	
+
 	public void removeNotesAfterString(TGMeasure measure,int string){
-		List notesToRemove = new ArrayList();
-		
-		Iterator beats = measure.getBeats().iterator();
+		List<TGNote> notesToRemove = new ArrayList<TGNote>();
+
+		Iterator<TGBeat> beats = measure.getBeats().iterator();
 		while(beats.hasNext()){
-			TGBeat beat = (TGBeat)beats.next();
+			TGBeat beat = beats.next();
 			for(int v = 0; v < beat.countVoices(); v ++){
 				TGVoice voice = beat.getVoice( v );
-				Iterator notes = voice.getNotes().iterator();
+				Iterator<TGNote> notes = voice.getNotes().iterator();
 				while(notes.hasNext()){
-					TGNote note = (TGNote)notes.next();
+					TGNote note = notes.next();
 					if(note.getString() > string){
 						notesToRemove.add(note);
 					}
 				}
 			}
 		}
-		Iterator it = notesToRemove.iterator();
+		Iterator<TGNote> it = notesToRemove.iterator();
 		while(it.hasNext()){
-			TGNote note = (TGNote)it.next();
+			TGNote note = it.next();
 			removeNote(note);
 		}
 	}
-	
+
 	/**
 	 * Retorna Todas las Notas en la posicion Start
 	 */
-	public List getNotes(TGMeasure measure,long start){
-		List notes = new ArrayList();
-		
+	public List<TGNote> getNotes(TGMeasure measure,long start){
+		List<TGNote> notes = new ArrayList<TGNote>();
+
 		TGBeat beat = getBeat(measure, start);
 		if(beat != null){
 			for(int v = 0 ; v < beat.countVoices(); v ++){
 				TGVoice voice = beat.getVoice( v );
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while(it.hasNext()){
-					TGNote note = (TGNote)it.next();
+					TGNote note = it.next();
 					notes.add(note);
 				}
 			}
 		}
 		return notes;
 	}
-	
+
 	/**
 	 * Retorna Todas las Notas en el pulso
 	 */
-	public List getNotes(TGBeat beat){
-		List notes = new ArrayList();
-		
+	public List<TGNote> getNotes(TGBeat beat){
+		List<TGNote> notes = new ArrayList<TGNote>();
+
 		if(beat != null){
 			for(int v = 0 ; v < beat.countVoices(); v ++){
 				TGVoice voice = beat.getVoice( v );
 				if( !voice.isEmpty() && !voice.isRestVoice() ){
-					Iterator it = voice.getNotes().iterator();
+					Iterator<TGNote> it = voice.getNotes().iterator();
 					while(it.hasNext()){
-						TGNote note = (TGNote)it.next();
+						TGNote note = it.next();
 						notes.add(note);
 					}
 				}
@@ -288,7 +288,7 @@ public List getNotes(TGBeat beat){
 		}
 		return notes;
 	}
-	
+
 	/**
 	 * Retorna la Nota en la posicion y cuerda
 	 */
@@ -299,7 +299,7 @@ public TGNote getNote(TGMeasure measure,long start,int string) {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Retorna la Nota en la cuerda
 	 */
@@ -315,18 +315,18 @@ public TGNote getNote(TGBeat beat,int string) {
 		}
 		return null;
 	}
-	
+
 	public TGNote getNote(TGVoice voice,int string) {
-		Iterator it = voice.getNotes().iterator();
+		Iterator<TGNote> it = voice.getNotes().iterator();
 		while(it.hasNext()){
-			TGNote note = (TGNote)it.next();
+			TGNote note = it.next();
 			if (note.getString() == string) {
 				return note;
 			}
 		}
 		return null;
 	}
-	
+
 	public TGNote getPreviousNote(TGMeasure measure,long start, int voiceIndex, int string) {
 		TGBeat beat = getBeat(measure, start);
 		if( beat != null ){
@@ -346,7 +346,7 @@ public TGNote getPreviousNote(TGMeasure measure,long start, int voiceIndex, int
 		}
 		return null;
 	}
-	
+
 	public TGNote getNextNote(TGMeasure measure,long start, int voiceIndex, int string) {
 		TGBeat beat = getBeat(measure, start);
 		if( beat != null ){
@@ -366,7 +366,7 @@ public TGNote getNextNote(TGMeasure measure,long start, int voiceIndex, int stri
 		}
 		return null;
 	}
-	
+
 	public TGDuration getMinimumDuration(TGBeat beat){
 		TGDuration minimumDuration = null;
 		for(int v = 0; v < beat.countVoices(); v ++){
@@ -379,14 +379,14 @@ public TGDuration getMinimumDuration(TGBeat beat){
 		}
 		return minimumDuration;
 	}
-	
+
 	public TGBeat getBeat(TGTrack track,long start) {
-		Iterator measures = track.getMeasures();
+		Iterator<TGMeasure> measures = track.getMeasures();
 		while( measures.hasNext() ){
-			TGMeasure measure = (TGMeasure)measures.next();
-			Iterator beats = measure.getBeats().iterator();
+			TGMeasure measure = measures.next();
+			Iterator<TGBeat> beats = measure.getBeats().iterator();
 			while(beats.hasNext()){
-				TGBeat beat = (TGBeat)beats.next();
+				TGBeat beat = beats.next();
 				if (beat.getStart() == start) {
 					return beat;
 				}
@@ -398,24 +398,24 @@ public TGBeat getBeat(TGTrack track,long start) {
 	 * Retorna las Nota en la posicion y cuerda
 	 */
 	public TGBeat getBeat(TGMeasure measure,long start) {
-		Iterator it = measure.getBeats().iterator();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			if (beat.getStart() == start) {
 				return beat;
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Retorna las Nota en la posicion y cuerda
 	 */
 	public TGBeat getBeatIn(TGMeasure measure,long start) {
 		TGBeat beatIn = null;
-		Iterator it = measure.getBeats().iterator();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			TGDuration duration = getMinimumDuration(beat);
 			if (beat.getStart() <= start && (beat.getStart() + duration.getTime() > start)) {
 				if(beatIn == null || beat.getStart() > beatIn.getStart()){
@@ -425,14 +425,14 @@ public TGBeat getBeatIn(TGMeasure measure,long start) {
 		}
 		return beatIn;
 	}
-	
+
 	/**
 	 * Retorna las Nota en la posicion y cuerda
 	 */
 	public TGVoice getVoiceIn(TGMeasure measure,long start, int voiceIndex) {
-		Iterator it = measure.getBeats().iterator();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			TGVoice voice = beat.getVoice(voiceIndex);
 			if (!voice.isEmpty() && beat.getStart() <= start && (beat.getStart() + voice.getDuration().getTime() > start)) {
 				return voice;
@@ -440,14 +440,14 @@ public TGVoice getVoiceIn(TGMeasure measure,long start, int voiceIndex) {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Retorna el Siguiente Componente
 	 */
-	public TGBeat getNextBeat(List beats,TGBeat beat) {
+	public TGBeat getNextBeat(List<TGBeat> beats,TGBeat beat) {
 		TGBeat next = null;
 		for (int i = 0; i < beats.size(); i++) {
-			TGBeat current = (TGBeat) beats.get(i);
+			TGBeat current = beats.get(i);
 			if (current.getStart() > beat.getStart()) {
 				if (next == null) {
 					next = current;
@@ -460,14 +460,14 @@ public TGBeat getNextBeat(List beats,TGBeat beat) {
 		}
 		return next;
 	}
-	
+
 	/**
 	 * Retorna el Componente Anterior
 	 */
-	public TGBeat getPreviousBeat(List beats,TGBeat beat) {
+	public TGBeat getPreviousBeat(List<TGBeat> beats,TGBeat beat) {
 		TGBeat previous = null;
 		for (int i = 0; i < beats.size(); i++) {
-			TGBeat current = (TGBeat) beats.get(i);
+			TGBeat current = beats.get(i);
 			if (current.getStart() < beat.getStart()) {
 				if (previous == null) {
 					previous = current;
@@ -480,35 +480,35 @@ public TGBeat getPreviousBeat(List beats,TGBeat beat) {
 		}
 		return previous;
 	}
-	
+
 	/**
 	 * Retorna el Primer Componente
 	 */
-	public TGBeat getFirstBeat(List components) {
+	public TGBeat getFirstBeat(List<TGBeat> components) {
 		TGBeat first = null;
 		for (int i = 0; i < components.size(); i++) {
-			TGBeat component = (TGBeat) components.get(i);
+			TGBeat component = components.get(i);
 			if (first == null || component.getStart() < first.getStart()) {
 				first = component;
 			}
 		}
 		return first;
 	}
-	
+
 	/**
 	 * Retorna el Ultimo Componente
 	 */
-	public TGBeat getLastBeat(List components) {
+	public TGBeat getLastBeat(List<TGBeat> components) {
 		TGBeat last = null;
 		for (int i = 0; i < components.size(); i++) {
-			TGBeat component = (TGBeat) components.get(i);
+			TGBeat component = components.get(i);
 			if (last == null || last.getStart() < component.getStart()) {
 				last = component;
 			}
 		}
 		return last;
 	}
-	
+
 	/**
 	 * Retorna el Siguiente Componente
 	 */
@@ -521,34 +521,34 @@ public TGBeat getNextRestBeat(List beats,TGBeat component) {
 		return next;
 	}
 	*/
-	
+
 	/**
 	 * Retorna Todos los desde Start hasta el final del compas
 	 */
-	public List getBeatsBeforeEnd(List beats,long fromStart) {
-		List list = new ArrayList();
-		Iterator it = beats.iterator();
+	public List<TGBeat> getBeatsBeforeEnd(List<TGBeat> beats,long fromStart) {
+		List<TGBeat> list = new ArrayList<TGBeat>();
+		Iterator<TGBeat> it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat current = (TGBeat)it.next();
+			TGBeat current = it.next();
 			if (current.getStart() >= fromStart) {
 				list.add(current);
 			}
 		}
 		return list;
 	}
-	
-	public List getBeatsBeetween(List beats,long p1, long p2) {
-		List list = new ArrayList();
-		Iterator it = beats.iterator();
+
+	public List<TGBeat> getBeatsBeetween(List<TGBeat> beats,long p1, long p2) {
+		List<TGBeat> list = new ArrayList<TGBeat>();
+		Iterator<TGBeat> it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat current = (TGBeat)it.next();
+			TGBeat current = it.next();
 			if (current.getStart() >= p1 && current.getStart() < p2 ) {
 				list.add(current);
 			}
 		}
 		return list;
 	}
-	
+
 	public void locateBeat( TGBeat beat, TGTrack track , boolean newMeasureAlsoForRestBeats) {
 		if( beat.getMeasure() != null ){
 			beat.getMeasure().removeBeat(beat);
@@ -561,7 +561,7 @@ public void locateBeat( TGBeat beat, TGTrack track , boolean newMeasureAlsoForRe
 				createNewMeasure = ( !beat.isRestBeat() || beat.isTextBeat() );
 			}
 			if( createNewMeasure ){
-				
+
 				while( newMeasure == null && beat.getStart() >= TGDuration.QUARTER_TIME){
 					getSongManager().addNewMeasureBeforeEnd();
 					newMeasure = getSongManager().getTrackManager().getMeasureAt(track, beat.getStart() );
@@ -605,23 +605,23 @@ public void locateBeat( TGBeat beat, TGTrack track , boolean newMeasureAlsoForRe
 							}
 							newVoice.setEmpty( false );
 							newVoiceDuration.copy( newVoice.getDuration() );
-							
+
 							locateBeat(newBeat, track, newMeasureAlsoForRestBeats);
 						}
 					}
 				}
 			}
-			
+
 			newMeasure.addBeat(beat);
 		}
 	}
-	
+
 	public void moveOutOfBoundsBeatsToNewMeasure(TGMeasure measure){
 		this.moveOutOfBoundsBeatsToNewMeasure(measure, true );
 	}
-	
+
 	public void moveOutOfBoundsBeatsToNewMeasure(TGMeasure measure, boolean newMeasureAlsoForRestBeats ){
-		List beats = new ArrayList();
+		List<TGBeat> beats = new ArrayList<TGBeat>();
 		long mStart = measure.getStart();
 		long mLength = measure.getLength();
 		for( int i = 0; i < measure.countBeats() ; i ++ ){
@@ -641,17 +641,17 @@ public void moveOutOfBoundsBeatsToNewMeasure(TGMeasure measure, boolean newMeasu
 			}
 		}
 		while( !beats.isEmpty() ){
-			TGBeat beat = (TGBeat)beats.get( 0 );
+			TGBeat beat = beats.get( 0 );
 			if( beat.getMeasure() != null ){
 				beat.getMeasure().removeBeat(beat);
 				beat.setMeasure(null);
 			}
 			this.locateBeat(beat, measure.getTrack(), newMeasureAlsoForRestBeats);
-			
+
 			beats.remove(0);
 		}
 	}
-	
+
 	public boolean moveBeatsInMeasure(TGMeasure measure,long start,long theMove, TGDuration fillDuration){
 		if( theMove == 0 ){
 			return false;
@@ -659,15 +659,15 @@ public boolean moveBeatsInMeasure(TGMeasure measure,long start,long theMove, TGD
 		boolean success = true;
 		long measureStart = measure.getStart();
 		long measureEnd =  (measureStart + measure.getLength());
-		
+
 		// Muevo los componentes
-		List beatsToMove = getBeatsBeforeEnd(measure.getBeats(),start);
+		List<TGBeat> beatsToMove = getBeatsBeforeEnd(measure.getBeats(),start);
 		moveBeats(beatsToMove,theMove);
-		
+
 		if(success){
-			List beatsToRemove = new ArrayList();
-			List beats = new ArrayList(measure.getBeats());
-			
+			List<TGBeat> beatsToRemove = new ArrayList<TGBeat>();
+			List<TGBeat> beats = new ArrayList<TGBeat>(measure.getBeats());
+
 			// Verifica los silencios a eliminar al principio del compas
 			TGBeat first = getFirstBeat( beats );
 			while(first != null && first.isRestBeat() && !first.isTextBeat() && first.getStart() < measureStart){
@@ -675,7 +675,7 @@ public boolean moveBeatsInMeasure(TGMeasure measure,long start,long theMove, TGD
 				beatsToRemove.add(first);
 				first = getNextBeat( beats,first);
 			}
-			
+
 			// Verifica los silencios a eliminar al final del compas
 			TGBeat last = getLastBeat(beats);
 			TGDuration lastDuration = (last != null ? getMinimumDuration(last) : null);
@@ -685,22 +685,22 @@ public boolean moveBeatsInMeasure(TGMeasure measure,long start,long theMove, TGD
 				last = getPreviousBeat(beats,last);
 				lastDuration = (last != null ? getMinimumDuration(last) : null);
 			}
-			
+
 			// Si el primer o ultimo componente, quedan fuera del compas, entonces el movimiento no es satisfactorio
 			if(first != null && last != null && lastDuration != null){
 				if(first.getStart() < measureStart || (last.getStart() + lastDuration.getTime()) > measureEnd){
 					success = false;
 				}
 			}
-			
+
 			if(success){
 				// Elimino los silencios que quedaron fuera del compas.
-				Iterator it = beatsToRemove.iterator();
+				Iterator<TGBeat> it = beatsToRemove.iterator();
 				while( it.hasNext() ){
-					TGBeat beat = (TGBeat)it.next();
+					TGBeat beat = it.next();
 					removeBeat(beat);
 				}
-				
+
 				// Se crean silencios en los espacios vacios, si la duracion fue especificada.
 				if( fillDuration != null ){
 					if( theMove < 0 ){
@@ -733,45 +733,45 @@ public boolean moveBeatsInMeasure(TGMeasure measure,long start,long theMove, TGD
 				}
 			}
 		}
-		
+
 		// Si el movimiento no es satisfactorio, regreso todo como estaba
 		if(! success ){
 			moveBeats(beatsToMove,-theMove);
 		}
-		
+
 		return success;
 	}
-	
+
 	public void moveAllBeats(TGMeasure measure,long theMove){
 		moveBeats(measure.getBeats(),theMove);
 	}
-	
+
 	public void moveBeats(TGMeasure measure, long start, long theMove){
 		moveBeats(getBeatsBeforeEnd(measure.getBeats(), start),theMove);
 	}
-	
+
 	/**
 	 * Mueve los componentes
 	 */
-	private void moveBeats(List beats,long theMove){
-		Iterator it = beats.iterator();
+	private void moveBeats(List<TGBeat> beats,long theMove){
+		Iterator<TGBeat> it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			moveBeat(beat,theMove);
 		}
 	}
-	
+
 	/**
 	 * Mueve el componente
 	 */
 	private void moveBeat(TGBeat beat,long theMove){
 		//obtengo el start viejo
 		long start = beat.getStart();
-		
+
 		//asigno el nuevo start
 		beat.setStart(start + theMove);
 	}
-	
+
 	public void cleanBeat(TGBeat beat){
 		beat.getStroke().setDirection( TGStroke.STROKE_NONE );
 		if( beat.getText() != null ){
@@ -780,23 +780,23 @@ public void cleanBeat(TGBeat beat){
 		if( beat.getChord() != null){
 			beat.removeChord();
 		}
-		
+
 		this.cleanBeatNotes(beat);
 	}
-	
+
 	public void cleanBeatNotes(TGBeat beat){
 		for(int v = 0; v < beat.countVoices(); v ++){
 			cleanVoiceNotes(beat.getVoice( v ));
 		}
 	}
-	
+
 	public void cleanBeatNotes(TGMeasure measure, long start){
 		TGBeat beat = getBeat(measure, start);
 		if(beat != null){
 			cleanBeatNotes(beat);
 		}
 	}
-	
+
 	public void cleanVoiceNotes(TGVoice voice){
 		if(!voice.isEmpty()){
 			while(voice.countNotes() > 0 ){
@@ -814,7 +814,7 @@ public void addChord(TGMeasure measure,long start, TGChord chord){
 			addChord(beat, chord);
 		}
 	}
-	
+
 	/**
 	 * Agrega el acorde al compas
 	 */
@@ -822,7 +822,7 @@ public void addChord(TGBeat beat,TGChord chord){
 		beat.removeChord();
 		beat.setChord(chord);
 	}
-	
+
 	/**
 	 * Retorna el acorde en la position
 	 */
@@ -833,7 +833,7 @@ public TGChord getChord(TGMeasure measure,long start) {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Borra el acorde en la position
 	 */
@@ -843,7 +843,7 @@ public void removeChord(TGMeasure measure,long start) {
 			beat.removeChord();
 		}
 	}
-	
+
 	/**
 	 * Agrega el texto al compas
 	 */
@@ -853,7 +853,7 @@ public void addText(TGMeasure measure,long start, TGText text){
 			addText(beat, text);
 		}
 	}
-	
+
 	/**
 	 * Agrega el texto al compas
 	 */
@@ -863,7 +863,7 @@ public void addText(TGBeat beat,TGText text){
 			beat.setText(text);
 		}
 	}
-	
+
 	/**
 	 * Retorna el texto en la position
 	 */
@@ -874,14 +874,14 @@ public TGText getText(TGMeasure measure,long start) {
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Borra el texto en el pulso
 	 */
 	public void removeText(TGBeat beat){
 		beat.removeText();
 	}
-	
+
 	/**
 	 * Borra el texto en la position
 	 */
@@ -893,27 +893,27 @@ public boolean removeText(TGMeasure measure,long start) {
 		}
 		return false;
 	}
-	
+
 	public void cleanMeasure(TGMeasure measure){
 		while( measure.countBeats() > 0){
 			removeBeat( measure.getBeat(0));
 		}
 	}
-	
+
 	/**
 	 * Mueve la nota a la cuerda de arriba
 	 */
 	public int shiftNoteUp(TGMeasure measure,long start,int string){
 		return shiftNote(measure, start, string,-1);
 	}
-	
+
 	/**
 	 * Mueve la nota a la cuerda de abajo
 	 */
 	public int shiftNoteDown(TGMeasure measure,long start,int string){
 		return shiftNote(measure, start, string,1);
 	}
-	
+
 	/**
 	 * Mueve la nota a la siguiente cuerda
 	 */
@@ -938,21 +938,21 @@ private int shiftNote(TGMeasure measure,long start,int string,int move){
 		}
 		return 0;
 	}
-	
+
 	/**
 	 * Mueve la nota 1 semitono arriba
 	 */
 	public boolean moveSemitoneUp(TGMeasure measure,long start,int string){
 		return moveSemitone(measure, start, string,1);
 	}
-	
+
 	/**
 	 * Mueve la nota 1 semitono abajo
 	 */
 	public boolean moveSemitoneDown(TGMeasure measure,long start,int string){
 		return moveSemitone(measure, start, string,-1);
 	}
-	
+
 	/**
 	 * Mueve la nota los semitonos indicados
 	 */
@@ -967,7 +967,7 @@ private boolean moveSemitone(TGMeasure measure,long start,int string,int semiton
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Set the beat stroke
 	 */
@@ -980,18 +980,18 @@ public boolean setStroke(TGMeasure measure,long start,int value, int direction){
 		}
 		return false;
 	}
-	
+
 	/**
 	 * Verifica si el componente se puede insertar en el compas.
 	 * si no puede, con la opcion removeSilences, verifica si el motivo por el
-	 * cual no entra es que lo siguen silencios. de ser asi los borra. 
+	 * cual no entra es que lo siguen silencios. de ser asi los borra.
 	 */
 	/*
 	public boolean validateDuration(TGMeasure measure,TGBeat beat,boolean moveNextComponents, boolean setCurrentDuration){
 		return validateDuration(measure, beat, beat.getDuration(),moveNextComponents, setCurrentDuration);
 	}
-	
-	
+
+
 	public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duration,boolean moveNextBeats, boolean setCurrentDuration){
 		int errorMargin = 10;
 		this.orderBeats(measure);
@@ -1001,13 +1001,13 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duratio
 		long beatLength = duration.getTime();
 		long beatEnd = (beatStart + beatLength);
 		List beats = measure.getBeats();
-		
+
 		//Verifico si hay un beat en el mismo lugar, y comparo las duraciones.
 		TGBeat currentBeat = getBeat(measure,beatStart);
 		if(currentBeat != null && beatLength <= currentBeat.getDuration().getTime()){
 			return true;
 		}
-		
+
 		//Verifico si hay lugar para meter el beat
 		TGBeat nextComponent = getNextBeat(beats,beat);
 		if(currentBeat == null){
@@ -1018,7 +1018,7 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duratio
 				return true;
 			}
 		}
-		
+
 		// Busca si hay espacio disponible de silencios entre el componente y el el que le sigue.. si encuentra lo borra
 		if(nextComponent != null && nextComponent.isRestBeat()){
 			//Verifico si lo que sigue es un silencio. y lo borro
@@ -1043,7 +1043,7 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duratio
 				return true;
 			}
 		}
-		
+
 		// Busca si hay espacio disponible de silencios entre el componente y el final.. si encuentra mueve todo
 		if(moveNextBeats){
 			nextComponent = getNextBeat(beats,beat);
@@ -1051,11 +1051,11 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duratio
 				long requiredLength = (beatLength  - (nextComponent.getStart() - beatStart));
 				long nextSilenceLength = 0;
 				TGBeat nextRestBeat = getNextRestBeat(beats, beat);
-				while(nextRestBeat != null && !nextRestBeat.isTextBeat()){ 
+				while(nextRestBeat != null && !nextRestBeat.isTextBeat()){
 					nextSilenceLength += nextRestBeat.getDuration().getTime();
 					nextRestBeat = getNextRestBeat(beats, nextRestBeat);
 				}
-				
+
 				if(requiredLength <= (nextSilenceLength + errorMargin)){
 					beats = getBeatsBeforeEnd(measure.getBeats(),nextComponent.getStart());
 					while(!beats.isEmpty()){
@@ -1072,7 +1072,7 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duratio
 				}
 			}
 		}
-		
+
 		// como ultimo intento, asigno la duracion de cualquier componente existente en el lugar.
 		if(setCurrentDuration && currentBeat != null){
 			currentBeat.getDuration().copy( duration );
@@ -1089,12 +1089,12 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,TGDuration duratio
 	public void changeDuration(TGMeasure measure,TGBeat beat,TGDuration duration,boolean tryMove){
 		//obtengo la duracion vieja
 		TGDuration oldDuration = beat.getDuration().clone(getSongManager().getFactory());
-		
+
 		//si no entra vuelvo a dejar la vieja
 		if(validateDuration(measure,beat, duration,tryMove,false)){
 			//se lo agrego a todas las notas en la posicion
 			beat.setDuration(duration.clone(getSongManager().getFactory()));
-			
+
 			//trato de agregar un silencio similar al lado
 			tryChangeSilenceAfter(measure,beat);
 		}else{
@@ -1107,7 +1107,7 @@ public void changeDuration(TGMeasure measure,TGBeat beat,TGDuration duration,boo
 	public void tryChangeSilenceAfter(TGMeasure measure,TGBeat beat){
 		autoCompleteSilences(measure);
 		TGBeat nextBeat = getNextBeat(measure.getBeats(),beat);
-		
+
 		long beatEnd = (beat.getStart() + beat.getDuration().getTime());
 		long measureEnd = (measure.getStart() + measure.getLength());
 		if(nextBeat != null && nextBeat.isRestBeat() && beatEnd <= measureEnd){
@@ -1125,15 +1125,15 @@ public void tryChangeSilenceAfter(TGMeasure measure,TGBeat beat){
 	/*
 	public void autoCompleteSilences(TGMeasure measure){
 		List components = measure.getBeats();
-		
+
 		for( int i = 0; i < TGBeat.MAX_VOICES; i ++ ){
 			//TGBeat component = getFirstBeat(components);
 			TGVoice component = getFirstVoice(components, i);
-			
+
 			long start = measure.getStart();
 			long end = 0;
 			long diff = 0;
-			
+
 			while (component != null) {
 				end = component.getBeat().getStart() + component.getDuration().getTime();
 				if(component.getBeat().getStart() > start){
@@ -1165,21 +1165,21 @@ public void autoCompleteSilences(TGMeasure measure){
 				createSilences(measure, measure.getStart(), (voice.getBeat().getStart() - measure.getStart()), v);
 			}
 		}
-		
+
 		long[] start = new long[beat.countVoices()];
 		long[] uncompletedLength = new long[beat.countVoices()];
 		for( int v = 0; v < uncompletedLength.length; v ++ ){
 			start[v] = 0;
 			uncompletedLength[v] = 0;
 		}
-		
+
 		while (beat != null) {
 			for( int v = 0; v < beat.countVoices(); v ++ ){
 				TGVoice voice = beat.getVoice( v );
 				if( !voice.isEmpty() ){
 					long voiceEnd = (beat.getStart() + voice.getDuration().getTime());
 					long nextPosition = (measure.getStart() + measure.getLength());
-					
+
 					TGVoice nextVoice = getNextVoice(measure.getBeats(), beat, voice.getIndex());
 					if(nextVoice != null){
 						nextPosition = nextVoice.getBeat().getStart();
@@ -1190,7 +1190,7 @@ public void autoCompleteSilences(TGMeasure measure){
 					}
 				}
 			}
-			
+
 			for( int v = 0; v < uncompletedLength.length; v ++ ){
 				if( uncompletedLength[v] > 0 ){
 					createSilences(measure,start[v],uncompletedLength[v], v);
@@ -1201,17 +1201,17 @@ public void autoCompleteSilences(TGMeasure measure){
 			beat = getNextBeat(measure.getBeats(), beat );
 		}
 	}
-	
+
 	/**
 	 * Crea Silencios temporarios en base a length
 	 */
 	private void createSilences(TGMeasure measure,long start,long length, int voiceIndex){
 		long nextStart = start;
-		List durations = createDurations(getSongManager().getFactory(),length);
-		Iterator it = durations.iterator();
+		List<TGDuration> durations = createDurations(getSongManager().getFactory(),length);
+		Iterator<TGDuration> it = durations.iterator();
 		while(it.hasNext()){
-			TGDuration duration = (TGDuration)it.next();
-			
+			TGDuration duration = it.next();
+
 			boolean isNew = false;
 			long beatStart = getRealStart(measure, nextStart);
 			TGBeat beat = getBeat(measure, beatStart);
@@ -1222,11 +1222,11 @@ private void createSilences(TGMeasure measure,long start,long length, int voiceI
 			}
 			//TGBeat beat = getSongManager().getFactory().newBeat();
 			//beat.setStart( getRealStart(measure, nextStart) );
-			
+
 			TGVoice voice = beat.getVoice(voiceIndex);
 			voice.setEmpty(false);
 			duration.copy(voice.getDuration());
-			
+
 			if( isNew ){
 				addBeat(measure,beat);
 			}
@@ -1234,11 +1234,11 @@ private void createSilences(TGMeasure measure,long start,long length, int voiceI
 			//beat.getVoice(0).setEmpty(false);
 			//beat.getVoice(1).setEmpty(false);
 			// /temporal
-			
+
 			nextStart += duration.getTime();
 		}
 	}
-	
+
 	public long getRealStart(TGMeasure measure,long currStart){
 		long beatLength = TGSongManager.getDivisionLength(measure.getHeader());
 		long start = currStart;
@@ -1261,8 +1261,8 @@ public long getRealStart(TGMeasure measure,long currStart){
 		}
 		return start;
 	}
-	
-	/** 
+
+	/**
 	 * Liga la nota
 	 */
 	public void changeTieNote(TGMeasure measure,long start,int string){
@@ -1271,16 +1271,16 @@ public void changeTieNote(TGMeasure measure,long start,int string){
 			changeTieNote(note);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Liga la nota
 	 */
 	public void changeTieNote(TGNote note){
 		note.setTiedNote(!note.isTiedNote());
 		note.getEffect().setDeadNote(false);
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un vibrato
 	 */
 	public void changeVibratoNote(TGMeasure measure,long start,int string){
@@ -1289,16 +1289,16 @@ public void changeVibratoNote(TGMeasure measure,long start,int string){
 			note.getEffect().setVibrato(!note.getEffect().isVibrato());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega una nota muerta
 	 */
 	public void changeDeadNote(TGNote note){
 		note.getEffect().setDeadNote(!note.getEffect().isDeadNote());
 		note.setTiedNote(false);
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un slide
 	 */
 	public void changeSlideNote(TGMeasure measure,long start,int string){
@@ -1307,8 +1307,8 @@ public void changeSlideNote(TGMeasure measure,long start,int string){
 			note.getEffect().setSlide(!note.getEffect().isSlide());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un hammer
 	 */
 	public void changeHammerNote(TGMeasure measure,long start,int string){
@@ -1317,8 +1317,8 @@ public void changeHammerNote(TGMeasure measure,long start,int string){
 			note.getEffect().setHammer(!note.getEffect().isHammer());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un palm-mute
 	 */
 	public void changePalmMute(TGMeasure measure,long start,int string){
@@ -1327,8 +1327,8 @@ public void changePalmMute(TGMeasure measure,long start,int string){
 			note.getEffect().setPalmMute(!note.getEffect().isPalmMute());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un staccato
 	 */
 	public void changeStaccato(TGMeasure measure,long start,int string){
@@ -1337,8 +1337,8 @@ public void changeStaccato(TGMeasure measure,long start,int string){
 			note.getEffect().setStaccato(!note.getEffect().isStaccato());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un let-ring
 	 */
 	public void changeLetRing(TGMeasure measure,long start,int string){
@@ -1347,8 +1347,8 @@ public void changeLetRing(TGMeasure measure,long start,int string){
 			note.getEffect().setLetRing(!note.getEffect().isLetRing());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un tapping
 	 */
 	public void changeTapping(TGMeasure measure,long start,int string){
@@ -1357,8 +1357,8 @@ public void changeTapping(TGMeasure measure,long start,int string){
 			note.getEffect().setTapping(!note.getEffect().isTapping());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un slapping
 	 */
 	public void changeSlapping(TGMeasure measure,long start,int string){
@@ -1367,8 +1367,8 @@ public void changeSlapping(TGMeasure measure,long start,int string){
 			note.getEffect().setSlapping(!note.getEffect().isSlapping());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un popping
 	 */
 	public void changePopping(TGMeasure measure,long start,int string){
@@ -1377,8 +1377,8 @@ public void changePopping(TGMeasure measure,long start,int string){
 			note.getEffect().setPopping(!note.getEffect().isPopping());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un bend
 	 */
 	public void changeBendNote(TGMeasure measure,long start,int string,TGEffectBend bend){
@@ -1387,8 +1387,8 @@ public void changeBendNote(TGMeasure measure,long start,int string,TGEffectBend
 			note.getEffect().setBend(bend);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un tremoloBar
 	 */
 	public void changeTremoloBar(TGMeasure measure,long start,int string,TGEffectTremoloBar tremoloBar){
@@ -1397,28 +1397,28 @@ public void changeTremoloBar(TGMeasure measure,long start,int string,TGEffectTre
 			note.getEffect().setTremoloBar(tremoloBar);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un GhostNote
 	 */
 	public void changeGhostNote(TGMeasure measure,long start,int string){
 		TGNote note = getNote(measure,start,string);
-		if(note != null){ 
+		if(note != null){
 			note.getEffect().setGhostNote(!note.getEffect().isGhostNote());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un AccentuatedNote
 	 */
 	public void changeAccentuatedNote(TGMeasure measure,long start,int string){
 		TGNote note = getNote(measure,start,string);
-		if(note != null){ 
+		if(note != null){
 			note.getEffect().setAccentuatedNote(!note.getEffect().isAccentuatedNote());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un GhostNote
 	 */
 	public void changeHeavyAccentuatedNote(TGMeasure measure,long start,int string){
@@ -1427,8 +1427,8 @@ public void changeHeavyAccentuatedNote(TGMeasure measure,long start,int string){
 			note.getEffect().setHeavyAccentuatedNote(!note.getEffect().isHeavyAccentuatedNote());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un harmonic
 	 */
 	public void changeHarmonicNote(TGMeasure measure,long start,int string,TGEffectHarmonic harmonic){
@@ -1437,8 +1437,8 @@ public void changeHarmonicNote(TGMeasure measure,long start,int string,TGEffectH
 			note.getEffect().setHarmonic(harmonic);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un grace
 	 */
 	public void changeGraceNote(TGMeasure measure,long start,int string,TGEffectGrace grace){
@@ -1447,8 +1447,8 @@ public void changeGraceNote(TGMeasure measure,long start,int string,TGEffectGrac
 			note.getEffect().setGrace(grace);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un trill
 	 */
 	public void changeTrillNote(TGMeasure measure,long start,int string,TGEffectTrill trill){
@@ -1457,8 +1457,8 @@ public void changeTrillNote(TGMeasure measure,long start,int string,TGEffectTril
 			note.getEffect().setTrill(trill);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un tremolo picking
 	 */
 	public void changeTremoloPicking(TGMeasure measure,long start,int string,TGEffectTremoloPicking tremoloPicking){
@@ -1467,8 +1467,8 @@ public void changeTremoloPicking(TGMeasure measure,long start,int string,TGEffec
 			note.getEffect().setTremoloPicking(tremoloPicking);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Agrega un fadeIn
 	 */
 	public void changeFadeIn(TGMeasure measure,long start,int string){
@@ -1477,8 +1477,8 @@ public void changeFadeIn(TGMeasure measure,long start,int string){
 			note.getEffect().setFadeIn(!note.getEffect().isFadeIn());
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Cambia el Velocity
 	 */
 	public void changeVelocity(int velocity,TGMeasure measure,long start,int string){
@@ -1515,16 +1515,16 @@ public static List createDurations(TGFactory factory,long time){
 		return durations;
 	}
 	*/
-	
-	public static List createDurations(TGFactory factory,long time){
-		List durations = new ArrayList();
+
+	public static List<TGDuration> createDurations(TGFactory factory,long time){
+		List<TGDuration> durations = new ArrayList<TGDuration>();
 		TGDuration minimum = factory.newDuration();
 		minimum.setValue(TGDuration.SIXTY_FOURTH);
 		minimum.setDotted(false);
 		minimum.setDoubleDotted(false);
 		minimum.getDivision().setEnters(3);
 		minimum.getDivision().setTimes(2);
-		
+
 		long missingTime = time;
 		while( missingTime > minimum.getTime() ){
 			TGDuration duration = TGDuration.fromTime(factory, missingTime, minimum ,  10);
@@ -1533,27 +1533,27 @@ public static List createDurations(TGFactory factory,long time){
 		}
 		return durations;
 	}
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	 * Retorna el Siguiente Componente
 	 */
-	public TGVoice getNextVoice(List beats,TGBeat beat, int index) {
+	public TGVoice getNextVoice(List<TGBeat> beats,TGBeat beat, int index) {
 		TGVoice next = null;
 		for (int i = 0; i < beats.size(); i++) {
-			TGBeat current = (TGBeat) beats.get(i);
+			TGBeat current = beats.get(i);
 			if (current.getStart() > beat.getStart() && !current.getVoice(index).isEmpty()) {
 				if (next == null) {
 					next = current.getVoice(index);
@@ -1566,14 +1566,14 @@ public TGVoice getNextVoice(List beats,TGBeat beat, int index) {
 		}
 		return next;
 	}
-	
+
 	/**
 	 * Retorna el Componente Anterior
 	 */
-	public TGVoice getPreviousVoice(List beats,TGBeat beat, int index) {
+	public TGVoice getPreviousVoice(List<TGBeat> beats,TGBeat beat, int index) {
 		TGVoice previous = null;
 		for (int i = 0; i < beats.size(); i++) {
-			TGBeat current = (TGBeat) beats.get(i);
+			TGBeat current = beats.get(i);
 			if (current.getStart() < beat.getStart() && !current.getVoice(index).isEmpty()) {
 				if (previous == null) {
 					previous = current.getVoice(index);
@@ -1586,52 +1586,52 @@ public TGVoice getPreviousVoice(List beats,TGBeat beat, int index) {
 		}
 		return previous;
 	}
-	
+
 	/**
 	 * Retorna el Primer Componente
 	 */
-	public TGVoice getFirstVoice(List beats, int index) {
+	public TGVoice getFirstVoice(List<TGBeat> beats, int index) {
 		TGVoice first = null;
 		for (int i = 0; i < beats.size(); i++) {
-			TGBeat current = (TGBeat) beats.get(i);
+			TGBeat current = beats.get(i);
 			if ( (first == null || current.getStart() < first.getBeat().getStart() ) && !current.getVoice(index).isEmpty()) {
 				first = current.getVoice(index);
 			}
 		}
 		return first;
 	}
-	
+
 	/**
 	 * Retorna el Ultimo Componente
 	 */
-	public TGVoice getLastVoice(List beats, int index) {
+	public TGVoice getLastVoice(List<TGBeat> beats, int index) {
 		TGVoice last = null;
 		for (int i = 0; i < beats.size(); i++) {
-			TGBeat current = (TGBeat) beats.get(i);
+			TGBeat current = beats.get(i);
 			if ( (last == null || last.getBeat().getStart() < current.getStart()) && !current.getVoice(index).isEmpty() ) {
 				last = current.getVoice(index);
 			}
 		}
 		return last;
 	}
-	
-	
+
+
 	/**
 	 * Retorna el Siguiente Componente
 	 */
-	public TGVoice getNextRestVoice(List beats,TGVoice voice) {
+	public TGVoice getNextRestVoice(List<TGBeat> beats,TGVoice voice) {
 		TGVoice next = getNextVoice(beats, voice.getBeat(), voice.getIndex());
 		while(next != null && !next.isRestVoice()){
 			next = getNextVoice(beats, next.getBeat(), next.getIndex());
 		}
 		return next;
 	}
-	
-	public List getVoicesBeforeEnd(List beats,long fromStart, int index) {
-		List list = new ArrayList();
-		Iterator it = beats.iterator();
+
+	public List<TGVoice> getVoicesBeforeEnd(List<TGBeat> beats,long fromStart, int index) {
+		List<TGVoice> list = new ArrayList<TGVoice>();
+		Iterator<TGBeat> it = beats.iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			if (beat.getStart() >= fromStart) {
 				TGVoice voice = beat.getVoice(index);
 				if(!voice.isEmpty()){
@@ -1641,34 +1641,34 @@ public List getVoicesBeforeEnd(List beats,long fromStart, int index) {
 		}
 		return list;
 	}
-	
+
 	public void addSilence(TGMeasure measure,long start, TGDuration duration, int voice){
 		TGBeat beat = getBeat(measure, start);
 		if(beat != null){
 			addSilence(beat, duration, voice);
 		}
 	}
-	
+
 	public void addSilence(TGBeat beat, TGDuration duration, int voice){
 		addSilence(beat, duration, beat.getStart(),voice);
 	}
-	
+
 	public void addSilence(TGBeat beat, TGDuration duration, long start, int voice){
 		boolean emptyVoice = beat.getVoice( voice ).isEmpty();
 		if( emptyVoice ){
 			beat.getVoice( voice ).setEmpty( false );
 		}
-		
+
 		//Verifico si entra en el compas
 		if(validateDuration(beat.getMeasure(),beat, voice, duration,true,true)){
 			//Borro lo que haya en la misma posicion
 			//removeNote(beat.getMeasure(),beat.getStart(),voice, note.getString());
-			
+
 			duration.copy(beat.getVoice(voice).getDuration());
-			
+
 			//trato de agregar un silencio similar al lado
 			tryChangeSilenceAfter(beat.getMeasure(),beat.getVoice(voice));
-			
+
 			// Despues de cambiar la duracion, verifico si hay un beat mejor para agregar el silencio.
 			TGVoice realVoice = beat.getVoice(voice);
 			if(realVoice.getBeat().getStart() != start){
@@ -1682,11 +1682,11 @@ public void addSilence(TGBeat beat, TGDuration duration, long start, int voice){
 			beat.getVoice( voice ).setEmpty( emptyVoice );
 		}
 	}
-	
+
 	public void removeVoice(TGVoice voice){
 		voice.setEmpty(true);
-		
-		// Remove the beat If all voices are empty 
+
+		// Remove the beat If all voices are empty
 		TGBeat beat = voice.getBeat();
 		for(int i = 0; i < beat.countVoices(); i ++){
 			if( !beat.getVoice(i).isEmpty() ){
@@ -1695,7 +1695,7 @@ public void removeVoice(TGVoice voice){
 		}
 		this.removeBeat(beat);
 	}
-	
+
 	public void removeVoice(TGVoice voice,boolean moveNextVoices){
 		removeVoice(voice);
 		if(moveNextVoices){
@@ -1708,23 +1708,23 @@ public void removeVoice(TGVoice voice,boolean moveNextVoices){
 			moveVoices(voice.getBeat().getMeasure(),start + length,-length, voice.getIndex(), voice.getDuration());
 		}
 	}
-	
+
 	public void removeVoice(TGMeasure measure,long start,int index, boolean moveNextComponents){
 		TGBeat beat = getBeat(measure, start);
 		if(beat != null){
 			removeVoice(beat.getVoice(index), moveNextComponents);
 		}
 	}
-	
+
 	public void removeVoicesOutOfTime(TGMeasure measure){
-		List voicesToRemove = new ArrayList();
-		
+		List<TGVoice> voicesToRemove = new ArrayList<TGVoice>();
+
 		long mStart = measure.getStart();
 		long mEnd = mStart + measure.getLength();
-		
-		Iterator beats = measure.getBeats().iterator();
+
+		Iterator<TGBeat> beats = measure.getBeats().iterator();
 		while(beats.hasNext()){
-			TGBeat beat = (TGBeat)beats.next();
+			TGBeat beat = beats.next();
 			for( int v = 0; v < beat.countVoices() ; v ++){
 				TGVoice voice = beat.getVoice( v );
 				if(!voice.isEmpty()){
@@ -1734,20 +1734,20 @@ public void removeVoicesOutOfTime(TGMeasure measure){
 				}
 			}
 		}
-		Iterator it = voicesToRemove.iterator();
+		Iterator<TGVoice> it = voicesToRemove.iterator();
 		while(it.hasNext()){
-			TGVoice voice = (TGVoice)it.next();
+			TGVoice voice = it.next();
 			this.removeVoice( voice );
 		}
 	}
-	
+
 	public void removeMeasureVoices(TGMeasure measure,int index){
 		boolean hasNotes = false;
-		
-		List voices = new ArrayList();
-		Iterator it = measure.getBeats().iterator();
+
+		List<TGVoice> voices = new ArrayList<TGVoice>();
+		Iterator<TGBeat> it = measure.getBeats().iterator();
 		while(it.hasNext()){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			TGVoice voice = beat.getVoice(index);
 			if(voice.isRestVoice()){
 				voices.add(voice);
@@ -1756,41 +1756,41 @@ public void removeMeasureVoices(TGMeasure measure,int index){
 				break;
 			}
 		}
-		
+
 		if( !hasNotes ){
-			it = voices.iterator();
-			while(it.hasNext()){
-				TGVoice voice = (TGVoice)it.next();
+			Iterator<TGVoice> itVoices = voices.iterator();
+			while(itVoices.hasNext()){
+				TGVoice voice = itVoices.next();
 				this.removeVoice( voice );
 			}
 		}
 	}
-	
+
 	public void changeVoiceDirection( TGVoice voice , int direction){
 		voice.setDirection( direction );
 	}
-	
+
 	public void changeDuration(TGMeasure measure,TGBeat beat,TGDuration duration,int voice, boolean tryMove){
 		//obtengo la duracion vieja
 		TGDuration oldDuration = beat.getVoice(voice).getDuration().clone(getSongManager().getFactory());
-		
+
 		//si no entra vuelvo a dejar la vieja
 		if(validateDuration(measure,beat, voice, duration,tryMove,false)){
 			//se lo agrego a todas las notas en la posicion
 			beat.getVoice(voice).setDuration(duration.clone(getSongManager().getFactory()));
-			
+
 			//trato de agregar un silencio similar al lado
 			tryChangeSilenceAfter(measure,beat.getVoice(voice));
 		}else{
 			oldDuration.copy( beat.getVoice(voice).getDuration() );
 		}
 	}
-	
+
 	public void tryChangeSilenceAfter(TGMeasure measure,TGVoice voice){
 		autoCompleteSilences(measure);
-		
+
 		TGVoice nextVoice = getNextVoice(measure.getBeats(),voice.getBeat(),voice.getIndex());
-		
+
 		long beatEnd = (voice.getBeat().getStart() + voice.getDuration().getTime());
 		long measureEnd = (measure.getStart() + measure.getLength());
 		if(nextVoice != null && !nextVoice.isEmpty() && nextVoice.isRestVoice() && beatEnd <= measureEnd){
@@ -1801,8 +1801,8 @@ public void tryChangeSilenceAfter(TGMeasure measure,TGVoice voice){
 			}
 		}
 	}
-	
-	private void moveVoices(List voices,long theMove){
+
+	private void moveVoices(List<TGVoice> voices,long theMove){
 		/*
 		Iterator it = voices.iterator();
 		while(it.hasNext()){
@@ -1812,24 +1812,24 @@ private void moveVoices(List voices,long theMove){
 		*/
 		int count = voices.size();
 		for( int i = 0 ; i < count ; i ++ ){
-			TGVoice voice = (TGVoice)voices.get( (theMove < 0 ? i : ( (count - 1) - i ) ) );
+			TGVoice voice = voices.get( (theMove < 0 ? i : ( (count - 1) - i ) ) );
 			moveVoice(voice,theMove);
 		}
 	}
-	
+
 	public void moveVoice(TGVoice voice, long theMove){
 		long newStart = (voice.getBeat().getStart() + theMove);
-		
+
 		TGBeat newBeat = getBeat(voice.getBeat().getMeasure(),newStart);
 		if( newBeat == null ){
 			newBeat = getSongManager().getFactory().newBeat();
 			newBeat.setStart( newStart );
 			addBeat(voice.getBeat().getMeasure(), newBeat);
 		}
-		
+
 		this.moveVoice(voice, newBeat);
 	}
-	
+
 	public void moveVoice(TGVoice voice, TGBeat beat){
 		TGBeat currentBeat = voice.getBeat();
 		if(!currentBeat.equals(beat)){
@@ -1856,7 +1856,7 @@ public void moveVoice(TGVoice voice, TGBeat beat){
 			beat.setVoice( voice.getIndex() , voice);
 		}
 	}
-	
+
 	public boolean validateDuration(TGMeasure measure,TGBeat beat,int voice, TGDuration duration,boolean moveNextBeats, boolean setCurrentDuration){
 		int errorMargin = 10;
 		this.orderBeats(measure);
@@ -1865,8 +1865,8 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,int voice, TGDurat
 		long beatStart = beat.getStart();
 		long beatLength = duration.getTime();
 		long beatEnd = (beatStart + beatLength);
-		List beats = measure.getBeats();
-		
+		List<TGBeat> beats = measure.getBeats();
+
 		//Verifico si hay un beat en el mismo lugar, y comparo las duraciones.
 		TGBeat currentBeat = getBeat(measure,beatStart);
 		TGVoice currentVoice = null;
@@ -1876,7 +1876,7 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,int voice, TGDurat
 				return true;
 			}
 		}
-		
+
 		//Verifico si hay lugar para meter el beat
 		TGVoice nextVoice = getNextVoice(beats,beat, voice);
 		if(currentVoice == null || currentVoice.isEmpty()){
@@ -1887,12 +1887,12 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,int voice, TGDurat
 				return true;
 			}
 		}
-		
+
 		// Busca si hay espacio disponible de silencios entre el componente y el el que le sigue.. si encuentra lo borra
 		if(nextVoice != null && !nextVoice.isEmpty() && nextVoice.isRestVoice()){
 			//Verifico si lo que sigue es un silencio. y lo borro
 			long nextBeatEnd = 0;
-			List nextBeats = new ArrayList();
+			List<TGVoice> nextBeats = new ArrayList<TGVoice>();
 			while(nextVoice != null && !nextVoice.isEmpty() && nextVoice.isRestVoice() && !nextVoice.getBeat().isTextBeat()){
 				nextBeats.add(nextVoice);
 				nextBeatEnd = nextVoice.getBeat().getStart() + nextVoice.getDuration().getTime();
@@ -1905,31 +1905,31 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,int voice, TGDurat
 			}
 			if(beatEnd <= (nextBeatEnd + errorMargin)){
 				while(!nextBeats.isEmpty()){
-					TGVoice currVoice = (TGVoice)nextBeats.get(0);
+					TGVoice currVoice = nextBeats.get(0);
 					nextBeats.remove(currVoice);
 					removeVoice(currVoice, false);
 				}
 				return true;
 			}
 		}
-		
+
 		// Busca si hay espacio disponible de silencios entre el componente y el final.. si encuentra mueve todo
-		
+
 		if(moveNextBeats){
 			nextVoice = getNextVoice(beats,beat, voice);
 			if(nextVoice != null){
 				long requiredLength = (beatLength  - (nextVoice.getBeat().getStart() - beatStart));
 				long nextSilenceLength = 0;
 				TGVoice nextRestBeat = getNextRestVoice(beats, beat.getVoice(voice));
-				while(nextRestBeat != null){ 
+				while(nextRestBeat != null){
 					nextSilenceLength += nextRestBeat.getDuration().getTime();
 					nextRestBeat = getNextRestVoice(beats, nextRestBeat);
 				}
-				
+
 				if(requiredLength <= (nextSilenceLength + errorMargin)){
-					List voices = getVoicesBeforeEnd(measure.getBeats(),nextVoice.getBeat().getStart(), voice);
+					List<TGVoice> voices = getVoicesBeforeEnd(measure.getBeats(),nextVoice.getBeat().getStart(), voice);
 					while(!voices.isEmpty()){
-						TGVoice currentVocie = (TGVoice)voices.get(0);
+						TGVoice currentVocie = voices.get(0);
 						if(currentVocie.isRestVoice()){
 							requiredLength -= currentVocie.getDuration().getTime();
 							removeVoice(currentVocie, false);
@@ -1942,8 +1942,8 @@ public boolean validateDuration(TGMeasure measure,TGBeat beat,int voice, TGDurat
 				}
 			}
 		}
-		
-		
+
+
 		// como ultimo intento, asigno la duracion de cualquier componente existente en el lugar.
 		if(setCurrentDuration && currentVoice != null && !currentVoice.isEmpty()){
 			currentVoice.getDuration().copy( duration );
@@ -1959,15 +1959,15 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 		boolean success = true;
 		long measureStart = measure.getStart();
 		long measureEnd =  (measureStart + measure.getLength());
-		
+
 		// Muevo los componentes
 		List voicesToMove = getVoicesBeforeEnd(measure.getBeats(),start, voiceIndex);
 		moveVoices(voicesToMove,theMove);
-		
+
 		if(success){
 			List voicesToRemove = new ArrayList();
 			List beats = new ArrayList(measure.getBeats());
-			
+
 			// Verifica los silencios a eliminar al principio del compas
 			TGVoice first = getFirstVoice( beats, voiceIndex );
 			while(first != null && first.isRestVoice() && first.getBeat().getStart() < measureStart){
@@ -1975,7 +1975,7 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 				voicesToRemove.add(first);
 				first = getNextVoice( beats,first.getBeat(), voiceIndex);
 			}
-			
+
 			// Verifica los silencios a eliminar al final del compas
 			TGVoice last = getLastVoice(beats, voiceIndex);
 			TGDuration lastDuration = (last != null ? last.getDuration() : null);
@@ -1985,14 +1985,14 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 				last = getPreviousVoice(beats,last.getBeat(), voiceIndex);
 				lastDuration = (last != null ? last.getDuration() : null);
 			}
-			
+
 			// Si el primer o ultimo componente, quedan fuera del compas, entonces el movimiento no es satisfactorio
 			if(first != null && last != null && lastDuration != null){
 				if(first.getBeat().getStart() < measureStart || (last.getBeat().getStart() + lastDuration.getTime()) > measureEnd){
 					success = false;
 				}
 			}
-			
+
 			if(success){
 				// Elimino los silencios que quedaron fuera del compas.
 				Iterator it = voicesToRemove.iterator();
@@ -2000,7 +2000,7 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 					TGVoice beat = (TGVoice)it.next();
 					removeVoice(beat);
 				}
-				
+
 				// Se crean silencios en los espacios vacios, si la duracion fue especificada.
 				if( fillDuration != null ){
 					if( theMove < 0 ){
@@ -2044,17 +2044,17 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 				}
 			}
 		}
-		
+
 		// Si el movimiento no es satisfactorio, regreso todo como estaba
 		if(! success ){
 			moveVoices(voicesToMove,-theMove);
 		}
 		this.removeEmptyBeats(measure);
-		
+
 		return success;
 	}
 	*/
-		
+
 	public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIndex, TGDuration fillDuration){
 		if( theMove == 0 ){
 			return false;
@@ -2062,11 +2062,11 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 		boolean success = true;
 		long measureStart = measure.getStart();
 		long measureEnd =  (measureStart + measure.getLength());
-		
-		List voicesToMove = getVoicesBeforeEnd(measure.getBeats(),start, voiceIndex);
-		List voicesToRemove = new ArrayList();
-		List currentBeats = getBeatsBeforeEnd(measure.getBeats(), start);
-		
+
+		List<TGVoice> voicesToMove = getVoicesBeforeEnd(measure.getBeats(),start, voiceIndex);
+		List<TGVoice> voicesToRemove = new ArrayList<TGVoice>();
+		List<TGBeat> currentBeats = getBeatsBeforeEnd(measure.getBeats(), start);
+
 		// Verifica los silencios a eliminar al principio del compas
 		TGVoice first = getFirstVoice( currentBeats, voiceIndex );
 		while(first != null && first.isRestVoice() && (!first.getBeat().isTextBeat() || !isUniqueVoice(first,false)) && (first.getBeat().getStart() + theMove) < measureStart){
@@ -2074,7 +2074,7 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 			voicesToRemove.add(first);
 			first = getNextVoice( currentBeats,first.getBeat(), voiceIndex);
 		}
-		
+
 		// Verifica los silencios a eliminar al final del compas
 		TGVoice last = getLastVoice(currentBeats, voiceIndex);
 		TGDuration lastDuration = (last != null ? last.getDuration() : null);
@@ -2084,24 +2084,24 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 			last = getPreviousVoice(currentBeats,last.getBeat(), voiceIndex);
 			lastDuration = (last != null ? last.getDuration() : null);
 		}
-		
+
 		// Si el primer o ultimo componente, quedan fuera del compas, entonces el movimiento no es satisfactorio
 		if(first != null && last != null && lastDuration != null){
 			if((first.getBeat().getStart() + theMove) < measureStart || (last.getBeat().getStart() + lastDuration.getTime() + theMove) > measureEnd){
 				success = false;
 			}
 		}
-		
+
 		if(success){
 			this.moveVoices(voicesToMove,theMove);
-			
+
 			// Elimino los silencios que quedaron fuera del compas.
-			Iterator it = voicesToRemove.iterator();
+			Iterator<TGVoice> it = voicesToRemove.iterator();
 			while( it.hasNext() ){
-				TGVoice beat = (TGVoice)it.next();
+				TGVoice beat = it.next();
 				removeVoice(beat);
 			}
-			
+
 			// Se crean silencios en los espacios vacios, si la duracion fue especificada.
 			if( fillDuration != null ){
 				if( theMove < 0 ){
@@ -2143,14 +2143,14 @@ public boolean moveVoices(TGMeasure measure,long start,long theMove, int voiceIn
 					}
 				}
 			}
-			
+
 			// Borro todos los beats que quedaron vacios.
 			this.removeEmptyBeats(measure);
 		}
-		
+
 		return success;
 	}
-	
+
 	public boolean isUniqueVoice(TGVoice voice, boolean ignoreRests){
 		TGBeat beat = voice.getBeat();
 		for( int v = 0 ; v < beat.countVoices() ; v ++ ){
@@ -2163,13 +2163,13 @@ public boolean isUniqueVoice(TGVoice voice, boolean ignoreRests){
 		}
 		return true;
 	}
-	
+
 	public void transposeNotes( TGMeasure measure, int transposition , boolean tryKeepString, boolean applyToChords, int applyToString){
 		if( transposition != 0 ){
 			if( measure != null ){
 				TGTrack track = measure.getTrack();
 				if( track != null ){
-					List strings = getSortedStringsByValue(track, ( transposition > 0 ? 1 : -1 ) ) ;
+					List<TGString> strings = getSortedStringsByValue(track, ( transposition > 0 ? 1 : -1 ) ) ;
 					for( int i = 0 ; i < measure.countBeats() ; i ++ ){
 						TGBeat beat = measure.getBeat( i );
 						transposeNotes( beat, strings, transposition , tryKeepString, applyToChords, applyToString );
@@ -2178,27 +2178,27 @@ public void transposeNotes( TGMeasure measure, int transposition , boolean tryKe
 			}
 		}
 	}
-	
+
 	public void transposeNotes( TGMeasure measure, int[] transpositionStrings , boolean tryKeepString , boolean applyToChords){
 		if( transpositionStrings != null && transpositionStrings.length > 0 ){
 			if( measure != null ){
 				TGTrack track = measure.getTrack();
 				if( track != null ){
 					TGNote[] notes = new TGNote[ transpositionStrings.length ];
-					
+
 					for( int b = 0 ; b < measure.countBeats() ; b ++ ){
 						TGBeat beat = measure.getBeat( b );
-						
+
 						for( int n = 0 ; n < notes.length ; n ++ ){
 							notes[ n ] = getNote( beat, (n + 1) );
 						}
-						
+
 						for( int i = 0 ; i < notes.length ; i ++ ){
 							if( notes[ i ] != null ){
 								int transposition = transpositionStrings[ i ];
 								if( transposition != 0 ){
 									int applyToString = notes[i].getString();
-									List strings = getSortedStringsByValue(track, ( transposition > 0 ? 1 : -1 ) ) ;
+									List<TGString> strings = getSortedStringsByValue(track, ( transposition > 0 ? 1 : -1 ) ) ;
 									transposeNotes( beat, strings, transposition , tryKeepString, applyToChords, applyToString );
 								}
 							}
@@ -2208,18 +2208,18 @@ public void transposeNotes( TGMeasure measure, int[] transpositionStrings , bool
 			}
 		}
 	}
-	
-	public void transposeNotes( TGBeat beat, List strings, int transposition , boolean tryKeepString, boolean applyToChord, int applyToString){
+
+	public void transposeNotes( TGBeat beat, List<TGString> strings, int transposition , boolean tryKeepString, boolean applyToChord, int applyToString){
 		if( transposition != 0 ){
-			List notes = getNotes(beat);
-			
+			List<TGNote> notes = getNotes(beat);
+
 			int stringCount = strings.size();
 			for( int i = 0 ; i < stringCount ; i ++ ){
-				TGString string = (TGString)strings.get( (stringCount - i) - 1 );
+				TGString string = strings.get( (stringCount - i) - 1 );
 				if( applyToString == -1 || string.getNumber() == applyToString ){
 					TGNote note = null;
 					for( int n = 0 ; n < notes.size() ; n ++ ){
-						TGNote current = (TGNote)notes.get( n );
+						TGNote current = notes.get( n );
 						if( current.getString() == string.getNumber() ){
 							note = current;
 						}
@@ -2227,7 +2227,7 @@ public void transposeNotes( TGBeat beat, List strings, int transposition , boole
 					if( note != null ){
 						transposeNote(note, notes, strings, transposition, tryKeepString, false );
 					}
-					
+
 					if( applyToChord && beat.isChordBeat() ){
 						TGChord chord = beat.getChord();
 						int chordString = ( string.getNumber() - 1 );
@@ -2240,14 +2240,14 @@ public void transposeNotes( TGBeat beat, List strings, int transposition , boole
 			}
 		}
 	}
-	
-	private boolean transposeNote( TGNote note, List notes, List strings , int transposition , boolean tryKeepString, boolean forceChangeString ){
+
+	private boolean transposeNote( TGNote note, List<TGNote> notes, List<TGString> strings , int transposition , boolean tryKeepString, boolean forceChangeString ){
 		boolean canTransposeFret = false;
-		
+
 		int maximumFret = 29;
-		
+
 		int transposedFret = ( note.getValue() + transposition );
-		
+
 		// Check if transposition could be done without change the string
 		if( transposedFret >= 0 && transposedFret <= maximumFret ){
 			// Do it now if keep string is the priority
@@ -2257,31 +2257,31 @@ private boolean transposeNote( TGNote note, List notes, List strings , int trans
 			}
 			canTransposeFret = true;
 		}
-		
+
 		// Check the current string index for this note
 		int stringIndex = -1;
 		for( int i = 0 ; i < strings.size() ; i ++ ){
-			TGString string = ( TGString ) strings.get( i );
+			TGString string = strings.get( i );
 			if( string.getNumber() == note.getString() ){
 				stringIndex = i;
 				break;
 			}
 		}
-		
+
 		// Try to change the string of the note
-		TGString string = ( TGString ) strings.get( stringIndex );
+		TGString string = strings.get( stringIndex );
 		int transposedValue = ( string.getValue() + note.getValue() + transposition );
 		int nextStringIndex = ( stringIndex + 1 );
 		while( nextStringIndex >= 0 && nextStringIndex < strings.size() ){
-			TGString nextString = ( TGString ) strings.get( nextStringIndex );
+			TGString nextString = strings.get( nextStringIndex );
 			TGNote nextOwner = null;
 			for( int i = 0 ; i < notes.size() ; i ++ ){
-				TGNote nextNote = (TGNote) notes.get( i );
+				TGNote nextNote = notes.get( i );
 				if( nextNote.getString() == nextString.getNumber() ){
 					nextOwner = nextNote;
 				}
 			}
-			
+
 			int transposedStringFret = ( transposedValue - nextString.getValue() );
 			if( transposedStringFret >= 0 && transposedStringFret <= maximumFret ){
 				if( nextOwner != null ){
@@ -2293,36 +2293,36 @@ private boolean transposeNote( TGNote note, List notes, List strings , int trans
 				if( nextOwner == null || nextOwner.getString() != nextString.getNumber() ){
 					note.setValue( transposedStringFret );
 					note.setString( nextString.getNumber() );
-					
+
 					return true;
 				}
 			}
 			nextStringIndex ++;
 		}
-		
+
 		// Keep using same string if it's possible
 		if( !forceChangeString && canTransposeFret ){
 			note.setValue( transposedFret );
 			return true;
 		}
-		
+
 		// If note can't be transposed, it must be removed.
 		notes.remove( note );
 		removeNote(note);
-		
+
 		return false;
 	}
-	
-	private boolean transposeChordNote( TGChord chord, int chordString, List strings , int transposition , boolean tryKeepString, boolean forceChangeString ){
+
+	private boolean transposeChordNote( TGChord chord, int chordString, List<TGString> strings , int transposition , boolean tryKeepString, boolean forceChangeString ){
 		boolean canTransposeFret = false;
-		
+
 		int maximumFret = 24;
-		
+
 		int noteValue = chord.getFretValue( chordString );
 		int noteString = (chordString + 1 );
-		
+
 		int transposedFret = ( noteValue + transposition );
-		
+
 		// Check if transposition could be done without change the string
 		if( transposedFret >= 0 && transposedFret <= maximumFret ){
 			// Do it now if keep string is the priority
@@ -2332,23 +2332,23 @@ private boolean transposeChordNote( TGChord chord, int chordString, List strings
 			}
 			canTransposeFret = true;
 		}
-		
+
 		// Check the current string index for this note
 		int stringIndex = -1;
 		for( int i = 0 ; i < strings.size() ; i ++ ){
-			TGString string = ( TGString ) strings.get( i );
+			TGString string = strings.get( i );
 			if( string.getNumber() == noteString ){
 				stringIndex = i;
 				break;
 			}
 		}
-		
+
 		// Try to change the string of the note
-		TGString string = ( TGString ) strings.get( stringIndex );
+		TGString string = strings.get( stringIndex );
 		int transposedValue = ( string.getValue() + noteValue + transposition );
 		int nextStringIndex = ( stringIndex + 1 );
 		while( nextStringIndex >= 0 && nextStringIndex < strings.size() ){
-			TGString nextString = ( TGString ) strings.get( nextStringIndex );
+			TGString nextString = strings.get( nextStringIndex );
 			int nextChordString = -1;
 			for( int i = 0 ; i < chord.countStrings() ; i ++ ){
 				if( (i + 1) == nextString.getNumber() ){
@@ -2357,7 +2357,7 @@ private boolean transposeChordNote( TGChord chord, int chordString, List strings
 					}
 				}
 			}
-			
+
 			int transposedStringFret = ( transposedValue - nextString.getValue() );
 			if( transposedStringFret >= 0 && transposedStringFret <= maximumFret ){
 				if( nextChordString >= 0 ){
@@ -2366,37 +2366,36 @@ private boolean transposeChordNote( TGChord chord, int chordString, List strings
 				if( nextChordString < 0 || chord.getFretValue( nextChordString ) < 0 ){
 					chord.addFretValue( chordString , -1 );
 					chord.addFretValue( ( nextString.getNumber() - 1 ) , transposedStringFret );
-					
+
 					return true;
 				}
 			}
 			nextStringIndex ++;
 		}
-		
+
 		// Keep using same string if it's possible
 		if( !forceChangeString && canTransposeFret ){
 			chord.addFretValue( chordString , transposedFret );
 			return true;
 		}
-		
+
 		// If note can't be transposed, it must be removed.
 		chord.addFretValue( chordString , -1 );
-		
+
 		return false;
 	}
-	
-	public List getSortedStringsByValue( TGTrack track , final int direction ){
-		List strings = new ArrayList();
+
+	public List<TGString> getSortedStringsByValue( TGTrack track , final int direction ){
+		List<TGString> strings = new ArrayList<TGString>();
 		for( int number = 1 ; number <= track.stringCount() ; number ++ ){
 			strings.add( track.getString( number ) );
 		}
-		
-		Collections.sort( strings , new Comparator() {
-			public int compare(Object o1, Object o2) {
+
+		Collections.sort( strings , new Comparator<TGString>() {
+			@Override
+			public int compare(TGString o1, TGString o2) {
 				if( o1 != null && o2 != null && o1 instanceof TGString && o2 instanceof TGString ){
-					TGString s1 = (TGString)o1;
-					TGString s2 = (TGString)o2;
-					int status = ( s1.getValue() - s2.getValue() );
+					int status = ( o1.getValue() - o2.getValue() );
 					if( status == 0 ){
 						return 0;
 					}
@@ -2405,7 +2404,7 @@ public int compare(Object o1, Object o2) {
 				return 0;
 			}
 		});
-		
+
 		return strings;
 	}
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/managers/TGSongManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGSongManager.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/song/managers/TGSongManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGSongManager.java
index f10d646d..2256f7e8 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/managers/TGSongManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGSongManager.java
@@ -1,8 +1,5 @@
 /*
  * Created on 23-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.managers;
 
@@ -26,69 +23,66 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class TGSongManager {
 	public static final short MAX_CHANNELS = 16;
-	
+
 	private TGFactory factory;
 	private TGSong song;
 	private TGTrackManager trackManager;
 	private TGMeasureManager measureManager;
-	
+
 	public TGSongManager(){
 		this(new TGFactory());
 	}
-	
+
 	public TGSongManager(TGFactory factory){
 		this.factory = factory;
 	}
-	
+
 	public TGFactory getFactory(){
 		return this.factory;
 	}
-	
+
 	public void setFactory(TGFactory factory){
 		this.factory = factory;
 	}
-	
+
 	public TGTrackManager getTrackManager(){
 		if(this.trackManager == null){
 			this.trackManager = new TGTrackManager(this);
 		}
 		return this.trackManager;
 	}
-	
+
 	public TGMeasureManager getMeasureManager(){
 		if(this.measureManager == null){
 			this.measureManager = new TGMeasureManager(this);
 		}
 		return this.measureManager;
 	}
-	
+
 	public void setSongName(String name){
 		getSong().setName(name);
 	}
-	
+
 	public TGSong getSong(){
 		return this.song;
 	}
-	
+
 	public void clearSong(){
 		if(this.getSong() != null){
 			this.getSong().clear();
 		}
 	}
-	
+
 	public void setSong(TGSong song){
 		if(song != null){
 			this.clearSong();
 			this.song = song;
 		}
 	}
-	
+
 	public void setProperties(String name,String artist,String album,String author,String date,String copyright,String writer,String transcriber,String comments){
 		getSong().setName(name);
 		getSong().setArtist(artist);
@@ -107,13 +101,13 @@ public TGSong newSong(){
 		channel.setChannel((short)0);
 		channel.setEffectChannel((short)1);
 		channel.setName(getDefaultChannelName(channel));
-		
+
 		TGMeasureHeader header = getFactory().newHeader();
 		header.setNumber(1);
 		header.setStart(TGDuration.QUARTER_TIME);
 		header.getTimeSignature().setNumerator(4);
 		header.getTimeSignature().getDenominator().setValue(TGDuration.QUARTER);
-		
+
 		TGTrack track = getFactory().newTrack();
 		track.setNumber(1);
 		track.setName(getDefaultTrackName(track));
@@ -121,32 +115,32 @@ public TGSong newSong(){
 		track.setStrings(createDefaultInstrumentStrings());
 		track.addMeasure(getFactory().newMeasure(header));
 		TGColor.RED.copy(track.getColor());
-		
+
 		TGSong song = getFactory().newSong();
 		song.addChannel(channel);
 		song.addMeasureHeader(header);
 		song.addTrack(track);
-		
+
 		return song;
 	}
-	
+
 	public TGChannel createChannel(){
 		TGChannel channel = getFactory().newChannel();
-		
-		List freeChannels = getFreeChannels( channel );
-		
-		channel.setChannel((short)( freeChannels.size() > 0 ? ((Integer)freeChannels.get(0)).intValue() : -1 ) );
-		channel.setEffectChannel((short)( freeChannels.size() > 1 ? ((Integer)freeChannels.get(1)).intValue() : channel.getChannel() ) );
-		
+
+		List<Integer> freeChannels = getFreeChannels( channel );
+
+		channel.setChannel((short)( freeChannels.size() > 0 ? freeChannels.get(0).intValue() : -1 ) );
+		channel.setEffectChannel((short)( freeChannels.size() > 1 ? freeChannels.get(1).intValue() : channel.getChannel() ) );
+
 		return channel;
 	}
-	
+
 	public TGChannel addChannel(){
 		TGChannel tgChannel = addChannel(createChannel());
 		tgChannel.setName(getDefaultChannelName(tgChannel));
 		return tgChannel;
 	}
-	
+
 	public TGChannel addChannel(TGChannel tgChannel){
 		if( tgChannel != null ){
 			if( tgChannel.getChannelId() <= 0 ){
@@ -156,69 +150,69 @@ public TGChannel addChannel(TGChannel tgChannel){
 		}
 		return tgChannel;
 	}
-	
+
 	public void removeChannel(TGChannel channel){
 		if( channel != null ){
 			getSong().removeChannel(channel);
 		}
 	}
-	
+
 	public void removeChannel(int channelId){
 		TGChannel channel = getChannel(channelId);
 		if( channel != null ){
 			removeChannel(channel);
 		}
 	}
-	
+
 	public void removeAllChannels(){
 		while( getSong().countChannels() > 0 ){
 			removeChannel( getSong().getChannel(0) );
 		}
 	}
-	
+
 	public TGChannel getChannel(int channelId){
-		Iterator it = getSong().getChannels();
+		Iterator<TGChannel> it = getSong().getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel;
 			}
 		}
 		return null;
 	}
-	
-	public List getChannels(){
-		List channels = new ArrayList();
-		
-		Iterator it = getSong().getChannels();
+
+	public List<TGChannel> getChannels(){
+		List<TGChannel> channels = new ArrayList<TGChannel>();
+
+		Iterator<TGChannel> it = getSong().getChannels();
 		while( it.hasNext() ){
-			channels.add((TGChannel)it.next());
+			channels.add(it.next());
 		}
-		
+
 		return channels;
 	}
-	
+
 	public int getNextChannelId(){
 		int maximumId = 0;
-		
-		Iterator it = getSong().getChannels();
+
+		Iterator<TGChannel> it = getSong().getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( maximumId < channel.getChannelId() ){
 				maximumId = channel.getChannelId();
 			}
 		}
-		
+
 		return (maximumId + 1);
 	}
-	
+
 	public String getDefaultChannelName(TGChannel tgChannel){
 		if( tgChannel != null && tgChannel.getChannelId() > 0 ){
 			return new String("#" + tgChannel.getChannelId());
 		}
 		return new String();
 	}
-	
+
 	public TGChannel updateChannel(int id,short c1,short c2,short bnk,short prg,short vol,short bal,short cho,short rev,short pha,short tre,String name){
 		TGChannel channel = getChannel(id);
 		if( channel != null ){
@@ -236,24 +230,24 @@ public TGChannel updateChannel(int id,short c1,short c2,short bnk,short prg,shor
 		}
 		return channel;
 	}
-	
-	public List getFreeChannels( TGChannel forChannel ){
-		List freeChannels = new ArrayList();
-		
+
+	public List<Integer> getFreeChannels( TGChannel forChannel ){
+		List<Integer> freeChannels = new ArrayList<Integer>();
+
 		for( int ch = 0 ; ch < TGSongManager.MAX_CHANNELS ; ch ++ ){
 			if( !TGChannel.isPercussionChannel(ch) ){
 				boolean isFreeChannel = true;
-				
-				Iterator channelIt = getSong().getChannels();
+
+				Iterator<TGChannel> channelIt = getSong().getChannels();
 				while( channelIt.hasNext() ){
-					TGChannel channel = (TGChannel) channelIt.next();
+					TGChannel channel = channelIt.next();
 					if( forChannel == null || !forChannel.equals( channel ) ){
 						if( channel.getChannel() == ch || channel.getEffectChannel() == ch){
 							isFreeChannel = false;
 						}
 					}
 				}
-				
+
 				if( isFreeChannel ){
 					freeChannels.add(new Integer(ch));
 				}
@@ -261,7 +255,7 @@ public List getFreeChannels( TGChannel forChannel ){
 		}
 		return freeChannels;
 	}
-	
+
 	public boolean isPercussionChannel( int channelId ){
 		TGChannel channel = getChannel(channelId);
 		if( channel != null ){
@@ -269,48 +263,48 @@ public boolean isPercussionChannel( int channelId ){
 		}
 		return false;
 	}
-	
+
 	public boolean isAnyPercussionChannel(){
-		Iterator it = getSong().getChannels();
+		Iterator<TGChannel> it = getSong().getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel) it.next();
+			TGChannel channel = it.next();
 			if( channel.isPercussionChannel() ){
 				return true;
 			}
 		}
 		return false;
 	}
-	
+
 	public boolean isAnyTrackConnectedToChannel( int channelId ){
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while( it.hasNext() ){
-			TGTrack track = (TGTrack) it.next();
+			TGTrack track = it.next();
 			if( track.getChannelId() == channelId ){
 				return true;
 			}
 		}
 		return false;
 	}
-	// -------------------------------------------------------------- // 
+	// -------------------------------------------------------------- //
 
 	private TGTrack createTrack(){
 		TGTrack tgTrack = getFactory().newTrack();
 		tgTrack.setNumber(getNextTrackNumber());
 		tgTrack.setName(getDefaultTrackName(tgTrack));
-		
-		Iterator it = getSong().getMeasureHeaders();
+
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			TGMeasure measure = getFactory().newMeasure(header);
 			tgTrack.addMeasure(measure);
 		}
 		tgTrack.setStrings(createDefaultInstrumentStrings());
-		
+
 		TGColor.RED.copy(tgTrack.getColor());
-		
+
 		return tgTrack;
 	}
-	
+
 	public TGTrack addTrack(){
 		if(getSong().isEmpty()){
 			setSong(newSong());
@@ -321,8 +315,8 @@ public TGTrack addTrack(){
 		addTrack(tgTrack);
 		return tgTrack;
 	}
-	
-	
+
+
 	public void addTrack(TGTrack trackToAdd){
 		this.orderTracks();
 		int addIndex = -1;
@@ -340,29 +334,29 @@ public void addTrack(TGTrack trackToAdd){
 		}
 		getSong().addTrack(addIndex,trackToAdd);
 	}
-	
+
 	public void removeTrack(TGTrack track){
 		removeTrack(track.getNumber());
 	}
-	
+
 	public void removeTrack(int number){
 		int nextNumber = number;
 		TGTrack trackToRemove = null;
 		orderTracks();
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack currTrack = (TGTrack)it.next();
+			TGTrack currTrack = it.next();
 			if(trackToRemove == null && currTrack.getNumber() == nextNumber){
 				trackToRemove = currTrack;
 			}else if(currTrack.getNumber() == (nextNumber + 1)){
 				currTrack.setNumber(nextNumber);
 				nextNumber ++;
 			}
-			
+
 		}
 		getSong().removeTrack(trackToRemove);
 	}
-	
+
 	private void orderTracks(){
 		for(int i = 0;i < getSong().countTracks();i++){
 			TGTrack minTrack = null;
@@ -375,7 +369,7 @@ private void orderTracks(){
 			getSong().moveTrack(i,minTrack);
 		}
 	}
-	
+
 	public TGTrack getTrack(int number){
 		TGTrack track = null;
 		for (int i = 0; i < getSong().countTracks(); i++) {
@@ -387,7 +381,7 @@ public TGTrack getTrack(int number){
 		}
 		return track;
 	}
-	
+
 	public TGTrack getFirstTrack(){
 		TGTrack track = null;
 		if(!getSong().isEmpty()){
@@ -395,7 +389,7 @@ public TGTrack getFirstTrack(){
 		}
 		return track;
 	}
-	
+
 	public TGTrack getLastTrack(){
 		TGTrack track = null;
 		if(!getSong().isEmpty()){
@@ -403,25 +397,25 @@ public TGTrack getLastTrack(){
 		}
 		return track;
 	}
-	
+
 	public int getNextTrackNumber(){
 		return (getSong().countTracks() + 1);
 	}
-	
+
 	public String getDefaultTrackName(TGTrack tgTrack){
 		if( tgTrack != null && tgTrack.getNumber() > 0 ){
 			return new String("Track " + tgTrack.getNumber());
 		}
 		return new String();
 	}
-	
+
 	public TGTrack cloneTrack(TGTrack track){
 		TGTrack clone = track.clone(getFactory(),getSong());
 		clone.setNumber(getNextTrackNumber());
 		addTrack(clone);
 		return clone;
 	}
-	
+
 	public boolean moveTrackUp(TGTrack track){
 		if(track.getNumber() > 1){
 			TGTrack prevTrack = getTrack(track.getNumber() - 1);
@@ -432,7 +426,7 @@ public boolean moveTrackUp(TGTrack track){
 		}
 		return false;
 	}
-	
+
 	public boolean moveTrackDown(TGTrack track){
 		if(track.getNumber() < getSong().countTracks()){
 			TGTrack nextTrack = getTrack(track.getNumber() + 1);
@@ -443,26 +437,26 @@ public boolean moveTrackDown(TGTrack track){
 		}
 		return false;
 	}
-	
+
 	public void changeTimeSignature(long start,TGTimeSignature timeSignature,boolean toEnd){
 		changeTimeSignature(getMeasureHeaderAt(start),timeSignature,toEnd);
 	}
-	
+
 	public void changeTimeSignature(TGMeasureHeader header,TGTimeSignature timeSignature,boolean toEnd){
 		//asigno el nuevo ritmo
 		timeSignature.copy(header.getTimeSignature());
-		
+
 		long nextStart = header.getStart() + header.getLength();
-		List measures = getMeasureHeadersBeforeEnd(header.getStart() + 1);
-		Iterator it = measures.iterator();
+		List<TGMeasureHeader> measures = getMeasureHeadersBeforeEnd(header.getStart() + 1);
+		Iterator<TGMeasureHeader> it = measures.iterator();
 		while(it.hasNext()){
-			TGMeasureHeader nextHeader = (TGMeasureHeader)it.next();
-			
+			TGMeasureHeader nextHeader = it.next();
+
 			long theMove = nextStart - nextHeader.getStart();
-			
+
 			//moveMeasureComponents(nextHeader,theMove);
 			moveMeasureHeader(nextHeader,theMove,0);
-			
+
 			if(toEnd){
 				timeSignature.copy(nextHeader.getTimeSignature());
 			}
@@ -470,42 +464,42 @@ public void changeTimeSignature(TGMeasureHeader header,TGTimeSignature timeSigna
 		}
 		moveOutOfBoundsBeatsToNewMeasure(header.getStart());
 	}
-	
+
 	public void moveOutOfBoundsBeatsToNewMeasure(long start){
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while( it.hasNext() ){
-			TGTrack track = (TGTrack) it.next();
+			TGTrack track = it.next();
 			getTrackManager().moveOutOfBoundsBeatsToNewMeasure(track, start);
 		}
 	}
-	
+
 	public void changeTripletFeel(long start,int tripletFeel,boolean toEnd){
 		changeTripletFeel(getMeasureHeaderAt(start),tripletFeel,toEnd);
 	}
-	
+
 	public void changeTripletFeel(TGMeasureHeader header,int tripletFeel,boolean toEnd){
 		//asigno el nuevo tripletFeel
 		header.setTripletFeel(tripletFeel);
-		
+
 		if(toEnd){
-			List measures = getMeasureHeadersBeforeEnd(header.getStart() + 1);
-			Iterator it = measures.iterator();
+			List<TGMeasureHeader> measures = getMeasureHeadersBeforeEnd(header.getStart() + 1);
+			Iterator<TGMeasureHeader> it = measures.iterator();
 			while(it.hasNext()){
-				TGMeasureHeader nextHeader = (TGMeasureHeader)it.next();
-				nextHeader.setTripletFeel(tripletFeel); 
+				TGMeasureHeader nextHeader = it.next();
+				nextHeader.setTripletFeel(tripletFeel);
 			}
 		}
 	}
-	
+
 	public void changeTempos(long start,TGTempo tempo,boolean toEnd){
 		changeTempos(getMeasureHeaderAt(start),tempo,toEnd);
 	}
-	
+
 	public void changeTempos(TGMeasureHeader header,TGTempo tempo,boolean toEnd){
 		int oldValue = header.getTempo().getValue();
-		Iterator it = getMeasureHeadersAfter(header.getNumber() - 1).iterator();
+		Iterator<TGMeasureHeader> it = getMeasureHeadersAfter(header.getNumber() - 1).iterator();
 		while(it.hasNext()){
-			TGMeasureHeader nextHeader = (TGMeasureHeader)it.next();
+			TGMeasureHeader nextHeader = it.next();
 			if(toEnd || nextHeader.getTempo().getValue() == oldValue){
 				changeTempo(nextHeader,tempo);
 			}else{
@@ -513,26 +507,26 @@ public void changeTempos(TGMeasureHeader header,TGTempo tempo,boolean toEnd){
 			}
 		}
 	}
-	
+
 	public void changeTempo(TGMeasureHeader header,TGTempo tempo){
 		tempo.copy(header.getTempo());
 	}
-	
+
 	public void changeOpenRepeat(long start){
 		TGMeasureHeader header = getMeasureHeaderAt(start);
 		header.setRepeatOpen(!header.isRepeatOpen());
 	}
-	
+
 	public void changeCloseRepeat(long start,int repeatClose){
 		TGMeasureHeader header = getMeasureHeaderAt(start);
 		header.setRepeatClose(repeatClose);
 	}
-	
+
 	public void changeAlternativeRepeat(long start,int repeatAlternative){
 		TGMeasureHeader header = getMeasureHeaderAt(start);
 		header.setRepeatAlternative(repeatAlternative);
 	}
-	
+
 	public TGMeasureHeader addNewMeasureBeforeEnd(){
 		TGMeasureHeader lastHeader = getLastMeasureHeader();
 		TGMeasureHeader header = getFactory().newHeader();
@@ -544,15 +538,15 @@ public TGMeasureHeader addNewMeasureBeforeEnd(){
 		lastHeader.getTimeSignature().copy(header.getTimeSignature());
 		lastHeader.getTempo().copy(header.getTempo());
 		getSong().addMeasureHeader(header);
-		
-		Iterator it = getSong().getTracks();
+
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			getTrackManager().addNewMeasureBeforeEnd(track,header);
 		}
 		return header;
 	}
-	
+
 	public void addNewMeasure(int number){
 		//Obtengo un clon para el nuevo Header.
 		TGMeasureHeader header = null;
@@ -567,29 +561,29 @@ public void addNewMeasure(int number){
 		header.setRepeatOpen(false);
 		header.setRepeatAlternative(0);
 		header.setRepeatClose(0);
-		
+
 		//Si hay Headers siguientes los muevo
 		TGMeasureHeader nextHeader = getMeasureHeader(number);
 		if(nextHeader != null){
 			moveMeasureHeaders(getMeasureHeadersBeforeEnd(nextHeader.getStart()),header.getLength(),1,true);
 		}
-		
+
 		//Agrego el header a la lista
 		addMeasureHeader( (header.getNumber() - 1) ,header);
-		
+
 		//Agrego los compases en todas las pistas
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			getTrackManager().addNewMeasure(track,header);
 		}
 	}
-	
-	public List getMeasures(long start){
-		List measures = new ArrayList();
-		Iterator it = getSong().getTracks();
+
+	public List<TGMeasure> getMeasures(long start){
+		List<TGMeasure> measures = new ArrayList<TGMeasure>();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			TGMeasure measure = getTrackManager().getMeasureAt(track,start);
 			if(measure != null){
 				measures.add(measure);
@@ -597,7 +591,7 @@ public List getMeasures(long start){
 		}
 		return measures;
 	}
-	
+
 	public TGTrack replaceTrack(TGTrack track){
 		TGTrack current = getTrack(track.getNumber());
 		if(current != null){
@@ -605,7 +599,7 @@ public TGTrack replaceTrack(TGTrack track){
 		}
 		return current;
 	}
-	
+
 	public TGMeasureHeader getFirstMeasureHeader(){
 		TGMeasureHeader firstHeader = null;
 		for(int i = 0;i < getSong().countMeasureHeaders();i++){
@@ -616,12 +610,12 @@ public TGMeasureHeader getFirstMeasureHeader(){
 		}
 		return firstHeader;
 	}
-	
+
 	public TGMeasureHeader getLastMeasureHeader(){
 		int lastIndex = getSong().countMeasureHeaders() - 1;
 		return getSong().getMeasureHeader(lastIndex);
 	}
-	
+
 	public TGMeasureHeader getPrevMeasureHeader(TGMeasureHeader header){
 		int prevIndex = header.getNumber() - 1;
 		if(prevIndex > 0){
@@ -629,7 +623,7 @@ public TGMeasureHeader getPrevMeasureHeader(TGMeasureHeader header){
 		}
 		return null;
 	}
-	
+
 	public TGMeasureHeader getNextMeasureHeader(TGMeasureHeader header){
 		int nextIndex = header.getNumber();
 		if(nextIndex < getSong().countMeasureHeaders()){
@@ -637,11 +631,11 @@ public TGMeasureHeader getNextMeasureHeader(TGMeasureHeader header){
 		}
 		return null;
 	}
-	
+
 	public TGMeasureHeader getMeasureHeaderAt(long start){
-		Iterator it = getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			long measureStart = header.getStart();
 			long measureLength = header.getLength();
 			if(start >= measureStart && start < measureStart + measureLength){
@@ -650,7 +644,7 @@ public TGMeasureHeader getMeasureHeaderAt(long start){
 		}
 		return null;
 	}
-	
+
 	public TGMeasureHeader getMeasureHeader(int number){
 		for (int i = 0; i < getSong().countMeasureHeaders(); i++) {
 			TGMeasureHeader header = getSong().getMeasureHeader(i);
@@ -660,7 +654,7 @@ public TGMeasureHeader getMeasureHeader(int number){
 		}
 		return null;
 	}
-	
+
 	public int getMeasureHeaderIndex(TGMeasureHeader mh){
 		for (int i = 0; i < getSong().countMeasureHeaders(); i++) {
 			TGMeasureHeader header = getSong().getMeasureHeader(i);
@@ -670,131 +664,131 @@ public int getMeasureHeaderIndex(TGMeasureHeader mh){
 		}
 		return -1;
 	}
-	
+
 	/**
 	 * Retorna Todos los desde Start hasta el final del compas
 	 */
-	public List getMeasureHeadersBeforeEnd(long fromStart) {
-		List headers = new ArrayList();
-		Iterator it = getSong().getMeasureHeaders();
+	public List<TGMeasureHeader> getMeasureHeadersBeforeEnd(long fromStart) {
+		List<TGMeasureHeader> headers = new ArrayList<TGMeasureHeader>();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if (header.getStart() >= fromStart) {
 				headers.add(header);
 			}
 		}
 		return headers;
 	}
-	
+
 	/**
 	 * Retorna Todos los desde Start hasta el final del compas
 	 */
-	public List getMeasureHeadersAfter(int number) {
-		List headers = new ArrayList();
-		Iterator it = getSong().getMeasureHeaders();
+	public List<TGMeasureHeader> getMeasureHeadersAfter(int number) {
+		List<TGMeasureHeader> headers = new ArrayList<TGMeasureHeader>();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if (header.getNumber() > number) {
 				headers.add(header);
 			}
 		}
 		return headers;
 	}
-	
+
 	/**
 	 * Retorna Todos los desde Start hasta el final del compas
 	 */
-	public List getMeasureHeadersBetween(long p1,long p2) {
-		List headers = new ArrayList();
-		Iterator it = getSong().getMeasureHeaders();
+	public List<TGMeasureHeader> getMeasureHeadersBetween(long p1,long p2) {
+		List<TGMeasureHeader> headers = new ArrayList<TGMeasureHeader>();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if ((header.getStart() + header.getLength()) > p1  &&  header.getStart() < p2) {
 				headers.add(header);
 			}
 		}
 		return headers;
 	}
-	
+
 	public void removeLastMeasure(){
 		removeLastMeasureHeader();
 	}
-	
+
 	public void removeMeasure(long start){
 		removeMeasureHeader(start);
 	}
-	
+
 	public void removeMeasure(int number){
 		removeMeasureHeader(number);
 	}
-	
+
 	/**
 	 * Agrega un Compas
 	 */
 	public void addMeasureHeader(TGMeasureHeader measure){
 		getSong().addMeasureHeader(measure);
 	}
-	
+
 	/**
 	 * Agrega un Compas
 	 */
 	public void addMeasureHeader(int index,TGMeasureHeader measure){
 		getSong().addMeasureHeader(index,measure);
 	}
-	
+
 	public void removeMeasureHeaders(int n1,int n2){
 		for(int i = n1; i <= n2; i ++){
 			TGMeasureHeader measure = getMeasureHeader(n1);
 			removeMeasureHeader(measure);
 		}
 	}
-	
+
 	public void removeLastMeasureHeader(){
 		removeMeasureHeader(getLastMeasureHeader());
 	}
-	
+
 	public void removeMeasureHeader(long start){
 		removeMeasureHeader(getMeasureHeaderAt(start));
 	}
-	
+
 	public void removeMeasureHeader(int number){
 		removeMeasureHeader(getMeasureHeader(number));
 	}
-	
+
 	public void removeMeasureHeader(TGMeasureHeader header){
 		long start = header.getStart();
 		long length = header.getLength();
-		
-		Iterator it = getSong().getTracks();
+
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			getTrackManager().removeMeasure(track,start);
 		}
 		moveMeasureHeaders(getMeasureHeadersBeforeEnd(start + 1),-length,-1,true);
 		getSong().removeMeasureHeader(header.getNumber() - 1);
 	}
-	
+
 	public TGMeasureHeader replaceMeasureHeader(TGMeasureHeader newMeasure){
 		TGMeasureHeader header = getMeasureHeaderAt(newMeasure.getStart());
 		header.makeEqual(newMeasure.clone(getFactory()));
 		return header;
 	}
-	
-	public void moveMeasureHeaders(List headers,long theMove,int numberMove,boolean moveComponents) {
+
+	public void moveMeasureHeaders(List<TGMeasureHeader> headers,long theMove,int numberMove,boolean moveComponents) {
 		if(moveComponents){
-			Iterator it = headers.iterator();
+			Iterator<TGMeasureHeader> it = headers.iterator();
 			while(it.hasNext()){
-				TGMeasureHeader header = (TGMeasureHeader) it.next();
+				TGMeasureHeader header = it.next();
 				moveMeasureComponents(header,theMove);
 			}
 		}
-		Iterator it = headers.iterator();
+		Iterator<TGMeasureHeader> it = headers.iterator();
 		while (it.hasNext()) {
-			TGMeasureHeader header = (TGMeasureHeader) it.next();
+			TGMeasureHeader header = it.next();
 			moveMeasureHeader(header,theMove,numberMove);
 		}
 	}
-	
+
 	/**
 	 * Mueve el compas
 	 */
@@ -802,25 +796,25 @@ public void moveMeasureHeader(TGMeasureHeader header,long theMove,int numberMove
 		header.setNumber(header.getNumber() + numberMove);
 		header.setStart(header.getStart() + theMove);
 	}
-	
+
 	/**
 	 * Mueve el compas
 	 */
 	public void moveMeasureComponents(TGMeasureHeader header,long theMove){
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			getTrackManager().moveMeasure(getTrackManager().getMeasure(track,header.getNumber()),theMove);
 		}
 	}
-	
-	/** 
+
+	/**
 	 * Retorna true si el start esta en el rango del compas
 	 */
 	public boolean isAtPosition(TGMeasureHeader header,long start){
 		return (start >= header.getStart() && start < header.getStart() + header.getLength());
 	}
-	
+
 	public TGMarker updateMarker(int measure,String title,TGColor color){
 		TGMeasureHeader header = getMeasureHeader(measure);
 		if(header != null){
@@ -832,50 +826,50 @@ public TGMarker updateMarker(int measure,String title,TGColor color){
 			header.getMarker().getColor().setR(color.getR());
 			header.getMarker().getColor().setG(color.getG());
 			header.getMarker().getColor().setB(color.getB());
-			return header.getMarker(); 
+			return header.getMarker();
 		}
 		return null;
 	}
-	
+
 	public TGMarker updateMarker(TGMarker marker){
 		return updateMarker(marker.getMeasure(),marker.getTitle(),marker.getColor());
 	}
-	
+
 	public void removeMarker(TGMarker marker){
 		if(marker != null){
 			removeMarker(marker.getMeasure());
 		}
 	}
-	
+
 	public void removeMarker(int number){
 		TGMeasureHeader header = getMeasureHeader(number);
 		if(header != null && header.hasMarker()){
 			header.setMarker(null);
 		}
 	}
-	
+
 	public void removeAllMarkers(){
-		Iterator it = getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.hasMarker()){
 				header.setMarker(null);
 			}
 		}
 	}
-	
-	public List getMarkers(){
-		List markers = new ArrayList();
-		Iterator it = getSong().getMeasureHeaders();
+
+	public List<TGMarker> getMarkers(){
+		List<TGMarker> markers = new ArrayList<TGMarker>();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.hasMarker()){
 				markers.add(header.getMarker());
 			}
 		}
 		return markers;
 	}
-	
+
 	public TGMarker getMarker(int number){
 		TGMeasureHeader header = getMeasureHeader(number);
 		if(header != null && header.hasMarker()){
@@ -883,12 +877,12 @@ public TGMarker getMarker(int number){
 		}
 		return null;
 	}
-	
+
 	public TGMarker getPreviousMarker(int from){
 		TGMeasureHeader previous = null;
-		Iterator it = getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.hasMarker() && header.getNumber() < from){
 				if(previous == null || previous.getNumber() < header.getNumber()){
 					previous = header;
@@ -897,12 +891,12 @@ public TGMarker getPreviousMarker(int from){
 		}
 		return (previous != null)?previous.getMarker():null;
 	}
-	
+
 	public TGMarker getNextMarker(int from){
 		TGMeasureHeader next = null;
-		Iterator it = getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.hasMarker() && header.getNumber() > from){
 				if(next == null || next.getNumber() > header.getNumber()){
 					next = header;
@@ -911,12 +905,12 @@ public TGMarker getNextMarker(int from){
 		}
 		return (next != null)?next.getMarker():null;
 	}
-	
+
 	public TGMarker getFirstMarker(){
 		TGMeasureHeader first = null;
-		Iterator it = getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.hasMarker()){
 				if(first == null || header.getNumber() < first.getNumber()){
 					first = header;
@@ -925,12 +919,12 @@ public TGMarker getFirstMarker(){
 		}
 		return (first != null)?first.getMarker():null;
 	}
-	
+
 	public TGMarker getLastMarker(){
 		TGMeasureHeader next = null;
-		Iterator it = getSong().getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = getSong().getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.hasMarker()){
 				if(next == null || header.getNumber() > next.getNumber()){
 					next = header;
@@ -939,25 +933,25 @@ public TGMarker getLastMarker(){
 		}
 		return (next != null)?next.getMarker():null;
 	}
-	
+
 	public void autoCompleteSilences(){
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			getTrackManager().autoCompleteSilences(track);
 		}
 	}
-	
+
 	public void orderBeats(){
-		Iterator it = getSong().getTracks();
+		Iterator<TGTrack> it = getSong().getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			getTrackManager().orderBeats(track);
 		}
 	}
-	
-	public List createDefaultInstrumentStrings(){
-		List strings = new ArrayList();
+
+	public List<TGString> createDefaultInstrumentStrings(){
+		List<TGString> strings = new ArrayList<TGString>();
 		strings.add(newString(getFactory(),1, 64));
 		strings.add(newString(getFactory(),2, 59));
 		strings.add(newString(getFactory(),3, 55));
@@ -966,22 +960,22 @@ public List createDefaultInstrumentStrings(){
 		strings.add(newString(getFactory(),6, 40));
 		return strings;
 	}
-	
-	public static List createPercussionStrings(TGFactory factory,int stringCount){
-		List strings = new ArrayList();
+
+	public static List<TGString> createPercussionStrings(TGFactory factory,int stringCount){
+		List<TGString> strings = new ArrayList<TGString>();
 		for(int i = 1;i <= stringCount; i++){
 			strings.add(newString(factory,i, 0));
 		}
 		return strings;
 	}
-	
+
 	public static TGString newString(TGFactory factory,int number,int value){
 		TGString string = factory.newString();
 		string.setNumber(number);
 		string.setValue(value);
 		return string;
 	}
-	
+
 	public static long getDivisionLength(TGMeasureHeader header){
 		long defaultLenght = TGDuration.QUARTER_TIME;
 		int denominator = header.getTimeSignature().getDenominator().getValue();
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/managers/TGTrackManager.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGTrackManager.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/song/managers/TGTrackManager.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGTrackManager.java
index 06d06785..b4eababc 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/managers/TGTrackManager.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/managers/TGTrackManager.java
@@ -8,47 +8,48 @@
 import org.herac.tuxguitar.song.models.TGColor;
 import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGString;
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class TGTrackManager {
-	private TGSongManager songManager;
-	
+	private final TGSongManager songManager;
+
 	public TGTrackManager(TGSongManager songManager){
 		this.songManager = songManager;
 	}
-	
+
 	public TGSongManager getSongManager(){
 		return this.songManager;
 	}
-	
+
 	public TGMeasure getFirstMeasure(TGTrack track){
 		TGMeasure firstMeasure = null;
-		Iterator measures = track.getMeasures();
+		Iterator<TGMeasure> measures = track.getMeasures();
 		while(measures.hasNext()){
-			TGMeasure currMeasure = (TGMeasure)measures.next();
+			TGMeasure currMeasure = measures.next();
 			if(firstMeasure == null || (currMeasure.getStart() < firstMeasure.getStart())){
 				firstMeasure = currMeasure;
 			}
 		}
 		return firstMeasure;
 	}
-	
+
 	public TGMeasure getLastMeasure(TGTrack track){
 		return track.getMeasure(track.countMeasures() - 1);
 	}
-	
+
 	public TGMeasure getPrevMeasure(TGMeasure measure){
 		return measure.getTrack().getMeasure(measure.getNumber() - 2);
 	}
-	
+
 	public TGMeasure getNextMeasure(TGMeasure measure){
 		return measure.getTrack().getMeasure(measure.getNumber());
 	}
-	
+
 	public TGMeasure getMeasureAt(TGTrack track,long start){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			long measureStart = measure.getStart();
 			long measureLength = measure.getLength();
 			if(start >= measureStart && start < measureStart + measureLength){
@@ -57,52 +58,52 @@ public TGMeasure getMeasureAt(TGTrack track,long start){
 		}
 		return null;
 	}
-	
+
 	public TGMeasure getMeasure(TGTrack track,int number){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			if(measure.getNumber() == number){
 				return measure;
 			}
 		}
 		return null;
 	}
-	
+
 	/**
 	 * Retorna Todos los desde Start hasta el final del compas
 	 */
-	public List getMeasuresBeforeEnd(TGTrack track,long fromStart) {
-		List measures = new ArrayList();
-		Iterator it = track.getMeasures();
+	public List<TGMeasure> getMeasuresBeforeEnd(TGTrack track,long fromStart) {
+		List<TGMeasure> measures = new ArrayList<TGMeasure>();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure currMeasure = (TGMeasure)it.next();
+			TGMeasure currMeasure = it.next();
 			if (currMeasure.getStart() >= fromStart) {
 				measures.add(currMeasure);
 			}
 		}
 		return measures;
 	}
-	
+
 	/**
 	 * Retorna Todos los desde Start hasta el final del compas
 	 */
-	public List getMeasuresBetween(TGTrack track,long p1,long p2) {
-		List measures = new ArrayList();
-		Iterator it = track.getMeasures();
+	public List<TGMeasure> getMeasuresBetween(TGTrack track,long p1,long p2) {
+		List<TGMeasure> measures = new ArrayList<TGMeasure>();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			if ((measure.getStart() + measure.getLength()) > p1  &&  measure.getStart() < p2) {
 				measures.add(measure);
 			}
 		}
 		return measures;
 	}
-	
+
 	public void addNewMeasureBeforeEnd(TGTrack track,TGMeasureHeader header){
 		addNewMeasureAfter(track,header,getLastMeasure(track));
 	}
-	
+
 	/**
 	 * Agrega un Compas
 	 */
@@ -112,7 +113,7 @@ public void addNewMeasureAfter(TGTrack track,TGMeasureHeader header,TGMeasure me
 		newMeasure.setKeySignature(measure.getKeySignature());
 		addMeasure(track,newMeasure);
 	}
-	
+
 	public void addNewMeasure(TGTrack track,TGMeasureHeader header){
 		TGMeasure previous = getMeasure(track, (header.getNumber() == 1)?(header.getNumber()+1):header.getNumber()-1);
 		TGMeasure newMeasure = getSongManager().getFactory().newMeasure(header);
@@ -144,39 +145,39 @@ public void insertMeasures(TGTrack track,List measures){
 			}
 		}
 	}*/
-	
+
 	/**
 	 * Agrega un Compas
 	 */
 	public void addMeasure(TGTrack track,TGMeasure measure){
 		track.addMeasure(measure);
 	}
-	
+
 	/**
 	 * Agrega un Compas
 	 */
 	public void addMeasure(TGTrack track,int index,TGMeasure measure){
 		track.addMeasure(index,measure);
 	}
-	
+
 	public void removeLastMeasure(TGTrack track){
 		removeMeasure(getLastMeasure(track));
 	}
-	
+
 	public void removeMeasure(TGTrack track,long start){
 		removeMeasure(getMeasureAt(track,start));
 	}
-	
+
 	public void removeMeasure(TGMeasure measure){
 		measure.getTrack().removeMeasure(measure.getNumber() - 1);
 	}
-	
+
 	public TGMeasure replaceMeasure(TGTrack track,TGMeasure newMeasure){
 		TGMeasure measure = getMeasureAt(track,newMeasure.getStart());
 		measure.makeEqual(newMeasure);
 		return measure;
 	}
-	
+
 	/**
 	 * Mueve el compas
 	 */
@@ -184,82 +185,82 @@ public void moveMeasure(TGMeasure measure,long theMove){
 		//getSongManager().getMeasureManager().moveAllComponents(measure,theMove);
 		getSongManager().getMeasureManager().moveAllBeats(measure,theMove);
 	}
-	
+
 	public void moveOutOfBoundsBeatsToNewMeasure(TGTrack track, long start){
-		Iterator it = getMeasuresBeforeEnd(track,start).iterator();
+		Iterator<TGMeasure> it = getMeasuresBeforeEnd(track,start).iterator();
 		while( it.hasNext() ){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			getSongManager().getMeasureManager().moveOutOfBoundsBeatsToNewMeasure(measure);
 		}
 	}
-	
+
 	public void moveTrackBeats(TGTrack track, long measureStart, long moveStart, long theMove ){
-		List measures = getMeasuresBeforeEnd(track,measureStart);
+		List<TGMeasure> measures = getMeasuresBeforeEnd(track,measureStart);
 		for( int i = 0 ; i < measures.size() ; i ++ ){
-			TGMeasure measure = (TGMeasure)measures.get(i);
+			TGMeasure measure = measures.get(i);
 			if( moveStart + theMove < moveStart ){
 				getSongManager().getMeasureManager().removeBeatsBeetween(measure, moveStart, (moveStart + Math.abs(theMove)));
 			}
 			getSongManager().getMeasureManager().moveBeats(measure, moveStart, theMove);
 		}
 		for( int i = 0 ; i < measures.size() ; i ++ ){
-			TGMeasure measure = (TGMeasure)measures.get(i);
+			TGMeasure measure = measures.get(i);
 			getSongManager().getMeasureManager().moveOutOfBoundsBeatsToNewMeasure(measure,false);
 		}
 	}
-	
+
 	public void changeKeySignature(TGTrack track,long start,int keySignature,boolean toEnd){
 		changeKeySignature(track,getMeasureAt(track,start),keySignature,toEnd);
 	}
-	
+
 	/**
 	 * Cambia el Key Signature
 	 */
 	public void changeKeySignature(TGTrack track,TGMeasure measure,int keySignature,boolean toEnd){
 		//asigno el nuevo Key
 		measure.setKeySignature(keySignature);
-		
+
 		if(toEnd){
-			List measures = getMeasuresBeforeEnd(track,measure.getStart() + 1);
-			Iterator it = measures.iterator();
+			List<TGMeasure> measures = getMeasuresBeforeEnd(track,measure.getStart() + 1);
+			Iterator<TGMeasure> it = measures.iterator();
 			while(it.hasNext()){
-				TGMeasure nextMeasure = (TGMeasure)it.next();
+				TGMeasure nextMeasure = it.next();
 				nextMeasure.setKeySignature(keySignature);
 			}
 		}
 	}
-	
+
 	public void changeClef(TGTrack track,long start,int clef,boolean toEnd){
 		changeClef(track,getMeasureAt(track,start),clef,toEnd);
 	}
-	
+
 	/**
 	 * Cambia el Clef
 	 */
 	public void changeClef(TGTrack track,TGMeasure measure,int clef,boolean toEnd){
 		//asigno el nuevo clef
 		measure.setClef(clef);
-		
+
 		if(toEnd){
-			List measures = getMeasuresBeforeEnd(track,measure.getStart() + 1);
-			Iterator it = measures.iterator();
+			List<TGMeasure> measures = getMeasuresBeforeEnd(track,measure.getStart() + 1);
+			Iterator<TGMeasure> it = measures.iterator();
 			while(it.hasNext()){
-				TGMeasure nextMeasure = (TGMeasure)it.next();
+				TGMeasure nextMeasure = it.next();
 				nextMeasure.setClef(clef);
 			}
 		}
 	}
-	
+
 	public void changeSolo(TGTrack track,boolean solo){
 		track.setSolo(solo);
 		track.setMute(track.isSolo() ? false : track.isMute());
 	}
-	
+
 	public void changeMute(TGTrack track,boolean mute){
 		track.setMute(mute);
 		track.setSolo(track.isMute() ? false : track.isSolo());
 	}
-	
+
 	public void changeInfo(TGTrack track,String name,TGColor color,int offset){
 		track.setName(name);
 		track.setOffset(offset);
@@ -267,71 +268,71 @@ public void changeInfo(TGTrack track,String name,TGColor color,int offset){
 		track.getColor().setG(color.getG());
 		track.getColor().setB(color.getB());
 	}
-	
-	public void changeInstrumentStrings(TGTrack track,List strings){
+
+	public void changeInstrumentStrings(TGTrack track,List<TGString> strings){
 		if(strings.size() < track.getStrings().size()){
 			removeNotesAfterString(track,strings.size());
 		}
 		track.setStrings(strings);
 	}
-	
+
 	public void removeNotesAfterString(TGTrack track,int string){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			getSongManager().getMeasureManager().removeNotesAfterString(measure,string);
 		}
 	}
-	
+
 	public void changeChannel(TGTrack track,int channelId){
 		TGChannel channel = getSongManager().getChannel(channelId);
-		
+
 		track.setChannelId( channelId );
-		
+
 		if( channel != null && channel.isPercussionChannel() ){
 			track.setStrings(TGSongManager.createPercussionStrings(getSongManager().getFactory(),track.getStrings().size()));
 		}
 	}
-	
+
 	public void autoCompleteSilences(TGTrack track){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			this.songManager.getMeasureManager().autoCompleteSilences(measure);
 		}
 	}
-	
+
 	public void orderBeats(TGTrack track){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			this.songManager.getMeasureManager().orderBeats(measure);
 		}
 	}
-	
+
 	public void transposeNotes(TGTrack track, int transposition , boolean tryKeepString, boolean applyToChords, int applyToString){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			this.songManager.getMeasureManager().transposeNotes(measure, transposition, tryKeepString, applyToChords, applyToString );
 		}
 	}
-	
+
 	public void transposeNotes(TGTrack track, int[] transpositionStrings , boolean tryKeepString , boolean applyToChords ){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			this.songManager.getMeasureManager().transposeNotes(measure, transpositionStrings, tryKeepString , applyToChords);
 		}
 	}
-	
+
 	/**
 	 * Retorna true si es el primer compas
 	 */
 	public boolean isFirstMeasure(TGMeasure measure){
 		return (measure.getNumber() == 1);
 	}
-	
+
 	/**
 	 * Retorna true si es el ultimo compas
 	 */
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGBeat.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGBeat.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGBeat.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGBeat.java
index 3b396d9e..4c62001b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGBeat.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGBeat.java
@@ -1,29 +1,27 @@
 /*
  * Created on 23-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGBeat {
-	
+public class TGBeat implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final int MAX_VOICES = 2;
-	
+
 	private long start;
 	private TGMeasure measure;
 	private TGChord chord;
 	private TGText text;
-	private TGVoice[] voices;
-	private TGStroke stroke;
-	
+	private final TGVoice[] voices;
+	private final TGStroke stroke;
+
 	public TGBeat(TGFactory factory) {
 		this.start = TGDuration.QUARTER_TIME;
 		this.stroke = factory.newStroke();
@@ -32,79 +30,79 @@ public TGBeat(TGFactory factory) {
 			this.setVoice(i, factory.newVoice(i));
 		}
 	}
-	
+
 	public TGMeasure getMeasure() {
 		return this.measure;
 	}
-	
+
 	public void setMeasure(TGMeasure measure) {
 		this.measure = measure;
 	}
-	
+
 	public long getStart() {
 		return this.start;
 	}
-	
+
 	public void setStart(long start) {
 		this.start = start;
 	}
-	
+
 	public void setVoice(int index, TGVoice voice){
 		if( index >= 0 && index < this.voices.length ){
 			this.voices[index] = voice;
 			this.voices[index].setBeat( this );
 		}
 	}
-	
+
 	public TGVoice getVoice(int index){
 		if( index >= 0 && index < this.voices.length ){
 			return this.voices[index];
 		}
 		return null;
 	}
-	
+
 	public int countVoices(){
 		return this.voices.length;
 	}
-	
+
 	public void setChord(TGChord chord) {
 		this.chord = chord;
 		this.chord.setBeat(this);
 	}
-	
+
 	public TGChord getChord() {
 		return this.chord;
 	}
-	
+
 	public void removeChord() {
 		this.chord = null;
 	}
-	
+
 	public TGText getText() {
 		return this.text;
 	}
-	
+
 	public void setText(TGText text) {
 		this.text = text;
 		this.text.setBeat(this);
 	}
-	
+
 	public void removeText(){
 		this.text = null;
 	}
-	
+
 	public boolean isChordBeat(){
 		return ( this.chord != null );
 	}
-	
+
 	public boolean isTextBeat(){
 		return ( this.text != null );
 	}
-	
+
 	public TGStroke getStroke() {
 		return this.stroke;
 	}
-	
+
 	public boolean isRestBeat(){
 		for(int v = 0; v < this.countVoices() ; v ++ ){
 			TGVoice voice = this.getVoice( v );
@@ -114,7 +112,7 @@ public boolean isRestBeat(){
 		}
 		return true;
 	}
-	
+
 	public TGBeat clone(TGFactory factory){
 		TGBeat beat = factory.newBeat();
 		beat.setStart(getStart());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGChannel.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGChannel.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGChannel.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGChannel.java
index d44431f7..f1224489 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGChannel.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGChannel.java
@@ -1,13 +1,16 @@
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
-public abstract class TGChannel {
-	
+public class TGChannel implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final short DEFAULT_PERCUSSION_CHANNEL = 9;
 	public static final short DEFAULT_PERCUSSION_PROGRAM = 0;
 	public static final short DEFAULT_PERCUSSION_BANK = 128;
-	
+
 	public static final short DEFAULT_BANK = 0;
 	public static final short DEFAULT_PROGRAM = 25;
 	public static final short DEFAULT_VOLUME = 127;
@@ -16,7 +19,7 @@ public abstract class TGChannel {
 	public static final short DEFAULT_REVERB = 0;
 	public static final short DEFAULT_PHASER = 0;
 	public static final short DEFAULT_TREMOLO = 0;
-	
+
 	private int channelId;
 	private short channel;
 	private short effectChannel;
@@ -29,7 +32,7 @@ public abstract class TGChannel {
 	private short phaser;
 	private short tremolo;
 	private String name;
-	
+
 	public TGChannel() {
 		this.channelId = 0;
 		this.channel = 0;
@@ -44,130 +47,130 @@ public TGChannel() {
 		this.tremolo = DEFAULT_TREMOLO;
 		this.name = new String();
 	}
-	
+
 	public int getChannelId() {
 		return this.channelId;
 	}
-	
+
 	public void setChannelId(int channelId) {
 		this.channelId = channelId;
 	}
-	
+
 	public short getBalance() {
 		return this.balance;
 	}
-	
+
 	public void setBalance(short balance) {
 		this.balance = balance;
 	}
-	
+
 	public short getChannel() {
 		return this.channel;
 	}
-	
+
 	public void setChannel(short channel) {
 		this.channel = channel;
 	}
-	
+
 	public short getEffectChannel() {
 		return this.effectChannel;
 	}
-	
+
 	public void setEffectChannel(short effectChannel) {
 		this.effectChannel = effectChannel;
 	}
-	
+
 	public short getChorus() {
 		return this.chorus;
 	}
-	
+
 	public void setChorus(short chorus) {
 		this.chorus = chorus;
 	}
-	
+
 	public short getBank() {
 		return (this.isPercussionChannel() ? DEFAULT_PERCUSSION_BANK : this.bank);
 	}
-	
+
 	public void setBank(short bank) {
 		this.bank = bank;
 	}
-	
+
 	public short getProgram() {
 		return this.program;
 	}
-	
+
 	public void setProgram(short program) {
 		this.program = program;
 	}
-	
+
 	public short getPhaser() {
 		return this.phaser;
 	}
-	
+
 	public void setPhaser(short phaser) {
 		this.phaser = phaser;
 	}
-	
+
 	public short getReverb() {
 		return this.reverb;
 	}
-	
+
 	public void setReverb(short reverb) {
 		this.reverb = reverb;
 	}
-	
+
 	public short getTremolo() {
 		return this.tremolo;
 	}
-	
+
 	public void setTremolo(short tremolo) {
 		this.tremolo = tremolo;
 	}
-	
+
 	public short getVolume() {
 		return this.volume;
 	}
-	
+
 	public void setVolume(short volume) {
 		this.volume = volume;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public boolean isPercussionChannel(){
 		return TGChannel.isPercussionChannel(this.getChannel());
 	}
-	
+
 	public static boolean isPercussionChannel(int channel){
 		return (channel == DEFAULT_PERCUSSION_CHANNEL);
 	}
-	
+
 	public static void setPercussionChannel(TGChannel channel){
 		channel.setChannel(DEFAULT_PERCUSSION_CHANNEL);
 		channel.setEffectChannel(DEFAULT_PERCUSSION_CHANNEL);
 		channel.setProgram(DEFAULT_PERCUSSION_PROGRAM);
 		channel.setBank(DEFAULT_PERCUSSION_BANK);
 	}
-	
+
 	public static TGChannel newPercussionChannel(TGFactory factory){
 		TGChannel channel = factory.newChannel();
 		TGChannel.setPercussionChannel(channel);
 		return channel;
 	}
-	
+
 	public TGChannel clone(TGFactory factory){
 		TGChannel channel = factory.newChannel();
 		copy(channel);
-		return channel; 
+		return channel;
 	}
-	
+
 	public void copy(TGChannel channel){
 		channel.setChannelId(getChannelId());
 		channel.setChannel(getChannel());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGChord.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGChord.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGChord.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGChord.java
index ec3959ce..eac123ab 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGChord.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGChord.java
@@ -1,69 +1,67 @@
 /*
  * Created on 29-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGChord {
+public class TGChord implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private int firstFret;
-	private int[] strings;
+	private final int[] strings;
 	private String name;
 	private TGBeat beat;
-	
+
 	public TGChord(int length){
 		this.strings = new int[length];
 		for(int i = 0;i < this.strings.length;i++){
 			this.strings[i] = -1;
 		}
 	}
-	
+
 	public TGBeat getBeat() {
 		return this.beat;
 	}
-	
+
 	public void setBeat(TGBeat beat) {
 		this.beat = beat;
 	}
-	
+
 	public void addFretValue(int string,int fret){
 		if(string >= 0 && string < this.strings.length){
 			this.strings[string] = fret;
 		}
 	}
-	
+
 	public int getFretValue(int string){
 		if(string >= 0 && string < this.strings.length){
 			return this.strings[string];
 		}
 		return -1;
 	}
-	
+
 	public int getFirstFret() {
 		return this.firstFret;
 	}
-	
+
 	public void setFirstFret(int firstFret) {
 		this.firstFret = firstFret;
 	}
-	
+
 	public int[] getStrings() {
 		return this.strings;
 	}
-	
+
 	public int countStrings(){
 		return this.strings.length;
 	}
-	
+
 	public int countNotes(){
 		int count = 0;
 		for(int i = 0;i < this.strings.length;i++){
@@ -73,15 +71,15 @@ public int countNotes(){
 		}
 		return count;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public TGChord clone(TGFactory factory){
 		TGChord chord = factory.newChord(this.strings.length);
 		chord.setName(getName());
@@ -91,5 +89,5 @@ public TGChord clone(TGFactory factory){
 		}
 		return chord;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGColor.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGColor.java
new file mode 100644
index 00000000..a55b5228
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGColor.java
@@ -0,0 +1,79 @@
+package org.herac.tuxguitar.song.models;
+
+import java.io.Serializable;
+
+import org.eclipse.swt.graphics.RGB;
+import org.herac.tuxguitar.song.factory.TGFactory;
+
+public class TGColor implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	public static final TGColor RED = newColor(255,0,0);
+	public static final TGColor GREEN = newColor(0,255,0);
+	public static final TGColor BLUE = newColor(0,0,255);
+	public static final TGColor WHITE = newColor(255,255,255);
+	public static final TGColor BLACK = newColor(0,0,0);
+
+	private int r;
+	private int g;
+	private int b;
+
+	public TGColor(){
+		this.r = 0;
+		this.g = 0;
+		this.b = 0;
+	}
+
+	public int getB() {
+		return this.b;
+	}
+
+	public void setB(int b) {
+		this.b = b;
+	}
+
+	public int getG() {
+		return this.g;
+	}
+
+	public void setG(int g) {
+		this.g = g;
+	}
+
+	public int getR() {
+		return this.r;
+	}
+
+	public void setR(int r) {
+		this.r = r;
+	}
+
+	public boolean isEqual(TGColor color){
+		return (this.getR() == color.getR() && this.getG() == color.getG() && this.getB() == color.getB());
+	}
+
+	public TGColor clone(TGFactory factory){
+		TGColor color = factory.newColor();
+		copy(color);
+		return color;
+	}
+
+	public void copy(TGColor color){
+		color.setR(getR());
+		color.setG(getG());
+		color.setB(getB());
+	}
+
+	public static TGColor newColor(int r,int g,int b){
+		TGColor color = new TGFactory().newColor();
+		color.setR(r);
+		color.setG(g);
+		color.setB(b);
+		return color;
+	}
+
+	public RGB getRGB() {
+		return new RGB(r, g, b);
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGDivisionType.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGDivisionType.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGDivisionType.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGDivisionType.java
index 91597f9f..3795c380 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGDivisionType.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGDivisionType.java
@@ -1,25 +1,22 @@
 /*
  * Created on 05-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGDivisionType {
-	
+public class TGDivisionType implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final TGDivisionType NORMAL = newDivisionType(1,1);
-	
+
 	public static final TGDivisionType TRIPLET = newDivisionType(3,2);
-	
+
 	public static final TGDivisionType[] ALTERED_DIVISION_TYPES = new TGDivisionType[]{
 		newDivisionType(3,2),
 		newDivisionType(5,4),
@@ -31,7 +28,7 @@ public abstract class TGDivisionType {
 		newDivisionType(12,8),
 		newDivisionType(13,8),
 	};
-	
+
 	/**
 	 * Cantidad de Duraciones que entran en los tiempos
 	 */
@@ -40,52 +37,52 @@ public abstract class TGDivisionType {
 	 * Tiempos
 	 */
 	private int times;
-	
+
 	public TGDivisionType(){
 		this.enters = 1;
 		this.times = 1;
 	}
-	
+
 	public int getEnters() {
 		return this.enters;
 	}
-	
+
 	public void setEnters(int enters) {
 		this.enters = enters;
 	}
-	
+
 	public int getTimes() {
 		return this.times;
 	}
-	
+
 	public void setTimes(int times) {
 		this.times = times;
 	}
-	
+
 	public long convertTime(long time){
 		return time * this.times / this.enters;
 	}
-	
+
 	public boolean isEqual(TGDivisionType divisionType){
 		return (divisionType.getEnters() == getEnters() && divisionType.getTimes() == getTimes());
 	}
-	
+
 	public TGDivisionType clone(TGFactory factory){
 		TGDivisionType divisionType = factory.newDivisionType();
 		copy(divisionType);
 		return divisionType;
 	}
-	
+
 	public void copy(TGDivisionType divisionType){
 		divisionType.setEnters(this.enters);
 		divisionType.setTimes(this.times);
 	}
-	
+
 	private static TGDivisionType newDivisionType(int enters,int times){
 		TGDivisionType divisionType = new TGFactory().newDivisionType();
 		divisionType.setEnters(enters);
 		divisionType.setTimes(times);
 		return divisionType;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGDuration.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGDuration.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGDuration.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGDuration.java
index 7b10862c..2ad3482d 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGDuration.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGDuration.java
@@ -1,19 +1,17 @@
 /*
  * Created on 29-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGDuration {
+public class TGDuration implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	/**
 	 * tiempo por defecto de la Negra.
 	 */
@@ -22,32 +20,32 @@ public abstract class TGDuration {
 	 * Redonda.
 	 */
 	public static final int WHOLE = 1;
-	
+
 	/**
 	 * Blanca.
 	 */
 	public static final int HALF = 2;
-	
+
 	/**
 	 * Negra.
 	 */
 	public static final int QUARTER = 4;
-	
+
 	/**
 	 * Corchea.
 	 */
 	public static final int EIGHTH = 8;
-	
+
 	/**
 	 * Semi-Corchea.
 	 */
 	public static final int SIXTEENTH = 16;
-	
+
 	/**
 	 * Fusa.
 	 */
 	public static final int THIRTY_SECOND = 32;
-	
+
 	/**
 	 * Semi-Fusa.
 	 */
@@ -67,43 +65,43 @@ public abstract class TGDuration {
 	/**
 	 * DivisionType.
 	 */
-	private TGDivisionType divisionType;
-	
+	private final TGDivisionType divisionType;
+
 	public TGDuration(TGFactory factory){
 		this.value = QUARTER;
 		this.dotted = false;
 		this.doubleDotted = false;
 		this.divisionType = factory.newDivisionType();
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(int value) {
 		this.value = value;
 	}
-	
+
 	public boolean isDotted() {
 		return this.dotted;
 	}
-	
+
 	public void setDotted(boolean dotted) {
 		this.dotted = dotted;
 	}
-	
+
 	public boolean isDoubleDotted() {
 		return this.doubleDotted;
 	}
-	
+
 	public void setDoubleDotted(boolean doubleDotted) {
 		this.doubleDotted = doubleDotted;
 	}
-	
+
 	public TGDivisionType getDivision(){
 		return this.divisionType;
 	}
-	
+
 	public long getTime(){
 		long time = (long)( QUARTER_TIME * ( 4.0f / this.value ) ) ;
 		if(this.dotted){
@@ -113,7 +111,7 @@ public long getTime(){
 		}
 		return this.divisionType.convertTime(time);
 	}
-	
+
 	public static TGDuration fromTime(TGFactory factory,long time){
 		TGDuration duration = factory.newDuration();
 		duration.setValue(TGDuration.SIXTY_FOURTH);
@@ -123,11 +121,11 @@ public static TGDuration fromTime(TGFactory factory,long time){
 		duration.getDivision().setTimes(2);
 		return fromTime(factory,time,duration);
 	}
-	
+
 	public static TGDuration fromTime(TGFactory factory,long time,TGDuration minDuration){
 		return fromTime(factory, time, minDuration, 10);
 	}
-	
+
 	public static TGDuration fromTime(TGFactory factory,long time,TGDuration minimum, int diff){
 		TGDuration duration = minimum.clone(factory);
 		TGDuration tmpDuration = factory.newDuration();
@@ -172,22 +170,22 @@ public int getIndex(){
 		}
 		return index;
 	}
-	
+
 	public boolean isEqual(TGDuration d){
 		return (getValue() == d.getValue() && isDotted() == d.isDotted() && isDoubleDotted() == d.isDoubleDotted() && getDivision().isEqual(d.getDivision()));
 	}
-	
+
 	public TGDuration clone(TGFactory factory){
 		TGDuration duration = factory.newDuration();
 		copy(duration);
 		return duration;
 	}
-	
+
 	public void copy(TGDuration duration){
 		duration.setValue(getValue());
 		duration.setDotted(isDotted());
 		duration.setDoubleDotted(isDoubleDotted());
 		getDivision().copy(duration.getDivision());
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGLyric.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGLyric.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGLyric.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGLyric.java
index 076fc57c..64311b72 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGLyric.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGLyric.java
@@ -1,46 +1,50 @@
 package org.herac.tuxguitar.song.models;
 
-public abstract class TGLyric {
+import java.io.Serializable;
+
+public class TGLyric implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private static final String REGEX = " ";
-	
+
 	private int from;
 	private String lyrics;
-	
+
 	public TGLyric(){
 		this.from = 1;
 		this.lyrics = new String();
 	}
-	
+
 	public int getFrom() {
 		return this.from;
 	}
-	
+
 	public void setFrom(int from) {
 		this.from = from;
 	}
-	
+
 	public String getLyrics() {
 		return this.lyrics;
 	}
-	
+
 	public void setLyrics(String lyrics) {
 		this.lyrics = lyrics;
 	}
-	
+
 	public String[] getLyricBeats(){
 		String lyrics = getLyrics();
 		lyrics = lyrics.replaceAll("\n",REGEX);
 		lyrics = lyrics.replaceAll("\r",REGEX);
 		return lyrics.split(REGEX);
 	}
-	
+
 	public boolean isEmpty(){
 		return (getLyrics().length() == 0);
 	}
-	
+
 	public void copy(TGLyric lyric){
 		lyric.setFrom(getFrom());
 		lyric.setLyrics(getLyrics());
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGMarker.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMarker.java
similarity index 87%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGMarker.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMarker.java
index 9a656cb9..73a114ae 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGMarker.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMarker.java
@@ -1,45 +1,49 @@
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
-public abstract class TGMarker {
+public class TGMarker implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private static final TGColor DEFAULT_COLOR = TGColor.RED;
 	private static final String DEFAULT_TITLE = "Untitled";
-	
+
 	private int measure;
 	private String title;
 	private TGColor color;
-	
+
 	public TGMarker(TGFactory factory) {
 		this.measure = 0;
 		this.title = DEFAULT_TITLE;
 		this.color = DEFAULT_COLOR.clone(factory);
 	}
-	
+
 	public int getMeasure() {
 		return this.measure;
 	}
-	
+
 	public void setMeasure(int measure) {
 		this.measure = measure;
 	}
-	
+
 	public String getTitle() {
 		return this.title;
 	}
-	
+
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	
+
 	public TGColor getColor() {
 		return this.color;
 	}
-	
+
 	public void setColor(TGColor color) {
 		this.color = color;
 	}
-	
+
 	public TGMarker clone(TGFactory factory){
 		TGMarker marker = factory.newMarker();
 		marker.setMeasure(getMeasure());
@@ -47,5 +51,5 @@ public TGMarker clone(TGFactory factory){
 		getColor().copy(marker.getColor());
 		return marker;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGMeasure.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMeasure.java
similarity index 84%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGMeasure.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMeasure.java
index 8b2244c5..aaea9ec6 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGMeasure.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMeasure.java
@@ -1,11 +1,9 @@
 /*
  * Created on 26-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -13,135 +11,140 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGMeasure {
-	
+public class TGMeasure implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final int CLEF_TREBLE = 1;
 	public static final int CLEF_BASS = 2;
 	public static final int CLEF_TENOR = 3;
 	public static final int CLEF_ALTO = 4;
-	
+
 	public static final int DEFAULT_CLEF = CLEF_TREBLE;
 	public static final int DEFAULT_KEY_SIGNATURE= 0;
-	
+
 	private TGMeasureHeader header;
 	private TGTrack track;
 	private int clef;
 	private int keySignature;
-	
-	private List beats;
-	
+
+	private final List<TGBeat> beats;
+
 	public TGMeasure(TGMeasureHeader header){
 		this.header = header;
 		this.clef = DEFAULT_CLEF;
 		this.keySignature = DEFAULT_KEY_SIGNATURE;
-		this.beats = new ArrayList();
+		this.beats = new ArrayList<TGBeat>();
 	}
-	
+
 	public TGTrack getTrack() {
 		return this.track;
 	}
-	
+
 	public void setTrack(TGTrack track) {
 		this.track = track;
 	}
-	
+
 	public int getClef() {
 		return this.clef;
 	}
-	
+
 	public void setClef(int clef) {
 		this.clef = clef;
 	}
-	
+
 	public int getKeySignature() {
 		return this.keySignature;
 	}
-	
+
 	public void setKeySignature(int keySignature) {
 		this.keySignature = keySignature;
 	}
-	
-	public List getBeats() {
+
+	public List<TGBeat> getBeats() {
 		return this.beats;
 	}
-	
+
 	public void addBeat(TGBeat beat){
 		beat.setMeasure(this);
 		this.beats.add(beat);
 	}
-	
+
 	public void moveBeat(int index,TGBeat beat){
 		this.beats.remove(beat);
 		this.beats.add(index,beat);
 	}
-	
+
 	public void removeBeat(TGBeat beat){
 		this.beats.remove(beat);
 	}
-	
+
 	public TGBeat getBeat(int index){
 		if(index >= 0 && index < countBeats()){
-			return (TGBeat)this.beats.get(index);
+			return this.beats.get(index);
 		}
 		return null;
 	}
-	
+
 	public int countBeats(){
 		return this.beats.size();
 	}
-	
+
 	public TGMeasureHeader getHeader() {
 		return this.header;
 	}
-	
+
 	public void setHeader(TGMeasureHeader header) {
 		this.header = header;
 	}
-	
+
 	public int getNumber() {
 		return this.header.getNumber();
 	}
-	
+
 	public int getRepeatClose() {
 		return this.header.getRepeatClose();
 	}
-	
+
+	/**
+	 * True if it has double bar separator at the end of the measure
+	 */
+	public boolean hasDoubleBar() {
+		return this.header.hasDoubleBar();
+	}
+
 	public long getStart() {
 		return this.header.getStart();
 	}
-	
+
 	public TGTempo getTempo() {
 		return this.header.getTempo();
 	}
-	
+
 	public TGTimeSignature getTimeSignature() {
 		return this.header.getTimeSignature();
 	}
-	
+
 	public boolean isRepeatOpen() {
 		return this.header.isRepeatOpen();
 	}
-	
+
 	public int getTripletFeel() {
 		return this.header.getTripletFeel();
 	}
-	
+
 	public long getLength() {
 		return this.header.getLength();
 	}
-	
+
 	public TGMarker getMarker(){
 		return this.header.getMarker();
 	}
-	
+
 	public boolean hasMarker() {
 		return this.header.hasMarker();
 	}
-	
+
 	public void makeEqual(TGMeasure measure){
 		this.clef = measure.getClef();
 		this.keySignature = measure.getKeySignature();
@@ -151,13 +154,13 @@ public void makeEqual(TGMeasure measure){
 			this.addBeat(beat);
 		}
 	}
-	
+
 	public TGMeasure clone(TGFactory factory,TGMeasureHeader header){
 		TGMeasure measure = factory.newMeasure(header);
 		measure.setClef(getClef());
 		measure.setKeySignature(getKeySignature());
 		for(int i = 0; i < countBeats(); i ++){
-			TGBeat beat = (TGBeat)this.beats.get(i);
+			TGBeat beat = this.beats.get(i);
 			measure.addBeat(beat.clone(factory));
 		}
 		return measure;
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGMeasureHeader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMeasureHeader.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGMeasureHeader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMeasureHeader.java
index e35aa190..55691325 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGMeasureHeader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGMeasureHeader.java
@@ -1,24 +1,22 @@
 /*
  * Created on 26-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGMeasureHeader {
+public class TGMeasureHeader implements Serializable{
+	private static final long serialVersionUID = 1L;
+
 	public static final int TRIPLET_FEEL_NONE = 1;
 	public static final int TRIPLET_FEEL_EIGHTH = 2;
 	public static final int TRIPLET_FEEL_SIXTEENTH = 3;
-	
+
 	private int number;
 	private long start;
 	private TGTimeSignature timeSignature;
@@ -27,9 +25,10 @@ public abstract class TGMeasureHeader {
 	private boolean repeatOpen;
 	private int repeatAlternative;
 	private int repeatClose;
+	private boolean doubleBar;
 	private int tripletFeel;
 	private TGSong song;
-	
+
 	public TGMeasureHeader(TGFactory factory){
 		this.number = 0;
 		this.start = TGDuration.QUARTER_TIME;
@@ -42,28 +41,42 @@ public TGMeasureHeader(TGFactory factory){
 		this.repeatAlternative = 0;
 		this.checkMarker();
 	}
-	
+
 	public int getNumber() {
 		return this.number;
 	}
-	
+
 	public void setNumber(int number) {
 		this.number = number;
 		this.checkMarker();
 	}
-	
+
 	public int getRepeatClose() {
 		return this.repeatClose;
 	}
-	
+
 	public void setRepeatClose(int repeatClose) {
 		this.repeatClose = repeatClose;
 	}
-	
+
 	public int getRepeatAlternative() {
 		return this.repeatAlternative;
 	}
-	
+
+	/**
+	 * True if it has double bar separator at the end of the measure
+	 */
+	public boolean hasDoubleBar() {
+		return this.doubleBar;
+	}
+
+	/**
+	 * Set presence of a double bar separator at the end of the measure
+	 */
+	public void setDoubleBar(boolean doubleBar) {
+		this.doubleBar = doubleBar;
+	}
+
 	/**
 	 * bitwise value 1 TO 8.
 	 * (1 << AlternativeNumber)
@@ -71,77 +84,77 @@ public int getRepeatAlternative() {
 	public void setRepeatAlternative(int repeatAlternative) {
 		this.repeatAlternative = repeatAlternative;
 	}
-	
+
 	public boolean isRepeatOpen() {
 		return this.repeatOpen;
 	}
-	
+
 	public void setRepeatOpen(boolean repeatOpen) {
 		this.repeatOpen = repeatOpen;
 	}
-	
+
 	public long getStart() {
 		return this.start;
 	}
-	
+
 	public void setStart(long start) {
 		this.start = start;
 	}
-	
+
 	public int getTripletFeel() {
 		return this.tripletFeel;
 	}
-	
+
 	public void setTripletFeel(int tripletFeel) {
 		this.tripletFeel = tripletFeel;
 	}
-	
+
 	public TGTempo getTempo() {
 		return this.tempo;
 	}
-	
+
 	public void setTempo(TGTempo tempo) {
 		this.tempo = tempo;
 	}
-	
+
 	public TGTimeSignature getTimeSignature() {
 		return this.timeSignature;
 	}
-	
+
 	public void setTimeSignature(TGTimeSignature timeSignature) {
 		this.timeSignature = timeSignature;
 	}
-	
+
 	public TGMarker getMarker() {
 		return this.marker;
 	}
-	
+
 	public void setMarker(TGMarker marker) {
 		this.marker = marker;
 	}
-	
+
 	public boolean hasMarker(){
 		return (getMarker() != null);
 	}
-	
+
 	private void checkMarker(){
 		if(hasMarker()){
 			this.marker.setMeasure(getNumber());
 		}
 	}
-	
+
 	public long getLength(){
 		return getTimeSignature().getNumerator() * getTimeSignature().getDenominator().getTime();
 	}
-	
+
 	public TGSong getSong() {
 		return this.song;
 	}
-	
+
 	public void setSong(TGSong song) {
 		this.song = song;
 	}
-	
+
 	public void makeEqual(TGMeasureHeader measure){
 		this.start = measure.getStart();
 		this.timeSignature = measure.getTimeSignature();
@@ -150,9 +163,10 @@ public void makeEqual(TGMeasureHeader measure){
 		this.repeatOpen = measure.isRepeatOpen();
 		this.repeatClose = measure.getRepeatClose();
 		this.repeatAlternative = measure.getRepeatAlternative();
+		this.doubleBar = measure.hasDoubleBar();
 		this.checkMarker();
 	}
-	
+
 	public TGMeasureHeader clone(TGFactory factory){
 		TGMeasureHeader header = factory.newHeader();
 		header.setNumber(getNumber());
@@ -161,9 +175,11 @@ public TGMeasureHeader clone(TGFactory factory){
 		header.setRepeatAlternative(getRepeatAlternative());
 		header.setRepeatClose(getRepeatClose());
 		header.setTripletFeel(getTripletFeel());
+		header.setDoubleBar(hasDoubleBar());
 		getTimeSignature().copy(header.getTimeSignature());
 		getTempo().copy(header.getTempo());
 		header.setMarker(hasMarker()?(TGMarker)getMarker().clone(factory):null);
 		return header;
 	}
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGNote.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGNote.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGNote.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGNote.java
index 9cc4a003..47cd0c1b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGNote.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGNote.java
@@ -1,26 +1,25 @@
 /*
  * Created on 23-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGNote {
+public class TGNote implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private int value;
 	private int velocity;
 	private int string;
 	private boolean tiedNote;
 	private TGNoteEffect effect;
 	private TGVoice voice;
-	
+
 	public TGNote(TGFactory factory) {
 		this.value = 0;
 		this.velocity = TGVelocities.DEFAULT;
@@ -28,55 +27,55 @@ public TGNote(TGFactory factory) {
 		this.tiedNote = false;
 		this.effect = factory.newEffect();
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(int value) {
 		this.value = value;
 	}
-	
+
 	public int getVelocity() {
 		return this.velocity;
 	}
-	
+
 	public void setVelocity(int velocity) {
 		this.velocity = velocity;
 	}
-	
+
 	public int getString() {
 		return this.string;
 	}
-	
+
 	public void setString(int string) {
 		this.string = string;
 	}
-	
+
 	public boolean isTiedNote() {
 		return this.tiedNote;
 	}
-	
+
 	public void setTiedNote(boolean tiedNote) {
 		this.tiedNote = tiedNote;
 	}
-	
+
 	public TGNoteEffect getEffect() {
 		return this.effect;
 	}
-	
+
 	public void setEffect(TGNoteEffect effect) {
 		this.effect = effect;
 	}
-	
+
 	public TGVoice getVoice() {
 		return this.voice;
 	}
-	
+
 	public void setVoice(TGVoice voice) {
 		this.voice = voice;
 	}
-	
+
 	public TGNote clone(TGFactory factory){
 		TGNote note = factory.newNote();
 		note.setValue(getValue());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGNoteEffect.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGNoteEffect.java
similarity index 95%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGNoteEffect.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGNoteEffect.java
index 71ad7614..c3713a26 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGNoteEffect.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGNoteEffect.java
@@ -1,11 +1,10 @@
 /*
  * Created on 26-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 import org.herac.tuxguitar.song.models.effects.TGEffectBend;
 import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
@@ -16,11 +15,10 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGNoteEffect {
+public class TGNoteEffect implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private TGEffectBend bend;
 	private TGEffectTremoloBar tremoloBar;
 	private TGEffectHarmonic harmonic;
@@ -41,7 +39,7 @@ public abstract class TGNoteEffect {
 	private boolean popping;
 	private boolean fadeIn;
 	private boolean letRing;
-	
+
 	public TGNoteEffect(){
 		this.bend = null;
 		this.tremoloBar = null;
@@ -64,11 +62,11 @@ public TGNoteEffect(){
 		this.fadeIn = false;
 		this.letRing = false;
 	}
-	
+
 	public boolean isDeadNote() {
 		return this.deadNote;
 	}
-	
+
 	public void setDeadNote(boolean deadNote) {
 		this.deadNote = deadNote;
 		//si es true, quito los efectos incompatibles
@@ -80,11 +78,11 @@ public void setDeadNote(boolean deadNote) {
 			this.hammer = false;
 		}
 	}
-	
+
 	public boolean isVibrato() {
 		return this.vibrato;
 	}
-	
+
 	public void setVibrato(boolean vibrato) {
 		this.vibrato = vibrato;
 		//si no es null quito los efectos incompatibles
@@ -92,11 +90,11 @@ public void setVibrato(boolean vibrato) {
 			this.trill = null;
 		}
 	}
-	
+
 	public TGEffectBend getBend() {
 		return this.bend;
 	}
-	
+
 	public void setBend(TGEffectBend bend) {
 		this.bend = bend;
 		//si no es null quito los efectos incompatibles
@@ -108,15 +106,15 @@ public void setBend(TGEffectBend bend) {
 			this.hammer = false;
 		}
 	}
-	
+
 	public boolean isBend() {
 		return (this.bend != null && !this.bend.getPoints().isEmpty());
 	}
-	
+
 	public TGEffectTremoloBar getTremoloBar() {
 		return this.tremoloBar;
 	}
-	
+
 	public void setTremoloBar(TGEffectTremoloBar tremoloBar) {
 		this.tremoloBar = tremoloBar;
 		//si no es null quito los efectos incompatibles
@@ -128,16 +126,16 @@ public void setTremoloBar(TGEffectTremoloBar tremoloBar) {
 			this.hammer = false;
 		}
 	}
-	
+
 	public boolean isTremoloBar() {
 		return (this.tremoloBar != null);
 	}
-	
-	
+
+
 	public TGEffectTrill getTrill() {
 		return this.trill;
 	}
-	
+
 	public void setTrill(TGEffectTrill trill) {
 		this.trill = trill;
 		//si es true, quito los efectos incompatibles
@@ -151,15 +149,15 @@ public void setTrill(TGEffectTrill trill) {
 			this.vibrato = false;
 		}
 	}
-	
+
 	public boolean isTrill() {
 		return (this.trill != null);
 	}
-	
+
 	public TGEffectTremoloPicking getTremoloPicking() {
 		return this.tremoloPicking;
 	}
-	
+
 	public void setTremoloPicking(TGEffectTremoloPicking tremoloPicking) {
 		this.tremoloPicking = tremoloPicking;
 		//si es true, quito los efectos incompatibles
@@ -173,15 +171,15 @@ public void setTremoloPicking(TGEffectTremoloPicking tremoloPicking) {
 			this.vibrato = false;
 		}
 	}
-	
+
 	public boolean isTremoloPicking() {
 		return (this.tremoloPicking != null);
 	}
-	
+
 	public boolean isHammer() {
 		return this.hammer;
 	}
-	
+
 	public void setHammer(boolean hammer) {
 		this.hammer = hammer;
 		//si es true, quito los efectos incompatibles
@@ -193,11 +191,11 @@ public void setHammer(boolean hammer) {
 			this.slide = false;
 		}
 	}
-	
+
 	public boolean isSlide() {
 		return this.slide;
 	}
-	
+
 	public void setSlide(boolean slide) {
 		this.slide = slide;
 		//si es true, quito los efectos incompatibles
@@ -209,11 +207,11 @@ public void setSlide(boolean slide) {
 			this.hammer = false;
 		}
 	}
-	
+
 	public boolean isGhostNote() {
 		return this.ghostNote;
 	}
-	
+
 	public void setGhostNote(boolean ghostNote) {
 		this.ghostNote = ghostNote;
 		//si es true, quito los efectos incompatibles
@@ -222,11 +220,11 @@ public void setGhostNote(boolean ghostNote) {
 			this.heavyAccentuatedNote = false;
 		}
 	}
-	
+
 	public boolean isAccentuatedNote() {
 		return this.accentuatedNote;
 	}
-	
+
 	public void setAccentuatedNote(boolean accentuatedNote) {
 		this.accentuatedNote = accentuatedNote;
 		//si es true, quito los efectos incompatibles
@@ -235,11 +233,11 @@ public void setAccentuatedNote(boolean accentuatedNote) {
 			this.heavyAccentuatedNote = false;
 		}
 	}
-	
+
 	public boolean isHeavyAccentuatedNote() {
 		return this.heavyAccentuatedNote;
 	}
-	
+
 	public void setHeavyAccentuatedNote(boolean heavyAccentuatedNote) {
 		this.heavyAccentuatedNote = heavyAccentuatedNote;
 		//si es true, quito los efectos incompatibles
@@ -248,35 +246,35 @@ public void setHeavyAccentuatedNote(boolean heavyAccentuatedNote) {
 			this.accentuatedNote = false;
 		}
 	}
-	
+
 	public void setHarmonic(TGEffectHarmonic harmonic) {
 		this.harmonic = harmonic;
 	}
-	
+
 	public TGEffectHarmonic getHarmonic() {
 		return this.harmonic;
 	}
-	
+
 	public boolean isHarmonic() {
 		return (this.harmonic != null);
 	}
-	
+
 	public TGEffectGrace getGrace() {
 		return this.grace;
 	}
-	
+
 	public void setGrace(TGEffectGrace grace) {
 		this.grace = grace;
 	}
-	
+
 	public boolean isGrace() {
 		return (this.grace != null);
 	}
-	
+
 	public boolean isPalmMute() {
 		return this.palmMute;
 	}
-	
+
 	public void setPalmMute(boolean palmMute) {
 		this.palmMute = palmMute;
 		//si es true, quito los efectos incompatibles
@@ -285,11 +283,11 @@ public void setPalmMute(boolean palmMute) {
 			this.letRing = false;
 		}
 	}
-	
+
 	public boolean isStaccato() {
 		return this.staccato;
 	}
-	
+
 	public void setStaccato(boolean staccato) {
 		this.staccato = staccato;
 		//si es true, quito los efectos incompatibles
@@ -298,11 +296,11 @@ public void setStaccato(boolean staccato) {
 			this.letRing = false;
 		}
 	}
-	
+
 	public boolean isLetRing() {
 		return this.letRing;
 	}
-	
+
 	public void setLetRing(boolean letRing) {
 		this.letRing = letRing;
 		//si es true, quito los efectos incompatibles
@@ -311,11 +309,11 @@ public void setLetRing(boolean letRing) {
 			this.palmMute = false;
 		}
 	}
-	
+
 	public boolean isPopping() {
 		return this.popping;
 	}
-	
+
 	public void setPopping(boolean popping) {
 		this.popping = popping;
 		//si es true, quito los efectos incompatibles
@@ -324,11 +322,11 @@ public void setPopping(boolean popping) {
 			this.slapping = false;
 		}
 	}
-	
+
 	public boolean isSlapping() {
 		return this.slapping;
 	}
-	
+
 	public void setSlapping(boolean slapping) {
 		this.slapping = slapping;
 		//si es true, quito los efectos incompatibles
@@ -337,11 +335,11 @@ public void setSlapping(boolean slapping) {
 			this.popping = false;
 		}
 	}
-	
+
 	public boolean isTapping() {
 		return this.tapping;
 	}
-	
+
 	public void setTapping(boolean tapping) {
 		this.tapping = tapping;
 		//si es true, quito los efectos incompatibles
@@ -350,15 +348,15 @@ public void setTapping(boolean tapping) {
 			this.popping = false;
 		}
 	}
-	
+
 	public boolean isFadeIn() {
 		return this.fadeIn;
 	}
-	
+
 	public void setFadeIn(boolean fadeIn) {
 		this.fadeIn = fadeIn;
 	}
-	
+
 	public boolean hasAnyEffect(){
 		return (isBend() ||
 				isTremoloBar() ||
@@ -381,7 +379,7 @@ public boolean hasAnyEffect(){
 				isPopping() ||
 				isFadeIn());
 	}
-	
+
 	public TGNoteEffect clone(TGFactory factory){
 		TGNoteEffect effect = factory.newEffect();
 		effect.setVibrato(isVibrato());
@@ -406,5 +404,5 @@ public TGNoteEffect clone(TGFactory factory){
 		effect.setTremoloPicking(isTremoloPicking()?(TGEffectTremoloPicking)this.tremoloPicking.clone(factory):null);
 		return effect;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGScale.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGScale.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGScale.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGScale.java
index 71fddcd2..f7c90f34 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGScale.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGScale.java
@@ -1,35 +1,39 @@
 package org.herac.tuxguitar.song.models;
 
-public abstract class TGScale {
+import java.io.Serializable;
+
+public class TGScale implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private final boolean[] notes = new boolean[12];
-	
+
 	private int key;
-	
+
 	public TGScale(){
 		this.clear();
 	}
-	
+
 	public void setKey(int key){
 		this.key = key;
 	}
-	
+
 	public int getKey(){
 		return this.key;
 	}
-	
+
 	public void setNote(int note,boolean on){
 		this.notes[note] = on;
 	}
-	
+
 	public boolean getNote(int note){
 		return this.notes[((note + (12 - this.key)) % 12)];
 	}
-	
+
 	public void clear(){
 		this.setKey(0);
 		for(int i = 0; i < this.notes.length; i++){
 			this.setNote(i,false);
 		}
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGSong.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGSong.java
similarity index 79%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGSong.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGSong.java
index a5edcf82..7e56633f 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGSong.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGSong.java
@@ -1,11 +1,9 @@
 /*
  * Created on 23-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -14,12 +12,10 @@
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGSong {
-	
+public class TGSong implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private String name;
 	private String artist;
 	private String album;
@@ -29,10 +25,10 @@ public abstract class TGSong {
 	private String writer;
 	private String transcriber;
 	private String comments;
-	private List tracks;
-	private List measureHeaders;
-	private List channels;
-	
+	private final List<TGTrack> tracks;
+	private final List<TGMeasureHeader> measureHeaders;
+	private final List<TGChannel> channels;
+
 	public TGSong() {
 		this.name = new String();
 		this.artist = new String();
@@ -43,193 +39,193 @@ public TGSong() {
 		this.writer = new String();
 		this.transcriber = new String();
 		this.comments = new String();
-		this.tracks = new ArrayList();
-		this.channels = new ArrayList();
-		this.measureHeaders = new ArrayList();
+		this.tracks = new ArrayList<TGTrack>();
+		this.channels = new ArrayList<TGChannel>();
+		this.measureHeaders = new ArrayList<TGMeasureHeader>();
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public String getAlbum() {
 		return this.album;
 	}
-	
+
 	public void setAlbum(String album) {
 		this.album = album;
 	}
-	
+
 	public String getAuthor() {
 		return this.author;
 	}
-	
+
 	public void setAuthor(String author) {
 		this.author = author;
 	}
-	
+
 	public String getArtist() {
 		return this.artist;
 	}
-	
+
 	public void setArtist(String artist) {
 		this.artist = artist;
 	}
-	
+
 	public String getDate() {
 		return this.date;
 	}
-	
+
 	public void setDate(String date) {
 		this.date = date;
 	}
-	
+
 	public String getCopyright() {
 		return this.copyright;
 	}
-	
+
 	public void setCopyright(String copyright) {
 		this.copyright = copyright;
 	}
-	
+
 	public String getWriter() {
 		return this.writer;
 	}
-	
+
 	public void setWriter(String writer) {
 		this.writer = writer;
 	}
-	
+
 	public String getTranscriber() {
 		return this.transcriber;
 	}
-	
+
 	public void setTranscriber(String transcriber) {
 		this.transcriber = transcriber;
 	}
-	
+
 	public String getComments() {
 		return this.comments;
 	}
-	
+
 	public void setComments(String comments) {
 		this.comments = comments;
 	}
-	
+
 	public int countMeasureHeaders(){
 		return this.measureHeaders.size();
 	}
-	
+
 	public void addMeasureHeader(TGMeasureHeader measureHeader){
 		this.addMeasureHeader(countMeasureHeaders(),measureHeader);
 	}
-	
+
 	public void addMeasureHeader(int index,TGMeasureHeader measureHeader){
 		measureHeader.setSong(this);
 		this.measureHeaders.add(index,measureHeader);
 	}
-	
+
 	public void removeMeasureHeader(int index){
 		this.measureHeaders.remove(index);
 	}
-	
+
 	public void removeMeasureHeader(TGMeasureHeader measureHeader){
 		this.measureHeaders.remove(measureHeader);
 	}
-	
+
 	public TGMeasureHeader getMeasureHeader(int index){
-		return (TGMeasureHeader)this.measureHeaders.get(index);
+		return this.measureHeaders.get(index);
 	}
-	
-	public Iterator getMeasureHeaders() {
+
+	public Iterator<TGMeasureHeader> getMeasureHeaders() {
 		return this.measureHeaders.iterator();
 	}
-	
+
 	public int countTracks(){
 		return this.tracks.size();
 	}
-	
+
 	public void addTrack(TGTrack track){
 		this.addTrack(countTracks(),track);
 	}
-	
+
 	public void addTrack(int index,TGTrack track){
 		track.setSong(this);
 		this.tracks.add(index,track);
 	}
-	
+
 	public void moveTrack(int index,TGTrack track){
 		this.tracks.remove(track);
 		this.tracks.add(index,track);
 	}
-	
+
 	public void removeTrack(TGTrack track){
 		this.tracks.remove(track);
 		track.clear();
 	}
-	
+
 	public TGTrack getTrack(int index){
-		return (TGTrack)this.tracks.get(index);
+		return this.tracks.get(index);
 	}
-	
-	public Iterator getTracks() {
+
+	public Iterator<TGTrack> getTracks() {
 		return this.tracks.iterator();
 	}
-	
+
 	public int countChannels(){
 		return this.channels.size();
 	}
-	
+
 	public void addChannel(TGChannel channel){
 		this.addChannel(countChannels(),channel);
 	}
-	
+
 	public void addChannel(int index,TGChannel channel){
 		this.channels.add(index,channel);
 	}
-	
+
 	public void moveChannel(int index,TGChannel channel){
 		this.channels.remove(channel);
 		this.channels.add(index,channel);
 	}
-	
+
 	public void removeChannel(TGChannel channel){
 		this.channels.remove(channel);
 	}
-	
+
 	public TGChannel getChannel(int index){
-		return (TGChannel)this.channels.get(index);
+		return this.channels.get(index);
 	}
-	
-	public Iterator getChannels() {
+
+	public Iterator<TGChannel> getChannels() {
 		return this.channels.iterator();
 	}
-	
+
 	public boolean isEmpty(){
 		return (countMeasureHeaders() == 0 || countTracks() == 0);
 	}
-	
+
 	public void clear(){
-		Iterator tracks = getTracks();
+		Iterator<TGTrack> tracks = getTracks();
 		while(tracks.hasNext()){
-			TGTrack track = (TGTrack)tracks.next();
+			TGTrack track = tracks.next();
 			track.clear();
 		}
 		this.tracks.clear();
 		this.channels.clear();
 		this.measureHeaders.clear();
 	}
-	
+
 	public TGSong clone(TGFactory factory){
 		TGSong song = factory.newSong();
 		copy(factory,song);
 		return song;
 	}
-	
+
 	public void copy(TGFactory factory,TGSong song){
 		song.clear();
 		song.setName(getName());
@@ -241,19 +237,19 @@ public void copy(TGFactory factory,TGSong song){
 		song.setWriter(getWriter());
 		song.setTranscriber(getTranscriber());
 		song.setComments(getComments());
-		Iterator headers = getMeasureHeaders();
+		Iterator<TGMeasureHeader> headers = getMeasureHeaders();
 		while(headers.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)headers.next();
+			TGMeasureHeader header = headers.next();
 			song.addMeasureHeader(header.clone(factory));
 		}
-		Iterator channels = getChannels();
+		Iterator<TGChannel> channels = getChannels();
 		while(channels.hasNext()){
-			TGChannel channel = (TGChannel)channels.next();
+			TGChannel channel = channels.next();
 			song.addChannel(channel.clone(factory));
 		}
-		Iterator tracks = getTracks();
+		Iterator<TGTrack> tracks = getTracks();
 		while(tracks.hasNext()){
-			TGTrack track = (TGTrack)tracks.next();
+			TGTrack track = tracks.next();
 			song.addTrack(track.clone(factory, song));
 		}
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGString.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGString.java
new file mode 100644
index 00000000..4a1a8fb5
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGString.java
@@ -0,0 +1,55 @@
+/*
+ * Created on 30-nov-2005
+ */
+package org.herac.tuxguitar.song.models;
+
+import java.io.Serializable;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+
+/**
+ * @author julian
+ */
+public class TGString implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	private int number;
+	private int value;
+
+	public TGString(){
+		this.number = 0;
+		this.value = 0;
+	}
+
+	public int getNumber() {
+		return this.number;
+	}
+
+	public int getValue() {
+		return this.value;
+	}
+
+	public void setNumber(int number) {
+		this.number = number;
+	}
+
+	public void setValue(int value) {
+		this.value = value;
+	}
+
+	public boolean isEqual(TGString string){
+		return (this.getNumber() == string.getNumber() && this.getValue() == string.getValue());
+	}
+
+	public TGString clone(TGFactory factory){
+		TGString string = factory.newString();
+		copy(string);
+		return string;
+	}
+
+	public void copy(TGString string){
+		string.setNumber(getNumber());
+		string.setValue(getValue());
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGStroke.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGStroke.java
similarity index 90%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGStroke.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGStroke.java
index 2185d54e..65cb5805 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGStroke.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGStroke.java
@@ -1,16 +1,19 @@
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
-public abstract class TGStroke {
-	
+public class TGStroke implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final int STROKE_NONE = 0;
 	public static final int STROKE_UP = 1;
 	public static final int STROKE_DOWN = -1;
-	
+
 	private int direction;
 	private int value;
-	
+
 	public TGStroke(){
 		this.direction = STROKE_NONE;
 	}
@@ -22,15 +25,15 @@ public int getDirection() {
 	public void setDirection(int direction) {
 		this.direction = direction;
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(int value) {
 		this.value = value;
 	}
-	
+
 	public int getIncrementTime( TGBeat beat ){
 		long duration = 0;
 		if( this.value > 0 ){
@@ -49,13 +52,13 @@ public int getIncrementTime( TGBeat beat ){
 		}
 		return 0;
 	}
-	
+
 	public TGStroke clone(TGFactory factory){
 		TGStroke stroke = factory.newStroke();
 		copy(stroke);
 		return stroke;
 	}
-	
+
 	public void copy(TGStroke stroke){
 		stroke.setValue(getValue());
 		stroke.setDirection(getDirection());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGTempo.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTempo.java
similarity index 76%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGTempo.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTempo.java
index 960cbdf5..cc588507 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGTempo.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTempo.java
@@ -1,61 +1,59 @@
 /*
  * Created on 29-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGTempo {
+public class TGTempo implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private static final int SECOND_IN_MILLIS = 1000;
-	
+
 	private int value;
-	
+
 	public TGTempo(){
 		this.value = 120;
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(int value) {
 		this.value = value;
 	}
-	
+
 	public long getInMillis(){
 		double millis = (60.00 / getValue() * SECOND_IN_MILLIS);
 		return (long)millis;
 	}
-	
+
 	public long getInUSQ(){
 		double usq = ((60.00 / getValue() * SECOND_IN_MILLIS) * 1000.00);
 		return (long)usq;
 	}
-	
+
 	public static TGTempo fromUSQ(TGFactory factory,int usq){
 		double value = ((60.00 * SECOND_IN_MILLIS) / (usq / 1000.00));
 		TGTempo tempo = factory.newTempo();
 		tempo.setValue((int)value);
 		return tempo;
 	}
-	
+
 	public TGTempo clone(TGFactory factory){
 		TGTempo tempo = factory.newTempo();
 		copy(tempo);
 		return tempo;
 	}
-	
+
 	public void copy(TGTempo tempo){
 		tempo.setValue(getValue());
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGText.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGText.java
similarity index 82%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGText.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGText.java
index c07fcf72..34399b16 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGText.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGText.java
@@ -1,44 +1,47 @@
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
-public class TGText{
-	
+public class TGText implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private String value;
 	private TGBeat beat;
-	
+
 	public TGText(){
 		super();
 	}
-	
+
 	public TGBeat getBeat() {
 		return this.beat;
 	}
-	
+
 	public void setBeat(TGBeat beat) {
 		this.beat = beat;
 	}
-	
+
 	public String getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(String value) {
 		this.value = value;
 	}
-	
+
 	public boolean isEmpty(){
 		return (this.value == null || this.value.length() == 0);
 	}
-	
+
 	public void copy(TGText text) {
 		text.setValue(getValue());
 	}
-	
+
 	public TGText clone(TGFactory factory) {
 		TGText text = factory.newText();
 		copy(text);
 		return text;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGTimeSignature.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTimeSignature.java
similarity index 77%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGTimeSignature.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTimeSignature.java
index 0d353cd6..cc8ca166 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGTimeSignature.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTimeSignature.java
@@ -1,55 +1,53 @@
 /*
  * Created on 29-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGTimeSignature {
+public class TGTimeSignature implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private TGDuration denominator;
 	private int numerator;
-	
+
 	public TGTimeSignature(TGFactory factory){
 		this.numerator = 4;
 		this.denominator = factory.newDuration();
 	}
-	
+
 	public int getNumerator() {
 		return this.numerator;
 	}
-	
+
 	public void setNumerator(int numerator) {
 		this.numerator = numerator;
 	}
-	
+
 	public TGDuration getDenominator() {
 		return this.denominator;
 	}
-	
+
 	public void setDenominator(TGDuration denominator) {
 		this.denominator = denominator;
 	}
-	
+
 	public TGTimeSignature clone(TGFactory factory){
 		TGTimeSignature timeSignature = factory.newTimeSignature();
 		copy(timeSignature);
 		return timeSignature;
 	}
-	
+
 	public void copy(TGTimeSignature timeSignature){
 		timeSignature.setNumerator(getNumerator());
 		getDenominator().copy(timeSignature.getDenominator());
 	}
-	
+
 	public boolean isEqual(TGTimeSignature ts){
 		return (getNumerator() == ts.getNumerator() && getDenominator().isEqual(ts.getDenominator()));
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGTrack.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTrack.java
similarity index 81%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGTrack.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTrack.java
index 3ee64245..eccfa62b 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGTrack.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGTrack.java
@@ -1,11 +1,9 @@
 /*
  * Created on 23-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -13,26 +11,25 @@
 import org.herac.tuxguitar.song.factory.TGFactory;
 /**
  * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGTrack {
+public class TGTrack implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final int MAX_OFFSET = 24;
 	public static final int MIN_OFFSET = -24;
-	
+
 	private int number;
 	private int offset;
 	private int channelId;
 	private boolean solo;
 	private boolean mute;
 	private String name;
-	private List measures;
-	private List strings;
+	private final List<TGMeasure> measures;
+	private List<TGString> strings;
 	private TGColor color;
 	private TGLyric lyrics;
 	private TGSong song;
-	
+
 	public TGTrack(TGFactory factory) {
 		this.number = 0;
 		this.offset = 0;
@@ -40,140 +37,140 @@ public TGTrack(TGFactory factory) {
 		this.solo = false;
 		this.mute = false;
 		this.name = new String();
-		this.measures = new ArrayList();
-		this.strings = new ArrayList();
+		this.measures = new ArrayList<TGMeasure>();
+		this.strings = new ArrayList<TGString>();
 		this.color = factory.newColor();
 		this.lyrics = factory.newLyric();
 	}
-	
+
 	public int getNumber() {
 		return this.number;
 	}
-	
+
 	public void setNumber(int number) {
 		this.number = number;
 	}
-	
-	public Iterator getMeasures() {
+
+	public Iterator<TGMeasure> getMeasures() {
 		return this.measures.iterator();
 	}
-	
+
 	public void addMeasure(TGMeasure measure){
 		measure.setTrack(this);
 		this.measures.add(measure);
 	}
-	
+
 	public void addMeasure(int index,TGMeasure measure){
 		measure.setTrack(this);
 		this.measures.add(index,measure);
 	}
-	
+
 	public TGMeasure getMeasure(int index){
 		if(index >= 0 && index < countMeasures()){
-			return (TGMeasure)this.measures.get(index);
+			return this.measures.get(index);
 		}
 		return null;
 	}
-	
+
 	public void removeMeasure(int index){
 		this.measures.remove(index);
 	}
-	
+
 	public int countMeasures(){
 		return this.measures.size();
 	}
-	
-	public List getStrings() {
+
+	public List<TGString> getStrings() {
 		return this.strings;
 	}
-	
-	public void setStrings(List strings) {
+
+	public void setStrings(List<TGString> strings) {
 		this.strings = strings;
 	}
-	
+
 	public TGColor getColor() {
 		return this.color;
 	}
-	
+
 	public void setColor(TGColor color) {
 		this.color = color;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public int getOffset() {
 		return this.offset;
 	}
-	
+
 	public void setOffset(int offset) {
 		this.offset = offset;
 	}
-	
+
 	public boolean isSolo() {
 		return this.solo;
 	}
-	
+
 	public void setSolo(boolean solo) {
 		this.solo = solo;
 	}
-	
+
 	public boolean isMute() {
 		return this.mute;
 	}
-	
+
 	public void setMute(boolean mute) {
 		this.mute = mute;
 	}
-	
+
 	public int getChannelId() {
 		return this.channelId;
 	}
-	
+
 	public void setChannelId(int channelId) {
 		this.channelId = channelId;
 	}
-	
+
 	public TGLyric getLyrics() {
 		return this.lyrics;
 	}
-	
+
 	public void setLyrics(TGLyric lyrics) {
 		this.lyrics = lyrics;
 	}
-	
+
 	public TGString getString(int number){
-		return (TGString)this.strings.get(number - 1);
+		return this.strings.get(number - 1);
 	}
-	
+
 	public int stringCount(){
 		return this.strings.size();
 	}
-	
+
 	public TGSong getSong() {
 		return this.song;
 	}
-	
+
 	public void setSong(TGSong song) {
 		this.song = song;
 	}
-	
+
 	public void clear(){
 		this.strings.clear();
 		this.measures.clear();
 	}
-	
+
 	public TGTrack clone(TGFactory factory,TGSong song){
 		TGTrack track = factory.newTrack();
 		copy(factory, song, track);
 		return track;
 	}
-	
+
 	public void copy(TGFactory factory,TGSong song,TGTrack track){
 		track.clear();
 		track.setNumber(getNumber());
@@ -185,7 +182,7 @@ public void copy(TGFactory factory,TGSong song,TGTrack track){
 		getColor().copy(track.getColor());
 		getLyrics().copy(track.getLyrics());
 		for (int i = 0; i < getStrings().size(); i++) {
-			TGString string = (TGString) getStrings().get(i);
+			TGString string = getStrings().get(i);
 			track.getStrings().add(string.clone(factory));
 		}
 		for (int i = 0; i < countMeasures(); i++) {
@@ -193,5 +190,5 @@ public void copy(TGFactory factory,TGSong song,TGTrack track){
 			track.addMeasure(measure.clone(factory,song.getMeasureHeader(i)));
 		}
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGVelocities.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGVelocities.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGVelocities.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGVelocities.java
index 81cf2e9e..caae84d2 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGVelocities.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGVelocities.java
@@ -1,27 +1,27 @@
 package org.herac.tuxguitar.song.models;
 
 public interface TGVelocities {
-	
+
 	public static final int MIN_VELOCITY = 15;
-	
+
 	public static final int VELOCITY_INCREMENT = 16;
-	
+
 	public static final int PIANO_PIANISSIMO = (MIN_VELOCITY);
-	
+
 	public static final int PIANISSIMO = (MIN_VELOCITY + VELOCITY_INCREMENT);
-	
+
 	public static final int PIANO = (MIN_VELOCITY + (VELOCITY_INCREMENT * 2));
-	
+
 	public static final int MEZZO_PIANO = (MIN_VELOCITY + (VELOCITY_INCREMENT * 3));
-	
+
 	public static final int MEZZO_FORTE = (MIN_VELOCITY + (VELOCITY_INCREMENT * 4));
-	
+
 	public static final int FORTE = (MIN_VELOCITY + (VELOCITY_INCREMENT * 5));
-	
+
 	public static final int FORTISSIMO = (MIN_VELOCITY + (VELOCITY_INCREMENT * 6));
-	
+
 	public static final int FORTE_FORTISSIMO = (MIN_VELOCITY + (VELOCITY_INCREMENT * 7));
-	
+
 	public static final int DEFAULT = FORTE;
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGVoice.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGVoice.java
similarity index 80%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/TGVoice.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGVoice.java
index f00c2697..5925b337 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGVoice.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/TGVoice.java
@@ -1,11 +1,9 @@
 /*
  * Created on 23-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 package org.herac.tuxguitar.song.models;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -13,62 +11,62 @@
 
 /**
  * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class TGVoice {
-	
+public class TGVoice implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
 	public static final int DIRECTION_NONE = 0;
 	public static final int DIRECTION_UP = 1;
 	public static final int DIRECTION_DOWN = 2;
-	
+
 	private TGBeat beat;
 	private TGDuration duration;
-	private List notes;
+	private final List<TGNote> notes;
 	private int index;
 	private int direction;
 	private boolean empty;
-	
+
 	public TGVoice(TGFactory factory, int index) {
 		this.duration = factory.newDuration();
-		this.notes = new ArrayList();
+		this.notes = new ArrayList<TGNote>();
 		this.index = index;
 		this.empty = true;
 		this.direction = DIRECTION_NONE;
 	}
-	
+
 	public int getIndex() {
 		return this.index;
 	}
-	
+
 	public void setIndex(int index) {
 		this.index = index;
 	}
-	
+
 	public boolean isEmpty() {
 		return this.empty;
 	}
-	
+
 	public void setEmpty(boolean empty) {
 		this.empty = empty;
 	}
-	
+
 	public int getDirection() {
 		return this.direction;
 	}
-	
+
 	public void setDirection(int direction) {
 		this.direction = direction;
 	}
-	
+
 	public TGDuration getDuration() {
 		return this.duration;
 	}
-	
+
 	public void setDuration(TGDuration duration) {
 		this.duration = duration;
 	}
-	
+
 	public TGBeat getBeat() {
 		return this.beat;
 	}
@@ -77,50 +75,50 @@ public void setBeat(TGBeat beat) {
 		this.beat = beat;
 	}
 
-	public List getNotes() {
+	public List<TGNote> getNotes() {
 		return this.notes;
 	}
-	
+
 	public void addNote(TGNote note){
 		note.setVoice(this);
 		this.notes.add(note);
 		this.setEmpty(false);
 	}
-	
+
 	public void moveNote(int index,TGNote note){
 		getNotes().remove(note);
 		getNotes().add(index,note);
 	}
-	
+
 	public void removeNote(TGNote note){
 		this.notes.remove(note);
 	}
-	
+
 	public TGNote getNote(int index){
 		if(index >= 0 && index < countNotes()){
-			return (TGNote)this.notes.get(index);
+			return this.notes.get(index);
 		}
 		return null;
 	}
-	
+
 	public int countNotes(){
 		return this.notes.size();
 	}
-	
+
 	public boolean isRestVoice(){
 		return this.notes.isEmpty();
 	}
-	
+
 	public TGVoice clone(TGFactory factory){
 		TGVoice voice = factory.newVoice(getIndex());
 		voice.setEmpty(isEmpty());
 		voice.setDirection( getDirection() );
 		getDuration().copy(voice.getDuration());
 		for(int i = 0;i < countNotes();i++){
-			TGNote note = (TGNote)this.notes.get(i);
+			TGNote note = this.notes.get(i);
 			voice.addNote(note.clone(factory));
 		}
 		return voice;
 	}
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectBend.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
new file mode 100644
index 00000000..4cbeacc6
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
@@ -0,0 +1,74 @@
+/*
+ * Created on 26-dic-2005
+ */
+package org.herac.tuxguitar.song.models.effects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+
+/**
+ * @author julian
+ */
+public class TGEffectBend implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	public static final int SEMITONE_LENGTH = 1;
+	public static final int MAX_POSITION_LENGTH = 12;
+	public static final int MAX_VALUE_LENGTH = (SEMITONE_LENGTH * 12);
+
+	private final List<BendPoint> points;
+
+	public TGEffectBend(){
+		this.points = new ArrayList<BendPoint>();
+	}
+
+	public void addPoint(int position,int value){
+		this.points.add(new BendPoint(position,value));
+	}
+
+	public List<BendPoint> getPoints(){
+		return this.points;
+	}
+
+	public TGEffectBend clone(TGFactory factory){
+		TGEffectBend effect = factory.newEffectBend();
+		Iterator<BendPoint> it = getPoints().iterator();
+		while(it.hasNext()){
+			BendPoint point = it.next();
+			effect.addPoint(point.getPosition(),point.getValue());
+		}
+		return effect;
+	}
+
+	public class BendPoint{
+		private final int position;
+		private final int value;
+
+		public BendPoint(int position,int value){
+			this.position = position;
+			this.value = value;
+		}
+
+		public int getPosition() {
+			return this.position;
+		}
+
+		public int getValue() {
+			return this.value;
+		}
+
+		public long getTime(long duration){
+			return (duration * getPosition() / MAX_POSITION_LENGTH);
+		}
+
+		@Override
+		public Object clone(){
+			return new BendPoint(getPosition(),getValue());
+		}
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
similarity index 92%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
index 15b94355..52eec677 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectGrace.java
@@ -1,26 +1,29 @@
 package org.herac.tuxguitar.song.models.effects;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGVelocities;
 
-public abstract class TGEffectGrace {
-	
+public class TGEffectGrace implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final int TRANSITION_NONE = 0;
-	
+
 	public static final int TRANSITION_SLIDE = 1;
-	
+
 	public static final int TRANSITION_BEND = 2;
-	
+
 	public static final int TRANSITION_HAMMER = 3;
-	
+
 	private int fret;
 	private int duration;
 	private int dynamic;
 	private int transition;
 	private boolean onBeat;
 	private boolean dead;
-	
+
 	public TGEffectGrace() {
 		this.fret = 0;
 		this.duration = 1;
@@ -29,60 +32,60 @@ public TGEffectGrace() {
 		this.onBeat = false;
 		this.dead = false;
 	}
-	
+
 	public boolean isDead() {
 		return this.dead;
 	}
-	
+
 	public void setDead(boolean dead) {
 		this.dead = dead;
 	}
-	
+
 	public int getDuration() {
 		return this.duration;
 	}
-	
+
 	public void setDuration(int duration) {
 		this.duration = duration;
 	}
-	
+
 	public int getDynamic() {
 		return this.dynamic;
 	}
-	
+
 	public void setDynamic(int dynamic) {
 		this.dynamic = dynamic;
 	}
-	
+
 	public int getFret() {
 		return this.fret;
 	}
-	
+
 	public void setFret(int fret) {
 		this.fret = fret;
 	}
-	
+
 	public boolean isOnBeat() {
 		return this.onBeat;
 	}
-	
+
 	public void setOnBeat(boolean onBeat) {
 		this.onBeat = onBeat;
 	}
-	
+
 	public int getTransition() {
 		return this.transition;
 	}
-	
+
 	public void setTransition(int transition) {
 		this.transition = transition;
 	}
-	
+
 	public int getDurationTime(){
 		//return (int)(((float)TGDuration.QUARTER_TIME / 16.00 ) * (float)getDuration());
 		return (int)((TGDuration.QUARTER_TIME / 16.00 ) * getDuration());
 	}
-	
+
 	public TGEffectGrace clone(TGFactory factory){
 		TGEffectGrace effect = factory.newEffectGrace();
 		effect.setFret(getFret());
@@ -93,5 +96,5 @@ public TGEffectGrace clone(TGFactory factory){
 		effect.setDead(isDead());
 		return effect;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
similarity index 91%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
index f850e28f..aefa85ec 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectHarmonic.java
@@ -1,34 +1,38 @@
 package org.herac.tuxguitar.song.models.effects;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 
-public abstract class TGEffectHarmonic {
+public class TGEffectHarmonic implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	public static final String KEY_NATURAL = "N.H";
-	
+
 	public static final String KEY_ARTIFICIAL = "A.H";
-	
+
 	public static final String KEY_TAPPED = "T.H";
-	
+
 	public static final String KEY_PINCH = "P.H";
-	
+
 	public static final String KEY_SEMI = "S.H";
-	
+
 	public static final int TYPE_NATURAL = 1;
-	
+
 	public static final int TYPE_ARTIFICIAL = 2;
-	
+
 	public static final int TYPE_TAPPED = 3;
-	
+
 	public static final int TYPE_PINCH = 4;
-	
+
 	public static final int TYPE_SEMI = 5;
-	
+
 	public static final int MIN_ARTIFICIAL_OFFSET = -24;
-	
+
 	public static final int MAX_ARTIFICIAL_OFFSET = 24;
-	
+
 	public static final int MAX_TAPPED_OFFSET = 24;
-	
+
 	public static final int NATURAL_FREQUENCIES[][] = {
 		{12, 12}, //AH12 (+12 frets)
 		{9 , 28}, //AH9 (+28 frets)
@@ -37,57 +41,57 @@ public abstract class TGEffectHarmonic {
 		{4 , 28}, //AH4 (+28 frets)
 		{3 , 31}  //AH3 (+31 frets)
 	};
-	
+
 	private int type;
-	
+
 	private int data;
-	
+
 	public TGEffectHarmonic(){
 		this.type = 0;
 		this.data = 0;
 	}
-	
+
 	public int getData() {
 		return this.data;
 	}
-	
+
 	public void setData(int data) {
 		this.data = data;
 	}
-	
+
 	public int getType() {
 		return this.type;
 	}
-	
+
 	public void setType(int type) {
 		this.type = type;
 	}
-	
+
 	public boolean isNatural(){
 		return (this.type == TYPE_NATURAL);
 	}
-	
+
 	public boolean isArtificial(){
 		return (this.type == TYPE_ARTIFICIAL);
 	}
-	
+
 	public boolean isTapped(){
 		return (this.type == TYPE_TAPPED);
 	}
-	
+
 	public boolean isPinch(){
 		return (this.type == TYPE_PINCH);
 	}
-	
+
 	public boolean isSemi(){
 		return (this.type == TYPE_SEMI);
 	}
-	
+
 	public TGEffectHarmonic clone(TGFactory factory){
 		TGEffectHarmonic effect = factory.newEffectHarmonic();
 		effect.setType(getType());
 		effect.setData(getData());
 		return effect;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
new file mode 100644
index 00000000..7ab2d7c7
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
@@ -0,0 +1,74 @@
+/*
+ * Created on 26-dic-2005
+ */
+package org.herac.tuxguitar.song.models.effects;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+
+/**
+ * @author julian
+ */
+public class TGEffectTremoloBar implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	public static final int MAX_POSITION_LENGTH = 12;
+	public static final int MAX_VALUE_LENGTH = 12;
+
+	private final List<TremoloBarPoint> points;
+
+	public TGEffectTremoloBar(){
+		this.points = new ArrayList<TremoloBarPoint>();
+	}
+
+	public void addPoint(int position,int value){
+		this.points.add(new TremoloBarPoint(position,value));
+	}
+
+	public List<TremoloBarPoint> getPoints(){
+		return this.points;
+	}
+
+	public TGEffectTremoloBar clone(TGFactory factory){
+		TGEffectTremoloBar effect = factory.newEffectTremoloBar();
+		Iterator<TremoloBarPoint> it = getPoints().iterator();
+		while(it.hasNext()){
+			TremoloBarPoint point = it.next();
+			effect.addPoint(point.getPosition(),point.getValue());
+		}
+
+		return effect;
+	}
+
+	public class TremoloBarPoint{
+		private final int position;
+		private final int value;
+
+		public TremoloBarPoint(int position,int value){
+			this.position = position;
+			this.value = value;
+		}
+
+		public int getPosition() {
+			return this.position;
+		}
+
+		public int getValue() {
+			return this.value;
+		}
+
+		public long getTime(long duration){
+			return (duration * getPosition() / MAX_POSITION_LENGTH);
+		}
+
+		@Override
+		public Object clone(){
+			return new TremoloBarPoint(getPosition(),getValue());
+		}
+	}
+
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
similarity index 86%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
index bb19014a..7d70a39c 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTremoloPicking.java
@@ -1,24 +1,27 @@
 package org.herac.tuxguitar.song.models.effects;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 import org.herac.tuxguitar.song.models.TGDuration;
 
-public abstract class TGEffectTremoloPicking {
-	
+public class TGEffectTremoloPicking implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private TGDuration duration;
-	
+
 	public TGEffectTremoloPicking(TGFactory factory) {
 		this.duration = factory.newDuration();
 	}
-	
+
 	public TGDuration getDuration() {
 		return this.duration;
 	}
-	
+
 	public void setDuration(TGDuration duration) {
 		this.duration = duration;
 	}
-	
+
 	public TGEffectTremoloPicking clone(TGFactory factory){
 		TGEffectTremoloPicking effect = factory.newEffectTremoloPicking();
 		effect.getDuration().setValue(getDuration().getValue());
@@ -28,5 +31,5 @@ public TGEffectTremoloPicking clone(TGFactory factory){
 		effect.getDuration().getDivision().setTimes(getDuration().getDivision().getTimes());
 		return effect;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
similarity index 88%
rename from TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
index a8997e22..d5345e5e 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/song/models/effects/TGEffectTrill.java
@@ -1,34 +1,37 @@
 package org.herac.tuxguitar.song.models.effects;
 
+import java.io.Serializable;
+
 import org.herac.tuxguitar.song.factory.TGFactory;
 import org.herac.tuxguitar.song.models.TGDuration;
 
-public abstract class TGEffectTrill {
-	
+public class TGEffectTrill implements Serializable {
+	private static final long serialVersionUID = 1L;
+
 	private int fret;
 	private TGDuration duration;
-	
+
 	public TGEffectTrill(TGFactory factory) {
 		this.fret = 0;
 		this.duration = factory.newDuration();
 	}
-	
+
 	public int getFret() {
 		return this.fret;
 	}
-	
+
 	public void setFret(int fret) {
 		this.fret = fret;
 	}
-	
+
 	public TGDuration getDuration() {
 		return this.duration;
 	}
-	
+
 	public void setDuration(TGDuration duration) {
 		this.duration = duration;
 	}
-	
+
 	public TGEffectTrill clone(TGFactory factory){
 		TGEffectTrill effect = factory.newEffectTrill();
 		effect.setFret(getFret());
@@ -37,8 +40,8 @@ public TGEffectTrill clone(TGFactory factory){
 		effect.getDuration().setDoubleDotted(getDuration().isDoubleDotted());
 		effect.getDuration().getDivision().setEnters(getDuration().getDivision().getEnters());
 		effect.getDuration().getDivision().setTimes(getDuration().getDivision().getTimes());
-		
+
 		return effect;
 	}
-	
+
 }
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/util/MapComparator.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/MapComparator.java
new file mode 100644
index 00000000..aea05167
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/MapComparator.java
@@ -0,0 +1,33 @@
+package org.herac.tuxguitar.util;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Compare elements using there values from a mapping
+ * @param <K> Type of the element to compare
+ * @param <V> Type of the value
+ */
+public class MapComparator<K,V extends Comparable<V>>  implements Comparator<K>{
+
+	private final Map<K,V> mapping;
+
+	public MapComparator(List<K> list, Map<K,V> mapping) {
+		this.mapping = mapping;
+	}
+
+	@Override
+	public int compare(K k1, K k2) {
+		V v1 = mapping.get(k1);
+		V v2 = mapping.get(k2);
+		if (v1 != null) {
+			return v1.compareTo(v2);
+		}
+		if (v2 != null) {
+			return -v2.compareTo(v1);
+		}
+		return 0;
+	}
+
+}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/util/StringUtil.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/StringUtil.java
new file mode 100644
index 00000000..8c739785
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/StringUtil.java
@@ -0,0 +1,13 @@
+package org.herac.tuxguitar.util;
+
+public class StringUtil {
+
+	/**
+	 * Create a string with the first char upper case
+	 * @param string A string
+	 * @return A string with the first char upper case
+	 */
+	public static String toUpperFirstChar(String string) {
+		return string.substring(0, 1).toUpperCase() + string.substring(1);
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/util/TGClassLoader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGClassLoader.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/util/TGClassLoader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGClassLoader.java
index 59eeabf3..fb1b9881 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/util/TGClassLoader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGClassLoader.java
@@ -6,26 +6,26 @@
 import java.net.URLClassLoader;
 
 public class TGClassLoader{
-	
+
 	private static TGClassLoader instance;
-	
+
 	private URLClassLoaderImpl classLoader;
-	
+
 	private TGClassLoader(){
 		this.classLoader = new URLClassLoaderImpl();
 	}
-	
+
 	public static TGClassLoader instance(){
 		if(instance == null){
 			instance = new TGClassLoader();
 		}
 		return instance;
 	}
-	
+
 	public ClassLoader getClassLoader(){
 		return this.classLoader;
 	}
-	
+
 	public Object newInstance(String loadClassName){
 		Object object = null;
 		try {
@@ -39,7 +39,7 @@ public Object newInstance(String loadClassName){
 		}
 		return object;
 	}
-	
+
 	public void addPath(String path){
 		try {
 			this.classLoader.addURL(new File(path).toURI().toURL());
@@ -47,7 +47,7 @@ public void addPath(String path){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public void addPaths(File folder){
 		if(folder != null && folder.exists() && folder.isDirectory()){
 			String[] files = folder.list();
@@ -60,17 +60,18 @@ public void addPaths(File folder){
 			}
 		}
 	}
-	
+
 	private class URLClassLoaderImpl extends URLClassLoader{
-		
+
 		public URLClassLoaderImpl(){
 			super(new URL[]{},TGClassLoader.class.getClassLoader());
 		}
-		
+
+		@Override
 		public void addURL(URL url){
 			super.addURL(url);
 		}
-		
+
 	}
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/util/TGLibraryLoader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGLibraryLoader.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/util/TGLibraryLoader.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGLibraryLoader.java
index 53c3d026..4bd631a9 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/util/TGLibraryLoader.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGLibraryLoader.java
@@ -4,23 +4,24 @@
 import java.io.FilenameFilter;
 
 public class TGLibraryLoader {
-	
+
 	private static TGLibraryLoader instance;
-	
+
 	private TGLibraryLoader(){
 		super();
 	}
-	
+
 	public static TGLibraryLoader instance(){
 		if(instance == null){
 			instance = new TGLibraryLoader();
 		}
 		return instance;
 	}
-	
+
 	public void loadLibraries(File folder,final String prefix,final  String extension){
 		if(folder != null && folder.exists()){
 			FilenameFilter filter = new FilenameFilter() {
+				@Override
 				public boolean accept(File dir, String name) {
 					if(name == null){
 						return false;
@@ -49,7 +50,7 @@ public boolean accept(File dir, String name) {
 			}
 		}
 	}
-	
+
 	protected void loadLibrary(File file){
 		try{
 			System.out.println("Loading: " + file.getAbsolutePath());
diff --git a/TuxGuitar/src/org/herac/tuxguitar/util/TGLock.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGLock.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/util/TGLock.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGLock.java
index 66332b05..9c88865a 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/util/TGLock.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGLock.java
@@ -1,26 +1,26 @@
 package org.herac.tuxguitar.util;
 
 public class TGLock {
-	
+
 	private Object lock;
 	private Thread lockThread;
-	
+
 	public TGLock(){
 		this.lock = new Object();
 		this.lockThread = null;
 	}
-	
+
 	public void lock(){
 		Thread thread = Thread.currentThread();
-		
+
 		boolean lockSuccess = false;
-		
+
 		synchronized( this.lock ){
 			if( ( lockSuccess = !this.isLocked( thread ) ) ){
 				this.lockThread = thread;
 			}
 		}
-		
+
 		if( !lockSuccess ){
 			while( isLocked(thread) ){
 				Thread.yield();
@@ -28,19 +28,19 @@ public void lock(){
 			this.lock();
 		}
 	}
-	
+
 	public void unlock(){
 		synchronized( this.lock ){
 			this.lockThread = null;
 		}
 	}
-	
+
 	public boolean isLocked(Thread thread){
 		synchronized( this.lock ){
 			return (this.lockThread != null && this.lockThread != thread);
 		}
 	}
-	
+
 	public boolean isLocked(){
 		return isLocked( Thread.currentThread() );
 	}
diff --git a/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGServiceReader.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGServiceReader.java
new file mode 100644
index 00000000..529f1881
--- /dev/null
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGServiceReader.java
@@ -0,0 +1,107 @@
+package org.herac.tuxguitar.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
+
+public class TGServiceReader {
+
+	private static final String SERVICE_PATH = new String("META-INF/services/");
+
+	public static Iterator<TGPlugin> lookupProviders(Class<?> spi){
+		return lookupProviders(spi,TGClassLoader.instance().getClassLoader());
+	}
+
+	public static Iterator<TGPlugin> lookupProviders(Class<?> spi,ClassLoader loader){
+		try{
+			if (spi == null || loader == null){
+				throw new IllegalArgumentException();
+			}
+			return new IteratorImpl(spi,loader,loader.getResources(SERVICE_PATH + spi.getName()));
+		}catch (IOException ioex){
+			List<TGPlugin> list = Collections.emptyList();
+			return list.iterator();
+		}
+	}
+
+	private static final class IteratorImpl implements Iterator<TGPlugin> {
+		private final Class<?> spi;
+		private final ClassLoader loader;
+		private final Enumeration<URL> urls;
+		private Iterator<String> iterator;
+
+		public IteratorImpl(Class<?> spi,ClassLoader loader,Enumeration<URL> urls){
+			this.spi = spi;
+			this.loader = loader;
+			this.urls = urls;
+			this.initialize();
+		}
+
+		private void initialize(){
+			List<String> providers = new ArrayList<String>();
+			while (this.urls.hasMoreElements()) {
+				URL url = this.urls.nextElement();
+				try {
+					BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"));
+					String line = null;
+					while((line = reader.readLine()) != null){
+						String provider = uncommentLine(line).trim();
+						if(provider != null && provider.length() > 0){
+							providers.add(provider);
+						}
+					}
+				} catch (UnsupportedEncodingException e) {
+					e.printStackTrace();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			this.iterator = providers.iterator();
+		}
+
+		private String uncommentLine(String line){
+			int index = line.indexOf('#');
+			if(index >= 0){
+				return (line.substring(0,index));
+			}
+			return line;
+		}
+
+		@Override
+		public boolean hasNext() {
+			return (this.iterator != null && this.iterator.hasNext());
+		}
+
+		@Override
+		public TGPlugin next() {
+			if (!hasNext()){
+				throw new NoSuchElementException();
+			}
+			try {
+				Object provider = this.loader.loadClass( this.iterator.next() ).newInstance();
+				if(this.spi.isInstance(provider)){
+					return (TGPlugin) provider;
+				}
+			} catch (Throwable throwable) {
+				throwable.printStackTrace();
+				throw new RuntimeException(throwable);
+			}
+			throw new NoSuchElementException();
+		}
+
+		@Override
+		public void remove() {
+			throw new UnsupportedOperationException();
+		}
+	}
+}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/util/TGSynchronizer.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGSynchronizer.java
similarity index 98%
rename from TuxGuitar/src/org/herac/tuxguitar/util/TGSynchronizer.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGSynchronizer.java
index e77d9756..bea196b7 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/util/TGSynchronizer.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGSynchronizer.java
@@ -2,15 +2,15 @@
 
 
 public class TGSynchronizer {
-	
+
 	private static TGSynchronizer instance;
-	
+
 	private TGSynchronizerController controller;
-	
+
 	private TGSynchronizer(){
 		super();
 	}
-	
+
 	public static TGSynchronizer instance(){
 		if (instance == null) {
 			synchronized (TGSynchronizer.class) {
@@ -19,7 +19,7 @@ public static TGSynchronizer instance(){
 		}
 		return instance;
 	}
-	
+
 	public void addRunnable(TGRunnable runnable) throws Throwable {
 		TGSynchronizerTask task = new TGSynchronizerTask(runnable);
 		this.controller.execute(task);
@@ -27,7 +27,7 @@ public void addRunnable(TGRunnable runnable) throws Throwable {
 			throw task.getThrowable();
 		}
 	}
-	
+
 	public void runLater(TGRunnable runnable) throws Throwable {
 		TGSynchronizerTask task = new TGSynchronizerTask(runnable);
 		this.controller.executeLater(task);
@@ -35,24 +35,24 @@ public void runLater(TGRunnable runnable) throws Throwable {
 			throw task.getThrowable();
 		}
 	}
-	
+
 	public void setController(TGSynchronizerController controller){
 		this.controller = controller;
 	}
-	
+
 	public class TGSynchronizerTask{
 		private Throwable throwable;
 		private TGRunnable runnable;
-		
+
 		public TGSynchronizerTask(TGRunnable runnable){
 			this.runnable = runnable;
 			this.throwable = null;
 		}
-		
+
 		public Throwable getThrowable(){
 			return this.throwable;
 		}
-		
+
 		public void run(){
 			try{
 				this.runnable.run();
@@ -61,11 +61,11 @@ public void run(){
 			}
 		}
 	}
-	
+
 	public interface TGRunnable {
 		public void run() throws Throwable;
 	}
-	
+
 	public interface TGSynchronizerController{
 		public void execute(TGSynchronizerTask task);
 		public void executeLater(TGSynchronizerTask task);
diff --git a/TuxGuitar/src/org/herac/tuxguitar/util/TGVersion.java b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGVersion.java
similarity index 97%
rename from TuxGuitar/src/org/herac/tuxguitar/util/TGVersion.java
rename to TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGVersion.java
index e27f5044..cc8618be 100644
--- a/TuxGuitar/src/org/herac/tuxguitar/util/TGVersion.java
+++ b/TuxGuitar/src/main/java/org/herac/tuxguitar/util/TGVersion.java
@@ -1,38 +1,38 @@
 package org.herac.tuxguitar.util;
 
 public class TGVersion {
-	
+
 	public static final TGVersion CURRENT = new TGVersion(1,2,20111001);
-	
+
 	private int major;
 	private int minor;
 	private int revision;
-	
+
 	public TGVersion(int major,int minor, int revision){
 		this.major = major;
 		this.minor = minor;
 		this.revision = revision;
 	}
-	
+
 	public int getMajor() {
 		return this.major;
 	}
-	
+
 	public int getMinor() {
 		return this.minor;
 	}
-	
+
 	public int getRevision() {
 		return this.revision;
 	}
-	
+
 	public boolean isSameVersion(TGVersion version){
 		if( version == null ){
 			return false;
 		}
 		return ( version.getMajor() == getMajor() && version.getMinor() == getMinor() && version.getRevision() == getRevision());
 	}
-	
+
 	public String getVersion(){
 		String version = (getMajor() + "." + getMinor());
 		if( getRevision() > 0 ){
@@ -40,7 +40,8 @@ public String getVersion(){
 		}
 		return version;
 	}
-	
+
+	@Override
 	public String toString(){
 		return getVersion();
 	}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/TGMain.java b/TuxGuitar/src/org/herac/tuxguitar/app/TGMain.java
deleted file mode 100644
index ee12dbef..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/TGMain.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.herac.tuxguitar.app;
-
-public class TGMain {
-	
-	public static void main(String[] args){
-		TuxGuitar.instance().displayGUI(args);
-		System.exit(0);
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionManager.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionManager.java
deleted file mode 100644
index aa09382d..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/ActionManager.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Created on 18-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.herac.tuxguitar.app.actions.caret.GoDownAction;
-import org.herac.tuxguitar.app.actions.caret.GoLeftAction;
-import org.herac.tuxguitar.app.actions.caret.GoRightAction;
-import org.herac.tuxguitar.app.actions.caret.GoUpAction;
-import org.herac.tuxguitar.app.actions.composition.ChangeClefAction;
-import org.herac.tuxguitar.app.actions.composition.ChangeInfoAction;
-import org.herac.tuxguitar.app.actions.composition.ChangeKeySignatureAction;
-import org.herac.tuxguitar.app.actions.composition.ChangeTempoAction;
-import org.herac.tuxguitar.app.actions.composition.ChangeTimeSignatureAction;
-import org.herac.tuxguitar.app.actions.composition.ChangeTripletFeelAction;
-import org.herac.tuxguitar.app.actions.duration.ChangeDivisionTypeAction;
-import org.herac.tuxguitar.app.actions.duration.ChangeDottedDurationAction;
-import org.herac.tuxguitar.app.actions.duration.ChangeDoubleDottedDurationAction;
-import org.herac.tuxguitar.app.actions.duration.DecrementDurationAction;
-import org.herac.tuxguitar.app.actions.duration.IncrementDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetEighthDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetHalfDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetQuarterDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetSixteenthDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetSixtyFourthDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetThirtySecondDurationAction;
-import org.herac.tuxguitar.app.actions.duration.SetWholeDurationAction;
-import org.herac.tuxguitar.app.actions.edit.RedoAction;
-import org.herac.tuxguitar.app.actions.edit.SetMouseModeEditionAction;
-import org.herac.tuxguitar.app.actions.edit.SetMouseModeSelectionAction;
-import org.herac.tuxguitar.app.actions.edit.SetNaturalKeyAction;
-import org.herac.tuxguitar.app.actions.edit.SetVoice1Action;
-import org.herac.tuxguitar.app.actions.edit.SetVoice2Action;
-import org.herac.tuxguitar.app.actions.edit.UndoAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeAccentuatedNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeBendNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeDeadNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeFadeInAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeGhostNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeGraceNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeHammerNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeHarmonicNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeHeavyAccentuatedNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeLetRingAction;
-import org.herac.tuxguitar.app.actions.effects.ChangePalmMuteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangePoppingAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeSlappingAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeSlideNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeStaccatoAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeTappingAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeTremoloBarAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeTremoloPickingAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeTrillNoteAction;
-import org.herac.tuxguitar.app.actions.effects.ChangeVibratoNoteAction;
-import org.herac.tuxguitar.app.actions.file.ExitAction;
-import org.herac.tuxguitar.app.actions.file.ExportSongAction;
-import org.herac.tuxguitar.app.actions.file.ImportSongAction;
-import org.herac.tuxguitar.app.actions.file.NewFileAction;
-import org.herac.tuxguitar.app.actions.file.OpenFileAction;
-import org.herac.tuxguitar.app.actions.file.OpenURLAction;
-import org.herac.tuxguitar.app.actions.file.PrintAction;
-import org.herac.tuxguitar.app.actions.file.PrintPreviewAction;
-import org.herac.tuxguitar.app.actions.file.SaveAsFileAction;
-import org.herac.tuxguitar.app.actions.file.SaveFileAction;
-import org.herac.tuxguitar.app.actions.help.ShowAboutAction;
-import org.herac.tuxguitar.app.actions.help.ShowDocAction;
-import org.herac.tuxguitar.app.actions.insert.InsertChordAction;
-import org.herac.tuxguitar.app.actions.insert.InsertTextAction;
-import org.herac.tuxguitar.app.actions.insert.RepeatAlternativeAction;
-import org.herac.tuxguitar.app.actions.insert.RepeatCloseAction;
-import org.herac.tuxguitar.app.actions.insert.RepeatOpenAction;
-import org.herac.tuxguitar.app.actions.layout.SetChordDiagramEnabledAction;
-import org.herac.tuxguitar.app.actions.layout.SetChordNameEnabledAction;
-import org.herac.tuxguitar.app.actions.layout.SetCompactViewAction;
-import org.herac.tuxguitar.app.actions.layout.SetLinearLayoutAction;
-import org.herac.tuxguitar.app.actions.layout.SetMultitrackViewAction;
-import org.herac.tuxguitar.app.actions.layout.SetPageLayoutAction;
-import org.herac.tuxguitar.app.actions.layout.SetScoreEnabledAction;
-import org.herac.tuxguitar.app.actions.layout.SetTablatureEnabledAction;
-import org.herac.tuxguitar.app.actions.marker.AddMarkerAction;
-import org.herac.tuxguitar.app.actions.marker.GoFirstMarkerAction;
-import org.herac.tuxguitar.app.actions.marker.GoLastMarkerAction;
-import org.herac.tuxguitar.app.actions.marker.GoNextMarkerAction;
-import org.herac.tuxguitar.app.actions.marker.GoPreviousMarkerAction;
-import org.herac.tuxguitar.app.actions.marker.ListMarkersAction;
-import org.herac.tuxguitar.app.actions.measure.AddMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.CleanMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.CopyMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.GoFirstMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.GoLastMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.GoNextMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.GoPreviousMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.PasteMeasureAction;
-import org.herac.tuxguitar.app.actions.measure.RemoveMeasureAction;
-import org.herac.tuxguitar.app.actions.note.ChangeNoteAction;
-import org.herac.tuxguitar.app.actions.note.ChangeTiedNoteAction;
-import org.herac.tuxguitar.app.actions.note.ChangeVelocityAction;
-import org.herac.tuxguitar.app.actions.note.CleanBeatAction;
-import org.herac.tuxguitar.app.actions.note.DecrementNoteSemitoneAction;
-import org.herac.tuxguitar.app.actions.note.DeleteNoteOrRestAction;
-import org.herac.tuxguitar.app.actions.note.IncrementNoteSemitoneAction;
-import org.herac.tuxguitar.app.actions.note.InsertRestBeatAction;
-import org.herac.tuxguitar.app.actions.note.MoveBeatsCustomAction;
-import org.herac.tuxguitar.app.actions.note.MoveBeatsLeftAction;
-import org.herac.tuxguitar.app.actions.note.MoveBeatsRightAction;
-import org.herac.tuxguitar.app.actions.note.RemoveUnusedVoiceAction;
-import org.herac.tuxguitar.app.actions.note.SetNoteFretNumberAction;
-import org.herac.tuxguitar.app.actions.note.SetStrokeDownAction;
-import org.herac.tuxguitar.app.actions.note.SetStrokeUpAction;
-import org.herac.tuxguitar.app.actions.note.SetVoiceAutoAction;
-import org.herac.tuxguitar.app.actions.note.SetVoiceDownAction;
-import org.herac.tuxguitar.app.actions.note.SetVoiceUpAction;
-import org.herac.tuxguitar.app.actions.note.ShiftNoteDownAction;
-import org.herac.tuxguitar.app.actions.note.ShiftNoteUpAction;
-import org.herac.tuxguitar.app.actions.settings.EditConfigAction;
-import org.herac.tuxguitar.app.actions.settings.EditKeyBindingsAction;
-import org.herac.tuxguitar.app.actions.settings.EditPluginsAction;
-import org.herac.tuxguitar.app.actions.system.DisposeAction;
-import org.herac.tuxguitar.app.actions.tools.ScaleAction;
-import org.herac.tuxguitar.app.actions.tools.TGBrowserAction;
-import org.herac.tuxguitar.app.actions.tools.TransposeAction;
-import org.herac.tuxguitar.app.actions.track.AddTrackAction;
-import org.herac.tuxguitar.app.actions.track.ChangeTrackMuteAction;
-import org.herac.tuxguitar.app.actions.track.ChangeTrackSoloAction;
-import org.herac.tuxguitar.app.actions.track.CloneTrackAction;
-import org.herac.tuxguitar.app.actions.track.EditLyricsAction;
-import org.herac.tuxguitar.app.actions.track.GoFirstTrackAction;
-import org.herac.tuxguitar.app.actions.track.GoLastTrackAction;
-import org.herac.tuxguitar.app.actions.track.GoNextTrackAction;
-import org.herac.tuxguitar.app.actions.track.GoPreviousTrackAction;
-import org.herac.tuxguitar.app.actions.track.GoToTrackAction;
-import org.herac.tuxguitar.app.actions.track.MoveTrackDownAction;
-import org.herac.tuxguitar.app.actions.track.MoveTrackUpAction;
-import org.herac.tuxguitar.app.actions.track.RemoveTrackAction;
-import org.herac.tuxguitar.app.actions.track.TrackPropertiesAction;
-import org.herac.tuxguitar.app.actions.transport.TransportCountDownAction;
-import org.herac.tuxguitar.app.actions.transport.TransportMetronomeAction;
-import org.herac.tuxguitar.app.actions.transport.TransportModeAction;
-import org.herac.tuxguitar.app.actions.transport.TransportPlayAction;
-import org.herac.tuxguitar.app.actions.transport.TransportSetLoopEHeaderAction;
-import org.herac.tuxguitar.app.actions.transport.TransportSetLoopSHeaderAction;
-import org.herac.tuxguitar.app.actions.transport.TransportStopAction;
-import org.herac.tuxguitar.app.actions.view.ShowFretBoardAction;
-import org.herac.tuxguitar.app.actions.view.ShowInstrumentsAction;
-import org.herac.tuxguitar.app.actions.view.ShowMatrixAction;
-import org.herac.tuxguitar.app.actions.view.ShowPianoAction;
-import org.herac.tuxguitar.app.actions.view.ShowToolbarsAction;
-import org.herac.tuxguitar.app.actions.view.ShowTransportAction;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ActionManager {
-	
-	private Map actions;
-	
-	public ActionManager(){
-		this.actions = new HashMap();
-		this.init();
-	}
-	
-	public void init(){
-		//file actions
-		addAction(new NewFileAction());
-		addAction(new OpenFileAction());
-		addAction(new SaveFileAction());
-		addAction(new SaveAsFileAction());
-		addAction(new ImportSongAction());
-		addAction(new ExportSongAction());
-		addAction(new PrintAction());
-		addAction(new PrintPreviewAction());
-		addAction(new OpenURLAction());
-		addAction(new ExitAction());
-		
-		//edit actions
-		addAction(new UndoAction());
-		addAction(new RedoAction());
-		addAction(new SetMouseModeSelectionAction());
-		addAction(new SetMouseModeEditionAction());
-		addAction(new SetNaturalKeyAction());
-		addAction(new SetVoice1Action());
-		addAction(new SetVoice2Action());
-		
-		//layout actions
-		addAction(new SetPageLayoutAction());
-		addAction(new SetLinearLayoutAction());
-		addAction(new SetMultitrackViewAction());
-		addAction(new SetScoreEnabledAction());
-		addAction(new SetTablatureEnabledAction());
-		addAction(new SetCompactViewAction());
-		addAction(new SetChordNameEnabledAction());
-		addAction(new SetChordDiagramEnabledAction());
-		
-		//view actions
-		addAction(new ShowToolbarsAction());
-		addAction(new ShowFretBoardAction());
-		addAction(new ShowPianoAction());
-		addAction(new ShowInstrumentsAction());
-		addAction(new ShowTransportAction());
-		addAction(new ShowMatrixAction());
-		
-		//composition actions
-		addAction(new ChangeTimeSignatureAction());
-		addAction(new ChangeTempoAction());
-		addAction(new ChangeClefAction());
-		addAction(new ChangeKeySignatureAction());
-		addAction(new ChangeTripletFeelAction());
-		addAction(new ChangeInfoAction());
-		
-		//track actions
-		addAction(new AddTrackAction());
-		addAction(new RemoveTrackAction());
-		addAction(new CloneTrackAction());
-		addAction(new GoFirstTrackAction());
-		addAction(new GoLastTrackAction());
-		addAction(new GoNextTrackAction());
-		addAction(new GoToTrackAction());
-		addAction(new GoPreviousTrackAction());
-		addAction(new MoveTrackUpAction());
-		addAction(new MoveTrackDownAction());
-		addAction(new ChangeTrackMuteAction());
-		addAction(new ChangeTrackSoloAction());
-		addAction(new EditLyricsAction());
-		addAction(new TrackPropertiesAction());
-		
-		//measure actions
-		addAction(new AddMeasureAction());
-		addAction(new RemoveMeasureAction());
-		addAction(new CopyMeasureAction());
-		addAction(new PasteMeasureAction());
-		addAction(new GoFirstMeasureAction());
-		addAction(new GoLastMeasureAction());
-		addAction(new GoNextMeasureAction());
-		addAction(new GoPreviousMeasureAction());
-		addAction(new CleanMeasureAction());
-		
-		//note actions
-		addAction(new ChangeNoteAction());
-		addAction(new InsertRestBeatAction());
-		addAction(new DeleteNoteOrRestAction());
-		addAction(new RemoveUnusedVoiceAction());
-		addAction(new CleanBeatAction());
-		addAction(new ChangeTiedNoteAction());
-		addAction(new ChangeVelocityAction());
-		addAction(new ShiftNoteUpAction());
-		addAction(new ShiftNoteDownAction());
-		addAction(new IncrementNoteSemitoneAction());
-		addAction(new DecrementNoteSemitoneAction());
-		addAction(new SetStrokeUpAction());
-		addAction(new SetStrokeDownAction());
-		addAction(new MoveBeatsRightAction());
-		addAction(new MoveBeatsLeftAction());
-		addAction(new MoveBeatsCustomAction());
-		for( int i = 0 ; i < 10 ; i ++ ){
-			addAction(new SetNoteFretNumberAction(i));
-		}
-		
-		//duration actions
-		addAction(new SetWholeDurationAction());
-		addAction(new SetHalfDurationAction());
-		addAction(new SetQuarterDurationAction());
-		addAction(new SetEighthDurationAction());
-		addAction(new SetSixteenthDurationAction());
-		addAction(new SetThirtySecondDurationAction());
-		addAction(new SetSixtyFourthDurationAction());
-		addAction(new ChangeDottedDurationAction());
-		addAction(new ChangeDoubleDottedDurationAction());
-		addAction(new ChangeDivisionTypeAction());
-		addAction(new IncrementDurationAction());
-		addAction(new DecrementDurationAction());
-		
-		//insert actions
-		addAction(new RepeatOpenAction());
-		addAction(new RepeatCloseAction());
-		addAction(new RepeatAlternativeAction());
-		addAction(new InsertChordAction());
-		addAction(new InsertTextAction());
-		
-		//note effects action
-		addAction(new ChangeVibratoNoteAction());
-		addAction(new ChangeBendNoteAction());
-		addAction(new ChangeDeadNoteAction());
-		addAction(new ChangeSlideNoteAction());
-		addAction(new ChangeHammerNoteAction());
-		addAction(new ChangeGhostNoteAction());
-		addAction(new ChangeAccentuatedNoteAction());
-		addAction(new ChangeHeavyAccentuatedNoteAction());
-		addAction(new ChangeHarmonicNoteAction());
-		addAction(new ChangeGraceNoteAction());
-		addAction(new ChangeTrillNoteAction());
-		addAction(new ChangeTremoloPickingAction());
-		addAction(new ChangePalmMuteAction());
-		addAction(new ChangeLetRingAction());
-		addAction(new ChangeStaccatoAction());
-		addAction(new ChangeTappingAction());
-		addAction(new ChangeSlappingAction());
-		addAction(new ChangePoppingAction());
-		addAction(new ChangeTremoloBarAction());
-		addAction(new ChangeFadeInAction());
-		addAction(new SetVoiceAutoAction());
-		addAction(new SetVoiceUpAction());
-		addAction(new SetVoiceDownAction());
-		
-		//marker actions
-		addAction(new AddMarkerAction());
-		addAction(new ListMarkersAction());
-		addAction(new GoPreviousMarkerAction());
-		addAction(new GoNextMarkerAction());
-		addAction(new GoFirstMarkerAction());
-		addAction(new GoLastMarkerAction());
-		
-		//player actions
-		addAction(new TransportPlayAction());
-		addAction(new TransportStopAction());
-		addAction(new TransportMetronomeAction());
-		addAction(new TransportCountDownAction());
-		addAction(new TransportModeAction());
-		addAction(new TransportSetLoopSHeaderAction());
-		addAction(new TransportSetLoopEHeaderAction());
-		
-		//setting actions
-		addAction(new EditPluginsAction());
-		addAction(new EditConfigAction()); 
-		addAction(new EditKeyBindingsAction()); 
-		
-		//caret actions
-		addAction(new GoRightAction());
-		addAction(new GoLeftAction());
-		addAction(new GoUpAction());
-		addAction(new GoDownAction());
-		
-		//help actions
-		addAction(new ShowDocAction());
-		addAction(new ShowAboutAction());
-		
-		//tools
-		addAction(new TransposeAction() );
-		addAction(new ScaleAction());
-		addAction(new TGBrowserAction());
-		
-		//exit
-		addAction(new DisposeAction());
-	}
-	
-	public void addAction(Action action){
-		this.actions.put(action.getName(),action);
-	}
-	
-	public void removeAction(String name){
-		this.actions.remove(name);
-	}
-	
-	public Action getAction(String name){
-		return (Action)this.actions.get(name);
-	}
-	
-	public List getAvailableKeyBindingActions(){
-		List availableKeyBindingActions = new ArrayList();
-		Iterator it = this.actions.keySet().iterator();
-		while(it.hasNext()){
-			String actionName = (String)it.next();
-			if(getAction(actionName).isKeyBindingAvailable()){
-				availableKeyBindingActions.add(actionName);
-			}
-		}
-		return availableKeyBindingActions;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoDownAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoDownAction.java
deleted file mode 100644
index 8c3ffd59..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoDownAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.caret;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoDownAction extends Action{
-	
-	public static final String NAME = "action.caret.go-down";
-	
-	public GoDownAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getCaret().moveDown();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoLeftAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoLeftAction.java
deleted file mode 100644
index a620b874..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoLeftAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.caret;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoLeftAction extends Action{
-	
-	public static final String NAME = "action.caret.go-left";
-	
-	public GoLeftAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(TuxGuitar.instance().getPlayer().isRunning()){
-			TuxGuitar.instance().getTransport().gotoPrevious();
-		}
-		else{
-			getEditor().getTablature().getCaret().moveLeft();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoUpAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoUpAction.java
deleted file mode 100644
index ff5aeef4..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/caret/GoUpAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.caret;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoUpAction extends Action{
-	
-	public static final String NAME = "action.caret.go-up";
-	
-	public GoUpAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getCaret().moveUp();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/RedoAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/RedoAction.java
deleted file mode 100644
index 90032e19..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/RedoAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.undo.CannotRedoException;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class RedoAction extends Action{
-	
-	public static final String NAME = "action.edit.redo";
-	
-	public RedoAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		try {
-			if(TuxGuitar.instance().getUndoableManager().canRedo()){
-				TuxGuitar.instance().getUndoableManager().redo();
-			}
-		} catch (CannotRedoException e1) {
-			e1.printStackTrace();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetMouseModeEditionAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetMouseModeEditionAction.java
deleted file mode 100644
index 6e1e01b1..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetMouseModeEditionAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.edit.EditorKit;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetMouseModeEditionAction extends Action{
-	
-	public static final String NAME = "action.edit.set-mouse-mode-edition";
-	
-	public SetMouseModeEditionAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getEditorKit().setMouseMode(EditorKit.MOUSE_MODE_EDITION);
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetMouseModeSelectionAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetMouseModeSelectionAction.java
deleted file mode 100644
index 75276a48..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetMouseModeSelectionAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.edit.EditorKit;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetMouseModeSelectionAction extends Action{
-	
-	public static final String NAME = "action.edit.set-mouse-mode-selection";
-	
-	public SetMouseModeSelectionAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getEditorKit().setMouseMode(EditorKit.MOUSE_MODE_SELECTION);
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetNaturalKeyAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetNaturalKeyAction.java
deleted file mode 100644
index 1bea6954..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetNaturalKeyAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetNaturalKeyAction extends Action{
-	
-	public static final String NAME = "action.edit.set-natural-key";
-	
-	public SetNaturalKeyAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | DISABLE_ON_PLAYING | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getEditorKit().setNatural(!getEditor().getTablature().getEditorKit().isNatural());
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetVoice1Action.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetVoice1Action.java
deleted file mode 100644
index 2bf30783..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetVoice1Action.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetVoice1Action extends Action{
-	
-	public static final String NAME = "action.edit.voice-1";
-	
-	public SetVoice1Action() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getCaret().setVoice(0);
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetVoice2Action.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetVoice2Action.java
deleted file mode 100644
index 17342e05..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/SetVoice2Action.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetVoice2Action extends Action{
-	
-	public static final String NAME = "action.edit.voice-2";
-	
-	public SetVoice2Action() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		getEditor().getTablature().getCaret().setVoice(1);
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/UndoAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/UndoAction.java
deleted file mode 100644
index 7c7b0cec..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/edit/UndoAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.edit;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.undo.CannotUndoException;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class UndoAction extends Action{
-	
-	public static final String NAME = "action.edit.undo";
-	
-	public UndoAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		try {
-			if(TuxGuitar.instance().getUndoableManager().canUndo()){
-				TuxGuitar.instance().getUndoableManager().undo();
-			}
-		} catch (CannotUndoException e1) {
-			e1.printStackTrace();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ExitAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ExitAction.java
deleted file mode 100644
index ad1c68f7..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/file/ExitAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.file;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.actions.ActionLock;
-
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
-public class ExitAction extends Action {
-	
-	public static final String NAME = "action.file.exit";
-	
-	public ExitAction() {
-		super(NAME, AUTO_LOCK | KEY_BINDING_AVAILABLE );
-	}
-	
-	protected int execute(ActionData actionData){
-		ActionLock.unlock();
-		TuxGuitar.instance().getShell().close();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/help/ShowAboutAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/help/ShowAboutAction.java
deleted file mode 100644
index f36d2cdd..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/help/ShowAboutAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.help;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Canvas;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.help.about.AboutDialog;
-
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public class ShowAboutAction extends Action {
-	
-	public static final String NAME = "action.help.about";
-	
-	protected Canvas imageCanvas;
-	protected Image tabImage;
-	
-	public ShowAboutAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK);
-	}
-	
-	protected int execute(ActionData actionData){
-		new AboutDialog().open(TuxGuitar.instance().getShell());
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/help/ShowDocAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/help/ShowDocAction.java
deleted file mode 100644
index 4c0fe192..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/help/ShowDocAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.help;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.help.doc.TGDocumentation;
-import org.herac.tuxguitar.app.util.MessageDialog;
-
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window -
- * Preferences - Java - Code Style - Code Templates
- */
-public class ShowDocAction extends Action {
-	
-	public static final String NAME = "action.help.doc";
-	
-	public ShowDocAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | KEY_BINDING_AVAILABLE );
-	}
-	
-	protected int execute(ActionData actionData){
-		try {
-			new TGDocumentation().display();
-		} catch (Throwable throwable) {
-			MessageDialog.errorMessage(throwable);
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
deleted file mode 100644
index eb3095e7..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetChordDiagramEnabledAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.layout;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.graphics.control.TGLayout;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetChordDiagramEnabledAction extends Action{
-	
-	public static final String NAME = "action.view.layout-set-chord-diagram-enabled";
-	
-	public SetChordDiagramEnabledAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TGLayout layout = getEditor().getTablature().getViewLayout();
-		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_CHORD_DIAGRAM) );
-		updateTablature();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
deleted file mode 100644
index 2694f058..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetChordNameEnabledAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.layout;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.graphics.control.TGLayout;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetChordNameEnabledAction extends Action{
-	
-	public static final String NAME = "action.view.layout-set-chord-name-enabled";
-	
-	public SetChordNameEnabledAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TGLayout layout = getEditor().getTablature().getViewLayout();
-		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_CHORD_NAME ) );
-		updateTablature();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetCompactViewAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetCompactViewAction.java
deleted file mode 100644
index efb6e5b1..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetCompactViewAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.layout;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.graphics.control.TGLayout;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetCompactViewAction extends Action{
-	
-	public static final String NAME = "action.view.layout-set-compact";
-	
-	public SetCompactViewAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TGLayout layout = getEditor().getTablature().getViewLayout();
-		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_COMPACT ) );
-		updateTablature();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetMultitrackViewAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetMultitrackViewAction.java
deleted file mode 100644
index ed677ab3..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetMultitrackViewAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.layout;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.graphics.control.TGLayout;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetMultitrackViewAction extends Action{
-	
-	public static final String NAME = "action.view.layout-set-multitrack";
-	
-	public SetMultitrackViewAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TGLayout layout = getEditor().getTablature().getViewLayout();
-		layout.setStyle( ( layout.getStyle() ^ TGLayout.DISPLAY_MULTITRACK ) );
-		updateTablature();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetPageLayoutAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetPageLayoutAction.java
deleted file mode 100644
index 0e749dd5..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/layout/SetPageLayoutAction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.layout;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.Tablature;
-import org.herac.tuxguitar.graphics.control.TGLayoutVertical;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class SetPageLayoutAction extends Action{
-	
-	public static final String NAME = "action.view.layout-set-page";
-	
-	public SetPageLayoutAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		Tablature tablature = getEditor().getTablature();
-		tablature.setViewLayout(new TGLayoutVertical(tablature,tablature.getViewLayout().getStyle()));
-		updateTablature();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoFirstMarkerAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoFirstMarkerAction.java
deleted file mode 100644
index 20f4227b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoFirstMarkerAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.marker;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.marker.MarkerNavigator;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoFirstMarkerAction extends Action{
-	
-	public static final String NAME = "action.marker.go-first";
-	
-	public GoFirstMarkerAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		new MarkerNavigator().goToSelectedMarker(getSongManager().getFirstMarker());
-		
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoLastMarkerAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoLastMarkerAction.java
deleted file mode 100644
index 6060c697..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoLastMarkerAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.marker;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.marker.MarkerNavigator;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoLastMarkerAction extends Action{
-	
-	public static final String NAME = "action.marker.go-last";
-	
-	public GoLastMarkerAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		new MarkerNavigator().goToSelectedMarker(getSongManager().getLastMarker());
-		
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoNextMarkerAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoNextMarkerAction.java
deleted file mode 100644
index 0eeece16..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoNextMarkerAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.marker;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.Caret;
-import org.herac.tuxguitar.app.marker.MarkerNavigator;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoNextMarkerAction extends Action{
-	
-	public static final String NAME = "action.marker.go-next";
-	
-	public GoNextMarkerAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE );
-	}
-	
-	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();
-		
-		new MarkerNavigator().goToSelectedMarker(getSongManager().getNextMarker(caret.getMeasure().getNumber()));
-		
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoPreviousMarkerAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoPreviousMarkerAction.java
deleted file mode 100644
index 48a118a7..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/GoPreviousMarkerAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.marker;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.Caret;
-import org.herac.tuxguitar.app.marker.MarkerNavigator;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoPreviousMarkerAction extends Action{
-	
-	public static final String NAME = "action.marker.go-previous";
-	
-	public GoPreviousMarkerAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();
-		
-		new MarkerNavigator().goToSelectedMarker(getSongManager().getPreviousMarker(caret.getMeasure().getNumber()));
-		
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/ListMarkersAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/ListMarkersAction.java
deleted file mode 100644
index 4a70618c..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/marker/ListMarkersAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.marker;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.marker.MarkerList;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ListMarkersAction extends Action{
-	
-	public static final String NAME = "action.marker.list";
-	
-	public ListMarkersAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(MarkerList.instance().isDisposed()){
-			MarkerList.instance().show();
-		}
-		else{
-			MarkerList.instance().dispose();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditConfigAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditConfigAction.java
deleted file mode 100644
index c6768119..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditConfigAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.settings;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.system.config.TGConfigEditor;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EditConfigAction extends Action{
-	
-	public static final String NAME = "action.settings.configure";
-	
-	public EditConfigAction() {
-		super(NAME, AUTO_LOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE );
-	}
-	
-	protected int execute(ActionData actionData){
-		new TGConfigEditor().showDialog(TuxGuitar.instance().getShell());
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditKeyBindingsAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditKeyBindingsAction.java
deleted file mode 100644
index 8bcd1457..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/settings/EditKeyBindingsAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.settings;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.system.keybindings.editor.KeyBindingEditor;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EditKeyBindingsAction extends Action{
-	
-	public static final String NAME = "action.settings.key-bindings";
-	
-	public EditKeyBindingsAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		new KeyBindingEditor().show(TuxGuitar.instance().getShell());
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/ScaleAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/ScaleAction.java
deleted file mode 100644
index 6478cb3b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/tools/ScaleAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.tools;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.tools.scale.ScaleEditor;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ScaleAction extends Action{
-	
-	public static final String NAME = "action.tools.scale";
-	
-	public ScaleAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		new ScaleEditor().show();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/EditLyricsAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/EditLyricsAction.java
deleted file mode 100644
index baef776f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/EditLyricsAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.track;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class EditLyricsAction extends Action{
-	
-	public static final String NAME = "action.track.lyrics";
-	
-	public EditLyricsAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(TuxGuitar.instance().getLyricEditor().isDisposed()){
-			TuxGuitar.instance().getLyricEditor().show();
-		}else{
-			TuxGuitar.instance().getLyricEditor().dispose();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoFirstTrackAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoFirstTrackAction.java
deleted file mode 100644
index e0bde59a..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoFirstTrackAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.track;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.Caret;
-import org.herac.tuxguitar.song.models.TGTrack;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoFirstTrackAction extends Action{
-	
-	public static final String NAME = "action.track.go-first";
-	
-	public GoFirstTrackAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();
-		TGTrack track = getSongManager().getFirstTrack();
-		if(track != null){
-			caret.update(track.getNumber());
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoLastTrackAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoLastTrackAction.java
deleted file mode 100644
index e4430e1b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoLastTrackAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.track;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.Caret;
-import org.herac.tuxguitar.song.models.TGTrack;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoLastTrackAction extends Action{
-	
-	public static final String NAME = "action.track.go-last";
-	
-	public GoLastTrackAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();
-		TGTrack track = getSongManager().getLastTrack();
-		if(track != null){
-			caret.update(track.getNumber());
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoNextTrackAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoNextTrackAction.java
deleted file mode 100644
index 6bd61ff6..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoNextTrackAction.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.track;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.editors.tab.Caret;
-import org.herac.tuxguitar.song.models.TGTrack;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoNextTrackAction extends Action{
-	
-	public static final String NAME = "action.track.go-next";
-	
-	public GoNextTrackAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		Caret caret = getEditor().getTablature().getCaret();
-		TGTrack track = getSongManager().getTrack(caret.getTrack().getNumber() + 1);
-		if(track != null){
-			caret.update(track.getNumber());
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoToTrackAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoToTrackAction.java
deleted file mode 100644
index 366bf069..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/GoToTrackAction.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.track;
-
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.graphics.control.TGTrackImpl;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class GoToTrackAction extends Action{
-	
-	public static final String NAME = "action.track.goto";
-	
-	public static final String PROPERTY_TRACK = "track";
-	
-	public GoToTrackAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE);
-	}
-	
-	protected int execute(ActionData actionData){
-		Object data = actionData.get(PROPERTY_TRACK);
-		if(data instanceof TGTrackImpl){
-			TGTrackImpl track = (TGTrackImpl)data;
-			getEditor().getTablature().getCaret().update(track.getNumber());
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/TrackPropertiesAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/TrackPropertiesAction.java
deleted file mode 100644
index a5c4a7df..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/track/TrackPropertiesAction.java
+++ /dev/null
@@ -1,716 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.track;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.actions.ActionLock;
-import org.herac.tuxguitar.app.editors.TGUpdateListener;
-import org.herac.tuxguitar.app.helper.SyncThread;
-import org.herac.tuxguitar.app.undo.undoables.UndoableJoined;
-import org.herac.tuxguitar.app.undo.undoables.track.UndoableTrackGeneric;
-import org.herac.tuxguitar.app.undo.undoables.track.UndoableTrackInfo;
-import org.herac.tuxguitar.app.undo.undoables.track.UndoableTrackInstrument;
-import org.herac.tuxguitar.app.util.DialogUtils;
-import org.herac.tuxguitar.app.util.TGMusicKeyUtils;
-import org.herac.tuxguitar.graphics.control.TGTrackImpl;
-import org.herac.tuxguitar.song.managers.TGSongManager;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.util.TGSynchronizer;
-
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
-public class TrackPropertiesAction extends Action implements TGUpdateListener {
-	
-	public static final String NAME = "action.track.properties";
-	
-	private static final String[] NOTE_NAMES = TGMusicKeyUtils.getSharpKeyNames(TGMusicKeyUtils.PREFIX_TUNING);
-	private static final int MINIMUM_LEFT_CONTROLS_WIDTH = 180;
-	private static final int MINIMUM_BUTTON_WIDTH = 80;
-	private static final int MINIMUM_BUTTON_HEIGHT = 25;
-	private static final int MAX_STRINGS = 7;
-	private static final int MIN_STRINGS = 4;
-	private static final int MAX_OCTAVES = 10;
-	private static final int MAX_NOTES = 12;
-	
-	protected Shell dialog;
-	protected Text nameText;
-	protected TGColor trackColor;
-	protected List tempStrings;
-	protected Button stringTransposition;
-	protected Button stringTranspositionTryKeepString;
-	protected Button stringTranspositionApplyToChords;
-	protected Spinner stringCountSpinner;
-	protected Combo[] stringCombos = new Combo[MAX_STRINGS];
-	protected Combo offsetCombo;
-	protected int stringCount;
-	protected Combo instrumentCombo;
-	protected Color colorButtonValue;
-	protected boolean percussionChannel;
-	
-	public TrackPropertiesAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | DISABLE_ON_PLAYING | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		showDialog(getEditor().getTablature().getShell());
-		return 0;
-	}
-	
-	public void showDialog(Shell shell) {
-		TGTrackImpl track = getEditor().getTablature().getCaret().getTrack();
-		if (track != null) {
-			this.stringCount = track.getStrings().size();
-			this.trackColor = track.getColor().clone(getSongManager().getFactory());
-			this.percussionChannel = getSongManager().isPercussionChannel(track.getChannelId());
-			this.initTempStrings(track.getStrings());
-			
-			this.dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-			this.dialog.setLayout(new GridLayout(2,false));
-			this.dialog.setText(TuxGuitar.getProperty("track.properties"));
-			
-			this.addListeners();
-			this.dialog.addDisposeListener(new DisposeListener() {
-				public void widgetDisposed(DisposeEvent e) {
-					removeListeners();
-				}
-			});
-			
-			Composite left = new Composite(this.dialog,SWT.NONE);
-			left.setLayout(new GridLayout());
-			left.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-			
-			Composite right = new Composite(this.dialog,SWT.NONE);
-			right.setLayout(new GridLayout());
-			right.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-			
-			Composite bottom = new Composite(this.dialog, SWT.NONE);
-			bottom.setLayout(new GridLayout(2,false));
-			bottom.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true,2,1));
-			
-			//GENERAL
-			initTrackInfo(makeGroup(left,1,TuxGuitar.getProperty("track.properties.general")), track);
-			
-			//INSTRUMENT
-			initInstrumentFields(makeGroup(left,1,TuxGuitar.getProperty("instrument")), track);
-			
-			//TUNING
-			initTuningInfo(makeGroup(right,2,TuxGuitar.getProperty("tuning")), track);
-			
-			//BUTTONS
-			initButtons(bottom);
-			
-			updateTuningGroup(!this.percussionChannel);
-			
-			DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		}
-	}
-	
-	private Group makeGroup(Composite parent,int horizontalSpan,String text){
-		Group group = new Group(parent, SWT.SHADOW_ETCHED_IN);
-		group.setLayoutData(makeGridData(horizontalSpan));
-		group.setText(text);
-		
-		return group;
-	}
-	
-	private GridData makeGridData(int horizontalSpan){
-		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
-		data.horizontalSpan = horizontalSpan;
-		return data;
-	}
-	
-	public GridData getButtonsData(){
-		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
-		data.minimumWidth = MINIMUM_BUTTON_WIDTH;
-		data.minimumHeight = MINIMUM_BUTTON_HEIGHT;
-		return data;
-	}
-	
-	private void initTrackInfo(Composite composite,TGTrackImpl track) {
-		composite.setLayout(new GridLayout(/*2,false*/));
-		Composite top = new Composite(composite, SWT.NONE);
-		top.setLayout(new GridLayout(/*2,false*/));
-		top.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		Composite bottom = new Composite(composite, SWT.NONE);
-		bottom.setLayout(new GridLayout(/*2,false*/));
-		bottom.setLayoutData(new GridData(SWT.FILL,SWT.BOTTOM,true,true));
-		
-		//-----------------------NAME---------------------------------
-		Label nameLabel = new Label(top, SWT.NONE);
-		nameLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
-		nameLabel.setText(TuxGuitar.getProperty("track.name") + ":");
-		
-		this.nameText = new Text(top, SWT.BORDER);
-		this.nameText.setLayoutData(getAlignmentData(MINIMUM_LEFT_CONTROLS_WIDTH,SWT.FILL));
-		this.nameText.setText(track.getName());
-		
-		//-----------------------COLOR---------------------------------
-		Label colorLabel = new Label(bottom, SWT.NONE);
-		colorLabel.setText(TuxGuitar.getProperty("track.color") + ":");
-		colorLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
-		
-		final Button colorButton = new Button(bottom, SWT.PUSH);
-		colorButton.setLayoutData(getAlignmentData(MINIMUM_LEFT_CONTROLS_WIDTH,SWT.FILL));
-		colorButton.setText(TuxGuitar.getProperty("choose"));
-		colorButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent event) {
-				ColorDialog dlg = new ColorDialog(TrackPropertiesAction.this.dialog);
-				dlg.setRGB(TrackPropertiesAction.this.dialog.getDisplay().getSystemColor(SWT.COLOR_BLACK).getRGB());
-				dlg.setText(TuxGuitar.getProperty("choose-color"));
-				RGB rgb = dlg.open();
-				if (rgb != null) {
-					TrackPropertiesAction.this.trackColor.setR(rgb.red);
-					TrackPropertiesAction.this.trackColor.setG(rgb.green);
-					TrackPropertiesAction.this.trackColor.setB(rgb.blue);
-					TrackPropertiesAction.this.setButtonColor(colorButton);
-				}
-			}
-		});
-		colorButton.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				TrackPropertiesAction.this.disposeButtonColor();
-			}
-		});
-		this.setButtonColor(colorButton);
-	}
-	
-	private void initTuningInfo(Composite composite,TGTrackImpl track) {
-		composite.setLayout(new GridLayout(2,false));
-		initTuningData(composite,track);
-		initTuningCombos(composite);
-	}
-	
-	private void initTuningCombos(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(/*MAX_STRINGS, false*/));
-		composite.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,false,true));
-		String[] tuningTexts = getAllValueNames();
-		for (int i = 0; i < MAX_STRINGS; i++) {
-			this.stringCombos[i] = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
-			this.stringCombos[i].setItems(tuningTexts);
-		}
-	}
-	
-	private void initTuningData(Composite parent,TGTrackImpl track) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		
-		Composite top = new Composite(composite, SWT.NONE);
-		top.setLayout(new GridLayout());
-		top.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		
-		Composite middle = new Composite(composite, SWT.NONE);
-		middle.setLayout(new GridLayout());
-		middle.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		
-		Composite bottom = new Composite( composite , SWT.NONE );
-		bottom.setLayout( new GridLayout() );
-		bottom.setLayoutData( new GridData(SWT.FILL,SWT.TOP,true,true) );
-		
-		//---------------------------------STRING--------------------------------
-		Label stringCountLabel = new Label(top, SWT.NONE);
-		stringCountLabel.setText(TuxGuitar.getProperty("tuning.strings") + ":");
-		stringCountLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
-		this.stringCountSpinner = new Spinner(top, SWT.BORDER);
-		this.stringCountSpinner.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		this.stringCountSpinner.setMinimum(MIN_STRINGS);
-		this.stringCountSpinner.setMaximum(MAX_STRINGS);
-		this.stringCountSpinner.setSelection(this.stringCount);
-		this.stringCountSpinner.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				TrackPropertiesAction.this.stringCount = TrackPropertiesAction.this.stringCountSpinner.getSelection();
-				setDefaultTuning(TrackPropertiesAction.this.percussionChannel);
-				updateTuningGroup(!TrackPropertiesAction.this.percussionChannel);
-			}
-		});
-		
-		//---------------------------------OFFSET--------------------------------
-		Label offsetLabel = new Label(middle, SWT.NONE);
-		offsetLabel.setText(TuxGuitar.getProperty("tuning.offset") + ":");
-		offsetLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
-		this.offsetCombo = new Combo(middle, SWT.DROP_DOWN | SWT.READ_ONLY);
-		this.offsetCombo.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		for(int i = TGTrack.MIN_OFFSET;i <= TGTrack.MAX_OFFSET;i ++){
-			this.offsetCombo.add(Integer.toString(i));
-			if(i == track.getOffset()){
-				this.offsetCombo.select(i - TGTrack.MIN_OFFSET);
-			}
-		}
-		
-		//---------------------------------OPTIONS----------------------------------
-		this.stringTransposition = new Button( bottom , SWT.CHECK );
-		this.stringTransposition.setLayoutData( new GridData(SWT.FILL,SWT.CENTER,true,true) );
-		this.stringTransposition.setText(TuxGuitar.getProperty("tuning.strings.transpose"));
-		this.stringTransposition.setSelection( true );
-		
-		this.stringTranspositionApplyToChords = new Button( bottom , SWT.CHECK );
-		this.stringTranspositionApplyToChords.setLayoutData( new GridData(SWT.FILL,SWT.CENTER,true,true) );
-		this.stringTranspositionApplyToChords.setText(TuxGuitar.getProperty("tuning.strings.transpose.apply-to-chords"));
-		this.stringTranspositionApplyToChords.setSelection( true );
-		
-		this.stringTranspositionTryKeepString = new Button( bottom , SWT.CHECK );
-		this.stringTranspositionTryKeepString.setLayoutData( new GridData(SWT.FILL,SWT.CENTER,true,true) );
-		this.stringTranspositionTryKeepString.setText(TuxGuitar.getProperty("tuning.strings.transpose.try-keep-strings"));
-		this.stringTranspositionTryKeepString.setSelection( true );
-		
-		this.stringTransposition.addSelectionListener( new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				Button stringTransposition = TrackPropertiesAction.this.stringTransposition;
-				Button stringTranspositionApplyToChords = TrackPropertiesAction.this.stringTranspositionApplyToChords;
-				Button stringTranspositionTryKeepString = TrackPropertiesAction.this.stringTranspositionTryKeepString;
-				stringTranspositionApplyToChords.setEnabled( ( stringTransposition.isEnabled() && stringTransposition.getSelection() ) );
-				stringTranspositionTryKeepString.setEnabled( ( stringTransposition.isEnabled() && stringTransposition.getSelection() ) );
-			}
-		});
-	}
-	
-	private GridData getAlignmentData(int minimumWidth,int horizontalAlignment){
-		GridData data = new GridData();
-		data.minimumWidth = minimumWidth;
-		data.horizontalAlignment = horizontalAlignment;
-		data.verticalAlignment = SWT.DEFAULT;
-		data.grabExcessHorizontalSpace = true;
-		data.grabExcessVerticalSpace = true;
-		return data;
-	}
-	
-	private void initButtons(final Composite parent) {
-		Button buttonOK = new Button(parent, SWT.PUSH);
-		buttonOK.setText(TuxGuitar.getProperty("ok"));
-		buttonOK.setLayoutData(getButtonsData());
-		buttonOK.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				updateTrackProperties();
-				TrackPropertiesAction.this.dialog.dispose();
-			}
-		});
-		
-		Button buttonCancel = new Button(parent, SWT.PUSH);
-		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
-		buttonCancel.setLayoutData(getButtonsData());
-		buttonCancel.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent arg0) {
-				TrackPropertiesAction.this.dialog.dispose();
-			}
-		});
-		
-		this.dialog.setDefaultButton( buttonOK );
-	}
-	
-	private void initInstrumentFields(Composite composite,TGTrackImpl track) {
-		composite.setLayout(new GridLayout());
-		
-		Composite top = new Composite(composite, SWT.NONE);
-		top.setLayout(new GridLayout(2,false));
-		top.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		
-		//------------Instrument Combo-------------------------------------
-		Label instrumentLabel = new Label(top, SWT.NONE);
-		instrumentLabel.setText(TuxGuitar.getProperty("instrument") + ":");
-		instrumentLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true,2,1));
-		
-		this.instrumentCombo = new Combo(top, SWT.DROP_DOWN | SWT.READ_ONLY);
-		this.instrumentCombo.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,false));
-		this.instrumentCombo.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				checkPercussionChannel();
-			}
-		});
-		this.loadChannels(track.getChannelId());
-		
-		Button settings = new Button(top, SWT.PUSH);
-		settings.setImage(TuxGuitar.instance().getIconManager().getSettings());
-		settings.setToolTipText(TuxGuitar.getProperty("settings"));
-		settings.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,false));
-		settings.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if(!TuxGuitar.instance().getChannelManager().isDisposed()){
-					TuxGuitar.instance().getChannelManager().dispose();
-				}
-				TuxGuitar.instance().getChannelManager().show(TrackPropertiesAction.this.dialog);
-			}
-		});
-	}
-	
-	protected void loadChannels(int selectedChannelId){
-		List tgChannelsData = new ArrayList();
-		List tgChannelsAvailable = getSongManager().getChannels();
-		
-		Combo tgChannelsCombo = this.instrumentCombo;
-		tgChannelsCombo.removeAll();
-		tgChannelsCombo.add(TuxGuitar.getProperty("track.instrument.default-select-option"));
-		tgChannelsCombo.select(0);
-		tgChannelsData.add(new Integer(-1));
-		
-		for( int i = 0 ; i < tgChannelsAvailable.size() ; i ++) {
-			TGChannel tgChannel = (TGChannel)tgChannelsAvailable.get(i);
-			tgChannelsData.add(new Integer(tgChannel.getChannelId()));
-			tgChannelsCombo.add(tgChannel.getName());
-			
-			if( tgChannel.getChannelId() == selectedChannelId ){
-				tgChannelsCombo.select(tgChannelsCombo.getItemCount() - 1);
-			}
-			
-		}
-		tgChannelsCombo.setData(tgChannelsData);
-	}
-	
-	protected void reloadChannels(){
-		loadChannels(getSelectedChannelId());
-	}
-	
-	protected void checkPercussionChannel(){
-		boolean percussionChannel = getSongManager().isPercussionChannel( getSelectedChannelId() );
-		if( this.percussionChannel != percussionChannel ){
-			this.setDefaultTuning(percussionChannel);
-			this.updateTuningGroup(!percussionChannel);
-		}
-		this.percussionChannel = percussionChannel;
-	}
-	
-	protected int getSelectedChannelId(){
-		int index = this.instrumentCombo.getSelectionIndex();
-		if( index >= 0 ){
-			Object data = this.instrumentCombo.getData();
-			if( data instanceof List && ((List)data).size() > index ){
-				return ((Integer)((List)data).get(index)).intValue();
-			}
-		}
-		return -1;
-	}
-	
-	protected void updateTrackProperties() {
-		final TGSongManager songManager = getSongManager();
-		final TGTrackImpl track = getEditor().getTablature().getCaret().getTrack();
-		
-		final String trackName = this.nameText.getText();
-		
-		final List strings = new ArrayList();
-		for (int i = 0; i < this.stringCount; i++) {
-			strings.add(TGSongManager.newString(getSongManager().getFactory(),(i + 1), this.stringCombos[i].getSelectionIndex()));
-		}
-		
-		final int channelId = getSelectedChannelId();
-		final int offset = ((songManager.isPercussionChannel(channelId))?0:TGTrack.MIN_OFFSET + this.offsetCombo.getSelectionIndex());
-		
-		
-		final TGColor trackColor = this.trackColor;
-		final boolean infoChanges = hasInfoChanges(track,trackName,trackColor,offset);
-		final boolean tuningChanges = hasTuningChanges(track,strings);
-		final boolean channelChanges = hasChannelChanges(track, channelId);
-		final boolean transposeStrings = shouldTransposeStrings(track, channelId);
-		final boolean transposeApplyToChords = (transposeStrings && this.stringTranspositionApplyToChords.getSelection());
-		final boolean transposeTryKeepString = (transposeStrings && this.stringTranspositionTryKeepString.getSelection());
-		
-		try {
-			if(infoChanges || tuningChanges || channelChanges){
-				ActionLock.lock();
-				TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
-					public void run() throws Throwable {
-						TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
-						new Thread( new Runnable() {
-							public void run() {
-								TuxGuitar.instance().getFileHistory().setUnsavedFile();
-								UndoableJoined undoable = new UndoableJoined();
-								
-								UndoableTrackGeneric undoableGeneric = null;
-								if(tuningChanges){
-									undoableGeneric = UndoableTrackGeneric.startUndo(track);
-								}
-								
-								//--------------------------------------info---------------------------------------
-								if(infoChanges){
-									UndoableTrackInfo undoableInfo = null;
-									if(!tuningChanges){
-										undoableInfo = UndoableTrackInfo.startUndo(track);
-									}
-									songManager.getTrackManager().changeInfo(track,trackName,trackColor,offset);
-									if(!tuningChanges && undoableInfo != null){
-										undoable.addUndoableEdit(undoableInfo.endUndo(track));
-									}
-								}
-								//--------------------------------------tuning---------------------------------------
-								if(tuningChanges){
-									updateTrackTunings(track, strings, transposeStrings, transposeTryKeepString, transposeApplyToChords);
-								}
-								//-----------------------------instrument----------------------------------------------
-								if(channelChanges){
-									UndoableTrackInstrument undoableInstrument = null;
-									if(!tuningChanges){
-										undoableInstrument = UndoableTrackInstrument.startUndo(track);
-									}
-									songManager.getTrackManager().changeChannel(track,channelId);
-									if(!tuningChanges && undoableInstrument != null){
-										undoable.addUndoableEdit(undoableInstrument.endUndo(track));
-									}
-								}
-								if(tuningChanges && undoableGeneric != null){
-									undoable.addUndoableEdit(undoableGeneric.endUndo(track));
-								}
-								addUndoableEdit(undoable.endUndo());
-								
-								new SyncThread(new Runnable() {
-									public void run() {
-										if(!TuxGuitar.isDisposed()){
-											updateTablature();
-											TuxGuitar.instance().updateCache( true );
-											TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
-											ActionLock.unlock();
-										}
-									}
-								}).start();
-							}
-						}).start();
-					}
-				});
-			}
-		} catch (Throwable throwable) {
-			TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
-			ActionLock.unlock();
-			throwable.printStackTrace();
-		}
-	}
-	
-	protected boolean shouldTransposeStrings(TGTrackImpl track, int selectedChannelId){
-		if(this.stringTransposition.getSelection()){
-			boolean percussionChannelNew = getSongManager().isPercussionChannel(selectedChannelId);
-			boolean percussionChannelOld = getSongManager().isPercussionChannel(track.getChannelId());
-			
-			return (!percussionChannelNew && !percussionChannelOld);
-		}
-		return false;
-	}
-	
-	protected boolean hasInfoChanges(TGTrackImpl track,String name,TGColor color,int offset){
-		if(!name.equals(track.getName())){
-			return true;
-		}
-		if(!color.isEqual(track.getColor())){
-			return true;
-		}
-		if(offset != track.getOffset()){
-			return true;
-		}
-		return false;
-	}
-	
-	protected boolean hasChannelChanges(TGTrackImpl track,int channelId){
-		return ( track.getChannelId() != channelId );
-	}
-	
-	protected boolean hasTuningChanges(TGTrackImpl track,List newStrings){
-		List oldStrings = track.getStrings();
-		//check the number of strings
-		if(oldStrings.size() != newStrings.size()){
-			return true;
-		}
-		//check the tuning of strings
-		for(int i = 0;i < oldStrings.size();i++){
-			TGString oldString = (TGString)oldStrings.get(i);
-			boolean stringExists = false;
-			for(int j = 0;j < newStrings.size();j++){
-				TGString newString = (TGString)newStrings.get(j);
-				if(newString.isEqual(oldString)){
-					stringExists = true;
-				}
-			}
-			if(!stringExists){
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	protected void updateTrackTunings(TGTrackImpl track, List strings, boolean transposeStrings , boolean transposeTryKeepString , boolean transposeApplyToChords ){
-		int[] transpositions = getStringTranspositions(track, strings);
-		getSongManager().getTrackManager().changeInstrumentStrings(track,strings);
-		if( transposeStrings ){
-			getSongManager().getTrackManager().transposeNotes(track, transpositions, transposeTryKeepString, transposeApplyToChords );
-		}
-	}
-	
-	protected int[] getStringTranspositions(TGTrackImpl track, List newStrings ){
-		int[] transpositions = new int[ newStrings.size() ];
-		
-		TGString newString = null;
-		TGString oldString = null;
-		for( int index = 0; index < transpositions.length ; index ++ ){
-			for( int i = 0; i < track.stringCount() ; i ++ ){
-				TGString string = track.getString( i + 1 );
-				if( string.getNumber() == (index + 1) ){
-					oldString = string;
-					break;
-				}
-			}
-			for( int i = 0; i < newStrings.size() ; i ++ ){
-				TGString string = (TGString)newStrings.get( i );
-				if( string.getNumber() == (index + 1) ){
-					newString = string;
-					break;
-				}
-			}
-			if( oldString != null && newString != null ){
-				transpositions[ index ] = (oldString.getValue() - newString.getValue());
-			}else{
-				transpositions[ index ] = 0;
-			}
-			
-			newString = null;
-			oldString = null;
-		}
-		
-		return transpositions;
-	}
-	
-	protected void setButtonColor(Button button){
-		Color color = new Color(this.dialog.getDisplay(), this.trackColor.getR(), this.trackColor.getG(), this.trackColor.getB());
-		button.setForeground( color );
-		this.disposeButtonColor();
-		this.colorButtonValue = color;
-	}
-	
-	protected void disposeButtonColor(){
-		if(this.colorButtonValue != null && !this.colorButtonValue.isDisposed()){
-			this.colorButtonValue.dispose();
-			this.colorButtonValue = null;
-		}
-	}
-	
-	protected void updateTuningGroup(boolean enabled) {
-		for (int i = 0; i < this.tempStrings.size(); i++) {
-			TGString string = (TGString)this.tempStrings.get(i);
-			this.stringCombos[i].select(string.getValue());
-			this.stringCombos[i].setVisible(true);
-			this.stringCombos[i].setEnabled(enabled);
-		}
-		
-		for (int i = this.tempStrings.size(); i < MAX_STRINGS; i++) {
-			this.stringCombos[i].select(0);
-			this.stringCombos[i].setVisible(false);
-		}
-		this.offsetCombo.setEnabled(enabled);
-		this.stringTransposition.setEnabled(enabled);
-		this.stringTranspositionApplyToChords.setEnabled(enabled && this.stringTransposition.getSelection());
-		this.stringTranspositionTryKeepString.setEnabled(enabled && this.stringTransposition.getSelection());
-	}
-	
-	protected void initTempStrings(List realStrings) {
-		this.tempStrings = new ArrayList();
-		for (int i = 0; i < realStrings.size(); i++) {
-			TGString realString = (TGString) realStrings.get(i);
-			this.tempStrings.add(realString.clone(getSongManager().getFactory()));
-		}
-	}
-	
-	protected void setDefaultTuning( boolean percussionChannel ) {
-		this.tempStrings.clear();
-		if( percussionChannel ) {
-			for (int i = 1; i <= this.stringCount; i++) {
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),i, 0));
-			}
-		}
-		else {
-			switch (this.stringCount) {
-			case 7:
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 64));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 59));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 55));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 50));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),5, 45));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),6, 40));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),7, 35));
-				break;
-			case 6:
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 64));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 59));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 55));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 50));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),5, 45));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),6, 40));
-				break;
-			case 5:
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 43));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 38));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 33));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 28));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),5, 23));
-				break;
-			case 4:
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),1, 43));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),2, 38));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),3, 33));
-				this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),4, 28));
-				break;
-			default:
-				for( int i = 1 ; i <= this.stringCount ; i ++ ){
-					this.tempStrings.add(TGSongManager.newString(getSongManager().getFactory(),i,0));
-				}
-				break;
-			}
-		}
-	}
-	
-	protected String[] getAllValueNames() {
-		String[] valueNames = new String[MAX_NOTES * MAX_OCTAVES];
-		for (int i = 0; i < valueNames.length; i++) {
-			valueNames[i] =  NOTE_NAMES[ (i -  ((i / MAX_NOTES) * MAX_NOTES) ) ] + (i / MAX_NOTES);
-		}
-		return valueNames;
-	}
-	
-	public void addListeners(){
-		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
-	}
-	
-	public void removeListeners(){
-		TuxGuitar.instance().getEditorManager().removeUpdateListener(this);
-	}
-	
-	public void updateItems(){
-		if( this.dialog != null && !this.dialog.isDisposed() ){
-			this.reloadChannels();
-		}
-	}
-	
-	public void doUpdate(int type) {
-		if( type == TGUpdateListener.SELECTION ){
-			this.updateItems();
-		}
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
deleted file mode 100644
index 10545ecf..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportPlayAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.transport;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
-public class TransportPlayAction extends Action {
-	
-	public static final String NAME = "action.transport.play";
-	
-	public TransportPlayAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TuxGuitar.instance().getTransport().play();
-		return 0;
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
deleted file mode 100644
index 5019ed9f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/transport/TransportStopAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.transport;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TransportStopAction extends Action{
-	
-	public static final String NAME = "action.transport.stop";
-	
-	public TransportStopAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TuxGuitar.instance().getTransport().stop();
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowInstrumentsAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowInstrumentsAction.java
deleted file mode 100644
index d77bd072..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowInstrumentsAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.view;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ShowInstrumentsAction extends Action{
-	
-	public static final String NAME = "action.view.show-instruments";
-	
-	public ShowInstrumentsAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(TuxGuitar.instance().getChannelManager().isDisposed()){
-			TuxGuitar.instance().getChannelManager().show();
-		}else{
-			TuxGuitar.instance().getChannelManager().dispose();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowMatrixAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowMatrixAction.java
deleted file mode 100644
index 1ec44aaa..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowMatrixAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.view;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ShowMatrixAction extends Action{
-	
-	public static final String NAME = "action.view.show-matrix";
-	
-	public ShowMatrixAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(TuxGuitar.instance().getMatrixEditor().isDisposed()){
-			TuxGuitar.instance().getMatrixEditor().show();
-		}else{
-			TuxGuitar.instance().getMatrixEditor().dispose();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowPianoAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowPianoAction.java
deleted file mode 100644
index 6249e7b7..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowPianoAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.view;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ShowPianoAction extends Action{
-	
-	public static final String NAME = "action.view.show-piano";
-	
-	public ShowPianoAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(TuxGuitar.instance().getPianoEditor().isDisposed()){
-			TuxGuitar.instance().getPianoEditor().show();
-		}else{
-			TuxGuitar.instance().getPianoEditor().dispose();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowToolbarsAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowToolbarsAction.java
deleted file mode 100644
index 62f3f901..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowToolbarsAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.view;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ShowToolbarsAction extends Action{
-	
-	public static final String NAME = "action.view.show-toolbars";
-	
-	public ShowToolbarsAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK | AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		TuxGuitar.instance().getItemManager().toogleToolbarVisibility();
-		
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowTransportAction.java b/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowTransportAction.java
deleted file mode 100644
index f17d595a..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/actions/view/ShowTransportAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Created on 17-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.actions.view;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.Action;
-import org.herac.tuxguitar.app.actions.ActionData;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ShowTransportAction extends Action{
-	
-	public static final String NAME = "action.view.show-transport";
-	
-	public ShowTransportAction() {
-		super(NAME, AUTO_LOCK | AUTO_UNLOCK |  AUTO_UPDATE | KEY_BINDING_AVAILABLE);
-	}
-	
-	protected int execute(ActionData actionData){
-		if(TuxGuitar.instance().getTransport().isDisposed()){
-			TuxGuitar.instance().getTransport().show();
-		}else{
-			TuxGuitar.instance().getTransport().dispose();
-		}
-		return 0;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/CannotInsertTransferException.java b/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/CannotInsertTransferException.java
deleted file mode 100644
index 45a4d4a8..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/CannotInsertTransferException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Created on 05-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.clipboard;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class CannotInsertTransferException extends Exception{
-	
-	private static final long serialVersionUID = 1L;
-	
-	public CannotInsertTransferException() {
-		super();
-	}
-	
-	public CannotInsertTransferException(String message) {
-		super(message);
-	}
-	
-	public CannotInsertTransferException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-	public CannotInsertTransferException(Throwable cause) {
-		super(cause);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/ClipBoard.java b/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/ClipBoard.java
deleted file mode 100644
index dbc43e49..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/ClipBoard.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Created on 09-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.clipboard;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ClipBoard {
-	private Transferable transferable;
-	
-	public ClipBoard(){
-		this.transferable = null;
-	}
-	
-	public void addTransferable(Transferable transferable){
-		this.transferable = transferable;
-	}
-	
-	public Transferable getTransferable(){
-		return this.transferable;
-	}
-	
-	public void insertTransfer() throws CannotInsertTransferException{
-		if(this.isEmpty()){
-			throw new CannotInsertTransferException();
-		}
-		this.transferable.insertTransfer();
-	}
-	
-	public boolean isEmpty(){
-		return (this.transferable == null);
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/MeasureTransferable.java b/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/MeasureTransferable.java
deleted file mode 100644
index da0d2ff1..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/MeasureTransferable.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Created on 09-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.clipboard;
-
-import java.util.Iterator;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.editors.TablatureEditor;
-import org.herac.tuxguitar.app.undo.undoables.measure.UndoableInsertMeasure;
-import org.herac.tuxguitar.app.undo.undoables.measure.UndoableReplaceMeasures;
-import org.herac.tuxguitar.song.helpers.TGSongSegment;
-import org.herac.tuxguitar.song.helpers.TGSongSegmentHelper;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGTrack;
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
-public class MeasureTransferable implements Transferable {
-	public static final int TRANSFER_TYPE_REPLACE = 1;
-	public static final int TRANSFER_TYPE_INSERT = 2;
-	
-	private TablatureEditor tablatureEditor;
-	private TGSongSegment segment;
-	private int transferType;
-	private int pasteCount;
-	
-	public MeasureTransferable(TablatureEditor tablatureEditor, int p1, int p2,boolean allTracks) {
-		this.tablatureEditor = tablatureEditor;
-		this.transferType = TRANSFER_TYPE_REPLACE;
-		this.getTransfer(p1, p2,allTracks);
-	}
-	
-	private void getTransfer(int p1, int p2,boolean allTracks) {
-		if(allTracks){
-			this.segment = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).copyMeasures(p1,p2);
-		}else{
-			TGTrack track = this.tablatureEditor.getTablature().getCaret().getTrack();
-			this.segment = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager()).copyMeasures(p1,p2,track);
-		}
-		skipMarkers(this.segment);
-	}
-	
-	public void insertTransfer() throws CannotInsertTransferException {
-		TGSongSegmentHelper helper = new TGSongSegmentHelper(TuxGuitar.instance().getSongManager());
-		TGSongSegment segment = helper.createSegmentCopies(this.segment, this.pasteCount );
-		if(this.transferType == TRANSFER_TYPE_REPLACE){
-			replaceMeasures(helper, segment);
-		}else if(this.transferType == TRANSFER_TYPE_INSERT){
-			insertMeasures(helper, segment);
-		}
-	}
-	
-	public void insertMeasures(TGSongSegmentHelper helper, TGSongSegment segment) throws CannotInsertTransferException {
-		TGMeasure measure = this.tablatureEditor.getTablature().getCaret().getMeasure();
-		TGTrack track = this.tablatureEditor.getTablature().getCaret().getTrack();
-		if (measure == null || segment.isEmpty()) {
-			throw new CannotInsertTransferException();
-		}
-		//Si el segmento tiene una sola pista,
-		//la pego en la pista seleccionada
-		int toTrack = ((segment.getTracks().size() == 1)?track.getNumber():0);
-		
-		//comienza el undoable
-		UndoableInsertMeasure undoable = new UndoableInsertMeasure(toTrack);
-		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
-		TGMeasureHeader first = (TGMeasureHeader)segment.getHeaders().get(0);
-		int fromNumber = measure.getNumber();
-		long theMove = (measure.getStart() - first.getStart());
-		
-		helper.insertMeasures(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),fromNumber,theMove,toTrack);
-		
-		//termia el undoable
-		TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),segment.getHeaders().size(),fromNumber,theMove));
-	}
-	
-	public void replaceMeasures(TGSongSegmentHelper helper, TGSongSegment segment) throws CannotInsertTransferException {
-		TGMeasure measure = this.tablatureEditor.getTablature().getCaret().getMeasure();
-		TGTrack track = this.tablatureEditor.getTablature().getCaret().getTrack();
-		if (measure == null || segment.isEmpty()) {
-			throw new CannotInsertTransferException();
-		}
-		TGMeasureHeader first = (TGMeasureHeader)segment.getHeaders().get(0);
-		
-		//Si el segmento tiene una sola pista,
-		//la pego en la pista seleccionada
-		int toTrack = ((segment.getTracks().size() == 1)?track.getNumber():0);
-		
-		//si no existen los compases los creo
-		int count = segment.getHeaders().size();
-		int current = measure.getNumber();
-		int freeSpace =  (track.countMeasures() - (current - 1));
-		long theMove = (measure.getStart() - first.getStart());
-		
-		//comienza el undoable
-		UndoableReplaceMeasures undoable = new UndoableReplaceMeasures(current, (current + count) , toTrack);
-		TuxGuitar.instance().getFileHistory().setUnsavedFile();
-		
-		for(int i = freeSpace;i < count;i ++){
-			TuxGuitar.instance().getSongManager().addNewMeasureBeforeEnd();
-		}
-		helper.replaceMeasures(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),theMove,toTrack);
-		
-		//Termina el undoable
-		TuxGuitar.instance().getUndoableManager().addEdit(undoable.endUndo(segment.clone(TuxGuitar.instance().getSongManager().getFactory()),count,freeSpace,theMove));
-	}
-	
-	public void setTransferType(int transferType){
-		this.transferType = transferType;
-	}
-	
-	public void setPasteCount(int pasteCount){
-		this.pasteCount = pasteCount;
-	}
-	
-	private void skipMarkers(TGSongSegment segment){
-		Iterator it = segment.getHeaders().iterator();
-		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
-			header.setMarker(null);
-		}
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/Transferable.java b/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/Transferable.java
deleted file mode 100644
index a0993249..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/clipboard/Transferable.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Created on 09-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.clipboard;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public interface Transferable {
-	
-	public void insertTransfer()throws CannotInsertTransferException;
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGEditorManager.java b/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGEditorManager.java
deleted file mode 100644
index dbc652db..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/TGEditorManager.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.herac.tuxguitar.app.editors;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.song.models.TGBeat;
-
-public class TGEditorManager {
-	
-	private List redrawListeners;
-	private List updateListeners;
-	private List beatViewerListeners;
-	
-	public TGEditorManager(){
-		this.redrawListeners = new ArrayList();
-		this.updateListeners = new ArrayList();
-		this.beatViewerListeners = new ArrayList();
-	}
-	
-	public void doRedraw( int type ){
-		for(int i = 0; i < this.redrawListeners.size(); i ++){
-			TGRedrawListener listener = (TGRedrawListener) this.redrawListeners.get( i );
-			listener.doRedraw( type );
-		}
-	}
-	
-	public void doUpdate( int type ){
-		for(int i = 0; i < this.updateListeners.size(); i ++){
-			TGUpdateListener listener = (TGUpdateListener) this.updateListeners.get( i );
-			listener.doUpdate( type );
-		}
-	}
-	
-	public void showExternalBeat( TGBeat beat ){
-		for(int i = 0; i < this.beatViewerListeners.size(); i ++){
-			TGExternalBeatViewerListener listener = (TGExternalBeatViewerListener) this.beatViewerListeners.get( i );
-			listener.showExternalBeat(beat);
-		}
-	}
-	
-	public void hideExternalBeat(){
-		for(int i = 0; i < this.beatViewerListeners.size(); i ++){
-			TGExternalBeatViewerListener listener = (TGExternalBeatViewerListener) this.beatViewerListeners.get( i );
-			listener.hideExternalBeat();
-		}
-	}
-	
-	public void addRedrawListener( TGRedrawListener listener){
-		if(!this.redrawListeners.contains( listener )){
-			this.redrawListeners.add( listener );
-		}
-	}
-	
-	public void removeRedrawListener( TGRedrawListener listener){
-		if(this.redrawListeners.contains( listener )){
-			this.redrawListeners.remove( listener );
-		}
-	}
-	
-	public void addUpdateListener( TGUpdateListener listener){
-		if(!this.updateListeners.contains( listener )){
-			this.updateListeners.add( listener );
-		}
-	}
-	
-	public void removeUpdateListener( TGUpdateListener listener){
-		if(this.updateListeners.contains( listener )){
-			this.updateListeners.remove( listener );
-		}
-	}
-	
-	public void addBeatViewerListener( TGExternalBeatViewerListener listener){
-		if(!this.beatViewerListeners.contains( listener )){
-			this.beatViewerListeners.add( listener );
-		}
-	}
-	
-	public void removeBeatViewerListener( TGExternalBeatViewerListener listener){
-		if(this.beatViewerListeners.contains( listener )){
-			this.beatViewerListeners.remove( listener );
-		}
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCreatorListener.java b/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCreatorListener.java
deleted file mode 100644
index 81535f7b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/chord/ChordCreatorListener.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.herac.tuxguitar.app.editors.chord;
-
-import java.util.List;
-
-public interface ChordCreatorListener {
-	
-	public void notifyChords(ChordCreatorUtil process, List chords);
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/TablaturePaintListener.java b/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/TablaturePaintListener.java
deleted file mode 100644
index 865a88e0..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/editors/tab/TablaturePaintListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Created on 30-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.editors.tab;
-
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.herac.tuxguitar.app.editors.TGPainterImpl;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TablaturePaintListener implements PaintListener{
-	private Tablature tablature;
-	
-	public TablaturePaintListener(Tablature tablature){
-		this.tablature = tablature;
-	}
-	
-	public void paintControl(PaintEvent e) {
-		this.tablature.paintTablature( new TGPainterImpl(e.gc) );
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/helper/SyncThread.java b/TuxGuitar/src/org/herac/tuxguitar/app/helper/SyncThread.java
deleted file mode 100644
index 912afaed..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/helper/SyncThread.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Created on 09-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.helper;
-
-import org.herac.tuxguitar.util.TGSynchronizer;
-
-/**
- * @author julian
- * 
- * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
- */
-public class SyncThread extends Thread {
-	
-	private TGSynchronizer.TGRunnable runnable;
-	
-	public SyncThread(TGSynchronizer.TGRunnable runnable) {
-		this.runnable = runnable;
-	}
-	
-	public SyncThread(final Runnable runnable) {
-		this(new TGSynchronizer.TGRunnable() {
-			public void run() throws Throwable {
-				runnable.run();
-			}
-		});
-	}
-	
-	public void run() {
-		try {
-			TGSynchronizer.instance().addRunnable(this.runnable);
-		} catch (Throwable e) {
-			e.printStackTrace();
-		}
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGPluginList.java b/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGPluginList.java
deleted file mode 100644
index e7e66f0c..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/system/plugins/base/TGPluginList.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.herac.tuxguitar.app.system.plugins.base;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.app.system.plugins.TGPlugin;
-import org.herac.tuxguitar.app.system.plugins.TGPluginException;
-
-public abstract class TGPluginList extends TGPluginAdapter{
-	
-	private List plugins;
-	
-	public TGPluginList(){
-		super();
-	}
-	
-	public void init() throws TGPluginException {
-		Iterator it = getIterator();
-		while(it.hasNext()){
-			TGPlugin plugin = (TGPlugin)it.next();
-			plugin.init();
-		}
-	}
-	
-	public void close() throws TGPluginException {
-		Iterator it = getIterator();
-		while(it.hasNext()){
-			TGPlugin plugin = (TGPlugin)it.next();
-			plugin.close();
-		}
-	}
-	
-	public void setEnabled(boolean enabled) throws TGPluginException {
-		Iterator it = getIterator();
-		while(it.hasNext()){
-			TGPlugin plugin = (TGPlugin)it.next();
-			plugin.setEnabled( enabled);
-		}
-	}
-	
-	private Iterator getIterator() throws TGPluginException {
-		if(this.plugins == null){
-			this.plugins = getPlugins();
-		}
-		return this.plugins.iterator();
-	}
-	
-	protected abstract List getPlugins() throws TGPluginException ;
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTable.java b/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTable.java
deleted file mode 100644
index f3a49b0c..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTable.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.herac.tuxguitar.app.table;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-public class TGTable {
-	private ScrolledComposite sComposite;
-	private Composite table;
-	private SashForm columnControl;
-	private Composite rowControl;
-	private TGTableColumn columnNumber;
-	private TGTableColumn columnSoloMute;
-	private TGTableColumn columnName;
-	private TGTableColumn columnInstrument;
-	private TGTableColumn columnCanvas;
-	private List rows;
-	private int rowHeight;
-	private int scrollIncrement;
-	
-	public TGTable(Composite parent){
-		this.rows = new ArrayList();
-		this.newTable(parent);
-	}
-	
-	public void newTable(Composite parent){
-		this.sComposite = new ScrolledComposite(parent,SWT.BORDER | SWT.V_SCROLL);
-		this.sComposite.setLayout(new GridLayout());
-		this.sComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		this.sComposite.setAlwaysShowScrollBars(true);
-		this.sComposite.setExpandHorizontal(true);
-		this.sComposite.setExpandVertical(true);
-		this.table = new Composite(this.sComposite,SWT.NONE);
-		this.table.setLayout(newGridLayout(1,0,0,0,0));
-		this.table.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
-		this.columnControl = new SashForm(this.table,SWT.HORIZONTAL);
-		this.columnControl.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
-		
-		this.columnNumber = new TGTableColumn(this,SWT.LEFT);
-		this.columnSoloMute = new TGTableColumn(this,SWT.LEFT);
-		this.columnName = new TGTableColumn(this,SWT.LEFT);
-		this.columnInstrument = new TGTableColumn(this,SWT.LEFT);
-		this.columnCanvas = new TGTableColumn(this,SWT.CENTER);
-		this.columnControl.setWeights(new int[]{1,2,7,7,20});
-		
-		this.rowControl = new Composite(this.table,SWT.NONE);
-		this.rowControl.setLayout(newGridLayout(1,0,1,0,1));
-		this.rowControl.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
-		this.sComposite.setContent(this.table);
-	}
-	
-	public Composite getControl(){
-		return this.table;
-	}
-	
-	public void newRow(){
-		this.rows.add(new TGTableRow(this));
-	}
-	
-	private GridLayout newGridLayout(int cols,int marginWidth,int marginHeight,int horizontalSpacing,int verticalSpacing){
-		GridLayout layout = new GridLayout(cols,false);
-		layout.marginWidth = marginWidth;
-		layout.marginHeight = marginHeight;
-		layout.horizontalSpacing = horizontalSpacing;
-		layout.verticalSpacing = verticalSpacing;
-		return layout;
-	}
-	
-	public void addRowItem(TGTableColumn column,Control control,boolean computeSize){
-		if(computeSize){
-			this.rowHeight = Math.max(this.rowHeight,control.computeSize(SWT.DEFAULT,SWT.DEFAULT).y);
-			this.scrollIncrement = this.rowHeight;
-		}
-		column.addControl(control);
-	}
-	
-	public int getMinHeight(){
-		return (this.sComposite.getMinHeight() + ( this.sComposite.getBorderWidth() * 2 ) );
-	}
-	
-	public Composite getColumnControl(){
-		return this.columnControl;
-	}
-	
-	public Composite getRowControl(){
-		return this.rowControl;
-	}
-	
-	public int getRowHeight(){
-		return this.rowHeight;
-	}
-	
-	public int getScrollIncrement(){
-		return this.scrollIncrement;
-	}	
-	
-	public TGTableColumn getColumnInstrument() {
-		return this.columnInstrument;
-	}
-	
-	public TGTableColumn getColumnName() {
-		return this.columnName;
-	}
-	
-	public TGTableColumn getColumnNumber() {
-		return this.columnNumber;
-	}
-	
-	public TGTableColumn getColumnSoloMute() {
-		return this.columnSoloMute;
-	}
-	
-	public TGTableColumn getColumnCanvas() {
-		return this.columnCanvas;
-	}
-	
-	public TGTableRow getRow(int index){
-		if(index >= 0 && index < this.rows.size()){
-			return (TGTableRow)this.rows.get(index);
-		}
-		return null;
-	}
-	
-	public void removeRowsAfter(int index){
-		while(index < this.rows.size()){
-			TGTableRow row = (TGTableRow)this.rows.get(index);
-			row.dispose();
-			this.rows.remove(index);
-		}
-		this.notifyRemoved();
-	}
-	
-	public int getRowCount(){
-		return this.rows.size();
-	}
-	
-	public void update(){
-		this.layoutColumns();
-		this.table.layout(true,true);
-		this.sComposite.setMinHeight(this.table.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-		this.sComposite.getVerticalBar().setIncrement( (getScrollIncrement() + this.sComposite.getBorderWidth() ) );
-	}
-	
-	private void notifyRemoved(){
-		this.columnNumber.notifyRemoved();
-		this.columnSoloMute.notifyRemoved();
-		this.columnName.notifyRemoved();
-		this.columnInstrument.notifyRemoved();
-		this.columnCanvas.notifyRemoved();
-	}
-	
-	private void layoutColumns(){
-		this.columnNumber.layout();
-		this.columnSoloMute.layout();
-		this.columnName.layout();
-		this.columnInstrument.layout();
-		this.columnCanvas.layout();
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableCanvasPainter.java b/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableCanvasPainter.java
deleted file mode 100644
index d4a55556..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableCanvasPainter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.herac.tuxguitar.app.table;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.editors.TGColorImpl;
-import org.herac.tuxguitar.app.editors.TGPainterImpl;
-import org.herac.tuxguitar.graphics.TGColor;
-import org.herac.tuxguitar.graphics.TGPainter;
-import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
-import org.herac.tuxguitar.song.models.TGTrack;
-
-public class TGTableCanvasPainter implements PaintListener{
-	
-	private TGTableViewer viewer;
-	private TGTrack track;
-	
-	public TGTableCanvasPainter(TGTableViewer viewer,TGTrack track){
-		this.viewer = viewer;
-		this.track = track;
-	}
-	
-	public void paintControl(PaintEvent e) {
-		TGPainterImpl painter = new TGPainterImpl(e.gc);
-		paintTrack(painter);
-	}
-	
-	protected void paintTrack(TGPainterImpl painter){
-		if(!TuxGuitar.instance().isLocked()){
-			TuxGuitar.instance().lock();
-			
-			int x = -this.viewer.getHScrollSelection();
-			int y = 0;
-			int size = this.viewer.getTable().getRowHeight();
-			int width = painter.getGC().getDevice().getBounds().width;
-			boolean playing = TuxGuitar.instance().getPlayer().isRunning();
-			
-			painter.setBackground(new TGColorImpl(painter.getGC().getDevice().getSystemColor(SWT.COLOR_GRAY)));
-			painter.initPath(TGPainter.PATH_FILL);
-			painter.setAntialias(false);
-			painter.addRectangle(0,y,width,size);
-			painter.closePath();
-			
-			TGColor trackColor = painter.createColor(this.track.getColor().getR(),this.track.getColor().getG(),this.track.getColor().getB());
-			painter.setBackground(trackColor);
-			painter.setForeground(trackColor);
-			
-			int count = this.track.countMeasures();
-			for(int j = 0;j < count;j++){
-				TGMeasureImpl measure = (TGMeasureImpl)this.track.getMeasure(j);
-				if(isRestMeasure(measure)){
-					painter.initPath();
-					painter.setAntialias(false);
-					painter.addRectangle(x,y,size - 2,size - 1);
-					painter.closePath();
-				}else{
-					painter.initPath(TGPainter.PATH_FILL);
-					painter.setAntialias(false);
-					painter.addRectangle(x,y,size - 1,size );
-					painter.closePath();
-				}
-				boolean hasCaret = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getMeasure().equals(measure);
-				if((playing && measure.isPlaying(this.viewer.getEditor().getTablature().getViewLayout())) || (!playing && hasCaret)){
-					painter.setBackground(new TGColorImpl(painter.getGC().getDevice().getSystemColor(SWT.COLOR_BLACK)));
-					painter.initPath(TGPainter.PATH_FILL);
-					painter.setAntialias(false);
-					painter.addRectangle(x + 4,y + 4,size - 9,size - 8);
-					painter.closePath();
-					painter.setBackground(trackColor);
-				}
-				x += size;
-			}
-			trackColor.dispose();
-			
-			TuxGuitar.instance().unlock();
-		}
-	}
-	
-	private boolean isRestMeasure(TGMeasureImpl measure){
-		int beatCount = measure.countBeats();
-		for(int i = 0; i < beatCount; i++){
-			if( !measure.getBeat(i).isRestBeat() ){
-				return false;
-			}
-		}
-		return true;
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableColumn.java b/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableColumn.java
deleted file mode 100644
index dd3456eb..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableColumn.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.herac.tuxguitar.app.table;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.herac.tuxguitar.app.TuxGuitar;
-
-public class TGTableColumn {
-	private TGTable table;
-	private CLabel column;
-	private List controls;
-	
-	public TGTableColumn(TGTable table,int align){
-		this.table = table;
-		this.controls = new ArrayList();
-		this.column = new CLabel(this.table.getColumnControl(),align | SWT.SHADOW_OUT);
-		this.column.setLayout(new GridLayout());
-		this.column.addListener(SWT.Resize,new Listener() {
-			public void handleEvent(Event arg0) {
-				layout();
-			}
-		});
-		this.column.pack();
-		this.appendListeners(this.column);
-	}
-	
-	public CLabel getControl(){
-		return this.column;
-	}
-	
-	public void setTitle(String title){
-		this.column.setText(title);
-	}
-	
-	public void addControl(Control control){
-		this.controls.add(control);
-		this.appendListeners(control);
-	}
-	
-	public void appendListeners(Control control){
-		TuxGuitar.instance().getkeyBindingManager().appendListenersTo(control);
-	}
-	
-	public void layout(){
-		Point location = this.column.getLocation();
-		Point size = this.column.getSize();
-		
-		for(int i = 0; i < this.controls.size(); i ++){
-			Control control = (Control)this.controls.get(i);
-			if(!control.isDisposed()){
-				control.setSize(size.x,this.table.getRowHeight());
-				control.setLocation(location.x, 0);
-			}
-		}
-	}
-	
-	public void notifyRemoved(){
-		for(int i = 0; i < this.controls.size(); i ++){
-			Control control = (Control)this.controls.get(i);
-			if(control.isDisposed()){
-				this.controls.remove(i --);
-			}
-		}
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableRow.java b/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableRow.java
deleted file mode 100644
index f7804f7f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableRow.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.herac.tuxguitar.app.table;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-
-public class TGTableRow {
-	private TGTable table;
-	private Composite row;
-	private CLabel number;
-	private CLabel soloMute;
-	private CLabel name;
-	private CLabel instrument;
-	private Composite painter;
-	private MouseListener mouseListenerLabel;
-	private MouseListener mouseListenerCanvas;
-	private PaintListener paintListenerCanvas;
-	
-	public TGTableRow(TGTable table){
-		this.table = table;
-		this.init();
-	}
-	
-	public void init(){
-		MouseListener mouseListenerLabel = new MouseListenerLabel();
-		MouseListener mouseListenerCanvas = new MouseListenerCanvas();
-		PaintListener paintListenerCanvas = new PaintListenerCanvas();
-		
-		this.row = new Composite(this.table.getRowControl(),SWT.NONE );
-		this.row.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
-		
-		this.number = new CLabel(this.row,SWT.LEFT);
-		this.number.addMouseListener(mouseListenerLabel);
-		this.table.addRowItem(this.table.getColumnNumber(),this.number,true);
-		
-		this.soloMute = new CLabel(this.row,SWT.LEFT);
-		this.soloMute.addMouseListener(mouseListenerLabel);
-		this.table.addRowItem(this.table.getColumnSoloMute(),this.soloMute,true);
-		
-		this.name = new CLabel(this.row,SWT.LEFT);
-		this.name.addMouseListener(mouseListenerLabel);
-		this.table.addRowItem(this.table.getColumnName(),this.name,true);
-		
-		this.instrument = new CLabel(this.row,SWT.LEFT);
-		this.instrument.addMouseListener(mouseListenerLabel);
-		this.table.addRowItem(this.table.getColumnInstrument(),this.instrument,true);
-		
-		this.painter = new Composite(this.row,SWT.DOUBLE_BUFFERED);
-		this.painter.addMouseListener(mouseListenerCanvas);
-		this.painter.addPaintListener(paintListenerCanvas);
-		this.table.addRowItem(this.table.getColumnCanvas(),this.painter,false);
-		
-		this.row.pack();
-	}
-	
-	public void setBackground(Color background){
-		this.number.setBackground(background);
-		this.soloMute.setBackground(background);
-		this.name.setBackground(background);
-		this.instrument.setBackground(background);
-	}
-	
-	public void setForeground(Color foreground){
-		this.number.setForeground(foreground);
-		this.soloMute.setForeground(foreground);
-		this.name.setForeground(foreground);
-		this.instrument.setForeground(foreground);
-	}
-	
-	public void dispose(){
-		this.row.dispose();
-	}
-	
-	public Composite getPainter() {
-		return this.painter;
-	}
-	
-	public CLabel getInstrument() {
-		return this.instrument;
-	}
-	
-	public CLabel getName() {
-		return this.name;
-	}
-	
-	public CLabel getNumber() {
-		return this.number;
-	}
-	
-	public CLabel getSoloMute() {
-		return this.soloMute;
-	}
-	
-	public MouseListener getMouseListenerLabel() {
-		return this.mouseListenerLabel;
-	}
-	
-	public void setMouseListenerLabel(MouseListener mouseListenerLabel) {
-		this.mouseListenerLabel = mouseListenerLabel;
-	}
-	
-	public MouseListener getMouseListenerCanvas() {
-		return this.mouseListenerCanvas;
-	}
-	
-	public void setMouseListenerCanvas(MouseListener mouseListenerCanvas) {
-		this.mouseListenerCanvas = mouseListenerCanvas;
-	}
-	
-	public PaintListener getPaintListenerCanvas() {
-		return this.paintListenerCanvas;
-	}
-	
-	public void setPaintListenerCanvas(PaintListener paintListenerCanvas) {
-		this.paintListenerCanvas = paintListenerCanvas;
-	}
-	
-	private class MouseListenerLabel implements MouseListener{
-		
-		public MouseListenerLabel(){
-			super();
-		}
-		
-		public void mouseDoubleClick(MouseEvent e) {
-			if(getMouseListenerLabel() != null){
-				getMouseListenerLabel().mouseDoubleClick(e);
-			}
-		}
-		
-		public void mouseDown(MouseEvent e) {
-			if(getMouseListenerLabel() != null){
-				getMouseListenerLabel().mouseDown(e);
-			}
-		}
-		
-		public void mouseUp(MouseEvent e) {
-			if(getMouseListenerLabel() != null){
-				getMouseListenerLabel().mouseUp(e);
-			}
-		}
-	}
-	
-	private class MouseListenerCanvas implements MouseListener{
-		
-		public MouseListenerCanvas(){
-			super();
-		}
-		
-		public void mouseDoubleClick(MouseEvent e) {
-			if(getMouseListenerCanvas() != null){
-				getMouseListenerCanvas().mouseDoubleClick(e);
-			}
-		}
-		
-		public void mouseDown(MouseEvent e) {
-			if(getMouseListenerCanvas() != null){
-				getMouseListenerCanvas().mouseDown(e);
-			}
-		}
-		
-		public void mouseUp(MouseEvent e) {
-			if(getMouseListenerCanvas() != null){
-				getMouseListenerCanvas().mouseUp(e);
-			}
-		}
-	}
-	
-	private class PaintListenerCanvas implements PaintListener{
-		
-		public PaintListenerCanvas(){
-			super();
-		}
-		
-		public void paintControl(PaintEvent e) {
-			if(getPaintListenerCanvas() != null){
-				getPaintListenerCanvas().paintControl(e);
-			}
-		}
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableViewer.java b/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableViewer.java
deleted file mode 100644
index 3317f210..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/table/TGTableViewer.java
+++ /dev/null
@@ -1,460 +0,0 @@
-package org.herac.tuxguitar.app.table;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.actions.ActionData;
-import org.herac.tuxguitar.app.actions.ActionLock;
-import org.herac.tuxguitar.app.actions.composition.ChangeInfoAction;
-import org.herac.tuxguitar.app.actions.track.GoToTrackAction;
-import org.herac.tuxguitar.app.actions.track.TrackPropertiesAction;
-import org.herac.tuxguitar.app.editors.TGRedrawListener;
-import org.herac.tuxguitar.app.editors.TGUpdateListener;
-import org.herac.tuxguitar.app.editors.TablatureEditor;
-import org.herac.tuxguitar.app.items.menu.TrackMenu;
-import org.herac.tuxguitar.app.system.config.TGConfigKeys;
-import org.herac.tuxguitar.app.system.icons.IconLoader;
-import org.herac.tuxguitar.app.system.language.LanguageLoader;
-import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
-import org.herac.tuxguitar.graphics.control.TGTrackImpl;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGTrack;
-
-public class TGTableViewer implements TGRedrawListener, TGUpdateListener, LanguageLoader {
-	
-	private Composite composite;
-	private ScrollBar hSroll;
-	private Color[] backgrounds;
-	private Color[] foregrounds;
-	private TGTable table;
-	private int selectedTrack;
-	private int selectedMeasure;
-	private int trackCount = 0;
-	private boolean autoSizeEnabled;
-	private boolean update;
-	private boolean followScroll;
-	private boolean resetTexts;
-	
-	public TGTableViewer() {
-		TuxGuitar.instance().getLanguageManager().addLoader(this);
-		TuxGuitar.instance().getEditorManager().addRedrawListener(this);
-		TuxGuitar.instance().getEditorManager().addUpdateListener(this);
-	}
-	
-	public void init(Composite parent){
-		this.composite = new Composite(parent,SWT.H_SCROLL);
-		this.addColors();
-		this.addLayout();
-		this.addTable();
-		this.addHScroll();
-		this.loadConfig();
-	}
-	
-	private void addColors(){
-		Display display = this.getComposite().getDisplay();
-
-		this.backgrounds = new Color[]{
-			new Color(display,255,255,255),
-			new Color(display,238,238,238),
-			new Color(display,192,192,192),
-		};
-		this.foregrounds = new Color[]{
-			new Color( display, 0, 0, 0 ),
-			new Color( display, 0, 0, 0 ),
-			new Color( display, 0, 0, 0 ),
-		};
-	}
-	
-	private void addLayout(){
-		GridLayout layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		layout.marginTop = 0;
-		layout.marginBottom = 0;
-		layout.horizontalSpacing = 0;
-		layout.verticalSpacing = 0;
-		getComposite().setLayout(layout);
-	}
-	
-	private void addHScroll(){
-		this.hSroll = getComposite().getHorizontalBar();
-		this.hSroll.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event e) {
-				redrawLocked();
-			}
-		});
-	}
-	
-	private void addTable(){
-		MouseListener listener = mouseFocusListener();
-		this.table = new TGTable(getComposite());
-		this.table.getColumnNumber().getControl().addMouseListener(listener);
-		this.table.getColumnSoloMute().getControl().addMouseListener(listener);
-		this.table.getColumnName().getControl().addMouseListener(listener);
-		this.table.getColumnInstrument().getControl().addMouseListener(listener);
-		this.table.getColumnCanvas().getControl().addMouseListener(listener);
-		this.table.getColumnCanvas().getControl().addMouseListener(new MouseAdapter() {
-			public void mouseDoubleClick(MouseEvent e) {
-				TuxGuitar.instance().getAction(ChangeInfoAction.NAME).process(new ActionData());
-			}
-		});
-		this.fireUpdate(true);
-		this.loadProperties();
-	}
-	
-	public void loadProperties() {
-		this.table.getColumnNumber().setTitle(TuxGuitar.getProperty("track.number"));
-		this.table.getColumnSoloMute().setTitle(TuxGuitar.getProperty("track.short-solo-mute"));
-		this.table.getColumnName().setTitle(TuxGuitar.getProperty("track.name"));
-		this.table.getColumnInstrument().setTitle(TuxGuitar.getProperty("track.instrument"));
-	}
-	
-	public void fireUpdate(boolean newSong){
-		this.update = true;
-		if(newSong){
-			this.trackCount = 0;
-		}
-	}
-	
-	public void updateItems(){
-		this.resetTexts = true;
-		this.followScroll = true;
-	}
-	
-	public void updateHScroll(){
-		int width = (getEditor().getTablature().getCaret().getTrack().countMeasures() * this.table.getRowHeight());
-		this.hSroll.setIncrement(this.table.getScrollIncrement());
-		this.hSroll.setMaximum(width);
-		this.hSroll.setThumb(Math.min(width ,this.table.getColumnCanvas().getControl().getClientArea().width));
-	}
-	
-	public TGTable getTable(){
-		return this.table;
-	}
-	
-	public int getHScrollSelection(){
-		return this.hSroll.getSelection();
-	}
-	
-	public TablatureEditor getEditor(){
-		return TuxGuitar.instance().getTablatureEditor();
-	}
-	
-	private String getInstrument(TGTrack track){
-		TGChannel channel = TuxGuitar.instance().getSongManager().getChannel(track.getChannelId());
-		if( channel != null ){
-			return ( channel.getName() != null ? channel.getName() : new String() );
-		}
-		return new String();
-	}
-	
-	private String getSoloMute(TGTrack track){
-		if( track.isSolo() ){
-			return TuxGuitar.getProperty("track.short-solo-mute.s");
-		}
-		if( track.isMute() ){
-			return TuxGuitar.getProperty("track.short-solo-mute.m");
-		}
-		return TuxGuitar.getProperty("track.short-solo-mute.none");
-	}
-	
-	private void updateTable(){
-		if(this.update){
-			int count = TuxGuitar.instance().getSongManager().getSong().countTracks();
-			this.table.removeRowsAfter(count);
-			for(int i = this.table.getRowCount(); i < count; i ++){
-				this.table.newRow();
-			}
-			for(int i = 0; i < count; i ++){
-				final TGTrack track = TuxGuitar.instance().getSongManager().getSong().getTrack(i);
-				final TGTableRow row = this.table.getRow(i);
-				if(row != null){
-					//Number
-					row.getNumber().setText(Integer.toString(track.getNumber()));
-					row.getNumber().setData(track);
-					row.getNumber().setMenu(createTrackMenu());
-					
-					//Solo-Mute
-					row.getSoloMute().setText(getSoloMute(track));
-					row.getSoloMute().setData(track);
-					row.getSoloMute().setMenu(createTrackMenu());
-					
-					//Name
-					row.getName().setText(track.getName());
-					row.getName().setData(track);
-					row.getName().setMenu(createTrackMenu());
-					
-					//Instrument
-					row.getInstrument().setText(getInstrument(track));
-					row.getInstrument().setData(track);
-					row.getInstrument().setMenu(createTrackMenu());
-					
-					row.setMouseListenerLabel(new MouseAdapter() {
-						
-						public void mouseUp(MouseEvent e) {
-							row.getPainter().setFocus();
-						}
-						
-						public void mouseDown(MouseEvent e) {
-							if(track.getNumber() != getEditor().getTablature().getCaret().getTrack().getNumber()){
-								ActionData actionData = new ActionData();
-								actionData.put(GoToTrackAction.PROPERTY_TRACK, track);
-								
-								TuxGuitar.instance().getAction(GoToTrackAction.NAME).process(actionData);
-							}
-						}
-						
-						public void mouseDoubleClick(final MouseEvent e) {
-							new Thread(new Runnable() {
-								public void run() {
-									ActionLock.waitFor();
-									TuxGuitar.instance().getAction(TrackPropertiesAction.NAME).process(new ActionData());
-								}
-							}).start();
-						}
-					});
-					row.setMouseListenerCanvas(new MouseAdapter() {
-						
-						public void mouseUp(MouseEvent e) {
-							row.getPainter().setFocus();
-						}
-						
-						public void mouseDown(MouseEvent e) {
-							int index = ((e.x + getHScrollSelection())/ getTable().getRowHeight());
-							if(index >= 0 && index < track.countMeasures()){
-								TGMeasureImpl measure = (TGMeasureImpl)track.getMeasure(index);
-								TGBeat beat = TuxGuitar.instance().getSongManager().getMeasureManager().getFirstBeat(measure.getBeats());
-								if(beat != null){
-									getEditor().getTablature().getCaret().moveTo((TGTrackImpl)track,measure,beat,1);
-									TuxGuitar.instance().updateCache(true);
-								}
-							}
-						}
-					});
-					row.setPaintListenerCanvas(new TGTableCanvasPainter(this,track));
-				}
-			}
-			this.table.update();
-			this.selectedTrack = 0;
-			this.selectedMeasure = 0;
-			
-			if(this.autoSizeEnabled && this.trackCount != count){
-				TuxGuitar.instance().setTableHeight( getHeight() );
-				this.trackCount = count;
-			}
-			
-		}
-		this.update = false;
-	}
-	
-	private int getHeight(){
-		Rectangle r1 = this.composite.getBounds();
-		Rectangle r2 = this.composite.getClientArea();
-		return ( this.table.getMinHeight() + (r1.height - r2.height) );
-	}
-	
-	private void resetTextsValues(){
-		int rows = this.table.getRowCount();
-		for(int i = 0; i < rows; i ++){
-			TGTableRow row = this.table.getRow(i);
-			
-			row.getNumber().setText(Integer.toString(((TGTrack)row.getNumber().getData()).getNumber()));
-			row.getSoloMute().setText(getSoloMute((TGTrack)row.getSoloMute().getData()));
-			row.getName().setText(((TGTrack)row.getName().getData()).getName());
-			row.getInstrument().setText(getInstrument((TGTrack)row.getInstrument().getData()));
-		}
-	}
-	
-	private void redrawRows(int selectedTrack){
-		int rows = this.table.getRowCount();
-		for(int i = 0; i < rows; i ++){
-			TGTableRow row = this.table.getRow(i); 
-			row.getPainter().redraw();
-			if(this.selectedTrack != selectedTrack){
-				row.setBackground( this.backgrounds[ ((selectedTrack - 1) == i)? 2: ( i % 2 ) ] );
-				row.setForeground( this.foregrounds[ ((selectedTrack - 1) == i)? 2: ( i % 2 ) ] );
-			}
-		}
-	}
-	
-	public void redrawLocked(){
-		if( !TuxGuitar.instance().isLocked() ){
-			TuxGuitar.instance().lock();
-			redraw();
-			TuxGuitar.instance().unlock();
-		}
-	}
-	
-	public void redraw(){
-		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
-			this.updateTable();
-			this.table.getColumnCanvas().setTitle(TuxGuitar.instance().getSongManager().getSong().getName());
-			int selectedTrack = getEditor().getTablature().getCaret().getTrack().getNumber();
-			this.redrawRows(selectedTrack);
-			this.selectedTrack = selectedTrack;
-			this.selectedMeasure = 0;
-			this.updateHScroll();
-			
-			if( this.resetTexts ){
-				this.resetTextsValues();
-				this.resetTexts = false;
-			}
-			if( this.followScroll ){
-				this.followHorizontalScroll(getEditor().getTablature().getCaret().getMeasure().getNumber());
-				this.followScroll = false;
-			}
-			getComposite().redraw();
-		}
-	}
-	
-	public void redrawPlayingMode(){
-		if(!isDisposed() && !TuxGuitar.instance().isLocked()){
-			TGMeasure measure =  TuxGuitar.instance().getEditorCache().getPlayMeasure();
-			if(measure != null && measure.getTrack() != null){
-				this.updateTable();
-				int selectedTrack = measure.getTrack().getNumber();
-				int selectedMeasure = measure.getNumber();
-				if(this.selectedTrack != selectedTrack || this.selectedMeasure != selectedMeasure){
-					this.redrawRows(selectedTrack);
-					this.followHorizontalScroll(selectedMeasure);
-				}
-				this.selectedTrack = selectedTrack;
-				this.selectedMeasure = selectedMeasure;
-			}
-		}
-	}
-	
-	private void followHorizontalScroll(int selectedMeasure){
-		int hScrollSelection = this.hSroll.getSelection();
-		int hScrollThumb = this.hSroll.getThumb();
-		
-		int measureSize = this.table.getRowHeight();
-		int measurePosition = ( (selectedMeasure * measureSize) - measureSize );
-		
-		if( (measurePosition - hScrollSelection) < 0 || (measurePosition + measureSize - hScrollSelection ) > hScrollThumb){
-			this.hSroll.setSelection(measurePosition);
-		}
-	}
-	
-	public void loadConfig(){
-		this.autoSizeEnabled = TuxGuitar.instance().getConfig().getBooleanConfigValue(TGConfigKeys.TABLE_AUTO_SIZE);
-		this.trackCount = 0;
-	}
-	
-	public Composite getComposite(){
-		return this.composite;
-	}
-	
-	public Menu createTrackMenu(){
-		final TrackMenu trackMenu = new TrackMenu(getComposite().getShell(),SWT.POP_UP);
-		trackMenu.showItems();
-		trackMenu.update();
-		
-		final TGUpdateListener trackMenuUpdateListener = new TGUpdateListener() {
-			public void doUpdate(int type) {
-				if(!trackMenu.isDisposed() && type == TGUpdateListener.SELECTION ){
-					trackMenu.update();
-				}	
-			}
-		};
-		final LanguageLoader trackMenuLanguageLoader = new LanguageLoader() {
-			public void loadProperties() {
-				if(!trackMenu.isDisposed()){
-					trackMenu.loadProperties();
-				}
-			}
-		};
-		final IconLoader trackMenuIconLoader = new IconLoader() {
-			public void loadIcons() {
-				if(!trackMenu.isDisposed()){
-					trackMenu.loadIcons();
-				}
-			}
-		};
-		
-		TuxGuitar.instance().getEditorManager().addUpdateListener(trackMenuUpdateListener);
-		TuxGuitar.instance().getLanguageManager().addLoader(trackMenuLanguageLoader);
-		TuxGuitar.instance().getIconManager().addLoader(trackMenuIconLoader);
-		
-		trackMenu.getMenu().addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				TuxGuitar.instance().getEditorManager().removeUpdateListener(trackMenuUpdateListener);
-				TuxGuitar.instance().getLanguageManager().removeLoader(trackMenuLanguageLoader);
-				TuxGuitar.instance().getIconManager().removeLoader(trackMenuIconLoader);
-			}
-		});
-		
-		return trackMenu.getMenu();
-	}
-	
-	public void disposeColors(){
-		for(int i = 0; i < this.backgrounds.length; i++){
-			this.backgrounds[i].dispose();
-		}
-		for(int i = 0; i < this.foregrounds.length; i++){
-			this.foregrounds[i].dispose();
-		}
-	}
-	
-	public void dispose(){
-		if(!isDisposed()){
-			getComposite().dispose();
-			disposeColors();
-		}
-	}
-	
-	public boolean isDisposed(){
-		return (getComposite() == null || getComposite().isDisposed());
-	}
-	
-	protected int getSelectedTrack(){
-		return this.selectedTrack;
-	}
-	
-	private MouseListener mouseFocusListener(){
-		return new MouseAdapter() {
-			public void mouseUp(MouseEvent e) {
-				TGTable table = getTable();
-				if(table != null){
-					TGTableRow row = table.getRow( ( getSelectedTrack() - 1 ) );
-					if(row != null){
-						row.getPainter().setFocus();
-					}
-				}
-			}
-		};
-	}
-
-	public void doRedraw(int type) {
-		if( type == TGRedrawListener.NORMAL ){
-			this.redraw();
-		}else if( type == TGRedrawListener.PLAYING_NEW_BEAT ){
-			this.redrawPlayingMode();
-		}
-	}
-	
-	public void doUpdate(int type) {
-		if( type == TGUpdateListener.SELECTION ){
-			this.updateItems();
-		}else if( type == TGUpdateListener.SONG_UPDATED ){
-			this.fireUpdate( false );
-		}else if( type == TGUpdateListener.SONG_LOADED ){
-			this.fireUpdate( true );
-		}
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserConnection.java b/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserConnection.java
deleted file mode 100644
index 37ee996f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/TGBrowserConnection.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser;
-
-import java.io.InputStream;
-import java.util.List;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserConnection {
-	
-	private boolean locked;
-	private TGBrowser browser;
-	private TGBrowserConnectionHandler handler;
-	
-	public TGBrowserConnection(TGBrowserConnectionHandler handler){
-		this.handler = handler;
-	}
-	
-	protected void lock(){
-		this.locked = true;
-		this.handler.notifyLockStatusChanged();
-	}
-	
-	protected void unlock(){
-		this.locked = false;
-		this.handler.notifyLockStatusChanged();
-	}
-	
-	public boolean isLocked(){
-		return this.locked;
-	}
-	
-	public TGBrowser getBrowser(){
-		return this.browser;
-	}
-	
-	public boolean isOpen(){
-		return (getBrowser() != null);
-	}
-	
-	public void open(final int callId,final TGBrowser browser){
-		if(!isLocked()){
-			this.close(callId);
-			this.lock();
-			this.browser = browser;
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(getBrowser() != null){
-							getBrowser().open();
-							notifyOpened(callId);
-						}else{
-							notifyClosed(callId);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void close(final int callId){
-		if(!isLocked()){
-			this.lock();
-			final TGBrowser browser = getBrowser();
-			this.browser = null;
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(browser != null){
-							browser.close();
-							notifyClosed(callId);
-						}else{
-							notifyClosed(callId);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void cdRoot(final int callId){
-		if(!isLocked()){
-			this.lock();
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(isOpen()){
-							getBrowser().cdRoot();
-							notifyCd(callId);
-						}else{
-							notifyClosed(callId);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void cdUp(final int callId){
-		if(!isLocked()){
-			this.lock();
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(isOpen()){
-							getBrowser().cdUp();
-							notifyCd(callId);
-						}else{
-							notifyClosed(callId);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void cd(final int callId,final TGBrowserElement element){
-		if(!isLocked()){
-			this.lock();
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(isOpen()){
-							getBrowser().cdElement(element);
-							notifyCd(callId);
-						}else{
-							notifyClosed(callId);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void listElements(final int callId){
-		if(!isLocked()){
-			this.lock();
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(isOpen()){
-							List elements = getBrowser().listElements();
-							notifyElements(callId,elements);
-						}else{
-							notifyClosed(callId);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void openStream(final int callId,final TGBrowserElement element){
-		if(!isLocked()){
-			this.lock();
-			new Thread(new Runnable() {
-				public void run() {
-					try {
-						if(element == null){
-							release();
-							return;
-						}
-						if(element.isFolder()){
-							release();
-							cd(callId,element);
-						}
-						else{
-							InputStream stream = element.getInputStream();
-							notifyStream(callId,stream,element);
-						}
-					} catch (TGBrowserException e) {
-						notifyError(callId,e);
-						e.printStackTrace();
-					}
-				}
-			}).start();
-		}
-	}
-	
-	public void release(){
-		this.unlock();
-	}
-	
-	public void notifyCd(final int callId) {
-		this.handler.notifyCd(callId);
-	}
-	
-	public void notifyClosed(final int callId) {
-		this.handler.notifyClosed(callId);
-	}
-	
-	public void notifyElements(final int callId,List elements) {
-		this.handler.notifyElements(callId,elements);
-	}
-	
-	public void notifyError(final int callId,Throwable throwable) {
-		this.handler.notifyError(callId,throwable);
-	}
-	
-	public void notifyOpened(final int callId) {
-		this.handler.notifyOpened(callId);
-	}
-	
-	public void notifyStream(final int callId,InputStream stream, TGBrowserElement element) {
-		this.handler.notifyStream(callId,stream,element);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataImpl.java b/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataImpl.java
deleted file mode 100644
index 3df3a642..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserDataImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.filesystem;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
-
-public class TGBrowserDataImpl implements TGBrowserData{
-	
-	private static final String STRING_SEPARATOR = ";";
-	
-	private String title;
-	private String path;
-	
-	public TGBrowserDataImpl(String title,String path){
-		this.title = title;
-		this.path = path;
-	}
-	
-	public String getTitle(){
-		return this.title;
-	}
-	
-	public String getPath(){
-		return this.path;
-	}
-	
-	public String toString(){
-		return (getTitle() + STRING_SEPARATOR + getPath());
-	}
-	
-	public static TGBrowserData fromString(String string) {
-		String[] data = string.split(STRING_SEPARATOR);
-		if(data.length == 2){
-			return new TGBrowserDataImpl(data[0],data[1]);
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementComparator.java b/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementComparator.java
deleted file mode 100644
index 125c9e0f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementComparator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.filesystem;
-
-import java.util.Comparator;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserElementComparator implements Comparator {
-	
-	private static final int RESULT_LESS = -1;
-	
-	private static final int RESULT_EQUAL = 0;
-	
-	private static final int RESULT_GREATER = 1;
-	
-	private static final int DIRECTION = 1;
-	
-	private static final int DIRECTION_FOLDER = 1;
-	
-	public int compare(Object o1, Object o2) {
-		if(o1 instanceof TGBrowserElement && o2 instanceof TGBrowserElement){
-			TGBrowserElement element1 = (TGBrowserElement)o1;
-			TGBrowserElement element2 = (TGBrowserElement)o2;
-			
-			if(element1.isFolder() && !element2.isFolder()){
-				return (DIRECTION_FOLDER * RESULT_LESS);
-			}
-			if(element2.isFolder() && !element1.isFolder()){
-				return (DIRECTION_FOLDER * RESULT_GREATER);
-			}
-			
-			return (DIRECTION * (element1.getName().compareTo(element2.getName())));
-		}
-		return RESULT_EQUAL;
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementImpl.java b/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementImpl.java
deleted file mode 100644
index c339089b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserElementImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.filesystem;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserElementImpl extends TGBrowserElement{
-	
-	private TGBrowserElementImpl parent;
-	private File file;
-	
-	public TGBrowserElementImpl(TGBrowserElementImpl parent,File file) {
-		super(file.getName());
-		this.parent = parent;
-		this.file = file;
-	}
-	
-	public File getFile() {
-		return this.file;
-	}
-	
-	public TGBrowserElementImpl getParent() {
-		return this.parent;
-	}
-	
-	public boolean isFolder(){
-		return getFile().isDirectory();
-	}
-	
-	public InputStream getInputStream() throws TGBrowserException {
-		if(!isFolder()){
-			try {
-				return new FileInputStream(getFile());
-			} catch (FileNotFoundException e) {
-				throw new TGBrowserException(e);
-			}
-		}
-		return null;
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserFactoryImpl.java b/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserFactoryImpl.java
deleted file mode 100644
index 359a98a8..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserFactoryImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.filesystem;
-
-import org.eclipse.swt.widgets.Shell;
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
-
-public class TGBrowserFactoryImpl implements TGBrowserFactory{
-	
-	public TGBrowserFactoryImpl() {
-		super();
-	}
-	
-	public String getType(){
-		return "file.system";
-	}
-	
-	public String getName(){
-		return TuxGuitar.getProperty("browser.factory.fs.name");
-	}
-	
-	public TGBrowser newTGBrowser(TGBrowserData data) {
-		if(data instanceof TGBrowserDataImpl){
-			return new TGBrowserImpl((TGBrowserDataImpl)data);
-		}
-		return null;
-	}
-	
-	public TGBrowserData parseData(String string) {
-		return TGBrowserDataImpl.fromString(string);
-	}
-	
-	public TGBrowserData dataDialog(Shell parent) {
-		TGBrowserDataDialog dialog = new TGBrowserDataDialog();
-		return dialog.open(parent);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserImpl.java b/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserImpl.java
deleted file mode 100644
index 568de29f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/tools/browser/filesystem/TGBrowserImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.herac.tuxguitar.app.tools.browser.filesystem;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
-import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
-
-public class TGBrowserImpl extends TGBrowser{
-	
-	private File root;
-	private TGBrowserElementImpl element;
-	private TGBrowserDataImpl data;
-	
-	public TGBrowserImpl(TGBrowserDataImpl data){
-		this.data = data;
-	}
-	
-	public void open(){
-		this.root = new File(this.data.getPath());
-	}
-	
-	public void close(){
-		this.root = null;
-	}
-	
-	public void cdElement(TGBrowserElement element) {
-		this.element = (TGBrowserElementImpl)element;
-	}
-	
-	public void cdRoot() {
-		this.element = null;
-	}
-	
-	public void cdUp() {
-		if(this.element != null){
-			this.element = this.element.getParent();
-		}
-	}
-	
-	public List listElements() {
-		List elements = new ArrayList();
-		File file = ((this.element != null)?this.element.getFile():this.root);
-		if(file.exists() && file.isDirectory()){
-			File[] files = file.listFiles();
-			for(int i = 0; i < files.length;i ++){
-				elements.add(new TGBrowserElementImpl(this.element,files[i]));
-			}
-		}
-		if( !elements.isEmpty() ){
-			Collections.sort(elements,new TGBrowserElementComparator());
-		}
-		return elements;
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/CannotRedoException.java b/TuxGuitar/src/org/herac/tuxguitar/app/undo/CannotRedoException.java
deleted file mode 100644
index a1e8406b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/CannotRedoException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Created on 05-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.undo;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class CannotRedoException extends Exception{
-	
-	private static final long serialVersionUID = 1L;
-	
-	public CannotRedoException() {
-		super();
-	}
-	
-	public CannotRedoException(String message) {
-		super(message);
-	}
-	
-	public CannotRedoException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-	public CannotRedoException(Throwable cause) {
-		super(cause);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/undo/CannotUndoException.java b/TuxGuitar/src/org/herac/tuxguitar/app/undo/CannotUndoException.java
deleted file mode 100644
index 6bd2545f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/undo/CannotUndoException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Created on 05-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.app.undo;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class CannotUndoException extends Exception{
-	
-	private static final long serialVersionUID = 1L;
-	
-	public CannotUndoException() {
-		super();
-	}
-	
-	public CannotUndoException(String message) {
-		super(message);
-	}
-	
-	public CannotUndoException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-	public CannotUndoException(Throwable cause) {
-		super(cause);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/app/util/TGMusicKeyUtils.java b/TuxGuitar/src/org/herac/tuxguitar/app/util/TGMusicKeyUtils.java
deleted file mode 100644
index c9dfe19c..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/app/util/TGMusicKeyUtils.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.herac.tuxguitar.app.util;
-
-import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.app.system.language.LanguageLoader;
-
-public class TGMusicKeyUtils {
-	
-	public static final String PREFIX_CHORD = "chord";
-	
-	public static final String PREFIX_SCALE = "scale";
-	
-	public static final String PREFIX_TUNING = "tuning";
-	
-	public static final String PREFIX_FRETBOARD = "fretboard";
-	
-	public static final String PREFIX_MATRIX = "matrix";
-	
-	private static final String[][] DEFAULT_KEY_NAMES = new String[][]{
-		{"C","C#","Cb"},
-		{"D","D#","Db"},
-		{"E","E#","Eb"},
-		{"F","F#","Fb"},
-		{"G","G#","Gb"},
-		{"A","A#","Ab"},
-		{"B","B#","Bb"}
-	};
-	
-	public static String[] getSharpKeyNames(String prefix){
-		return new TGMusicKeyNames(true,prefix).getNames();
-	}
-	
-	public static String[] getFlatKeyNames(String prefix){
-		return new TGMusicKeyNames(false,prefix).getNames();
-	}
-	
-	protected static void loadKeyNames(String[] names,String prefix,boolean sharp){
-		if(sharp){
-			loadSharpKeyNames(names, prefix);
-		}else{
-			loadFlatKeyNames(names, prefix);
-		}
-	}
-	
-	private static void loadSharpKeyNames(String[] names,String prefix){
-		names[0] = getName(prefix,0,0);
-		names[1] = getName(prefix,0,1);
-		names[2] = getName(prefix,1,0);
-		names[3] = getName(prefix,1,1);
-		names[4] = getName(prefix,2,0);
-		names[5] = getName(prefix,3,0);
-		names[6] = getName(prefix,3,1);
-		names[7] = getName(prefix,4,0);
-		names[8] = getName(prefix,4,1);
-		names[9] = getName(prefix,5,0);
-		names[10] = getName(prefix,5,1);
-		names[11] = getName(prefix,6,0);
-	}
-	
-	private static void loadFlatKeyNames(String[] names,String prefix){
-		names[0] = getName(prefix,0,0);
-		names[1] = getName(prefix,1,2);
-		names[2] = getName(prefix,1,0);
-		names[3] = getName(prefix,2,2);
-		names[4] = getName(prefix,2,0);
-		names[5] = getName(prefix,3,0);
-		names[6] = getName(prefix,4,2);
-		names[7] = getName(prefix,4,0);
-		names[8] = getName(prefix,5,2);
-		names[9] = getName(prefix,5,0);
-		names[10] = getName(prefix,6,2);
-		names[11] = getName(prefix,6,0);
-	}
-	
-	private static String getName(String prefix,int key,int signature){
-		String resource = ("key." + prefix + "." + key + "." + signature);
-		return TuxGuitar.instance().getLanguageManager().getProperty(resource,DEFAULT_KEY_NAMES[key][signature]);
-	}
-}
-
-class TGMusicKeyNames implements LanguageLoader{
-	
-	private boolean sharp;
-	private String prefix;
-	private String[] names;
-	
-	public TGMusicKeyNames(boolean sharp,String prefix){
-		this.sharp = sharp;
-		this.prefix = prefix;
-		this.names = new String[12];
-		this.loadProperties();
-		
-		TuxGuitar.instance().getLanguageManager().addLoader(this);
-	}
-	
-	public String[] getNames(){
-		return this.names;
-	}
-	
-	public void loadProperties() {
-		TGMusicKeyUtils.loadKeyNames(this.names, this.prefix, this.sharp);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGColor.java b/TuxGuitar/src/org/herac/tuxguitar/graphics/TGColor.java
deleted file mode 100644
index 27f28a85..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/graphics/TGColor.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.herac.tuxguitar.graphics;
-
-public interface TGColor extends TGResource {
-	
-	public int getRed();
-	
-	public int getGreen();
-	
-	public int getBlue();
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatManager.java b/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatManager.java
deleted file mode 100644
index 525e9f30..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGFileFormatManager.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.herac.tuxguitar.io.base;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.io.tg.TGInputStream;
-import org.herac.tuxguitar.io.tg.TGOutputStream;
-import org.herac.tuxguitar.io.tg.TGStream;
-
-public class TGFileFormatManager {
-	
-	public static final String DEFAULT_EXTENSION = TGStream.TG_FORMAT_EXTENSION;
-	
-	private static TGFileFormatManager instance;
-	
-	private TGSongLoader loader;
-	private TGSongWriter writer;
-	private List inputStreams;
-	private List outputStreams;
-	private List exporters;
-	private List importers;
-	
-	private TGFileFormatManager(){
-		this.loader = new TGSongLoader();
-		this.writer = new TGSongWriter();
-		this.inputStreams = new ArrayList();
-		this.outputStreams = new ArrayList();
-		this.exporters = new ArrayList();
-		this.importers = new ArrayList();
-		this.addDefaultStreams();
-	}
-	
-	public static TGFileFormatManager instance(){
-		if(instance == null){
-			instance = new TGFileFormatManager();
-		}
-		return instance;
-	}
-	
-	public TGSongLoader getLoader(){
-		return this.loader;
-	}
-	
-	public TGSongWriter getWriter(){
-		return this.writer;
-	}
-	
-	public void addInputStream(TGInputStreamBase stream){
-		this.inputStreams.add(stream);
-	}
-	
-	public void removeInputStream(TGInputStreamBase stream){
-		this.inputStreams.remove(stream);
-	}
-	
-	public int countInputStreams(){
-		return this.inputStreams.size();
-	}
-	
-	public void addOutputStream(TGOutputStreamBase stream){
-		this.outputStreams.add(stream);
-	}
-	
-	public void removeOutputStream(TGOutputStreamBase stream){
-		this.outputStreams.remove(stream);
-	}
-	
-	public int countOutputStreams(){
-		return this.outputStreams.size();
-	}
-	
-	public void addImporter(TGRawImporter importer){
-		this.importers.add(importer);
-	}
-	
-	public void removeImporter(TGRawImporter importer){
-		this.importers.remove(importer);
-	}
-	
-	public int countImporters(){
-		return this.importers.size();
-	}
-	
-	public void addExporter(TGRawExporter exporter){
-		this.exporters.add(exporter);
-	}
-	
-	public void removeExporter(TGRawExporter exporter){
-		this.exporters.remove(exporter);
-	}
-	
-	public int countExporters(){
-		return this.exporters.size();
-	}
-	
-	public Iterator getInputStreams(){
-		return this.inputStreams.iterator();
-	}
-	
-	public Iterator getOutputStreams(){
-		return this.outputStreams.iterator();
-	}
-	
-	public Iterator getImporters(){
-		return this.importers.iterator();
-	}
-	
-	public Iterator getExporters(){
-		return this.exporters.iterator();
-	}
-	
-	public List getInputFormats(){
-		List formats = new ArrayList();
-		Iterator it = getInputStreams();
-		while(it.hasNext()){
-			TGInputStreamBase stream = (TGInputStreamBase)it.next();
-			TGFileFormat format = stream.getFileFormat();
-			if(!existsFormat(format, formats)){
-				formats.add(format);
-			}
-		}
-		return formats;
-	}
-	
-	public List getOutputFormats(){
-		List formats = new ArrayList();
-		Iterator it = getOutputStreams();
-		while(it.hasNext()){
-			TGOutputStreamBase stream = (TGOutputStreamBase)it.next();
-			TGFileFormat format = stream.getFileFormat();
-			if(!existsFormat(format, formats)){
-				formats.add(format);
-			}
-		}
-		return formats;
-	}
-	
-	private boolean existsFormat(TGFileFormat format,List formats){
-		Iterator it = formats.iterator();
-		while(it.hasNext()){
-			TGFileFormat comparator = (TGFileFormat)it.next();
-			if(comparator.getName().equals(format.getName()) || comparator.getSupportedFormats().equals(format.getSupportedFormats())){
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	private void addDefaultStreams(){
-		this.addInputStream(new TGInputStream());
-		this.addOutputStream(new TGOutputStream());
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongLoader.java b/TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongLoader.java
deleted file mode 100644
index 2243354e..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongLoader.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Created on 19-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.base;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.util.Iterator;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGSong;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGSongLoader {
-	
-	public TGSongLoader(){
-		super();
-	}
-	
-	/**
-	 * @return TGSong
-	 * @throws TGFileFormatException
-	 */
-	public TGSong load(TGFactory factory,InputStream is) throws TGFileFormatException{
-		try{
-			BufferedInputStream stream = new BufferedInputStream(is);
-			stream.mark(1);
-			Iterator it = TGFileFormatManager.instance().getInputStreams();
-			while(it.hasNext()){
-				TGInputStreamBase reader = (TGInputStreamBase)it.next();
-				reader.init(factory,stream);
-				if(reader.isSupportedVersion()){
-					return reader.readSong();
-				}
-				stream.reset();
-			}
-			stream.close();
-		}catch(Throwable t){
-			throw new TGFileFormatException(t);
-		}
-		throw new TGFileFormatException("Unsupported file format");
-	}
-}
\ No newline at end of file
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongWriter.java b/TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongWriter.java
deleted file mode 100644
index ef225a21..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/io/base/TGSongWriter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Created on 19-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.base;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Iterator;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGSong;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGSongWriter {
-	
-	public TGSongWriter(){
-		super();
-	}
-	
-	public void write(TGFactory factory,TGSong song,String path) throws TGFileFormatException{
-		try {
-			Iterator it = TGFileFormatManager.instance().getOutputStreams();
-			while(it.hasNext()){
-				TGOutputStreamBase writer = (TGOutputStreamBase)it.next();
-				if(isSupportedExtension(writer,path)){
-					writer.init(factory,new BufferedOutputStream(new FileOutputStream(new File(path))));
-					writer.writeSong(song);
-					return;
-				}
-			}
-		} catch (Throwable t) {
-			throw new TGFileFormatException(t);
-		}
-		throw new TGFileFormatException("Unsupported file format");
-	}
-	
-	private boolean isSupportedExtension(TGOutputStreamBase writer,String path){
-		int index = path.lastIndexOf(".");
-		if(index > 0){
-			return writer.isSupportedExtension(path.substring(index));
-		}
-		return false;
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGInputStream.java b/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGInputStream.java
deleted file mode 100644
index ea0f3604..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGInputStream.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg;
-
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGInputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGInputStream extends TGStream implements TGInputStreamBase{
-	
-	private DataInputStream dataInputStream;
-	private String version;
-	private TGFactory factory;
-	
-	public TGInputStream() {
-		super();
-	}
-	
-	public void init(TGFactory factory,InputStream stream) {
-		this.factory = factory;
-		this.dataInputStream = new DataInputStream(stream);
-		this.version = null;
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public boolean isSupportedVersion(String version){
-		return (version.equals(TG_FORMAT_VERSION));
-	}
-	
-	public boolean isSupportedVersion(){
-		try{
-			readVersion();
-			return isSupportedVersion(this.version);
-		}catch(Throwable throwable){
-			return false;
-		}
-	}
-	
-	public TGSong readSong() throws TGFileFormatException{
-		try {
-			if(this.isSupportedVersion()){
-				TGSong song = this.read();
-				this.dataInputStream.close();
-				return song;
-			}
-			throw new TGFileFormatException("Unsopported Version");
-		} catch (Throwable throwable) {
-			throw new TGFileFormatException(throwable);
-		}
-	}
-	
-	private void readVersion(){
-		if(this.version == null){
-			this.version = readUnsignedByteString();
-		}
-	}
-	
-	private TGSong read(){
-		TGSong song = this.factory.newSong();
-		
-		//leo el nombre
-		song.setName(readUnsignedByteString());
-		
-		//leo el artista
-		song.setArtist(readUnsignedByteString());
-		
-		//leo el album
-		song.setAlbum(readUnsignedByteString());
-		
-		//leo el autor
-		song.setAuthor(readUnsignedByteString());
-		
-		//leo la fecha
-		song.setDate(readUnsignedByteString());
-		
-		//leo el copyright
-		song.setCopyright(readUnsignedByteString());
-		
-		//leo el creador
-		song.setWriter(readUnsignedByteString());
-		
-		//leo el transcriptor
-		song.setTranscriber(readUnsignedByteString());
-		
-		//leo los comentarios
-		song.setComments(readIntegerString());
-		
-		//leo la cantidad de canales
-		int channelCount = readByte();
-		
-		//leo las canales
-		for(int i = 0;i < channelCount;i++){
-			TGChannel channel = this.factory.newChannel();
-			readChannel(channel);
-			song.addChannel(channel);
-		}
-		
-		//leo la cantidad de measure headers
-		int headerCount = readShort();
-		
-		//leo las pistas
-		TGMeasureHeader lastHeader = null;
-		long headerStart = TGDuration.QUARTER_TIME;
-		for(int i = 0;i < headerCount;i++){
-			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
-			song.addMeasureHeader(header);
-			headerStart += header.getLength();
-			lastHeader = header;
-		}
-		
-		//leo la cantidad de pistas
-		int trackCount = readByte();
-		
-		//leo las pistas
-		for(int i = 0;i < trackCount;i++){
-			song.addTrack(readTrack(i + 1,song));
-		}
-		
-		return song;
-	}
-	
-	private TGTrack readTrack(int number,TGSong song){
-		//header
-		int header = readHeader();
-		
-		TGTrack track = this.factory.newTrack();
-		
-		track.setNumber(number);
-		
-		//leo el nombre
-		track.setName(readUnsignedByteString());
-		
-		//leo el solo
-		track.setSolo((header & TRACK_SOLO) != 0);
-		
-		//leo el mute
-		track.setMute((header & TRACK_MUTE) != 0);
-		
-		//leo el id del canal
-		track.setChannelId(readShort());
-		
-		//leo la cantidad de compases
-		int measureCount = song.countMeasureHeaders();
-		
-		//leo los compases
-		TGMeasure lastMeasure = null;
-		for(int i = 0;i < measureCount;i++){
-			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
-			track.addMeasure(measure);
-			lastMeasure = measure;
-		}
-		
-		//leo la cantidad de cuerdas
-		int stringCount = readByte();
-		
-		//leo las cuerdas
-		for(int i = 0;i < stringCount;i++){
-			track.getStrings().add(readInstrumentString(i + 1));
-		}
-		
-		//leo el offset
-		track.setOffset(TGTrack.MIN_OFFSET + readByte());
-		
-		//leo el color
-		readRGBColor(track.getColor());
-		
-		//leo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			readLyrics(track.getLyrics());
-		}
-		
-		return track;
-	}
-	
-	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
-		int header = readHeader();
-		
-		TGMeasureHeader measureHeader = this.factory.newHeader();
-		measureHeader.setNumber(number);
-		measureHeader.setStart(start);
-		
-		//leo el time signature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			readTimeSignature(measureHeader.getTimeSignature());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
-		}
-		
-		//leo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			readTempo(measureHeader.getTempo());
-		}else if(lastMeasureHeader != null){
-			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
-		}
-		
-		//leo el comienzo de la repeticion
-		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
-		
-		//leo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			 measureHeader.setRepeatClose(readShort());
-		}
-		
-		//leo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			 measureHeader.setRepeatAlternative(readByte());
-		}
-		
-		//leo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			measureHeader.setMarker(readMarker(number));
-		}
-		
-		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			measureHeader.setTripletFeel(readByte());
-		}
-		
-		return measureHeader;
-	}
-	
-	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
-		int header = readHeader();
-		
-		TGMeasure measure = this.factory.newMeasure(measureHeader);
-		TGBeatData data = new TGBeatData(measure);
-		
-		//leo la los beats
-		readBeats(measure, data);
-		
-		//leo la clave
-		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
-		if(((header & MEASURE_CLEF) != 0)){
-			measure.setClef(readByte());
-		}
-		
-		//leo el key signature
-		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			measure.setKeySignature(readByte());
-		}
-		
-		return measure;
-	}
-	
-	private void readChannel(TGChannel channel){
-		//leo el id
-		channel.setChannelId(readShort());
-		
-		//leo el canal
-		channel.setChannel(readByte());
-		
-		//leo el canal de efectos
-		channel.setEffectChannel(readByte());
-		
-		//leo el banco de sonidos
-		channel.setBank(readByte());
-		
-		//leo el programa
-		channel.setProgram(readByte());
-		
-		//leo el volumen
-		channel.setVolume(readByte());
-		
-		//leo el balance
-		channel.setBalance(readByte());
-		
-		//leo el chorus
-		channel.setChorus(readByte());
-		
-		//leo el reverb
-		channel.setReverb(readByte());
-		
-		//leo el phaser
-		channel.setPhaser(readByte());
-		
-		//leo el tremolo
-		channel.setTremolo(readByte());
-
-		//leo el nombre
-		channel.setName(readUnsignedByteString());
-	}
-	
-	private void readBeats(TGMeasure measure,TGBeatData data){
-		int header = BEAT_HAS_NEXT;
-		while(((header & BEAT_HAS_NEXT) != 0)){
-			header = readHeader();
-			readBeat(header, measure, data);
-		}
-	}
-	
-	private void readBeat(int header, TGMeasure measure,TGBeatData data){
-		TGBeat beat = this.factory.newBeat();
-		
-		beat.setStart(data.getCurrentStart());
-		
-		readVoices(header, beat, data);
-		
-		//leo el stroke
-		if(((header & BEAT_HAS_STROKE) != 0)){
-			readStroke(beat.getStroke());
-		}
-		
-		//leo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			readChord(beat);
-		}
-		
-		//leo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			readText(beat);
-		}
-		
-		measure.addBeat(beat);
-	}
-	
-	private void readVoices(int header, TGBeat beat, TGBeatData data){
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			
-			beat.getVoice(i).setEmpty(true);
-			
-			if(((header & (BEAT_HAS_VOICE << shift)) != 0)){
-				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
-					data.getVoice(i).setFlags( readHeader() );
-				}
-				
-				int flags = data.getVoice(i).getFlags();
-				
-				//leo la duracion
-				if(((flags & VOICE_NEXT_DURATION) != 0)){
-					readDuration(data.getVoice(i).getDuration());
-				}
-				
-				//leo las notas
-				if(((flags & VOICE_HAS_NOTES) != 0)){
-					readNotes(beat.getVoice(i), data);
-				}
-				
-				//leo la direccion
-				if(((flags & VOICE_DIRECTION_UP) != 0)){
-					beat.getVoice(i).setDirection( TGVoice.DIRECTION_UP );
-				}
-				else if(((flags & VOICE_DIRECTION_DOWN) != 0)){
-					beat.getVoice(i).setDirection( TGVoice.DIRECTION_DOWN );
-				}
-				data.getVoice(i).getDuration().copy(beat.getVoice(i).getDuration());
-				data.getVoice(i).setStart(data.getVoice(i).getStart() + beat.getVoice(i).getDuration().getTime());
-				
-				beat.getVoice(i).setEmpty(false);
-			}
-		}
-	}
-	
-	private void readNotes(TGVoice voice,TGBeatData data){
-		int header = NOTE_HAS_NEXT;
-		while(((header & NOTE_HAS_NEXT) != 0)){
-			header = readHeader();
-			readNote(header, voice, data);
-		}
-	}
-	
-	private void readNote(int header,TGVoice voice,TGBeatData data){
-		TGNote note = this.factory.newNote();
-		
-		//leo el valor
-		note.setValue(readByte());
-		
-		//leo la cuerda
-		note.setString(readByte());
-		
-		//leo la ligadura
-		note.setTiedNote((header & NOTE_TIED) != 0);
-		
-		//leo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			data.getVoice(voice.getIndex()).setVelocity(readByte());
-		}
-		note.setVelocity(data.getVoice(voice.getIndex()).getVelocity());
-		
-		//leo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			readNoteEffect(note.getEffect());
-		}
-		
-		voice.addNote(note);
-	}
-	
-	private void readChord(TGBeat beat){
-		TGChord chord = this.factory.newChord(readByte());
-		
-		//leo el nombre
-		chord.setName( readUnsignedByteString() );
-		
-		//leo el primer fret
-		chord.setFirstFret(readByte());
-		
-		//leo las cuerdas
-		for(int string = 0; string < chord.countStrings(); string ++){
-			chord.addFretValue(string, readByte());
-		}
-		beat.setChord(chord);
-	}
-	
-	private void readText(TGBeat beat){
-		TGText text = this.factory.newText();
-		
-		//leo el texto
-		text.setValue(readUnsignedByteString());
-		
-		beat.setText(text);
-	}
-	
-	private TGString readInstrumentString(int number){
-		TGString string = this.factory.newString();
-		
-		string.setNumber(number);
-		
-		//leo el valor
-		string.setValue(readByte());
-		
-		return string;
-	}
-	
-	private void readTempo(TGTempo tempo){
-		//leo el valor
-		tempo.setValue(readShort());
-	}
-	
-	private void readTimeSignature(TGTimeSignature timeSignature){
-		//leo el numerador
-		timeSignature.setNumerator(readByte());
-		
-		//leo el denominador
-		readDuration(timeSignature.getDenominator());
-	}
-	
-	private void readDuration(TGDuration duration){
-		int header = readHeader();
-		
-		// leo el puntillo
-		duration.setDotted((header & DURATION_DOTTED) != 0);
-		
-		//leo el doble puntillo
-		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
-		
-		//leo el valor
-		duration.setValue(readByte());
-		
-		//leo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			readDivisionType(duration.getDivision());
-		}
-		else{
-			TGDivisionType.NORMAL.copy(duration.getDivision());
-		}
-	}
-	
-	private void readDivisionType(TGDivisionType divisionType){
-		//leo los enters
-		divisionType.setEnters(readByte());
-		
-		//leo los tiempos
-		divisionType.setTimes(readByte());
-	}
-	
-	private void readStroke(TGStroke stroke){
-		//leo la direccion
-		stroke.setDirection( readByte() );
-		
-		//leo el valor
-		stroke.setValue( readByte() );
-	}
-	
-	private void readNoteEffect(TGNoteEffect effect){
-		int header = readHeader(3);
-		
-		//leo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			effect.setBend(readBendEffect());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			effect.setTremoloBar(readTremoloBarEffect());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			effect.setHarmonic(readHarmonicEffect());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			effect.setGrace(readGraceEffect());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			effect.setTrill(readTrillEffect());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			effect.setTremoloPicking(readTremoloPickingEffect());
-		}
-		
-		//vibrato
-		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
-		
-		//dead note
-		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
-		
-		//slide
-		effect.setSlide(((header & EFFECT_SLIDE) != 0));
-		
-		//hammer-on/pull-off
-		effect.setHammer(((header & EFFECT_HAMMER) != 0));
-		
-		//ghost note
-		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
-		
-		//accentuated note
-		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
-		
-		//heavy accentuated note
-		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
-		
-		//palm mute
-		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
-		
-		//staccato
-		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
-		
-		//tapping
-		effect.setTapping(((header & EFFECT_TAPPING) != 0));
-		
-		//slapping
-		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
-		
-		//popping
-		effect.setPopping(((header & EFFECT_POPPING) != 0));
-		
-		//fade in
-		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
-		
-		//let ring
-		effect.setLetRing(((header & EFFECT_LET_RING) != 0));
-	}
-	
-	private TGEffectBend readBendEffect(){
-		TGEffectBend bend = this.factory.newEffectBend();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value = readByte();
-			
-			//agrego el punto
-			bend.addPoint(position,value);
-		}
-		return bend;
-	}
-	
-	private TGEffectTremoloBar readTremoloBarEffect(){
-		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
-		
-		//leo la cantidad de puntos
-		int count = readByte();
-		
-		for(int i = 0;i < count;i++){
-			//leo la posicion
-			int position = readByte();
-			
-			//leo el valor
-			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
-			
-			//agrego el punto
-			tremoloBar.addPoint(position,value);
-		}
-		return tremoloBar;
-	}
-	
-	private TGEffectHarmonic readHarmonicEffect(){
-		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
-		
-		//leo el tipo
-		effect.setType(readByte());
-		
-		//leo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			effect.setData(readByte());
-		}
-		return effect;
-	}
-	
-	private TGEffectGrace readGraceEffect(){
-		int header = readHeader();
-		
-		TGEffectGrace effect = this.factory.newEffectGrace();
-		
-		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
-		
-		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.setDuration(readByte());
-		
-		//leo el velocity
-		effect.setDynamic(readByte());
-		
-		//leo la transicion
-		effect.setTransition(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTremoloPicking readTremoloPickingEffect(){
-		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGEffectTrill readTrillEffect(){
-		TGEffectTrill effect = this.factory.newEffectTrill();
-		
-		//leo el fret
-		effect.setFret(readByte());
-		
-		//leo la duracion
-		effect.getDuration().setValue(readByte());
-		
-		return effect;
-	}
-	
-	private TGMarker readMarker(int measure){
-		TGMarker marker = this.factory.newMarker();
-		
-		marker.setMeasure(measure);
-		
-		//leo el titulo
-		marker.setTitle(readUnsignedByteString());
-		
-		//leo el color
-		readRGBColor(marker.getColor());
-		
-		return marker;
-	}
-	
-	private void readRGBColor(TGColor color){
-		//leo el RGB
-		color.setR((readByte() & 0xff));
-		color.setG((readByte() & 0xff));
-		color.setB((readByte() & 0xff));
-	}
-	
-	private void readLyrics(TGLyric lyrics){
-		//leo el compas de comienzo
-		lyrics.setFrom(readShort());
-		
-		//leo el texto
-		lyrics.setLyrics(readIntegerString());
-	}
-	
-	private byte readByte(){
-		try {
-			return (byte)this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(){
-		try {
-			return this.dataInputStream.read();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private int readHeader(int bCount){
-		int header = 0;
-		for(int i = bCount; i > 0; i --){
-			header += ( readHeader() << ( (8 * i) - 8 ) );
-		}
-		return header;
-	}
-	
-	private short readShort(){
-		try {
-			return this.dataInputStream.readShort();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return 0;
-	}
-	
-	private String readUnsignedByteString(){
-		try {
-			return readString( (this.dataInputStream.read() & 0xFF ));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readIntegerString(){
-		try {
-			return readString(this.dataInputStream.readInt());
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	private String readString(int length){
-		try {
-			char[] chars = new char[length];
-			for(int i = 0;i < chars.length; i++){
-				chars[i] = this.dataInputStream.readChar();
-			}
-			return String.copyValueOf(chars);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGOutputStream.java b/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGOutputStream.java
deleted file mode 100644
index 77027c05..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGOutputStream.java
+++ /dev/null
@@ -1,724 +0,0 @@
-/*
- * Created on 16-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.io.tg;
-
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGOutputStreamBase;
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TGOutputStream extends TGStream implements TGOutputStreamBase{
-	
-	private DataOutputStream dataOutputStream;
-	
-	public boolean isSupportedExtension(String extension) {
-		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
-	}
-	
-	public void init(TGFactory factory,OutputStream stream) {
-		this.dataOutputStream = new DataOutputStream(stream);
-	}
-	
-	public TGFileFormat getFileFormat(){
-		return new TGFileFormat("TuxGuitar","*.tg");
-	}
-	
-	public void writeSong(TGSong song) throws IOException{
-		this.writeVersion();
-		this.write(song);
-		this.dataOutputStream.flush();
-		this.dataOutputStream.close();
-	}
-	
-	private void writeVersion(){
-		writeUnsignedByteString(TG_FORMAT_VERSION);
-	}
-	
-	private void write(TGSong song){
-		//escribo el nombre
-		writeUnsignedByteString(song.getName());
-		
-		//escribo el artista
-		writeUnsignedByteString(song.getArtist());
-		
-		//escribo el album
-		writeUnsignedByteString(song.getAlbum());
-		
-		//escribo el autor
-		writeUnsignedByteString(song.getAuthor());
-		
-		//escribo la fecha
-		writeUnsignedByteString(song.getDate());
-		
-		//escribo el copyright
-		writeUnsignedByteString(song.getCopyright());
-		
-		//escribo el creador
-		writeUnsignedByteString(song.getWriter());
-		
-		//escribo el transcriptor
-		writeUnsignedByteString(song.getTranscriber());
-		
-		//escribo los comentarios
-		writeIntegerString(song.getComments());
-		
-		//escribo la cantidad de canales
-		writeByte(song.countChannels());
-		
-		//escribo las canales
-		for(int i = 0;i < song.countChannels();i++){
-			writeChannel(song.getChannel(i));
-		}
-		
-		//escribo la cantidad de measure headers 
-		writeShort((short)song.countMeasureHeaders());
-		
-		//escribo las pistas
-		TGMeasureHeader lastHeader = null;
-		Iterator headers = song.getMeasureHeaders();
-		while(headers.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)headers.next();
-			writeMeasureHeader(header,lastHeader);
-			lastHeader = header;
-		}
-		
-		//escribo la cantidad de pistas
-		writeByte(song.countTracks());
-		
-		//escribo las pistas
-		for(int i = 0;i < song.countTracks();i++){
-			writeTrack(song.getTrack(i));
-		}
-	}
-	
-	private void writeTrack(TGTrack track){
-		//header
-		int header = 0;
-		if (track.isSolo()) {
-			header |= TRACK_SOLO;
-		}
-		if (track.isMute()) {
-			header |= TRACK_MUTE;
-		}
-		if(!track.getLyrics().isEmpty()){
-			header |= TRACK_LYRICS;
-		}
-		writeHeader(header);
-		
-		//escribo el nombre
-		writeUnsignedByteString(track.getName());
-		
-		//escribo el id del canal
-		writeShort((short)track.getChannelId());
-		
-		//escribo los compases
-		TGMeasure lastMeasure = null;
-		Iterator measures  = track.getMeasures();
-		while(measures.hasNext()){
-			TGMeasure measure = (TGMeasure)measures.next();
-			writeMeasure(measure,lastMeasure);
-			lastMeasure = measure;
-		}
-		
-		//escribo la cantidad de cuerdas 
-		writeByte(track.getStrings().size());
-		
-		//escribo las cuerdas
-		Iterator stringIt  = track.getStrings().iterator();
-		while(stringIt.hasNext()){
-			TGString string = (TGString)stringIt.next();
-			writeInstrumentString(string);
-		}
-		
-		//escribo el offset
-		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
-		
-		//escribo el color
-		writeRGBColor(track.getColor());
-		
-		//escribo el lyrics
-		if(((header & TRACK_LYRICS) != 0)){
-			writeLyrics(track.getLyrics());
-		}
-	}
-	
-	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
-		int header = 0;
-		if(lastMeasureHeader == null){
-			header |= MEASURE_HEADER_TIMESIGNATURE;
-			header |= MEASURE_HEADER_TEMPO;
-			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}else{
-			//Time Signature
-			int numerator = measureheader.getTimeSignature().getNumerator();
-			int value = measureheader.getTimeSignature().getDenominator().getValue();
-			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
-			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
-			if(numerator != prevNumerator || value != prevValue){
-				header |= MEASURE_HEADER_TIMESIGNATURE;
-			}
-			//Tempo
-			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
-				header |= MEASURE_HEADER_TEMPO;
-			}
-			//Triplet Feel
-			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
-				header |= MEASURE_HEADER_TRIPLET_FEEL;
-			}
-		}
-		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
-		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
-		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
-		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
-		
-		writeHeader(header);
-		
-		//escribo el timeSignature
-		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
-			writeTimeSignature(measureheader.getTimeSignature());
-		}
-		
-		//escribo el tempo
-		if(((header & MEASURE_HEADER_TEMPO) != 0)){
-			writeTempo(measureheader.getTempo());
-		}
-		
-		//escribo el numero de repeticiones
-		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
-			writeShort((short)measureheader.getRepeatClose());
-		}
-		
-		//escribo los finales alternativos
-		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
-			writeByte(measureheader.getRepeatAlternative());
-		}
-		
-		//escribo el marker
-		if(((header & MEASURE_HEADER_MARKER) != 0)){
-			writeMarker(measureheader.getMarker());
-		}
-		
-		//escribo el triplet feel
-		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
-			writeByte(measureheader.getTripletFeel());
-		}
-	}
-	
-	private void writeMeasure(TGMeasure measure,TGMeasure lastMeasure){
-		int header = 0;
-		if(lastMeasure == null){
-			header |= MEASURE_CLEF;
-			header |= MEASURE_KEYSIGNATURE;
-		}else{
-			//Clef
-			if(measure.getClef() != lastMeasure.getClef()){
-				header |= MEASURE_CLEF;
-			}
-			//KeySignature
-			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
-				header |= MEASURE_KEYSIGNATURE;
-			}
-		}
-		//escribo la cabecera
-		writeHeader(header);
-		
-		//escribo los beats
-		TGBeatData data = new TGBeatData(measure);
-		writeBeats(measure, data);
-		
-		//escribo la clave
-		if(((header & MEASURE_CLEF) != 0)){
-			writeByte(measure.getClef());
-		}
-		
-		//escribo el key signature
-		if(((header & MEASURE_KEYSIGNATURE) != 0)){
-			writeByte(measure.getKeySignature());
-		}
-	}
-	
-	private void writeChannel(TGChannel channel){
-		//escribo el id
-		writeShort((short)channel.getChannelId());
-		
-		//escribo el canal
-		writeByte(channel.getChannel());
-		
-		//escribo el canal de efectos
-		writeByte(channel.getEffectChannel());
-
-		//escribo el banco de sonidos
-		writeByte(channel.getBank());
-		
-		//escribo el programa
-		writeByte(channel.getProgram());
-		
-		//escribo el volumen
-		writeByte(channel.getVolume());
-		
-		//escribo el balance
-		writeByte(channel.getBalance());
-		
-		//escribo el chorus
-		writeByte(channel.getChorus());
-		
-		//escribo el reverb
-		writeByte(channel.getReverb());
-		
-		//escribo el phaser
-		writeByte(channel.getPhaser());
-		
-		//escribo el tremolo
-		writeByte(channel.getTremolo());
-		
-		//escribo el nombre
-		writeUnsignedByteString(channel.getName());
-	}
-	
-	private void writeBeats(TGMeasure measure,TGBeatData data){
-		int count = measure.countBeats();
-		for(int i = 0; i < count; i ++){
-			TGBeat beat = measure.getBeat(i);
-			writeBeat(beat,data, (i + 1 < count ));
-		}
-	}
-	
-	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
-		int header = hasNext ? BEAT_HAS_NEXT : 0;
-		
-		//Berifico si hay cambios en las voces
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			if(!beat.getVoice(i).isEmpty()){
-				header |= ( BEAT_HAS_VOICE << shift ); 
-				
-				int flags = ( beat.getVoice(i).isRestVoice() ? 0 : VOICE_HAS_NOTES );
-				if(!beat.getVoice(i).getDuration().isEqual(data.getVoice(i).getDuration())){
-					flags |= VOICE_NEXT_DURATION;
-					data.getVoice(i).setDuration(beat.getVoice(i).getDuration());
-				}
-				if(beat.getVoice(i).getDirection() != TGVoice.DIRECTION_NONE ){
-					if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_UP ){
-						flags |= VOICE_DIRECTION_UP;
-					}
-					else if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_DOWN ){
-						flags |= VOICE_DIRECTION_DOWN;
-					}
-				}
-				if( data.getVoice(i).getFlags() != flags ){
-					header |= ( BEAT_HAS_VOICE_CHANGES << shift ); 
-					data.getVoice(i).setFlags( flags );
-				}
-			}
-			
-		}
-		//Berifico si tiene stroke
-		if(beat.getStroke().getDirection() != TGStroke.STROKE_NONE){
-			header |= BEAT_HAS_STROKE;
-		}
-		//Berifico si tiene acorde
-		if(beat.getChord() != null){
-			header |= BEAT_HAS_CHORD;
-		}
-		//Berifico si tiene texto
-		if(beat.getText() != null){
-			header |= BEAT_HAS_TEXT;
-		}
-		
-		// escribo la cabecera
-		writeHeader(header);
-		
-		//escribo las voces
-		writeVoices(header, beat, data);
-		
-		//escribo el stroke
-		if(((header & BEAT_HAS_STROKE) != 0)){
-			writeStroke(beat.getStroke());
-		}
-		
-		//escribo el acorde
-		if(((header & BEAT_HAS_CHORD) != 0)){
-			writeChord(beat.getChord());
-		}
-		
-		//escribo el texto
-		if(((header & BEAT_HAS_TEXT) != 0)){
-			writeText(beat.getText());
-		}
-	}
-	
-	private void writeVoices(int header, TGBeat beat,TGBeatData data){
-		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
-			int shift = (i * 2 );
-			if((( header & (BEAT_HAS_VOICE << shift)) != 0)){
-				
-				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
-					writeHeader( data.getVoice(i).getFlags() );
-				}
-				
-				//escribo la duracion
-				if((( data.getVoice(i).getFlags() & VOICE_NEXT_DURATION) != 0)){
-					writeDuration(beat.getVoice(i).getDuration());
-				}
-				
-				//escribo las notas
-				if((( data.getVoice(i).getFlags() & VOICE_HAS_NOTES) != 0)){
-					writeNotes(beat.getVoice(i), data);
-				}
-			}
-		}
-	}
-	
-	private void writeNotes(TGVoice voice,TGBeatData data){
-		for( int i = 0 ; i < voice.countNotes() ; i ++){
-			TGNote note = voice.getNote(i);
-			
-			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
-			header = (note.isTiedNote())?header |= NOTE_TIED:header;
-			if(note.getVelocity() != data.getVoice(voice.getIndex()).getVelocity()){
-				data.getVoice(voice.getIndex()).setVelocity(note.getVelocity());
-				header |= NOTE_VELOCITY;
-			}
-			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
-			
-			writeHeader(header);
-			
-			writeNote(header,note);
-		}
-	}
-	
-	private void writeNote(int header,TGNote note){
-		//escribo el valor
-		writeByte(note.getValue());
-		
-		//escribo la cuerda
-		writeByte(note.getString());
-		
-		//escribo el velocity
-		if(((header & NOTE_VELOCITY) != 0)){
-			writeByte(note.getVelocity());
-		}
-		
-		//escribo los efectos
-		if(((header & NOTE_EFFECT) != 0)){
-			writeNoteEffect(note.getEffect());
-		}
-	}
-	
-	private void writeStroke(TGStroke stroke){
-		//escribo la direccion
-		writeByte(stroke.getDirection());
-		
-		//escribo el valor
-		writeByte(stroke.getValue());
-	}
-	
-	private void writeChord(TGChord chord){
-		//escribo la cantidad de cuerdas
-		writeByte(chord.countStrings());
-		
-		//escribo el nombre
-		writeUnsignedByteString(chord.getName());
-		
-		//escribo el primer fret
-		writeByte(chord.getFirstFret());
-		
-		//escribo el valor de cada cuerda
-		for(int string = 0; string < chord.countStrings(); string ++){
-			writeByte(chord.getFretValue(string));
-		}
-	}
-	
-	private void writeText(TGText text){
-		//escribo el texto
-		writeUnsignedByteString(text.getValue());
-	}
-	
-	private void writeInstrumentString(TGString string){
-		//escribo el valor
-		writeByte(string.getValue());
-	}
-	
-	private void writeTempo(TGTempo tempo){
-		//escribo el valor
-		writeShort((short)tempo.getValue());
-	}
-	
-	private void writeTimeSignature(TGTimeSignature timeSignature){
-		//escribo el numerador
-		writeByte(timeSignature.getNumerator());
-		
-		//escribo el denominador
-		writeDuration(timeSignature.getDenominator());
-	}
-	
-	private void writeDuration(TGDuration duration){
-		int header = 0;
-		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
-		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
-		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLET:header;
-		writeHeader(header);
-		
-		//escribo el valor
-		writeByte(duration.getValue());
-		
-		//escribo el tipo de divisiones
-		if(((header & DURATION_NO_TUPLET) != 0)){
-			writeDivisionType(duration.getDivision());
-		}
-	}
-	
-	private void writeDivisionType(TGDivisionType divisionType){
-		//escribo los enters
-		writeByte(divisionType.getEnters());
-		
-		//escribo los tiempos
-		writeByte(divisionType.getTimes());
-	}
-	
-	private void writeNoteEffect(TGNoteEffect effect){
-		int header = 0;
-		
-		header = (effect.isBend())?header |= EFFECT_BEND:header;
-		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
-		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
-		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
-		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
-		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
-		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
-		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
-		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
-		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
-		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
-		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
-		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
-		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
-		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
-		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
-		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
-		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
-		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
-		header = (effect.isLetRing())?header |= EFFECT_LET_RING:header;
-		
-		writeHeader(header,3);
-		
-		//escribo el bend
-		if(((header & EFFECT_BEND) != 0)){
-			writeBendEffect(effect.getBend());
-		}
-		
-		//leo el tremolo bar
-		if(((header & EFFECT_TREMOLO_BAR) != 0)){
-			writeTremoloBarEffect(effect.getTremoloBar());
-		}
-		
-		//leo el harmonic
-		if(((header & EFFECT_HARMONIC) != 0)){
-			writeHarmonicEffect(effect.getHarmonic());
-		}
-		
-		//leo el grace
-		if(((header & EFFECT_GRACE) != 0)){
-			writeGraceEffect(effect.getGrace());
-		}
-		
-		//leo el trill
-		if(((header & EFFECT_TRILL) != 0)){
-			writeTrillEffect(effect.getTrill());
-		}
-		
-		//leo el tremolo picking
-		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
-			writeTremoloPickingEffect(effect.getTremoloPicking());
-		}
-	}
-	
-	private void writeBendEffect(TGEffectBend effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte(point.getValue());
-		}
-	}
-	
-	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
-		//escribo la cantidad de puntos
-		writeByte(effect.getPoints().size());
-		
-		Iterator it = effect.getPoints().iterator();
-		while(it.hasNext()){
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint)it.next();
-			
-			//escribo la posicion
-			writeByte(point.getPosition());
-			
-			//escribo el valor
-			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
-		}
-	}
-	
-	private void writeHarmonicEffect(TGEffectHarmonic effect){
-		//excribo el tipo
-		writeByte(effect.getType());
-		
-		//excribo la data
-		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
-			writeByte(effect.getData());
-		}
-	}
-	
-	private void writeGraceEffect(TGEffectGrace effect){
-		int header = 0;
-		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
-		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
-		
-		//excribo el header
-		writeHeader(header);
-		
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration());
-		
-		//excribo el velocity
-		writeByte(effect.getDynamic());
-		
-		//excribo la transicion
-		writeByte(effect.getTransition());
-	}
-	
-	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeTrillEffect(TGEffectTrill effect){
-		//excribo el fret
-		writeByte(effect.getFret());
-		
-		//excribo la duracion
-		writeByte(effect.getDuration().getValue());
-	}
-	
-	private void writeMarker(TGMarker marker){
-		//escribo el titulo
-		writeUnsignedByteString(marker.getTitle());
-		
-		//escribo el color
-		writeRGBColor(marker.getColor());
-	}
-	
-	private void writeRGBColor(TGColor color){
-		//escribo el RGB
-		writeByte(color.getR());
-		writeByte(color.getG());
-		writeByte(color.getB());
-	}
-	
-	private void writeLyrics(TGLyric lyrics){
-		//escribo el compas de comienzo
-		writeShort((short)lyrics.getFrom());
-		
-		//escribo el texto
-		writeIntegerString(lyrics.getLyrics());
-	}
-	
-	public void writeByte(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeUnsignedByteString(String v){
-		try {
-			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
-			this.dataOutputStream.write(byteString.length());
-			this.dataOutputStream.writeChars(byteString);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	private void writeIntegerString(String v){
-		try {
-			this.dataOutputStream.writeInt(v.length());
-			this.dataOutputStream.writeChars(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v){
-		try {
-			this.dataOutputStream.write(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-	
-	public void writeHeader(int v,int bCount){
-		for(int i = bCount; i > 0; i --){
-			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
-		}
-	}
-	
-	public void writeShort(short v){
-		try {
-			this.dataOutputStream.writeShort(v);
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGStream.java b/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGStream.java
deleted file mode 100644
index f66486bd..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/io/tg/TGStream.java
+++ /dev/null
@@ -1,205 +0,0 @@
-package org.herac.tuxguitar.io.tg;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGVelocities;
-import org.herac.tuxguitar.util.TGVersion;
-
-public class TGStream {
-	
-	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
-	
-	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + TGVersion.CURRENT.getVersion() );
-	
-	public static final String TG_FORMAT_EXTENSION = (".tg");
-	
-	protected static final int TRACK_SOLO = 0x01;
-	
-	protected static final int TRACK_MUTE = 0x02;
-	
-	protected static final int TRACK_LYRICS = 0x04;
-	
-	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
-	
-	protected static final int MEASURE_HEADER_TEMPO = 0x02;
-	
-	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
-	
-	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
-	
-	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
-	
-	protected static final int MEASURE_HEADER_MARKER = 0x20;
-	
-	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
-	
-	protected static final int MEASURE_CLEF = 0x01;
-	
-	protected static final int MEASURE_KEYSIGNATURE = 0x02;
-	
-	protected static final int BEAT_HAS_NEXT = 0x01;
-	
-	protected static final int BEAT_HAS_STROKE = 0x02;
-	
-	protected static final int BEAT_HAS_CHORD = 0x04;
-	
-	protected static final int BEAT_HAS_TEXT = 0x08;
-	
-	protected static final int BEAT_HAS_VOICE = 0x10;
-	
-	protected static final int BEAT_HAS_VOICE_CHANGES = 0x20;
-	
-	protected static final int VOICE_HAS_NOTES = 0x01;
-	
-	protected static final int VOICE_NEXT_DURATION = 0x02;
-	
-	protected static final int VOICE_DIRECTION_UP = 0x04;
-	
-	protected static final int VOICE_DIRECTION_DOWN = 0x08;
-	
-	protected static final int NOTE_HAS_NEXT = 0x01;
-	
-	protected static final int NOTE_TIED = 0x02;
-	
-	protected static final int NOTE_EFFECT = 0x04;
-	
-	protected static final int NOTE_VELOCITY = 0x08;
-	
-	protected static final int DURATION_DOTTED = 0x01;
-	
-	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
-	
-	protected static final int DURATION_NO_TUPLET = 0x04;
-	
-	protected static final int EFFECT_BEND = 0x000001;
-	
-	protected static final int EFFECT_TREMOLO_BAR = 0x000002;
-	
-	protected static final int EFFECT_HARMONIC = 0x000004;
-	
-	protected static final int EFFECT_GRACE = 0x000008;
-	
-	protected static final int EFFECT_TRILL = 0x000010;
-	
-	protected static final int EFFECT_TREMOLO_PICKING = 0x000020;
-	
-	protected static final int EFFECT_VIBRATO = 0x000040;
-	
-	protected static final int EFFECT_DEAD = 0x000080;
-	
-	protected static final int EFFECT_SLIDE = 0x000100;
-	
-	protected static final int EFFECT_HAMMER = 0x000200;
-	
-	protected static final int EFFECT_GHOST = 0x000400;
-	
-	protected static final int EFFECT_ACCENTUATED = 0x000800;
-	
-	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x001000;
-	
-	protected static final int EFFECT_PALM_MUTE = 0x002000;
-	
-	protected static final int EFFECT_STACCATO = 0x004000;
-	
-	protected static final int EFFECT_TAPPING = 0x008000;
-	
-	protected static final int EFFECT_SLAPPING = 0x010000;
-	
-	protected static final int EFFECT_POPPING = 0x020000;
-	
-	protected static final int EFFECT_FADE_IN = 0x040000;
-	
-	protected static final int EFFECT_LET_RING = 0x080000;
-	
-	protected static final int GRACE_FLAG_DEAD = 0x01;
-	
-	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
-	
-	protected class TGBeatData {
-		private long currentStart;
-		private TGVoiceData[] voices;
-		
-		protected TGBeatData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.currentStart = measure.getStart();
-			this.voices = new TGVoiceData[TGBeat.MAX_VOICES];
-			for(int i = 0 ; i < this.voices.length ; i ++ ){
-				this.voices[i] = new TGVoiceData(measure);
-			}
-		}
-		
-		protected TGVoiceData getVoice(int index){
-			return this.voices[index];
-		}
-		
-		public long getCurrentStart(){
-			long minimumStart = -1;
-			for(int i = 0 ; i < this.voices.length ; i ++ ){
-				if( this.voices[i].getStart() > this.currentStart ){
-					if( minimumStart < 0 || this.voices[i].getStart() < minimumStart ){
-						minimumStart = this.voices[i].getStart();
-					}
-				}
-			}
-			if( minimumStart > this.currentStart ){
-				this.currentStart = minimumStart;
-			}
-			return this.currentStart;
-		}
-	}
-	
-	protected class TGVoiceData {
-		private long start;
-		private int velocity;
-		private int flags;
-		private TGDuration duration;
-		
-		protected TGVoiceData(TGMeasure measure){
-			this.init(measure);
-		}
-		
-		private void init(TGMeasure measure){
-			this.flags = 0;
-			this.setStart(measure.getStart());
-			this.setVelocity(TGVelocities.DEFAULT);
-			this.setDuration(new TGFactory().newDuration());
-		}
-		
-		public TGDuration getDuration() {
-			return this.duration;
-		}
-		
-		public void setDuration(TGDuration duration) {
-			this.duration = duration;
-		}
-		
-		public long getStart() {
-			return this.start;
-		}
-		
-		public void setStart(long start) {
-			this.start = start;
-		}
-		
-		public int getVelocity() {
-			return this.velocity;
-		}
-		
-		public void setVelocity(int velocity) {
-			this.velocity = velocity;
-		}
-		
-		public int getFlags() {
-			return this.flags;
-		}
-		
-		public void setFlags(int flags) {
-			this.flags = flags;
-		}
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java b/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
deleted file mode 100644
index eafe976c..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiOutputPortProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.herac.tuxguitar.player.base;
-
-import java.util.List;
-
-public interface MidiOutputPortProvider {
-	
-	public List listPorts() throws MidiPlayerException;
-	
-	public void closeAll() throws MidiPlayerException;
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiRepeatController.java b/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiRepeatController.java
deleted file mode 100644
index f154d754..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiRepeatController.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.herac.tuxguitar.player.base;
-
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGSong;
-
-public class MidiRepeatController {
-	
-	private TGSong song;
-	private int count;
-	private int index;
-	private int lastIndex;	
-	private boolean shouldPlay;	
-	private boolean repeatOpen;
-	private long repeatStart;
-	private long repeatEnd;
-	private long repeatMove;
-	private int repeatStartIndex;
-	private int repeatNumber;
-	private int repeatAlternative;
-	private int sHeader;
-	private int eHeader;
-	
-	public MidiRepeatController(TGSong song, int sHeader , int eHeader){
-		this.song = song;
-		this.sHeader = sHeader;
-		this.eHeader = eHeader;
-		this.count = song.countMeasureHeaders();
-		this.index = 0;
-		this.lastIndex = -1;
-		this.shouldPlay = true;
-		this.repeatOpen = true;
-		this.repeatAlternative = 0;
-		this.repeatStart = TGDuration.QUARTER_TIME;
-		this.repeatEnd = 0;
-		this.repeatMove = 0;
-		this.repeatStartIndex = 0;
-		this.repeatNumber = 0;
-	}
-	
-	public void process(){
-		TGMeasureHeader header = this.song.getMeasureHeader(this.index);
-		
-		//Verifica si el compas esta dentro del rango.
-		if( (this.sHeader != -1 && header.getNumber() < this.sHeader) || ( this.eHeader != -1 && header.getNumber() > this.eHeader ) ){
-			this.shouldPlay = false;
-			this.index ++;
-			return;
-		}
-		
-		//Abro repeticion siempre para el primer compas.
-		if( (this.sHeader != -1 && header.getNumber() == this.sHeader ) || header.getNumber() == 1 ){
-			this.repeatStartIndex = this.index;
-			this.repeatStart = header.getStart();
-			this.repeatOpen = true;
-		}
-		
-		//Por defecto el compas deberia sonar
-		this.shouldPlay = true;
-		
-		//En caso de existir una repeticion nueva,
-		//guardo el indice de el compas donde empieza una repeticion
-		if (header.isRepeatOpen()) {
-			this.repeatStartIndex = this.index;
-			this.repeatStart = header.getStart();
-			this.repeatOpen = true;
-			
-			//Si es la primer vez que paso por este compas
-			//Pongo numero de repeticion y final alternativo en cero
-			if(this.index > this.lastIndex){
-				this.repeatNumber = 0;
-				this.repeatAlternative = 0;
-			}
-		}
-		else{
-			//verifico si hay un final alternativo abierto
-			if(this.repeatAlternative == 0){
-				this.repeatAlternative = header.getRepeatAlternative();
-			}
-			//Si estoy en un final alternativo.
-			//el compas solo puede sonar si el numero de repeticion coincide con el numero de final alternativo.
-			if (this.repeatOpen && (this.repeatAlternative > 0) && ((this.repeatAlternative & (1 << (this.repeatNumber))) == 0)){
-				this.repeatMove -= header.getLength();
-				if (header.getRepeatClose() >0){
-					this.repeatAlternative = 0;
-				}
-				this.shouldPlay = false;
-				this.index ++;
-				return;
-			}
-		}
-		
-		//antes de ejecutar una posible repeticion
-		//guardo el indice del ultimo compas tocado 
-		this.lastIndex = Math.max(this.lastIndex,this.index);
-		
-		//si hay una repeticion la hago
-		if (this.repeatOpen && header.getRepeatClose() > 0) {
-			if (this.repeatNumber < header.getRepeatClose() || (this.repeatAlternative > 0)) {
-				this.repeatEnd = header.getStart() + header.getLength();
-				this.repeatMove += this.repeatEnd - this.repeatStart;
-				this.index = this.repeatStartIndex - 1;
-				this.repeatNumber++;
-			} else{
-				this.repeatStart = 0;
-				this.repeatNumber = 0;
-				this.repeatEnd = 0;
-				this.repeatOpen = false;
-			}
-			this.repeatAlternative = 0;
-		}
-		
-		this.index ++;
-	}
-	
-	public boolean finished(){
-		return (this.index >= this.count);
-	}
-	
-	public boolean shouldPlay(){
-		return this.shouldPlay;
-	}
-	
-	public int getIndex(){
-		return this.index;
-	}
-	
-	public long getRepeatMove(){
-		return this.repeatMove;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerProvider.java b/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
deleted file mode 100644
index df2f5f1f..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/base/MidiSequencerProvider.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.herac.tuxguitar.player.base;
-
-import java.util.List;
-
-public interface MidiSequencerProvider {
-	
-	public List listSequencers() throws MidiPlayerException;
-	
-	public void closeAll() throws MidiPlayerException;
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java b/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
deleted file mode 100644
index 63b3dbd9..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiEvent.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.herac.tuxguitar.player.impl.sequencer;
-
-public class MidiEvent {
-	
-	public static final int ALL_TRACKS = -1;
-	
-	public static final int MIDI_SYSTEM_EVENT = 1;
-	public static final int MIDI_EVENT_NOTEON = 2;
-	public static final int MIDI_EVENT_NOTEOFF = 3;
-	public static final int MIDI_EVENT_PROGRAM_CHANGE = 4;
-	public static final int MIDI_EVENT_CONTROL_CHANGE = 5;
-	public static final int MIDI_EVENT_PITCH_BEND = 6;
-	
-	private long tick;
-	private int type;
-	private int track;
-	private byte[] data;
-	
-	public MidiEvent(long tick,int type,byte[] data){
-		this(tick,type,ALL_TRACKS,data);
-	}
-	
-	public MidiEvent(long tick,int type,int track,byte[] data){
-		this.tick = tick;
-		this.type = type;
-		this.track = track;
-		this.data = data;
-	}
-	
-	public long getTick() {
-		return this.tick;
-	}
-	
-	public int getType() {
-		return this.type;
-	}
-	
-	public int getTrack() {
-		return this.track;
-	}
-	
-	public byte[] getData() {
-		return this.data;
-	}
-	
-	public static MidiEvent systemReset(final long tick){
-		return new MidiEvent(tick,MIDI_SYSTEM_EVENT,ALL_TRACKS,null);
-	}
-	
-	public static MidiEvent noteOn(final long tick,final int track,final int channel,final int key,final int velocity){
-		return new MidiEvent(tick,MIDI_EVENT_NOTEON,track,new byte[]{(byte)channel,(byte)key,(byte)velocity});
-	}
-	
-	public static MidiEvent noteOff(final long tick,final int track,final int channel,final int key,final int velocity){
-		return new MidiEvent(tick,MIDI_EVENT_NOTEOFF,track,new byte[]{(byte)channel,(byte)key,(byte)velocity});
-	}
-	
-	public static MidiEvent controlChange(final long tick,final int track,final int channel,final int controller,final int value){
-		return new MidiEvent(tick,MIDI_EVENT_CONTROL_CHANGE,track,new byte[]{(byte)channel,(byte)controller,(byte)value});
-	}
-	
-	public static MidiEvent programChange(final long tick,final int track,final int channel,final int value){
-		return new MidiEvent(tick,MIDI_EVENT_PROGRAM_CHANGE,track,new byte[]{(byte)channel,(byte)value});
-	}
-	
-	public static MidiEvent pitchBend(final long tick,final int track,final int channel,final int value){
-		return new MidiEvent(tick,MIDI_EVENT_PITCH_BEND,track,new byte[]{(byte)channel,(byte)value});
-	}
-	
-	public static MidiEvent tempoInUSQ(final long tick,final int usq){
-		return new MidiEvent(tick,MIDI_SYSTEM_EVENT,new byte[]{0x51,(byte) (usq & 0xff),(byte) ((usq >> 8) & 0xff),(byte) ((usq >> 16) & 0xff)});
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java b/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
deleted file mode 100644
index 3b1b8e9c..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequenceHandlerImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.herac.tuxguitar.player.impl.sequencer;
-
-import org.herac.tuxguitar.player.base.MidiSequenceHandler;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-
-public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
-	
-	private MidiSequencerImpl seq;
-	
-	public MidiSequenceHandlerImpl(MidiSequencerImpl seq,int tracks) {
-		super(tracks);
-		this.seq = seq;
-		this.seq.getMidiTrackController().init(getTracks());
-	}
-	
-	public void addControlChange(long tick,int track,int channel, int controller, int value) {
-		this.seq.addEvent(MidiEvent.controlChange(tick, track, channel, controller, value));
-	}
-	
-	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
-		this.seq.addEvent(MidiEvent.noteOff(tick, track, channel, note, velocity));
-	}
-	
-	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
-		this.seq.addEvent(MidiEvent.noteOn(tick, track, channel, note, velocity));
-	}
-	
-	public void addPitchBend(long tick,int track,int channel, int value) {
-		this.seq.addEvent(MidiEvent.pitchBend(tick, track, channel, value));
-	}
-	
-	public void addProgramChange(long tick,int track,int channel, int instrument) {
-		this.seq.addEvent(MidiEvent.programChange(tick, track, channel, instrument));
-	}
-	
-	public void addTempoInUSQ(long tick,int track,int usq) {
-		this.seq.addEvent(MidiEvent.tempoInUSQ(tick, usq));
-	}
-	
-	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
-		//not implemented
-	}
-	
-	public void notifyFinish(){
-		//not implemented
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java b/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
deleted file mode 100644
index 1e17e300..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerImpl.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.herac.tuxguitar.player.impl.sequencer;
-
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-import org.herac.tuxguitar.player.base.MidiSequenceHandler;
-import org.herac.tuxguitar.player.base.MidiSequencer;
-import org.herac.tuxguitar.player.base.MidiTransmitter;
-
-public class MidiSequencerImpl implements MidiSequencer{
-	
-	private boolean reset;
-	private boolean running;
-	private boolean stopped;
-	private MidiTransmitter transmitter;
-	private MidiTickPlayer midiTickPlayer;
-	private MidiEventPlayer midiEventPlayer;
-	private MidiEventDispacher midiEventDispacher;
-	private MidiTrackController midiTrackController;
-	
-	public MidiSequencerImpl(){
-		this.running = false;
-		this.stopped = true;
-		this.midiTickPlayer = new MidiTickPlayer();
-		this.midiEventPlayer = new MidiEventPlayer(this);
-		this.midiEventDispacher = new MidiEventDispacher(this);
-		this.midiTrackController = new MidiTrackController(this);
-	}
-	
-	public synchronized MidiTrackController getMidiTrackController(){
-		return this.midiTrackController;
-	}
-	
-	public synchronized void setTempo(int tempo){
-		this.midiTickPlayer.setTempo(tempo);
-	}
-	
-	public synchronized long getTickPosition(){
-		return this.midiTickPlayer.getTick();
-	}
-	
-	public synchronized void setTickPosition(long tickPosition){
-		this.reset = true;
-		this.midiTickPlayer.setTick(tickPosition);
-	}
-	
-	public synchronized long getTickLength(){
-		return this.midiTickPlayer.getTickLength();
-	}
-	
-	public synchronized void sendEvent(MidiEvent event) throws MidiPlayerException{
-		if(!this.reset){
-			this.midiEventDispacher.dispatch(event);
-		}
-	}
-	
-	public synchronized void addEvent(MidiEvent event){
-		this.midiEventPlayer.addEvent(event);
-		this.midiTickPlayer.notifyTick(event.getTick());
-	}
-	
-	public synchronized boolean isRunning() {
-		return this.running;
-	}
-	
-	public synchronized void setRunning(boolean running) throws MidiPlayerException {
-		this.running = running;
-		if(this.running){
-			this.setTempo(120);
-			this.setTickPosition( this.getTickPosition() );
-			new MidiTimer(this).start();
-		}else{
-			this.process();
-		}
-	}
-	
-	public synchronized void stop() throws MidiPlayerException{
-		this.setRunning(false);
-	}
-	
-	public synchronized void start() throws MidiPlayerException{
-		this.setRunning(true);
-	}
-	
-	public synchronized void reset()  throws MidiPlayerException{
-		this.getTransmitter().sendAllNotesOff();
-		for(int channel = 0; channel < 16;channel ++){
-			this.getTransmitter().sendPitchBend(channel, 64);
-		}
-	}
-	
-	protected synchronized boolean process() throws MidiPlayerException{
-		boolean running = this.isRunning();
-		if(running){
-			if(this.reset){
-				this.reset();
-				this.reset = false;
-				this.midiEventPlayer.reset();
-			}
-			this.stopped = false;
-			this.midiTickPlayer.process();
-			this.midiEventPlayer.process();
-			if(this.getTickPosition() > this.getTickLength()){
-				this.stop();
-			}
-		}
-		else if( !this.stopped ){
-			this.stopped = true;
-			this.midiEventPlayer.clearEvents();
-			this.midiTickPlayer.clearTick();
-			this.reset();
-		}
-		return running;
-	}
-	
-	public synchronized MidiTransmitter getTransmitter() {
-		return this.transmitter;
-	}
-	
-	public synchronized void setTransmitter(MidiTransmitter transmitter) {
-		this.transmitter = transmitter;
-	}
-	
-	public void check() {
-		// Not implemented
-	}
-	
-	public synchronized void open() {
-		//not implemented
-	}
-	
-	public synchronized void close() throws MidiPlayerException {
-		if(isRunning()){
-			this.stop();
-		}
-	}
-	
-	public synchronized MidiSequenceHandler createSequence(int tracks) throws MidiPlayerException{
-		return new MidiSequenceHandlerImpl(this,tracks);
-	}
-	
-	public synchronized void setSolo(int index,boolean solo) throws MidiPlayerException{
-		this.getMidiTrackController().setSolo(index, solo);
-	}
-	
-	public synchronized void setMute(int index,boolean mute) throws MidiPlayerException{
-		this.getMidiTrackController().setMute(index, mute);
-	}
-	
-	public String getKey() {
-		return "tuxguitar.sequencer";
-	}
-	
-	public String getName() {
-		return "TuxGuitar Sequencer";
-	}
-	
-	private class MidiTimer extends Thread{
-		
-		private static final int TIMER_DELAY = 15;
-		
-		private MidiSequencerImpl sequencer;
-		
-		public MidiTimer(MidiSequencerImpl sequencer){
-			this.sequencer = sequencer;
-		}
-		
-		public void run() {
-			try {
-				synchronized(this.sequencer) {
-					while( this.sequencer.process() ){
-						this.sequencer.wait( TIMER_DELAY );
-					}
-				}
-			} catch (Throwable throwable) {
-				throwable.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java b/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
deleted file mode 100644
index fdd5d579..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiSequencerProviderImpl.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.herac.tuxguitar.player.impl.sequencer;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.player.base.MidiPlayerException;
-import org.herac.tuxguitar.player.base.MidiSequencer;
-import org.herac.tuxguitar.player.base.MidiSequencerProvider;
-
-public class MidiSequencerProviderImpl implements MidiSequencerProvider{
-	
-	private List sequencers;
-	
-	public MidiSequencerProviderImpl(){
-		super();
-	}
-	
-	public List listSequencers() throws MidiPlayerException {
-		if(this.sequencers == null){
-			this.sequencers = new ArrayList();
-			this.sequencers.add(new MidiSequencerImpl());
-		}
-		return this.sequencers;
-	}
-	
-	public void closeAll() throws MidiPlayerException {
-		Iterator it = listSequencers().iterator();
-		while(it.hasNext()){
-			MidiSequencer sequencer = (MidiSequencer)it.next();
-			sequencer.close();
-		}
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java b/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
deleted file mode 100644
index 7208074b..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/player/impl/sequencer/MidiTrack.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.herac.tuxguitar.player.impl.sequencer;
-
-public class MidiTrack {
-	
-	private boolean solo;
-	private boolean mute;
-	
-	public MidiTrack(){
-		this.solo = false;
-		this.mute = false;
-	}
-	
-	public boolean isMute() {
-		return this.mute;
-	}
-	
-	public void setMute(boolean mute) {
-		this.mute = mute;
-	}
-	
-	public boolean isSolo() {
-		return this.solo;
-	}
-	
-	public void setSolo(boolean solo) {
-		this.solo = solo;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/factory/TGFactory.java b/TuxGuitar/src/org/herac/tuxguitar/song/factory/TGFactory.java
deleted file mode 100644
index df0578f7..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/factory/TGFactory.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.herac.tuxguitar.song.factory;
-
-import org.herac.tuxguitar.song.models.TGBeat;
-import org.herac.tuxguitar.song.models.TGChannel;
-import org.herac.tuxguitar.song.models.TGChord;
-import org.herac.tuxguitar.song.models.TGColor;
-import org.herac.tuxguitar.song.models.TGDuration;
-import org.herac.tuxguitar.song.models.TGLyric;
-import org.herac.tuxguitar.song.models.TGMarker;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGNote;
-import org.herac.tuxguitar.song.models.TGNoteEffect;
-import org.herac.tuxguitar.song.models.TGScale;
-import org.herac.tuxguitar.song.models.TGSong;
-import org.herac.tuxguitar.song.models.TGString;
-import org.herac.tuxguitar.song.models.TGStroke;
-import org.herac.tuxguitar.song.models.TGTempo;
-import org.herac.tuxguitar.song.models.TGText;
-import org.herac.tuxguitar.song.models.TGTimeSignature;
-import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
-import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.effects.TGEffectBend;
-import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
-import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
-import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
-import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
-
-public class TGFactory {
-	
-	public TGSong newSong(){
-		return new TGSong() {
-			//TGSong Implementation
-		};
-	}
-	
-	public TGLyric newLyric(){
-		return new TGLyric(){
-			//TGLyric Implementation
-		};
-	}
-	
-	public TGMarker newMarker(){
-		return new TGMarker(this){
-			//TGMarker Implementation
-		};
-	}
-	
-	public TGChord newChord(int length){
-		return new TGChord(length){
-			//TGChord Implementation
-		};
-	}
-	
-	public TGScale newScale(){
-		return new TGScale(){
-			//TGScale Implementation
-		};
-	}
-	
-	public TGColor newColor(){
-		return new TGColor(){
-			//TGColor Implementation
-		};
-	}
-	
-	public TGDuration newDuration(){
-		return new TGDuration(this){
-			//TGDuration Implementation
-		};
-	}
-	
-	public TGDivisionType newDivisionType(){
-		return new TGDivisionType(){
-			//TGDivisionType Implementation
-		};
-	}
-	
-	public TGTimeSignature newTimeSignature(){
-		return new TGTimeSignature(this){
-			//TGTimeSignature Implementation
-		};
-	}
-	
-	public TGTempo newTempo(){
-		return new TGTempo(){
-			//TGTempo Implementation
-		};
-	}
-	
-	public TGChannel newChannel(){
-		return new TGChannel(){
-			//TGChannel Implementation
-		};
-	}
-	
-	public TGTrack newTrack(){
-		return new TGTrack(this){
-			//TGTrack Implementation
-		};
-	}
-	
-	public TGMeasureHeader newHeader(){
-		return new TGMeasureHeader(this){
-			//TGMeasureHeader Implementation
-		};
-	}
-	
-	public TGMeasure newMeasure(TGMeasureHeader header){
-		return new TGMeasure(header){
-			//TGMeasure Implementation
-		};
-	}
-	
-	public TGBeat newBeat(){
-		return new TGBeat(this){
-			//TGBeat Implementation
-		};
-	}
-	
-	public TGVoice newVoice(int index){
-		return new TGVoice(this, index){
-			//TGVoice Implementation
-		};
-	}
-	
-	public TGNote newNote(){
-		return new TGNote(this){
-			//TGNote Implementation
-		};
-	}
-	
-	public TGString newString(){
-		return new TGString(){
-			//TGString Implementation
-		};
-	}
-	
-	public TGStroke newStroke(){
-		return new TGStroke(){
-			//TGString Implementation
-		};
-	}
-	
-	public TGText newText(){
-		return new TGText(){
-			//TGString Implementation
-		};
-	}
-	
-	public TGNoteEffect newEffect(){
-		return new TGNoteEffect(){
-			//TGNoteEffect Implementation
-		};
-	}
-	
-	public TGEffectBend newEffectBend(){
-		return new TGEffectBend(){
-			//TGEffectBend Implementation
-		};
-	}
-	
-	public TGEffectTremoloBar newEffectTremoloBar(){
-		return new TGEffectTremoloBar(){
-			//TGEffectTremoloBar Implementation
-		};
-	}
-	
-	public TGEffectGrace newEffectGrace(){
-		return new TGEffectGrace(){
-			//TGEffectGrace Implementation
-		};
-	}
-	
-	public TGEffectHarmonic newEffectHarmonic(){
-		return new TGEffectHarmonic(){
-			//TGEffectHarmonic Implementation
-		};
-	}
-	
-	public TGEffectTrill newEffectTrill(){
-		return new TGEffectTrill(this){
-			//TGEffectTrill Implementation
-		};
-	}
-	
-	public TGEffectTremoloPicking newEffectTremoloPicking(){
-		return new TGEffectTremoloPicking(this){
-			//TGEffectTremoloPicking Implementation
-		};
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegment.java b/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegment.java
deleted file mode 100644
index 8497d302..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegment.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.herac.tuxguitar.song.helpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-
-public class TGSongSegment {
-	private List headers;
-	private List tracks;
-	
-	public TGSongSegment(){
-		this.headers = new ArrayList();
-		this.tracks = new ArrayList();
-	}
-	
-	public List getHeaders() {
-		return this.headers;
-	}
-	
-	public List getTracks() {
-		return this.tracks;
-	}
-	
-	public void addTrack(int track,List measures){
-		this.tracks.add(new TGTrackSegment(track,measures));
-	}
-	
-	public boolean isEmpty(){
-		return (this.headers.isEmpty() || this.tracks.isEmpty());
-	}
-	
-	public TGSongSegment clone(TGFactory factory){
-		TGSongSegment segment = new TGSongSegment();
-		for(int i = 0;i < getHeaders().size();i++){
-			TGMeasureHeader header = (TGMeasureHeader)getHeaders().get(i);
-			segment.getHeaders().add(header.clone(factory));
-		}
-		for(int i = 0;i < getTracks().size();i++){
-			TGTrackSegment trackMeasure = (TGTrackSegment)getTracks().get(i);
-			segment.getTracks().add(trackMeasure.clone(factory,segment.getHeaders()));
-		}
-		return segment;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java b/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
deleted file mode 100644
index 00190b72..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGSongSegmentHelper.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package org.herac.tuxguitar.song.helpers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.song.managers.TGSongManager;
-import org.herac.tuxguitar.song.managers.TGTrackManager;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-import org.herac.tuxguitar.song.models.TGTrack;
-
-public class TGSongSegmentHelper {
-	
-	private TGSongManager sm;
-	
-	public TGSongSegmentHelper(TGSongManager sm){
-		this.sm = sm;
-	}
-	
-	public TGSongSegment copyMeasures(int m1, int m2){
-		TGSongSegment segment = new TGSongSegment();
-		int number1 = Math.max(1,m1);
-		int number2 = Math.min(this.sm.getSong().countMeasureHeaders(),m2);
-		for(int number = number1; number <= number2;number ++){
-			segment.getHeaders().add( this.sm.getMeasureHeader(number) );
-		}
-		Iterator it = this.sm.getSong().getTracks();
-		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
-			List measures = new ArrayList();
-			for(int number = number1; number <= number2;number ++){
-				measures.add(this.sm.getTrackManager().getMeasure(track, number));
-			}
-			segment.addTrack(track.getNumber(),measures);
-		}
-		return segment.clone(this.sm.getFactory());
-	}
-	
-	public TGSongSegment copyMeasures(int m1, int m2,TGTrack track){
-		TGSongSegment segment = new TGSongSegment();
-		List measures = new ArrayList();
-		int number1 = Math.max(1,m1);
-		int number2 = Math.min(this.sm.getSong().countMeasureHeaders(),m2);
-		for(int number = number1; number <= number2;number ++){
-			segment.getHeaders().add( this.sm.getMeasureHeader(number) );
-			measures.add(this.sm.getTrackManager().getMeasure(track, number));
-		}
-		segment.addTrack(track.getNumber(),measures);
-		return segment.clone(this.sm.getFactory());
-	}
-	
-	public void insertMeasures(TGSongSegment segment,int fromNumber,long move, int track){
-		List headers = new ArrayList();
-		this.sm.moveMeasureHeaders(segment.getHeaders(),move,0,false);
-		
-		int headerNumber = fromNumber;
-		Iterator it = segment.getHeaders().iterator();
-		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
-			header.setNumber(headerNumber);
-			headers.add(header);
-			headerNumber ++;
-		}
-		long start = ((TGMeasureHeader)headers.get(0)).getStart();
-		long end = ((TGMeasureHeader)headers.get(headers.size() - 1)).getStart() + ((TGMeasureHeader)headers.get(headers.size() - 1)).getLength();
-		List headersBeforeEnd = this.sm.getMeasureHeadersBeforeEnd(start);
-		this.sm.moveMeasureHeaders(headersBeforeEnd,end - start,headers.size(),true);
-		
-		it = segment.getHeaders().iterator();
-		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
-			this.sm.addMeasureHeader(header.getNumber() - 1,header);
-		}
-		
-		it = this.sm.getSong().getTracks();
-		while (it.hasNext()) {
-			TGTrack currTrack = (TGTrack) it.next();
-			List measures = null;
-			
-			Iterator tracks = segment.getTracks().iterator();
-			while(tracks.hasNext()){
-				TGTrackSegment tSegment = (TGTrackSegment)tracks.next();
-				
-				if(  ((track > 0 && segment.getTracks().size() == 1)?track:tSegment.getTrack()) == currTrack.getNumber()){
-					measures = tSegment.getMeasures();
-					break;
-				}
-			}
-			if(measures == null){
-				TGTrackManager tm = this.sm.getTrackManager();
-				TGMeasure measure = (fromNumber > 1 ? tm.getMeasure(currTrack , (fromNumber - 1) ) : tm.getMeasure(currTrack, headerNumber ));
-				int clef = ( measure != null ? measure.getClef() : TGMeasure.DEFAULT_CLEF );
-				int keySignature = ( measure != null ? measure.getKeySignature() : TGMeasure.DEFAULT_KEY_SIGNATURE );
-				measures = getEmptyMeasures(segment.getHeaders().size(), clef, keySignature);
-			}
-			
-			for(int i = 0;i < measures.size();i++){
-				TGMeasure measure = (TGMeasure)measures.get(i);
-				measure.setHeader((TGMeasureHeader)headers.get(i));
-				this.sm.getMeasureManager().moveAllBeats(measure,move);
-			}
-			
-			insertMeasures(currTrack,measures);
-		}
-	}
-	
-	public void insertMeasures(TGTrack track,List measures){
-		if(!measures.isEmpty()){
-			Iterator it = measures.iterator();
-			while(it.hasNext()){
-				TGMeasure measure = (TGMeasure)it.next();
-				this.sm.getMeasureManager().removeNotesAfterString(measure, track.stringCount());
-				this.sm.getTrackManager().addMeasure(track,(measure.getNumber() - 1),measure);
-			}
-		}
-	}
-	
-	public void replaceMeasures(TGSongSegment segment,long move, int track) {
-		boolean replaceHeader = ( track == 0 || this.sm.getSong().countTracks() == 1 );
-		
-		List measureHeaders = new ArrayList();
-		this.sm.moveMeasureHeaders(segment.getHeaders(),move,0,false);
-		Iterator sHeaders = segment.getHeaders().iterator();
-		while(sHeaders.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)sHeaders.next();
-			TGMeasureHeader replace = (replaceHeader ? this.sm.replaceMeasureHeader(header) : this.sm.getMeasureHeaderAt(header.getStart()));
-			
-			Iterator nextHeaders = this.sm.getMeasureHeadersAfter(replace.getNumber()).iterator();
-			long nextStart =  (replace.getStart() + replace.getLength());
-			while(nextHeaders.hasNext()){
-				TGMeasureHeader next = (TGMeasureHeader)nextHeaders.next();
-				this.sm.moveMeasureComponents(next, (nextStart - next.getStart() ));
-				this.sm.moveMeasureHeader(next, (nextStart - next.getStart() ) , 0);
-				nextStart = (next.getStart() + next.getLength());
-			}
-			measureHeaders.add(replace);
-		}
-		
-		Iterator sTracks = segment.getTracks().iterator();
-		while(sTracks.hasNext()){
-			TGTrackSegment tSegment = (TGTrackSegment)sTracks.next();
-			TGTrack currTrack = this.sm.getTrack( (track > 0 && segment.getTracks().size() == 1)?track:tSegment.getTrack());
-			if(currTrack != null){
-				for(int i = 0;i < tSegment.getMeasures().size();i++){
-					TGMeasure measure = (TGMeasure)tSegment.getMeasures().get(i);
-					measure.setHeader((TGMeasureHeader)measureHeaders.get(i));
-					//this.sm.getMeasureManager().removeNotesAfterString(measure, currTrack.stringCount());
-					//this.sm.getMeasureManager().moveAllBeats(measure,move);
-					this.sm.getMeasureManager().moveAllBeats(measure,move);
-					this.sm.getMeasureManager().removeVoicesOutOfTime(measure);
-					this.sm.getMeasureManager().removeNotesAfterString(measure, currTrack.stringCount());
-					this.sm.getTrackManager().replaceMeasure(currTrack,measure);
-				}
-			}
-		}
-	}
-	
-	private List getEmptyMeasures(int count, int clef, int keySignature) {
-		List measures = new ArrayList();
-		for(int i = 0 ; i < count ; i ++ ){
-			TGMeasure measure = this.sm.getFactory().newMeasure(null);
-			measure.setClef(clef);
-			measure.setKeySignature(keySignature);
-			measures.add(measure);
-		}
-		return measures;
-	}
-	
-	public TGSongSegment createSegmentCopies( TGSongSegment srcSegment , int count ){
-		TGSongSegment segment = srcSegment.clone( this.sm.getFactory() );
-		
-		int mCount = segment.getHeaders().size();
-		int tCount = segment.getTracks().size();
-		
-		TGMeasureHeader fMeasure = (TGMeasureHeader)segment.getHeaders().get( 0 );
-		TGMeasureHeader lMeasure = (TGMeasureHeader)segment.getHeaders().get( mCount - 1 );
-		
-		long mMove = ( ( lMeasure.getStart() + lMeasure.getLength() ) - fMeasure.getStart() );
-		for( int i = 1 ; i < count ; i ++ ){
-			for(int m = 0; m < mCount; m++ ){
-				TGMeasureHeader header = ( (TGMeasureHeader)segment.getHeaders().get(m) ).clone( this.sm.getFactory() );
-				segment.getHeaders().add( header );
-				this.sm.moveMeasureHeader(header,(mMove * i),(mCount * i));
-				for( int t = 0 ; t < tCount ; t ++ ){
-					TGTrackSegment track = (TGTrackSegment)segment.getTracks().get( t );
-					TGMeasure measure = ((TGMeasure)track.getMeasures().get( m )).clone(this.sm.getFactory(), header );
-					track.getMeasures().add( measure );
-					this.sm.getMeasureManager().moveAllBeats(measure, (mMove * i));
-				}
-			}
-		}
-		
-		return segment;
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGTrackSegment.java b/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
deleted file mode 100644
index e487277d..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/helpers/TGTrackSegment.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.herac.tuxguitar.song.helpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-import org.herac.tuxguitar.song.models.TGMeasure;
-import org.herac.tuxguitar.song.models.TGMeasureHeader;
-
-public class TGTrackSegment {
-	private int track;
-	private List measures;
-	
-	public TGTrackSegment(int track,List measures){
-		this.track = track;
-		this.measures = measures;
-	}
-	
-	public List getMeasures() {
-		return this.measures;
-	}
-	
-	public int getTrack() {
-		return this.track;
-	}
-	
-	public Object clone(TGFactory factory,List headers){
-		List measures = new ArrayList();
-		for(int i = 0;i < getMeasures().size();i++){
-			TGMeasure measure = (TGMeasure)getMeasures().get(i);
-			measures.add(measure.clone(factory,(TGMeasureHeader)headers.get(i)));
-		}
-		return new TGTrackSegment(getTrack(),measures);
-	}
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGColor.java b/TuxGuitar/src/org/herac/tuxguitar/song/models/TGColor.java
deleted file mode 100644
index 5d91f624..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGColor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.herac.tuxguitar.song.models;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-
-public abstract class TGColor {
-	public static final TGColor RED = newColor(255,0,0);
-	public static final TGColor GREEN = newColor(0,255,0);
-	public static final TGColor BLUE = newColor(0,0,255);
-	public static final TGColor WHITE = newColor(255,255,255);
-	public static final TGColor BLACK = newColor(0,0,0);
-	
-	private int r;
-	private int g;
-	private int b;
-	
-	public TGColor(){
-		this.r = 0;
-		this.g = 0;
-		this.b = 0;
-	}
-	
-	public int getB() {
-		return this.b;
-	}
-	
-	public void setB(int b) {
-		this.b = b;
-	}
-	
-	public int getG() {
-		return this.g;
-	}
-	
-	public void setG(int g) {
-		this.g = g;
-	}
-	
-	public int getR() {
-		return this.r;
-	}
-	
-	public void setR(int r) {
-		this.r = r;
-	}
-	
-	public boolean isEqual(TGColor color){
-		return (this.getR() == color.getR() && this.getG() == color.getG() && this.getB() == color.getB());
-	}
-	
-	public TGColor clone(TGFactory factory){
-		TGColor color = factory.newColor();
-		copy(color);
-		return color;
-	}
-	
-	public void copy(TGColor color){
-		color.setR(getR());
-		color.setG(getG());
-		color.setB(getB());
-	}
-	
-	public static TGColor newColor(int r,int g,int b){
-		TGColor color = new TGFactory().newColor();
-		color.setR(r);
-		color.setG(g);
-		color.setB(b);
-		return color;
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGString.java b/TuxGuitar/src/org/herac/tuxguitar/song/models/TGString.java
deleted file mode 100644
index b4e6b974..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/TGString.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Created on 30-nov-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.song.models;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public abstract class TGString {
-	private int number;
-	private int value;
-	
-	public TGString(){
-		this.number = 0;
-		this.value = 0;
-	}
-	
-	public int getNumber() {
-		return this.number;
-	}
-	
-	public int getValue() {
-		return this.value;
-	}
-	
-	public void setNumber(int number) {
-		this.number = number;
-	}
-	
-	public void setValue(int value) {
-		this.value = value;
-	}
-	
-	public boolean isEqual(TGString string){
-		return (this.getNumber() == string.getNumber() && this.getValue() == string.getValue());
-	}
-	
-	public TGString clone(TGFactory factory){
-		TGString string = factory.newString();
-		copy(string);
-		return string;
-	}
-	
-	public void copy(TGString string){
-		string.setNumber(getNumber());
-		string.setValue(getValue());
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectBend.java b/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
deleted file mode 100644
index d8401015..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectBend.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Created on 26-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.song.models.effects;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public abstract class TGEffectBend {
-	public static final int SEMITONE_LENGTH = 1;
-	public static final int MAX_POSITION_LENGTH = 12;
-	public static final int MAX_VALUE_LENGTH = (SEMITONE_LENGTH * 12);
-	
-	private List points;
-	
-	public TGEffectBend(){
-		this.points = new ArrayList();
-	}
-	
-	public void addPoint(int position,int value){
-		this.points.add(new BendPoint(position,value));
-	}
-	
-	public List getPoints(){
-		return this.points;
-	}
-	
-	public TGEffectBend clone(TGFactory factory){
-		TGEffectBend effect = factory.newEffectBend();
-		Iterator it = getPoints().iterator();
-		while(it.hasNext()){
-			BendPoint point = (BendPoint)it.next();
-			effect.addPoint(point.getPosition(),point.getValue());
-		}
-		return effect;
-	}
-	
-	public class BendPoint{
-		private int position;
-		private int value;
-		
-		public BendPoint(int position,int value){
-			this.position = position;
-			this.value = value;
-		}
-		
-		public int getPosition() {
-			return this.position;
-		}
-		
-		public int getValue() {
-			return this.value;
-		}
-		
-		public long getTime(long duration){
-			return (duration * getPosition() / MAX_POSITION_LENGTH);
-		}
-		
-		public Object clone(){
-			return new BendPoint(getPosition(),getValue());
-		}
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java b/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
deleted file mode 100644
index cdf20e36..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/song/models/effects/TGEffectTremoloBar.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Created on 26-dic-2005
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.herac.tuxguitar.song.models.effects;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.herac.tuxguitar.song.factory.TGFactory;
-
-/**
- * @author julian
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public abstract class TGEffectTremoloBar {
-	public static final int MAX_POSITION_LENGTH = 12;
-	public static final int MAX_VALUE_LENGTH = 12;
-	
-	private List points;
-	
-	public TGEffectTremoloBar(){
-		this.points = new ArrayList();
-	}
-	
-	public void addPoint(int position,int value){
-		this.points.add(new TremoloBarPoint(position,value));
-	}
-	
-	public List getPoints(){
-		return this.points;
-	}
-	
-	public TGEffectTremoloBar clone(TGFactory factory){
-		TGEffectTremoloBar effect = factory.newEffectTremoloBar();
-		Iterator it = getPoints().iterator();
-		while(it.hasNext()){
-			TremoloBarPoint point = (TremoloBarPoint)it.next();
-			effect.addPoint(point.getPosition(),point.getValue());
-		}
-		
-		return effect;
-	}
-	
-	public class TremoloBarPoint{
-		private int position;
-		private int value;
-		
-		public TremoloBarPoint(int position,int value){
-			this.position = position;
-			this.value = value;
-		}
-		
-		public int getPosition() {
-			return this.position;
-		}
-		
-		public int getValue() {
-			return this.value;
-		}
-		
-		public long getTime(long duration){
-			return (duration * getPosition() / MAX_POSITION_LENGTH);
-		}
-		
-		public Object clone(){
-			return new TremoloBarPoint(getPosition(),getValue());
-		}
-	}
-	
-}
diff --git a/TuxGuitar/src/org/herac/tuxguitar/util/TGServiceReader.java b/TuxGuitar/src/org/herac/tuxguitar/util/TGServiceReader.java
deleted file mode 100644
index 23506dfa..00000000
--- a/TuxGuitar/src/org/herac/tuxguitar/util/TGServiceReader.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.herac.tuxguitar.util;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-public class TGServiceReader {
-	
-	private static final String SERVICE_PATH = new String("META-INF/services/");
-	
-	public static Iterator lookupProviders(Class spi){
-		return TGServiceReader.lookupProviders(spi,TGClassLoader.instance().getClassLoader());
-	}
-	
-	public static Iterator lookupProviders(Class spi,ClassLoader loader){
-		try{
-			if (spi == null || loader == null){
-				throw new IllegalArgumentException();
-			}
-			return new IteratorImpl(spi,loader,loader.getResources(SERVICE_PATH + spi.getName()));
-		}catch (IOException ioex){
-			return Collections.EMPTY_LIST.iterator();
-		}
-	}
-	
-	private static final class IteratorImpl implements Iterator{
-		private Class spi;
-		private ClassLoader loader;
-		private Enumeration urls;
-		private Iterator iterator;
-		
-		public IteratorImpl(Class spi,ClassLoader loader,Enumeration urls){
-			this.spi = spi;
-			this.loader = loader;
-			this.urls = urls;
-			this.initialize();
-		}
-		
-		private void initialize(){
-			List providers = new ArrayList();
-			while (this.urls.hasMoreElements()) {
-				URL url = (URL) this.urls.nextElement();
-				try {
-					BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream(), "UTF-8"));
-					String line = null;
-					while((line = reader.readLine()) != null){
-						String provider = uncommentLine(line).trim();
-						if(provider != null && provider.length() > 0){
-							providers.add(provider);
-						}
-					}
-				} catch (UnsupportedEncodingException e) {
-					e.printStackTrace();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-			this.iterator = providers.iterator();
-		}
-		
-		private String uncommentLine(String line){
-			int index = line.indexOf('#');
-			if(index >= 0){
-				return (line.substring(0,index));
-			}
-			return line;
-		}
-		
-		public boolean hasNext() {
-			return (this.iterator != null && this.iterator.hasNext());
-		}
-		
-		public Object next() {
-			if (!hasNext()){
-				throw new NoSuchElementException();
-			}
-			try {
-				Object provider = this.loader.loadClass( (String)this.iterator.next() ).newInstance();
-				if(this.spi.isInstance(provider)){
-					return provider;
-				}
-			} catch (Throwable throwable) {
-				throwable.printStackTrace();
-			}
-			throw new NoSuchElementException();
-		}
-		
-		public void remove() {
-			throw new UnsupportedOperationException();
-		}
-	}
-}
diff --git a/TuxGuitar/src/test/java/org/herac/tuxguitar/app/player/TestRepeat.java b/TuxGuitar/src/test/java/org/herac/tuxguitar/app/player/TestRepeat.java
new file mode 100644
index 00000000..d743c4b5
--- /dev/null
+++ b/TuxGuitar/src/test/java/org/herac/tuxguitar/app/player/TestRepeat.java
@@ -0,0 +1,138 @@
+package org.herac.tuxguitar.app.player;
+
+import junit.framework.Assert;
+
+import org.herac.tuxguitar.graphics.control.TGFactoryImpl;
+import org.herac.tuxguitar.player.base.MidiRepeatController;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.junit.Test;
+
+public class TestRepeat {
+
+	private final TGFactory factory = new TGFactoryImpl();
+
+	private void createMeasureHeader(TGSong song, String name, boolean repeatOpen, int repeatClose, int repeatAlternative) {
+		TGMeasureHeader result = new TGMeasureHeader(this.factory);
+		result.setRepeatOpen(repeatOpen);
+		result.setRepeatClose(repeatClose);
+		result.setRepeatAlternative(repeatAlternative);
+		result.setMarker(this.factory.newMarker());
+		result.getMarker().setTitle(name);
+
+		result.setNumber(song.countMeasureHeaders() + 1);
+		song.addMeasureHeader(result);
+	}
+
+	private String playAsString(MidiRepeatController player) {
+		StringBuilder result = new StringBuilder();
+
+		for (int i = 1; i < 50; i++) {
+			if (player.finished()) {
+				break;
+			}
+
+			TGMeasureHeader header = player.getTGSong().getMeasureHeader(player.getIndex());
+			player.process();
+			if (player.shouldPlay()) {
+				result.append(header.getMarker().getTitle());
+			}
+		}
+
+		if (!player.finished()) {
+			result.append("[truncated]");
+		}
+
+		return result.toString();
+	}
+
+	@Test
+	public void noRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", false, 0, 0);
+		createMeasureHeader(song, "B", false, 0, 0);
+		createMeasureHeader(song, "C", false, 0, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("ABC", sequence);
+	}
+
+	@Test
+	public void simpleRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", true, 2, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("AAA", sequence);
+	}
+
+	@Test
+	public void oneFullRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", true, 0, 0);
+		createMeasureHeader(song, "B", false, 0, 0);
+		createMeasureHeader(song, "C", false, 1, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("ABCABC", sequence);
+	}
+
+	@Test
+	public void multiRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", false, 0, 0);
+		createMeasureHeader(song, "B", true, 0, 0);
+		createMeasureHeader(song, "C", false, 2, 0);
+		createMeasureHeader(song, "D", false, 0, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("ABCBCBCD", sequence);
+	}
+
+	@Test
+	public void eachMeasureRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", true, 1, 0);
+		createMeasureHeader(song, "B", true, 1, 0);
+		createMeasureHeader(song, "C", true, 1, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("AABBCC", sequence);
+	}
+
+	@Test
+	public void alternateEndRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", false, 0, 0);
+		createMeasureHeader(song, "B", true, 0, 0);
+		createMeasureHeader(song, "C", false, 1, 1 << 0);
+		createMeasureHeader(song, "D", false, 0, 1 << 1);
+		createMeasureHeader(song, "E", false, 0, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("ABCBDE", sequence);
+	}
+
+	@Test
+	public void manyAlternateEndRepeat() {
+		TGSong song = new TGSong();
+		createMeasureHeader(song, "A", false, 0, 0);
+		createMeasureHeader(song, "B", true, 0, 0);
+		createMeasureHeader(song, "C", false, 2, 1 << 0);
+		createMeasureHeader(song, "D", false, 0, 1 << 1);
+		createMeasureHeader(song, "E", false, 0, 1 << 2);
+		createMeasureHeader(song, "F", false, 0, 0);
+
+		MidiRepeatController player = new MidiRepeatController(song, -1, -1);
+		String sequence = playAsString(player);
+		Assert.assertEquals("ABCBDBEF", sequence);
+	}
+
+}
diff --git a/TuxGuitar/src/test/java/org/herac/tuxguitar/app/util/TestNoteNameToValue.java b/TuxGuitar/src/test/java/org/herac/tuxguitar/app/util/TestNoteNameToValue.java
new file mode 100644
index 00000000..84c48c15
--- /dev/null
+++ b/TuxGuitar/src/test/java/org/herac/tuxguitar/app/util/TestNoteNameToValue.java
@@ -0,0 +1,96 @@
+package org.herac.tuxguitar.app.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestNoteNameToValue {
+
+	@Test
+	public void validNote() {
+		Assert.assertEquals(33, TGMusicKeyUtils.getMidiValueFromName("A0"));
+		Assert.assertEquals(24, TGMusicKeyUtils.getMidiValueFromName("C0"));
+		Assert.assertEquals(31, TGMusicKeyUtils.getMidiValueFromName("G0"));
+		Assert.assertEquals(52, TGMusicKeyUtils.getMidiValueFromName("E2"));
+		Assert.assertEquals(53, TGMusicKeyUtils.getMidiValueFromName("F2"));
+	}
+
+	@Test
+	public void validOctave() {
+		Assert.assertEquals(59, TGMusicKeyUtils.getMidiValueFromName("B2"));
+		Assert.assertEquals(12, TGMusicKeyUtils.getMidiValueFromName("C-1"));
+		Assert.assertEquals(91, TGMusicKeyUtils.getMidiValueFromName("G5"));
+	}
+
+	@Test
+	public void validAlteration() {
+		Assert.assertEquals(56, TGMusicKeyUtils.getMidiValueFromName("Ab2"));
+		Assert.assertEquals(13, TGMusicKeyUtils.getMidiValueFromName("C#-1"));
+		Assert.assertEquals(92, TGMusicKeyUtils.getMidiValueFromName("G#5"));
+	}
+
+	@Test
+	public void wrongBigSize() throws IllegalArgumentException {
+		try {
+			TGMusicKeyUtils.getMidiValueFromName("C#-2m2");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	@Test
+	public void wrongSmallSize() throws IllegalArgumentException {
+		try {
+			TGMusicKeyUtils.getMidiValueFromName("C");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	@Test
+	public void wrongValue() throws IllegalArgumentException {
+		try {
+			// this note is valid but out of range 0..127
+			TGMusicKeyUtils.getMidiValueFromName("B-3");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	@Test
+	public void wrongValue2() throws IllegalArgumentException {
+		try {
+			// this note is valid but out of range 0..127
+			TGMusicKeyUtils.getMidiValueFromName("A8");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	@Test
+	public void wrongNote() throws IllegalArgumentException {
+		try {
+			TGMusicKeyUtils.getMidiValueFromName("H0");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	@Test
+	public void wrongOctave() throws IllegalArgumentException {
+		try {
+			TGMusicKeyUtils.getMidiValueFromName("Am");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	@Test
+	public void wrongAlteration() throws IllegalArgumentException {
+		try {
+			TGMusicKeyUtils.getMidiValueFromName("C@-1");
+			Assert.fail();
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+}
diff --git a/plugins/abc/pom.xml b/plugins/abc/pom.xml
new file mode 100644
index 00000000..4802e8a3
--- /dev/null
+++ b/plugins/abc/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-abc</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: ABC</name>
+	<description>ABC plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.java
index a9896d86..e98f7f60 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCExportSettingsDialog.java
@@ -16,58 +16,59 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class ABCExportSettingsDialog {
-	
+
 	private static final int STATUS_NONE = 0;
-	
+
 	private static final int STATUS_CANCELLED = 1;
-	
+
 	private static final int STATUS_ACCEPTED = 2;
-	
+
 	protected int status;
-	
+
 	public ABCExportSettingsDialog(){
 		super();
 	}
-	
+
 	public ABCSettings open() {
 		this.status = STATUS_NONE;
 		final ABCSettings settings = ABCSettings.getDefaults();
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout(2, false));
 		dialog.setText(TuxGuitar.getProperty("abc.options"));
-		
+
 		Composite columnLeft = new Composite(dialog, SWT.NONE);
 		columnLeft.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		columnLeft.setLayout(getColumnLayout());
-		
+
 		Composite columnRight = new Composite(dialog, SWT.NONE);
 		columnRight.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		columnRight.setLayout(getColumnLayout());
-		
+
 		//------------------X SELECTION------------------
 		Group xGroup = new Group(columnLeft,SWT.SHADOW_ETCHED_IN);
 		xGroup.setLayout(new GridLayout(2,false));
 		xGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		xGroup.setText(TuxGuitar.getProperty("abc.options.x.tip"));
-		
+
 		final int minXNum = 1;
 		final int maxXNum = 100;
-		
+
 		Label xNumLabel = new Label(xGroup, SWT.NULL);
 		xNumLabel.setText(TuxGuitar.getProperty("abc.options.x.number"));
 		xNumLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner xNumSpinner = new Spinner(xGroup, SWT.BORDER);
 		xNumSpinner.setLayoutData(getSpinnerData());
 		xNumSpinner.setMaximum(maxXNum);
 		xNumSpinner.setMinimum(minXNum);
 		xNumSpinner.setSelection(minXNum);
-		
+
 		xNumSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int fromSelection = xNumSpinner.getSelection();
-				
+
 				if(fromSelection < minXNum){
 					xNumSpinner.setSelection(minXNum);
 				}else if(fromSelection > maxXNum){
@@ -81,11 +82,11 @@ public void widgetSelected(SelectionEvent e) {
 		trackGroup.setLayout(new GridLayout(2,false));
 		trackGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackGroup.setText(TuxGuitar.getProperty("abc.options.select-track.tip"));
-		
+
 		final Label trackLabel = new Label(trackGroup, SWT.NULL);
 		trackLabel.setText(TuxGuitar.getProperty("abc.options.select-track") + ":");
 		trackLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo trackCombo = new Combo(trackGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		trackCombo.setLayoutData(getComboData());
 		for(int number = 1; number <= TuxGuitar.instance().getSongManager().getSong().countTracks(); number ++){
@@ -93,46 +94,47 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		trackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber() - 1);
 		trackCombo.setEnabled( settings.getTrack() != ABCSettings.ALL_TRACKS );
-		
+
 		final Button trackAllCheck = new Button(trackGroup,SWT.CHECK);
 		trackAllCheck.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true,2,1));
 		trackAllCheck.setText(TuxGuitar.getProperty("abc.options.select-all-tracks"));
 		trackAllCheck.setSelection( settings.getTrack() == ABCSettings.ALL_TRACKS );
-		
+
 		//------------------MEASURE RANGE------------------
 		Group measureGroup = new Group(columnLeft,SWT.SHADOW_ETCHED_IN);
 		measureGroup.setLayout(new GridLayout(2,false));
 		measureGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		measureGroup.setText(TuxGuitar.getProperty("abc.options.measure-range.tip"));
-		
+
 		final int minSelection = 1;
 		final int maxSelection = TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders();
-		
+
 		Label measureFromLabel = new Label(measureGroup, SWT.NULL);
 		measureFromLabel.setText(TuxGuitar.getProperty("abc.options.measure-range.from"));
 		measureFromLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner measureFromSpinner = new Spinner(measureGroup, SWT.BORDER);
 		measureFromSpinner.setLayoutData(getSpinnerData());
 		measureFromSpinner.setMaximum(maxSelection);
 		measureFromSpinner.setMinimum(minSelection);
 		measureFromSpinner.setSelection(minSelection);
-		
+
 		Label measureToLabel = new Label(measureGroup, SWT.NULL);
 		measureToLabel.setText(TuxGuitar.getProperty("abc.options.measure-range.to"));
 		measureToLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner measureToSpinner = new Spinner(measureGroup, SWT.BORDER);
 		measureToSpinner.setLayoutData(getSpinnerData());
 		measureToSpinner.setMinimum(minSelection);
 		measureToSpinner.setMaximum(maxSelection);
 		measureToSpinner.setSelection(maxSelection);
-		
+
 		measureFromSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int fromSelection = measureFromSpinner.getSelection();
 				int toSelection = measureToSpinner.getSelection();
-				
+
 				if(fromSelection < minSelection){
 					measureFromSpinner.setSelection(minSelection);
 				}else if(fromSelection > toSelection){
@@ -141,6 +143,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		measureToSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int toSelection = measureToSpinner.getSelection();
 				int fromSelection = measureFromSpinner.getSelection();
@@ -151,29 +154,29 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//------------------LAYOUT OPTIONS------------------
 		Group layoutGroup = new Group(columnRight,SWT.SHADOW_ETCHED_IN);
 		layoutGroup.setLayout(new GridLayout());
 		layoutGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		layoutGroup.setText(TuxGuitar.getProperty("abc.options.layout.tip"));
-		
+
 		final Button scoreCheck = new Button(layoutGroup,SWT.CHECK);
 		scoreCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		scoreCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-score"));
 		scoreCheck.setSelection(settings.isScoreEnabled());
-		
+
 		final Button tablatureCheck = new Button(layoutGroup,SWT.CHECK);
 		tablatureCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		tablatureCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-tablature"));
 		tablatureCheck.setSelection(settings.isTablatureEnabled());
-		
+
 		final Button trackGroupCheck = new Button(layoutGroup,SWT.CHECK);
 		trackGroupCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackGroupCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-track-groups"));
 		trackGroupCheck.setSelection(settings.isTrackGroupEnabled());
 		trackGroupCheck.setEnabled(settings.getTrack() == ABCSettings.ALL_TRACKS);
-		
+
 		final Button trackNameCheck = new Button(layoutGroup,SWT.CHECK);
 		trackNameCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackNameCheck.setSelection(settings.isTrackNameEnabled());
@@ -188,31 +191,31 @@ public void widgetSelected(SelectionEvent e) {
 		textsCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		textsCheck.setSelection(settings.isTextEnabled());
 		textsCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-texts"));
-		
+
 		final Button chordDiagramsCheck = new Button(layoutGroup,SWT.CHECK);
 		chordDiagramsCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		chordDiagramsCheck.setSelection(settings.isChordDiagramEnabled());
 		chordDiagramsCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-chord-diagrams"));
-		
+
 		final Button chordTracksCheck = new Button(layoutGroup,SWT.CHECK);
 		chordTracksCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		chordTracksCheck.setSelection(settings.isChordEnabled());
 		chordTracksCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-chord-tracks"));
-		
+
 		final Button droneTrackCheck = new Button(layoutGroup,SWT.CHECK);
 		droneTrackCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		droneTrackCheck.setSelection(settings.isDroneEnabled());
 		droneTrackCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-drone-track"));
-		
+
 		final Button instrCheck = new Button(layoutGroup,SWT.CHECK);
 		instrCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		instrCheck.setSelection(settings.isInstrumentsStartAt1());
 		instrCheck.setText(TuxGuitar.getProperty("abc.options.layout.instruments-start-at-1"));
-		
+
 		final Label diagramTrackLabel = new Label(layoutGroup, SWT.NULL);
 		diagramTrackLabel.setText(TuxGuitar.getProperty("abc.options.layout.chord-diagrams-track"));
 		diagramTrackLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo diagramTrackCombo = new Combo(layoutGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		diagramTrackCombo.setLayoutData(getComboData());
 		diagramTrackCombo.add("");
@@ -221,11 +224,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		diagramTrackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber());
 		diagramTrackCombo.setEnabled( settings.isChordDiagramEnabled() );
-		
+
 		final Label chordTrackLabel = new Label(layoutGroup, SWT.NULL);
 		chordTrackLabel.setText(TuxGuitar.getProperty("abc.options.layout.chord-track"));
 		chordTrackLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo chordTrackCombo = new Combo(layoutGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		chordTrackCombo.setLayoutData(getComboData());
 		chordTrackCombo.add("");
@@ -234,11 +237,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		chordTrackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber());
 		chordTrackCombo.setEnabled( settings.isChordEnabled() );
-		
+
 		final Label baseTrackLabel = new Label(layoutGroup, SWT.NULL);
 		baseTrackLabel.setText(TuxGuitar.getProperty("abc.options.layout.base-track"));
 		baseTrackLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo baseTrackCombo = new Combo(layoutGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		baseTrackCombo.setLayoutData(getComboData());
 		baseTrackCombo.add("");
@@ -247,11 +250,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		baseTrackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber());
 		baseTrackCombo.setEnabled( settings.isChordEnabled() );
-		
+
 		final Label droneTrackLabel = new Label(layoutGroup, SWT.NULL);
 		droneTrackLabel.setText(TuxGuitar.getProperty("abc.options.layout.drone-track"));
 		droneTrackLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo droneTrackCombo = new Combo(layoutGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		droneTrackCombo.setLayoutData(getComboData());
 		droneTrackCombo.add("");
@@ -260,11 +263,11 @@ public void widgetSelected(SelectionEvent e) {
 		}
 		droneTrackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber());
 		droneTrackCombo.setEnabled( settings.isDroneEnabled() );
-		
+
 		Label measuresPerLineLabel = new Label(layoutGroup, SWT.NULL);
 		measuresPerLineLabel.setText(TuxGuitar.getProperty("abc.options.layout.measures-per-line"));
 		measuresPerLineLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner measuresPerLineSpinner = new Spinner(layoutGroup, SWT.BORDER);
 		measuresPerLineSpinner.setLayoutData(getSpinnerData());
 		measuresPerLineSpinner.setMaximum(5);
@@ -272,6 +275,7 @@ public void widgetSelected(SelectionEvent e) {
 		measuresPerLineSpinner.setSelection(3);
 
 		tablatureCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!tablatureCheck.getSelection()){
 					scoreCheck.setSelection(true);
@@ -279,6 +283,7 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		scoreCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!scoreCheck.getSelection()){
 					tablatureCheck.setSelection(true);
@@ -286,6 +291,7 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		trackAllCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				trackLabel.setEnabled( !trackAllCheck.getSelection() );
 				trackCombo.setEnabled( !trackAllCheck.getSelection() );
@@ -293,34 +299,38 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		chordDiagramsCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				diagramTrackCombo.setEnabled( chordDiagramsCheck.getSelection() );
 			}
 		});
 		chordTracksCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				chordTrackCombo.setEnabled( chordTracksCheck.getSelection() );
 				baseTrackCombo.setEnabled( chordTracksCheck.getSelection() );
 			}
 		});
 		droneTrackCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				droneTrackCombo.setEnabled( droneTrackCheck.getSelection() );
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true,2,1));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				ABCExportSettingsDialog.this.status = STATUS_ACCEPTED;
-				
+
 				settings.setX(xNumSpinner.getSelection());
 				settings.setTrack( trackAllCheck.getSelection()?ABCSettings.ALL_TRACKS:trackCombo.getSelectionIndex() + 1);
 				settings.setTrackGroupEnabled( trackAllCheck.getSelection()? trackGroupCheck.getSelection() : false);
@@ -357,47 +367,48 @@ public void widgetSelected(SelectionEvent arg0) {
 					settings.setDroneTrack(ABCSettings.NO_TRACK);
 				}
 				settings.check();
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				ABCExportSettingsDialog.this.status = STATUS_CANCELLED;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return ( ( this.status == STATUS_ACCEPTED )? settings : null );
 	}
-	
+
 	private GridLayout getColumnLayout(){
 		GridLayout layout = new GridLayout();
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
 		return layout;
 	}
-	
+
 	private GridData getComboData(){
 		GridData data = new GridData(SWT.FILL,SWT.CENTER,true,true);
 		data.minimumWidth = 120;
 		return data;
 	}
-	
+
 	private GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.CENTER,true,true);
 		data.minimumWidth = 60;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.java
index e92febd6..24a52b25 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCImportSettingsDialog.java
@@ -15,58 +15,59 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class ABCImportSettingsDialog {
-	
+
 	private static final int STATUS_NONE = 0;
-	
+
 	private static final int STATUS_CANCELLED = 1;
-	
+
 	private static final int STATUS_ACCEPTED = 2;
-	
+
 	protected int status;
-	
+
 	public ABCImportSettingsDialog(){
 		super();
 	}
-	
+
 	public ABCSettings open() {
 		this.status = STATUS_NONE;
 		final ABCSettings settings = ABCSettings.getDefaults();
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout(2, false));
 		dialog.setText(TuxGuitar.getProperty("abc.options"));
-		
+
 		Composite columnLeft = new Composite(dialog, SWT.NONE);
 		columnLeft.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		columnLeft.setLayout(getColumnLayout());
-		
+
 		Composite columnRight = new Composite(dialog, SWT.NONE);
 		columnRight.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		columnRight.setLayout(getColumnLayout());
-		
+
 		//------------------X SELECTION------------------
 		Group xGroup = new Group(columnLeft,SWT.SHADOW_ETCHED_IN);
 		xGroup.setLayout(new GridLayout(2,false));
 		xGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		xGroup.setText(TuxGuitar.getProperty("abc.options.x.tip"));
-		
+
 		final int minXNum = 1;
 		final int maxXNum = 100;
-		
+
 		Label xNumLabel = new Label(xGroup, SWT.NULL);
 		xNumLabel.setText(TuxGuitar.getProperty("abc.options.x.number"));
 		xNumLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner xNumSpinner = new Spinner(xGroup, SWT.BORDER);
 		xNumSpinner.setLayoutData(getSpinnerData());
 		xNumSpinner.setMaximum(maxXNum);
 		xNumSpinner.setMinimum(minXNum);
 		xNumSpinner.setSelection(minXNum);
-		
+
 		xNumSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int fromSelection = xNumSpinner.getSelection();
-				
+
 				if(fromSelection < minXNum){
 					xNumSpinner.setSelection(minXNum);
 				}else if(fromSelection > maxXNum){
@@ -80,7 +81,7 @@ public void widgetSelected(SelectionEvent e) {
 		layoutGroup.setLayout(new GridLayout());
 		layoutGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		layoutGroup.setText(TuxGuitar.getProperty("abc.options.layout.tip"));
-		
+
 		final Button trackNameCheck = new Button(layoutGroup,SWT.CHECK);
 		trackNameCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackNameCheck.setSelection(settings.isTrackNameEnabled());
@@ -95,39 +96,40 @@ public void widgetSelected(SelectionEvent e) {
 		textsCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		textsCheck.setSelection(settings.isTextEnabled());
 		textsCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-texts"));
-		
+
 		final Button chordDiagramsCheck = new Button(layoutGroup,SWT.CHECK);
 		chordDiagramsCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		chordDiagramsCheck.setSelection(settings.isChordDiagramEnabled());
 		chordDiagramsCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-chord-diagrams"));
-		
+
 		final Button chordTracksCheck = new Button(layoutGroup,SWT.CHECK);
 		chordTracksCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		chordTracksCheck.setSelection(settings.isChordEnabled());
 		chordTracksCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-chord-tracks"));
-		
+
 		final Button droneTrackCheck = new Button(layoutGroup,SWT.CHECK);
 		droneTrackCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		droneTrackCheck.setSelection(settings.isDroneEnabled());
 		droneTrackCheck.setText(TuxGuitar.getProperty("abc.options.layout.enable-drone-track"));
-		
+
 		final Button instrCheck = new Button(layoutGroup,SWT.CHECK);
 		instrCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		instrCheck.setSelection(settings.isInstrumentsStartAt1());
 		instrCheck.setText(TuxGuitar.getProperty("abc.options.layout.instruments-start-at-1"));
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true,2,1));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				ABCImportSettingsDialog.this.status = STATUS_ACCEPTED;
-				
+
 				settings.setX(xNumSpinner.getSelection());
 				settings.setTrackNameEnabled( trackNameCheck.getSelection() );
 				settings.setChordDiagramEnabled(chordDiagramsCheck.getSelection());
@@ -137,41 +139,42 @@ public void widgetSelected(SelectionEvent arg0) {
 				settings.setTextEnabled(textsCheck.getSelection());
 				settings.setInstrumentsStartAt1(instrCheck.getSelection());
 				settings.check();
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				ABCImportSettingsDialog.this.status = STATUS_CANCELLED;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return ( ( this.status == STATUS_ACCEPTED )? settings : null );
 	}
-	
+
 	private GridLayout getColumnLayout(){
 		GridLayout layout = new GridLayout();
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
 		return layout;
 	}
-	
+
 	private GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.CENTER,true,true);
 		data.minimumWidth = 60;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCInputStream.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCInputStream.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCInputStream.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCInputStream.java
index 8b146c38..1e16f110 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCInputStream.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCInputStream.java
@@ -8,7 +8,7 @@
 import org.herac.tuxguitar.io.base.TGFileFormatException;
 
 public class ABCInputStream {
-	
+
 	private static final int OUTSIDE = 0;
 	private static final int SKIPX = 1;
 	private static final int INHEAD = 2;
@@ -24,7 +24,7 @@ public class ABCInputStream {
 	private String line;
 	private int putback;
 	private ABCSettings settings;
-	
+
 	public ABCInputStream(InputStream stream,ABCSettings settings){
 		this.stream            = stream;
 		this.putback           = EMPTY;
@@ -47,9 +47,9 @@ public ABCSong readSong() throws TGFileFormatException{
 						this.song.setX(Integer.parseInt(line.substring(2).trim(), 10));
 					}
 				}
-				else { 
+				else {
 					if(this.state==OUTSIDE) {
-						if(this.line.startsWith("U:")) this.song.addRedefinable(line.substring(2).trim());			
+						if(this.line.startsWith("U:")) this.song.addRedefinable(line.substring(2).trim());
 						else if(this.line.startsWith("m:")) this.song.addMacro(line.substring(2).trim());
 					}
 				}
@@ -89,7 +89,7 @@ public ABCSong readSong() throws TGFileFormatException{
 					  d:  body Decorations. d:!pp! * * !mf! * !ff!
 					  s:  body inline symbols. s:+pp+ * * +mf+ * +ff+
 					  w:  body inline lyrics. w:Help! I need...
-					 */	
+					 */
 					if(this.line.startsWith("A:")) this.song.setArea(line.substring(2).trim());
 					else if(this.line.startsWith("B:")) this.song.setBook(line.substring(2).trim());
 					else if(this.line.startsWith("C:")) this.song.setComponist(line.substring(2).trim());
@@ -132,7 +132,7 @@ else if(this.line.startsWith("Y:")) { /* do nothing */ }
 					else if(this.line.startsWith("Z:")) this.song.setTranscriptor(line.substring(2).trim());
 					else if(this.line.startsWith("m:")) this.song.addMacro(line.substring(2).trim());
 					else if(this.line.startsWith("r:")) this.song.addRemarks(line.substring(2).trim());
-					else if(this.state == INBODY) { 
+					else if(this.state == INBODY) {
 						if(firstMusicLine) this.song.initBody();
 						firstMusicLine=false;
 						if(this.line.startsWith("d:")) this.song.addSymbols(line.substring(2).trim());
@@ -149,7 +149,7 @@ else if(this.line.matches("[a-z]:.*")) { /* do nothing */ }
 			else
 				this.state = EOF;
 		}
-		
+
 		this.close();
 		if(this.song.getEvents()==null) {
 			throw new TGFileFormatException("no music body");
@@ -248,7 +248,7 @@ private boolean readLine() {
 			}
 			if(b==LF && line.endsWith("\\")) {
 				this.line=this.line.substring(0, this.line.length()-1)+' ';
-				if(this.putback!=EMPTY) { 
+				if(this.putback!=EMPTY) {
 					this.line+=(char)this.putback;
 					this.putback=EMPTY;
 				}
@@ -267,7 +267,7 @@ protected int readByte(){
 		}
 		return 0;
 	}
-	
+
 	protected void close(){
 		try {
 			this.stream.close();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCOutputStream.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCOutputStream.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCOutputStream.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCOutputStream.java
index 93f05470..731d9667 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCOutputStream.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCOutputStream.java
@@ -14,6 +14,7 @@
 import org.herac.tuxguitar.song.models.TGBeat;
 import org.herac.tuxguitar.song.models.TGChannel;
 import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
@@ -25,12 +26,11 @@
 import org.herac.tuxguitar.song.models.TGTempo;
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.TGVoice;
 import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
 
 public class ABCOutputStream {
-	
+
 	private static final String ABC_VERSION = "ABC standard 2.0 & ABCplus-1.1.0";
 	private static final String[] ABC_KEY_SIGNATURES = new String[]{ "C","G","D","A","E","B","F#","C#","F","Bb","Eb","Ab", "Db", "Gb","Cb" };
 	private TGSongManager manager;
@@ -57,35 +57,35 @@ public class ABCOutputStream {
 	private int enters;
 	private int times;
 	private String triol;
-	
+
 	public ABCOutputStream(OutputStream stream,ABCSettings settings){
 		this.writer = new PrintWriter(stream);
 		this.settings = settings;
 		this.instrumentoffset=(settings==null) ? 1 : settings.isInstrumentsStartAt1() ? 1 : 0;
 	}
-	
+
 	public void writeSong(TGSong song){
 		this.manager = new TGSongManager();
 		this.manager.setSong(song);
 		this.channelAux = null;
-		
+
 		this.addVersion();
 		this.addPaper(song);
 		this.addSongDefinitions(song);
 		this.addSong(song);
-		
+
 		this.writer.flush();
 		this.writer.close();
 	}
-	
+
 	private void addVersion(){
 		this.writer.println("% ABC version " + ABC_VERSION + " with ABCPlus");
 	}
-	
+
 	private void addPaper(TGSong song){
 		this.writer.println("%%scale 0.66");
 	}
-	
+
 	private void addSongDefinitions(TGSong song){
 		String[] line={ "X:1" };
 		if(song.getComments()!=null) line=song.getComments().split("\\n+");
@@ -103,7 +103,7 @@ private void addSongDefinitions(TGSong song){
 		this.chordt=this.settings.getChordTrack();
 		this.baset=this.settings.getBaseTrack();
 		this.dronet=this.settings.getDroneTrack();
-		if(this.diagramt==ABCSettings.AUTO_TRACK 
+		if(this.diagramt==ABCSettings.AUTO_TRACK
 		|| this.chordt==ABCSettings.AUTO_TRACK
 		|| this.baset==ABCSettings.AUTO_TRACK
 		|| this.dronet==ABCSettings.AUTO_TRACK) {
@@ -112,7 +112,7 @@ private void addSongDefinitions(TGSong song){
 				int tnum=track.getNumber();
 				if(this.settings.getTrack() == ABCSettings.ALL_TRACKS || this.settings.getTrack() == tnum) {
 					String id = track.getName();
-					
+
 					if((tnum==this.diagramt+1 || id.indexOf('\t')<0) && !isPercussionTrack(track)) {
 						for(int j=0;j<song.countTracks();j++) {
 							TGTrack buddy=song.getTrack(j);
@@ -301,7 +301,7 @@ else if(this.baset==i+1 || id.endsWith("\tbase")) {
 		if(this.gchord!=null) this.writer.println("%%MIDI gchord "+this.gchord);
 		if(s!=null) this.writer.println(s);
 	}
-	
+
 	private String handleId(String name) {
 		if(name.indexOf('\t')<0) return name;
 		if(this.chordt==ABCSettings.NO_TRACK) name=name.replaceAll("\tchords", " chords");
@@ -342,7 +342,7 @@ private String getABCGchord(TGSong song, int m) {
 				if(n==0) b='z';
 				else {
 					if(chordt==baset && n>3) b='f';
-					else if(chordt!=baset) { 
+					else if(chordt!=baset) {
 						if(n==1) b=getABCGchordNote(song,beatb);
 						else	 b='f';
 						if(b=='G') b='f';
@@ -462,7 +462,7 @@ private char getABCGchordNote(TGSong song, TGBeat beat) {
 			while(name.length()>0 && "CDEFGAB".indexOf(name.charAt(0))<0) name=name.substring(1);
 			if(name.length()>0) {
 				name=name.split("\\s+")[0];
-				ABCChord abcChord=new ABCChord(name); 
+				ABCChord abcChord=new ABCChord(name);
 				TGNote note=null;
 				for(int v=0;v<beat.countVoices();v++) {
 					for(int i=0;i<beat.getVoice(v).countNotes();i++)
@@ -604,7 +604,7 @@ private void addSong(TGSong song) {
 			this.writer.println("%");
 		}
 	}
-	
+
 	private void handleBeginMeasure(TGMeasure measure, TGMeasure previous) {
 		// Open repeat
 		if(measure.isRepeatOpen()){
@@ -617,18 +617,18 @@ else if(measure.getHeader().getRepeatAlternative() > 0){
 		if(previous == null || measure.getTempo().getValue() != previous.getTempo().getValue()) {
 			this.addTempo(measure.getTempo());
 		}
-		
+
 		if(previous == null || measure.getClef() != previous.getClef()){
 			this.addClef(measure.getClef());
 		}
 		if(previous == null || measure.getKeySignature() != previous.getKeySignature()){
 			this.addKeySignature(measure.getKeySignature());
 		}
-		
+
 		if(previous == null || !measure.getTimeSignature().isEqual(previous.getTimeSignature())){
 			this.addTimeSignature(measure.getTimeSignature());
 		}
-		
+
 	}
 
 	private void handleEndMeasure(TGMeasure measure) {
@@ -744,7 +744,7 @@ private void addRepeatOpen(TGMeasureHeader measure){
 		if(!this.line.endsWith("|")) this.line += "[";
 		this.line += ": ";
 	}
-	
+
 	private void addRepeatAlternativeOpen(int alternatives) {
 		int bit=1;
 		String comma="[";
@@ -757,21 +757,21 @@ private void addRepeatAlternativeOpen(int alternatives) {
 			bit<<=1;
 		}
 	}
-	
+
 	private void addTempo(TGTempo tempo) {
 		this.line += "[Q:1/4=" + tempo.getValue()+"]";
 	}
-	
+
 	private void addTimeSignature(TGTimeSignature ts) {
 		this.line += "[M:" + ts.getNumerator() + "/" + ts.getDenominator().getValue()+"]";
 	}
-	
+
 	private void addKeySignature(int keySignature) {
 		if(keySignature >= 0 && keySignature < ABC_KEY_SIGNATURES.length){
 			this.line += "[K:" + ABC_KEY_SIGNATURES[keySignature] + "]";
 		}
 	}
-	
+
 	private void addClef(int clef){
 		String clefName = "";
 		if(clef == TGMeasure.CLEF_TREBLE){
@@ -790,16 +790,16 @@ else if(clef == TGMeasure.CLEF_TENOR){
 			this.line += "[V:"+vId+" clef="+clefName+"]";
 		}
 	}
-	
+
 	private void addMeasureComponents(TGMeasure measure,int voice){
 		this.line += " ";
 		this.addComponents(measure,voice);
 	}
-	
+
 	private void addComponents(TGMeasure measure,int vIndex){
 		int key = measure.getKeySignature();
 		TGBeat previous = null;
-		
+
 		for(int i = 0 ; i < measure.countBeats() ; i ++){
 			TGBeat beat = measure.getBeat( i );
 			TGVoice voice = beat.getVoice( vIndex );
@@ -808,16 +808,16 @@ private void addComponents(TGMeasure measure,int vIndex){
 				previous = beat;
 			}
 		}
-		// It Means that all voice beats are empty 
+		// It Means that all voice beats are empty
 		if( previous == null ){
 			int ticks=(int) (measure.getTimeSignature().getDenominator().getTime() * measure.getTimeSignature().getNumerator());
 			int eight=(int) (TGDuration.QUARTER_TIME/2);
 			this.line += "x"+String.valueOf(ticks/eight);
 		}
-		
+
 	}
-	
-	private void addBeat(int key,TGBeat beat, TGVoice voice){		
+
+	private void addBeat(int key,TGBeat beat, TGVoice voice){
 		// Add Chord, if was not previously added in another voice
 		if( beat.isChordBeat() && voice.getIndex()==0) {
 			String name=beat.getChord().getName().replaceAll("[^ -~]", " ").trim();
@@ -827,7 +827,7 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 				this.line += "\""+name+"\"";
 			}
 		}
-		
+
 		if(voice.isRestVoice()){
 			boolean skip = false;
 			for( int v = 0 ; v < beat.countVoices() ; v ++ ){
@@ -844,8 +844,8 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 		}
 		else{
 			this.addEffectsBeforeBeat(voice);
-			
-			
+
+
 			int size = voice.countNotes();
 			this.addTrioles(voice.getDuration());
 			this.addEffectsOnBeat( voice );
@@ -854,24 +854,24 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 			String tie="";
 			for(int i = 0 ; i < size ; i ++){
 				TGNote note = voice.getNote(i);
-				
+
 				this.addEffectsBeforeNote(note);
-				
+
 				this.addKey(key, (beat.getMeasure().getTrack().getString(note.getString()).getValue() + note.getValue()) );
 				if(this.isAnyTiedTo(note)){
 					tie = "-";
 				}
-				
+
 				this.addEffectsOnNote(note.getEffect());
-				
+
 			}
-			
+
 			if(size > 1) this.line += "]";
-			
+
 			this.addDuration( voice.getDuration() );
 			this.line += tie;
 		}
-		
+
 		// Add Text, if was not previously added in another voice
 		boolean skip = false;
 		for( int v = 0 ; v < voice.getIndex() ; v ++ ){
@@ -887,10 +887,10 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 				this.wline+=" *";
 			}
 		}
-		
+
 		this.line += " ";
 	}
-	
+
 	private void addTrioles(TGDuration duration) {
 		TGDivisionType dt=duration.getDivision();
 		int times=dt.getTimes();
@@ -901,7 +901,7 @@ private void addTrioles(TGDuration duration) {
 		else {
 			if(this.enterstogo==0) {
 				this.enterstogo=enters;
-				this.triol = "("+enters+":"+times+":"+enters; 
+				this.triol = "("+enters+":"+times+":"+enters;
 				this.line += this.triol+" ";
 			}
 			this.enters=enters;
@@ -941,7 +941,7 @@ private void addKey(int keySignature,int value){
 		int i=this.line.lastIndexOf('|')+1;
 		this.line += scanMeasure(this.line.substring(i),pitch);
 	}
-	
+
 	private String scanMeasure(String m, String pitch) {
 		char c=pitch.charAt(0);
 		switch(c) {
@@ -978,7 +978,7 @@ private String scanMeasure(String m, String pitch) {
 	private void addDuration(TGDuration duration){
 		this.line += getABCDuration(duration);
 	}
-	
+
 	private void addEffectsBeforeNote(TGNote note){
 		TGNoteEffect effect = note.getEffect();
 		if( effect.isDeadNote() ){
@@ -995,13 +995,13 @@ private void addEffectsBeforeNote(TGNote note){
 			this.line += "+upbow+";
 		}
 	}
-	
+
 	private void addEffectsOnNote(TGNoteEffect effect){
 		if( effect.isHarmonic() ){
 			this.line += "\"_harmonic\"";
 		}
 	}
-	
+
 	private void addEffectsOnDuration(TGVoice voice){
 		int tremoloPicking = -1;
 		for( int i = 0 ; i < voice.countNotes() ; i ++ ){
@@ -1014,7 +1014,7 @@ private void addEffectsOnDuration(TGVoice voice){
 			this.line += "+trill+";
 		}
 	}
-	
+
 	private void addEffectsOnBeat(TGVoice voice){
 		boolean trill = false;
 		boolean vibrato = false;
@@ -1024,7 +1024,7 @@ private void addEffectsOnBeat(TGVoice voice){
 		boolean arpeggio = ( voice.getBeat().getStroke().getDirection() != TGStroke.STROKE_NONE );
 		for( int i = 0 ; i < voice.countNotes() ; i ++ ){
 			TGNoteEffect effect = voice.getNote(i).getEffect();
-			
+
 			trill = (trill || effect.isTrill() );
 			vibrato = (vibrato || effect.isVibrato() );
 			staccato = (staccato || effect.isStaccato() );
@@ -1050,9 +1050,9 @@ private void addEffectsOnBeat(TGVoice voice){
 			this.line += "+arpeggio+";
 		}
 	}
-	
+
 	private void addEffectsBeforeBeat(TGVoice voice){
-		List graceNotes = new ArrayList();
+		List<TGNote> graceNotes = new ArrayList<TGNote>();
 		for( int i = 0 ; i < voice.countNotes() ; i ++ ){
 			TGNote note = voice.getNote(i);
 			if( note.getEffect().isGrace() ){
@@ -1061,14 +1061,14 @@ private void addEffectsBeforeBeat(TGVoice voice){
 		}
 		if( !graceNotes.isEmpty() ){
 			this.line += "{";
-			
+
 			int duration = 0;
 			for( int i = 0 ; i < graceNotes.size() ; i ++ ){
-				TGNote note = (TGNote)graceNotes.get( i );
+				TGNote note = graceNotes.get( i );
 				TGMeasure measure = voice.getBeat().getMeasure();
 				TGString string = measure.getTrack().getString(note.getString());
 				TGEffectGrace grace = note.getEffect().getGrace();
-				
+
 				if( duration < TGDuration.SIXTY_FOURTH && grace.getDuration() == 1 ){
 					duration = TGDuration.SIXTY_FOURTH;
 				}else if( duration < TGDuration.THIRTY_SECOND && grace.getDuration() == 2 ){
@@ -1081,22 +1081,22 @@ private void addEffectsBeforeBeat(TGVoice voice){
 			this.line += "}";
 		}
 	}
-	
+
 	private boolean isAnyTiedTo(TGNote note){
 		TGMeasure measure = note.getVoice().getBeat().getMeasure();
 		TGBeat beat = this.manager.getMeasureManager().getNextBeat( measure.getBeats(), note.getVoice().getBeat());
 		while( measure != null){
 			while( beat != null ){
 				TGVoice voice = beat.getVoice(0);
-				
+
 				// If is a rest beat, all voice sounds must be stopped.
 				if(voice.isRestVoice()){
 					return false;
 				}
 				// Check if is there any note at same string.
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while( it.hasNext() ){
-					TGNote current = (TGNote) it.next();
+					TGNote current = it.next();
 					if(current.getString() == note.getString()){
 						return current.isTiedNote();
 					}
@@ -1110,7 +1110,7 @@ private boolean isAnyTiedTo(TGNote note){
 		}
 		return false;
 	}
-	
+
 	private String getABCKey(int keySignature , int value){
 		final String[][] ABC_SCALE = {
 				{ "B", "c", "=d", "d", "=e", "e", "f", "=g", "g", "=a", "a", "=b" } ,	// 7 sharps
@@ -1147,7 +1147,7 @@ private String getABCKey(int keySignature , int value){
 		}
 		return key;
 	}
-	
+
 	private String getABCDuration(TGDuration value) {
 		int ticks=getTime(value);
 		int eight=(int) (TGDuration.QUARTER_TIME/2);
@@ -1160,7 +1160,7 @@ private String getABCDuration(TGDuration value) {
 		duration+="/"+Integer.toString(d);
 		return duration;
 	}
-	
+
 	private int getTime(TGDuration value) {
 		long time = (long)( TGDuration.QUARTER_TIME * ( 4.0f / value.getValue()) ) ;
 		if(value.isDotted()){
@@ -1170,7 +1170,7 @@ private int getTime(TGDuration value) {
 		}
 		return (int)time;
 	}
-	
+
 	protected TGChannel getChannel( TGTrack track ){
 		TGChannel tgChannel = this.manager.getChannel( track.getChannelId() );
 		if( tgChannel != null ){
@@ -1184,9 +1184,9 @@ protected TGChannel getChannel( TGTrack track ){
 		}
 		return this.channelAux;
 	}
-	
+
 	private boolean isPercussionTrack(TGTrack track){
 		return this.manager.isPercussionChannel(track.getChannelId());
-	
+
 	}
 }
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginExporter.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginExporter.java
similarity index 90%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginExporter.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginExporter.java
index 12d72381..04ee128b 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginExporter.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginExporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class ABCPluginExporter extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new ABCSongExporter();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Peter Grootswagers <pgrootswagers@planet.nl>";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "ABC 2.10.5 exporter plugin";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "ABC exporter";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginImporter.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginImporter.java
similarity index 90%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginImporter.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginImporter.java
index 3b25734e..107bde61 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCPluginImporter.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginImporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawImporter;
 
 public class ABCPluginImporter extends TGImporterPlugin{
-	
+
+	@Override
 	protected TGRawImporter getImporter() {
 		return new ABCSongImporter();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Peter Grootswagers <pgrootswagers@planet.nl>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "ABCF file format importer";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "ABCF file format importer";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginList.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginList.java
new file mode 100644
index 00000000..fa8acf5d
--- /dev/null
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCPluginList.java
@@ -0,0 +1,38 @@
+package org.herac.tuxguitar.io.abc;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
+import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
+
+public class ABCPluginList extends TGPluginList{
+
+	@Override
+	protected List<TGPlugin> getPlugins() {
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
+		plugins.add(new ABCPluginImporter());
+		plugins.add(new ABCPluginExporter());
+		return plugins;
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Peter Grootswagers <pgrootswagers@planet.nl>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "ABC file format import-export plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "ABC file format import-export plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+}
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSettings.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSettings.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSettings.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSettings.java
index 575717e1..bf905c6f 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSettings.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSettings.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.io.abc;
 
 public class ABCSettings {
-	
+
 	public static final int ALL_TRACKS = -1;
 	public static final int FIRST_MEASURE = -1;
 	public static final int LAST_MEASURE = -1;
 	public static final int AUTO_MEASURES = 0;
 	public static final int AUTO_TRACK = 0;
 	public static final int NO_TRACK = -2;
-	
+
 	private int x = 1;
 	private int track;
-	private int measureFrom;	
+	private int measureFrom;
 	private int measureTo;
 	private int measuresPerLine;
 	private int diagramTrack;
@@ -29,87 +29,87 @@ public class ABCSettings {
 	private boolean chordEnabled;
 	private boolean droneEnabled;
 	private boolean textEnabled;
-	
+
 	public ABCSettings(){
 		super();
 	}
-	
+
 	public int getMeasureFrom() {
 		return this.measureFrom;
 	}
-	
+
 	public void setMeasureFrom(int measureFrom) {
 		this.measureFrom = measureFrom;
 	}
-	
+
 	public int getMeasureTo() {
 		return this.measureTo;
 	}
-	
+
 	public void setMeasureTo(int measureTo) {
 		this.measureTo = measureTo;
 	}
-	
+
 	public int getTrack() {
 		return this.track;
 	}
-	
+
 	public void setTrack(int track) {
 		this.track = track;
 	}
-	
+
 	public boolean isTrackGroupEnabled() {
 		return this.trackGroupEnabled;
 	}
-	
+
 	public void setTrackGroupEnabled(boolean trackGroupEnabled) {
 		this.trackGroupEnabled = trackGroupEnabled;
 	}
-	
+
 	public boolean isTrackNameEnabled() {
 		return this.trackNameEnabled;
 	}
-	
+
 	public void setTrackNameEnabled(boolean trackNameEnabled) {
 		this.trackNameEnabled = trackNameEnabled;
 	}
-	
+
 	public boolean isScoreEnabled() {
 		return this.scoreEnabled;
 	}
-	
+
 	public void setScoreEnabled(boolean scoreEnabled) {
 		this.scoreEnabled = scoreEnabled;
 	}
-	
+
 	public boolean isTablatureEnabled() {
 		return this.tablatureEnabled;
 	}
-	
+
 	public void setTablatureEnabled(boolean tablatureEnabled) {
 		this.tablatureEnabled = tablatureEnabled;
 	}
-	
+
 	public boolean isLyricsEnabled() {
 		return this.lyricsEnabled;
 	}
-	
+
 	public void setLyricsEnabled(boolean lyricsEnabled) {
 		this.lyricsEnabled = lyricsEnabled;
 	}
-	
+
 	public boolean isChordDiagramEnabled() {
 		return this.chordDiagramEnabled;
 	}
-	
+
 	public void setChordDiagramEnabled(boolean chordDiagramEnabled) {
 		this.chordDiagramEnabled = chordDiagramEnabled;
 	}
-	
+
 	public boolean isTextEnabled() {
 		return this.textEnabled;
 	}
-	
+
 	public void setTextEnabled(boolean textEnabled) {
 		this.textEnabled = textEnabled;
 	}
@@ -120,7 +120,7 @@ public void check(){
 			this.setTablatureEnabled( true );
 		}
 	}
-	
+
 	public static ABCSettings getDefaults(){
 		ABCSettings settings = new ABCSettings();
 		settings.setX(1);
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSongExporter.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSongExporter.java
similarity index 94%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSongExporter.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSongExporter.java
index 8505a789..98e8794f 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSongExporter.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSongExporter.java
@@ -8,27 +8,32 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class ABCSongExporter implements TGLocalFileExporter{
-	
+
 	private OutputStream stream;
 	private ABCSettings settings;
-	
+
+	@Override
 	public String getExportName() {
 		return "Abc";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Abc","*.abc");
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		this.settings = (setDefaults ? ABCSettings.getDefaults() : new ABCExportSettingsDialog().open());
 		return (this.settings != null);
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) {
 		if(this.stream != null && this.settings != null){
 			new ABCOutputStream(this.stream,this.settings).writeSong(song);
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSongImporter.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSongImporter.java
similarity index 97%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSongImporter.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSongImporter.java
index 2b92a63f..ebc4c051 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/ABCSongImporter.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/ABCSongImporter.java
@@ -3,21 +3,22 @@
 import java.io.InputStream;
 import java.util.Iterator;
 
-import org.herac.tuxguitar.io.base.TGFileFormat;
-import org.herac.tuxguitar.io.base.TGFileFormatException;
-import org.herac.tuxguitar.io.base.TGLocalFileImporter;
 import org.herac.tuxguitar.io.abc.base.ABCChord;
-import org.herac.tuxguitar.io.abc.base.ABCLocation;
 import org.herac.tuxguitar.io.abc.base.ABCEvent;
+import org.herac.tuxguitar.io.abc.base.ABCLocation;
 import org.herac.tuxguitar.io.abc.base.ABCSong;
 import org.herac.tuxguitar.io.abc.base.ABCTimeSignature;
 import org.herac.tuxguitar.io.abc.base.ABCTrack;
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGLocalFileImporter;
 import org.herac.tuxguitar.song.factory.TGFactory;
 import org.herac.tuxguitar.song.managers.TGSongManager;
 import org.herac.tuxguitar.song.models.TGBeat;
 import org.herac.tuxguitar.song.models.TGChannel;
 import org.herac.tuxguitar.song.models.TGChord;
 import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGMarker;
 import org.herac.tuxguitar.song.models.TGMeasure;
@@ -31,11 +32,10 @@
 import org.herac.tuxguitar.song.models.TGText;
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
 
 public class ABCSongImporter implements TGLocalFileImporter{
-	
+
 	public static final int[][] PERCUSSION_TUNINGS = new int[][]{
 		new int[]{ 32 },
 		new int[]{ 49, 32 },
@@ -45,35 +45,40 @@ public class ABCSongImporter implements TGLocalFileImporter{
 		new int[]{ 49, 51, 42, 50, 45, 37 },
 		new int[]{ 49, 51, 42, 50, 45, 37, 41 },
 	};
-	
+
 	protected TGSongManager manager;
 	protected InputStream stream;
 
 	private ABCSettings settings;
-	
+
 	public ABCSongImporter(){
 		super();
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("ABC","*.abc");
 	}
-	
+
+	@Override
 	public String getImportName() {
 		return "ABC";
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults){
 		this.settings = (setDefaults ? ABCSettings.getDefaults() : new ABCImportSettingsDialog().open());
 		return (this.settings != null);
 	}
-	
-	
+
+
+	@Override
 	public void init(TGFactory factory,InputStream stream) {
 		this.manager = new TGSongManager(factory);
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public TGSong importSong() throws TGFileFormatException {
 		try {
 			if( this.manager != null && this.stream != null ){
@@ -84,17 +89,17 @@ public TGSong importSong() throws TGFileFormatException {
 		}
 		throw new TGFileFormatException();
 	}
-	
+
 	private TGSong parseSong(ABCSong song){
 		song.sortEvents();
 		this.newTGSong(song);
 		this.addMeasureValues(song);
 		this.addTrackValues(song.getTracks());
 		this.addComponents(song);
-		
+
 		return new TGSongAdjuster(this.manager).process();
 	}
-	
+
 	private void newTGSong(ABCSong song) {
 		int tracks=song.getTracks().length;
 		int measures=song.getMeasures();
@@ -153,7 +158,7 @@ private void newTGSong(ABCSong song) {
 			}
 		}
 	}
-	
+
 	private void addMeasureValues(ABCSong song){
 		for(int i = 0; i < this.manager.getSong().countMeasureHeaders(); i ++){
 			TGTimeSignature timeSignature = this.manager.getFactory().newTimeSignature();
@@ -172,11 +177,11 @@ private void addMeasureValues(ABCSong song){
 			this.manager.changeTripletFeel(header, TGMeasureHeader.TRIPLET_FEEL_EIGHTH, true);
 		}
 	}
-	
+
 	private void addTrackValues(ABCTrack[] tracks){
 		for(int i = 0; i < tracks.length; i ++){
 			TGTrack track = this.manager.getSong().getTrack(i);
-			
+
 			TGChannel tgChannel = this.manager.addChannel();
 			tgChannel.setVolume((short) 127);
 			tgChannel.setBalance((short)(( tracks[i].getPan() * 127) / 15));
@@ -188,7 +193,7 @@ private void addTrackValues(ABCTrack[] tracks){
 			track.setName(tracks[i].getName());
 			track.getStrings().clear();
 			int strings[] = tracks[i].getStrings();
-			
+
 			for(int j = 0; j < strings.length;j ++){
 				if(j >= 7){
 					break;
@@ -202,13 +207,13 @@ private void addTrackValues(ABCTrack[] tracks){
 			}
 		}
 	}
-	
+
 	private void addComponents(ABCSong song){
 		ABCTrack[] tracks = song.getTracks();
-		Iterator it = song.getEvents().iterator();
+		Iterator<ABCLocation> it = song.getEvents().iterator();
 		while(it.hasNext()){
-			ABCLocation component = (ABCLocation)it.next();
-			
+			ABCLocation component = it.next();
+
 			if(component.getMeasure() >= 0 && component.getMeasure() < this.manager.getSong().countMeasureHeaders()){
 				for(int i = 0; i < tracks.length; i ++){
 					if( component.getTrack()==i ) {
@@ -356,7 +361,7 @@ private void addDecoration(ABCLocation component, TGMeasure tgMeasure) {
 					marker.setTitle(m);
 				else
 					marker.setTitle(m+" | Coda");
-				
+
 			}
 			else
 				marker.setTitle("Coda");
@@ -401,21 +406,21 @@ private TGBeat getBeat(TGMeasure measure, long start){
 		}
 		return beat;
 	}
-	
+
 	private long getStart(TGDuration duration, TGMeasure measure,int position){
 		float fixedPosition = (position*64)/ABCSong.TICKS_PER_QUART;
 		if(duration != null && !duration.getDivision().isEqual(TGDivisionType.NORMAL)){
 			fixedPosition = (( fixedPosition - (fixedPosition % 64)) + ((((fixedPosition % 64) * 2) * 2) / 3) );
 		}
 		long start = ((long) (measure.getStart() + ( (fixedPosition * TGDuration.QUARTER_TIME)  / 64)) );
-		
+
 		return start;
 	}
-	
+
 	private TGDuration getDuration(int duration){
 		return TGDuration.fromTime(this.manager.getFactory(), ticksToTime(duration));
 	}
-	
+
 	private int ticksToTime(int tcks) {
 		return (int) ((tcks*TGDuration.QUARTER_TIME)/ABCSong.TICKS_PER_QUART);
 	}
@@ -466,7 +471,7 @@ private void addNote(ABCTrack track,ABCLocation component,int string,int strings
 		if(e.isGrace()) {
 			for(int i=0;i<tgBeat.getVoice(0).countNotes();i++) {
 				TGNote n=tgBeat.getVoice(0).getNote(i);
-				if(n.getString()==tgNote.getString()) 
+				if(n.getString()==tgNote.getString())
 					n.setEffect(tgNote.getEffect().clone(factory));
 			}
 		}
@@ -481,12 +486,12 @@ private void addNote(ABCTrack track,ABCLocation component,int string,int strings
 			tgBeat.getVoice(0).addNote(tgNote);
 		}
 	}
-	
+
 	private void addChord(ABCChord[] chords,ABCLocation component,TGTrack tgTrack,TGMeasure tgMeasure){
 		if(component.getEvent().getChordnum() >= 0 && component.getEvent().getChordnum() < chords.length){
 			ABCChord chord = chords[component.getEvent().getChordnum()];
 			byte[] strings = chord.getStrings();
-			
+
 			TGChord tgChord = this.manager.getFactory().newChord(tgTrack.stringCount());
 			tgChord.setName(chord.getName());
 			for(int i = 0; i < tgChord.countStrings(); i ++){
@@ -499,39 +504,39 @@ private void addChord(ABCChord[] chords,ABCLocation component,TGTrack tgTrack,TG
 			}
 		}
 	}
-	
+
 }
 
 class TGSongAdjuster{
-	
+
 	protected TGSongManager manager;
-	
+
 	public TGSongAdjuster(TGSongManager manager){
 		this.manager = manager;
 	}
-	
+
 	public TGSong process(){
-		Iterator tracks = this.manager.getSong().getTracks();
+		Iterator<TGTrack> tracks = this.manager.getSong().getTracks();
 		while(tracks.hasNext()){
-			TGTrack track = (TGTrack)tracks.next();
-			Iterator measures = track.getMeasures();
+			TGTrack track = tracks.next();
+			Iterator<TGMeasure> measures = track.getMeasures();
 			while(measures.hasNext()){
-				TGMeasure measure = (TGMeasure)measures.next();
+				TGMeasure measure = measures.next();
 				this.process(measure);
 			}
 		}
 		return this.manager.getSong();
 	}
-	
+
 	public void process(TGMeasure measure){
 		this.manager.getMeasureManager().orderBeats(measure);
 		this.adjustBeats(measure);
 	}
-	
+
 	public void adjustBeats(TGMeasure measure){
 		TGBeat previous = null;
 		boolean finish = true;
-		
+
 		long measureStart = measure.getStart();
 		long measureEnd = (measureStart + measure.getLength());
 		for(int i = 0;i < measure.countBeats();i++){
@@ -541,7 +546,7 @@ public void adjustBeats(TGMeasure measure){
 			if(previous != null){
 				long previousStart = previous.getStart();
 				long previousLength = previous.getVoice(0).getDuration().getTime();
-				
+
 				// check for a chord in a rest beat
 				if( beat.getVoice(0).isRestVoice() && beat.isChordBeat() ){
 					TGBeat candidate = null;
@@ -562,7 +567,7 @@ public void adjustBeats(TGMeasure measure){
 					finish = false;
 					break;
 				}
-				
+
 				// check the duration
 				if(previousStart < beatStart && (previousStart + previousLength) > beatStart){
 					if(beat.getVoice(0).isRestVoice()){
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCChord.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCChord.java
similarity index 99%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCChord.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCChord.java
index 47bcecfe..476b1ed0 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCChord.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCChord.java
@@ -7,7 +7,7 @@ public class ABCChord {
 	private static final String GCHORDNOTESET = "fghijklGHIJ";
 
 	private static final ChordInfo[] data = new ChordInfo[]{
-		
+
 
 		new ChordInfo("",      new int[]{ 1, 5, 8 }),		// Major
 		new ChordInfo("7",     new int[]{ 1, 5, 8, 11 }),
@@ -25,7 +25,7 @@ public class ABCChord {
 		new ChordInfo("dim7",  new int[]{ 1, 4, 7, 10 }),
 		new ChordInfo("aug",   new int[]{ 1, 5, 9 }),
 		new ChordInfo("5",     new int[]{ 1, 8 }),
-//		from here extending ChordDataBase 
+//		from here extending ChordDataBase
 		new ChordInfo("M7",    new int[]{ 1, 5, 8, 12 }),
 		new ChordInfo("+",     new int[]{ 1, 5, 9 }),
 		new ChordInfo("aug7",  new int[]{ 1, 5, 9, 11 }),
@@ -44,21 +44,21 @@ public class ABCChord {
 		new ChordInfo("9sus4", new int[]{ 1, 6, 11, 15, 20 }),
 		new ChordInfo("5",     new int[]{ 1, 8 }),
 		new ChordInfo("13",    new int[]{ 1, 5, 8, 11, 17, 21 }),
-		
+
 	};
-	
+
 	private byte[] strings;
 	private String name;
 	private String[] chordnote;
 	private int size;
 
 	private int[] gchordnote;
-	
+
 	public ABCChord(String name){
 		this.name = name.substring(0, 1).toUpperCase()+name.substring(1);
 		plotChord(this.name);
 	}
-	
+
 	private void plotChord(String name) {
 		String base,variant,root;
 		if(name.length()>1 && (name.charAt(1)=='#' || name.charAt(1)=='b')) {
@@ -165,15 +165,16 @@ private void initChord(ChordInfo info, String base, String root) {
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public byte[] getStrings() {
 		return this.strings;
 	}
-	
+
 	public int size() {
 		return this.size;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[CHORD]");
 		string += "\n     Name:       " + getName();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponent.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponent.java
similarity index 96%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponent.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponent.java
index ba357779..f36d1204 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponent.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponent.java
@@ -1,27 +1,27 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public abstract class ABCComponent {
-	
+
 	private int position;
-	
+
 	private int measure;
-	
+
 	private int string;
-	
+
 	public ABCComponent(int position,int measure, int string) {
 		this.position = position;
 		this.measure = measure;
 		this.string = string;
 	}
-	
+
 	public int getPosition() {
 		return this.position;
 	}
-	
+
 	public int getMeasure() {
 		return this.measure;
 	}
-	
+
 	public int getString() {
 		return this.string;
 	}
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponentChord.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponentChord.java
similarity index 97%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponentChord.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponentChord.java
index 062499bb..1e9d80ae 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponentChord.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponentChord.java
@@ -1,18 +1,19 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCComponentChord extends ABCComponent{
-	
+
 	private int chord;
-	
+
 	public ABCComponentChord(int position,int measure, int string, int chord) {
 		super(position, measure, string);
 		this.chord = chord;
 	}
-	
+
 	public int getChord() {
 		return this.chord;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[NOTE]");
 		string += "\n     Measure:   " + getMeasure();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponentNote.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponentNote.java
similarity index 97%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponentNote.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponentNote.java
index f77fb17e..959606c2 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCComponentNote.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCComponentNote.java
@@ -1,15 +1,15 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCComponentNote extends ABCComponent{
-	
+
 	private int fret;
-	
+
 	private int duration;
-	
+
 	private int dynamic;
-	
+
 	private int effect;
-	
+
 	public ABCComponentNote(int position,int measure, int string, int fret, int duration, int dynamic, int effect) {
 		super(position, measure, string);
 		this.fret = fret;
@@ -17,30 +17,31 @@ public ABCComponentNote(int position,int measure, int string, int fret, int dura
 		this.dynamic = dynamic;
 		this.effect = effect;
 	}
-	
+
 	public int getDuration() {
 		return this.duration;
 	}
-	
+
 	public int getDynamic() {
 		return this.dynamic;
 	}
-	
+
 	public int getEffect() {
 		return this.effect;
 	}
-	
+
 	public int getFret() {
 		return this.fret;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[NOTE]");
 		string += "\n     Measure:   " + getMeasure();
 		string += "\n     Position:  " + getPosition();
 		string += "\n     String:    " + getString();
 		string += "\n     Fret:      " + getFret();
-		
+
 		return string;
 	}
 }
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCEvent.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCEvent.java
similarity index 94%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCEvent.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCEvent.java
index e7a1658b..8179f4f1 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCEvent.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCEvent.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.io.abc.base;
 
@@ -9,7 +9,7 @@
  * @author peter
  *
  */
-public class ABCEvent implements Comparable {
+public class ABCEvent implements Comparable<Object> {
 	// types
 	public static final int BAR = 0;
 	public static final int BAR_BAR = 1;
@@ -103,7 +103,7 @@ public class ABCEvent implements Comparable {
 	public static final int DRONEON = -11;
 	public static final int DRONEOFF = -12;
 	public static final int DRONE = -13;
-	
+
 	private String name;
 	private int type;
 	private int pitch;
@@ -120,8 +120,8 @@ public class ABCEvent implements Comparable {
 	private int tripletP;
 	private int tripletQ;
 	private int tripletR;
-	private ArrayList lyrics;
-	
+	private ArrayList<String> lyrics;
+
 	public ABCEvent(int type, String parm, int value) {
 		this.type=type;
 		this.name=parm;
@@ -152,7 +152,7 @@ public ABCEvent(ABCSong song, String name) {
 		triplet=false;
 		switch(a[0]) {
 		default: type=NOT_RELEVANT; i=1;break;
-		case '|': 
+		case '|':
 			if(a[1]==':') {
 				type=REPEAT_BEGIN;
 				i=2;
@@ -171,7 +171,7 @@ public ABCEvent(ABCSong song, String name) {
 			type=BAR;
 			i=1;
 			break;
-		case '[': 
+		case '[':
 			if(a[1]=='|') {
 				type=FATBAR_BAR;
 				i=2;
@@ -213,15 +213,15 @@ public ABCEvent(ABCSong song, String name) {
 			type=CHORD_BEGIN;
 			i=1;
 			break;
-		case ':': 
-			if(a[1]==':') 
-				type=REPEAT_END_AND_START; 
-			else 
+		case ':':
+			if(a[1]==':')
+				type=REPEAT_END_AND_START;
+			else
 				type=REPEAT_END;
 			i=2;
 			break;
 		case '"':// preceded by one of five symbols ^, _, <, > or @ which controls where the annotation is to be placed
-			if("^_<>@".indexOf(a[1])<0) 
+			if("^_<>@".indexOf(a[1])<0)
 				type=CHORD_SYMBOL;
 			else
 				type=ANNOTATION;
@@ -247,7 +247,7 @@ public ABCEvent(ABCSong song, String name) {
 			while(i<a.length && "![:]| \t".indexOf(a[i])<0) ++i;
 			if(i<a.length && a[i]=='!') ++i;
 			else {
-				type=LINE_BREAK;	// old school ABC 
+				type=LINE_BREAK;	// old school ABC
 				i=1;
 			}
 			break;
@@ -271,7 +271,7 @@ public ABCEvent(ABCSong song, String name) {
 				++i;
 			}
 			if(n>0) multiplyer=n;
-			if(a[i]=='/') { 
+			if(a[i]=='/') {
 				if("0123456789".indexOf(a[i+1])>=0) {
 					n=0;
 					++i;
@@ -302,7 +302,7 @@ else if(type==NOTE) {
 			setPitchStringAndFret(pitch,strings);
 		}
 		else if(type==DECORATION) {
-			if(this.name.equals(".")) 
+			if(this.name.equals("."))
 				pitch=STACATODOT;
 			else {
 				if(!this.name.endsWith(this.name.substring(0, 1))) this.name+=this.name.substring(0, 1);
@@ -321,6 +321,7 @@ else if(type==ANNOTATION) {
 		}
 	}
 
+	@Override
 	public Object clone() {
 		ABCEvent e=new ABCEvent(this.type, this.name, this.pitch);
 		e.ticks=this.ticks;
@@ -331,14 +332,14 @@ public Object clone() {
 		e.grace=this.grace;
 		return e;
 	}
-	
+
 	public void setPitchStringAndFret(int pitch, int[] strings) {
 		int f=0;
 		this.pitch=pitch;
 		if(strings==null) return;
 		this.string=-1;
 		this.fret=127;
-		for(int y=0;y<strings.length;y++) { 
+		for(int y=0;y<strings.length;y++) {
 			if(strings[y]<=pitch) {
 				f=pitch-strings[y];
 				if(f<this.fret) {
@@ -357,11 +358,11 @@ private int decoration(String d) {
 		if(d.equals("trill")) return TRILL; // "tr" (trill mark)
 		if(d.equals("lowermordent")) return LOWERMORDENT; // short /|/|/ squiggle with a vertical line through it
 		if(d.equals("uppermordent")) return UPPERMORDENT; // short /|/|/ squiggle
-		if(d.equals("mordent")) return LOWERMORDENT; // same as +lowermordent+ 
-		if(d.equals("pralltriller")) return UPPERMORDENT; // same as +uppermordent+ 
+		if(d.equals("mordent")) return LOWERMORDENT; // same as +lowermordent+
+		if(d.equals("pralltriller")) return UPPERMORDENT; // same as +uppermordent+
 		if(d.equals("accent")) return ACCENT; // > mark
-		if(d.equals(">")) return ACCENT; // same as +accent+ 
-		if(d.equals("emphasis")) return ACCENT; // same as +accent+ 
+		if(d.equals(">")) return ACCENT; // same as +accent+
+		if(d.equals("emphasis")) return ACCENT; // same as +accent+
 		if(d.equals("fermata")) return FERMATA; // fermata or hold (arc above dot)
 		if(d.equals("invertedfermata")) return INVERTEDFERMATA; // upside down fermata
 		if(d.equals("tenuto")) return TENUTO; // horizontal line to indicate holding note for full duration
@@ -375,7 +376,7 @@ private int decoration(String d) {
 		if(d.equals("wedge")) return WEDGE; // small filled-in wedge mark
 		if(d.equals("open")) return OPEN; // small circle above note indicating open string or harmonic
 		if(d.equals("thumb")) return THUMB; // cello thumb symbol
-		if(d.equals("snap")) return THUMB; // snap-pizzicato mark, visually similar to +thumb+ 
+		if(d.equals("snap")) return THUMB; // snap-pizzicato mark, visually similar to +thumb+
 		if(d.equals("turn")) return TURN; // a turn mark
 		if(d.equals("roll")) return ROLL; // a roll mark (arc) as used in Irish music
 		if(d.equals("breath")) return BREATH; // a breath mark (apostrophe-like) after note
@@ -411,20 +412,22 @@ private int decoration(String d) {
 		if(d.equals("upbow")) return UPBOW; // V mark
 		if(d.equals("downbow")) return DOWNBOW; // squared n mark
 //		By extension, the following decorations have been added:
-		if(d.equals("slide")) return SLIDE; 
-		if(d.equals("turnx")) return TURNX; 
-		if(d.equals("invertedturn")) return INVERTEDTURN; 
-		if(d.equals("invertedturnx")) return INVERTEDTURNX; 
-		if(d.equals("arpeggio")) return ARPEGGIO; 
-		if(d.equals("trill(")) return STARTTRILL; 
-		if(d.equals("trill)")) return ENDTRILL; 
+		if(d.equals("slide")) return SLIDE;
+		if(d.equals("turnx")) return TURNX;
+		if(d.equals("invertedturn")) return INVERTEDTURN;
+		if(d.equals("invertedturnx")) return INVERTEDTURNX;
+		if(d.equals("arpeggio")) return ARPEGGIO;
+		if(d.equals("trill(")) return STARTTRILL;
+		if(d.equals("trill)")) return ENDTRILL;
 		return 0;
 	}
 
+	@Override
 	public String toString() {
 		return name;
 	}
-	
+
+	@Override
 	public int compareTo(Object o) {
 		if(o==null) return 1;
 		if (o instanceof ABCEvent) {
@@ -650,12 +653,12 @@ public void setTriplet(int p, int q, int r) {
 	public String[] getLyrics() {
 		if(this.lyrics==null) return null;
 		String[] s=new String[lyrics.size()];
-		for(int i=0;i<s.length;i++) s[i]=(String)lyrics.get(i);
+		for(int i=0;i<s.length;i++) s[i]=lyrics.get(i);
 		return s;
 	}
 
 	public void setLyrics(String lyrics) {
-		if(this.lyrics==null) this.lyrics=new ArrayList();
+		if(this.lyrics==null) this.lyrics=new ArrayList<String>();
 		this.lyrics.add(lyrics);
 	}
 
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCInfo.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCInfo.java
similarity index 91%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCInfo.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCInfo.java
index 874b5e6b..8bf461c1 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCInfo.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCInfo.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 public class ABCInfo {
-	
+
 	private String title;
 	private String subtitle;
 	private String comments;
@@ -15,38 +15,39 @@ public class ABCInfo {
 	private String discography;
 	private String filename;
 	private String group;
-	private List history;
-	private List note;
+	private List<String> history;
+	private List<String> note;
 	private String information;
 	private String origin;
 	private String source;
 	private String transcriptor;
-	
+
 	public ABCInfo(String title, String subtitle, String comments) {
 		this.title = title;
 		this.subtitle = subtitle;
 		this.comments = comments;
 	}
-	
+
 	public String getComments() {
 		return this.comments;
 	}
-	
+
 	public String getSubtitle() {
 		return this.subtitle;
 	}
-	
+
 	public String getTitle() {
 		return this.title;
 	}
-	
+
 	public String getNotes() {
 		if(this.note==null) return null;
 		String s="";
-		for(int i=0;i<note.size();i++) s+=(String)note.get(i)+"\n";
+		for(int i=0;i<note.size();i++) s+=note.get(i)+"\n";
 		return s;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[INFO]");
 		string += "\n     Title:       " + getTitle();
@@ -115,7 +116,7 @@ public void setBook(String string) {
 		this.book=string;
 	}
 	/**
-	 * @return the book 
+	 * @return the book
 	 */
 	public String getBook() {
 		return book;
@@ -125,7 +126,7 @@ public void setDiscography(String string) {
 		this.discography=string;
 	}
 	/**
-	 * @return the discography 
+	 * @return the discography
 	 */
 	public String getDiscography() {
 		return discography;
@@ -154,7 +155,7 @@ public String getGroup() {
 	}
 
 	public void addHistory(String string) {
-		if(history==null) history=new ArrayList();
+		if(history==null) history=new ArrayList<String>();
 		history.add(string);
 	}
 
@@ -165,7 +166,7 @@ public void setInformation(String string) {
 	/**
 	 * @return the history
 	 */
-	public List getHistory() {
+	public List<String> getHistory() {
 		return history;
 	}
 
@@ -177,7 +178,7 @@ public String getInformation() {
 	}
 
 	public void addNote(String string) {
-		if(note==null) note=new ArrayList();
+		if(note==null) note=new ArrayList<String>();
 		note.add(string);
 	}
 
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCLocation.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCLocation.java
similarity index 96%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCLocation.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCLocation.java
index f94ee5fe..5edc7304 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCLocation.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCLocation.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.io.abc.base;
 
@@ -7,7 +7,7 @@
  * @author peter
  *
  */
-public class ABCLocation implements Comparable {
+public class ABCLocation implements Comparable<Object> {
 
 	private String part;
 	private int ticks;
@@ -28,6 +28,7 @@ public ABCLocation(String part, int track, int measure, int ticks, ABCChord chor
 		this.event = event;
 	}
 
+	@Override
 	public String toString() {
 		String s;
 		if(part==null) s="";
@@ -38,7 +39,7 @@ public String toString() {
 		s+=event.getName();
 		return s;
 	}
-	
+
 	/**
 	 * @return the measure
 	 */
@@ -74,6 +75,7 @@ public ABCEvent getEvent() {
 		return event;
 	}
 
+	@Override
 	public int compareTo(Object o) {
 		if(o==null) return 1;
 		if (o instanceof ABCLocation) {
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCMacro.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCMacro.java
similarity index 80%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCMacro.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCMacro.java
index 1769eba8..be92559c 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCMacro.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCMacro.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.io.abc.base;
 
@@ -8,32 +8,32 @@
  * <p>
  * <b>Macros</b>
  * <p>
- *  This standard defines an optional system of macros which is principally used to define the way in which ornament symbols 
+ *  This standard defines an optional system of macros which is principally used to define the way in which ornament symbols
  *  such as the tilde ~ are played (although it could be used for many other purposes).
- *  <p> 
- *  Software implementing these macros, should first expand the macros defined in this section, 
- *  and only afterwards apply any relevant U: replacement (see section Redefinable symbols). 
  *  <p>
- *  When these macros are stored in an ABC Header file (see section Include field), they may form a powerful library. 
+ *  Software implementing these macros, should first expand the macros defined in this section,
+ *  and only afterwards apply any relevant U: replacement (see section Redefinable symbols).
+ *  <p>
+ *  When these macros are stored in an ABC Header file (see section Include field), they may form a powerful library.
  *  <p>
  *  There are two kinds of macro, called Static and Transposing.
- *  <p> 
+ *  <p>
  * <b>Static macros</b>
  * <p>
  *  You define a static macro by writing into the tune header something like this:
- *  <p> 
+ *  <p>
  *  m: ~G3 = G{A}G{F}G
  *  <p>
- *  When you play the tune, the program searches the tune header for macro definitions, 
- *  then does a search and replace on its internal copy of the text before passing that 
- *  to the parser which plays the tune. Every occurence of ~G3 in the tune is replaced 
+ *  When you play the tune, the program searches the tune header for macro definitions,
+ *  then does a search and replace on its internal copy of the text before passing that
+ *  to the parser which plays the tune. Every occurence of ~G3 in the tune is replaced
  *  by G{A}G{F}G, and that is what gets played. Only ~G3 notes are affected,
- *  ~G2, ~g3, ~F3 etc. are ignored. 
+ *  ~G2, ~g3, ~F3 etc. are ignored.
  *  <p>
- *  You can put in as many macros as you want, and indeed, if you only use static macros 
- *  you will need to write a separate macro for each combination of pitch and note-length. 
+ *  You can put in as many macros as you want, and indeed, if you only use static macros
+ *  you will need to write a separate macro for each combination of pitch and note-length.
  *  Here is an example:
- *  <pre> 
+ *  <pre>
  * X:50
  * T:Apples in Winter
  * S:Trad, arr. Paddy O'Brien
@@ -50,10 +50,10 @@
  * [2edB def|gba ~g2e|fdB AGF|GEE E2||
  * </pre>
  * <p>
- *  Here I have put in two static macros, since there are two different notes in the tune marked with a tilde. 
+ *  Here I have put in two static macros, since there are two different notes in the tune marked with a tilde.
  *  <p>
  *  A static macro definition consists of four parts:
- *  <ul><li> 
+ *  <ul><li>
  *  the field identifier m:
  *  </li><li>
  *  the target string - e.g ~G3
@@ -63,35 +63,35 @@
  *  the replacement string - e.g. G{A}G{F}G
  *  </li></ul>
  *  <p>
- *  The target string can consist of any string up to 31 characters in length, 
- *  except that it may not include the letter 'n', for reasons which will become obvious later. 
- *  You don't have to use the tilde, but of course if you don't use a legal combination of abc, 
- *  other programs will not be able to play your tune. 
+ *  The target string can consist of any string up to 31 characters in length,
+ *  except that it may not include the letter 'n', for reasons which will become obvious later.
+ *  You don't have to use the tilde, but of course if you don't use a legal combination of abc,
+ *  other programs will not be able to play your tune.
  *  <p>
- *  The replacement string consists of any legal abc text up to 200 characters in length. 
- *  It's up to you to ensure that the target and replacement strings occupy the same time 
- *  interval (the program does not check this). Both the target and replacement strings may 
- *  have spaces embedded if necessary, but leading and trailing spaces are stripped off so 
+ *  The replacement string consists of any legal abc text up to 200 characters in length.
+ *  It's up to you to ensure that the target and replacement strings occupy the same time
+ *  interval (the program does not check this). Both the target and replacement strings may
+ *  have spaces embedded if necessary, but leading and trailing spaces are stripped off so
  *  <p>
  * m:~g2={a}g{f}g
  * <p>
- *  is perfectly OK, although less readable. 
+ *  is perfectly OK, although less readable.
  * <p><b>Transposing macros</b>
- *  If your tune has ornaments on lots of different notes, and you want them to all play 
- *  with the same ornament pattern, you can use transposing macros to achieve this. 
- *  Transposing macros are written in exactly the same way as static macros, except that 
- *  the note symbol in the target string is represented by 'n' (meaning any note) and the 
- *  note symbols in the replacement string by other letters (h to z) which are interpreted 
+ *  If your tune has ornaments on lots of different notes, and you want them to all play
+ *  with the same ornament pattern, you can use transposing macros to achieve this.
+ *  Transposing macros are written in exactly the same way as static macros, except that
+ *  the note symbol in the target string is represented by 'n' (meaning any note) and the
+ *  note symbols in the replacement string by other letters (h to z) which are interpreted
  *  according to their position in the alphabet relative to n.
- *  <p> 
- *  So, for example I could re-write the static macro m: ~G3 = G{A}G{F}G as a transposing 
- *  macro m: ~n3 = n{o}n{m}n. When the transposing macro is expanded, any note of the form 
- *  ~n3 will be replaced by the appropriate pattern of notes. 
- *  Notes of the form ~n2 (or other lengths) will be ignored, so you will have to write 
- *  separate transposing macros for each note length. 
+ *  <p>
+ *  So, for example I could re-write the static macro m: ~G3 = G{A}G{F}G as a transposing
+ *  macro m: ~n3 = n{o}n{m}n. When the transposing macro is expanded, any note of the form
+ *  ~n3 will be replaced by the appropriate pattern of notes.
+ *  Notes of the form ~n2 (or other lengths) will be ignored, so you will have to write
+ *  separate transposing macros for each note length.
  *  <p>
  *  Here's an example:
- *  <pre> 
+ *  <pre>
  * X:35
  * T:Down the Broom
  * S:Trad, arr. Paddy O'Brien
@@ -106,7 +106,7 @@
  * </pre>
  * <p>
  *  A transposing macro definition consists of four parts:
- *  <ul><li> 
+ *  <ul><li>
  *  the field identifier m:
  *  </li><li>
  *  the target string - e.g ~n3
@@ -116,24 +116,24 @@
  *  the replacement string - e.g. n{o}n{m}n
  *  </li></ul>
  *  <p>
- *  The target string can consist of any string up to 31 characters in length, 
- *  except that it must conclude with the letter 'n', followed by a number 
- *  which specifies the note length. 
+ *  The target string can consist of any string up to 31 characters in length,
+ *  except that it must conclude with the letter 'n', followed by a number
+ *  which specifies the note length.
  *  <p>
- *  The replacement string consists of any legal abc text up to 200 characters in length, 
- *  where note pitches are defined by the letters h - z, the pitches being interpreted 
- *  relative to that of the letter n. Once again you should ensure that the time intervals match. 
- *  You should not use accidentals in transposing macros (I can't for the life of me think of a way 
- *  to transpose ~=a3 or ~^G2 which will work correctly under all circumstances, so if you need to 
- *  do this you must use a static macro.) 
+ *  The replacement string consists of any legal abc text up to 200 characters in length,
+ *  where note pitches are defined by the letters h - z, the pitches being interpreted
+ *  relative to that of the letter n. Once again you should ensure that the time intervals match.
+ *  You should not use accidentals in transposing macros (I can't for the life of me think of a way
+ *  to transpose ~=a3 or ~^G2 which will work correctly under all circumstances, so if you need to
+ *  do this you must use a static macro.)
  * <p>
  * @see ABCSymbol
  */
 public class ABCMacro {
-	
-	private static final String N_SCALE = 
+
+	private static final String N_SCALE =
 		"D, E, F, G, A, B, C  D  E  F  G  A  B  c  d  e  f  g  a  b  c' d' e' f' g' a' b' c''d''e''f''g''";
-	//   h  i  j  k  l  m  n                                      n  o  p  q  r  s  t  u  v  w  x  y  z  
+	//   h  i  j  k  l  m  n                                      n  o  p  q  r  s  t  u  v  w  x  y  z
 	private String name;
 	private String symbol;
 	private boolean valid;
@@ -164,7 +164,7 @@ public ABCMacro(String string) {
 					this.nmatch=String.valueOf(this.n);
 			}
 		}
-		
+
 	}
 
 	public String execute(String line) {
@@ -172,7 +172,7 @@ public String execute(String line) {
 		char q=0;
 		while(i<line.length()) {
 			switch(line.charAt(i)) {
-			case '"': 
+			case '"':
 				if(q=='"') q=0;
 				else if(q==0) q='"';
 				break;
@@ -181,8 +181,8 @@ public String execute(String line) {
 				else if(q==0) q='+';
 				break;
 			default:
-				if(q==0 
-				&& line.substring(i).length()>=targetlen 
+				if(q==0
+				&& line.substring(i).length()>=targetlen
 				&& line.substring(i).startsWith(name)
 				&& line.substring(i+name.length()).matches(nmatch)) {
 					line=line.substring(0,i)+invoke(line.charAt(i+name.length()))+line.substring(i+targetlen);
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.java
index 598a0f39..d153d53d 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCOctaveDatabase.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.io.abc.base;
 
@@ -16,7 +16,7 @@ public class ABCOctaveDatabase {
 	public ABCOctaveDatabase() {
 		this.database=new Properties();
 	}
-	
+
 	public void store(int i, int pitch) {
 		this.database.setProperty(String.valueOf(pitch), String.valueOf(i));
 	}
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCRepeat.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCRepeat.java
similarity index 96%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCRepeat.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCRepeat.java
index 55c6560b..5933dfb6 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCRepeat.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCRepeat.java
@@ -1,24 +1,25 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCRepeat {
-	
+
 	private int data1;
-	
+
 	private int data2;
-	
+
 	public ABCRepeat(int data1,int data2){
 		this.data1 = data1;
 		this.data2 = data2;
 	}
-	
+
 	public int getData1() {
 		return this.data1;
 	}
-	
+
 	public int getData2() {
 		return this.data2;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[REPEAT]     ");
 		string += (this.getData1() + "-" + this.getData2());
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCSong.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCSong.java
similarity index 93%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCSong.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCSong.java
index 4b03a05f..4a4298ed 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCSong.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCSong.java
@@ -17,7 +17,7 @@ public class ABCSong {
 	private static final int PITCH = 0;
 	private static final int OCTAVE = 1;
 	private static final int NOT = 2;
-	
+
 	// buddy track types
 	private static final String DRONE = "drone";
 	private static final String DRUMS = "drums";
@@ -33,25 +33,25 @@ public class ABCSong {
 	private ABCText[] texts;
 	private ABCChord[] chords;
 	private ABCTrack[] tracks;
-	private List tsChanges;
+	private List<ABCTimeSignatureChange> tsChanges;
 	private ABCTimeSignature defaultNoteLength;
 	private String key;
 	private String parts;
 	private String rhythm;
-	private List words;
-	private List redefinable;
-	private List macro;
+	private List<String> words;
+	private List<ABCSymbol> redefinable;
+	private List<ABCMacro> macro;
 	private int x;
 	private String part;
-	private List symbols;
-	private List lyrics;
-	private List voice;
+	private List<String> symbols;
+	private List<String> lyrics;
+	private List<ABCTrack> voice;
 	private int track;
-	private List remarks;
+	private List<String> remarks;
 	private int ticks;
 	private int measure;
 	private int ticksperbar;
-	private ArrayList events;
+	private ArrayList<ABCLocation> events;
 	private int lineloc;
 	private String scale;
 	private String gchord;
@@ -64,8 +64,8 @@ public class ABCSong {
 	private boolean gchordon;
 	private boolean drumon;
 	private boolean droneon;
-	private ArrayList chordsList;
-	private ArrayList voiceloc;
+	private ArrayList<ABCChord> chordsList;
+	private ArrayList<ABCLocation> voiceloc;
 	private int keySignature;
 	private ABCChord chord;
 	private int tickspergchord;
@@ -78,7 +78,7 @@ public class ABCSong {
 	private int dronevoice;
 	private boolean tied;
 	private ABCEvent[] drumnotes;
-	private List tmpsChanges;
+	private List<ABCTempoChange> tmpsChanges;
 	private ABCEvent[] dronenotes;
 	private String beatstring;
 	private int[] beat;
@@ -87,10 +87,10 @@ public class ABCSong {
 	private boolean sorted;
 
 	private int legato;
-	
+
 	public ABCSong(){
-		this.tsChanges = new ArrayList();
-		this.tmpsChanges = new ArrayList();
+		this.tsChanges = new ArrayList<ABCTimeSignatureChange>();
+		this.tmpsChanges = new ArrayList<ABCTempoChange>();
 		this.part=null;
 		this.track=0;
 		this.measure=0;
@@ -113,79 +113,79 @@ public ABCSong(){
 		dronevoice=-1;
 		this.sorted=false;
 	}
-	
+
 	public ABCChord[] getChords() {
 		if(this.chords==null && this.chordsList==null) return null;
 		if(this.chords==null) {
 			this.chords=new ABCChord[this.chordsList.size()];
-			for(int i=0;i<chords.length;i++) 
-				this.chords[i]=(ABCChord) this.chordsList.get(i);
+			for(int i=0;i<chords.length;i++)
+				this.chords[i]=this.chordsList.get(i);
 		}
 		return this.chords;
 	}
-	
+
 	public void setChords(int length) {
 		this.chords = new ABCChord[length];
 	}
-	
+
 	public void setChord(int index,ABCChord chord) {
 		this.chords[index] = chord;
 	}
-	
+
 	public ABCInfo getInfo() {
 		return this.info;
 	}
-	
+
 	public ABCInfo setInfo(ABCInfo info) {
 		this.info = info;
 		return this.info;
 	}
-	
+
 	public ABCRepeat[] getRepeats() {
 		return this.repeats;
 	}
-	
+
 	public void setRepeats(int length) {
 		this.repeats = new ABCRepeat[length];
 	}
-	
+
 	public void setRepeat(int index,ABCRepeat repeat) {
 		this.repeats[index] = repeat;
 	}
-	
+
 	public ABCText[] getTexts() {
 		return this.texts;
 	}
-	
+
 	public void setTexts(int length) {
 		this.texts = new ABCText[length];
 	}
-	
+
 	public void setText(int index,ABCText text) {
 		this.texts[index] = text;
 	}
-	
+
 	public ABCTrack[] getTracks() {
 		if(voice==null) addVoice("1 clef=treble");
 		this.tracks = new ABCTrack[voice.size()];
 		for(int i=0;i<tracks.length;i++) {
-			tracks[i]=(ABCTrack)voice.get(i);
+			tracks[i]=voice.get(i);
 		}
 		return this.tracks;
 	}
-	
+
 	public void setTracks(int length) {
 		this.tracks = new ABCTrack[length];
 	}
-	
+
 	public void setTrack(int index,ABCTrack track) {
 		this.tracks[index] = track;
 	}
-	
+
 	public ABCTimeSignature getTimeSignature() {
 		return this.timeSignature;
 	}
-	
+
 	public void setTimeSignature(ABCTimeSignature timeSignature) {
 		this.timeSignature = timeSignature;
 		if(timeSignature==null) return;
@@ -202,7 +202,7 @@ public void setTimeSignature(ABCTimeSignature timeSignature) {
 		this.tickspergchord=getTickspergchord();
 		addTimeSignatureChange(new ABCTimeSignatureChange(this.measure,timeSignature));
 	}
-	
+
 	private int getTickspergchord() {
 		if(gchord==null) return 0;
 		char[] g=gchord.toCharArray();
@@ -218,22 +218,22 @@ private int getTickspergchord() {
 	public int getTempo() {
 		return this.tempo;
 	}
-	
+
 	public int getStrings() {
 		return this.strings;
 	}
-	
+
 	public void setStrings(int strings) {
 		this.strings = strings;
 	}
-	
+
 	public int getMeasures() {
 		return this.measures;
 	}
-	
+
 	public void addTempoChange(ABCTempoChange tChange) {
 		for(int i=0;i<this.tmpsChanges.size();i++) {
-			ABCTempoChange tc = (ABCTempoChange)this.tmpsChanges.get(i);
+			ABCTempoChange tc = this.tmpsChanges.get(i);
 			if(tc.getMeasure()==tChange.getMeasure()) {
 				if(tc.getTempo()!=tChange.getTempo()) {
 					this.tmpsChanges.remove(i);
@@ -244,12 +244,12 @@ public void addTempoChange(ABCTempoChange tChange) {
 		}
 		this.tmpsChanges.add(tChange);
 	}
-	
+
 	public void addTimeSignatureChange(ABCTimeSignatureChange tsChange) {
 		int n=tsChange.getTimeSignature().getNumerator();
 		int d=tsChange.getTimeSignature().getDenominator();
 		for(int i=0;i<this.tsChanges.size();i++) {
-			ABCTimeSignatureChange tsc = (ABCTimeSignatureChange)this.tsChanges.get(i);
+			ABCTimeSignatureChange tsc = this.tsChanges.get(i);
 			if(tsc.getMeasure()==tsChange.getMeasure()) {
 				int n1=tsc.getTimeSignature().getNumerator();
 				int d1=tsc.getTimeSignature().getDenominator();
@@ -262,12 +262,12 @@ public void addTimeSignatureChange(ABCTimeSignatureChange tsChange) {
 		}
 		this.tsChanges.add(tsChange);
 	}
-	
+
 	public ABCTimeSignature getTimeSignature(int measure) {
-		Iterator it = this.tsChanges.iterator();
+		Iterator<ABCTimeSignatureChange> it = this.tsChanges.iterator();
 		ABCTimeSignatureChange last = null;
 		while(it.hasNext()){
-			ABCTimeSignatureChange change = (ABCTimeSignatureChange)it.next();
+			ABCTimeSignatureChange change = it.next();
 			if(change.getMeasure() == measure){
 				return change.getTimeSignature();
 			}
@@ -280,12 +280,12 @@ public ABCTimeSignature getTimeSignature(int measure) {
 			return getTimeSignature();
 		return last.getTimeSignature();
 	}
-	
+
 	public int getTempo(int measure) {
-		Iterator it = this.tmpsChanges.iterator();
+		Iterator<ABCTempoChange> it = this.tmpsChanges.iterator();
 		ABCTempoChange last = null;
 		while(it.hasNext()){
-			ABCTempoChange change = (ABCTempoChange)it.next();
+			ABCTempoChange change = it.next();
 			if(change.getMeasure() == measure){
 				return change.getTempo();
 			}
@@ -299,6 +299,7 @@ public int getTempo(int measure) {
 		return last.getTempo();
 	}
 
+	@Override
 	public String toString(){
 		String string = new String("[SONG] *** ABC file format ***\n");
 		string +=  (this.getInfo().toString() + "\n");
@@ -361,7 +362,7 @@ public void setDiscography(String string) {
 	}
 
 	public void setDefaultNoteLength(ABCTimeSignature signature) {
-		this.defaultNoteLength=signature;		
+		this.defaultNoteLength=signature;
 	}
 
 	/**
@@ -422,7 +423,7 @@ public void setKey(String string) {
 		this.key=string;
 		resetScale();
 	}
-	
+
 	public void resetScale() {
 		final String[] scales={
 				"7 sharps:   C#      A#m      G#Mix   D#Dor   E#Phr   F#Lyd   B#Loc ",
@@ -527,7 +528,7 @@ else if(string.trim().matches("\".*\"")) {
 	}
 
 	private ABCTimeSignature parseTimeSignature(String string) {
-		// There may be up to 4 beats in the definition, e.g: 
+		// There may be up to 4 beats in the definition, e.g:
 		//	Q:1/4 3/8 1/4 3/8=40
 		// This means: play the tune as if Q:5/4=40 was written, but print the tempo indication using separate notes as specified by the user.
 		String[] q=string.split("\\s+");
@@ -550,7 +551,7 @@ private ABCTimeSignature parseTimeSignature(String string) {
 		return new ABCTimeSignature(numerator,denominator,true);
 	}
 /**
- * Abc also includes a rhythm field, 
+ * Abc also includes a rhythm field,
  * R:, which is used for cataloguing and sorting collections of abc tunes:
  * this is entirely free text (although there are obvious 'standard' entries eg R:reel, R:jig, R:schottische).
 */
@@ -565,7 +566,7 @@ public void setSource(String string) {
 	}
 
 	public void addWords(String string) {
-		if(this.words==null) this.words=new ArrayList();
+		if(this.words==null) this.words=new ArrayList<String>();
 		this.words.add(string.substring(2).trim());
 		addNote(string);
 	}
@@ -579,25 +580,25 @@ public void setTranscriptor(String string) {
 	public void addRedefinable(String string) {
 		ABCSymbol symbol=new ABCSymbol(string);
 		if(!symbol.isValid()) return;
-		if(this.redefinable==null) this.redefinable=new ArrayList();
+		if(this.redefinable==null) this.redefinable=new ArrayList<ABCSymbol>();
 		// delete eventual "old" symbol redefinition
 		char c=symbol.getName();
 		for(int i=0;i<this.redefinable.size();i++) {
-			char a=((ABCSymbol)this.redefinable.get(i)).getName();
+			char a=this.redefinable.get(i).getName();
 			if(a==c) {
 				this.redefinable.remove(i);
 				break;
 			}
 		}
 
-		if(!symbol.isNil()) 
+		if(!symbol.isNil())
 			this.redefinable.add(symbol);
 	}
 
 	public void addMacro(String string) {
 		ABCMacro m=new ABCMacro(string);
 		if(!m.isValid()) return;
-		if(this.macro==null) this.macro=new ArrayList();
+		if(this.macro==null) this.macro=new ArrayList<ABCMacro>();
 		this.macro.add(m);
 	}
 
@@ -615,26 +616,26 @@ public void setPart(String string) {
  * @param string
  * <p>
  *	Adding many symbols to a line of music can make a tune difficult to read.<br>
- *	In such cases, a symbol line (a line that contains only +...+ decorations and "..." chord symbols or annotations) can be used, 
+ *	In such cases, a symbol line (a line that contains only +...+ decorations and "..." chord symbols or annotations) can be used,
  *	analogous to a lyrics line.<br>
- *	A symbol line starts with s:, followed by a line of symbols.<br> 
+ *	A symbol line starts with s:, followed by a line of symbols.<br>
  *	Matching of notes and symbols follows the rules defined in section Lyrics.<br>
- *<pre> 
- *	 Example: 
+ *<pre>
+ *	 Example:
  *	   CDEF    | G'''AB'c
  *	s: "^slow" | +f+ ** +fff+
  *</pre>
  * @see #addLyrics(String)
  */
 	public void addSymbols(String string) {
-		if(this.symbols==null) this.symbols=new ArrayList();
+		if(this.symbols==null) this.symbols=new ArrayList<String>();
 		this.symbols.add(string);
 		if(events==null) return;
 		String[] w=string.trim().split("\\s+");
 		int x=0;
 		boolean dx=false;
 		for(int i=lineloc;i<events.size() && x<w.length;i++) {
-			ABCLocation loc=(ABCLocation) events.get(i);
+			ABCLocation loc=events.get(i);
 			ABCEvent e=loc.getEvent();
 			if(loc.getTrack()==this.track && e.getTicks()>0 && e.isGrace()==false) {
 				dx=false;
@@ -649,9 +650,9 @@ else if(w[x].matches("\\*+")) {
 				else {
 					dx=true;
 					String s=w[x].replace('~', ' ');
-					if(s.startsWith("\"") && s.endsWith("\"")) insertAnnotation(i,s); 
-					else if(s.startsWith("+") && s.endsWith("+")) insertDecoration(i,s); 
-					else if(s.startsWith("!") && s.endsWith("!")) insertDecoration(i,s); 
+					if(s.startsWith("\"") && s.endsWith("\"")) insertAnnotation(i,s);
+					else if(s.startsWith("+") && s.endsWith("+")) insertDecoration(i,s);
+					else if(s.startsWith("!") && s.endsWith("!")) insertDecoration(i,s);
 					else e.setLyrics(s);
 				}
 				if(dx) {
@@ -659,7 +660,7 @@ else if(w[x].matches("\\*+")) {
 					while(x<w.length && w[x].equals("|")) {
 						int m = loc.getMeasure();
 						for(i+=1;i<events.size();i++) {
-							loc=(ABCLocation) events.get(i);
+							loc=events.get(i);
 							if(loc.getTrack()==this.track && loc.getMeasure()>m)
 								break;
 						}
@@ -667,13 +668,13 @@ else if(w[x].matches("\\*+")) {
 						++x;
 					}
 				}
-					
+
 			}
 		}
 	}
 
 private void insertAnnotation(int i, String s) {
-	ABCLocation loc=(ABCLocation) events.get(i);
+	ABCLocation loc=events.get(i);
 	ABCEvent a=new ABCEvent(this, s+"  ");
 	if(a.getType()==ABCEvent.CHORD_SYMBOL) {
 		if(chordvoice<0) {
@@ -688,14 +689,14 @@ private void insertAnnotation(int i, String s) {
 			setBassprog(bassprog);
 			setBassvol(bassvol);
 		}
-		this.chord=(ABCChord) chordsList.get(a.getChordnum());
+		this.chord=chordsList.get(a.getChordnum());
 		events.add(i,new ABCLocation(loc.getPart(),loc.getTrack(),loc.getMeasure(),loc.getTicks(),this.chord,a));
 	}
 	events.add(i,new ABCLocation(loc.getPart(),loc.getTrack(),loc.getMeasure(),loc.getTicks(),loc.getChord(),a));
 }
 
 private void insertDecoration(int i, String s) {
-	ABCLocation loc=(ABCLocation) events.get(i);
+	ABCLocation loc=events.get(i);
 	ABCEvent d=new ABCEvent(this, s+"  ");
 	events.add(i,new ABCLocation(loc.getPart(),loc.getTrack(),loc.getMeasure(),loc.getTicks(),loc.getChord(),d));
 }
@@ -703,35 +704,35 @@ private void insertDecoration(int i, String s) {
 /**
  * @param string
  * <p>
- *	 The w field (lowercase w) in the body, supplies a line of lyrics to be aligned syllable 
+ *	 The w field (lowercase w) in the body, supplies a line of lyrics to be aligned syllable
  *   by syllable below the previous line of notes.<br>
  *   Syllables are not aligned on grace notes and tied notes are treated as two separate notes;
  *   slurred or beamed notes are also treated as separate notes in this context. <br>
- *   Note that lyrics are always aligned to the beginning of the preceding music line.<br> 
+ *   Note that lyrics are always aligned to the beginning of the preceding music line.<br>
  *	 It is possible for a music line to be followed by several w fields.<br>
  *   This can be used together with the part notation to create verses.<br>
- *   The first w field is used the first time that part is played, then the second and so on.<br> 
+ *   The first w field is used the first time that part is played, then the second and so on.<br>
  *	 The lyrics lines are treated as an ABC string.<br>
  *   Within the lyrics, the words should be separated by one or more spaces
  *   and to correctly align them the following symbols may be used:
  *   <p>
  *   <table>
- *    <tr><th>Symbol</th><th>Meaning</th></tr> 
- *	  <tr><td>-    (hyphen)</td><td>break between syllables within a word</td></tr> 
- *	  <tr><td>_    (underscore)</td><td> last syllable is to be held for an extra note</td></tr> 
+ *    <tr><th>Symbol</th><th>Meaning</th></tr>
+ *	  <tr><td>-    (hyphen)</td><td>break between syllables within a word</td></tr>
+ *	  <tr><td>_    (underscore)</td><td> last syllable is to be held for an extra note</td></tr>
  *	  <tr><td>*    </td><td>one note is skipped (i.e. * is equivalent to a blank syllable) </td></tr>
  *	  <tr><td>~    </td><td>appears as a space; aligns multiple words under one note </td></tr>
  *	  <tr><td>\-   </td><td>appears as hyphen; aligns multiple syllables under one note </td></tr>
  *	  <tr><td>|    </td><td>advances to the next bar </td></tr>
  *   </table>
  *   <p>
- *	 Note that if - is preceded by a space or another hyphen, it is regarded as a separate syllable.<br> 
+ *	 Note that if - is preceded by a space or another hyphen, it is regarded as a separate syllable.<br>
  *	 When an underscore is used next to a hyphen, the hyphen must always come first. <br>
  *	 If there are not as many syllables as notes in a measure, typing a | automatically advances to the next bar;
- *	 if there are enough syllables the '|' is just ignored. 
+ *	 if there are enough syllables the '|' is just ignored.
  *<p>
  *	 <b>Some examples:</b>
- *<pre> 
+ *<pre>
  *	w: syll-a-ble    is aligned with three notes
  *	w: syll-a--ble   is aligned with four notes
  *	w: syll-a -ble   (equivalent to the previous line)
@@ -743,9 +744,9 @@ private void insertDecoration(int i, String s) {
  *	   Will~ye come to the Wa-x-ies dar-gle?
  *</pre>
  *<p>
- *	 Please see section Continuation of input lines for the meaning of the backslash (\) character. 
+ *	 Please see section Continuation of input lines for the meaning of the backslash (\) character.
  *<p>
- *	 If a word starts with a digit, this is interpreted as numbering of a stanza and is pushed forward a bit.<br> 
+ *	 If a word starts with a digit, this is interpreted as numbering of a stanza and is pushed forward a bit.<br>
  *   In other words, use something like <br>
  *	   w: 1.~Three blind mice<br>
  *	 to put a number before Three.
@@ -753,14 +754,14 @@ private void insertDecoration(int i, String s) {
  *@see #addSymbols(String)
  */
 	 public void addLyrics(String string) {
-		if(this.lyrics==null) this.lyrics=new ArrayList();
+		if(this.lyrics==null) this.lyrics=new ArrayList<String>();
 		this.lyrics.add(string);
 		if(events==null) return;
 		String[] w=string.trim().split("\\s+");
 		int x=0;
 		boolean dx=false;
 		for(int i=lineloc;i<events.size() && x<w.length;i++) {
-			ABCLocation loc=(ABCLocation) events.get(i);
+			ABCLocation loc=events.get(i);
 			ABCEvent e=loc.getEvent();
 			if(loc.getTrack()==this.track && e.getTicks()>0 && e.getType()==ABCEvent.NOTE && !e.isGrace()) {
 				dx=false;
@@ -802,7 +803,7 @@ else if(u>0) {
 						int m = loc.getMeasure();
 						int j=i;
 						for(i+=1;i<events.size();i++) {
-							loc=(ABCLocation) events.get(i);
+							loc=events.get(i);
 							if(loc.getTrack()==this.track) {
 								if(loc.getMeasure()>m)
 									break;
@@ -813,15 +814,15 @@ else if(u>0) {
 						++x;
 					}
 				}
-					
+
 			}
 		}
 	}
 
 	public void addVoice(String string) {
 		if(this.voice==null) {
-			this.voice=new ArrayList();
-			this.voiceloc=new ArrayList();
+			this.voice=new ArrayList<ABCTrack>();
+			this.voiceloc=new ArrayList<ABCLocation>();
 		}
 		this.track=this.voice.size();
 		this.voice.add(new ABCTrack(string.trim()));
@@ -835,9 +836,9 @@ public void addVoice(String string) {
 
 	public void setVoice(String string) {
 		if(this.voice==null) {
-			this.voice=new ArrayList();
+			this.voice=new ArrayList<ABCTrack>();
 			this.voice.add(new ABCTrack(string.trim()));
-			this.voiceloc=new ArrayList();
+			this.voiceloc=new ArrayList<ABCLocation>();
 			ABCLocation loc=new ABCLocation(this.part,this.track,this.measure,this.ticks,null,null);
 			loc.setTied(this.tied);
 			loc.setLegato(this.legato);
@@ -846,7 +847,7 @@ public void setVoice(String string) {
 			this.voiceloc.add(loc);
 		}
 		else {
-			ABCLocation loc=(ABCLocation) this.voiceloc.get(this.track);
+			ABCLocation loc=this.voiceloc.get(this.track);
 			loc.setPart(this.part);
 			loc.setMeasure(this.measure);
 			loc.setTicks(this.ticks);
@@ -857,11 +858,11 @@ public void setVoice(String string) {
 		}
 		String v=string.trim().split("\\s+")[0];
 		for(int i=0;i<voice.size();i++) {
-			ABCTrack trk=(ABCTrack)voice.get(i);
+			ABCTrack trk=voice.get(i);
 			String vi=trk.getName();
 			if(vi.equals(v)) {
 				this.track = i;
-				ABCLocation loc=(ABCLocation) this.voiceloc.get(this.track);
+				ABCLocation loc=this.voiceloc.get(this.track);
 				this.part    = loc.getPart();
 				this.measure = loc.getMeasure();
 				this.ticks   = loc.getTicks();
@@ -887,14 +888,14 @@ public void setVoice(String string) {
 	}
 
 	public void addRemarks(String string) {
-		if(this.remarks==null) this.remarks=new ArrayList();
+		if(this.remarks==null) this.remarks=new ArrayList<String>();
 		this.remarks.add(string);
 	}
 
 	public void addMusic(String line) {
 		if(this.macro!=null) line=substituteMacros(line);
 		if(this.redefinable!=null) line=substituteSymbols(line);
-		if(this.events==null) this.events = new ArrayList();
+		if(this.events==null) this.events = new ArrayList<ABCLocation>();
 		this.lineloc = this.events.size();
 		char[] a=(line+"  ").toCharArray();
 		int i=0;
@@ -940,7 +941,7 @@ public void addMusic(String line) {
 						setBassprog(bassprog);
 						setBassvol(bassvol);
 					}
-					this.chord=(ABCChord) chordsList.get(e.getChordnum());
+					this.chord=chordsList.get(e.getChordnum());
 					events.add(new ABCLocation(this.part,chordTrack(this.track),this.measure,this.ticks,this.chord,e));
 				}
 				else {
@@ -969,7 +970,7 @@ public void addMusic(String line) {
 						}
 					}
 					else if(e.getType()==ABCEvent.NOTE) {
-						if(this.tied) { 
+						if(this.tied) {
 							e.setTied(true);
 							if(!inchord) this.tied=false;
 						}
@@ -1062,15 +1063,15 @@ else if(e.getType()==ABCEvent.NOTE) {
 						i++;
 					}
 					r=p;
-//					Symbol					Meaning 
-//					(2    2 notes in the time of 3 
-//					  (3    3 notes in the time of 2 
-//					  (4    4 notes in the time of 3 
-//					  (5    5 notes in the time of n 
-//					  (6    6 notes in the time of 2 
-//					  (7    7 notes in the time of n 
-//					  (8    8 notes in the time of 3 
-//					  (9    9 notes in the time of n 
+//					Symbol					Meaning
+//					(2    2 notes in the time of 3
+//					  (3    3 notes in the time of 2
+//					  (4    4 notes in the time of 3
+//					  (5    5 notes in the time of n
+//					  (6    6 notes in the time of 2
+//					  (7    7 notes in the time of n
+//					  (8    8 notes in the time of 3
+//					  (9    9 notes in the time of n
 //					If the time signature is compound (6/8, 9/8, 12/8) then n is three, otherwise n is two.
 					switch(p) {
 					case 2: q=3;break;
@@ -1078,7 +1079,7 @@ else if(e.getType()==ABCEvent.NOTE) {
 					case 4: q=3;break;
 					case 6: q=2;break;
 					case 8: q=3;break;
-					default: 
+					default:
 						if(this.timeSignature.getDenominator()==8 && this.timeSignature.getNumerator() % 3==0) q=3;
 						else q=2;
 					break;
@@ -1118,7 +1119,7 @@ else if(e.getType()==ABCEvent.NOTE) {
 					switch(a[i+1]) {
 					case 'V':
 						this.setVoice(line.substring(i+3, j).trim());
-						if(bol) 
+						if(bol)
 							lineMeasure=this.measure;
 						break;
 					case 'P':
@@ -1181,7 +1182,7 @@ else if("123456789".indexOf(a[i+1])>=0) {
 					i+=e.getName().length();
 					int t=e.getTicks();
 					for(int x=chordstart;x<events.size();x++) {
-						ABCLocation l=(ABCLocation) events.get(x);
+						ABCLocation l=events.get(x);
 						e=l.getEvent();
 						switch(e.getType()) {
 						case ABCEvent.NOTE:
@@ -1198,7 +1199,7 @@ else if("123456789".indexOf(a[i+1])>=0) {
 						this.ticks += (t*q)/p; // put p notes into the time of q for the next r notes
 						--r;
 					}
-					else 
+					else
 						this.ticks+=t;
 					if(fermato>0) setTempo(String.valueOf(fermato));
 					fermato=0;
@@ -1272,7 +1273,7 @@ else if(a[i+1]==']') {
 	private void setVolume(int volume) {
 		if(voice==null) addVoice("1 clef=treble");
 		for(int i=this.track;i<voice.size();i++) {
-			ABCTrack trk=(ABCTrack) voice.get(i);
+			ABCTrack trk=voice.get(i);
 			if(i==this.track || trk.getVolume()<0)
 				trk.setVolume(volume);
 		}
@@ -1313,10 +1314,10 @@ private void alignTicks() {
 	}
 
 	private boolean isBuddy(String type) {
-		ABCTrack ttrk=(ABCTrack) voice.get(this.track);
+		ABCTrack ttrk=voice.get(this.track);
 		String v=ttrk.getName()+"\t"+type;
 		for(int i=0;i<voice.size();i++) {
-			ABCTrack trk=(ABCTrack)voice.get(i);
+			ABCTrack trk=voice.get(i);
 			if(v.equalsIgnoreCase(trk.getName())) return true;
 		}
 		return false;
@@ -1324,21 +1325,21 @@ private boolean isBuddy(String type) {
 
 	private String substituteMacros(String line) {
 		for(int i=0;i<macro.size();i++) {
-			line=((ABCMacro)macro.get(i)).execute(line);
+			line=macro.get(i).execute(line);
 		}
 		return line;
 	}
 
 	private String substituteSymbols(String line) {
 		for(int i=0;i<redefinable.size();i++) {
-			line=((ABCSymbol)redefinable.get(i)).execute(line);
+			line=redefinable.get(i).execute(line);
 		}
 		return line;
 	}
 
 	private int beatVolume() {
 		if(voice==null) addVoice("1 clef=treble");
-		ABCTrack trk=(ABCTrack) voice.get(this.track);
+		ABCTrack trk=voice.get(this.track);
 		int v=trk.getVolume();
 		int tpb=ticksperbar/timeSignature.getNumerator();
 		int b=ticks/tpb;
@@ -1532,7 +1533,7 @@ private void generatechordnotes(int t, char[] g, int i) {
 	private void remapChord(int sz) {
 		ABCEvent[] e=new ABCEvent[sz];
 		int[] snares=getTracks()[this.track].getStrings();
-		for(int i=0;i<sz;i++) e[i]=((ABCLocation)events.get(events.size()-sz+i)).getEvent();
+		for(int i=0;i<sz;i++) e[i]=events.get(events.size()-sz+i).getEvent();
 		int[] frets=new int[snares.length];
 		for(int i=0;i<frets.length;i++) frets[i]=-1;
 		for(int i=0;i<sz;i++) {
@@ -1574,7 +1575,7 @@ else if(s<strings.length-1) {
 					else e[j].setType(ABCEvent.NOT_RELEVANT);
 				}
 			}
-		
+
 	}
 
 	private int baseTrack(int t) {
@@ -1586,25 +1587,25 @@ private int chordTrack(int t) {
 		if(chordvoice<0) chordvoice=buddyTrack(t,CHORDS,6, TGMeasure.CLEF_TREBLE, getChordprog());
 		return chordvoice;
 	}
-	
+
 	private int drumTrack(int t) {
 		if(drumvoice<0) drumvoice=buddyTrack(t,DRUMS,6, TGMeasure.CLEF_BASS, 0);
 		return drumvoice;
 	}
-	
+
 	private int droneTrack(int t) {
 		if(dronevoice<0) dronevoice=buddyTrack(t,DRONE,2, TGMeasure.CLEF_BASS, getDroneprog());
-		ABCTrack ttrk=(ABCTrack) voice.get(dronevoice);
+		ABCTrack ttrk=voice.get(dronevoice);
 		final int[] s={ 40, 28 };
 		ttrk.setStrings(s);
 		return dronevoice;
 	}
-	
+
 	private int buddyTrack(int t, String type, int strings, int cleftype, int instrument) {
-		ABCTrack ttrk=(ABCTrack) voice.get(t);
+		ABCTrack ttrk=voice.get(t);
 		String v=ttrk.getName()+"\t"+type;
 		for(int i=0;i<voice.size();i++) {
-			ABCTrack trk=(ABCTrack)voice.get(i);
+			ABCTrack trk=voice.get(i);
 			if(v.equalsIgnoreCase(trk.getName())) return i;
 		}
 		int i=voice.size();
@@ -1617,11 +1618,11 @@ private int buddyTrack(int t, String type, int strings, int cleftype, int instru
 
 	public int getVoice(String string) {
 		if(this.voice==null) {
-			this.voice=new ArrayList();
-			this.voiceloc=new ArrayList();
+			this.voice=new ArrayList<ABCTrack>();
+			this.voiceloc=new ArrayList<ABCLocation>();
 		}
 		for(int i=0;i<voice.size();i++) {
-			ABCTrack trk=(ABCTrack)voice.get(i);
+			ABCTrack trk=voice.get(i);
 			if(string.equalsIgnoreCase(trk.getName())) return i;
 		}
 		this.voice.add(new ABCTrack(string.trim()));
@@ -1643,14 +1644,14 @@ public void setBarkey(String scale) {
 	/**
 	 * @return the events
 	 */
-	public ArrayList getEvents() {
+	public ArrayList<ABCLocation> getEvents() {
 		return events;
 	}
 
 	public int addChord(String name) {
-		if(this.chordsList==null) this.chordsList=new ArrayList();
+		if(this.chordsList==null) this.chordsList=new ArrayList<ABCChord>();
 		for(int i=0;i<chordsList.size();i++) {
-			ABCChord chord=(ABCChord) chordsList.get(i);
+			ABCChord chord=chordsList.get(i);
 			if(chord.getName().equals(name))
 				return i;
 		}
@@ -1762,7 +1763,7 @@ public void setDroneon(boolean droneon) {
 			if(drone!=null) setDrone(drone);
 		}
 		ABCEvent e=new ABCEvent(droneon?ABCEvent.DRONEON:ABCEvent.DRONEOFF,"[I:MIDI=droneo"+(gchordon?"n]":"ff]"),0);
-		if(this.events==null) this.events = new ArrayList();
+		if(this.events==null) this.events = new ArrayList<ABCLocation>();
 		events.add(new ABCLocation(this.part,dronevoice,this.measure,this.ticks,this.chord,e));
 	}
 
@@ -1809,7 +1810,7 @@ public void setDrum(String drum) {
 			setDrumon(true);
 		}
 		ABCEvent e=new ABCEvent(ABCEvent.DRUM,drum,0);
-		if(events==null) events=new ArrayList();
+		if(events==null) events=new ArrayList<ABCLocation>();
 		events.add(new ABCLocation(this.part,drumvoice,this.measure,this.ticks,this.chord,e));
 	}
 
@@ -1905,7 +1906,7 @@ public void midiCommand(String line) {
 						instrument=127;
 						instrumentOffset=1;
 					}
-					getTracks()[v].setInstrument(instrument); 
+					getTracks()[v].setInstrument(instrument);
 				}
 				++i;
 			}
@@ -1919,7 +1920,7 @@ else if(v>=0 && a[i].toLowerCase().matches("instrument=[0-9]+")) {
 					instrument=127;
 					instrumentOffset=1;
 				}
-				getTracks()[v].setInstrument(instrument); 
+				getTracks()[v].setInstrument(instrument);
 			}
 			else if(a[i].equalsIgnoreCase("gchord")) {
 				if(i<a.length-1) setGchord(a[i+1]);
@@ -1992,24 +1993,24 @@ else if(a[i].equalsIgnoreCase(DRONE)) {
 		}
 	}
 
-	/*	
-	 * MIDI files usually sound artificial and expressionless, but there are several ways to improve them. 
+	/*
+	 * MIDI files usually sound artificial and expressionless, but there are several ways to improve them.
 	 * The command %%MIDI beatstring fmp provides a way of specifying where the strong, medium and weak
 	 * stresses fall within a bar.
 	 *   f indicates a strong beat, m a medium beat, and p a soft beat.
 	 * For example, let's consider an Irish jig, which has a 6/8 time.
 	 * The corresponding fmp sequence would be fppmpp.
-	 */ 
+	 */
 	private void setBeatstring(String string) {
 		if(string.matches("[fmp]+")) beatstring=string;
 	}
 
-	/*	
+	/*
 	 * To fine-grain the volume of the single notes in a measure, the
 	 *  %%MIDI beat <vol1> <vol2> <vol3> <pos>
 	 * command can be used. vol1, vol2, and vol3 specify the volume of notes that fall on a strong,
 	 * medium, and weak beat, while pos indicates the position of strong beats in the measure.
-	 * We interpret it as percentages of the track volume, the first beat (pos=0) is always a 
+	 * We interpret it as percentages of the track volume, the first beat (pos=0) is always a
 	 * strong beat and pos indicates the medium beat
 	*/
 	private void setBeat(String string) {
@@ -2033,7 +2034,7 @@ public void postprocessor() {
 		if(events==null) return;
 		int sz=events.size();
 		if(this.ticks==0) this.measures--;
-		((ABCTrack)voice.get(0)).setPan(8);
+		voice.get(0).setPan(8);
 		if(chordvoice>=0) generatechordtracks(sz);
 		if(dronevoice>=0) generatedronetrack(sz);
 		if(drumvoice>=0) generatedrumtrack(sz);
@@ -2042,7 +2043,8 @@ public void postprocessor() {
 	public void sortEvents() {
 		if(getEvents()==null) return;
 		if(this.sorted) return;
-		Collections.sort(getEvents(),new Comparator() {
+		Collections.sort(getEvents(),new Comparator<Object>() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				if(o1 instanceof ABCLocation){
 					ABCLocation c1 = (ABCLocation)o1;
@@ -2067,7 +2069,7 @@ private void generatedronetrack(int sz) {
 		droneon=false;
 		tied=false;
 		for(int i=0;i<sz;i++) {
-			ABCLocation loc=(ABCLocation) events.get(i);
+			ABCLocation loc=events.get(i);
 			if(loc.getTrack()==dronevoice) {
 				ABCEvent e=loc.getEvent();
 				if(droneon && drone!=null) {
@@ -2124,7 +2126,7 @@ private ABCEvent[] initDronenotes() {
 		if(drone==null || !drone.matches("[0-9]+\\s+[0-9]+\\s+[0-9]+\\s+[0-9]+\\s+[0-9]+")) return null;
 		ABCEvent[] e=new ABCEvent[2];
 		String[] a=this.drone.split("\\s+");
-		int[] strings=((ABCTrack)voice.get(dronevoice)).getStrings();
+		int[] strings=voice.get(dronevoice).getStrings();
 		int i=Integer.parseInt(a[0],10)-instrumentOffset;
 		if(i<0) {
 			i=0;
@@ -2134,7 +2136,7 @@ private ABCEvent[] initDronenotes() {
 			i=127;
 			instrumentOffset=1;
 		}
-		((ABCTrack)voice.get(dronevoice)).setInstrument(i);
+		voice.get(dronevoice).setInstrument(i);
 		for(int n=0;n<e.length;n++) {
 			e[n]=new ABCEvent(ABCEvent.NOTE,"D",0);
 			e[n].setPitchStringAndFret(Integer.parseInt(a[1+n],10), strings);
@@ -2153,7 +2155,7 @@ private void generatedrumtrack(int sz) {
 		part=null;
 		drumon=true;
 		for(int i=0;i<sz;i++) {
-			ABCLocation loc=(ABCLocation) events.get(i);
+			ABCLocation loc=events.get(i);
 			if(loc.getTrack()==drumvoice) {
 				ABCEvent e=loc.getEvent();
 				if(drumon && drum!=null) {
@@ -2216,8 +2218,8 @@ private ABCEvent[] initDrumnotes() {
 		int ticksperdrum=ticksperbar/n;
 		ABCEvent[] e=new ABCEvent[events];
 		int[] drumstrings;
-		if(drumvoice<0) drumstrings=new ABCTrack("dummy\tdrums").getStrings(); 
-		else drumstrings=((ABCTrack)voice.get(drumvoice)).getStrings();
+		if(drumvoice<0) drumstrings=new ABCTrack("dummy\tdrums").getStrings();
+		else drumstrings=voice.get(drumvoice).getStrings();
 		n=0;
 		int note=0;
 		events=0;
@@ -2267,8 +2269,8 @@ private void advancedrumticks(int t) {
 	}
 
 	private void generatechordtracks(int sz) {
-		ABCTrack cTrk=(ABCTrack) voice.get(chordvoice);
-		ABCTrack bTrk=(ABCTrack) voice.get(basevoice);
+		ABCTrack cTrk=voice.get(chordvoice);
+		ABCTrack bTrk=voice.get(basevoice);
 		sortEvents();
 		measure=0;
 		ticks=0;
@@ -2276,7 +2278,7 @@ private void generatechordtracks(int sz) {
 		part=null;
 		gchordon=true;
 		for(int i=0;i<sz;i++) {
-			ABCLocation loc=(ABCLocation) events.get(i);
+			ABCLocation loc=events.get(i);
 			if(loc.getTrack()==chordvoice) {
 				ABCEvent e=loc.getEvent();
 				if(gchordon && chord!=null && gchord!=null) {
@@ -2296,7 +2298,7 @@ private void generatechordtracks(int sz) {
 				switch(e.getType()) {
 				case ABCEvent.CHORD_SYMBOL:
 					if(gchordon) {
-						chord=(ABCChord) chordsList.get(e.getChordnum());
+						chord=chordsList.get(e.getChordnum());
 						chordMeasure = this.measure;
 						chordTicks = this.ticks;
 					}
@@ -2377,7 +2379,7 @@ public void initBody() {
 	public boolean isHornpipe() {
 		return "hornpipe".equalsIgnoreCase(this.rhythm);
 	}
-	
+
 	public void initHead() {
 		this.setTimeSignature(new ABCTimeSignature(4,4,true));
 		this.setDefaultNoteLength(new ABCTimeSignature(1,8,false));
@@ -2465,8 +2467,8 @@ public void directive(String line) {
 		if(line.startsWith("%%propagate-accidentals")) {
 //			%%propagate-accidentals not | octave | pitch
 //			When set to not, accidentals apply only to the note they're attached to.
-//			When set to octave, accidentals also apply to all the notes of the same pitch in the same octave up to the end of the bar. 
-//			When set to pitch, accidentals also apply to all the notes of the same pitch in all octaves up to the end of the bar. 
+//			When set to octave, accidentals also apply to all the notes of the same pitch in the same octave up to the end of the bar.
+//			When set to pitch, accidentals also apply to all the notes of the same pitch in all octaves up to the end of the bar.
 //			The default value is pitch.
 			String[] option=line.split("\\s+");
 			if(option.length>1) {
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCSymbol.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCSymbol.java
similarity index 89%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCSymbol.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCSymbol.java
index 30462ab6..620bb0ae 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCSymbol.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCSymbol.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.io.abc.base;
 
@@ -10,38 +10,38 @@
  * <p>
  * As a short cut to writing symbols which avoids the +symbol+ syntax (see decorations),
  * the letters H-W and h-w and the symbol ~ can be assigned with the U: field.<br>
- * For example, to assign the letter T to represent the trill, you can write: 
+ * For example, to assign the letter T to represent the trill, you can write:
  * <pre>
  *     U: T = +trill+
  * </pre>
- * You can also use "^text" etc (see Annotations below) in definitions, e.g. 
+ * You can also use "^text" etc (see Annotations below) in definitions, e.g.
  * <pre>
  *     U: X = ''^+''
  * </pre>
- * to print a plus sign over notes with X before them. 
+ * to print a plus sign over notes with X before them.
  * <p>
  * Symbol definitions can be written in the file header, in which case they apply to all
- * the tunes in that file, or in a tune header, when they apply only to that tune, and 
+ * the tunes in that file, or in a tune header, when they apply only to that tune, and
  * override any previous definitions.
- * <p> 
- * Programs may also make use of a set of global default definitions, which apply 
+ * <p>
+ * Programs may also make use of a set of global default definitions, which apply
  * everywhere unless overridden by local definitions. <br>
- * You can assign the same symbol to two or more letters e.g. 
+ * You can assign the same symbol to two or more letters e.g.
  * <pre>
  *     U: T = +trill+
  *     U: U = +trill+
  * </pre>
- * in which case the same visible symbol will be produced by both letters 
- * (but they may be played differently), 
- * and you can de-assign a symbol by writing: 
+ * in which case the same visible symbol will be produced by both letters
+ * (but they may be played differently),
+ * and you can de-assign a symbol by writing:
  * <pre>
  *     U: T = +nil+
  * </pre>
- * or 
+ * or
  * <pre>
  *     U: T = +none+
  * </pre>
- * The standard set of definitions (if you do not redefine them) is: 
+ * The standard set of definitions (if you do not redefine them) is:
  * <pre>
  *     U: ~ = +roll+
  *     U: T = +trill+
@@ -63,7 +63,7 @@ public class ABCSymbol {
 	private char name;
 	private String symbol;
 	private boolean valid;
-	
+
 
 	public ABCSymbol(String string) {
 		this.valid=false;
@@ -84,7 +84,7 @@ public String execute(String line) {
 		char q=0;
 		while(i<line.length()) {
 			switch(line.charAt(i)) {
-			case '"': 
+			case '"':
 				if(q=='"') q=0;
 				else if(q==0) q='"';
 				break;
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTempo.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTempo.java
similarity index 98%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTempo.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTempo.java
index 8ea8cf37..ec854e13 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTempo.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTempo.java
@@ -1,20 +1,20 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCTempo {
-	
+
 	private int value;
-	
+
 	public ABCTempo(int value){
 		this.value = value;
 	}
-	
+
 	/**
 	 * @param string
 	 * <p>
 	 * "the actual number of beats per minute in a piece marked allergro (for example),
 	 *  will depend on the music itself.
 	 *  A piece consisting mainly of 'half notes' can be played very much quicker in
-	 *  terms of bpm than a piece consisting mainly of 'sixteenth notes', 
+	 *  terms of bpm than a piece consisting mainly of 'sixteenth notes',
 	 *  but still be described with the same word."
 	 *  <p>
 	 * Here are the best descriptions for the following tempo markings:<br>
@@ -24,9 +24,9 @@ public ABCTempo(int value){
 	 * <tr><td>40</td><td>Grave/td><td>slow and solemn (20-40 bpm)</td></tr>
 	 * <tr><td>50</td><td>Lento/td><td>very slow (40-60 bpm)</td></tr>
 	 * <tr><td>60</td><td>Largo/td><td>very slow (40-60 bpm), like lento</td></tr>
-	 * <tr><td>65</td><td>Larghetto</td><td>rather broadly (60-66 bpm)</td></tr> 
+	 * <tr><td>65</td><td>Larghetto</td><td>rather broadly (60-66 bpm)</td></tr>
 	 * <tr><td>76</td><td>Adagio</td><td>slowly </td></tr>
-	 * <tr><td>80</td><td>Andante</td><td>at a walking pace</td></tr> 
+	 * <tr><td>80</td><td>Andante</td><td>at a walking pace</td></tr>
 	 * <tr><td>90</td><td>Andante Moderato</td><td>a bit faster than andante</td></tr>
 	 * <tr><td>100</td><td>Andantino</td><td>slightly faster than andante</td></tr>
 	 * <tr><td>105</td><td>Moderato</td><td>moderately (101-110 bpm)</td></tr>
@@ -39,7 +39,7 @@ public ABCTempo(int value){
 	 * <tr><td>180</td><td>Presto</td><td>very fast (168-200 bpm)</td></tr>
 	 * <tr><td>220</td><td>Prestissimo</td><td>extremely fast (more than 200bpm)</td></tr>
 	 * </table>
-	 * 
+	 *
 	 */
 	public ABCTempo(String string) {
 		this.value=120;
@@ -69,7 +69,8 @@ public ABCTempo(String string) {
 	public int getValue() {
 		return this.value;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TEMPO]");
 		string += "\n     Value:       " + getValue();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTempoChange.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTempoChange.java
similarity index 97%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTempoChange.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTempoChange.java
index 89f98ab1..c8be3173 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTempoChange.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTempoChange.java
@@ -3,20 +3,21 @@
 public class ABCTempoChange {
 	private int measure;
 	private int tempo;
-	
+
 	public ABCTempoChange(int measure, int tempo) {
 		this.measure = measure;
 		this.tempo = tempo;
 	}
-	
+
 	public int getMeasure(){
 		return this.measure;
 	}
-	
+
 	public int getTempo() {
 		return this.tempo;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TEMPO CHANGE]");
 		string += "\n     Measure:     " + getMeasure();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCText.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCText.java
similarity index 95%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCText.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCText.java
index 3519067f..4aa08273 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCText.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCText.java
@@ -1,17 +1,18 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCText {
-	
+
 	private String value;
-	
+
 	public ABCText(String value){
 		this.value = value;
 	}
-	
+
 	public String getValue() {
 		return this.value;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TEXT]");
 		string += "\n     Value:       " + getValue();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.java
similarity index 97%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.java
index 3fe7bf21..ae4a45d5 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTimeSignature.java
@@ -1,25 +1,26 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCTimeSignature {
-	
+
 	private int numerator;
 	private int denominator;
 	private boolean toEnd;
-	
+
 	public ABCTimeSignature(int numerator, int denominator, boolean toEnd) {
 		this.numerator = numerator;
 		this.denominator = denominator;
 		this.toEnd=toEnd;
 	}
-	
+
+	@Override
 	public String toString() {
 		return this.numerator+"/"+this.denominator;
 	}
-	
+
 	public int getDenominator() {
 		return this.denominator;
 	}
-	
+
 	public int getNumerator() {
 		return this.numerator;
 	}
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.java
similarity index 97%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.java
index af08d39c..504a9299 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTimeSignatureChange.java
@@ -1,23 +1,24 @@
 package org.herac.tuxguitar.io.abc.base;
 
 public class ABCTimeSignatureChange{
-	
+
 	private int measure;
 	private ABCTimeSignature timeSignature;
-	
+
 	public ABCTimeSignatureChange(int measure, ABCTimeSignature timeSignature) {
 		this.measure = measure;
 		this.timeSignature = timeSignature;
 	}
-	
+
 	public int getMeasure(){
 		return this.measure;
 	}
-	
+
 	public ABCTimeSignature getTimeSignature() {
 		return this.timeSignature;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TIME SIGNATURE CHANGE]");
 		string += "\n     Measure:     " + getMeasure();
diff --git a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTrack.java b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTrack.java
similarity index 95%
rename from TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTrack.java
rename to plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTrack.java
index 268f2cf2..58e4b9b8 100644
--- a/TuxGuitar-abc/src/org/herac/tuxguitar/io/abc/base/ABCTrack.java
+++ b/plugins/abc/src/main/java/org/herac/tuxguitar/io/abc/base/ABCTrack.java
@@ -4,7 +4,7 @@
 import org.herac.tuxguitar.song.models.TGMeasure;
 
 public class ABCTrack {
-	
+
 	public static final int FLAG_DOUBLE_STRINGS = 0x01;
 	public static final int FLAG_LET_RING = 0x02;
 	public static final int FLAG_PEDAL_SABCEL_GUITAR = 0x04;
@@ -22,19 +22,19 @@ public class ABCTrack {
 	private String name;
 	private String declaration;
 	private boolean bagpipe;
-	
+
 	public ABCTrack(String declaration) {
 		this.declaration=declaration;
 		name=declaration.split("\\s+")[0];
 		percussion = declaration.endsWith("\tdrums");
-		bagpipe = declaration.endsWith("\tdrone"); 
+		bagpipe = declaration.endsWith("\tdrone");
 		instrument=0;
 		capo=0;
 		clefType=TGMeasure.DEFAULT_CLEF;
 		clefNumber=0;
 		pan=(int) (Math.random()*16);
 		volume=-1;
-		flags=0; 
+		flags=0;
 		strings=null;
 		if(declaration.toLowerCase().indexOf("clef=")>0) {
 			if(declaration.toLowerCase().indexOf("clef=treble")>0) clefType=TGMeasure.CLEF_TREBLE;
@@ -77,55 +77,56 @@ public ABCTrack(String declaration) {
 			break;
 		}
 		if(percussion) {
-			for(int i=0;i<strings.length;i++) 
+			for(int i=0;i<strings.length;i++)
 				strings[i]=ABCSongImporter.PERCUSSION_TUNINGS[strings.length-1][i];
 		}
 	}
-	
+
 	public int getCapo() {
 		return this.capo;
 	}
-	
+
 	public int getClefNumber() {
 		return this.clefNumber;
 	}
-	
+
 	public int getClefType() {
 		return this.clefType;
 	}
-	
+
 	public int getFlags() {
 		return this.flags;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public int getPan() {
 		return this.pan;
 	}
-	
+
 	public boolean isPercussion() {
 		return this.percussion;
 	}
-	
+
 	public int[] getStrings() {
 		return this.strings;
 	}
-	
+
 	public int getVolume() {
 		return this.volume;
 	}
-	
+
 	public int getInstrument() {
 		return this.instrument;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TRACK]");
 		string += "\n     "  + this.getName();
-		
+
 		for(int i = 0; i < this.strings.length; i ++){
 			string += "\n     String " + i + ": " + (96 - this.strings[i]);
 		}
@@ -206,12 +207,12 @@ public ABCTrack clone(String name, int numstrings) {
 		ABCTrack trk=new ABCTrack(this.declaration);
 		trk.name=name;
 		trk.percussion = name.endsWith("\tdrums");
-		trk.bagpipe = name.endsWith("\tdrone"); 
-		if(numstrings==strings.length && !trk.percussion) 
+		trk.bagpipe = name.endsWith("\tdrone");
+		if(numstrings==strings.length && !trk.percussion)
 			return trk;
 		trk.strings=new int[numstrings];
 		if(trk.percussion) {
-			for(int i=0;i<numstrings;i++) 
+			for(int i=0;i<numstrings;i++)
 				trk.strings[i]=ABCSongImporter.PERCUSSION_TUNINGS[numstrings-1][i];
 		}
 		else if(strings.length>numstrings) {
diff --git a/TuxGuitar-abc/share/META-INF/MANIFEST.MF b/plugins/abc/src/main/resources/META-INF/MANIFEST.MF
similarity index 100%
rename from TuxGuitar-abc/share/META-INF/MANIFEST.MF
rename to plugins/abc/src/main/resources/META-INF/MANIFEST.MF
diff --git a/TuxGuitar-abc/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/abc/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-abc/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/abc/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-abc/share/lang/messages.properties b/plugins/abc/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-abc/share/lang/messages.properties
rename to plugins/abc/src/main/resources/lang/messages.properties
diff --git a/plugins/alsa/pom.xml b/plugins/alsa/pom.xml
new file mode 100644
index 00000000..49ede8e1
--- /dev/null
+++ b/plugins/alsa/pom.xml
@@ -0,0 +1,145 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-alsa</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: ALSA</name>
+	<description>ALSA plugin for TuxGuitar</description>
+
+	<!-- TODO clean up, this pom is full of hack, if there is something cleaner, with only 1 pom, it is welcome -->
+	<build>
+
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+		<plugins>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile java files -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- package the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${version}</finalName>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- install .jar as an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>jar-artefact</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+									<type>jar</type>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared</linkerStartOption>
+					</linkerStartOptions>
+					<linkerEndOptions>
+						<linkerEndOption>-lasound</linkerEndOption>
+					</linkerEndOptions>
+					<!-- easy way to package the shared lib with jar -->
+					<linkerOutputDirectory>${project.build.directory}/classes</linkerOutputDirectory>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.herac.tuxguitar</groupId>
+			<artifactId>tuxguitar-app</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java
new file mode 100644
index 00000000..6674acda
--- /dev/null
+++ b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortImpl.java
@@ -0,0 +1,60 @@
+package org.herac.tuxguitar.player.impl.midiport.alsa;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiOutputPortImpl implements MidiOutputPort{
+
+	private int port;
+	private int client;
+	private String clientName;
+	private MidiReceiverImpl receiver;
+
+	public MidiOutputPortImpl(MidiSystem midiSystem,String clientName,int client,int port){
+		this.port = port;
+		this.client = client;
+		this.clientName = clientName;
+		this.receiver = new MidiReceiverImpl(this,midiSystem);
+	}
+
+	@Override
+	public void open(){
+		if(!this.receiver.isConnected()){
+			this.receiver.connect();
+		}
+	}
+
+	@Override
+	public void close(){
+		this.receiver.disconnect();
+	}
+
+	@Override
+	public MidiReceiver getReceiver(){
+		this.open();
+		return this.receiver;
+	}
+
+	@Override
+	public void check(){
+		// Not implemented
+	}
+
+	public int getPort() {
+		return this.port;
+	}
+
+	public int getClient() {
+		return this.client;
+	}
+
+	@Override
+	public String getKey(){
+		return ("tuxguitar-alsa_" + this.client + "-" + this.port);
+	}
+
+	@Override
+	public String getName(){
+		return (this.clientName +" [" + this.client + ":" + this.port + "]");
+	}
+}
\ No newline at end of file
diff --git a/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderImpl.java b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderImpl.java
new file mode 100644
index 00000000..09becce6
--- /dev/null
+++ b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderImpl.java
@@ -0,0 +1,35 @@
+package org.herac.tuxguitar.player.impl.midiport.alsa;
+
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
+
+	private MidiSystem midiSystem;
+
+	public MidiOutputPortProviderImpl(){
+		super();
+	}
+
+	@Override
+	public List<MidiOutputPort> listPorts() {
+		if(this.midiSystem == null){
+			this.midiSystem = new MidiSystem();
+		}
+		if(!this.midiSystem.isOpen()){
+			this.midiSystem.open();
+		}
+		return this.midiSystem.findPorts();
+	}
+
+	@Override
+	public void closeAll(){
+		if(this.midiSystem != null){
+			this.midiSystem.close();
+			this.midiSystem.finalize();
+			this.midiSystem = null;
+		}
+	}
+}
diff --git a/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderPlugin.java b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderPlugin.java
new file mode 100644
index 00000000..d47efee0
--- /dev/null
+++ b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiOutputPortProviderPlugin.java
@@ -0,0 +1,33 @@
+package org.herac.tuxguitar.player.impl.midiport.alsa;
+
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin{
+
+	@Override
+	protected MidiOutputPortProvider getProvider() {
+		return new MidiOutputPortProviderImpl();
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "ALSA output plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "ALSA output plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+
+}
diff --git a/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiReceiverImpl.java b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiReceiverImpl.java
new file mode 100644
index 00000000..b44147e8
--- /dev/null
+++ b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiReceiverImpl.java
@@ -0,0 +1,81 @@
+package org.herac.tuxguitar.player.impl.midiport.alsa;
+
+import org.herac.tuxguitar.player.base.MidiControllers;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiReceiverImpl implements MidiReceiver{
+
+	private boolean connected;
+	private MidiOutputPortImpl midiPort;
+	private MidiSystem midiSystem;
+
+	public MidiReceiverImpl(MidiOutputPortImpl midiPort, MidiSystem midiSystem){
+		this.midiPort = midiPort;
+		this.midiSystem = midiSystem;
+		this.connected = false;
+	}
+
+	public boolean isConnected(){
+		return this.connected;
+	}
+
+	public void connect(){
+		if(!isConnected()){
+			this.midiSystem.openPort(this.midiPort.getClient(),this.midiPort.getPort());
+			this.connected = true;
+		}
+	}
+
+	public void disconnect() {
+		if(isConnected()){
+			this.midiSystem.closePort();
+			this.connected = false;
+		}
+	}
+
+	@Override
+	public void sendAllNotesOff() {
+		for(int i = 0; i < 16; i ++){
+			this.sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
+		}
+	}
+
+	@Override
+	public void sendControlChange(int channel, int controller, int value) {
+		if(isConnected()){
+			this.midiSystem.controlChange(channel, controller, value);
+		}
+	}
+
+	@Override
+	public void sendNoteOff(int channel, int key, int velocity) {
+		if(isConnected()){
+			this.midiSystem.noteOff(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendNoteOn(int channel, int key, int velocity) {
+		if(isConnected()){
+			this.midiSystem.noteOn(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendPitchBend(int channel, int value) {
+		if(isConnected()){
+			this.midiSystem.pitchBend(channel, value);
+		}
+	}
+
+	@Override
+	public void sendProgramChange(int channel, int value) {
+		if(isConnected()){
+			this.midiSystem.programChange(channel, value);
+		}
+	}
+
+	public void sendSystemReset() {
+		//not implemented
+	}
+}
diff --git a/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiSystem.java b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiSystem.java
new file mode 100644
index 00000000..c6b25dc5
--- /dev/null
+++ b/plugins/alsa/src/main/java/org/herac/tuxguitar/player/impl/midiport/alsa/MidiSystem.java
@@ -0,0 +1,131 @@
+package org.herac.tuxguitar.player.impl.midiport.alsa;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.util.JNILibraryLoader;
+
+public class MidiSystem{
+
+	private static final String JNI_LIBRARY_NAME = "tuxguitar-alsa";
+
+	static{
+		JNILibraryLoader.loadLibrary(JNI_LIBRARY_NAME);
+	}
+
+	private long instance;
+	private boolean open;
+	private final List<MidiOutputPort> ports;
+
+	public MidiSystem() {
+		this.instance = malloc();
+		this.open = false;
+		this.ports = new ArrayList<MidiOutputPort>();
+	}
+
+	public boolean isOpen(){
+		return (this.instance != 0 && this.open);
+	}
+
+	@Override
+	public void finalize(){
+		if(this.instance != 0){
+			this.free(this.instance);
+			this.instance = 0;
+		}
+	}
+
+	public void open(){
+		if(this.instance != 0 && !this.open){
+			this.open(this.instance);
+			this.open = true;
+		}
+	}
+
+	public void close(){
+		if(this.instance != 0 && this.open){
+			this.close(this.instance);
+			this.open = false;
+		}
+	}
+
+	public List<MidiOutputPort> findPorts(){
+		this.ports.clear();
+		if(this.instance != 0 && this.open){
+			this.findPorts(this.instance);
+		}
+		return this.ports;
+	}
+
+	public void openPort(int client,int port){
+		if(this.instance != 0 && this.open){
+			this.openPort(this.instance, client, port);
+		}
+	}
+
+	public void closePort(){
+		if(this.instance != 0 && this.open){
+			this.closePort(this.instance);
+		}
+	}
+
+	public void noteOn(int channel,int note,int velocity){
+		if(this.instance != 0 && this.open){
+			this.noteOn(this.instance, channel, note, velocity);
+		}
+	}
+
+	public void noteOff(int channel,int note,int velocity){
+		if(this.instance != 0 && this.open){
+			this.noteOff(this.instance, channel, note, velocity);
+		}
+	}
+
+	public void controlChange(int channel,int control,int value){
+		if(this.instance != 0 && this.open){
+			this.controlChange(this.instance, channel, control, value);
+		}
+	}
+
+	public void programChange(int channel,int program){
+		if(this.instance != 0 && this.open){
+			this.programChange(this.instance, channel, program);
+		}
+	}
+
+	public void pitchBend(int channel,int value){
+		if(this.instance != 0 && this.open){
+			this.pitchBend(this.instance, channel, value);
+		}
+	}
+
+	protected void addPort(String name,int client,int port){
+		this.ports.add(new MidiOutputPortImpl(this,name,client,port));
+	}
+
+	private native long malloc();
+
+	private native void free(long instance);
+
+	private native void open(long instance);
+
+	private native void close(long instance);
+
+	private native void findPorts(long instance);
+
+	private native void openPort(long instance,int client,int port);
+
+	private native void closePort(long instance);
+
+	private native void noteOn(long instance,int channel,int note,int velocity);
+
+	private native void noteOff(long instance,int channel,int note,int velocity);
+
+	private native void controlChange(long instance,int channel,int control,int value);
+
+	private native void programChange(long instance,int channel,int program);
+
+	private native void pitchBend(long instance,int channel,int value);
+
+}
diff --git a/plugins/alsa/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java b/plugins/alsa/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
new file mode 100644
index 00000000..e95f1535
--- /dev/null
+++ b/plugins/alsa/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		if(!JNILibraryLoader.loadFromClassPath(getFileName(libname))){
+			System.loadLibrary(libname);
+		}
+	}
+
+	/**
+	 * Return filename of the library, which is platform dependent: .so, .dll...
+	 * @param libraryName Name of the library
+	 * @return Name of the file
+	 */
+	private static String getFileName(String libraryName) {
+		// FIXME fix other platforms
+		return libraryName + ".so";
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		File file = new File(JNI_TMP_PATH + filename);
+		try{
+			if(!file.exists()){
+				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					OutputStream outputStream = new FileOutputStream(file);
+
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			if(file.exists()){
+				System.load(file.getAbsolutePath());
+				return true;
+			}
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+	}
+}
diff --git a/TuxGuitar-alsa/jni/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c b/plugins/alsa/src/main/native/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
similarity index 100%
rename from TuxGuitar-alsa/jni/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
rename to plugins/alsa/src/main/native/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.c
diff --git a/TuxGuitar-alsa/jni/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.h b/plugins/alsa/src/main/native/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.h
similarity index 100%
rename from TuxGuitar-alsa/jni/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.h
rename to plugins/alsa/src/main/native/org_herac_tuxguitar_player_impl_midiport_alsa_MidiSystem.h
diff --git a/TuxGuitar-alsa/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/alsa/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-alsa/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/alsa/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/ascii/pom.xml b/plugins/ascii/pom.xml
new file mode 100644
index 00000000..3e854985
--- /dev/null
+++ b/plugins/ascii/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-ascii</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: ASCII</name>
+	<description>ASCII plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIOutputStream.java b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIIOutputStream.java
similarity index 98%
rename from TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIOutputStream.java
rename to plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIIOutputStream.java
index 7cb01f0a..769d8383 100644
--- a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIOutputStream.java
+++ b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIIOutputStream.java
@@ -7,23 +7,23 @@ public class ASCIIOutputStream {
 	private PrintWriter writer;
 	private int x;
 	private int y;
-	
+
 	public ASCIIOutputStream(PrintStream stream){
 		this.writer = new PrintWriter(stream);
 	}
-	
+
 	public void drawNote(int fret){
 		movePoint(getPosX() + ((fret >=10 )?2:1),getPosY());
 		this.writer.print(fret);
 	}
-	
+
 	public void drawStringSegments(int count){
 		movePoint(getPosX() + count,getPosY());
 		for(int i = 0; i < count;i ++){
 			this.writer.print("-");
 		}
 	}
-	
+
 	public void drawTuneSegment(String tune,int maxLength){
 		for(int i = tune.length();i < maxLength;i ++){
 			drawSpace();
@@ -31,44 +31,44 @@ public void drawTuneSegment(String tune,int maxLength){
 		movePoint(getPosX() + tune.length(),getPosY());
 		this.writer.print(tune);
 	}
-	
+
 	public void drawBarSegment(){
 		movePoint(getPosX() + 1,getPosY());
 		this.writer.print("|");
 	}
-	
+
 	public void nextLine(){
 		movePoint(0,getPosY() + 1);
 		this.writer.println("");
 	}
-	
+
 	public void drawStringLine(String s){
 		movePoint(0,getPosY() + 1);
 		this.writer.println(s);
 	}
-	
+
 	public void drawSpace(){
 		movePoint(getPosX() + 1,getPosY());
 		this.writer.print(" ");
 	}
-	
+
 	private void movePoint(int x,int y){
 		this.x = x;
 		this.y = y;
 	}
-	
+
 	public int getPosX(){
 		return this.x;
 	}
-	
+
 	public int getPosY(){
 		return this.y;
 	}
-	
+
 	public void flush(){
 		this.writer.flush();
 	}
-	
+
 	public void close(){
 		this.writer.close();
 	}
diff --git a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java
similarity index 90%
rename from TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java
rename to plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java
index dbec5c76..8bd25238 100644
--- a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java
+++ b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIIPluginExporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class ASCIIPluginExporter extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new ASCIISongExporter();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "ASCII tab exporter";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "ASCII tab exporter";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java
similarity index 92%
rename from TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java
rename to plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java
index c0a9cdd9..48dadbd7 100644
--- a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java
+++ b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIISongExporter.java
@@ -8,29 +8,34 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class ASCIISongExporter implements TGLocalFileExporter{
-	
+
 	private OutputStream stream;
-	
+
+	@Override
 	public String getExportName() {
 		return "ASCII";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("ASCII","*.tab");
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		return true;
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) {
 		if( this.stream != null ){
 			new ASCIITabOutputStream(this.stream).writeSong(song);
 		}
 	}
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIITabOutputStream.java b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIITabOutputStream.java
similarity index 95%
rename from TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIITabOutputStream.java
rename to plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIITabOutputStream.java
index 30d3650f..0c44d803 100644
--- a/TuxGuitar-ascii/src/org/herac/tuxguitar/io/ascii/ASCIITabOutputStream.java
+++ b/plugins/ascii/src/main/java/org/herac/tuxguitar/io/ascii/ASCIITabOutputStream.java
@@ -16,27 +16,27 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class ASCIITabOutputStream {
-	
+
 	private static final String[] TONIC_NAMES = new String[]{"C","C#","D","D#","E","F","F#","G","G#","A","A#","B"};
-	
+
 	private static final int MAX_LINE_LENGTH = 80;
-	
+
 	private TGSongManager manager;
 	private PrintStream stream;
 	private ASCIIOutputStream out;
-	
+
 	public ASCIITabOutputStream(PrintStream stream){
 		this.stream = stream;
 	}
-	
+
 	public ASCIITabOutputStream(OutputStream stream){
 		this(new PrintStream(stream));
 	}
-	
+
 	public ASCIITabOutputStream(String fileName) throws FileNotFoundException{
 		this(new FileOutputStream(fileName));
 	}
-	
+
 	public void writeSong(TGSong song){
 		this.manager = new TGSongManager();
 		this.manager.setSong(song);
@@ -45,47 +45,47 @@ public void writeSong(TGSong song){
 		this.out.flush();
 		this.out.close();
 	}
-	
+
 	private void drawSong(){
 		TGSong song = this.manager.getSong();
-		
+
 		//Propiedades de cancion
 		this.out.drawStringLine("Title: " + song.getName());
 		this.out.drawStringLine("Artist: " + song.getArtist());
 		this.out.drawStringLine("Album: " + song.getAlbum());
 		this.out.drawStringLine("Author: " + song.getAuthor());
-		
-		Iterator it = song.getTracks();
+
+		Iterator<TGTrack> it = song.getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			this.out.nextLine();
 			drawTrack(track);
 			this.out.nextLine();
 		}
 	}
-	
+
 	private void drawTrack(TGTrack track){
 		//Propiedades de pista
 		this.out.nextLine();
 		this.out.drawStringLine("Track " + track.getNumber() + ": " + track.getName());
-		
+
 		//Obtengo los nombres de la afinacion, y el ancho maximo que ocupa
 		String[] tuning = new String[track.getStrings().size()];
 		int maxTuningLength = 1;
 		for(int i = 0; i < track.getStrings().size();i++){
-			TGString string = (TGString)track.getStrings().get(i);
+			TGString string = track.getStrings().get(i);
 			tuning[i] = TONIC_NAMES[(string.getValue() % TONIC_NAMES.length)];
 			maxTuningLength = Math.max(maxTuningLength,tuning[i].length());
 		}
-		
+
 		int nextMeasure = 0;
 		boolean eof = false;
 		while(!eof){
 			this.out.nextLine();
 			int index = nextMeasure;
 			for(int i = 0; i < track.getStrings().size();i++){
-				TGString string = (TGString)track.getStrings().get(i);
-				
+				TGString string = track.getStrings().get(i);
+
 				//Dibujo la afinacion de la cuerda
 				this.out.drawTuneSegment(tuning[i],maxTuningLength);
 				int measureCount = track.countMeasures();
@@ -93,10 +93,10 @@ private void drawTrack(TGTrack track){
 					TGMeasure measure = track.getMeasure(j);
 					drawMeasure(measure,string);
 					nextMeasure = (j + 1);
-					
+
 					//Calculo si era el ultimo compas
 					eof = (this.manager.getTrackManager().isLastMeasure(measure));
-					
+
 					//Si se supero el ancho maximo, bajo de linea
 					if(this.out.getPosX() > MAX_LINE_LENGTH){
 						break;
@@ -110,7 +110,7 @@ private void drawTrack(TGTrack track){
 		}
 		this.out.nextLine();
 	}
-	
+
 	private void drawMeasure(TGMeasure measure,TGString string){
 		//Abro el compas
 		this.out.drawBarSegment();
@@ -118,7 +118,7 @@ private void drawMeasure(TGMeasure measure,TGString string){
 		TGBeat beat = this.manager.getMeasureManager().getFirstBeat( measure.getBeats() );
 		while(beat != null){
 			int outLength = 0;
-			
+
 			//Si hay una nota en la misma cuerda, la dibujo
 			TGNote note = this.manager.getMeasureManager().getNote(beat, string.getNumber());
 			if(note != null){
@@ -129,26 +129,26 @@ private void drawMeasure(TGMeasure measure,TGString string){
 			else{
 				this.out.drawStringSegments(1);
 			}
-			
+
 			TGBeat nextBeat = this.manager.getMeasureManager().getNextBeat( measure.getBeats() , beat);
-			
+
 			long length = (nextBeat != null ? nextBeat.getStart() - beat.getStart() : (measure.getStart() + measure.getLength()) - beat.getStart());
 			//Agrego espacios correspondientes hasta el proximo pulso.
 			this.out.drawStringSegments(getDurationScaping(length) - outLength);
-			
+
 			beat = nextBeat;
-			
+
 			//Agrego espacios correspondientes hasta el proximo pulso.
 			//this.out.drawStringSegments(getDurationScaping(beat.getDuration()) - outLength);
-			
+
 			//beat = this.manager.getMeasureManager().getNextBeat( measure.getBeats() , beat);
 		}
-		
+
 	}
 	/*
 	private int getDurationScaping(TGDuration duration){
 		int spacing = 1;
-		
+
 		if(duration.getValue() >= TGDuration.SIXTEENTH){
 			spacing = 2;
 		}
diff --git a/TuxGuitar-ascii/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/ascii/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-ascii/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/ascii/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-AudioUnit/How to Install.txt b/plugins/audiounit/How to Install.txt
similarity index 100%
rename from TuxGuitar-AudioUnit/How to Install.txt
rename to plugins/audiounit/How to Install.txt
diff --git a/plugins/audiounit/Makefile b/plugins/audiounit/Makefile
new file mode 100644
index 00000000..b151bddc
--- /dev/null
+++ b/plugins/audiounit/Makefile
@@ -0,0 +1,28 @@
+CXX = g++
+
+#SDK = /Developer/SDKs/MacOSX10.5.sdk
+#SDK64 = /Developer/SDKs/MacOSX10.5.sdk
+SDK = $(shell xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk # works for 10.8.2
+SDK64 = $(SDK)
+JAVA_FRAMEWORK = $(SDK)/System/Library/Frameworks/JavaVM.framework
+JAVA_FRAMEWORK64 = $(SDK64)/System/Library/Frameworks/JavaVM.framework
+
+#INCLUDES = -I $(JAVA_FRAMEWORK)/Headers/
+#INCLUDES64 = -I $(JAVA_FRAMEWORK64)/Headers/
+
+LIBRARIES = -framework CoreAudio -framework JavaVM -framework AudioUnit -framework AudioToolbox -framework CoreServices
+
+LIBRARY = libtuxguitar-audiounit-jni.jnilib
+
+FILENAME = org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
+
+all:	$(LIBRARY)
+
+$(LIBRARY):	clean
+#	g++ $(INCLUDES) -isysroot $(SDK) -arch ppc $(LIBRARIES) -msse -bundle -o ppc_$(LIBRARY) $(FILENAME)
+	g++ -arch i386 $(LIBRARIES) -msse -bundle -o intel_$(LIBRARY) $(FILENAME)
+	g++ -arch x86_64 $(LIBRARIES) -msse -bundle -o intel64_$(LIBRARY) $(FILENAME)
+	lipo -create intel_$(LIBRARY) intel64_$(LIBRARY) -output $(LIBRARY)
+
+clean:
+	rm -f ppc_$(LIBRARY) intel_$(LIBRARY) intel64_$(LIBRARY) $(LIBRARY)
diff --git a/plugins/audiounit/pom.xml b/plugins/audiounit/pom.xml
new file mode 100644
index 00000000..2aacd833
--- /dev/null
+++ b/plugins/audiounit/pom.xml
@@ -0,0 +1,112 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-audiounit</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: AudioUnit</name>
+	<description>MacOS AudioUnit plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- generate the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+					<phase>validate</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- the jar is also an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+				  <execution>
+					<phase>validate</phase>
+					<goals>
+					  <goal>attach-artifact</goal>
+					</goals>
+					<configuration>
+					  <artifacts>
+						<artifact>
+						  <file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+						  <type>jar</type>
+						</artifact>
+					  </artifacts>
+					</configuration>
+				  </execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>       
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared</linkerStartOption> 
+					</linkerStartOptions>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java
new file mode 100644
index 00000000..552337b1
--- /dev/null
+++ b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/JNILibraryLoader.java
@@ -0,0 +1,65 @@
+package org.herac.tuxguitar.player.impl.midiport.audiounit;
+
+import java.io.File;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_EXTENSION = ".jnilib";
+
+	//private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		System.out.println("trying to load" + libname + " (void loadLibrary)");
+		JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION);
+		/*
+		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
+			//System.loadLibrary(libname);
+		}
+		 */
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		System.out.println("trying to load" + filename + " (bool loadFromClassPath)");
+
+		File file = new File(/*JNI_TMP_PATH +*/ filename);
+		/*
+		try{
+			if(!file.exists()){
+				OutputStream outputStream = new FileOutputStream(file);
+				InputStream inputStream = JNILibraryLoader.class.getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			*/
+			if(file.exists()){
+				System.out.println("calling file.getAbsolutePath() : "+ file.getAbsolutePath());
+				System.load(file.getAbsolutePath());
+				//System.load(file.getAbsolutePath());
+				return true;
+			}
+			//else
+			//{
+				System.out.println("Can't find file " + file.getAbsolutePath());
+				return false;
+			//}
+			/*
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+			 */
+	}
+}
+
+
diff --git a/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java
new file mode 100644
index 00000000..b4f1f50e
--- /dev/null
+++ b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortImpl.java
@@ -0,0 +1,50 @@
+package org.herac.tuxguitar.player.impl.midiport.audiounit;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiPortImpl implements MidiOutputPort{
+
+	private String key;
+	private String name;
+	private MidiReceiverImpl receiver;
+
+	public MidiPortImpl(MidiReceiverImpl midiOut,String name,String key){
+        this.key = key;
+        this.name = name;
+		this.receiver = midiOut;
+	}
+
+	@Override
+	public void open(){
+		if(!this.receiver.isConnected()){
+			this.receiver.connect();
+		}
+	}
+
+	@Override
+	public void close(){
+		this.receiver.disconnect();
+	}
+
+	@Override
+	public MidiReceiver getReceiver(){
+		this.open();
+		return this.receiver;
+	}
+
+	@Override
+	public void check(){
+		// Not implemented
+	}
+
+	@Override
+	public String getKey(){
+		return this.key;
+	}
+
+	@Override
+	public String getName(){
+		return this.name;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java
similarity index 75%
rename from TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java
rename to plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java
index 3040ff7e..db56d54e 100644
--- a/TuxGuitar-AudioUnit/src/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java
+++ b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderAudioUnit.java
@@ -2,26 +2,28 @@
 
 import java.util.List;
 
+import org.herac.tuxguitar.player.base.MidiOutputPort;
 import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-import org.herac.tuxguitar.player.impl.midiport.audiounit.MidiReceiverImpl;
 
 public class MidiPortReaderAudioUnit implements MidiOutputPortProvider{
 
 	private static final MidiReceiverImpl midiOut = new MidiReceiverImpl();
-	
+
 	public MidiPortReaderAudioUnit(){
 		super();
 	}
-	
-	public List listPorts() {
+
+	@Override
+	public List<MidiOutputPort> listPorts() {
 		if(!midiOut.isOpen()){
 			midiOut.open();
 		}
 		return midiOut.listPorts();
 	}
 
-	public void closeAll(){	
+	@Override
+	public void closeAll(){
 		midiOut.close();
 	}
-	
+
 }
diff --git a/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java
new file mode 100644
index 00000000..345c0c08
--- /dev/null
+++ b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiPortReaderPlugin.java
@@ -0,0 +1,33 @@
+package org.herac.tuxguitar.player.impl.midiport.audiounit;
+
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiPortReaderPlugin extends TGMidiOutputPortProviderPlugin{
+
+	@Override
+	protected MidiOutputPortProvider getProvider() {
+		return new MidiPortReaderAudioUnit();
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Auria";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Core Audio output plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "Core Audio output plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+
+}
diff --git a/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java
new file mode 100644
index 00000000..3e870ffe
--- /dev/null
+++ b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverImpl.java
@@ -0,0 +1,116 @@
+package org.herac.tuxguitar.player.impl.midiport.audiounit;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiControllers;
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiReceiverImpl extends MidiReceiverJNI implements MidiReceiver{
+	private boolean open; // unncessary
+    private boolean connected;
+	private final List<MidiOutputPort> ports;
+
+	public MidiReceiverImpl(){
+		this.ports = new ArrayList<MidiOutputPort>();
+        this.connected = false;
+	}
+
+	@Override
+	public void open(){
+		super.open();
+		this.open = true;
+	}
+
+	@Override
+	public void close(){
+		if(this.isOpen()){
+			this.disconnect();
+			super.close();
+			this.open = false;
+		}
+	}
+
+	public boolean isOpen(){
+		return (this.open);
+	}
+
+	public boolean isConnected(){
+		return (this.isOpen() && this.connected);
+	}
+
+    public void connect(){
+        if(isOpen()){
+            if(!isConnected()){
+                this.connected = true;
+                this.openDevice();
+            }
+        }
+    }
+
+	public void disconnect() {
+		if(isConnected()){
+			this.closeDevice();
+			this.connected = false;
+		}
+	}
+
+	public List<MidiOutputPort> listPorts(){
+		if(isOpen()){
+			this.ports.clear();
+			this.ports.add(new MidiPortImpl(this, "AudioUnit graph midi playback" , "audiounit" ));
+			return this.ports;
+		}
+		return Collections.emptyList();
+	}
+
+	public void sendSystemReset() {
+		if(isOpen()){
+			//not implemented
+		}
+	}
+
+	@Override
+	public void sendAllNotesOff() {
+		for(int i = 0; i < 16; i ++){
+			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
+		}
+	}
+
+	@Override
+	public void sendControlChange(int channel, int controller, int value) {
+		if(isOpen()){
+			super.controlChange(channel, controller, value);
+		}
+	}
+
+	@Override
+	public void sendNoteOff(int channel, int key, int velocity) {
+		if(isOpen()){
+			super.noteOff(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendNoteOn(int channel, int key, int velocity) {
+		if(isOpen()){
+			super.noteOn(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendPitchBend(int channel, int value) {
+		if(isOpen()){
+			super.pitchBend(channel, value);
+		}
+	}
+
+	@Override
+	public void sendProgramChange(int channel, int value) {
+		if(isOpen()){
+			super.programChange(channel, value);
+		}
+	}
+}
diff --git a/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java
new file mode 100644
index 00000000..5dde623d
--- /dev/null
+++ b/plugins/audiounit/src/main/java/org/herac/tuxguitar/player/impl/midiport/audiounit/MidiReceiverJNI.java
@@ -0,0 +1,37 @@
+package org.herac.tuxguitar.player.impl.midiport.audiounit;
+
+public abstract class MidiReceiverJNI{
+
+	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-audiounit-jni");
+
+	static{
+		System.loadLibrary (JNI_LIBRARY_NAME);
+	}
+
+	public MidiReceiverJNI() {
+		super();
+	}
+
+	protected native void open();
+
+	protected native void close();
+
+	//protected native void findDevices();
+
+	protected native void openDevice();
+
+	protected native void closeDevice();
+
+	protected native void noteOn(int channel,int note,int velocity);
+
+	protected native void noteOff(int channel,int note,int velocity);
+
+	protected native void controlChange(int channel,int control,int value);
+
+	protected native void programChange(int channel,int program);
+
+	protected native void pitchBend(int channel,int value);
+
+
+	//protected abstract void addDevice(String name);
+}
diff --git a/TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp b/plugins/audiounit/src/main/native/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
similarity index 98%
rename from TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
rename to plugins/audiounit/src/main/native/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
index 173a33ac..f05edf0c 100644
--- a/TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
+++ b/plugins/audiounit/src/main/native/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.cpp
@@ -5,6 +5,10 @@
 #include <AudioUnit/AudioUnit.h>
 #include <AudioToolbox/AudioToolbox.h>
 
+//#include <CoreServices/CoreServices.h> //for file stuff
+#include <Carbon/Carbon.h>
+
+
 // some MIDI constants:
 enum
 {
@@ -43,7 +47,7 @@ class MidiPlayer
             //create the nodes of the graph
             AUNode synthNode, limiterNode, outNode;
             
-            ComponentDescription cd;
+            AudioComponentDescription cd;
             cd.componentManufacturer = kAudioUnitManufacturer_Apple;
             cd.componentFlags = 0;
             cd.componentFlagsMask = 0;
diff --git a/TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.h b/plugins/audiounit/src/main/native/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.h
similarity index 100%
rename from TuxGuitar-AudioUnit/jni/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.h
rename to plugins/audiounit/src/main/native/org_herac_tuxguitar_player_impl_midiport_audiounit_MidiReceiverJNI.h
diff --git a/plugins/browser-ftp/pom.xml b/plugins/browser-ftp/pom.xml
new file mode 100644
index 00000000..62409e69
--- /dev/null
+++ b/plugins/browser-ftp/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-browser-ftp</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Browser FTP</name>
+	<description>Browser FTP plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserDataImpl.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserDataImpl.java
new file mode 100644
index 00000000..e196eed2
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserDataImpl.java
@@ -0,0 +1,99 @@
+package org.herac.tuxguitar.app.tools.browser.ftp;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
+import org.herac.tuxguitar.app.tools.browser.ftp.utils.Base64Decoder;
+import org.herac.tuxguitar.app.tools.browser.ftp.utils.Base64Encoder;
+
+public class TGBrowserDataImpl implements TGBrowserData{
+
+	private static final String STRING_SEPARATOR = ";";
+
+	private String name;
+	private String host;
+	private String path;
+	private String username;
+	private String password;
+	private String proxyUser;
+	private String proxyPwd;
+	private String proxyHost;
+	private int proxyPort;
+
+	public TGBrowserDataImpl(String name, String host, String path, String username, String password, String proxyUser, String proxyPwd, String proxyHost, int proxyPort) {
+		this.name = name;
+		this.host = host;
+		this.path = path;
+		this.username = username;
+		this.password = password;
+		this.proxyUser = proxyUser;
+		this.proxyPwd = proxyPwd;
+		this.proxyHost = proxyHost;
+		this.proxyPort = proxyPort;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public String getHost() {
+		return this.host;
+	}
+
+	public String getPath() {
+		return this.path;
+	}
+
+	public String getPassword() {
+		return ((this.username != null && this.username.length() > 0)?this.password:TGBrowserFTPClient.DEFAULT_USER_PASSWORD);
+	}
+
+	public String getUsername() {
+		return ((this.username != null && this.username.length() > 0)?this.username:TGBrowserFTPClient.DEFAULT_USER_NAME);
+	}
+
+	@Override
+	public String getTitle(){
+		return getName();
+	}
+
+	public String getProxyHost() {
+		return this.proxyHost;
+	}
+
+	public int getProxyPort() {
+		return this.proxyPort;
+	}
+
+	public String getProxyUser() {
+		return this.proxyUser;
+	}
+
+	public String getProxyPwd() {
+		return this.proxyPwd;
+	}
+
+	@Override
+	public String toString(){
+		String username = new String( Base64Encoder.encode( getUsername().getBytes() ) );
+		String password = new String( Base64Encoder.encode( getPassword().getBytes() ) );
+		String	proxyUser = new String( Base64Encoder.encode( getProxyUser().getBytes() ));
+		String	proxyPwd = new String( Base64Encoder.encode( getProxyPwd().getBytes() ));
+
+		return getName() + STRING_SEPARATOR + getHost() + STRING_SEPARATOR
+				+ getPath() + STRING_SEPARATOR + username + STRING_SEPARATOR
+				+ password + STRING_SEPARATOR + proxyUser + STRING_SEPARATOR
+				+ proxyPwd + STRING_SEPARATOR + getProxyHost()
+				+ STRING_SEPARATOR + getProxyPort();
+	}
+
+	public static TGBrowserData fromString(String string) {
+		String[] data = string.split(STRING_SEPARATOR);
+		if(data.length == 9){
+			String username = new String( Base64Decoder.decode( data[3].getBytes() ) );
+			String password = new String( Base64Decoder.decode( data[4].getBytes() ) );
+			String proxyUser = new String( Base64Decoder.decode( data[5].getBytes() ));
+			String proxyPwd = new String( Base64Decoder.decode( data[6].getBytes() ) );
+			return new TGBrowserDataImpl(data[0], data[1], data[2], username, password,  proxyUser, proxyPwd, data[7], Integer.parseInt(data[8]));
+		}
+		return null;
+	}
+}
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementComparator.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementComparator.java
new file mode 100644
index 00000000..87c99755
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementComparator.java
@@ -0,0 +1,37 @@
+package org.herac.tuxguitar.app.tools.browser.ftp;
+
+import java.util.Comparator;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserElementComparator implements Comparator<Object> {
+
+	private static final int RESULT_LESS = -1;
+
+	private static final int RESULT_EQUAL = 0;
+
+	private static final int RESULT_GREATER = 1;
+
+	private static final int DIRECTION = 1;
+
+	private static final int DIRECTION_FOLDER = 1;
+
+	@Override
+	public int compare(Object o1, Object o2) {
+		if(o1 instanceof TGBrowserElement && o2 instanceof TGBrowserElement){
+			TGBrowserElement element1 = (TGBrowserElement)o1;
+			TGBrowserElement element2 = (TGBrowserElement)o2;
+
+			if(element1.isFolder() && !element2.isFolder()){
+				return (DIRECTION_FOLDER * RESULT_LESS);
+			}
+			if(element2.isFolder() && !element1.isFolder()){
+				return (DIRECTION_FOLDER * RESULT_GREATER);
+			}
+
+			return (DIRECTION * (element1.getName().compareTo(element2.getName())));
+		}
+		return RESULT_EQUAL;
+	}
+
+}
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementImpl.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementImpl.java
new file mode 100644
index 00000000..8dbed6bd
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserElementImpl.java
@@ -0,0 +1,35 @@
+package org.herac.tuxguitar.app.tools.browser.ftp;
+
+import java.io.InputStream;
+
+import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserElementImpl extends TGBrowserElement{
+
+	private TGBrowserImpl browser;
+	private String path;
+	private String info;
+
+	public TGBrowserElementImpl(TGBrowserImpl browser,String name,String info,String path) {
+		super(name);
+		this.browser = browser;
+		this.info = info;
+		this.path = path;
+	}
+
+	@Override
+	public boolean isFolder(){
+		return (this.info != null && this.info.length() > 0 && this.info.charAt(0) == 'd');
+	}
+
+	public boolean isSymLink() {
+		return (this.info != null && this.info.length() > 0 && this.info.charAt(0) == 'l');
+	}
+
+	@Override
+	public InputStream getInputStream()throws TGBrowserException {
+		return this.browser.getInputStream(this.path,this);
+	}
+
+}
diff --git a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFTPClient.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFTPClient.java
similarity index 98%
rename from TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFTPClient.java
rename to plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFTPClient.java
index 7f894f66..e5be5f6a 100644
--- a/TuxGuitar-browser-ftp/src/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFTPClient.java
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFTPClient.java
@@ -10,12 +10,12 @@
 import java.net.Socket;
 
 public class TGBrowserFTPClient {
-	
+
 	public static final int DEFAULT_PORT = 21;
-	
+
 	public static final String DEFAULT_USER_NAME = "anonymous";
 	public static final String DEFAULT_USER_PASSWORD = "anonymous";
-	
+
 	private static final String REQUEST_USER_NAME = "USER";
 	private static final String REQUEST_USER_PASSWORD = "PASS";
 	private static final String REQUEST_EXIT = "QUIT";
@@ -28,7 +28,7 @@ public class TGBrowserFTPClient {
 	private static final String REQUEST_GET = "RETR";
 	private static final String REQUEST_LIST_FILES = "LIST";
 	private static final String REQUEST_LIST_NAMES = "NLST";
-	
+
 	private static final int RESPONSE_CODE_CONNECT = 220;
 	private static final int RESPONSE_CODE_USER_NAME = 331;
 	private static final int RESPONSE_CODE_USER_PASSWORD = 230;
@@ -37,32 +37,32 @@ public class TGBrowserFTPClient {
 	private static final int RESPONSE_CODE_TYPE = 200;
 	private static final int RESPONSE_CODE_PASV = 227;
 	private static final int RESPONSE_CODE_PASV_CONNECTION = 150;
-	
+
 	private boolean open;
 	private Socket socket = null;
 	private BufferedWriter request = null;
 	private BufferedReader response = null;
-	
+
 	public boolean isOpen() {
 		return this.open;
 	}
-	
+
 	public void setOpen(boolean open) {
 		this.open = open;
 	}
-	
+
 	public synchronized void open(String host, int port) throws IOException {
 		this.socket = new Socket(host, port);
 		this.response = new BufferedReader(new InputStreamReader(this.socket.getInputStream()));
 		this.request = new BufferedWriter(new OutputStreamWriter(this.socket.getOutputStream()));
-		
+
 		String response = getResponse(RESPONSE_CODE_CONNECT);
 		if (!isExpectedResponse(response, RESPONSE_CODE_CONNECT)) {
 			throw new IOException(response);
 		}
 		this.setOpen( true );
 	}
-	
+
 	public synchronized void close() throws IOException {
 		if( this.isOpen() ){
 			this.setRequest(REQUEST_EXIT);
@@ -71,21 +71,21 @@ public synchronized void close() throws IOException {
 		}
 		this.setOpen( false );
 	}
-	
+
 	public synchronized void login(String user, String password) throws IOException {
 		String error = null;
-		
+
 		this.setRequest(REQUEST_USER_NAME + " " + user);
 		if ((error = getResponseError(RESPONSE_CODE_USER_NAME)) != null ){
 			throw new IOException(error);
 		}
-		
+
 		this.setRequest(REQUEST_USER_PASSWORD + " " + password);
 		if ((error = getResponseError(RESPONSE_CODE_USER_PASSWORD)) != null ){
 			throw new IOException(error);
 		}
 	}
-	
+
 	public synchronized String pwd() throws IOException {
 		this.setRequest(REQUEST_PWD);
 		String response = getResponse(RESPONSE_CODE_PWD);
@@ -98,48 +98,48 @@ public synchronized String pwd() throws IOException {
 		}
 		return null;
 	}
-	
+
 	public synchronized boolean cd(String dir) throws IOException {
 		this.setRequest(REQUEST_CD + " " + dir);
 		return (getResponseError(RESPONSE_CODE_CD) == null);
 	}
-	
+
 	public synchronized boolean cdUp() throws IOException {
 		this.setRequest(REQUEST_CDUP);
 		return (getResponseError(RESPONSE_CODE_CD) == null);
 	}
-	
+
 	public synchronized boolean binary() throws IOException {
 		this.setRequest(REQUEST_TYPE_BINARY);
 		return (getResponseError(RESPONSE_CODE_TYPE) == null);
 	}
-	
+
 	public synchronized boolean ascii() throws IOException {
 		this.setRequest(REQUEST_TYPE_ASCII);
 		return (getResponseError(RESPONSE_CODE_TYPE) == null);
 	}
-	
+
 	public synchronized byte[] get(String file)  throws IOException{
 		return sendPasvCMD(REQUEST_GET + " " + file);
 	}
-	
+
 	public synchronized String[] listDetails() throws IOException{
 		return new String( sendPasvCMD(REQUEST_LIST_FILES) ).split("\r\n");
 	}
-	
+
 	public synchronized String[] listNames() throws IOException{
 		return new String( sendPasvCMD(REQUEST_LIST_NAMES) ).split("\r\n");
 	}
-	
+
 	private synchronized byte[] sendPasvCMD(String cmd)  throws IOException{
 		byte[] buffer = new byte[0];
-		
+
 		setRequest(REQUEST_PASSIVE);
-		
+
 		String response = getResponse(RESPONSE_CODE_PASV);
 		if(isExpectedResponse(response, RESPONSE_CODE_PASV)){
 			setRequest(cmd);
-			
+
 			int addressIndex1 = response.indexOf("(") + 1;
 			int addressIndex2 = response.indexOf(")");
 			if( addressIndex1 > 0 && addressIndex2 > addressIndex1 ){
@@ -151,9 +151,9 @@ private synchronized byte[] sendPasvCMD(String cmd)  throws IOException{
 					int a4 = Integer.parseInt(address[3]);
 					int p1 = Integer.parseInt(address[4]);
 					int p2 = Integer.parseInt(address[5]);
-					
+
 					Socket socket = new Socket((a1 + "." + a2 + "." + a3 + "." + a4), ((p1 * 256) + p2));
-					
+
 					response = getResponse(RESPONSE_CODE_PASV_CONNECTION);
 					if(isExpectedResponse(response, RESPONSE_CODE_PASV_CONNECTION)){
 						buffer = getByteBuffer(socket.getInputStream());
@@ -167,16 +167,16 @@ private synchronized byte[] sendPasvCMD(String cmd)  throws IOException{
 		}
 		return buffer;
 	}
-	
+
 	private boolean isExpectedResponse(String response, int expectedCode){
 		return ( response != null && response.indexOf(expectedCode + " ") == 0 );
 	}
-	
+
 	private String getResponseError(int expectedCode) throws IOException{
 		String response = getResponse(expectedCode);
-		return (isExpectedResponse(response, expectedCode) ? null : response); 
+		return (isExpectedResponse(response, expectedCode) ? null : response);
 	}
-	
+
 	private String getResponse(int expectedCode) throws IOException{
 		String response = this.getResponse();
 		// Some FTP Servers appends comments like "[CODE_NUMBER]-".
@@ -184,31 +184,31 @@ private String getResponse(int expectedCode) throws IOException{
 		while( response != null && response.indexOf(expectedCode + "-") == 0){
 			response = this.getResponse();
 		}
-		return response; 
+		return response;
 	}
-	
+
 	private String getResponse() throws IOException {
 		return this.response.readLine();
 	}
-	
+
 	private void setRequest(String line) throws IOException {
 		this.request.write(line + "\r\n");
 		this.request.flush();
 	}
-	
+
 	private static byte[] getByteBuffer(InputStream in) throws IOException{
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		
+
 		int read = 0;
 		while((read = in.read()) != -1){
 			out.write(read);
 		}
-		
+
 		byte[] bytes = out.toByteArray();
-		
+
 		out.close();
 		out.flush();
-		
+
 		return bytes;
 	}
 }
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFactoryImpl.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFactoryImpl.java
new file mode 100644
index 00000000..a052edda
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserFactoryImpl.java
@@ -0,0 +1,259 @@
+package org.herac.tuxguitar.app.tools.browser.ftp;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.tools.browser.TGBrowserCollection;
+import org.herac.tuxguitar.app.tools.browser.TGBrowserManager;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
+import org.herac.tuxguitar.app.util.DialogUtils;
+import org.herac.tuxguitar.app.util.MessageDialog;
+
+public class TGBrowserFactoryImpl implements TGBrowserFactory{
+
+	public TGBrowserFactoryImpl() {
+		super();
+	}
+
+	@Override
+	public String getType(){
+		return "ftp";
+	}
+
+	@Override
+	public String getName(){
+		return "FTP";
+	}
+
+	@Override
+	public TGBrowser newTGBrowser(TGBrowserData data) {
+		if(data instanceof TGBrowserDataImpl){
+			return new TGBrowserImpl((TGBrowserDataImpl)data);
+		}
+		return null;
+	}
+
+	@Override
+	public TGBrowserData parseData(String string) {
+		return TGBrowserDataImpl.fromString(string);
+	}
+
+	@Override
+	public TGBrowserData dataDialog(Shell parent) {
+		return new TGBrowserDataDialog().show(parent);
+	}
+
+}
+class TGBrowserDataDialog{
+
+	protected TGBrowserDataImpl data;
+
+	public TGBrowserDataImpl show(final Shell parent){
+		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+
+		dialog.setLayout(new GridLayout());
+		dialog.setText(TuxGuitar.getProperty("FTP Location"));
+
+		//-------------LIBRARY DATA-----------------------------------------------
+		Composite composite = new Composite(dialog, SWT.NONE);
+		composite.setLayout(new GridLayout(2,false));
+		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
+		GridData textData = new GridData(SWT.FILL,SWT.FILL,true,true);
+		textData.minimumWidth = 300;
+
+		//name
+		Label nameLabel = new Label(composite, SWT.NULL);
+		nameLabel.setText(TuxGuitar.getProperty("Name"));
+		final Text nameText = new Text(composite,SWT.BORDER);
+		nameText.setLayoutData(textData);
+
+
+		//host
+		Label hostLabel = new Label(composite, SWT.NULL);
+		hostLabel.setText(TuxGuitar.getProperty("Host"));
+		final Text hostText = new Text(composite,SWT.BORDER);
+		hostText.setLayoutData(textData);
+
+		//path
+		Label pathLabel = new Label(composite, SWT.NULL);
+		pathLabel.setText(TuxGuitar.getProperty("Path"));
+		final Text pathText = new Text(composite,SWT.BORDER);
+		pathText.setLayoutData(textData);
+
+		//user
+		Label userLabel = new Label(composite, SWT.NULL);
+		userLabel.setText(TuxGuitar.getProperty("Login name"));
+		final Text userText = new Text(composite,SWT.BORDER);
+		userText.setLayoutData(textData);
+
+		//password
+		Label passwordLabel = new Label(composite, SWT.NULL);
+		passwordLabel.setText(TuxGuitar.getProperty("Password"));
+		final Text passwordText = new Text(composite,SWT.BORDER | SWT.PASSWORD);
+		passwordText.setLayoutData(textData);
+
+		// Proxy
+		final Button hasProxy = new Button(composite,SWT.CHECK);
+		hasProxy.setText("Connect via Proxy Server");
+		Label dummyLabel = new Label(composite, SWT.NULL);
+		dummyLabel.setLayoutData(textData);
+
+		//proxy host
+		final Label proxyHostLabel = new Label(composite, SWT.NULL);
+		proxyHostLabel.setText(TuxGuitar.getProperty("Proxy Server Host"));
+		final Text proxyHostText = new Text(composite,SWT.BORDER);
+		proxyHostText.setLayoutData(textData);
+
+		//proxy port
+		final Label proxyPortLabel = new Label(composite, SWT.NULL);
+		proxyPortLabel.setText(TuxGuitar.getProperty("Proxy Server Port"));
+		final Text proxyPortText = new Text(composite,SWT.BORDER);
+		proxyPortText.setText("1080");
+		proxyPortText.setLayoutData(textData);
+
+		//proxy user
+		final Label proxyUserLabel = new Label(composite, SWT.NULL);
+		proxyUserLabel.setText(TuxGuitar.getProperty("Proxy Server User"));
+		final Text proxyUserText = new Text(composite,SWT.BORDER);
+		proxyUserText.setLayoutData(textData);
+
+		//proxy password
+		final Label proxyPwdLabel = new Label(composite, SWT.NULL);
+		proxyPwdLabel.setText(TuxGuitar.getProperty("Proxy Server Password"));
+		final Text proxyPwdText = new Text(composite,SWT.BORDER | SWT.PASSWORD);
+		proxyPwdText.setLayoutData(textData);
+
+		proxyHostText.setEnabled(false);
+		proxyPortText.setEnabled(false);
+		proxyUserText.setEnabled(false);
+		proxyPwdText.setEnabled(false);
+
+		hasProxy.addSelectionListener(new SelectionAdapter(){
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				proxyHostText.setEnabled(hasProxy.getSelection());
+				proxyPortText.setEnabled(hasProxy.getSelection());
+				proxyUserText.setEnabled(hasProxy.getSelection());
+				proxyPwdText.setEnabled(hasProxy.getSelection());
+			}
+		});
+
+
+		//------------------BUTTONS--------------------------
+		Composite buttons = new Composite(dialog, SWT.NONE);
+		buttons.setLayout(new GridLayout(2,false));
+		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
+
+		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
+		data.minimumWidth = 80;
+		data.minimumHeight = 25;
+
+		final Button buttonOk = new Button(buttons, SWT.PUSH);
+		buttonOk.setText(TuxGuitar.getProperty("ok"));
+		buttonOk.setLayoutData(data);
+		buttonOk.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				String name = nameText.getText();
+				String host = hostText.getText();
+				String path = pathText.getText();
+				String user = userText.getText();
+				String password = passwordText.getText();
+				String proxyHost = proxyHostText.getText();
+				String proxyPortStr = proxyPortText.getText();
+				String proxyUser = proxyUserText.getText();
+				String proxyPwd = proxyPwdText.getText();
+
+				List<String> errors = validate(name, host, proxyHost, proxyPortStr, hasProxy.getSelection());
+				if( !errors.isEmpty() ){
+					StringWriter buffer = new StringWriter();
+					PrintWriter writer = new PrintWriter( buffer );
+					Iterator<String> it = errors.iterator();
+					while( it.hasNext() ){
+						writer.println( "*" + it.next() );
+					}
+					MessageDialog.errorMessage(parent, buffer.getBuffer().toString() );
+				}else{
+					int proxyPort = Integer.parseInt( proxyPortStr );
+					TGBrowserDataDialog.this.data = new TGBrowserDataImpl(name, host, path, user, password, proxyUser, proxyPwd, proxyHost, proxyPort);
+
+					dialog.dispose();
+				}
+			}
+		});
+
+		Button buttonCancel = new Button(buttons, SWT.PUSH);
+		buttonCancel.setLayoutData(data);
+		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
+		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				dialog.dispose();
+			}
+		});
+
+		dialog.setDefaultButton( buttonOk );
+
+		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
+
+		return this.data;
+	}
+
+	protected List<String> validate(String name, String host, String pHost, String pPort, boolean pEnabled){
+		List<String> errors = new ArrayList<String>();
+		// Check the Name
+		if (name == null || name.trim().length() == 0) {
+			errors.add("Please enter the Name");
+		}else{
+			Iterator<TGBrowserCollection> it = TGBrowserManager.instance().getCollections();
+			while(it.hasNext()){
+				TGBrowserCollection collection = it.next();
+				if(name.equals(collection.getData().getTitle())){
+					errors.add("A collection named \"" + name + "\" already exists");
+					break;
+				}
+			}
+		}
+		if (host == null || host.trim().length() == 0) {
+			errors.add("Please enter the Host");
+		}
+		if( pEnabled ){
+			if(pHost == null || pHost.trim().length() == 0){
+				errors.add("Please enter Proxy Host");
+			}
+			if(pPort == null || pPort.trim().length() == 0){
+				errors.add("Please enter Proxy Port");
+			}else if(!isNumber(pPort)){
+				errors.add("Proxy Port should be a valid number");
+			}
+		}
+
+		return errors;
+	}
+
+	private boolean isNumber( String s ){
+		try {
+			Integer.parseInt(s);
+		} catch (Throwable e) {
+			return false;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserImpl.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserImpl.java
new file mode 100644
index 00000000..fdeb205e
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserImpl.java
@@ -0,0 +1,181 @@
+package org.herac.tuxguitar.app.tools.browser.ftp;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserImpl extends TGBrowser{
+
+	private final TGBrowserDataImpl data;
+	private String root;
+	private String path;
+	private TGBrowserFTPClient client;
+
+	public TGBrowserImpl(TGBrowserDataImpl data){
+		this.data = data;
+	}
+
+	private String getRoot(){
+		if(this.root == null){
+			this.root = "/";
+			if(this.data.getPath() != null && this.data.getPath().length() > 0){
+				this.root = this.data.getPath();
+				if(this.root.indexOf("/") != 0){
+					this.root = ("/" + this.root);
+				}
+			}
+		}
+		return this.root;
+	}
+
+	@Override
+	public void open() throws TGBrowserException{
+		try {
+			checkForProxy();
+			this.client = new TGBrowserFTPClient();
+			this.client.open(this.data.getHost(), TGBrowserFTPClient.DEFAULT_PORT);
+			this.client.login(this.data.getUsername(),this.data.getPassword());
+			this.cdRoot();
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+	}
+
+
+	@Override
+	public void close() throws TGBrowserException{
+		try {
+			closeProxy();
+			this.client.close();
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+	}
+
+	@Override
+	public void cdElement(TGBrowserElement element) throws TGBrowserException {
+		try {
+			boolean isCDSuccess = this.client.cd(element.getName());
+			if(!isCDSuccess)
+				throw new TGBrowserException("could not cd to "+element.getName());
+			this.path = this.client.pwd();
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+	}
+
+	@Override
+	public void cdRoot() throws TGBrowserException {
+		try {
+			this.client.cd(getRoot());
+			this.path = this.client.pwd();
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+	}
+
+	@Override
+	public void cdUp() throws TGBrowserException {
+		try {
+			this.client.cdUp();
+			this.path = this.client.pwd();
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+	}
+
+	@Override
+	public List<TGBrowserElement> listElements() throws TGBrowserException {
+		List<TGBrowserElement> elements = new ArrayList<TGBrowserElement>();
+		try {
+			this.client.binary();
+			String[] names = this.client.listNames();
+			String[] infos = this.client.listDetails();
+
+			if(names.length > 0 && infos.length > 0){
+				for(int i = 0;i < names.length;i++){
+					String name = names[i].trim();
+
+					if(name.indexOf(this.path) == 0 && name.length() > this.path.length()){
+						name = name.substring(this.path.length());
+					}
+					while(name.indexOf("/") == 0){
+						name = name.substring(1);
+					}
+					if( name.length() > 0 ){
+						for(int j = 0;j < infos.length;j++){
+							String info = infos[j].trim();
+							if(info.indexOf(name) > 0){
+								elements.add(new TGBrowserElementImpl(this,name,info,this.path));
+								break;
+							}
+						}
+					}
+				}
+			}
+			if( !elements.isEmpty() ){
+				Collections.sort(elements,new TGBrowserElementComparator());
+			}
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+		return elements;
+	}
+
+	public InputStream getInputStream(String path,TGBrowserElement element)throws TGBrowserException {
+		try {
+			this.client.cd(path);
+			this.client.binary();
+
+			byte[] bytes = this.client.get(element.getName());
+
+			return new ByteArrayInputStream( bytes );
+		} catch (Throwable throwable) {
+			throw new TGBrowserException(throwable);
+		}
+	}
+
+	private void checkForProxy() {
+		if (this.data.getProxyHost() != null && this.data.getProxyPort() > 0) {
+			System.setProperty("socksProxyHost", this.data.getProxyHost());
+			System.setProperty("socksProxyPort", String.valueOf(this.data.getProxyPort()));
+			if (this.data.getProxyUser() != null && this.data.getProxyUser().trim().length() > 0) {
+				System.setProperty("java.net.socks.username", this.data.getProxyUser());
+				System.setProperty("java.net.socks.password", this.data.getProxyPwd());
+				Authenticator.setDefault(new ProxyAuthenticator(this.data.getProxyUser(), this.data.getProxyPwd()));
+			}
+		} else {
+			closeProxy();
+		}
+	}
+
+	private void closeProxy() {
+		Properties sysProperties = System.getProperties();
+		sysProperties.remove("socksProxyHost");
+		sysProperties.remove("socksProxyPort");
+		sysProperties.remove("java.net.socks.username");
+		sysProperties.remove("java.net.socks.password");
+	}
+
+	private final class ProxyAuthenticator extends Authenticator {
+		private final PasswordAuthentication auth;
+
+		protected ProxyAuthenticator(String user, String pass) {
+			this.auth = new PasswordAuthentication(user, pass.toCharArray());
+		}
+
+		@Override
+		protected PasswordAuthentication getPasswordAuthentication() {
+			return this.auth;
+		}
+	}
+}
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserPluginImpl.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserPluginImpl.java
new file mode 100644
index 00000000..25f5d2c3
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/TGBrowserPluginImpl.java
@@ -0,0 +1,32 @@
+package org.herac.tuxguitar.app.tools.browser.ftp;
+
+import org.herac.tuxguitar.app.system.plugins.base.TGBrowserPlugin;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
+
+public class TGBrowserPluginImpl extends TGBrowserPlugin {
+
+	@Override
+	protected TGBrowserFactory getFactory() {
+		return new TGBrowserFactoryImpl();
+	}
+
+	@Override
+	public String getName() {
+		return "FTP Plugin for TGBrowser";
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "FTP Plugin for TGBrowser";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+}
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Decoder.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Decoder.java
new file mode 100644
index 00000000..75c619d7
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Decoder.java
@@ -0,0 +1,96 @@
+package org.herac.tuxguitar.app.tools.browser.ftp.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class Base64Decoder {
+
+	private static final int BUFFER_SIZE = 1024;
+
+	private static int get1(byte buf[], int off) {
+		return ((buf[off] & 0x3f) << 2) | ((buf[off + 1] & 0x30) >>> 4);
+	}
+
+	private static int get2(byte buf[], int off) {
+		return ((buf[off + 1] & 0x0f) << 4) | ((buf[off + 2] & 0x3c) >>> 2);
+	}
+
+	private static int get3(byte buf[], int off) {
+		return ((buf[off + 2] & 0x03) << 6) | (buf[off + 3] & 0x3f);
+	}
+
+	private static int check(int ch) {
+		if ((ch >= 'A') && (ch <= 'Z')) {
+			return ch - 'A';
+		} else if ((ch >= 'a') && (ch <= 'z')) {
+			return ch - 'a' + 26;
+		} else if ((ch >= '0') && (ch <= '9')) {
+			return ch - '0' + 52;
+		} else {
+			switch (ch) {
+				case '=':
+					return 65;
+				case '+':
+					return 62;
+				case '/':
+					return 63;
+				default:
+					return -1;
+			}
+		}
+	}
+
+	public static byte[] decode(byte[] bytes){
+		try{
+			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+			byte buffer[] = new byte[BUFFER_SIZE];
+			byte chunk[] = new byte[4];
+			int got = -1;
+			int ready = 0;
+
+			fill: while ((got = in.read(buffer)) > 0) {
+				int skiped = 0;
+
+				while (skiped < got) {
+
+					while (ready < 4) {
+						if (skiped >= got){
+							continue fill;
+						}
+						int ch = check(buffer[skiped++]);
+						if (ch >= 0) {
+							chunk[ready++] = (byte) ch;
+						}
+					}
+
+					if (chunk[2] == 65) {
+						out.write(get1(chunk, 0));
+						return out.toByteArray();
+					}
+					else if (chunk[3] == 65) {
+						out.write(get1(chunk, 0));
+						out.write(get2(chunk, 0));
+						return out.toByteArray();
+					}
+					else {
+						out.write(get1(chunk, 0));
+						out.write(get2(chunk, 0));
+						out.write(get3(chunk, 0));
+					}
+					ready = 0;
+				}
+			}
+			if (ready == 0){
+				out.flush();
+				return out.toByteArray();
+			}
+
+		}catch(Throwable throwable){
+			throwable.printStackTrace();
+		}
+
+		return bytes;
+	}
+}
\ No newline at end of file
diff --git a/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Encoder.java b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Encoder.java
new file mode 100644
index 00000000..ce99aeea
--- /dev/null
+++ b/plugins/browser-ftp/src/main/java/org/herac/tuxguitar/app/tools/browser/ftp/utils/Base64Encoder.java
@@ -0,0 +1,132 @@
+package org.herac.tuxguitar.app.tools.browser.ftp.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class Base64Encoder {
+
+	private static final int BUFFER_SIZE = 1024;
+
+	private static byte ENCODING[] = {
+		(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H',
+		(byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
+		(byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X',
+		(byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f',
+		(byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n',
+		(byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', (byte) 'v',
+		(byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
+		(byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) '+', (byte) '/',
+		(byte) '='
+	};
+
+	private static int get1(byte buf[], int off) {
+		return (buf[off] & 0xfc) >> 2;
+	}
+
+	private static int get2(byte buf[], int off) {
+		return ((buf[off] & 0x3) << 4) | ((buf[off + 1] & 0xf0) >>> 4);
+	}
+
+	private static int get3(byte buf[], int off) {
+		return ((buf[off + 1] & 0x0f) << 2) | ((buf[off + 2] & 0xc0) >>> 6);
+	}
+
+	private static int get4(byte buf[], int off) {
+		return buf[off + 2] & 0x3f;
+	}
+
+	public static byte[] encode(byte[] bytes) {
+		try{
+
+			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+			byte buffer[] = new byte[BUFFER_SIZE];
+			int got = -1;
+			int off = 0;
+			int count = 0;
+			while ((got = in.read(buffer, off, BUFFER_SIZE - off)) > 0) {
+				if ((got + off) >= 3) {
+					got += off;
+					off = 0;
+					while (off + 3 <= got) {
+						int c1 = get1(buffer, off);
+						int c2 = get2(buffer, off);
+						int c3 = get3(buffer, off);
+						int c4 = get4(buffer, off);
+						switch (count) {
+							case 73:
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write('\n');
+								out.write(ENCODING[c4]);
+								count = 1;
+								break;
+							case 74:
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write('\n');
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count = 2;
+								break;
+							case 75:
+								out.write(ENCODING[c1]);
+								out.write('\n');
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count = 3;
+								break;
+							case 76:
+								out.write('\n');
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count = 4;
+								break;
+							default:
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count += 4;
+								break;
+						}
+						off += 3;
+					}
+
+					for (int i = 0; i < 3; i++){
+						buffer[i] = (i < got - off) ? buffer[off + i] : ((byte) 0);
+					}
+					off = got - off;
+				} else {
+					off += got;
+				}
+			}
+
+			switch (off) {
+				case 1:
+					out.write(ENCODING[get1(buffer, 0)]);
+					out.write(ENCODING[get2(buffer, 0)]);
+					out.write('=');
+					out.write('=');
+					break;
+				case 2:
+					out.write(ENCODING[get1(buffer, 0)]);
+					out.write(ENCODING[get2(buffer, 0)]);
+					out.write(ENCODING[get3(buffer, 0)]);
+					out.write('=');
+			}
+
+			return out.toByteArray();
+
+		}catch(Throwable throwable){
+			throwable.printStackTrace();
+		}
+
+		return bytes;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar-browser-ftp/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/browser-ftp/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-browser-ftp/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/browser-ftp/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/carbon-intergration/CLEAN+TEST b/plugins/carbon-intergration/CLEAN+TEST
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/carbon-intergration/pom.xml b/plugins/carbon-intergration/pom.xml
new file mode 100644
index 00000000..c84da462
--- /dev/null
+++ b/plugins/carbon-intergration/pom.xml
@@ -0,0 +1,114 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.herac.tuxguitar</groupId>
+	<artifactId>tuxguitar-carbon</artifactId>
+	<version>1.3-SNAPSHOT</version>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: MacOS Carbon integration</name>
+	<description>MacOS Carbon integration plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- generate the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+					<phase>validate</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- the jar is also an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+				  <execution>
+					<phase>validate</phase>
+					<goals>
+					  <goal>attach-artifact</goal>
+					</goals>
+					<configuration>
+					  <artifacts>
+						<artifact>
+						  <file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+						  <type>jar</type>
+						</artifact>
+					  </artifacts>
+					</configuration>
+				  </execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>       
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared -lasound</linkerStartOption> 
+					</linkerStartOptions>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/TGCarbonIntegrationPlugin.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/TGCarbonIntegrationPlugin.java
new file mode 100644
index 00000000..3278a6bc
--- /dev/null
+++ b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/TGCarbonIntegrationPlugin.java
@@ -0,0 +1,28 @@
+package org.herac.tuxguitar.carbon;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
+import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
+import org.herac.tuxguitar.carbon.menu.MacMenuPlugin;
+import org.herac.tuxguitar.carbon.opendoc.OpenDocPlugin;
+
+public class TGCarbonIntegrationPlugin extends TGPluginList {
+
+	private List<TGPlugin> plugins; 
+	
+	@Override
+	protected List<TGPlugin> getPlugins() {
+		if( this.plugins == null ){
+			this.plugins = new ArrayList<TGPlugin>();
+			
+			this.plugins.add(new OpenDocPlugin());
+			this.plugins.add(new MacMenuPlugin());
+		}
+		return this.plugins;
+	}
+	
+	
+
+}
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/menu/MacMenu.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/menu/MacMenu.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/menu/MacMenu.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/menu/MacMenu.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/menu/MacMenuCallback.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/menu/MacMenuCallback.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/menu/MacMenuCallback.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/menu/MacMenuCallback.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/menu/MacMenuPlugin.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/menu/MacMenuPlugin.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/menu/MacMenuPlugin.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/menu/MacMenuPlugin.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocAction.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocAction.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocAction.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocAction.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocCallback.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocCallback.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocCallback.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocCallback.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocJNI.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocJNI.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocJNI.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocJNI.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocListener.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocListener.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocListener.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocListener.java
diff --git a/TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocPlugin.java b/plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocPlugin.java
similarity index 100%
rename from TuxGuitar-carbon-integration/src/org/herac/tuxguitar/carbon/opendoc/OpenDocPlugin.java
rename to plugins/carbon-intergration/src/main/java/org/herac/tuxguitar/carbon/opendoc/OpenDocPlugin.java
diff --git a/TuxGuitar-carbon-integration/jni/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.cpp b/plugins/carbon-intergration/src/main/native/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.cpp
similarity index 100%
rename from TuxGuitar-carbon-integration/jni/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.cpp
rename to plugins/carbon-intergration/src/main/native/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.cpp
diff --git a/TuxGuitar-carbon-integration/jni/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.h b/plugins/carbon-intergration/src/main/native/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.h
similarity index 100%
rename from TuxGuitar-carbon-integration/jni/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.h
rename to plugins/carbon-intergration/src/main/native/org_herac_tuxguitar_carbon_opendoc_OpenDocJNI.h
diff --git a/plugins/cocoa-integration/CLEAN+TEST b/plugins/cocoa-integration/CLEAN+TEST
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/cocoa-integration/pom.xml b/plugins/cocoa-integration/pom.xml
new file mode 100644
index 00000000..521547c3
--- /dev/null
+++ b/plugins/cocoa-integration/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-cocoa</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Cocoa integration</name>
+	<description>Cocoa integration plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoa.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/TGCocoa.java
similarity index 93%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoa.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/TGCocoa.java
index 68ca0fe5..c33aad90 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoa.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/TGCocoa.java
@@ -4,19 +4,13 @@
 
 import org.eclipse.swt.internal.C;
 import org.eclipse.swt.internal.Callback;
-import org.eclipse.swt.internal.cocoa.NSButton;
-import org.eclipse.swt.internal.cocoa.NSControl;
-import org.eclipse.swt.internal.cocoa.NSMenu;
-import org.eclipse.swt.internal.cocoa.NSMenuItem;
-import org.eclipse.swt.internal.cocoa.NSString;
-import org.eclipse.swt.internal.cocoa.NSWindow;
-import org.eclipse.swt.internal.cocoa.OS;
+import org.eclipse.swt.internal.gtk.OS;
 import org.herac.tuxguitar.cocoa.toolbar.MacToolbarDelegate;
 
 public class TGCocoa {
-	
+
 	public static final int noErr = OS.noErr;
-	
+
 	public static final long sel_registerName(String selectorName){
 		try {
 			return longValue(invokeMethod(OS.class, "sel_registerName", new Object[] { selectorName }));
@@ -25,82 +19,82 @@ public static final long sel_registerName(String selectorName){
 		}
 		return 0;
 	}
-	
+
 	public static final long objc_lookUpClass(String classname) throws Throwable{
 		return longValue(invokeMethod(OS.class, "objc_lookUpClass", new Object[] { classname }));
 	}
-	
+
 	public static final long objc_allocateClassPair(String name, long extraBytes) throws Throwable{
 		return longValue(invokeMethod(OS.class, "objc_allocateClassPair", new Object[] { OS.class.getField("class_NSObject").get(OS.class), name, osType(extraBytes) }));
 	}
-	
+
 	public static final boolean class_addIvar(long cls, byte[] name, long size, byte alignment, byte[] types) throws Throwable{
 		return boolValue(invokeMethod(OS.class, "class_addIvar", new Object[] { osType(cls), name, osType(size), new Byte(alignment), types }));
 	}
-	
+
 	public static final long object_setInstanceVariable(Object idValue, byte[] name, long value) throws Throwable{
 		return longValue(invokeMethod(OS.class, "object_setInstanceVariable", new Object[] { idValue , name, osType(value) }));
 	}
-	
+
 	public static final boolean class_addMethod(long cls, long name, long imp, String types) throws Throwable{
 		return boolValue(invokeMethod(OS.class,"class_addMethod", new Object[] { osType(cls), osType(name), osType(imp), types }));
 	}
-	
+
 	public static final void objc_registerClassPair(long cls) throws Throwable{
 		invokeMethod(OS.class, "objc_registerClassPair", new Object[] { osType(cls) });
 	}
-	
+
 	public static final void setControlAction(NSControl control, long aSelector) throws Throwable{
 		invokeMethod(NSControl.class, control, "setAction", new Object[] { osType(aSelector) });
 	}
-	
+
 	public static final void setControlAction(NSMenuItem control, long aSelector) throws Throwable{
 		invokeMethod(NSMenuItem.class, control, "setAction", new Object[] { osType(aSelector) });
 	}
-	
+
 	public static final NSMenuItem getMenuItemAtIndex(NSMenu menu, long index) throws Throwable{
 		return (NSMenuItem)invokeMethod(NSMenu.class, menu, "itemAtIndex", new Object[] { osType(index) });
 	}
-	
+
 	public static final NSButton getStandardWindowButton(NSWindow nsWindow, long index) throws Throwable{
 		return (NSButton)invokeMethod(NSWindow.class, nsWindow, "standardWindowButton", new Object[] { osType(index) });
 	}
-	
+
 	public static final String getNSStringValue( long pointer ) throws Throwable {
 		NSString nsString = new NSString();
 		NSString.class.getField("id").set(nsString, osType(pointer) );
 		return nsString.getString();
 	}
-	
+
 	public static final Callback newCallback(Object object, String method64, String method32, int argCount) throws Throwable {
 		return new Callback( object, ( C.PTR_SIZEOF == 8 ? method64 : method32 ) , argCount );
 	}
-	
+
 	public static final long getCallbackAddress( Callback callback ) throws Throwable {
 		return longValue(invokeMethod(Callback.class, callback , "getAddress", new Object[] {}));
 	}
-	
+
 	public static final long getMenuNumberOfItems( NSMenu menu ) throws Throwable {
 		return longValue(invokeMethod(NSMenu.class, menu , "numberOfItems", new Object[] {}));
 	}
-	
+
 	public static final long NewGlobalRef( Object object ) throws Throwable{
 		Method method = OS.class.getMethod("NewGlobalRef", new Class[] { Object.class });
 		return longValue( method.invoke(OS.class, new Object[] { object }) ) ;
 	}
-	
+
 	public static final void DeleteGlobalRef( long ref ) throws Throwable{
 		invokeMethod(OS.class, "DeleteGlobalRef", new Object[] { osType(ref) } );
 	}
-	
+
 	public static final MacToolbarDelegate newMacToolbarDelegate() throws Throwable{
 		return (MacToolbarDelegate)Class.forName( MacToolbarDelegate.class.getName() ).newInstance();
 	}
-	
+
 	private static Object invokeMethod(Class clazz, String methodName, Object[] args) throws Throwable {
 		return invokeMethod(clazz, null, methodName, args);
 	}
-	
+
 	private static Object invokeMethod(Class clazz, Object target, String methodName, Object[] args) throws Throwable {
 		Class[] signature = new Class[args.length];
 		for (int i = 0; i < args.length; i++) {
@@ -118,11 +112,11 @@ private static Object invokeMethod(Class clazz, Object target, String methodName
 		Method method = clazz.getMethod(methodName, signature);
 		return method.invoke(target, args);
 	}
-	
+
 	private static Object osType( long value ) {
 		return ( C.PTR_SIZEOF == 8 ? ((Object)new Long(value)) : ((Object)new Integer((int)value)) );
 	}
-	
+
 	private static long longValue(Object object) {
 		if (object instanceof Integer) {
 			return ((Integer) object).longValue();
@@ -132,7 +126,7 @@ private static long longValue(Object object) {
 		}
 		return 0;
 	}
-	
+
 	private static boolean boolValue(Object object) {
 		if (object instanceof Boolean) {
 			return ((Boolean) object).booleanValue();
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java
similarity index 79%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java
index 144f54aa..d7a8e476 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/TGCocoaIntegrationPlugin.java
@@ -3,21 +3,23 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
 import org.herac.tuxguitar.app.system.plugins.TGPluginException;
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
 import org.herac.tuxguitar.cocoa.menu.MacMenuPlugin;
+import org.herac.tuxguitar.cocoa.modifiedmarker.ModifiedMarkerPlugin;
 import org.herac.tuxguitar.cocoa.opendoc.OpenDocPlugin;
 import org.herac.tuxguitar.cocoa.toolbar.MacToolbarPlugin;
-import org.herac.tuxguitar.cocoa.modifiedmarker.ModifiedMarkerPlugin;
 
 public class TGCocoaIntegrationPlugin extends TGPluginList {
-	
-	private List plugins; 
-	
-	protected List getPlugins() throws TGPluginException {
+
+	private List<TGPlugin> plugins;
+
+	@Override
+	protected List<TGPlugin> getPlugins() throws TGPluginException {
 		if( this.plugins == null ){
-			this.plugins = new ArrayList();
-			
+			this.plugins = new ArrayList<TGPlugin>();
+
 			this.plugins.add(new OpenDocPlugin());
 			this.plugins.add(new MacMenuPlugin());
 			this.plugins.add(new MacToolbarPlugin());
@@ -25,19 +27,23 @@ protected List getPlugins() throws TGPluginException {
 		}
 		return this.plugins;
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Auria & Julian Casadesus";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Cocoa Integration Plugin";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Cocoa Integration Plugin";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenu.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/menu/MacMenu.java
similarity index 92%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenu.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/menu/MacMenu.java
index 566f99c1..c2a66371 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenu.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/menu/MacMenu.java
@@ -1,9 +1,6 @@
 package org.herac.tuxguitar.cocoa.menu;
 
 import org.eclipse.swt.internal.Callback;
-import org.eclipse.swt.internal.cocoa.NSApplication;
-import org.eclipse.swt.internal.cocoa.NSMenu;
-import org.eclipse.swt.internal.cocoa.NSMenuItem;
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.actions.file.ExitAction;
 import org.herac.tuxguitar.app.actions.help.ShowAboutAction;
@@ -11,19 +8,19 @@
 import org.herac.tuxguitar.cocoa.TGCocoa;
 
 public class MacMenu {
-	
+
 	private static final long kAboutMenuItem = 0;
 	private static final long kPreferencesMenuItem = 2;
-	
+
 	private static long sel_preferencesMenuItemSelected_ = TGCocoa.sel_registerName("preferencesMenuItemSelected:");
 	private static long sel_aboutMenuItemSelected_ = TGCocoa.sel_registerName("aboutMenuItemSelected:");
-	
+
 	private boolean enabled;
-	
+
 	public MacMenu(){
 		super();
 	}
-	
+
 	public void init() throws Throwable{
 		long cls = TGCocoa.objc_lookUpClass ("SWTApplicationDelegate");
 		if( cls != 0 ){
@@ -39,7 +36,7 @@ public void init() throws Throwable{
 		if( TGCocoa.getMenuNumberOfItems( mainMenu ) > 0 ){
 			NSMenuItem appMenuItem = TGCocoa.getMenuItemAtIndex( mainMenu , 0 );
 			NSMenu appMenu = appMenuItem.submenu();
-			
+
 			long itemCount = TGCocoa.getMenuNumberOfItems( appMenu );
 			if( itemCount > kPreferencesMenuItem ) {
 				NSMenuItem menuItem = TGCocoa.getMenuItemAtIndex( appMenu , kPreferencesMenuItem );
@@ -53,7 +50,7 @@ public void init() throws Throwable{
 			}
 		}
 	}
-	
+
 	public long callbackProc( long id, long sel, long arg0 ) {
 		if ( this.isEnabled() ){
 			if ( sel == sel_preferencesMenuItemSelected_ ) {
@@ -64,33 +61,33 @@ public long callbackProc( long id, long sel, long arg0 ) {
 		}
 		return TGCocoa.noErr;
 	}
-	
+
 	public long callbackProc64( long id, long sel, long arg0 ) {
 		return this.callbackProc(id, sel, arg0);
 	}
-	
+
 	public int callbackProc32( int id, int sel, int arg0 ) {
-		return (int)this.callbackProc( (long)id, (long)sel, (long)arg0);
+		return (int)this.callbackProc( id, sel, arg0);
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
-	
+
 	public long handleQuitCommand(){
 		TuxGuitar.instance().getAction(ExitAction.NAME).process(null);
 		return TGCocoa.noErr;
 	}
-	
+
 	public long handleAboutCommand(){
 		TuxGuitar.instance().getAction(ShowAboutAction.NAME).process(null);
 		return TGCocoa.noErr;
 	}
-	
+
 	public long handlePreferencesCommand(){
 		TuxGuitar.instance().getAction(EditConfigAction.NAME).process(null);
 		return TGCocoa.noErr;
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java
similarity index 95%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java
index 2e4fe2a6..c2f1adb9 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/menu/MacMenuPlugin.java
@@ -4,17 +4,20 @@
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginAdapter;
 
 public class MacMenuPlugin extends TGPluginAdapter {
-	
+
 	private MacMenu macMenu;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		try {
 			if( this.macMenu != null ){
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java
similarity index 93%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java
index bf19cc9a..154ddb75 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarker.java
@@ -1,44 +1,44 @@
 package org.herac.tuxguitar.cocoa.modifiedmarker;
 
-import org.eclipse.swt.internal.cocoa.NSWindow;
 import org.eclipse.swt.widgets.Shell;
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.editors.TGUpdateListener;
 
 public class ModifiedMarker implements TGUpdateListener {
-	
+
 	private boolean enabled;
-	
+
 	public ModifiedMarker(){
 		super();
 	}
-	
+
 	/** From 'TGUpdateListener' */
+	@Override
 	public void doUpdate( int type ){
 	    if (!enabled) return;
-	    
+
 	    final boolean isEdited = TuxGuitar.instance().getFileHistory().isUnsavedFile();
 	    setFrameState( isEdited );
 	}
-	
+
 	public void init() throws Throwable{
 	    TuxGuitar.instance().getEditorManager().addUpdateListener(this);
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
-		
+
 		if (!enabled) setFrameState(false);
 	}
-	
+
 	private void setFrameState(boolean modified) {
 	    Shell shell = TuxGuitar.instance().getShell();
    	    NSWindow nsWindow = shell.view.window();
         nsWindow.setDocumentEdited(modified);
 	}
-	
+
 }
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java
similarity index 95%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java
index 32be0f99..3ca2b22b 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/modifiedmarker/ModifiedMarkerPlugin.java
@@ -4,17 +4,20 @@
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginAdapter;
 
 public class ModifiedMarkerPlugin extends TGPluginAdapter {
-	
+
 	private ModifiedMarker modifiedMarker;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		try {
 			if( this.modifiedMarker != null ){
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java
similarity index 97%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java
index c2fb6d72..e204e45e 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocAction.java
@@ -8,12 +8,12 @@
 import org.herac.tuxguitar.app.util.ConfirmDialog;
 
 public class OpenDocAction {
-	
+
 	public static void saveAndOpen(final String file){
 		ActionLock.lock();
-		
+
 		TuxGuitar.instance().getPlayer().reset();
-		
+
 		if(TuxGuitar.instance().getFileHistory().isUnsavedFile()){
 			ConfirmDialog confirm = new ConfirmDialog(TuxGuitar.getProperty("file.save-changes-question"));
 			confirm.setDefaultStatus( ConfirmDialog.STATUS_CANCEL );
@@ -30,10 +30,12 @@ public static void saveAndOpen(final String file){
 				}
 				TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 				new Thread(new Runnable() {
+					@Override
 					public void run() {
 						if(!TuxGuitar.isDisposed()){
 							FileActionUtils.save(fileName);
 							new SyncThread(new Runnable() {
+								@Override
 								public void run() {
 									if(!TuxGuitar.isDisposed()){
 										TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
@@ -49,7 +51,7 @@ public void run() {
 		}
 		openFile(file );
 	}
-	
+
 	protected static void openFile(final String url){
 		if(url == null){
 			ActionLock.unlock();
@@ -57,6 +59,7 @@ protected static void openFile(final String url){
 		}
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				if(!TuxGuitar.isDisposed()){
 					FileActionUtils.open(url);
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java
similarity index 93%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java
index a273f897..c5bc8c8a 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocListener.java
@@ -4,27 +4,27 @@
 import org.herac.tuxguitar.cocoa.TGCocoa;
 
 public class OpenDocListener {
-	
+
 	public static final long sel_application_openFile_ = TGCocoa.sel_registerName("application:openFile:");
-	
+
 	private boolean enabled;
-	
+
 	public OpenDocListener(){
 		this.enabled = false;
 	}
-	
+
 	public void init() throws Throwable{
 		long cls = TGCocoa.objc_lookUpClass ("SWTApplicationDelegate");
 		if( cls != 0 ){
 			Callback callback = TGCocoa.newCallback( this , "callbackProc64" , "callbackProc32", 4 );
-			
+
 			long callbackProc = TGCocoa.getCallbackAddress( callback );
 			if( callbackProc != 0 ){
 				TGCocoa.class_addMethod(cls, sel_application_openFile_, callbackProc , "B:@@");
 			}
 		}
 	}
-	
+
 	public long callbackProc(long id, long sel,long arg0, long arg1) {
 		if( this.isEnabled() ){
 			if (sel == sel_application_openFile_) {
@@ -40,19 +40,19 @@ public long callbackProc(long id, long sel,long arg0, long arg1) {
 		}
 		return TGCocoa.noErr;
 	}
-	
+
 	public long callbackProc64(long id, long sel,long arg0, long arg1) {
 		return this.callbackProc(id, sel, arg0, arg1);
 	}
-	
+
 	public int callbackProc32(int id, int sel,int arg0, int arg1) {
-		return (int)this.callbackProc( (long)id, (long)sel, (long)arg0, (long)arg1);
+		return (int)this.callbackProc( id, sel, arg0, arg1);
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java
similarity index 95%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java
index ef76faf8..3997f97c 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/opendoc/OpenDocPlugin.java
@@ -4,17 +4,20 @@
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginAdapter;
 
 public class OpenDocPlugin extends TGPluginAdapter {
-	
+
 	private OpenDocListener openDocListener;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		try {
 			if( this.openDocListener != null ){
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java
similarity index 90%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java
index 5bfc7cd4..b40c497e 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbar.java
@@ -2,35 +2,31 @@
 
 import org.eclipse.swt.internal.C;
 import org.eclipse.swt.internal.Callback;
-import org.eclipse.swt.internal.cocoa.NSButton;
-import org.eclipse.swt.internal.cocoa.NSString;
-import org.eclipse.swt.internal.cocoa.NSToolbar;
-import org.eclipse.swt.internal.cocoa.NSWindow;
 import org.eclipse.swt.widgets.Shell;
 import org.herac.tuxguitar.cocoa.TGCocoa;
 
 public class MacToolbar {
-	
+
 	private static final byte[] SWT_OBJECT = {'S', 'W', 'T', '_', 'O', 'B', 'J', 'E', 'C', 'T', '\0'};
-	
+
 	private static final long NSWindowToolbarButton = 3;
-	
+
 	private static final long sel_toolbarButtonClicked_ = TGCocoa.sel_registerName("toolbarButtonClicked:");
-	
+
 	private boolean enabled;
-	
+
 	private long delegateRef;
-	
+
 	private MacToolbarDelegate delegate;
-	
+
 	public MacToolbar(){
 		super();
 	}
-	
+
 	public void init( Shell shell ) throws Throwable{
 		Callback callback = TGCocoa.newCallback( this , "callbackProc64", "callbackProc32", 3 );
 		long callbackProc = TGCocoa.getCallbackAddress( callback );
-		
+
 		if( callbackProc != 0 ){
 			String classname = ("MacToolbarDelegate");
 			if( TGCocoa.objc_lookUpClass ( classname ) == 0 ) {
@@ -39,23 +35,23 @@ public void init( Shell shell ) throws Throwable{
 				TGCocoa.class_addMethod(cls, sel_toolbarButtonClicked_, callbackProc , "@:@");
 				TGCocoa.objc_registerClassPair(cls);
 			}
-			
+
 			this.delegate = TGCocoa.newMacToolbarDelegate();
 			this.delegate.alloc().init();
 			this.delegateRef = TGCocoa.NewGlobalRef( MacToolbar.this );
-			
+
 			TGCocoa.object_setInstanceVariable( MacToolbarDelegate.class.getField("id").get( delegate ) , SWT_OBJECT , this.delegateRef );
-			
+
 			NSToolbar dummyBar = new NSToolbar();
 			dummyBar.alloc();
 			dummyBar.initWithIdentifier(NSString.stringWith("SWTToolbar")); //$NON-NLS-1$
 			dummyBar.setVisible(false);
-			
+
 			NSWindow nsWindow = shell.view.window();
 			nsWindow.setToolbar(dummyBar);
 			dummyBar.release();
 			nsWindow.setShowsToolbarButton(true);
-			
+
 			NSButton toolbarButton = TGCocoa.getStandardWindowButton(nsWindow, NSWindowToolbarButton);
 			if (toolbarButton != null) {
 				toolbarButton.setTarget( delegate );
@@ -63,14 +59,15 @@ public void init( Shell shell ) throws Throwable{
 			}
 		}
 	}
-	
+
+	@Override
 	public void finalize() throws Throwable{
 		if( this.delegateRef != 0 ){
 			TGCocoa.DeleteGlobalRef( this.delegateRef );
 			this.delegateRef = 0;
 		}
 	}
-	
+
 	public long callbackProc( long id, long sel, long arg0 ) {
 		if ( this.isEnabled() ){
 			if ( sel == sel_toolbarButtonClicked_ ) {
@@ -79,23 +76,23 @@ public long callbackProc( long id, long sel, long arg0 ) {
 		}
 		return TGCocoa.noErr;
 	}
-	
+
 	public long callbackProc64( long id, long sel, long arg0 ) {
 		return this.callbackProc(id, sel, arg0);
 	}
-	
+
 	public int callbackProc32( int id, int sel, int arg0 ) {
-		return (int)this.callbackProc( (long)id, (long)sel, (long)arg0);
+		return (int)this.callbackProc( id, sel, arg0);
 	}
-	
+
 	public boolean isEnabled() {
 		return this.enabled;
 	}
-	
+
 	public void setEnabled(boolean enabled) {
 		this.enabled = enabled;
 	}
-	
+
 	public long handleToogleToolbarCommand(){
 		MacToolbarAction.toogleToolbar();
 		return TGCocoa.noErr;
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java
similarity index 96%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java
index 353648b9..55d65ba0 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarAction.java
@@ -4,10 +4,11 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class MacToolbarAction {
-	
+
 	protected static void toogleToolbar(){
 		try {
 			TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					TuxGuitar.instance().getItemManager().toogleToolbarVisibility();
 				}
diff --git a/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java
new file mode 100644
index 00000000..627af65f
--- /dev/null
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarDelegate.java
@@ -0,0 +1,8 @@
+package org.herac.tuxguitar.cocoa.toolbar;
+
+public class MacToolbarDelegate extends NSObject {
+
+	public MacToolbarDelegate() {
+		super();
+	}
+}
diff --git a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java
similarity index 96%
rename from TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java
rename to plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java
index 95be85d9..26517c85 100644
--- a/TuxGuitar-cocoa-integration/src/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java
+++ b/plugins/cocoa-integration/src/main/java/org/herac/tuxguitar/cocoa/toolbar/MacToolbarPlugin.java
@@ -5,13 +5,15 @@
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginAdapter;
 
 public class MacToolbarPlugin extends TGPluginAdapter {
-	
+
 	private MacToolbar macToolbar;
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		// Nothing todo
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		try {
 			if( this.macToolbar != null ){
@@ -21,7 +23,8 @@ public void close() throws TGPluginException {
 			throw new TGPluginException( throwable );
 		}
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) throws TGPluginException {
 		try {
 			if( this.macToolbar != null ){
diff --git a/plugins/community/pom.xml b/plugins/community/pom.xml
new file mode 100644
index 00000000..a30360a7
--- /dev/null
+++ b/plugins/community/pom.xml
@@ -0,0 +1,40 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-community</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Community</name>
+	<description>Community plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunityPluginImpl.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/TGCommunityPluginImpl.java
similarity index 81%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunityPluginImpl.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/TGCommunityPluginImpl.java
index 21c634d4..38b5b3e3 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunityPluginImpl.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/TGCommunityPluginImpl.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
 import org.herac.tuxguitar.app.system.plugins.TGPluginException;
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
 import org.herac.tuxguitar.community.browser.TGBrowserPluginImpl;
@@ -11,38 +12,45 @@
 
 public class TGCommunityPluginImpl extends TGPluginList {
 
-	protected List getPlugins() throws TGPluginException {
-		List plugins = new ArrayList();
-		
+	@Override
+	protected List<TGPlugin> getPlugins() throws TGPluginException {
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
+
 		plugins.add(new TGShareSongPlugin());
 		plugins.add(new TGBrowserPluginImpl());
 		plugins.add(new TGCommunityStartupPlugin());
-		
+
 		return plugins;
 	}
-	
+
+	@Override
 	public void init() throws TGPluginException{
 		TGCommunitySingleton.getInstance().loadSettings();
 		super.init();
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException{
 		TGCommunitySingleton.getInstance().saveSettings();
 		super.close();
 	}
-	
+
+	@Override
 	public String getName() {
 		return "TuxGuitar Community Integration";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "TuxGuitar Community Integration";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.2";
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunitySingleton.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/TGCommunitySingleton.java
similarity index 96%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunitySingleton.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/TGCommunitySingleton.java
index 0c2d7d9a..38a029b7 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/TGCommunitySingleton.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/TGCommunitySingleton.java
@@ -5,16 +5,16 @@
 import org.herac.tuxguitar.community.auth.TGCommunityAuth;
 
 public class TGCommunitySingleton {
-	
+
 	private static TGCommunitySingleton instance;
-	
+
 	private TGConfigManager config;
 	private TGCommunityAuth auth;
-	
+
 	private TGCommunitySingleton(){
 		this.auth = new TGCommunityAuth();
 	}
-	
+
 	public static TGCommunitySingleton getInstance() {
 		synchronized ( TGCommunitySingleton.class ) {
 			if( instance == null ){
@@ -23,26 +23,26 @@ public static TGCommunitySingleton getInstance() {
 		}
 		return instance;
 	}
-	
+
 	public TGConfigManager getConfig(){
-		if(this.config == null){ 
+		if(this.config == null){
 			this.config = new TGPluginConfigManager("tuxguitar-community");
 			this.config.init();
 		}
 		return this.config;
 	}
-	
+
 	public void loadSettings(){
 		TGConfigManager config = getConfig();
 		this.auth.load( config );
 	}
-	
+
 	public void saveSettings(){
 		TGConfigManager config = getConfig();
 		this.auth.save( config );
 		config.save();
 	}
-	
+
 	public TGCommunityAuth getAuth(){
 		return this.auth;
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuth.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/TGCommunityAuth.java
similarity index 98%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuth.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/auth/TGCommunityAuth.java
index 927a4712..57b87e40 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuth.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/TGCommunityAuth.java
@@ -7,43 +7,43 @@
 import org.herac.tuxguitar.community.auth.utils.Base64Encoder;
 
 public class TGCommunityAuth {
-	
+
 	private static final String STRING_SEPARATOR = ";";
-	
+
 	private String username;
 	private String password;
 	private String authCode;
-	
+
 	public TGCommunityAuth(){
 		this.username = new String();
 		this.password = new String();
 		this.authCode = new String();
 	}
-	
+
 	public String getUsername() {
 		return username;
 	}
-	
+
 	public void setUsername(String username) {
 		this.username = username;
 	}
-	
+
 	public String getPassword() {
 		return password;
 	}
-	
+
 	public void setPassword(String password) {
 		this.password = password;
 	}
-	
+
 	public String getAuthCode() {
 		return this.authCode;
 	}
-	
+
 	public boolean isEmpty(){
 		return ( this.username == null || this.password == null || this.username.length() == 0 || this.password.length() == 0 );
 	}
-	
+
 	public void update(){
 		try {
 			String passwordMD5 = new String();
@@ -61,13 +61,13 @@ public void update(){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public void save( TGConfigManager config ){
 		String data = new String(this.getUsername() + STRING_SEPARATOR + this.getPassword() );
 		String encodedData = new String(Base64Encoder.encode( data.getBytes() ) ) ;
 		config.setProperty("community.account", encodedData );
 	}
-	
+
 	public void load( TGConfigManager config ) {
 		String encodedData = config.getStringConfigValue("community.account");
 		if( encodedData != null && encodedData.length() > 0 ){
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java
similarity index 97%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java
index 0df0b1b7..4f07e3f6 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/TGCommunityAuthDialog.java
@@ -21,23 +21,24 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class TGCommunityAuthDialog {
-	
+
 	private boolean accepted;
 	private TGCommunityAuth auth;
-	
+
 	public TGCommunityAuthDialog(){
 		this.auth = TGCommunitySingleton.getInstance().getAuth();
 		this.accepted = false;
 	}
-	
+
 	public void open() {
 		this.open( TuxGuitar.instance().getShell() );
 	}
-	
+
 	public void open(final Shell shell) {
 		try {
 			if( shell != null && !shell.isDisposed() ){
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() throws Throwable {
 						if( !shell.isDisposed() ){
 							doOpen( shell );
@@ -49,55 +50,57 @@ public void run() throws Throwable {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	protected void doOpen(Shell shell) {
 		this.accepted = false;
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		dialog.setText(TuxGuitar.getProperty("tuxguitar-community.auth-dialog.title"));
-		
+
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(makeGroupLayout(2,5));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("tuxguitar-community.auth-dialog.signin"));
-		
+
 		//-------USERNAME------------------------------------
 		Label usernameLabel = new Label(group, SWT.NULL);
-		usernameLabel.setLayoutData(makeLabelData()); 
+		usernameLabel.setLayoutData(makeLabelData());
 		usernameLabel.setText(TuxGuitar.getProperty("tuxguitar-community.auth-dialog.signin.username") + ":");
-		
+
 		final Text usernameText = new Text(group, SWT.BORDER);
 		usernameText.setLayoutData(makeTextData());
 		usernameText.setText( this.auth.getUsername() );
-		
+
 		//-------PASSWORD------------------------------------
 		Label passwordLabel = new Label(group, SWT.NULL);
 		passwordLabel.setLayoutData(makeLabelData());
 		passwordLabel.setText(TuxGuitar.getProperty("tuxguitar-community.auth-dialog.signin.password") + ":");
-		
+
 		final Text passwordText = new Text(group, SWT.BORDER | SWT.PASSWORD );
 		passwordText.setLayoutData(makeTextData());
 		passwordText.setText( this.auth.getPassword() );
-		
+
 		//-------JOIN------------------------------------
 		Group join = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		join.setLayout(makeGroupLayout(1,5));
 		//join.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		join.setLayoutData(new GridData(group.computeSize(SWT.DEFAULT, SWT.DEFAULT).x , SWT.DEFAULT));
 		join.setText(TuxGuitar.getProperty("tuxguitar-community.auth-dialog.signup"));
-		
+
 		final Link joinLink = new Link( join, SWT.LEFT );
 		joinLink.setLayoutData( new GridData(SWT.LEFT, SWT.CENTER, true, true ));
 		joinLink.setText(TuxGuitar.getProperty("tuxguitar-community.auth-dialog.signup.tip"));
 		joinLink.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				final String href = event.text;
 				if( href != null ){
 					new Thread( new Runnable() {
+						@Override
 						public void run() {
 							TGCommunityWeb.open( href );
 						}
@@ -105,37 +108,39 @@ public void run() {
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				update(usernameText.getText(), passwordText.getText());
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridLayout makeGroupLayout(int columns, int spacing){
 		GridLayout layout = new GridLayout(columns,false);
 		layout.marginTop = spacing;
@@ -146,30 +151,30 @@ private GridLayout makeGroupLayout(int columns, int spacing){
 		layout.horizontalSpacing = spacing;
 		return layout;
 	}
-	
+
 	private GridData makeLabelData(){
 		return new GridData(SWT.RIGHT,SWT.CENTER,false,true);
 	}
-	
+
 	private GridData makeTextData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 250;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void update( String username, String password){
 		this.auth.setUsername(username);
 		this.auth.setPassword(password);
 		this.accepted = true;
 	}
-	
+
 	public boolean isAccepted(){
 		return this.accepted;
 	}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java
new file mode 100644
index 00000000..08b1c20c
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/utils/Base64Decoder.java
@@ -0,0 +1,96 @@
+package org.herac.tuxguitar.community.auth.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class Base64Decoder {
+
+	private static final int BUFFER_SIZE = 1024;
+
+	private static int get1(byte buf[], int off) {
+		return ((buf[off] & 0x3f) << 2) | ((buf[off + 1] & 0x30) >>> 4);
+	}
+
+	private static int get2(byte buf[], int off) {
+		return ((buf[off + 1] & 0x0f) << 4) | ((buf[off + 2] & 0x3c) >>> 2);
+	}
+
+	private static int get3(byte buf[], int off) {
+		return ((buf[off + 2] & 0x03) << 6) | (buf[off + 3] & 0x3f);
+	}
+
+	private static int check(int ch) {
+		if ((ch >= 'A') && (ch <= 'Z')) {
+			return ch - 'A';
+		} else if ((ch >= 'a') && (ch <= 'z')) {
+			return ch - 'a' + 26;
+		} else if ((ch >= '0') && (ch <= '9')) {
+			return ch - '0' + 52;
+		} else {
+			switch (ch) {
+				case '=':
+					return 65;
+				case '+':
+					return 62;
+				case '/':
+					return 63;
+				default:
+					return -1;
+			}
+		}
+	}
+
+	public static byte[] decode(byte[] bytes){
+		try{
+			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+			byte buffer[] = new byte[BUFFER_SIZE];
+			byte chunk[] = new byte[4];
+			int got = -1;
+			int ready = 0;
+
+			fill: while ((got = in.read(buffer)) > 0) {
+				int skiped = 0;
+
+				while (skiped < got) {
+
+					while (ready < 4) {
+						if (skiped >= got){
+							continue fill;
+						}
+						int ch = check(buffer[skiped++]);
+						if (ch >= 0) {
+							chunk[ready++] = (byte) ch;
+						}
+					}
+
+					if (chunk[2] == 65) {
+						out.write(get1(chunk, 0));
+						return out.toByteArray();
+					}
+					else if (chunk[3] == 65) {
+						out.write(get1(chunk, 0));
+						out.write(get2(chunk, 0));
+						return out.toByteArray();
+					}
+					else {
+						out.write(get1(chunk, 0));
+						out.write(get2(chunk, 0));
+						out.write(get3(chunk, 0));
+					}
+					ready = 0;
+				}
+			}
+			if (ready == 0){
+				out.flush();
+				return out.toByteArray();
+			}
+
+		}catch(Throwable throwable){
+			throwable.printStackTrace();
+		}
+
+		return bytes;
+	}
+}
\ No newline at end of file
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java
new file mode 100644
index 00000000..408b9671
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/auth/utils/Base64Encoder.java
@@ -0,0 +1,132 @@
+package org.herac.tuxguitar.community.auth.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+public class Base64Encoder {
+
+	private static final int BUFFER_SIZE = 1024;
+
+	private static byte ENCODING[] = {
+		(byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G', (byte) 'H',
+		(byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N', (byte) 'O', (byte) 'P',
+		(byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U', (byte) 'V', (byte) 'W', (byte) 'X',
+		(byte) 'Y', (byte) 'Z', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f',
+		(byte) 'g', (byte) 'h', (byte) 'i', (byte) 'j', (byte) 'k', (byte) 'l', (byte) 'm', (byte) 'n',
+		(byte) 'o', (byte) 'p', (byte) 'q', (byte) 'r', (byte) 's', (byte) 't', (byte) 'u', (byte) 'v',
+		(byte) 'w', (byte) 'x', (byte) 'y', (byte) 'z', (byte) '0', (byte) '1', (byte) '2', (byte) '3',
+		(byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9', (byte) '+', (byte) '/',
+		(byte) '='
+	};
+
+	private static int get1(byte buf[], int off) {
+		return (buf[off] & 0xfc) >> 2;
+	}
+
+	private static int get2(byte buf[], int off) {
+		return ((buf[off] & 0x3) << 4) | ((buf[off + 1] & 0xf0) >>> 4);
+	}
+
+	private static int get3(byte buf[], int off) {
+		return ((buf[off + 1] & 0x0f) << 2) | ((buf[off + 2] & 0xc0) >>> 6);
+	}
+
+	private static int get4(byte buf[], int off) {
+		return buf[off + 2] & 0x3f;
+	}
+
+	public static byte[] encode(byte[] bytes) {
+		try{
+
+			ByteArrayInputStream  in  = new ByteArrayInputStream( bytes );
+			ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+			byte buffer[] = new byte[BUFFER_SIZE];
+			int got = -1;
+			int off = 0;
+			int count = 0;
+			while ((got = in.read(buffer, off, BUFFER_SIZE - off)) > 0) {
+				if ((got + off) >= 3) {
+					got += off;
+					off = 0;
+					while (off + 3 <= got) {
+						int c1 = get1(buffer, off);
+						int c2 = get2(buffer, off);
+						int c3 = get3(buffer, off);
+						int c4 = get4(buffer, off);
+						switch (count) {
+							case 73:
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write('\n');
+								out.write(ENCODING[c4]);
+								count = 1;
+								break;
+							case 74:
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write('\n');
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count = 2;
+								break;
+							case 75:
+								out.write(ENCODING[c1]);
+								out.write('\n');
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count = 3;
+								break;
+							case 76:
+								out.write('\n');
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count = 4;
+								break;
+							default:
+								out.write(ENCODING[c1]);
+								out.write(ENCODING[c2]);
+								out.write(ENCODING[c3]);
+								out.write(ENCODING[c4]);
+								count += 4;
+								break;
+						}
+						off += 3;
+					}
+
+					for (int i = 0; i < 3; i++){
+						buffer[i] = (i < got - off) ? buffer[off + i] : ((byte) 0);
+					}
+					off = got - off;
+				} else {
+					off += got;
+				}
+			}
+
+			switch (off) {
+				case 1:
+					out.write(ENCODING[get1(buffer, 0)]);
+					out.write(ENCODING[get2(buffer, 0)]);
+					out.write('=');
+					out.write('=');
+					break;
+				case 2:
+					out.write(ENCODING[get1(buffer, 0)]);
+					out.write(ENCODING[get2(buffer, 0)]);
+					out.write(ENCODING[get3(buffer, 0)]);
+					out.write('=');
+			}
+
+			return out.toByteArray();
+
+		}catch(Throwable throwable){
+			throwable.printStackTrace();
+		}
+
+		return bytes;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java
similarity index 97%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java
index 7ee7ed9b..6edb7909 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserAuthDialog.java
@@ -17,40 +17,41 @@
 import org.herac.tuxguitar.community.auth.TGCommunityAuthDialog;
 
 public class TGBrowserAuthDialog {
-	
+
 	private boolean accepted;
-	
+
 	public TGBrowserAuthDialog(){
 		this.accepted = false;
 	}
-	
+
 	protected void open(Shell shell) {
 		this.accepted = false;
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		dialog.setText(TuxGuitar.getProperty("tuxguitar-community.browser-dialog.title"));
-		
+
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(makeGroupLayout(5));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("tuxguitar-community.browser-dialog.account"));
-		
+
 		//-------USERNAME---------------------------------
 		Label usernameLabel = new Label(group, SWT.NULL);
-		usernameLabel.setLayoutData(makeLabelData()); 
+		usernameLabel.setLayoutData(makeLabelData());
 		usernameLabel.setText(TuxGuitar.getProperty("tuxguitar-community.browser-dialog.account.user") + ":");
-		
+
 		final Text usernameText = new Text(group, SWT.BORDER | SWT.READ_ONLY );
 		usernameText.setLayoutData(makeUsernameTextData());
 		usernameText.setText( TGCommunitySingleton.getInstance().getAuth().getUsername() );
-		
+
 		final Button usernameChooser = new Button(group, SWT.PUSH );
 		usernameChooser.setText("...");
 		usernameChooser.addSelectionListener( new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TGCommunityAuthDialog authDialog = new TGCommunityAuthDialog();
 				authDialog.open( dialog );
@@ -60,36 +61,38 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		} );
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setAccepted();
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridLayout makeGroupLayout(int spacing){
 		GridLayout layout = new GridLayout(3,false);
 		layout.marginTop = spacing;
@@ -100,28 +103,28 @@ private GridLayout makeGroupLayout(int spacing){
 		layout.horizontalSpacing = spacing;
 		return layout;
 	}
-	
+
 	private GridData makeLabelData(){
 		return new GridData(SWT.RIGHT,SWT.CENTER,false,true);
 	}
-	
+
 	private GridData makeUsernameTextData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 250;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void setAccepted(){
 		this.accepted = true;
 	}
-	
+
 	public boolean isAccepted(){
 		return this.accepted;
 	}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserConnection.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserConnection.java
new file mode 100644
index 00000000..dd2cf2bd
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserConnection.java
@@ -0,0 +1,46 @@
+package org.herac.tuxguitar.community.browser;
+
+import java.util.List;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+import org.herac.tuxguitar.community.TGCommunitySingleton;
+import org.herac.tuxguitar.community.auth.TGCommunityAuth;
+import org.herac.tuxguitar.community.auth.TGCommunityAuthDialog;
+
+public class TGBrowserConnection {
+
+	private static final String HTTP_STATUS_OK = "200";
+	private static final String HTTP_STATUS_UNAUTHORIZED = "401";
+
+	private final TGCommunityAuth auth;
+
+	public TGBrowserConnection(){
+		this.auth = TGCommunitySingleton.getInstance().getAuth();
+		this.auth.update();
+	}
+
+	public void getElements( List<TGBrowserElement> elements, TGBrowserElementImpl element ) throws TGBrowserException{
+		try {
+			TGBrowserRequest request = new TGBrowserRequest(this.auth, element);
+			TGBrowserResponse response = request.getResponse();
+
+			String status = response.getStatus();
+			if( status != null && status.equals(HTTP_STATUS_OK) ){
+				response.loadElements( elements );
+			}else if( status != null && status.equals(HTTP_STATUS_UNAUTHORIZED) ){
+				TGCommunityAuthDialog authDialog = new TGCommunityAuthDialog();
+				if( !TuxGuitar.instance().getBrowser().isDisposed() ){
+					authDialog.open( TuxGuitar.instance().getBrowser().getShell() );
+					if( authDialog.isAccepted() ){
+						this.auth.update();
+						this.getElements(elements, element );
+					}
+				}
+			}
+		}catch(Throwable throwable){
+			throw new TGBrowserException(throwable);
+		}
+	}
+}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java
new file mode 100644
index 00000000..77463c5d
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserDataImpl.java
@@ -0,0 +1,20 @@
+package org.herac.tuxguitar.community.browser;
+
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
+
+public class TGBrowserDataImpl implements TGBrowserData {
+
+	public TGBrowserDataImpl(){
+		super();
+	}
+
+	@Override
+	public String getTitle() {
+		return "TuxGuitar Community";
+	}
+
+	@Override
+	public String toString(){
+		return getTitle();
+	}
+}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java
new file mode 100644
index 00000000..9a885651
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserElementImpl.java
@@ -0,0 +1,71 @@
+package org.herac.tuxguitar.community.browser;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserElementImpl extends TGBrowserElement {
+
+	private TGBrowserElementImpl parent;
+	private final Map<String, String> properties;
+	private String url;
+
+	public TGBrowserElementImpl(String name) {
+		super(name);
+		this.url = null;
+		this.properties = new HashMap<String, String>();
+	}
+
+	public TGBrowserElementImpl getParent() {
+		return this.parent;
+	}
+
+	public void setParent(TGBrowserElementImpl parent) {
+		this.parent = parent;
+	}
+
+	public String getUrl() {
+		return this.url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public void addProperty( String key, String value ){
+		this.properties.put( key, value );
+	}
+
+	public String getProperty( String key ){
+		return this.properties.get( key );
+	}
+
+	public Iterator<Map.Entry<String,String>> getProperties(){
+		return this.properties.entrySet().iterator();
+	}
+
+	@Override
+	public boolean isFolder() {
+		return (this.url == null || this.url.length() == 0 );
+	}
+
+	@Override
+	public InputStream getInputStream() throws TGBrowserException {
+		try {
+			if( ! this.isFolder() ){
+				URL url = new URL( this.url );
+				InputStream stream = url.openStream();
+
+				return stream;
+			}
+		} catch ( Throwable throwable ){
+			throw new TGBrowserException( throwable );
+		}
+		return null;
+	}
+}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java
new file mode 100644
index 00000000..3020e498
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserFactoryImpl.java
@@ -0,0 +1,46 @@
+package org.herac.tuxguitar.community.browser;
+
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserData;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
+
+public class TGBrowserFactoryImpl implements TGBrowserFactory {
+
+	private TGBrowserDataImpl data;
+
+	public TGBrowserFactoryImpl(){
+		this.data = new TGBrowserDataImpl();
+	}
+
+	@Override
+	public String getName() {
+		return "Community Files";
+	}
+
+	@Override
+	public String getType() {
+		return "community";
+	}
+
+	@Override
+	public TGBrowser newTGBrowser(TGBrowserData data) {
+		return new TGBrowserImpl( (TGBrowserDataImpl)data );
+	}
+
+	@Override
+	public TGBrowserData parseData(String string) {
+		return this.data;
+	}
+
+	@Override
+	public TGBrowserData dataDialog(Shell parent) {
+		TGBrowserAuthDialog authDialog = new TGBrowserAuthDialog();
+		authDialog.open( parent );
+		if( authDialog.isAccepted() ){
+			return this.data;
+		}
+		return null;
+	}
+
+}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserImpl.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserImpl.java
new file mode 100644
index 00000000..00df05c0
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserImpl.java
@@ -0,0 +1,57 @@
+package org.herac.tuxguitar.community.browser;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.app.tools.browser.TGBrowserException;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowser;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
+
+public class TGBrowserImpl extends TGBrowser {
+
+	private final TGBrowserConnection connection;
+	private TGBrowserElementImpl element;
+
+	public TGBrowserImpl(TGBrowserDataImpl data){
+		this.element = null;
+		this.connection = new TGBrowserConnection();
+	}
+
+	@Override
+	public void open() throws TGBrowserException {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void close() throws TGBrowserException {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void cdRoot() throws TGBrowserException {
+		this.element = null;
+	}
+
+	@Override
+	public void cdUp() throws TGBrowserException {
+		if( this.element != null ){
+			this.element = this.element.getParent();
+		}
+	}
+
+	@Override
+	public void cdElement(TGBrowserElement element) throws TGBrowserException {
+		if( element instanceof TGBrowserElementImpl ){
+			TGBrowserElementImpl nextElement = (TGBrowserElementImpl)element;
+			nextElement.setParent( this.element );
+			this.element = nextElement;
+		}
+	}
+
+	@Override
+	public List<TGBrowserElement> listElements() throws TGBrowserException {
+		List<TGBrowserElement> elements = new ArrayList<TGBrowserElement>();
+		this.connection.getElements(elements , this.element );
+		return elements;
+	}
+}
diff --git a/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java
new file mode 100644
index 00000000..d3b255bf
--- /dev/null
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserPluginImpl.java
@@ -0,0 +1,14 @@
+package org.herac.tuxguitar.community.browser;
+
+import org.herac.tuxguitar.app.system.plugins.TGPluginException;
+import org.herac.tuxguitar.app.system.plugins.base.TGBrowserPlugin;
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserFactory;
+
+public class TGBrowserPluginImpl extends TGBrowserPlugin {
+
+	@Override
+	protected TGBrowserFactory getFactory() throws TGPluginException {
+		return new TGBrowserFactoryImpl();
+	}
+
+}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserRequest.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserRequest.java
similarity index 83%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserRequest.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserRequest.java
index 2ee5bddd..e8515f29 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserRequest.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserRequest.java
@@ -6,52 +6,53 @@
 import java.net.URLEncoder;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.herac.tuxguitar.community.auth.TGCommunityAuth;
 import org.herac.tuxguitar.community.utils.TGCommunityWeb;
 
 public class TGBrowserRequest {
-	
+
 	private static final String REMOTE_URL = (TGCommunityWeb.HOME_URL + "/rd.php/sharing/tuxguitar/browser.do");
-	
+
 	private String request;
-	
+
 	public TGBrowserRequest(TGCommunityAuth auth, TGBrowserElementImpl element) throws Throwable {
 		this.initialize(auth, element);
 	}
-	
+
 	public TGBrowserRequest(TGCommunityAuth auth) throws Throwable {
 		this(auth , null);
 	}
-	
+
 	private void initialize( TGCommunityAuth auth, TGBrowserElementImpl element ) throws Throwable {
 		this.request = new String();
 		this.request += URLEncoder.encode( "auth" , "UTF-8" );
 		this.request += ("=");
 		this.request += URLEncoder.encode( auth.getAuthCode() , "UTF-8" );
-		
+
 		if( element != null ){
-			Iterator it = element.getProperties();
+			Iterator<Entry<String, String>> it = element.getProperties();
 			while( it.hasNext() ){
-				Map.Entry property = (Map.Entry) it.next();
+				Map.Entry<String, String> property = it.next();
 				this.request += ("&");
-				this.request += URLEncoder.encode( (String)property.getKey() , "UTF-8" );
+				this.request += URLEncoder.encode( property.getKey() , "UTF-8" );
 				this.request += ("=");
-				this.request += URLEncoder.encode( (String)property.getValue() , "UTF-8" );
+				this.request += URLEncoder.encode( property.getValue() , "UTF-8" );
 			}
 		}
 	}
-	
+
 	public TGBrowserResponse getResponse() throws Throwable {
 		URL url = new URL(REMOTE_URL);
 		URLConnection conn = url.openConnection();
 		conn.setDoOutput(true);
-		
+
 		OutputStreamWriter outputStream = new OutputStreamWriter(conn.getOutputStream());
 		outputStream.write(this.request);
 		outputStream.flush();
 		outputStream.close();
-		
+
 		return new TGBrowserResponse( conn.getInputStream() ) ;
 	}
 }
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserResponse.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserResponse.java
similarity index 95%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserResponse.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserResponse.java
index 89e68c33..9f1c7ea2 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/browser/TGBrowserResponse.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/browser/TGBrowserResponse.java
@@ -7,13 +7,14 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import org.herac.tuxguitar.app.tools.browser.base.TGBrowserElement;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 public class TGBrowserResponse {
-	
+
 	private static final String TAG_STATUS = "status";
 	private static final String TAG_ELEMENTS = "elements";
 	private static final String TAG_ELEMENT = "element";
@@ -25,26 +26,26 @@ public class TGBrowserResponse {
 	private static final String ATTRIBUTE_URL = "url";
 	private static final String ATTRIBUTE_KEY = "key";
 	private static final String ATTRIBUTE_VALUE = "value";
-	
+
 	private Document document;
-	
+
 	public TGBrowserResponse( InputStream stream ) throws Throwable {
 		this.initialize( stream );
 	}
-	
+
 	private void initialize(InputStream stream) throws Throwable {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		this.document = builder.parse(stream);
 	}
-	
+
 	public String getStatus() {
 		if ( this.document != null ){
 			return getStatus(this.document.getFirstChild());
 		}
 		return null;
 	}
-	
+
 	private String getStatus(Node rootNode){
 		NodeList rootNodes = rootNode.getChildNodes();
 		for (int i = 0; i < rootNodes.getLength(); i++) {
@@ -55,49 +56,49 @@ private String getStatus(Node rootNode){
 		}
 		return null;
 	}
-	
-	public void loadElements(List list){
+
+	public void loadElements(List<TGBrowserElement> list){
 		if ( this.document != null ){
 			loadElements(list,this.document.getFirstChild());
 		}
 	}
-	
-	private void loadElements(List list,Node rootNode){
+
+	private void loadElements(List<TGBrowserElement> list,Node rootNode){
 		NodeList rootNodes = rootNode.getChildNodes();
 		for (int i = 0; i < rootNodes.getLength(); i++) {
 			Node elementsNode = rootNodes.item(i);
-			
+
 			if (elementsNode.getNodeName().equals( TAG_ELEMENTS )) {
-				
+
 				NodeList elementList = elementsNode.getChildNodes();
 				for (int e = 0; e < elementList.getLength(); e++) {
 					Node elementNode = elementList.item(e);
 					String nodeName = elementNode.getNodeName();
-					
+
 					if (nodeName.equals( TAG_ELEMENT )) {
 						NamedNodeMap params = elementNode.getAttributes();
-						
+
 						String name = getAttributeValue( params, ATTRIBUTE_NAME);
 						if (name != null && name.trim().length() > 0 ){
 							TGBrowserElementImpl element = new TGBrowserElementImpl( name );
-							
+
 							NodeList nodeChildren = elementNode.getChildNodes();
 							for (int c = 0; c < nodeChildren.getLength(); c++) {
 								Node child = nodeChildren.item( c );
 								if( child.getNodeName().equals( TAG_SONG ) ){
 									element.setUrl( getAttributeValue( child.getAttributes() , ATTRIBUTE_URL) );
 								}else if( child.getNodeName().equals( TAG_PARAMETERS ) ){
-									
+
 									NodeList parameters = child.getChildNodes();
 									for (int p = 0; p < parameters.getLength(); p++) {
-										
+
 										Node parameter = parameters.item( p );
 										if( parameter.getNodeName().equals( TAG_PARAMETER ) ){
 											NamedNodeMap parameterAttributes = parameter.getAttributes();
-											
+
 											String key = getAttributeValue( parameterAttributes, ATTRIBUTE_KEY);
 											String value = getAttributeValue( parameterAttributes, ATTRIBUTE_VALUE);
-											
+
 											if (key != null && value != null && key.trim().length() > 0 && value.trim().length() > 0 ){
 												element.addProperty(key, value);
 											}
@@ -105,7 +106,7 @@ private void loadElements(List list,Node rootNode){
 									}
 								}
 							}
-							
+
 							list.add( element );
 						}
 					}
@@ -113,7 +114,7 @@ private void loadElements(List list,Node rootNode){
 			}
 		}
 	}
-	
+
 	private String getAttributeValue( NamedNodeMap node , String attribute ){
 		try{
 			if( node != null && attribute != null ){
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFile.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareFile.java
similarity index 97%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFile.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareFile.java
index bbc3e4ad..91281135 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFile.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareFile.java
@@ -1,50 +1,50 @@
 package org.herac.tuxguitar.community.io;
 
 public class TGShareFile {
-	
+
 	private byte[] file;
 	private String title;
 	private String description;
 	private String tagkeys;
-	
+
 	public TGShareFile(){
 		this.title = new String();
 		this.description = new String();
 		this.tagkeys = new String();
 	}
-	
+
 	public byte[] getFile() {
 		return this.file;
 	}
-	
+
 	public void setFile(byte[] file) {
 		this.file = file;
 	}
-	
+
 	public String getTitle() {
 		return this.title;
 	}
-	
+
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	
+
 	public String getDescription() {
 		return this.description;
 	}
-	
+
 	public void setDescription(String description) {
 		this.description = description;
 	}
-	
+
 	public String getTagkeys() {
 		return this.tagkeys;
 	}
-	
+
 	public void setTagkeys(String tagkeys) {
 		this.tagkeys = tagkeys;
 	}
-	
+
 	public String getFilename(){
 		return ( this.title + ".tg" );
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFileDialog.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareFileDialog.java
similarity index 97%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFileDialog.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareFileDialog.java
index b1fd610a..410958c3 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareFileDialog.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareFileDialog.java
@@ -19,20 +19,21 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class TGShareFileDialog {
-	
+
 	private boolean accepted;
 	private TGShareFile file;
 	private String errors;
-	
+
 	public TGShareFileDialog(TGShareFile file , String errors ){
 		this.file = file;
 		this.errors = errors;
 		this.accepted = false;
 	}
-	
+
 	public void open() {
 		try {
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					if( !TuxGuitar.isDisposed() ){
 						open( TuxGuitar.instance().getShell() );
@@ -43,34 +44,35 @@ public void run() throws Throwable {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	protected void open(Shell shell) {
 		this.accepted = false;
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
-		
+
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		dialog.setText(TuxGuitar.getProperty("tuxguitar-community.share-dialog.title"));
-		
+
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(makeGroupLayout(5));
 		group.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		group.setText(TuxGuitar.getProperty("tuxguitar-community.share-dialog.details"));
-		
+
 		//-------USERNAME---------------------------------
 		Label usernameLabel = new Label(group, SWT.NULL);
-		usernameLabel.setLayoutData(makeLabelData()); 
+		usernameLabel.setLayoutData(makeLabelData());
 		usernameLabel.setText(TuxGuitar.getProperty("tuxguitar-community.share-dialog.details.user") + ":");
-		
+
 		final Text usernameText = new Text(group, SWT.BORDER | SWT.READ_ONLY );
 		usernameText.setLayoutData(makeUsernameTextData());
 		usernameText.setText( TGCommunitySingleton.getInstance().getAuth().getUsername() );
-		
+
 		final Button usernameChooser = new Button(group, SWT.PUSH );
 		usernameChooser.setText("...");
 		usernameChooser.addSelectionListener( new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				TGCommunityAuthDialog authDialog = new TGCommunityAuthDialog();
 				authDialog.open( dialog );
@@ -80,67 +82,69 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		} );
-		
+
 		//-------TITLE------------------------------------
 		Label titleLabel = new Label(group, SWT.NULL);
-		titleLabel.setLayoutData(makeLabelData()); 
+		titleLabel.setLayoutData(makeLabelData());
 		titleLabel.setText(TuxGuitar.getProperty("tuxguitar-community.share-dialog.details.title") + ":");
-		
+
 		final Text titleText = new Text(group, SWT.BORDER);
 		titleText.setLayoutData(makeTextData());
 		titleText.setText( this.file.getTitle() );
-		
+
 		//-------TAGKEYS------------------------------------
 		Label tagkeysLabel = new Label(group, SWT.NULL);
 		tagkeysLabel.setLayoutData(makeLabelData());
 		tagkeysLabel.setText(TuxGuitar.getProperty("tuxguitar-community.share-dialog.details.tagkeys") + ":");
-		
+
 		final Text tagkeysText = new Text(group, SWT.BORDER);
 		tagkeysText.setLayoutData(makeTextData());
 		tagkeysText.setText( this.file.getTagkeys() );
-		
+
 		//-------DESCRIPTION------------------------------------
 		Label descriptionLabel = new Label(group, SWT.NULL);
 		descriptionLabel.setLayoutData(makeLabelData());
 		descriptionLabel.setText(TuxGuitar.getProperty("tuxguitar-community.share-dialog.details.description") + ":");
-		
+
 		final Text descriptionText = new Text(group, SWT.BORDER | SWT.MULTI | SWT.WRAP | SWT.V_SCROLL);
 		descriptionText.setLayoutData(makeTextAreaData());
 		descriptionText.setText( this.file.getDescription() );
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				update(titleText.getText(), tagkeysText.getText() , descriptionText.getText() );
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		if( this.errors != null ){
 			MessageDialog.errorMessage(dialog, this.errors);
 		}
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	private GridLayout makeGroupLayout(int spacing){
 		GridLayout layout = new GridLayout(3,false);
 		layout.marginTop = spacing;
@@ -151,44 +155,44 @@ private GridLayout makeGroupLayout(int spacing){
 		layout.horizontalSpacing = spacing;
 		return layout;
 	}
-	
+
 	private GridData makeLabelData(){
 		return new GridData(SWT.RIGHT,SWT.CENTER,false,true);
 	}
-	
+
 	private GridData makeTextAreaData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 2 , 1);
 		data.minimumWidth = 250;
 		data.minimumHeight = 100;
 		return data;
 	}
-	
+
 	private GridData makeTextData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 2 , 1);
 		data.minimumWidth = 250;
 		return data;
 	}
-	
+
 	private GridData makeUsernameTextData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 250;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void update( String title, String tagkeys, String description ){
 		this.file.setTitle( title );
 		this.file.setTagkeys( tagkeys );
 		this.file.setDescription( description );
 		this.accepted = true;
 	}
-	
+
 	public boolean isAccepted(){
 		return this.accepted;
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSong.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSong.java
similarity index 95%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSong.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSong.java
index 88fa9170..e9709423 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSong.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSong.java
@@ -21,7 +21,7 @@ public class TGShareSong {
 	public TGShareSong( ) {
 		super();
 	}
-	
+
 	public void process( TGSong song ) {
 		try {
 			TGShareFile file = new TGShareFile();
@@ -31,10 +31,11 @@ public void process( TGSong song ) {
 			MessageDialog.errorMessage(throwable);
 		}
 	}
-	
+
 	public void processDialog( final TGShareFile file , final String errors ) {
 		try {
 			TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					TGShareFileDialog fileDialog = new TGShareFileDialog( file , errors );
 					fileDialog.open();
@@ -47,10 +48,11 @@ public void run() throws Throwable {
 			MessageDialog.errorMessage(throwable);
 		}
 	}
-	
+
 	public void processAuthDialog( final TGShareFile file ) {
 		try {
 			TGSynchronizer.instance().runLater(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					TGCommunityAuthDialog authDialog = new TGCommunityAuthDialog();
 					authDialog.open();
@@ -63,11 +65,12 @@ public void run() throws Throwable {
 			MessageDialog.errorMessage(throwable);
 		}
 	}
-	
+
 	public void processUpload( final TGShareFile file ) {
 		this.setActiveMode();
-		
+
 		new Thread( new Runnable() {
+			@Override
 			public void run() {
 				try {
 					TGShareSongConnection share = new TGShareSongConnection();
@@ -78,10 +81,10 @@ public void run() {
 			}
 		} ).start();
 	}
-	
+
 	public void processResult( TGShareSongResponse response, TGShareFile file ){
 		this.setPasiveMode();
-		
+
 		try {
 			String status = response.getStatus();
 			if( status != null && status.equals(TGShareSongConnection.HTTP_STATUS_OK) ){
@@ -92,11 +95,11 @@ else if( status != null && status.equals(TGShareSongConnection.HTTP_STATUS_UNAUT
 			}
 			else if( status != null && status.equals(TGShareSongConnection.HTTP_STATUS_INVALID) ){
 				String message = new String();
-				List messages = new ArrayList();
+				List<String> messages = new ArrayList<String>();
 				response.loadMessages( messages );
-				Iterator it = messages.iterator();
+				Iterator<String> it = messages.iterator();
 				while( it.hasNext() ){
-					message += ( (String) it.next() + "\r\n" );
+					message += ( it.next() + "\r\n" );
 				}
 				processDialog( file , message );
 			}
@@ -107,7 +110,7 @@ else if( status != null && status.equals(TGShareSongConnection.HTTP_STATUS_INVAL
 			MessageDialog.errorMessage(throwable);
 		}
 	}
-	
+
 	private byte[] getSongBytes( TGSong song ) throws Throwable {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		TGOutputStreamBase tgStream = new TGOutputStream();
@@ -116,13 +119,13 @@ private byte[] getSongBytes( TGSong song ) throws Throwable {
 		out.close();
 		return out.toByteArray();
 	}
-	
+
 	public void setActiveMode(){
 		TuxGuitar.instance().lock();
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_WAIT);
 		ActionLock.lock();
 	}
-	
+
 	public void setPasiveMode(){
 		ActionLock.unlock();
 		TuxGuitar.instance().loadCursor(SWT.CURSOR_ARROW);
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongConnection.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongConnection.java
similarity index 98%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongConnection.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongConnection.java
index 4471dec0..4564f395 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongConnection.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongConnection.java
@@ -4,25 +4,25 @@
 import org.herac.tuxguitar.community.auth.TGCommunityAuth;
 
 public class TGShareSongConnection {
-	
+
 	public static final String HTTP_STATUS_OK = "200";
 	public static final String HTTP_STATUS_UNAUTHORIZED = "401";
 	public static final String HTTP_STATUS_INVALID = "400";
-	
+
 	private String status;
 	private TGCommunityAuth auth;
-	
+
 	public TGShareSongConnection(){
 		this.auth = TGCommunitySingleton.getInstance().getAuth();
 		this.auth.update();
 	}
-	
+
 	public void uploadFile( TGShareFile file , TGShareSong callback ) throws Throwable {
 		TGShareSongRequest request = new TGShareSongRequest(this.auth, file);
 		TGShareSongResponse response = request.getResponse();
 		callback.processResult(response, file);
 	}
-	
+
 	public String getStatus(){
 		return this.status;
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongExporter.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongExporter.java
similarity index 86%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongExporter.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongExporter.java
index ca3f1cf9..f193b35b 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongExporter.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongExporter.java
@@ -5,21 +5,24 @@
 import org.herac.tuxguitar.song.factory.TGFactory;
 import org.herac.tuxguitar.song.models.TGSong;
 
-public class TGShareSongExporter implements TGRawExporter { 
-	
+public class TGShareSongExporter implements TGRawExporter {
+
 	public TGShareSongExporter(){
 		super();
 	}
-	
+
+	@Override
 	public void exportSong(TGSong srcSong) throws TGFileFormatException {
 		final TGSong song = srcSong.clone(new TGFactory());
 		new Thread( new Runnable() {
+			@Override
 			public void run() {
 				new TGShareSong().process( song );
 			}
 		} ).start();
 	}
-	
+
+	@Override
 	public String getExportName() {
 		return ("Share with the Community");
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongPlugin.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongPlugin.java
similarity index 97%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongPlugin.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongPlugin.java
index 5fd6b661..46301853 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongPlugin.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongPlugin.java
@@ -5,7 +5,8 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class TGShareSongPlugin extends TGExporterPlugin {
-	
+
+	@Override
 	protected TGRawExporter getExporter() throws TGPluginException {
 		return new TGShareSongExporter();
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongRequest.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongRequest.java
similarity index 96%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongRequest.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongRequest.java
index aac12e8c..d1d71a1b 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongRequest.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongRequest.java
@@ -8,22 +8,22 @@
 import org.herac.tuxguitar.community.utils.TGCommunityWeb;
 
 public class TGShareSongRequest {
-	
+
 	private static final String REMOTE_URL = (TGCommunityWeb.HOME_URL + "/rd.php/sharing/tuxguitar/upload.do");
-	
+
 	private static final String EOL =  "\r\n";
 	private static final String BOUNDARY = "*****";
 	private static final String BOUNDARY_SEPARATOR = "--";
-	
+
 	private TGShareFile file;
 	private TGCommunityAuth auth;
-	
+
 	public TGShareSongRequest(TGCommunityAuth auth , TGShareFile file){
 		this.auth = auth;
 		this.file = file;
 	}
-	
-	public TGShareSongResponse getResponse() throws Throwable { 
+
+	public TGShareSongResponse getResponse() throws Throwable {
 		URL url = new URL(REMOTE_URL);
 		URLConnection conn = url.openConnection();
 		conn.setDoInput(true);
@@ -31,48 +31,48 @@ public TGShareSongResponse getResponse() throws Throwable {
 		conn.setUseCaches(false);
 		conn.setRequestProperty("Connection", "Keep-Alive");
 		conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+BOUNDARY);
-		
+
 		DataOutputStream out = new DataOutputStream( conn.getOutputStream() );
-		
+
 		// auth
 		out.writeBytes(BOUNDARY_SEPARATOR + BOUNDARY + EOL);
 		out.writeBytes("Content-Disposition: form-data; name=\"auth\";" + EOL);
 		out.writeBytes(EOL);
 		out.writeBytes(this.auth.getAuthCode());
 		out.writeBytes(EOL);
-		
+
 		// title
 		out.writeBytes(BOUNDARY_SEPARATOR + BOUNDARY + EOL);
 		out.writeBytes("Content-Disposition: form-data; name=\"title\";" + EOL);
 		out.writeBytes(EOL);
 		out.writeBytes(this.file.getTitle());
 		out.writeBytes(EOL);
-		
+
 		// description
 		out.writeBytes(BOUNDARY_SEPARATOR + BOUNDARY + EOL);
 		out.writeBytes("Content-Disposition: form-data; name=\"description\";" + EOL);
 		out.writeBytes(EOL);
 		out.writeBytes(this.file.getDescription());
 		out.writeBytes(EOL);
-		
+
 		// tagkeys
 		out.writeBytes(BOUNDARY_SEPARATOR + BOUNDARY + EOL);
 		out.writeBytes("Content-Disposition: form-data; name=\"tagkeys\";" + EOL);
 		out.writeBytes(EOL);
 		out.writeBytes(this.file.getTagkeys());
 		out.writeBytes(EOL);
-		
+
 		// file
 		out.writeBytes(BOUNDARY_SEPARATOR + BOUNDARY + EOL);
 		out.writeBytes("Content-Disposition: form-data; name=\"fileName\";" + " filename=\"" + this.file.getFilename() +"\"" + EOL);
 		out.writeBytes(EOL);
 		out.write( this.file.getFile() );
 		out.writeBytes(EOL);
-		
+
 		out.writeBytes(BOUNDARY_SEPARATOR + BOUNDARY + BOUNDARY_SEPARATOR + EOL);
 		out.flush();
 		out.close();
-		
+
 		return new TGShareSongResponse( conn.getInputStream() );
 	}
 }
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongResponse.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongResponse.java
similarity index 94%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongResponse.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongResponse.java
index 6e9153f8..89c5e640 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/io/TGShareSongResponse.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/io/TGShareSongResponse.java
@@ -13,32 +13,32 @@
 import org.w3c.dom.NodeList;
 
 public class TGShareSongResponse {
-	
+
 	private static final String TAG_STATUS = "status";
 	private static final String TAG_MESSAGES = "messages";
 	private static final String TAG_MESSAGE = "message";
 	private static final String ATTRIBUTE_CODE = "code";
 	private static final String ATTRIBUTE_VALUE = "value";
-	
+
 	private Document document;
-	
+
 	public TGShareSongResponse( InputStream stream ) throws Throwable {
 		this.initialize( stream );
 	}
-	
+
 	private void initialize(InputStream stream) throws Throwable {
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 		DocumentBuilder builder = factory.newDocumentBuilder();
 		this.document = builder.parse(stream);
 	}
-	
+
 	public String getStatus() throws Throwable {
 		if ( this.document != null ){
 			return getStatus(this.document.getFirstChild());
 		}
 		return null;
 	}
-	
+
 	private String getStatus(Node rootNode) throws Throwable {
 		NodeList rootNodes = rootNode.getChildNodes();
 		for (int i = 0; i < rootNodes.getLength(); i++) {
@@ -49,15 +49,15 @@ private String getStatus(Node rootNode) throws Throwable {
 		}
 		return null;
 	}
-	
-	public String loadMessages(List list) throws Throwable {
+
+	public String loadMessages(List<String> list) throws Throwable {
 		if ( this.document != null ){
 			return loadMessages(list , this.document.getFirstChild());
 		}
 		return null;
 	}
-	
-	private String loadMessages(List list, Node rootNode) throws Throwable {
+
+	private String loadMessages(List<String> list, Node rootNode) throws Throwable {
 		NodeList rootNodes = rootNode.getChildNodes();
 		for (int i = 0; i < rootNodes.getLength(); i++) {
 			Node messagesNode = rootNodes.item(i);
@@ -73,7 +73,7 @@ private String loadMessages(List list, Node rootNode) throws Throwable {
 		}
 		return null;
 	}
-	
+
 	private String getAttributeValue( NamedNodeMap node , String attribute ){
 		try{
 			if( node != null && attribute != null ){
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java
similarity index 93%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java
index 04b44742..16c9a470 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/startup/TGCommunityStartupPlugin.java
@@ -3,21 +3,24 @@
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginAdapter;
 
 public class TGCommunityStartupPlugin extends TGPluginAdapter {
-	
+
 	private boolean done;
-	
+
 	public TGCommunityStartupPlugin(){
 		this.done = false;
 	}
-	
+
+	@Override
 	public void init() {
 		// Nothing to init.
 	}
-	
+
+	@Override
 	public void close() {
 		// Nothing to close.
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) {
 		if(!this.done && enabled){
 			TGCommunityStartupScreen startup = new TGCommunityStartupScreen();
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java
similarity index 98%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java
index 1fd1b6a2..f680a17b 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/startup/TGCommunityStartupScreen.java
@@ -23,18 +23,19 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class TGCommunityStartupScreen {
-	
+
 	private static final int MAIN_WIDTH  = 550;
 	private static final int MAIN_HEIGHT = SWT.DEFAULT;
-	
+
 	public TGCommunityStartupScreen(){
 		super();
 	}
-	
+
 	public void open(){
 		try {
 			final Shell parent = TuxGuitar.instance().getShell();
 			TGSynchronizer.instance().runLater( new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					open( parent );
 				}
@@ -43,86 +44,87 @@ public void run() throws Throwable {
 			e.printStackTrace();
 		}
 	}
-	
+
 	protected void open(Shell parent){
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM );
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		dialog.setText(TuxGuitar.getProperty("tuxguitar-community.welcome-dialog.title"));
-		
+
 		Composite composite = new Composite( dialog, SWT.NONE );
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(MAIN_WIDTH, MAIN_HEIGHT));
-		
+
 		//==============================================================//
 		Composite top = new Composite( composite, SWT.NONE );
 		top.setLayout(new GridLayout( 2 , false ));
 		top.setLayoutData(new GridData(SWT.FILL,SWT.FILL, true,true));
-		
+
 		Composite topLeft = new Composite( top , SWT.NONE );
 		topLeft.setLayout( new GridLayout() );
 		topLeft.setLayoutData(new GridData(SWT.LEFT,SWT.TOP,false,false));
-		
+
 		Label image = new Label( topLeft, SWT.NONE );
 		image.setImage( TuxGuitar.instance().getIconManager().getAppIcon() );
-		
+
 		Composite topRight = new Composite( top , SWT.NONE );
 		topRight.setLayout( new GridLayout(2,false) );
 		topRight.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		addTitle( topRight , TuxGuitar.getProperty("tuxguitar-community.welcome-dialog.title") );
-		
+
 		addTipItem( topRight );
 		addComment( topRight , TuxGuitar.getProperty("tuxguitar-community.welcome-dialog.tip-1") );
-		
+
 		addTipItem( topRight );
 		addComment( topRight , TuxGuitar.getProperty("tuxguitar-community.welcome-dialog.tip-2") );
-		
+
 		//==============================================================//
 		Composite bottom = new Composite( composite, SWT.NONE );
 		bottom.setLayout(new GridLayout());
 		bottom.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		addComment( bottom , TuxGuitar.getProperty("tuxguitar-community.welcome-dialog.tip-bottom") );
-		
+
 		//==============================================================//
 		Composite buttons = new Composite( composite, SWT.NONE );
 		buttons.setLayout(new GridLayout( 2 , false ));
 		buttons.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		final Button buttonDisabled = new Button( buttons , SWT.CHECK );
 		buttonDisabled.setLayoutData( new GridData(SWT.LEFT, SWT.FILL, true, true) );
 		buttonDisabled.setText( TuxGuitar.getProperty("tuxguitar-community.welcome-dialog.disable") );
 		buttonDisabled.setSelection( this.isDisabled() );
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonOkData());
 		buttonOK.setFocus();
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				setDisabled( buttonDisabled.getSelection() );
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK );
 	}
-	
+
 	private GridData getButtonOkData(){
 		GridData data = new GridData(SWT.RIGHT, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private void addTitle( Composite parent , String text ){
 		Label label = new Label( parent , SWT.LEFT );
 		label.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true,2,1));
 		label.setText(text);
-		
+
 		FontData[] fontDatas = label.getFont().getFontData();
 		if(fontDatas.length > 0){
 			int fHeight = (fontDatas[0].getHeight() + 2);
@@ -130,28 +132,31 @@ private void addTitle( Composite parent , String text ){
 			final Font font = new Font(label.getDisplay(),fontDatas[0].getName(),fHeight, fStyle);
 			label.setFont(font);
 			label.addDisposeListener(new DisposeListener() {
+				@Override
 				public void widgetDisposed(DisposeEvent arg0) {
 					font.dispose();
 				}
 			});
 		}
 	}
-	
+
 	private void addTipItem( Composite parent ){
 		Label label = new Label( parent , SWT.LEFT );
 		label.setLayoutData(new GridData(SWT.LEFT,SWT.TOP,false,true));
 		label.setText("\u066D");
 	}
-	
+
 	private void addComment( Composite parent , String text ){
 		final Link link = new Link( parent , SWT.LEFT );
 		link.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		link.setText(text);
 		link.addListener(SWT.Selection, new Listener() {
+			@Override
 			public void handleEvent(Event event) {
 				final String href = event.text;
 				if( href != null ){
 					new Thread( new Runnable() {
+						@Override
 						public void run() {
 							TGCommunityWeb.open( href );
 						}
@@ -160,11 +165,11 @@ public void run() {
 			}
 		});
 	}
-	
+
 	public void setDisabled( boolean enabled ){
 		TGCommunitySingleton.getInstance().getConfig().setProperty("community.welcome.disabled",enabled);
 	}
-	
+
 	public boolean isDisabled(){
 		return TGCommunitySingleton.getInstance().getConfig().getBooleanConfigValue("community.welcome.disabled");
 	}
diff --git a/TuxGuitar-community/src/org/herac/tuxguitar/community/utils/TGCommunityWeb.java b/plugins/community/src/main/java/org/herac/tuxguitar/community/utils/TGCommunityWeb.java
similarity index 96%
rename from TuxGuitar-community/src/org/herac/tuxguitar/community/utils/TGCommunityWeb.java
rename to plugins/community/src/main/java/org/herac/tuxguitar/community/utils/TGCommunityWeb.java
index 1b2a595f..68901bdf 100644
--- a/TuxGuitar-community/src/org/herac/tuxguitar/community/utils/TGCommunityWeb.java
+++ b/plugins/community/src/main/java/org/herac/tuxguitar/community/utils/TGCommunityWeb.java
@@ -8,9 +8,9 @@
 import org.herac.tuxguitar.community.TGCommunitySingleton;
 
 public class TGCommunityWeb {
-	
+
 	public static String HOME_URL = TGCommunitySingleton.getInstance().getConfig().getStringConfigValue("community.url");
-	
+
 	public static void open( String suffix ){
 		try {
 			open( new URL(HOME_URL + "/" + suffix) );
@@ -18,7 +18,7 @@ public static void open( String suffix ){
 			e.printStackTrace();
 		}
 	}
-	
+
 	public static boolean open( URL url ){
 		if( openDesktopBrowser( url ) ){
 			return true;
@@ -28,10 +28,10 @@ public static boolean open( URL url ){
 		}
 		return false;
 	}
-	
+
 	private static boolean openDesktopBrowser( URL url ){
 		try {
-			Class desktopClass = Class.forName("java.awt.Desktop");
+			Class<?> desktopClass = Class.forName("java.awt.Desktop");
 			if( desktopClass != null ){
 				Method desktop_getDesktop = desktopClass.getDeclaredMethod("getDesktop", new Class[]{} );
 				Method desktop_browse = desktopClass.getDeclaredMethod("browse", new Class[]{ java.net.URI.class });
@@ -48,15 +48,15 @@ private static boolean openDesktopBrowser( URL url ){
 		}
 		return false;
 	}
-	
+
 	private static boolean openCommandLineBrowser( URL url ){
 		TGConfigManager config = TGCommunitySingleton.getInstance().getConfig();
-		
+
 		String[] browserCmds = config.getStringConfigValue("community.browser","").split(";");
 		for( int i = 0 ; i < browserCmds.length ; i ++ ){
 			try {
 				String browserCmd = browserCmds[i];
-				
+
 				if( browserCmd != null && browserCmd.length() > 0 ){
 					String pattern = ("%s");
 					int indexOfPattern = browserCmd.indexOf( pattern );
diff --git a/TuxGuitar-community/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/community/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-community/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/community/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-community/share/lang/messages.properties b/plugins/community/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages.properties
rename to plugins/community/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-community/share/lang/messages_ca.properties b/plugins/community/src/main/resources/lang/messages_ca.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_ca.properties
rename to plugins/community/src/main/resources/lang/messages_ca.properties
diff --git a/TuxGuitar-community/share/lang/messages_en.properties b/plugins/community/src/main/resources/lang/messages_en.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_en.properties
rename to plugins/community/src/main/resources/lang/messages_en.properties
diff --git a/TuxGuitar-community/share/lang/messages_es.properties b/plugins/community/src/main/resources/lang/messages_es.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_es.properties
rename to plugins/community/src/main/resources/lang/messages_es.properties
diff --git a/TuxGuitar-community/share/lang/messages_eu.properties b/plugins/community/src/main/resources/lang/messages_eu.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_eu.properties
rename to plugins/community/src/main/resources/lang/messages_eu.properties
diff --git a/TuxGuitar-community/share/lang/messages_fi.properties b/plugins/community/src/main/resources/lang/messages_fi.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_fi.properties
rename to plugins/community/src/main/resources/lang/messages_fi.properties
diff --git a/TuxGuitar-community/share/lang/messages_ja.properties b/plugins/community/src/main/resources/lang/messages_ja.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_ja.properties
rename to plugins/community/src/main/resources/lang/messages_ja.properties
diff --git a/TuxGuitar-community/share/lang/messages_pl.properties b/plugins/community/src/main/resources/lang/messages_pl.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_pl.properties
rename to plugins/community/src/main/resources/lang/messages_pl.properties
diff --git a/TuxGuitar-community/share/lang/messages_pt.properties b/plugins/community/src/main/resources/lang/messages_pt.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_pt.properties
rename to plugins/community/src/main/resources/lang/messages_pt.properties
diff --git a/TuxGuitar-community/share/lang/messages_sv.properties b/plugins/community/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_sv.properties
rename to plugins/community/src/main/resources/lang/messages_sv.properties
diff --git a/TuxGuitar-community/share/lang/messages_zh_GB.properties b/plugins/community/src/main/resources/lang/messages_zh_GB.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_zh_GB.properties
rename to plugins/community/src/main/resources/lang/messages_zh_GB.properties
diff --git a/TuxGuitar-community/share/lang/messages_zh_TW.properties b/plugins/community/src/main/resources/lang/messages_zh_TW.properties
similarity index 100%
rename from TuxGuitar-community/share/lang/messages_zh_TW.properties
rename to plugins/community/src/main/resources/lang/messages_zh_TW.properties
diff --git a/TuxGuitar-community/share/tuxguitar-community.cfg b/plugins/community/src/main/resources/tuxguitar-community.cfg
similarity index 100%
rename from TuxGuitar-community/share/tuxguitar-community.cfg
rename to plugins/community/src/main/resources/tuxguitar-community.cfg
diff --git a/plugins/compat/pom.xml b/plugins/compat/pom.xml
new file mode 100644
index 00000000..0bf8a47a
--- /dev/null
+++ b/plugins/compat/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-compat</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Compat</name>
+	<description>Compat plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/TGPluginListImpl.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/TGPluginListImpl.java
similarity index 87%
rename from TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/TGPluginListImpl.java
rename to plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/TGPluginListImpl.java
index 7fb8bf88..0cea32b2 100644
--- a/TuxGuitar-compat/src/org/herac/tuxguitar/io/tg/TGPluginListImpl.java
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/TGPluginListImpl.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
 import org.herac.tuxguitar.app.system.plugins.base.TGExporterPlugin;
 import org.herac.tuxguitar.app.system.plugins.base.TGInputStreamPlugin;
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
@@ -10,69 +11,83 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class TGPluginListImpl extends TGPluginList{
-	
-	protected List getPlugins() {
-		List plugins = new ArrayList();
+
+	@Override
+	protected List<TGPlugin> getPlugins() {
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new org.herac.tuxguitar.io.tg.v12.TGInputStream();
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new org.herac.tuxguitar.io.tg.v11.TGInputStream();
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new org.herac.tuxguitar.io.tg.v10.TGInputStream();
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new org.herac.tuxguitar.io.tg.v09.TGInputStream();
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new org.herac.tuxguitar.io.tg.v08.TGInputStream();
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new org.herac.tuxguitar.io.tg.v07.TGInputStream();
 			}
 		});
 		plugins.add(new TGExporterPlugin() {
+			@Override
 			protected TGRawExporter getExporter() {
 				return new org.herac.tuxguitar.io.tg.v12.TGOutputStream();
 			}
 		});
 		plugins.add(new TGExporterPlugin() {
+			@Override
 			protected TGRawExporter getExporter() {
 				return new org.herac.tuxguitar.io.tg.v11.TGOutputStream();
 			}
 		});
 		plugins.add(new TGExporterPlugin() {
+			@Override
 			protected TGRawExporter getExporter() {
 				return new org.herac.tuxguitar.io.tg.v10.TGOutputStream();
 			}
 		});
 		return plugins;
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "TuxGuitar file format compatibility";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "This plugin, provides support for other tuxguitar file format versions.";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v07/TGInputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v07/TGInputStream.java
new file mode 100644
index 00000000..cccdcbe5
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v07/TGInputStream.java
@@ -0,0 +1,467 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v07;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGInputStream implements TGInputStreamBase{
+	private static final String TG_VERSION = "TG_DEVEL-0.01";
+
+	private DataInputStream dataInputStream;
+	private TGFactory factory;
+	private String version;
+
+	public TGInputStream(){
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Exception e){
+			return false;
+		}catch(Error e){
+			return false;
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readString();
+		}
+	}
+
+	@Override
+	public TGSong readSong()throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		}catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readString());
+
+		//leo el artista
+		song.setArtist(readString());
+
+		//leo el album
+		song.setAlbum(readString());
+
+		//leo el autor
+		song.setAuthor(readString());
+
+		//leo la cantidad de pistas
+		int trackCount = readInt();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(song));
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(TGSong song){
+		TGTrack track = this.factory.newTrack();
+
+		//leo el numero
+		track.setNumber((int)readLong());
+
+		//leo el nombre
+		track.setName(readString());
+
+		//leo el canal
+		readChannel(song,track);
+
+		//leo el solo
+		track.setSolo(readBoolean());
+
+		//leo el mute
+		track.setMute(readBoolean());
+
+		//leo la cantidad de compases
+		int measureCount = readInt();
+
+		if(song.countMeasureHeaders() == 0){
+			for(int i = 0;i < measureCount;i++){
+				TGMeasureHeader header = this.factory.newHeader();
+				song.addMeasureHeader(header);
+			}
+		}
+
+		//leo los compases
+		for(int i = 0;i < measureCount;i++){
+			track.addMeasure(readMeasure(song.getMeasureHeader(i)));
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readInt();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString());
+		}
+
+		//leo el color
+		readColor(track.getColor());
+
+		return track;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader header){
+		TGMeasure measure = this.factory.newMeasure(header);
+
+		//leo el number
+		header.setNumber(readInt());
+
+		//leo el start
+		header.setStart( (TGDuration.QUARTER_TIME * readLong() / 1000) );
+
+		//leo la cantidad de notas
+		int noteCount = readInt();
+
+		//leo las notas
+		TGBeat previous = null;
+		for(int i = 0;i < noteCount;i++){
+			previous = readNote(measure,previous);
+		}
+
+		//leo la cantidad de silencios
+		int silenceCount = readInt();
+
+		//leo los silencios
+		previous = null;
+		for(int i = 0;i < silenceCount;i++){
+			previous = readSilence(measure,previous);
+		}
+
+		//leo el time signature
+		readTimeSignature(header.getTimeSignature());
+
+		//leo el tempo
+		readTempo(header.getTempo());
+
+		//leo la clave
+		measure.setClef(readInt());
+
+		//leo el key signature
+		measure.setKeySignature(readInt());
+
+		//leo el comienzo de la repeticion
+		header.setRepeatOpen(readBoolean());
+
+		//leo el numero de repeticiones
+		header.setRepeatClose(readInt());
+
+		return measure;
+
+	}
+
+	private TGBeat readNote(TGMeasure measure, TGBeat previous){
+		TGBeat beat = previous;
+
+		//leo el valor
+		int value = readInt();
+
+		//leo el start
+		long start = (TGDuration.QUARTER_TIME * readLong() / 1000);
+		if(beat == null || beat.getStart() != start){
+			beat = this.factory.newBeat();
+			beat.setStart(start);
+			measure.addBeat(beat);
+		}
+		TGVoice voice = beat.getVoice(0);
+		voice.setEmpty( false );
+
+		//leo la duracion
+		readDuration(voice.getDuration());
+
+		TGNote note = this.factory.newNote();
+
+		note.setValue(value);
+
+		//leo el velocity
+		note.setVelocity(readInt());
+
+		//leo la cuerda
+		note.setString(readInt());
+
+		//leo la ligadura
+		note.setTiedNote(readBoolean());
+
+		//leo los efectos
+		readNoteEffect(note.getEffect());
+
+		voice.addNote(note);
+		return beat;
+	}
+
+	private void readChannel(TGSong song, TGTrack track){
+		TGChannel channel = this.factory.newChannel();
+
+		//leo el canal
+		channel.setChannel(readShort());
+
+		//leo el canal de efectos
+		channel.setEffectChannel(readShort());
+
+		//leo el instrumento
+		channel.setProgram(readShort());
+
+		//leo el volumen
+		channel.setVolume(readShort());
+
+		//leo el balance
+		channel.setBalance(readShort());
+
+		//leo el chorus
+		channel.setChorus(readShort());
+
+		//leo el reverb
+		channel.setReverb(readShort());
+
+		//leo el phaser
+		channel.setPhaser(readShort());
+
+		//leo el tremolo
+		channel.setTremolo(readShort());
+
+		//------------------------------------------//
+		for( int i = 0 ; i < song.countChannels() ; i ++ ){
+			TGChannel channelAux = song.getChannel(i);
+			if( channelAux.getChannel() == channel.getChannel() ){
+				channel.setChannelId(channelAux.getChannelId());
+			}
+		}
+		if( channel.getChannelId() <= 0 ){
+			channel.setChannelId( song.countChannels() + 1 );
+			channel.setName(("#" + channel.getChannelId()));
+			song.addChannel(channel);
+		}
+		track.setChannelId(channel.getChannelId());
+	}
+
+	private TGBeat readSilence(TGMeasure measure, TGBeat previous){
+		TGBeat beat = previous;
+
+		//leo el start
+		long start = (TGDuration.QUARTER_TIME * readLong() / 1000);
+		if(beat == null || beat.getStart() != start){
+			beat = this.factory.newBeat();
+			beat.setStart(start);
+			measure.addBeat(beat);
+		}
+		TGVoice voice = beat.getVoice(0);
+		voice.setEmpty( false );
+
+		//leo la duracion
+		readDuration(voice.getDuration());
+
+		return beat;
+	}
+
+	private TGString readInstrumentString(){
+		TGString string = this.factory.newString();
+
+		//leo el numero
+		string.setNumber( readInt() );
+
+		//leo el valor
+		string.setValue(readInt());
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readInt());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readInt());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		//leo el valor
+		duration.setValue( readInt() );
+
+		//leo el puntillo
+		duration.setDotted( readBoolean() );
+
+		//leo el doble puntillo
+		duration.setDoubleDotted( readBoolean() );
+
+		//leo el tipo de divisiones
+		readDivisionType(duration.getDivision());
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readInt());
+
+		//leo los tiempos
+		divisionType.setTimes(readInt());
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		//leo el vibrato
+		effect.setVibrato(readBoolean());
+
+		//leo el bend
+		if(readBoolean()){
+			effect.setBend(readBendEffect());
+		}
+
+		//leo la nota muerta
+		effect.setDeadNote(readBoolean());
+
+		//leo el slide
+		effect.setSlide(readBoolean());
+
+		//leo el hammer
+		effect.setHammer(readBoolean());
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readInt();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readInt();
+
+			//leo el valor
+			int value = readInt();
+
+			//agrego el punto
+			bend.addPoint(position,((value > 0)?value / 2:value));
+		}
+		return bend;
+	}
+
+	private void readColor(TGColor color){
+		//escribo el RGB
+		color.setR(readInt());
+		color.setG(readInt());
+		color.setB(readInt());
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readInt(){
+		try {
+			return this.dataInputStream.readInt();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private long readLong(){
+		try {
+			return this.dataInputStream.readLong();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readString(){
+		try {
+			int length = this.dataInputStream.read();
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+
+	private boolean readBoolean(){
+		try {
+			return this.dataInputStream.readBoolean();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v08/TGInputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v08/TGInputStream.java
new file mode 100644
index 00000000..3b0e42fa
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v08/TGInputStream.java
@@ -0,0 +1,497 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v08;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGInputStream extends TGStream implements TGInputStreamBase{
+
+	private DataInputStream dataInputStream;
+	private TGFactory factory;
+	private String version;
+
+	public TGInputStream(){
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Throwable throwable){
+			return false;
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readString();
+		}
+	}
+
+	@Override
+	public TGSong readSong() throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		} catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readString());
+
+		//leo el artista
+		song.setArtist(readString());
+
+		//leo el album
+		song.setAlbum(readString());
+
+		//leo el autor
+		song.setAuthor(readString());
+
+		//leo la cantidad de measure headers
+		int headerCount = readShort();
+
+		//leo las pistas
+		long headerStart = TGDuration.QUARTER_TIME;
+		TGMeasureHeader lastHeader = null;
+		for(int i = 0;i < headerCount;i++){
+			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
+			song.addMeasureHeader(header);
+			headerStart += header.getLength();
+			lastHeader = header;
+		}
+
+		//leo la cantidad de pistas
+		int trackCount = readByte();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(i + 1,song));
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(int number,TGSong song){
+		TGTrack track = this.factory.newTrack();
+
+		track.setNumber(number);
+
+		//leo el nombre
+		track.setName(readString());
+
+		//leo el canal
+		readChannel(song, track);
+
+		//leo la cantidad de compases
+		int measureCount = song.countMeasureHeaders();
+
+		//leo los compases
+		TGMeasure lastMeasure = null;
+		for(int i = 0;i < measureCount;i++){
+			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
+			track.addMeasure(measure);
+			lastMeasure = measure;
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readByte();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString(i + 1));
+		}
+
+		//leo el offset
+		track.setOffset((TGTrack.MIN_OFFSET + readByte()));
+
+		//leo el color
+		readColor(track.getColor());
+
+		return track;
+	}
+
+	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
+		int header = readHeader();
+
+		TGMeasureHeader measureHeader = this.factory.newHeader();
+		measureHeader.setNumber(number);
+		measureHeader.setStart(start);
+
+		//leo el time signature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			readTimeSignature(measureHeader.getTimeSignature());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
+		}
+
+		//leo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			readTempo(measureHeader.getTempo());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
+		}
+
+		//leo el comienzo de la repeticion
+		measureHeader.setRepeatOpen( ((header & MEASURE_HEADER_OPEN_REPEAT) != 0) );
+
+		//leo el numero de repeticiones
+		if(((header & MEASURE_HEADER_CLOSE_REPEAT) != 0)){
+			measureHeader.setRepeatClose(readShort());
+		}
+
+		//leo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			measureHeader.setMarker(readMarker(number));
+		}
+
+		measureHeader.setTripletFeel( ((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE) );
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			measureHeader.setTripletFeel( readByte() );
+		}
+		return measureHeader;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
+		int header = readHeader();
+
+		TGMeasure measure = this.factory.newMeasure(measureHeader);
+
+		//leo la cantidad de componentes
+		TGBeat previous = null;
+		int componentCount = readShort();
+		for(int i = 0;i < componentCount;i++){
+			previous = readComponent(measure,previous);
+		}
+
+		//leo la clave
+		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
+		if(((header & MEASURE_CLEF) != 0)){
+			measure.setClef(readByte());
+		}
+
+		//leo el key signature
+		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			measure.setKeySignature(readByte());
+		}
+
+		return measure;
+	}
+
+	private void readChannel(TGSong song, TGTrack track){
+		int header = readHeader();
+
+		TGChannel channel = this.factory.newChannel();
+
+		//leo el canal
+		channel.setChannel((short)readByte());
+
+		//leo el canal de efectos
+		channel.setEffectChannel((short)readByte());
+
+		//leo el instrumento
+		channel.setProgram((short)readByte());
+
+		//leo el volumen
+		channel.setVolume((short)readByte());
+
+		//leo el balance
+		channel.setBalance((short)readByte());
+
+		//leo el chorus
+		channel.setChorus((short)readByte());
+
+		//leo el reverb
+		channel.setReverb((short)readByte());
+
+		//leo el phaser
+		channel.setPhaser((short)readByte());
+
+		//leo el tremolo
+		channel.setTremolo((short)readByte());
+
+		//leo el solo
+		track.setSolo(((header & CHANNEL_SOLO) != 0));
+
+		//leo el mute
+		track.setMute(((header & CHANNEL_MUTE) != 0));
+
+		//------------------------------------------//
+		for( int i = 0 ; i < song.countChannels() ; i ++ ){
+			TGChannel channelAux = song.getChannel(i);
+			if( channelAux.getChannel() == channel.getChannel() ){
+				channel.setChannelId(channelAux.getChannelId());
+			}
+		}
+		if( channel.getChannelId() <= 0 ){
+			channel.setChannelId( song.countChannels() + 1 );
+			channel.setName(("#" + channel.getChannelId()));
+			song.addChannel(channel);
+		}
+		track.setChannelId(channel.getChannelId());
+	}
+
+	private TGBeat readComponent(TGMeasure measure,TGBeat previous){
+		TGBeat beat = previous;
+
+		int header = readHeader();
+
+		//leo el start
+		if(beat == null){
+			beat = this.factory.newBeat();
+			beat.setStart(measure.getStart());
+			measure.addBeat(beat);
+		}else if(((header & COMPONENT_NEXT_BEAT) != 0)){
+			beat = this.factory.newBeat();
+			beat.setStart(previous.getStart() + previous.getVoice(0).getDuration().getTime());
+			measure.addBeat(beat);
+		}
+		TGVoice voice = beat.getVoice(0);
+		voice.setEmpty(false);
+
+		//leo la duracion
+		if(((header & COMPONENT_NEXT_DURATION) != 0)){
+			readDuration(voice.getDuration());
+		}else if(previous != null && !previous.equals(beat)){
+			previous.getVoice(0).getDuration().copy( voice.getDuration() );
+		}
+
+		if(((header & COMPONENT_NOTE) != 0)){
+			TGNote note = this.factory.newNote();
+
+			//leo el valor
+			note.setValue(readByte());
+
+			//leo el velocity
+			note.setVelocity( readByte() );
+
+			//leo la cuerda
+			note.setString(readByte());
+
+			//leo la ligadura
+			note.setTiedNote(((header & COMPONENT_TIEDNOTE) != 0));
+
+			//leo los efectos
+			if(((header & COMPONENT_EFFECT) != 0)){
+				readNoteEffect(note.getEffect());
+			}
+
+			voice.addNote(note);
+		}
+		return beat;
+	}
+
+	private TGString readInstrumentString(int number){
+		TGString string = this.factory.newString();
+
+		//leo el numero
+		string.setNumber(number);
+
+		//leo el valor
+		string.setValue(readByte());
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readShort());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readByte());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		int header = readHeader();
+
+		duration.setDotted((header & DURATION_DOTTED) != 0);
+
+		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
+
+		//leo el valor
+		duration.setValue(readByte());
+
+		//leo el tipo de divisiones
+		if(((header & DURATION_TUPLETO) != 0)){
+			readDivisionType(duration.getDivision());
+		}
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readByte());
+
+		//leo los tiempos
+		divisionType.setTimes(readByte());
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		int header = readHeader();
+
+		//leo el vibrato
+		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
+
+		//leo la nota muerta
+		effect.setDeadNote(((header & EFFECT_DEAD_NOTE) != 0));
+
+		//leo el slide
+		effect.setSlide(((header & EFFECT_SLIDE) != 0));
+
+		//leo el hammer
+		effect.setHammer(((header & EFFECT_HAMMER) != 0));
+
+		//leo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			effect.setBend(readBendEffect());
+		}
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value = readByte();
+
+			//agrego el punto
+			bend.addPoint(position,((value > 0)?value / 2:value));
+		}
+		return bend;
+	}
+
+	private TGMarker readMarker(int measure){
+		TGMarker marker = this.factory.newMarker();
+
+		//leo el compas
+		marker.setMeasure(measure);
+
+		//leo el titulo
+		marker.setTitle(readString());
+
+		//leo el color
+		readColor(marker.getColor());
+
+		return marker;
+	}
+
+	private void readColor(TGColor color){
+		//escribo el RGB
+		color.setR(readShort());
+		color.setG(readShort());
+		color.setB(readShort());
+	}
+
+	private int readByte(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readString(){
+		try {
+			int length = this.dataInputStream.read();
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v08/TGStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v08/TGStream.java
new file mode 100644
index 00000000..3a1e7311
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v08/TGStream.java
@@ -0,0 +1,55 @@
+package org.herac.tuxguitar.io.tg.v08;
+
+public class TGStream {
+
+	protected static final String TG_VERSION = ("TG_DEVEL-0.8");
+
+	protected static final int CHANNEL_SOLO = 0x01;
+
+	protected static final int CHANNEL_MUTE = 0x02;
+
+	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
+
+	protected static final int MEASURE_HEADER_TEMPO = 0x02;
+
+	protected static final int MEASURE_HEADER_OPEN_REPEAT = 0x04;
+
+	protected static final int MEASURE_HEADER_CLOSE_REPEAT = 0x08;
+
+	protected static final int MEASURE_HEADER_MARKER = 0x10;
+
+	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x20;
+
+	protected static final int MEASURE_CLEF = 0x01;
+
+	protected static final int MEASURE_KEYSIGNATURE = 0x02;
+
+	protected static final int COMPONENT_NOTE = 0x01;
+
+	protected static final int COMPONENT_SILENCE = 0x02;
+
+	protected static final int COMPONENT_TIEDNOTE = 0x04;
+
+	protected static final int COMPONENT_EFFECT = 0x08;
+
+	protected static final int COMPONENT_NEXT_BEAT = 0x10;
+
+	protected static final int COMPONENT_NEXT_DURATION = 0x20;
+
+	protected static final int DURATION_DOTTED = 0x01;
+
+	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
+
+	protected static final int DURATION_TUPLETO = 0x04;
+
+	protected static final int EFFECT_VIBRATO = 0x01;
+
+	protected static final int EFFECT_BEND = 0x02;
+
+	protected static final int EFFECT_DEAD_NOTE = 0x04;
+
+	protected static final int EFFECT_SLIDE = 0x08;
+
+	protected static final int EFFECT_HAMMER = 0x10;
+
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v09/TGInputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v09/TGInputStream.java
new file mode 100644
index 00000000..ac0a56ac
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v09/TGInputStream.java
@@ -0,0 +1,668 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v09;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVelocities;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGInputStream extends TGStream implements TGInputStreamBase{
+
+	private DataInputStream dataInputStream;
+	private String version;
+	private TGFactory factory;
+
+	private int velocity;
+
+	public TGInputStream() {
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Throwable throwable){
+			return false;
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readString();
+		}
+	}
+
+	@Override
+	public TGSong readSong() throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		} catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readString());
+
+		//leo el artista
+		song.setArtist(readString());
+
+		//leo el album
+		song.setAlbum(readString());
+
+		//leo el autor
+		song.setAuthor(readString());
+
+		//leo la cantidad de measure headers
+		int headerCount = readShort();
+
+		//leo las pistas
+		long headerStart = TGDuration.QUARTER_TIME;
+		TGMeasureHeader lastHeader = null;
+		for(int i = 0;i < headerCount;i++){
+			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
+			song.addMeasureHeader(header);
+			headerStart += header.getLength();
+			lastHeader = header;
+		}
+
+		//leo la cantidad de pistas
+		int trackCount = readByte();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(i + 1,song) );
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(int number,TGSong song){
+		//header
+		int header = readHeader();
+
+		TGTrack track = this.factory.newTrack();
+
+		track.setNumber(number);
+
+		//leo el nombre
+		track.setName( readString() );
+
+		//leo el canal
+		readChannel(song, track);
+
+		//leo la cantidad de compases
+		int measureCount = song.countMeasureHeaders();
+
+		//leo los compases
+		TGMeasure lastMeasure = null;
+		for(int i = 0;i < measureCount;i++){
+			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
+			track.addMeasure(measure);
+			lastMeasure = measure;
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readByte();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString(i + 1));
+		}
+
+		//leo el offset
+		track.setOffset( (TGTrack.MIN_OFFSET + readByte()) );
+
+		//leo el color
+		readColor(track.getColor());
+
+		//leo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			readLyrics(track.getLyrics());
+		}
+
+		return track;
+	}
+
+	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
+		int header = readHeader();
+
+		TGMeasureHeader measureHeader = this.factory.newHeader();
+		measureHeader.setNumber(number);
+		measureHeader.setStart(start);
+
+		//leo el time signature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			readTimeSignature(measureHeader.getTimeSignature());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
+		}
+
+		//leo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			readTempo(measureHeader.getTempo());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
+		}
+
+		//leo el comienzo de la repeticion
+		measureHeader.setRepeatOpen((header & MEASURE_HEADER_OPEN_REPEAT) != 0);
+
+		//leo el numero de repeticiones
+		if(((header & MEASURE_HEADER_CLOSE_REPEAT) != 0)){
+			measureHeader.setRepeatClose(readShort());
+		}
+
+		//leo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			measureHeader.setMarker(readMarker(number));
+		}
+
+		measureHeader.setTripletFeel ((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			measureHeader.setTripletFeel( readByte() );
+		}
+
+		return measureHeader;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
+		this.velocity = TGVelocities.DEFAULT;
+
+		int header = readHeader();
+
+		TGMeasure measure = this.factory.newMeasure(measureHeader);
+
+		//leo la cantidad de componentes
+		TGBeat previous = null;
+		int componentCount = readShort();
+		for(int i = 0;i < componentCount;i++){
+			previous = readComponent(measure,previous);
+		}
+
+		//leo la clave
+		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
+		if(((header & MEASURE_CLEF) != 0)){
+			measure.setClef( readByte() );
+		}
+
+		//leo el key signature
+		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			measure.setKeySignature(readByte());
+		}
+
+		return measure;
+
+	}
+
+	private void readChannel(TGSong song, TGTrack track){
+		int header = readHeader();
+
+		TGChannel channel = this.factory.newChannel();
+
+		//leo el canal
+		channel.setChannel( (short)readByte() );
+
+		//leo el canal de efectos
+		channel.setEffectChannel( (short)readByte() );
+
+		//leo el instrumento
+		channel.setProgram( (short)readByte() );
+
+		//leo el volumen
+		channel.setVolume( (short)readByte() );
+
+		//leo el balance
+		channel.setBalance( (short)readByte() );
+
+		//leo el chorus
+		channel.setChorus( (short)readByte() );
+
+		//leo el reverb
+		channel.setReverb( (short)readByte() );
+
+		//leo el phaser
+		channel.setPhaser( (short)readByte() );
+
+		//leo el tremolo
+		channel.setTremolo( (short)readByte() );
+
+		//leo el solo
+		track.setSolo( ((header & CHANNEL_SOLO) != 0) );
+
+		//leo el mute
+		track.setMute( ((header & CHANNEL_MUTE) != 0) );
+
+		//------------------------------------------//
+		for( int i = 0 ; i < song.countChannels() ; i ++ ){
+			TGChannel channelAux = song.getChannel(i);
+			if( channelAux.getChannel() == channel.getChannel() ){
+				channel.setChannelId(channelAux.getChannelId());
+			}
+		}
+		if( channel.getChannelId() <= 0 ){
+			channel.setChannelId( song.countChannels() + 1 );
+			channel.setName(("#" + channel.getChannelId()));
+			song.addChannel(channel);
+		}
+		track.setChannelId(channel.getChannelId());
+	}
+
+	private TGBeat readComponent(TGMeasure measure,TGBeat previous){
+		TGBeat beat = previous;
+
+		int header = readHeader();
+
+		//leo el start
+		if(beat == null){
+			beat = this.factory.newBeat();
+			beat.setStart(measure.getStart());
+			measure.addBeat(beat);
+		}else if(((header & COMPONENT_NEXT_BEAT) != 0)){
+			beat = this.factory.newBeat();
+			beat.setStart(previous.getStart() + previous.getVoice(0).getDuration().getTime());
+			measure.addBeat(beat);
+		}
+		TGVoice voice = beat.getVoice(0);
+		voice.setEmpty(false);
+
+		//leo la duracion
+		if(((header & COMPONENT_NEXT_DURATION) != 0)){
+			readDuration(voice.getDuration());
+		}else if(previous != null && !previous.equals(beat)){
+			previous.getVoice(0).getDuration().copy( voice.getDuration() );
+		}
+
+		if(((header & COMPONENT_NOTE) != 0)){
+			TGNote note = this.factory.newNote();
+
+			//leo el valor
+			note.setValue(readByte());
+
+			//leo la cuerda
+			note.setString(readByte());
+
+			//leo la ligadura
+			note.setTiedNote((header & COMPONENT_TIEDNOTE) != 0);
+
+			//leo el velocity
+			if(((header & COMPONENT_VELOCITY) != 0)){
+				this.velocity = readByte();
+			}
+			note.setVelocity(this.velocity);
+
+			//leo los efectos
+			if(((header & COMPONENT_EFFECT) != 0)){
+				readNoteEffect(note.getEffect());
+			}
+			voice.addNote(note);
+		}
+		return beat;
+	}
+
+	private TGString readInstrumentString(int number){
+		TGString string = this.factory.newString();
+
+		string.setNumber(number);
+
+		//leo el valor
+		string.setValue( readByte() );
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readShort());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readByte());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		int header = readHeader();
+
+		// leo el puntillo
+		duration.setDotted((header & DURATION_DOTTED) != 0);
+
+		//leo el doble puntillo
+		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
+
+		//leo el valor
+		duration.setValue(readByte());
+
+		//leo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			readDivisionType(duration.getDivision());
+		}
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readByte());
+
+		//leo los tiempos
+		divisionType.setTimes(readByte());
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		int header = readHeader(3);
+
+		//leo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			effect.setBend(readBendEffect());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			effect.setTremoloBar(readTremoloBarEffect());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			effect.setHarmonic(readHarmonicEffect());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			effect.setGrace(readGraceEffect());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			effect.setTrill(readTrillEffect());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			effect.setTremoloPicking(readTremoloPickingEffect());
+		}
+
+		//vibrato
+		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
+
+		//dead note
+		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
+
+		//slide
+		effect.setSlide(((header & EFFECT_SLIDE) != 0));
+
+		//hammer-on/pull-off
+		effect.setHammer(((header & EFFECT_HAMMER) != 0));
+
+		//ghost note
+		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
+
+		//accentuated note
+		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
+
+		//heavy accentuated note
+		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
+
+		//palm mute
+		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
+
+		//staccato
+		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
+
+		//tapping
+		effect.setTapping(((header & EFFECT_TAPPING) != 0));
+
+		//slapping
+		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
+
+		//popping
+		effect.setPopping(((header & EFFECT_POPPING) != 0));
+
+		//fade in
+		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value = readByte();
+
+			//agrego el punto
+			bend.addPoint(position,value);
+		}
+		return bend;
+	}
+
+	private TGEffectTremoloBar readTremoloBarEffect(){
+		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
+
+			//agrego el punto
+			tremoloBar.addPoint(position,value);
+		}
+		return tremoloBar;
+	}
+
+	private TGEffectHarmonic readHarmonicEffect(){
+		TGEffectHarmonic harmonic = this.factory.newEffectHarmonic();
+
+		//leo el tipo
+		harmonic.setType(readByte());
+
+		//leo la data
+		if(harmonic.getType() == TGEffectHarmonic.TYPE_ARTIFICIAL){
+			harmonic.setData(TGEffectHarmonic.MIN_ARTIFICIAL_OFFSET + readByte());
+		}else if(harmonic.getType() == TGEffectHarmonic.TYPE_TAPPED){
+			harmonic.setData(readByte());
+		}
+		return harmonic;
+	}
+
+	private TGEffectGrace readGraceEffect(){
+		TGEffectGrace grace = this.factory.newEffectGrace();
+
+		int header = readHeader();
+
+		grace.setDead(((header & GRACE_FLAG_DEAD) != 0));
+
+		grace.setOnBeat(((header & GRACE_FLAG_ON_BEAT) != 0));
+
+		//leo el fret
+		grace.setFret(readByte());
+
+		//leo la duracion
+		grace.setDuration(readByte());
+
+		//leo el velocity
+		grace.setDynamic(readByte());
+
+		//leo la transicion
+		grace.setTransition(readByte());
+
+		return grace;
+	}
+
+	private TGEffectTremoloPicking readTremoloPickingEffect(){
+		TGEffectTremoloPicking tremoloPicking = this.factory.newEffectTremoloPicking();
+
+		//leo la duracion
+		tremoloPicking.getDuration().setValue(readByte());
+
+		return tremoloPicking;
+	}
+
+	private TGEffectTrill readTrillEffect(){
+		TGEffectTrill trill = this.factory.newEffectTrill();
+
+		//leo el fret
+		trill.setFret(readByte());
+
+		//leo la duracion
+		trill.getDuration().setValue(readByte());
+
+		return trill;
+	}
+
+	private TGMarker readMarker(int measure){
+		TGMarker marker = this.factory.newMarker();
+
+		marker.setMeasure(measure);
+
+		//leo el titulo
+		marker.setTitle(readString());
+
+		//leo el color
+		readColor(marker.getColor());
+
+		return marker;
+	}
+
+	private void readColor(TGColor color){
+		//leo el RGB
+		color.setR(readShort());
+		color.setG(readShort());
+		color.setB(readShort());
+	}
+
+	private void readLyrics(TGLyric lyrics){
+		//leo el compas de comienzo
+		lyrics.setFrom(readShort());
+
+		//leo el texto
+		lyrics.setLyrics(readString());
+	}
+
+	private int readByte(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(int bCount){
+		int header = 0;
+		for(int i = bCount; i > 0; i --){
+			header += ( readHeader() << ( (8 * i) - 8 ) );
+		}
+		return header;
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readString(){
+		try {
+			int length = this.dataInputStream.read();
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v09/TGStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v09/TGStream.java
new file mode 100644
index 00000000..46a4a2d2
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v09/TGStream.java
@@ -0,0 +1,90 @@
+package org.herac.tuxguitar.io.tg.v09;
+
+public class TGStream {
+
+	protected static final String TG_VERSION = ("TuxGuitar File Format - 0.9");
+
+	protected static final int TRACK_LYRICS = 0x01;
+
+	protected static final int CHANNEL_SOLO = 0x01;
+
+	protected static final int CHANNEL_MUTE = 0x02;
+
+	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
+
+	protected static final int MEASURE_HEADER_TEMPO = 0x02;
+
+	protected static final int MEASURE_HEADER_OPEN_REPEAT = 0x04;
+
+	protected static final int MEASURE_HEADER_CLOSE_REPEAT = 0x08;
+
+	protected static final int MEASURE_HEADER_MARKER = 0x10;
+
+	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x20;
+
+	protected static final int MEASURE_CLEF = 0x01;
+
+	protected static final int MEASURE_KEYSIGNATURE = 0x02;
+
+	protected static final int COMPONENT_NOTE = 0x01;
+
+	protected static final int COMPONENT_SILENCE = 0x02;
+
+	protected static final int COMPONENT_TIEDNOTE = 0x04;
+
+	protected static final int COMPONENT_EFFECT = 0x08;
+
+	protected static final int COMPONENT_NEXT_BEAT = 0x10;
+
+	protected static final int COMPONENT_NEXT_DURATION = 0x20;
+
+	protected static final int COMPONENT_VELOCITY = 0x40;
+
+	protected static final int DURATION_DOTTED = 0x01;
+
+	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
+
+	protected static final int DURATION_NO_TUPLET = 0x04;
+
+	protected static final int EFFECT_BEND = 0x01;
+
+	protected static final int EFFECT_TREMOLO_BAR = 0x02;
+
+	protected static final int EFFECT_HARMONIC = 0x04;
+
+	protected static final int EFFECT_GRACE = 0x08;
+
+	protected static final int EFFECT_TRILL = 0x010;
+
+	protected static final int EFFECT_TREMOLO_PICKING = 0x020;
+
+	protected static final int EFFECT_VIBRATO = 0x040;
+
+	protected static final int EFFECT_DEAD = 0x080;
+
+	protected static final int EFFECT_SLIDE = 0x0100;
+
+	protected static final int EFFECT_HAMMER = 0x0200;
+
+	protected static final int EFFECT_GHOST = 0x0400;
+
+	protected static final int EFFECT_ACCENTUATED = 0x0800;
+
+	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x01000;
+
+	protected static final int EFFECT_PALM_MUTE = 0x02000;
+
+	protected static final int EFFECT_STACCATO = 0x04000;
+
+	protected static final int EFFECT_TAPPING = 0x08000;
+
+	protected static final int EFFECT_SLAPPING = 0x010000;
+
+	protected static final int EFFECT_POPPING = 0x020000;
+
+	protected static final int EFFECT_FADE_IN = 0x040000;
+
+	protected static final int GRACE_FLAG_DEAD = 0x01;
+
+	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGInputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGInputStream.java
new file mode 100644
index 00000000..054a1dc5
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGInputStream.java
@@ -0,0 +1,733 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v10;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGInputStream extends TGStream implements TGInputStreamBase{
+
+	private DataInputStream dataInputStream;
+	private String version;
+	private TGFactory factory;
+
+	public TGInputStream() {
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_FORMAT_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Throwable throwable){
+			return false;
+		}
+	}
+
+	@Override
+	public TGSong readSong() throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		} catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readUnsignedByteString();
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readUnsignedByteString());
+
+		//leo el artista
+		song.setArtist(readUnsignedByteString());
+
+		//leo el album
+		song.setAlbum(readUnsignedByteString());
+
+		//leo el autor
+		song.setAuthor(readUnsignedByteString());
+
+		//leo la cantidad de measure headers
+		int headerCount = readShort();
+
+		//leo las pistas
+		TGMeasureHeader lastHeader = null;
+		long headerStart = TGDuration.QUARTER_TIME;
+		for(int i = 0;i < headerCount;i++){
+			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
+			song.addMeasureHeader(header);
+			headerStart += header.getLength();
+			lastHeader = header;
+		}
+
+		//leo la cantidad de pistas
+		int trackCount = readByte();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(i + 1,song));
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(int number,TGSong song){
+		//header
+		int header = readHeader();
+
+		TGTrack track = this.factory.newTrack();
+
+		track.setNumber(number);
+
+		//leo el nombre
+		track.setName(readUnsignedByteString());
+
+		//leo el canal
+		readChannel(song, track);
+
+		//leo la cantidad de compases
+		int measureCount = song.countMeasureHeaders();
+
+		//leo los compases
+		TGMeasure lastMeasure = null;
+		for(int i = 0;i < measureCount;i++){
+			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
+			track.addMeasure(measure);
+			lastMeasure = measure;
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readByte();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString(i + 1));
+		}
+
+		//leo el offset
+		track.setOffset(TGTrack.MIN_OFFSET + readByte());
+
+		//leo el color
+		readRGBColor(track.getColor());
+
+		//leo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			readLyrics(track.getLyrics());
+		}
+
+		return track;
+	}
+
+	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
+		int header = readHeader();
+
+		TGMeasureHeader measureHeader = this.factory.newHeader();
+		measureHeader.setNumber(number);
+		measureHeader.setStart(start);
+
+		//leo el time signature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			readTimeSignature(measureHeader.getTimeSignature());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
+		}
+
+		//leo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			readTempo(measureHeader.getTempo());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
+		}
+
+		//leo el comienzo de la repeticion
+		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
+
+		//leo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			 measureHeader.setRepeatClose(readShort());
+		}
+
+		//leo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			 measureHeader.setRepeatAlternative(readByte());
+		}
+
+		//leo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			measureHeader.setMarker(readMarker(number));
+		}
+
+		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			measureHeader.setTripletFeel(readByte());
+		}
+
+		return measureHeader;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
+		int header = readHeader();
+
+		TGMeasure measure = this.factory.newMeasure(measureHeader);
+		TGBeatData data = new TGBeatData(measure);
+
+		//leo la los beats
+		readBeats(measure, data);
+
+		//leo la clave
+		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
+		if(((header & MEASURE_CLEF) != 0)){
+			measure.setClef(readByte());
+		}
+
+		//leo el key signature
+		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			measure.setKeySignature(readByte());
+		}
+
+		return measure;
+	}
+
+	private void readChannel(TGSong song, TGTrack track){
+		int header = readHeader();
+
+		TGChannel channel = this.factory.newChannel();
+
+		//leo el canal
+		channel.setChannel(readByte());
+
+		//leo el canal de efectos
+		channel.setEffectChannel(readByte());
+
+		//leo el instrumento
+		channel.setProgram(readByte());
+
+		//leo el volumen
+		channel.setVolume(readByte());
+
+		//leo el balance
+		channel.setBalance(readByte());
+
+		//leo el chorus
+		channel.setChorus(readByte());
+
+		//leo el reverb
+		channel.setReverb(readByte());
+
+		//leo el phaser
+		channel.setPhaser(readByte());
+
+		//leo el tremolo
+		channel.setTremolo(readByte());
+
+		//leo el solo
+		track.setSolo((header & CHANNEL_SOLO) != 0);
+
+		//leo el mute
+		track.setMute((header & CHANNEL_MUTE) != 0);
+
+		//------------------------------------------//
+		for( int i = 0 ; i < song.countChannels() ; i ++ ){
+			TGChannel channelAux = song.getChannel(i);
+			if( channelAux.getChannel() == channel.getChannel() ){
+				channel.setChannelId(channelAux.getChannelId());
+			}
+		}
+		if( channel.getChannelId() <= 0 ){
+			channel.setChannelId( song.countChannels() + 1 );
+			channel.setName(("#" + channel.getChannelId()));
+			song.addChannel(channel);
+		}
+		track.setChannelId(channel.getChannelId());
+	}
+
+	private void readBeats(TGMeasure measure,TGBeatData data){
+		int header = BEAT_HAS_NEXT;
+		while(((header & BEAT_HAS_NEXT) != 0)){
+			header = readHeader();
+			readBeat(header, measure, data);
+		}
+	}
+
+	private void readBeat(int header, TGMeasure measure,TGBeatData data){
+		TGBeat beat = this.factory.newBeat();
+		TGVoice voice = beat.getVoice(0);
+
+		beat.setStart(data.getStart());
+		voice.setEmpty( false );
+
+		//leo la duracion
+		if(((header & BEAT_NEXT_DURATION) != 0)){
+			readDuration(data.getDuration());
+		}
+
+		//leo las notas
+		if(((header & BEAT_HAS_NOTES) != 0)){
+			readNotes(beat, data);
+		}
+
+		//leo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			readChord(beat);
+		}
+
+		//leo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			readText(beat);
+		}
+
+		data.getDuration().copy(voice.getDuration());
+
+		measure.addBeat(beat);
+
+		data.setStart(data.getStart() + data.getDuration().getTime());
+	}
+
+	private void readNotes(TGBeat beat,TGBeatData data){
+		int header = NOTE_HAS_NEXT;
+		while(((header & NOTE_HAS_NEXT) != 0)){
+			header = readHeader();
+			readNote(header, beat, data);
+		}
+	}
+
+	private void readNote(int header,TGBeat beat,TGBeatData data){
+		TGNote note = this.factory.newNote();
+		TGVoice voice = beat.getVoice(0);
+
+		//leo el valor
+		note.setValue(readByte());
+
+		//leo la cuerda
+		note.setString(readByte());
+
+		//leo la ligadura
+		note.setTiedNote((header & NOTE_TIED) != 0);
+
+		//leo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			data.setVelocity(readByte());
+		}
+		note.setVelocity(data.getVelocity());
+
+		//leo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			readNoteEffect(note.getEffect());
+		}
+
+		voice.addNote(note);
+	}
+
+	private void readChord(TGBeat beat){
+		TGChord chord = this.factory.newChord(readByte());
+
+		//leo el nombre
+		chord.setName( readUnsignedByteString() );
+
+		//leo el primer fret
+		chord.setFirstFret(readByte());
+
+		//leo las cuerdas
+		for(int string = 0; string < chord.countStrings(); string ++){
+			chord.addFretValue(string, readByte());
+		}
+		beat.setChord(chord);
+	}
+
+	private void readText(TGBeat beat){
+		TGText text = this.factory.newText();
+
+		//leo el texto
+		text.setValue(readUnsignedByteString());
+
+		beat.setText(text);
+	}
+
+	private TGString readInstrumentString(int number){
+		TGString string = this.factory.newString();
+
+		string.setNumber(number);
+
+		//leo el valor
+		string.setValue(readByte());
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readShort());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readByte());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		int header = readHeader();
+
+		// leo el puntillo
+		duration.setDotted((header & DURATION_DOTTED) != 0);
+
+		//leo el doble puntillo
+		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
+
+		//leo el valor
+		duration.setValue(readByte());
+
+		//leo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLE) != 0)){
+			readDivisionType(duration.getDivision());
+		}
+		else{
+			TGDivisionType.NORMAL.copy(duration.getDivision());
+		}
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readByte());
+
+		//leo los tiempos
+		divisionType.setTimes(readByte());
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		int header = readHeader(3);
+
+		//leo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			effect.setBend(readBendEffect());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			effect.setTremoloBar(readTremoloBarEffect());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			effect.setHarmonic(readHarmonicEffect());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			effect.setGrace(readGraceEffect());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			effect.setTrill(readTrillEffect());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			effect.setTremoloPicking(readTremoloPickingEffect());
+		}
+
+		//vibrato
+		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
+
+		//dead note
+		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
+
+		//slide
+		effect.setSlide(((header & EFFECT_SLIDE) != 0));
+
+		//hammer-on/pull-off
+		effect.setHammer(((header & EFFECT_HAMMER) != 0));
+
+		//ghost note
+		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
+
+		//accentuated note
+		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
+
+		//heavy accentuated note
+		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
+
+		//palm mute
+		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
+
+		//staccato
+		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
+
+		//tapping
+		effect.setTapping(((header & EFFECT_TAPPING) != 0));
+
+		//slapping
+		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
+
+		//popping
+		effect.setPopping(((header & EFFECT_POPPING) != 0));
+
+		//fade in
+		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value = readByte();
+
+			//agrego el punto
+			bend.addPoint(position,value);
+		}
+		return bend;
+	}
+
+	private TGEffectTremoloBar readTremoloBarEffect(){
+		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
+
+			//agrego el punto
+			tremoloBar.addPoint(position,value);
+		}
+		return tremoloBar;
+	}
+
+	private TGEffectHarmonic readHarmonicEffect(){
+		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
+
+		//leo el tipo
+		effect.setType(readByte());
+
+		//leo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			effect.setData(readByte());
+		}
+		return effect;
+	}
+
+	private TGEffectGrace readGraceEffect(){
+		int header = readHeader();
+
+		TGEffectGrace effect = this.factory.newEffectGrace();
+
+		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
+
+		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.setDuration(readByte());
+
+		//leo el velocity
+		effect.setDynamic(readByte());
+
+		//leo la transicion
+		effect.setTransition(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTremoloPicking readTremoloPickingEffect(){
+		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTrill readTrillEffect(){
+		TGEffectTrill effect = this.factory.newEffectTrill();
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGMarker readMarker(int measure){
+		TGMarker marker = this.factory.newMarker();
+
+		marker.setMeasure(measure);
+
+		//leo el titulo
+		marker.setTitle(readUnsignedByteString());
+
+		//leo el color
+		readRGBColor(marker.getColor());
+
+		return marker;
+	}
+
+	private void readRGBColor(TGColor color){
+		//leo el RGB
+		color.setR((readByte() & 0xff));
+		color.setG((readByte() & 0xff));
+		color.setB((readByte() & 0xff));
+	}
+
+	private void readLyrics(TGLyric lyrics){
+		//leo el compas de comienzo
+		lyrics.setFrom(readShort());
+
+		//leo el texto
+		lyrics.setLyrics(readIntegerString());
+	}
+
+	private byte readByte(){
+		try {
+			return (byte)this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(int bCount){
+		int header = 0;
+		for(int i = bCount; i > 0; i --){
+			header += ( readHeader() << ( (8 * i) - 8 ) );
+		}
+		return header;
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readUnsignedByteString(){
+		try {
+			return readString( (this.dataInputStream.read() & 0xFF ));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readIntegerString(){
+		try {
+			return readString(this.dataInputStream.readInt());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readString(int length){
+		try {
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java
new file mode 100644
index 00000000..1332da26
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGOutputStream.java
@@ -0,0 +1,805 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v10;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGLocalFileExporter;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend.BendPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar.TremoloBarPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGOutputStream extends TGStream implements TGLocalFileExporter{
+
+	private TGFactory factory;
+	private TGChannel channelAux;
+	private DataOutputStream dataOutputStream;
+
+	public boolean isSupportedExtension(String extension) {
+		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
+	}
+
+	@Override
+	public String getExportName(){
+		return "TuxGuitar 1.0";
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	@Override
+	public boolean configure(boolean setDefaults){
+		return true;
+	}
+
+	@Override
+	public void init(TGFactory factory,OutputStream stream){
+		this.factory = factory;
+		this.channelAux = null;
+		this.dataOutputStream = new DataOutputStream(stream);
+	}
+
+	@Override
+	public void exportSong(TGSong song) throws TGFileFormatException {
+		try{
+			this.writeVersion();
+			this.write(song);
+			this.dataOutputStream.flush();
+			this.dataOutputStream.close();
+		}catch( Throwable throwable){
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void writeVersion(){
+		writeUnsignedByteString(TG_FORMAT_VERSION);
+	}
+
+	private void write(TGSong song){
+		//escribo el nombre
+		writeUnsignedByteString(song.getName());
+
+		//escribo el artista
+		writeUnsignedByteString(song.getArtist());
+
+		//escribo el album
+		writeUnsignedByteString(song.getAlbum());
+
+		//escribo el autor
+		writeUnsignedByteString(song.getAuthor());
+
+		//escribo la cantidad de measure headers
+		writeShort((short)song.countMeasureHeaders());
+
+		//escribo las pistas
+		TGMeasureHeader lastHeader = null;
+		Iterator<TGMeasureHeader> headers = song.getMeasureHeaders();
+		while(headers.hasNext()){
+			TGMeasureHeader header = headers.next();
+			writeMeasureHeader(header,lastHeader);
+			lastHeader = header;
+		}
+
+		//escribo la cantidad de pistas
+		writeByte(song.countTracks());
+
+		//escribo las pistas
+		for(int i = 0;i < song.countTracks();i++){
+			TGTrack track = song.getTrack(i);
+			writeTrack(track);
+		}
+	}
+
+	private void writeTrack(TGTrack track){
+		//header
+		int header = 0;
+		if(!track.getLyrics().isEmpty()){
+			header |= TRACK_LYRICS;
+		}
+		writeHeader(header);
+
+		//escribo el nombre
+		writeUnsignedByteString(track.getName());
+
+		//escribo el canal
+		writeChannel(track);
+
+		//escribo los compases
+		TGMeasure lastMeasure = null;
+		Iterator<TGMeasure> measures  = track.getMeasures();
+		while(measures.hasNext()){
+			TGMeasure measure = measures.next();
+			writeMeasure(measure,lastMeasure);
+			lastMeasure = measure;
+		}
+
+		//escribo la cantidad de cuerdas
+		writeByte(track.getStrings().size());
+
+		//escribo las cuerdas
+		Iterator<TGString> stringIt  = track.getStrings().iterator();
+		while(stringIt.hasNext()){
+			TGString string = stringIt.next();
+			writeInstrumentString(string);
+		}
+
+		//escribo el offset
+		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
+
+		//escribo el color
+		writeRGBColor(track.getColor());
+
+		//escribo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			writeLyrics(track.getLyrics());
+		}
+	}
+
+	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
+		int header = 0;
+		if(lastMeasureHeader == null){
+			header |= MEASURE_HEADER_TIMESIGNATURE;
+			header |= MEASURE_HEADER_TEMPO;
+			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}else{
+			//Time Signature
+			int numerator = measureheader.getTimeSignature().getNumerator();
+			int value = measureheader.getTimeSignature().getDenominator().getValue();
+			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
+			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
+			if(numerator != prevNumerator || value != prevValue){
+				header |= MEASURE_HEADER_TIMESIGNATURE;
+			}
+			//Tempo
+			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
+				header |= MEASURE_HEADER_TEMPO;
+			}
+			//Triplet Feel
+			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}
+		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
+		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
+		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
+		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
+
+		writeHeader(header);
+
+		//escribo el timeSignature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			writeTimeSignature(measureheader.getTimeSignature());
+		}
+
+		//escribo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			writeTempo(measureheader.getTempo());
+		}
+
+		//escribo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			writeShort((short)measureheader.getRepeatClose());
+		}
+
+		//escribo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			writeByte(measureheader.getRepeatAlternative());
+		}
+
+		//escribo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			writeMarker(measureheader.getMarker());
+		}
+
+		//escribo el triplet feel
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			writeByte(measureheader.getTripletFeel());
+		}
+	}
+
+	private void writeMeasure(TGMeasure srcMeasure,TGMeasure lastMeasure){
+		TGMeasure measure = new TGVoiceJoiner(new TGFactory(),srcMeasure).process();
+
+		int header = 0;
+		if(lastMeasure == null){
+			header |= MEASURE_CLEF;
+			header |= MEASURE_KEYSIGNATURE;
+		}else{
+			//Clef
+			if(measure.getClef() != lastMeasure.getClef()){
+				header |= MEASURE_CLEF;
+			}
+			//KeySignature
+			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
+				header |= MEASURE_KEYSIGNATURE;
+			}
+		}
+		//escribo la cabecera
+		writeHeader(header);
+
+		//escribo los beats
+		TGBeatData data = new TGBeatData(measure);
+		writeBeats(measure, data);
+
+		//escribo la clave
+		if(((header & MEASURE_CLEF) != 0)){
+			writeByte(measure.getClef());
+		}
+
+		//escribo el key signature
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			writeByte(measure.getKeySignature());
+		}
+	}
+
+	private void writeChannel(TGTrack track){
+		int header = 0;
+		header = (track.isSolo())?header |= CHANNEL_SOLO:header;
+		header = (track.isMute())?header |= CHANNEL_MUTE:header;
+		writeHeader(header);
+
+		TGChannel channel = getChannel(track.getSong(), track);
+
+		//escribo el canal
+		writeByte(channel.getChannel());
+
+		//escribo el canal de efectos
+		writeByte(channel.getEffectChannel());
+
+		//escribo el instrumento
+		writeByte(channel.getProgram());
+
+		//escribo el volumen
+		writeByte(channel.getVolume());
+
+		//escribo el balance
+		writeByte(channel.getBalance());
+
+		//escribo el chorus
+		writeByte(channel.getChorus());
+
+		//escribo el reverb
+		writeByte(channel.getReverb());
+
+		//escribo el phaser
+		writeByte(channel.getPhaser());
+
+		//escribo el tremolo
+		writeByte(channel.getTremolo());
+	}
+
+	private void writeBeats(TGMeasure measure,TGBeatData data){
+		int count = measure.countBeats();
+		for(int i = 0; i < count; i ++){
+			TGBeat beat = measure.getBeat(i);
+			writeBeat(beat,data, (i + 1 < count ));
+		}
+	}
+
+	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
+		TGVoice voice = beat.getVoice( 0 );
+
+		int header = hasNext ? BEAT_HAS_NEXT : 0;
+
+		//Berifico si hay cambio de duracion
+		if(!voice.getDuration().isEqual(data.getDuration())){
+			header |= BEAT_NEXT_DURATION;
+			data.setDuration(voice.getDuration());
+		}
+
+		//Berifico si tiene notas
+		if(!beat.isRestBeat()){
+			header |= BEAT_HAS_NOTES;
+		}
+
+		//Berifico si tiene acorde
+		if(beat.getChord() != null){
+			header |= BEAT_HAS_CHORD;
+		}
+
+		//Berifico si tiene texto
+		if(beat.getText() != null){
+			header |= BEAT_HAS_TEXT;
+		}
+
+		// escribo la cabecera
+		writeHeader(header);
+
+		//escribo la duracion
+		if(((header & BEAT_NEXT_DURATION) != 0)){
+			writeDuration(voice.getDuration());
+		}
+
+		//escribo las notas
+		if(((header & BEAT_HAS_NOTES) != 0)){
+			writeNotes(voice, data);
+		}
+
+		//escribo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			writeChord(beat.getChord());
+		}
+
+		//escribo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			writeText(beat.getText());
+		}
+	}
+
+	private void writeNotes(TGVoice voice,TGBeatData data){
+		for( int i = 0 ; i < voice.countNotes() ; i ++){
+			TGNote note = voice.getNote(i);
+
+			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
+			header = (note.isTiedNote())?header |= NOTE_TIED:header;
+			if(note.getVelocity() != data.getVelocity()){
+				data.setVelocity(note.getVelocity());
+				header |= NOTE_VELOCITY;
+			}
+			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
+
+			writeHeader(header);
+
+			writeNote(header,note);
+		}
+	}
+
+	private void writeNote(int header,TGNote note){
+		//escribo el valor
+		writeByte(note.getValue());
+
+		//escribo la cuerda
+		writeByte(note.getString());
+
+		//escribo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			writeByte(note.getVelocity());
+		}
+
+		//escribo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			writeNoteEffect(note.getEffect());
+		}
+	}
+
+	private void writeChord(TGChord chord){
+		//escribo la cantidad de cuerdas
+		writeByte(chord.countStrings());
+
+		//escribo el nombre
+		writeUnsignedByteString(chord.getName());
+
+		//escribo el primer fret
+		writeByte(chord.getFirstFret());
+
+		//escribo el valor de cada cuerda
+		for(int string = 0; string < chord.countStrings(); string ++){
+			writeByte(chord.getFretValue(string));
+		}
+	}
+
+	private void writeText(TGText text){
+		//escribo el texto
+		writeUnsignedByteString(text.getValue());
+	}
+
+	private void writeInstrumentString(TGString string){
+		//escribo el valor
+		writeByte(string.getValue());
+	}
+
+	private void writeTempo(TGTempo tempo){
+		//escribo el valor
+		writeShort((short)tempo.getValue());
+	}
+
+	private void writeTimeSignature(TGTimeSignature timeSignature){
+		//escribo el numerador
+		writeByte(timeSignature.getNumerator());
+
+		//escribo el denominador
+		writeDuration(timeSignature.getDenominator());
+	}
+
+	private void writeDuration(TGDuration duration){
+		int header = 0;
+		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
+		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
+		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLE:header;
+		writeHeader(header);
+
+		//escribo el valor
+		writeByte(duration.getValue());
+
+		//escribo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLE) != 0)){
+			writeDivisionType(duration.getDivision());
+		}
+	}
+
+	private void writeDivisionType(TGDivisionType divisionType){
+		//escribo los enters
+		writeByte(divisionType.getEnters());
+
+		//escribo los tiempos
+		writeByte(divisionType.getTimes());
+	}
+
+	private void writeNoteEffect(TGNoteEffect effect){
+		int header = 0;
+
+		header = (effect.isBend())?header |= EFFECT_BEND:header;
+		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
+		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
+		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
+		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
+		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
+		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
+		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
+		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
+		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
+		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
+		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
+		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
+		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
+		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
+		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
+		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
+		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
+		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
+
+		writeHeader(header,3);
+
+		//escribo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			writeBendEffect(effect.getBend());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			writeTremoloBarEffect(effect.getTremoloBar());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			writeHarmonicEffect(effect.getHarmonic());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			writeGraceEffect(effect.getGrace());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			writeTrillEffect(effect.getTrill());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			writeTremoloPickingEffect(effect.getTremoloPicking());
+		}
+	}
+
+	private void writeBendEffect(TGEffectBend effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<BendPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectBend.BendPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte(point.getValue());
+		}
+	}
+
+	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<TremoloBarPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectTremoloBar.TremoloBarPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
+		}
+	}
+
+	private void writeHarmonicEffect(TGEffectHarmonic effect){
+		//excribo el tipo
+		writeByte(effect.getType());
+
+		//excribo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			writeByte(effect.getData());
+		}
+	}
+
+	private void writeGraceEffect(TGEffectGrace effect){
+		int header = 0;
+		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
+		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
+
+		//excribo el header
+		writeHeader(header);
+
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration());
+
+		//excribo el velocity
+		writeByte(effect.getDynamic());
+
+		//excribo la transicion
+		writeByte(effect.getTransition());
+	}
+
+	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeTrillEffect(TGEffectTrill effect){
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeMarker(TGMarker marker){
+		//escribo el titulo
+		writeUnsignedByteString(marker.getTitle());
+
+		//escribo el color
+		writeRGBColor(marker.getColor());
+	}
+
+	private void writeRGBColor(TGColor color){
+		//escribo el RGB
+		writeByte(color.getR());
+		writeByte(color.getG());
+		writeByte(color.getB());
+	}
+
+	private void writeLyrics(TGLyric lyrics){
+		//escribo el compas de comienzo
+		writeShort((short)lyrics.getFrom());
+
+		//escribo el texto
+		writeIntegerString(lyrics.getLyrics());
+	}
+
+	public void writeByte(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeUnsignedByteString(String v){
+		try {
+			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
+			this.dataOutputStream.write(byteString.length());
+			this.dataOutputStream.writeChars(byteString);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeIntegerString(String v){
+		try {
+			this.dataOutputStream.writeInt(v.length());
+			this.dataOutputStream.writeChars(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v,int bCount){
+		for(int i = bCount; i > 0; i --){
+			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
+		}
+	}
+
+	public void writeShort(short v){
+		try {
+			this.dataOutputStream.writeShort(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private TGChannel getChannel( TGSong song, TGTrack track ){
+		TGSongManager tgSongManager = new TGSongManager(this.factory);
+		tgSongManager.setSong( song );
+
+		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
+		if( tgChannel != null ){
+			return tgChannel;
+		}
+		if( this.channelAux == null ){
+			this.channelAux = tgSongManager.createChannel();
+			if( this.channelAux.getChannel() < 0 && song.countChannels() > 0 ){
+				this.channelAux = (song.getChannel(song.countChannels() - 1));
+			}
+		}
+		return this.channelAux;
+	}
+
+	public class TGVoiceJoiner {
+		private final TGFactory factory;
+		private final TGMeasure measure;
+
+		public TGVoiceJoiner(TGFactory factory,TGMeasure measure){
+			this.factory = factory;
+			this.measure = measure.clone(factory, measure.getHeader());
+			this.measure.setTrack( measure.getTrack() );
+		}
+
+		public TGMeasure process(){
+			this.orderBeats();
+			this.joinBeats();
+			return this.measure;
+		}
+
+		public void joinBeats(){
+			TGBeat previous = null;
+			boolean finish = true;
+
+			long measureStart = this.measure.getStart();
+			long measureEnd = (measureStart + this.measure.getLength());
+			for(int i = 0;i < this.measure.countBeats();i++){
+				TGBeat beat = this.measure.getBeat( i );
+				TGVoice voice = beat.getVoice(0);
+				for(int v = 1; v < beat.countVoices(); v++ ){
+					TGVoice currentVoice = beat.getVoice(v);
+					if(!currentVoice.isEmpty()){
+						for(int n = 0 ; n < currentVoice.countNotes() ; n++ ){
+							TGNote note = currentVoice.getNote( n );
+							voice.addNote( note );
+						}
+					}
+				}
+				if( voice.isEmpty() ){
+					this.measure.removeBeat(beat);
+					finish = false;
+					break;
+				}
+
+				long beatStart = beat.getStart();
+				if(previous != null){
+					long previousStart = previous.getStart();
+
+					TGDuration previousBestDuration = null;
+					for(int v = /*1*/0; v < previous.countVoices(); v++ ){
+						TGVoice previousVoice = previous.getVoice(v);
+						if(!previousVoice.isEmpty()){
+							long length = previousVoice.getDuration().getTime();
+							if( (previousStart + length) <= beatStart){
+								if( previousBestDuration == null || length > previousBestDuration.getTime() ){
+									previousBestDuration = previousVoice.getDuration();
+								}
+							}
+						}
+					}
+
+					if(previousBestDuration != null){
+						previousBestDuration.copy( previous.getVoice(0).getDuration() );
+					}else{
+						if(voice.isRestVoice()){
+							this.measure.removeBeat(beat);
+							finish = false;
+							break;
+						}
+						TGDuration duration = TGDuration.fromTime(this.factory, (beatStart - previousStart) );
+						duration.copy( previous.getVoice(0).getDuration() );
+					}
+				}
+
+				TGDuration beatBestDuration = null;
+				for(int v = /*1*/0; v < beat.countVoices(); v++ ){
+					TGVoice currentVoice = beat.getVoice(v);
+					if(!currentVoice.isEmpty()){
+						long length = currentVoice.getDuration().getTime();
+						if( (beatStart + length) <= measureEnd ){
+							if( beatBestDuration == null || length > beatBestDuration.getTime() ){
+								beatBestDuration = currentVoice.getDuration();
+							}
+						}
+					}
+				}
+
+				if(beatBestDuration == null){
+					if(voice.isRestVoice()){
+						this.measure.removeBeat(beat);
+						finish = false;
+						break;
+					}
+					TGDuration duration = TGDuration.fromTime(this.factory, (measureEnd - beatStart) );
+					duration.copy( voice.getDuration() );
+				}
+				previous = beat;
+			}
+			if(!finish){
+				joinBeats();
+			}
+		}
+
+		public void orderBeats(){
+			for(int i = 0;i < this.measure.countBeats();i++){
+				TGBeat minBeat = null;
+				for(int j = i;j < this.measure.countBeats();j++){
+					TGBeat beat = this.measure.getBeat(j);
+					if(minBeat == null || beat.getStart() < minBeat.getStart()){
+						minBeat = beat;
+					}
+				}
+				this.measure.moveBeat(i, minBeat);
+			}
+		}
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGStream.java
new file mode 100644
index 00000000..fd9c4354
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v10/TGStream.java
@@ -0,0 +1,146 @@
+package org.herac.tuxguitar.io.tg.v10;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGVelocities;
+import org.herac.tuxguitar.util.TGVersion;
+
+public class TGStream {
+
+	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
+
+	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + new TGVersion(1,0,0).getVersion() );
+
+	public static final String TG_FORMAT_EXTENSION = (".tg");
+
+	protected static final int TRACK_LYRICS = 0x01;
+
+	protected static final int CHANNEL_SOLO = 0x01;
+
+	protected static final int CHANNEL_MUTE = 0x02;
+
+	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
+
+	protected static final int MEASURE_HEADER_TEMPO = 0x02;
+
+	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
+
+	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
+
+	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
+
+	protected static final int MEASURE_HEADER_MARKER = 0x20;
+
+	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
+
+	protected static final int MEASURE_CLEF = 0x01;
+
+	protected static final int MEASURE_KEYSIGNATURE = 0x02;
+
+	protected static final int BEAT_HAS_NEXT = 0x01;
+
+	protected static final int BEAT_NEXT_DURATION = 0x02;
+
+	protected static final int BEAT_HAS_NOTES = 0x04;
+
+	protected static final int BEAT_HAS_CHORD = 0x08;
+
+	protected static final int BEAT_HAS_TEXT = 0x10;
+
+	protected static final int NOTE_HAS_NEXT = 0x01;
+
+	protected static final int NOTE_TIED = 0x02;
+
+	protected static final int NOTE_EFFECT = 0x04;
+
+	protected static final int NOTE_VELOCITY = 0x08;
+
+	protected static final int DURATION_DOTTED = 0x01;
+
+	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
+
+	protected static final int DURATION_NO_TUPLE = 0x04;
+
+	protected static final int EFFECT_BEND = 0x01;
+
+	protected static final int EFFECT_TREMOLO_BAR = 0x02;
+
+	protected static final int EFFECT_HARMONIC = 0x04;
+
+	protected static final int EFFECT_GRACE = 0x08;
+
+	protected static final int EFFECT_TRILL = 0x010;
+
+	protected static final int EFFECT_TREMOLO_PICKING = 0x020;
+
+	protected static final int EFFECT_VIBRATO = 0x040;
+
+	protected static final int EFFECT_DEAD = 0x080;
+
+	protected static final int EFFECT_SLIDE = 0x0100;
+
+	protected static final int EFFECT_HAMMER = 0x0200;
+
+	protected static final int EFFECT_GHOST = 0x0400;
+
+	protected static final int EFFECT_ACCENTUATED = 0x0800;
+
+	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x01000;
+
+	protected static final int EFFECT_PALM_MUTE = 0x02000;
+
+	protected static final int EFFECT_STACCATO = 0x04000;
+
+	protected static final int EFFECT_TAPPING = 0x08000;
+
+	protected static final int EFFECT_SLAPPING = 0x010000;
+
+	protected static final int EFFECT_POPPING = 0x020000;
+
+	protected static final int EFFECT_FADE_IN = 0x040000;
+
+	protected static final int GRACE_FLAG_DEAD = 0x01;
+
+	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
+
+	protected class TGBeatData {
+		private long start;
+		private int velocity;
+		private TGDuration duration;
+
+		protected TGBeatData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.setStart(measure.getStart());
+			this.setVelocity(TGVelocities.DEFAULT);
+			this.setDuration(new TGFactory().newDuration());
+		}
+
+		public TGDuration getDuration() {
+			return this.duration;
+		}
+
+		public void setDuration(TGDuration duration) {
+			this.duration = duration;
+		}
+
+		public long getStart() {
+			return this.start;
+		}
+
+		public void setStart(long start) {
+			this.start = start;
+		}
+
+		public int getVelocity() {
+			return this.velocity;
+		}
+
+		public void setVelocity(int velocity) {
+			this.velocity = velocity;
+		}
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGInputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGInputStream.java
new file mode 100644
index 00000000..dfaa6d8c
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGInputStream.java
@@ -0,0 +1,768 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v11;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGInputStream extends TGStream implements TGInputStreamBase{
+
+	private DataInputStream dataInputStream;
+	private String version;
+	private TGFactory factory;
+
+	public TGInputStream() {
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_FORMAT_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Throwable throwable){
+			return false;
+		}
+	}
+
+	@Override
+	public TGSong readSong() throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		} catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readUnsignedByteString();
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readUnsignedByteString());
+
+		//leo el artista
+		song.setArtist(readUnsignedByteString());
+
+		//leo el album
+		song.setAlbum(readUnsignedByteString());
+
+		//leo el autor
+		song.setAuthor(readUnsignedByteString());
+
+		//leo la cantidad de measure headers
+		int headerCount = readShort();
+
+		//leo las pistas
+		TGMeasureHeader lastHeader = null;
+		long headerStart = TGDuration.QUARTER_TIME;
+		for(int i = 0;i < headerCount;i++){
+			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
+			song.addMeasureHeader(header);
+			headerStart += header.getLength();
+			lastHeader = header;
+		}
+
+		//leo la cantidad de pistas
+		int trackCount = readByte();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(i + 1,song));
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(int number,TGSong song){
+		//header
+		int header = readHeader();
+
+		TGTrack track = this.factory.newTrack();
+
+		track.setNumber(number);
+
+		//leo el nombre
+		track.setName(readUnsignedByteString());
+
+		//leo el solo
+		track.setSolo((header & TRACK_SOLO) != 0);
+
+		//leo el mute
+		track.setMute((header & TRACK_MUTE) != 0);
+
+		//leo el canal
+		readChannel(song, track);
+
+		//leo la cantidad de compases
+		int measureCount = song.countMeasureHeaders();
+
+		//leo los compases
+		TGMeasure lastMeasure = null;
+		for(int i = 0;i < measureCount;i++){
+			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
+			track.addMeasure(measure);
+			lastMeasure = measure;
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readByte();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString(i + 1));
+		}
+
+		//leo el offset
+		track.setOffset(TGTrack.MIN_OFFSET + readByte());
+
+		//leo el color
+		readRGBColor(track.getColor());
+
+		//leo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			readLyrics(track.getLyrics());
+		}
+
+		return track;
+	}
+
+	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
+		int header = readHeader();
+
+		TGMeasureHeader measureHeader = this.factory.newHeader();
+		measureHeader.setNumber(number);
+		measureHeader.setStart(start);
+
+		//leo el time signature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			readTimeSignature(measureHeader.getTimeSignature());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
+		}
+
+		//leo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			readTempo(measureHeader.getTempo());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
+		}
+
+		//leo el comienzo de la repeticion
+		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
+
+		//leo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			 measureHeader.setRepeatClose(readShort());
+		}
+
+		//leo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			 measureHeader.setRepeatAlternative(readByte());
+		}
+
+		//leo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			measureHeader.setMarker(readMarker(number));
+		}
+
+		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			measureHeader.setTripletFeel(readByte());
+		}
+
+		return measureHeader;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
+		int header = readHeader();
+
+		TGMeasure measure = this.factory.newMeasure(measureHeader);
+		TGBeatData data = new TGBeatData(measure);
+
+		//leo la los beats
+		readBeats(measure, data);
+
+		//leo la clave
+		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
+		if(((header & MEASURE_CLEF) != 0)){
+			measure.setClef(readByte());
+		}
+
+		//leo el key signature
+		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			measure.setKeySignature(readByte());
+		}
+
+		return measure;
+	}
+
+	private void readChannel(TGSong song, TGTrack track){
+		TGChannel channel = this.factory.newChannel();
+
+		//leo el canal
+		channel.setChannel(readByte());
+
+		//leo el canal de efectos
+		channel.setEffectChannel(readByte());
+
+		//leo el instrumento
+		channel.setProgram(readByte());
+
+		//leo el volumen
+		channel.setVolume(readByte());
+
+		//leo el balance
+		channel.setBalance(readByte());
+
+		//leo el chorus
+		channel.setChorus(readByte());
+
+		//leo el reverb
+		channel.setReverb(readByte());
+
+		//leo el phaser
+		channel.setPhaser(readByte());
+
+		//leo el tremolo
+		channel.setTremolo(readByte());
+
+		//------------------------------------------//
+		for( int i = 0 ; i < song.countChannels() ; i ++ ){
+			TGChannel channelAux = song.getChannel(i);
+			if( channelAux.getChannel() == channel.getChannel() ){
+				channel.setChannelId(channelAux.getChannelId());
+			}
+		}
+		if( channel.getChannelId() <= 0 ){
+			channel.setChannelId( song.countChannels() + 1 );
+			channel.setName(("#" + channel.getChannelId()));
+			song.addChannel(channel);
+		}
+		track.setChannelId(channel.getChannelId());
+	}
+
+	private void readBeats(TGMeasure measure,TGBeatData data){
+		int header = BEAT_HAS_NEXT;
+		while(((header & BEAT_HAS_NEXT) != 0)){
+			header = readHeader();
+			readBeat(header, measure, data);
+		}
+	}
+
+	private void readBeat(int header, TGMeasure measure,TGBeatData data){
+		TGBeat beat = this.factory.newBeat();
+
+		beat.setStart(data.getCurrentStart());
+
+		readVoices(header, beat, data);
+
+		//leo el stroke
+		if(((header & BEAT_HAS_STROKE) != 0)){
+			readStroke(beat.getStroke());
+		}
+
+		//leo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			readChord(beat);
+		}
+
+		//leo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			readText(beat);
+		}
+
+		measure.addBeat(beat);
+	}
+
+	private void readVoices(int header, TGBeat beat, TGBeatData data){
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+
+			beat.getVoice(i).setEmpty(true);
+
+			if(((header & (BEAT_HAS_VOICE << shift)) != 0)){
+				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
+					data.getVoice(i).setFlags( readHeader() );
+				}
+
+				int flags = data.getVoice(i).getFlags();
+
+				//leo la duracion
+				if(((flags & VOICE_NEXT_DURATION) != 0)){
+					readDuration(data.getVoice(i).getDuration());
+				}
+
+				//leo las notas
+				if(((flags & VOICE_HAS_NOTES) != 0)){
+					readNotes(beat.getVoice(i), data);
+				}
+
+				//leo la direccion
+				if(((flags & VOICE_DIRECTION_UP) != 0)){
+					beat.getVoice(i).setDirection( TGVoice.DIRECTION_UP );
+				}
+				else if(((flags & VOICE_DIRECTION_DOWN) != 0)){
+					beat.getVoice(i).setDirection( TGVoice.DIRECTION_DOWN );
+				}
+				data.getVoice(i).getDuration().copy(beat.getVoice(i).getDuration());
+				data.getVoice(i).setStart(data.getVoice(i).getStart() + beat.getVoice(i).getDuration().getTime());
+
+				beat.getVoice(i).setEmpty(false);
+			}
+		}
+	}
+
+	private void readNotes(TGVoice voice,TGBeatData data){
+		int header = NOTE_HAS_NEXT;
+		while(((header & NOTE_HAS_NEXT) != 0)){
+			header = readHeader();
+			readNote(header, voice, data);
+		}
+	}
+
+	private void readNote(int header,TGVoice voice,TGBeatData data){
+		TGNote note = this.factory.newNote();
+
+		//leo el valor
+		note.setValue(readByte());
+
+		//leo la cuerda
+		note.setString(readByte());
+
+		//leo la ligadura
+		note.setTiedNote((header & NOTE_TIED) != 0);
+
+		//leo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			data.getVoice(voice.getIndex()).setVelocity(readByte());
+		}
+		note.setVelocity(data.getVoice(voice.getIndex()).getVelocity());
+
+		//leo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			readNoteEffect(note.getEffect());
+		}
+
+		voice.addNote(note);
+	}
+
+	private void readChord(TGBeat beat){
+		TGChord chord = this.factory.newChord(readByte());
+
+		//leo el nombre
+		chord.setName( readUnsignedByteString() );
+
+		//leo el primer fret
+		chord.setFirstFret(readByte());
+
+		//leo las cuerdas
+		for(int string = 0; string < chord.countStrings(); string ++){
+			chord.addFretValue(string, readByte());
+		}
+		beat.setChord(chord);
+	}
+
+	private void readText(TGBeat beat){
+		TGText text = this.factory.newText();
+
+		//leo el texto
+		text.setValue(readUnsignedByteString());
+
+		beat.setText(text);
+	}
+
+	private TGString readInstrumentString(int number){
+		TGString string = this.factory.newString();
+
+		string.setNumber(number);
+
+		//leo el valor
+		string.setValue(readByte());
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readShort());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readByte());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		int header = readHeader();
+
+		// leo el puntillo
+		duration.setDotted((header & DURATION_DOTTED) != 0);
+
+		//leo el doble puntillo
+		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
+
+		//leo el valor
+		duration.setValue(readByte());
+
+		//leo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			readDivisionType(duration.getDivision());
+		}
+		else{
+			TGDivisionType.NORMAL.copy(duration.getDivision());
+		}
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readByte());
+
+		//leo los tiempos
+		divisionType.setTimes(readByte());
+	}
+
+	private void readStroke(TGStroke stroke){
+		//leo la direccion
+		stroke.setDirection( readByte() );
+
+		//leo el valor
+		stroke.setValue( readByte() );
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		int header = readHeader(3);
+
+		//leo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			effect.setBend(readBendEffect());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			effect.setTremoloBar(readTremoloBarEffect());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			effect.setHarmonic(readHarmonicEffect());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			effect.setGrace(readGraceEffect());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			effect.setTrill(readTrillEffect());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			effect.setTremoloPicking(readTremoloPickingEffect());
+		}
+
+		//vibrato
+		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
+
+		//dead note
+		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
+
+		//slide
+		effect.setSlide(((header & EFFECT_SLIDE) != 0));
+
+		//hammer-on/pull-off
+		effect.setHammer(((header & EFFECT_HAMMER) != 0));
+
+		//ghost note
+		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
+
+		//accentuated note
+		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
+
+		//heavy accentuated note
+		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
+
+		//palm mute
+		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
+
+		//staccato
+		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
+
+		//tapping
+		effect.setTapping(((header & EFFECT_TAPPING) != 0));
+
+		//slapping
+		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
+
+		//popping
+		effect.setPopping(((header & EFFECT_POPPING) != 0));
+
+		//fade in
+		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value = readByte();
+
+			//agrego el punto
+			bend.addPoint(position,value);
+		}
+		return bend;
+	}
+
+	private TGEffectTremoloBar readTremoloBarEffect(){
+		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
+
+			//agrego el punto
+			tremoloBar.addPoint(position,value);
+		}
+		return tremoloBar;
+	}
+
+	private TGEffectHarmonic readHarmonicEffect(){
+		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
+
+		//leo el tipo
+		effect.setType(readByte());
+
+		//leo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			effect.setData(readByte());
+		}
+		return effect;
+	}
+
+	private TGEffectGrace readGraceEffect(){
+		int header = readHeader();
+
+		TGEffectGrace effect = this.factory.newEffectGrace();
+
+		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
+
+		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.setDuration(readByte());
+
+		//leo el velocity
+		effect.setDynamic(readByte());
+
+		//leo la transicion
+		effect.setTransition(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTremoloPicking readTremoloPickingEffect(){
+		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTrill readTrillEffect(){
+		TGEffectTrill effect = this.factory.newEffectTrill();
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGMarker readMarker(int measure){
+		TGMarker marker = this.factory.newMarker();
+
+		marker.setMeasure(measure);
+
+		//leo el titulo
+		marker.setTitle(readUnsignedByteString());
+
+		//leo el color
+		readRGBColor(marker.getColor());
+
+		return marker;
+	}
+
+	private void readRGBColor(TGColor color){
+		//leo el RGB
+		color.setR((readByte() & 0xff));
+		color.setG((readByte() & 0xff));
+		color.setB((readByte() & 0xff));
+	}
+
+	private void readLyrics(TGLyric lyrics){
+		//leo el compas de comienzo
+		lyrics.setFrom(readShort());
+
+		//leo el texto
+		lyrics.setLyrics(readIntegerString());
+	}
+
+	private byte readByte(){
+		try {
+			return (byte)this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(int bCount){
+		int header = 0;
+		for(int i = bCount; i > 0; i --){
+			header += ( readHeader() << ( (8 * i) - 8 ) );
+		}
+		return header;
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readUnsignedByteString(){
+		try {
+			return readString( (this.dataInputStream.read() & 0xFF ));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readIntegerString(){
+		try {
+			return readString(this.dataInputStream.readInt());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readString(int length){
+		try {
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java
new file mode 100644
index 00000000..9eb8ede2
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGOutputStream.java
@@ -0,0 +1,734 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v11;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGLocalFileExporter;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend.BendPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar.TremoloBarPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGOutputStream extends TGStream implements TGLocalFileExporter{
+
+	private TGFactory factory;
+	private TGChannel channelAux;
+	private DataOutputStream dataOutputStream;
+
+	public boolean isSupportedExtension(String extension) {
+		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
+	}
+
+	@Override
+	public String getExportName(){
+		return "TuxGuitar 1.1";
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	@Override
+	public boolean configure(boolean setDefaults){
+		return true;
+	}
+
+	@Override
+	public void init(TGFactory factory,OutputStream stream){
+		this.factory = factory;
+		this.channelAux = null;
+		this.dataOutputStream = new DataOutputStream(stream);
+	}
+
+	@Override
+	public void exportSong(TGSong song) throws TGFileFormatException {
+		try{
+			this.writeVersion();
+			this.write(song);
+			this.dataOutputStream.flush();
+			this.dataOutputStream.close();
+		}catch( Throwable throwable){
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void writeVersion(){
+		writeUnsignedByteString(TG_FORMAT_VERSION);
+	}
+
+	private void write(TGSong song){
+		//escribo el nombre
+		writeUnsignedByteString(song.getName());
+
+		//escribo el artista
+		writeUnsignedByteString(song.getArtist());
+
+		//escribo el album
+		writeUnsignedByteString(song.getAlbum());
+
+		//escribo el autor
+		writeUnsignedByteString(song.getAuthor());
+
+		//escribo la cantidad de measure headers
+		writeShort((short)song.countMeasureHeaders());
+
+		//escribo las pistas
+		TGMeasureHeader lastHeader = null;
+		Iterator<TGMeasureHeader> headers = song.getMeasureHeaders();
+		while(headers.hasNext()){
+			TGMeasureHeader header = headers.next();
+			writeMeasureHeader(header,lastHeader);
+			lastHeader = header;
+		}
+
+		//escribo la cantidad de pistas
+		writeByte(song.countTracks());
+
+		//escribo las pistas
+		for(int i = 0;i < song.countTracks();i++){
+			TGTrack track = song.getTrack(i);
+			writeTrack(track);
+		}
+	}
+
+	private void writeTrack(TGTrack track){
+		//header
+		int header = 0;
+		if (track.isSolo()) {
+			header |= TRACK_SOLO;
+		}
+		if (track.isMute()) {
+			header |= TRACK_MUTE;
+		}
+		if(!track.getLyrics().isEmpty()){
+			header |= TRACK_LYRICS;
+		}
+		writeHeader(header);
+
+		//escribo el nombre
+		writeUnsignedByteString(track.getName());
+
+		//escribo el canal
+		writeChannel(getChannel(track.getSong(), track));
+
+		//escribo los compases
+		TGMeasure lastMeasure = null;
+		Iterator<TGMeasure> measures  = track.getMeasures();
+		while(measures.hasNext()){
+			TGMeasure measure = measures.next();
+			writeMeasure(measure,lastMeasure);
+			lastMeasure = measure;
+		}
+
+		//escribo la cantidad de cuerdas
+		writeByte(track.getStrings().size());
+
+		//escribo las cuerdas
+		Iterator<TGString> stringIt  = track.getStrings().iterator();
+		while(stringIt.hasNext()){
+			TGString string = stringIt.next();
+			writeInstrumentString(string);
+		}
+
+		//escribo el offset
+		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
+
+		//escribo el color
+		writeRGBColor(track.getColor());
+
+		//escribo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			writeLyrics(track.getLyrics());
+		}
+	}
+
+	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
+		int header = 0;
+		if(lastMeasureHeader == null){
+			header |= MEASURE_HEADER_TIMESIGNATURE;
+			header |= MEASURE_HEADER_TEMPO;
+			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}else{
+			//Time Signature
+			int numerator = measureheader.getTimeSignature().getNumerator();
+			int value = measureheader.getTimeSignature().getDenominator().getValue();
+			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
+			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
+			if(numerator != prevNumerator || value != prevValue){
+				header |= MEASURE_HEADER_TIMESIGNATURE;
+			}
+			//Tempo
+			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
+				header |= MEASURE_HEADER_TEMPO;
+			}
+			//Triplet Feel
+			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}
+		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
+		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
+		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
+		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
+
+		writeHeader(header);
+
+		//escribo el timeSignature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			writeTimeSignature(measureheader.getTimeSignature());
+		}
+
+		//escribo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			writeTempo(measureheader.getTempo());
+		}
+
+		//escribo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			writeShort((short)measureheader.getRepeatClose());
+		}
+
+		//escribo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			writeByte(measureheader.getRepeatAlternative());
+		}
+
+		//escribo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			writeMarker(measureheader.getMarker());
+		}
+
+		//escribo el triplet feel
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			writeByte(measureheader.getTripletFeel());
+		}
+	}
+
+	private void writeMeasure(TGMeasure measure,TGMeasure lastMeasure){
+		int header = 0;
+		if(lastMeasure == null){
+			header |= MEASURE_CLEF;
+			header |= MEASURE_KEYSIGNATURE;
+		}else{
+			//Clef
+			if(measure.getClef() != lastMeasure.getClef()){
+				header |= MEASURE_CLEF;
+			}
+			//KeySignature
+			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
+				header |= MEASURE_KEYSIGNATURE;
+			}
+		}
+		//escribo la cabecera
+		writeHeader(header);
+
+		//escribo los beats
+		TGBeatData data = new TGBeatData(measure);
+		writeBeats(measure, data);
+
+		//escribo la clave
+		if(((header & MEASURE_CLEF) != 0)){
+			writeByte(measure.getClef());
+		}
+
+		//escribo el key signature
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			writeByte(measure.getKeySignature());
+		}
+	}
+
+	private void writeChannel(TGChannel channel){
+		//escribo el canal
+		writeByte(channel.getChannel());
+
+		//escribo el canal de efectos
+		writeByte(channel.getEffectChannel());
+
+		//escribo el instrumento
+		writeByte(channel.getProgram());
+
+		//escribo el volumen
+		writeByte(channel.getVolume());
+
+		//escribo el balance
+		writeByte(channel.getBalance());
+
+		//escribo el chorus
+		writeByte(channel.getChorus());
+
+		//escribo el reverb
+		writeByte(channel.getReverb());
+
+		//escribo el phaser
+		writeByte(channel.getPhaser());
+
+		//escribo el tremolo
+		writeByte(channel.getTremolo());
+	}
+
+	private void writeBeats(TGMeasure measure,TGBeatData data){
+		int count = measure.countBeats();
+		for(int i = 0; i < count; i ++){
+			TGBeat beat = measure.getBeat(i);
+			writeBeat(beat,data, (i + 1 < count ));
+		}
+	}
+
+	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
+		int header = hasNext ? BEAT_HAS_NEXT : 0;
+
+		//Berifico si hay cambios en las voces
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+			if(!beat.getVoice(i).isEmpty()){
+				header |= ( BEAT_HAS_VOICE << shift );
+
+				int flags = ( beat.getVoice(i).isRestVoice() ? 0 : VOICE_HAS_NOTES );
+				if(!beat.getVoice(i).getDuration().isEqual(data.getVoice(i).getDuration())){
+					flags |= VOICE_NEXT_DURATION;
+					data.getVoice(i).setDuration(beat.getVoice(i).getDuration());
+				}
+				if(beat.getVoice(i).getDirection() != TGVoice.DIRECTION_NONE ){
+					if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_UP ){
+						flags |= VOICE_DIRECTION_UP;
+					}
+					else if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_DOWN ){
+						flags |= VOICE_DIRECTION_DOWN;
+					}
+				}
+				if( data.getVoice(i).getFlags() != flags ){
+					header |= ( BEAT_HAS_VOICE_CHANGES << shift );
+					data.getVoice(i).setFlags( flags );
+				}
+			}
+
+		}
+		//Berifico si tiene stroke
+		if(beat.getStroke().getDirection() != TGStroke.STROKE_NONE){
+			header |= BEAT_HAS_STROKE;
+		}
+		//Berifico si tiene acorde
+		if(beat.getChord() != null){
+			header |= BEAT_HAS_CHORD;
+		}
+		//Berifico si tiene texto
+		if(beat.getText() != null){
+			header |= BEAT_HAS_TEXT;
+		}
+
+		// escribo la cabecera
+		writeHeader(header);
+
+		//escribo las voces
+		writeVoices(header, beat, data);
+
+		//escribo el stroke
+		if(((header & BEAT_HAS_STROKE) != 0)){
+			writeStroke(beat.getStroke());
+		}
+
+		//escribo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			writeChord(beat.getChord());
+		}
+
+		//escribo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			writeText(beat.getText());
+		}
+	}
+
+	private void writeVoices(int header, TGBeat beat,TGBeatData data){
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+			if((( header & (BEAT_HAS_VOICE << shift)) != 0)){
+
+				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
+					writeHeader( data.getVoice(i).getFlags() );
+				}
+
+				//escribo la duracion
+				if((( data.getVoice(i).getFlags() & VOICE_NEXT_DURATION) != 0)){
+					writeDuration(beat.getVoice(i).getDuration());
+				}
+
+				//escribo las notas
+				if((( data.getVoice(i).getFlags() & VOICE_HAS_NOTES) != 0)){
+					writeNotes(beat.getVoice(i), data);
+				}
+			}
+		}
+	}
+
+	private void writeNotes(TGVoice voice,TGBeatData data){
+		for( int i = 0 ; i < voice.countNotes() ; i ++){
+			TGNote note = voice.getNote(i);
+
+			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
+			header = (note.isTiedNote())?header |= NOTE_TIED:header;
+			if(note.getVelocity() != data.getVoice(voice.getIndex()).getVelocity()){
+				data.getVoice(voice.getIndex()).setVelocity(note.getVelocity());
+				header |= NOTE_VELOCITY;
+			}
+			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
+
+			writeHeader(header);
+
+			writeNote(header,note);
+		}
+	}
+
+	private void writeNote(int header,TGNote note){
+		//escribo el valor
+		writeByte(note.getValue());
+
+		//escribo la cuerda
+		writeByte(note.getString());
+
+		//escribo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			writeByte(note.getVelocity());
+		}
+
+		//escribo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			writeNoteEffect(note.getEffect());
+		}
+	}
+
+	private void writeStroke(TGStroke stroke){
+		//escribo la direccion
+		writeByte(stroke.getDirection());
+
+		//escribo el valor
+		writeByte(stroke.getValue());
+	}
+
+	private void writeChord(TGChord chord){
+		//escribo la cantidad de cuerdas
+		writeByte(chord.countStrings());
+
+		//escribo el nombre
+		writeUnsignedByteString(chord.getName());
+
+		//escribo el primer fret
+		writeByte(chord.getFirstFret());
+
+		//escribo el valor de cada cuerda
+		for(int string = 0; string < chord.countStrings(); string ++){
+			writeByte(chord.getFretValue(string));
+		}
+	}
+
+	private void writeText(TGText text){
+		//escribo el texto
+		writeUnsignedByteString(text.getValue());
+	}
+
+	private void writeInstrumentString(TGString string){
+		//escribo el valor
+		writeByte(string.getValue());
+	}
+
+	private void writeTempo(TGTempo tempo){
+		//escribo el valor
+		writeShort((short)tempo.getValue());
+	}
+
+	private void writeTimeSignature(TGTimeSignature timeSignature){
+		//escribo el numerador
+		writeByte(timeSignature.getNumerator());
+
+		//escribo el denominador
+		writeDuration(timeSignature.getDenominator());
+	}
+
+	private void writeDuration(TGDuration duration){
+		int header = 0;
+		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
+		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
+		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLET:header;
+		writeHeader(header);
+
+		//escribo el valor
+		writeByte(duration.getValue());
+
+		//escribo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			writeDivisionType(duration.getDivision());
+		}
+	}
+
+	private void writeDivisionType(TGDivisionType divisionType){
+		//escribo los enters
+		writeByte(divisionType.getEnters());
+
+		//escribo los tiempos
+		writeByte(divisionType.getTimes());
+	}
+
+	private void writeNoteEffect(TGNoteEffect effect){
+		int header = 0;
+
+		header = (effect.isBend())?header |= EFFECT_BEND:header;
+		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
+		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
+		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
+		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
+		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
+		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
+		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
+		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
+		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
+		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
+		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
+		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
+		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
+		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
+		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
+		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
+		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
+		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
+
+		writeHeader(header,3);
+
+		//escribo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			writeBendEffect(effect.getBend());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			writeTremoloBarEffect(effect.getTremoloBar());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			writeHarmonicEffect(effect.getHarmonic());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			writeGraceEffect(effect.getGrace());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			writeTrillEffect(effect.getTrill());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			writeTremoloPickingEffect(effect.getTremoloPicking());
+		}
+	}
+
+	private void writeBendEffect(TGEffectBend effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<BendPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectBend.BendPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte(point.getValue());
+		}
+	}
+
+	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<TremoloBarPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectTremoloBar.TremoloBarPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
+		}
+	}
+
+	private void writeHarmonicEffect(TGEffectHarmonic effect){
+		//excribo el tipo
+		writeByte(effect.getType());
+
+		//excribo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			writeByte(effect.getData());
+		}
+	}
+
+	private void writeGraceEffect(TGEffectGrace effect){
+		int header = 0;
+		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
+		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
+
+		//excribo el header
+		writeHeader(header);
+
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration());
+
+		//excribo el velocity
+		writeByte(effect.getDynamic());
+
+		//excribo la transicion
+		writeByte(effect.getTransition());
+	}
+
+	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeTrillEffect(TGEffectTrill effect){
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeMarker(TGMarker marker){
+		//escribo el titulo
+		writeUnsignedByteString(marker.getTitle());
+
+		//escribo el color
+		writeRGBColor(marker.getColor());
+	}
+
+	private void writeRGBColor(TGColor color){
+		//escribo el RGB
+		writeByte(color.getR());
+		writeByte(color.getG());
+		writeByte(color.getB());
+	}
+
+	private void writeLyrics(TGLyric lyrics){
+		//escribo el compas de comienzo
+		writeShort((short)lyrics.getFrom());
+
+		//escribo el texto
+		writeIntegerString(lyrics.getLyrics());
+	}
+
+	public void writeByte(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeUnsignedByteString(String v){
+		try {
+			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
+			this.dataOutputStream.write(byteString.length());
+			this.dataOutputStream.writeChars(byteString);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeIntegerString(String v){
+		try {
+			this.dataOutputStream.writeInt(v.length());
+			this.dataOutputStream.writeChars(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v,int bCount){
+		for(int i = bCount; i > 0; i --){
+			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
+		}
+	}
+
+	public void writeShort(short v){
+		try {
+			this.dataOutputStream.writeShort(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private TGChannel getChannel( TGSong song, TGTrack track ){
+		TGSongManager tgSongManager = new TGSongManager(this.factory);
+		tgSongManager.setSong( song );
+
+		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
+		if( tgChannel != null ){
+			return tgChannel;
+		}
+		if( this.channelAux == null ){
+			this.channelAux = tgSongManager.createChannel();
+			if( this.channelAux.getChannel() < 0 && song.countChannels() > 0 ){
+				this.channelAux = (song.getChannel(song.countChannels() - 1));
+			}
+		}
+		return this.channelAux;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGStream.java
new file mode 100644
index 00000000..55a188e4
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v11/TGStream.java
@@ -0,0 +1,203 @@
+package org.herac.tuxguitar.io.tg.v11;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGVelocities;
+import org.herac.tuxguitar.util.TGVersion;
+
+public class TGStream {
+
+	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
+
+	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + new TGVersion(1,1,0).getVersion() );
+
+	public static final String TG_FORMAT_EXTENSION = (".tg");
+
+	protected static final int TRACK_SOLO = 0x01;
+
+	protected static final int TRACK_MUTE = 0x02;
+
+	protected static final int TRACK_LYRICS = 0x04;
+
+	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
+
+	protected static final int MEASURE_HEADER_TEMPO = 0x02;
+
+	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
+
+	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
+
+	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
+
+	protected static final int MEASURE_HEADER_MARKER = 0x20;
+
+	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
+
+	protected static final int MEASURE_CLEF = 0x01;
+
+	protected static final int MEASURE_KEYSIGNATURE = 0x02;
+
+	protected static final int BEAT_HAS_NEXT = 0x01;
+
+	protected static final int BEAT_HAS_STROKE = 0x02;
+
+	protected static final int BEAT_HAS_CHORD = 0x04;
+
+	protected static final int BEAT_HAS_TEXT = 0x08;
+
+	protected static final int BEAT_HAS_VOICE = 0x10;
+
+	protected static final int BEAT_HAS_VOICE_CHANGES = 0x20;
+
+	protected static final int VOICE_HAS_NOTES = 0x01;
+
+	protected static final int VOICE_NEXT_DURATION = 0x02;
+
+	protected static final int VOICE_DIRECTION_UP = 0x04;
+
+	protected static final int VOICE_DIRECTION_DOWN = 0x08;
+
+	protected static final int NOTE_HAS_NEXT = 0x01;
+
+	protected static final int NOTE_TIED = 0x02;
+
+	protected static final int NOTE_EFFECT = 0x04;
+
+	protected static final int NOTE_VELOCITY = 0x08;
+
+	protected static final int DURATION_DOTTED = 0x01;
+
+	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
+
+	protected static final int DURATION_NO_TUPLET = 0x04;
+
+	protected static final int EFFECT_BEND = 0x01;
+
+	protected static final int EFFECT_TREMOLO_BAR = 0x02;
+
+	protected static final int EFFECT_HARMONIC = 0x04;
+
+	protected static final int EFFECT_GRACE = 0x08;
+
+	protected static final int EFFECT_TRILL = 0x010;
+
+	protected static final int EFFECT_TREMOLO_PICKING = 0x020;
+
+	protected static final int EFFECT_VIBRATO = 0x040;
+
+	protected static final int EFFECT_DEAD = 0x080;
+
+	protected static final int EFFECT_SLIDE = 0x0100;
+
+	protected static final int EFFECT_HAMMER = 0x0200;
+
+	protected static final int EFFECT_GHOST = 0x0400;
+
+	protected static final int EFFECT_ACCENTUATED = 0x0800;
+
+	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x01000;
+
+	protected static final int EFFECT_PALM_MUTE = 0x02000;
+
+	protected static final int EFFECT_STACCATO = 0x04000;
+
+	protected static final int EFFECT_TAPPING = 0x08000;
+
+	protected static final int EFFECT_SLAPPING = 0x010000;
+
+	protected static final int EFFECT_POPPING = 0x020000;
+
+	protected static final int EFFECT_FADE_IN = 0x040000;
+
+	protected static final int GRACE_FLAG_DEAD = 0x01;
+
+	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
+
+	protected class TGBeatData {
+		private long currentStart;
+		private TGVoiceData[] voices;
+
+		protected TGBeatData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.currentStart = measure.getStart();
+			this.voices = new TGVoiceData[TGBeat.MAX_VOICES];
+			for(int i = 0 ; i < this.voices.length ; i ++ ){
+				this.voices[i] = new TGVoiceData(measure);
+			}
+		}
+
+		protected TGVoiceData getVoice(int index){
+			return this.voices[index];
+		}
+
+		public long getCurrentStart(){
+			long minimumStart = -1;
+			for(int i = 0 ; i < this.voices.length ; i ++ ){
+				if( this.voices[i].getStart() > this.currentStart ){
+					if( minimumStart < 0 || this.voices[i].getStart() < minimumStart ){
+						minimumStart = this.voices[i].getStart();
+					}
+				}
+			}
+			if( minimumStart > this.currentStart ){
+				this.currentStart = minimumStart;
+			}
+			return this.currentStart;
+		}
+	}
+
+	protected class TGVoiceData {
+		private long start;
+		private int velocity;
+		private int flags;
+		private TGDuration duration;
+
+		protected TGVoiceData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.flags = 0;
+			this.setStart(measure.getStart());
+			this.setVelocity(TGVelocities.DEFAULT);
+			this.setDuration(new TGFactory().newDuration());
+		}
+
+		public TGDuration getDuration() {
+			return this.duration;
+		}
+
+		public void setDuration(TGDuration duration) {
+			this.duration = duration;
+		}
+
+		public long getStart() {
+			return this.start;
+		}
+
+		public void setStart(long start) {
+			this.start = start;
+		}
+
+		public int getVelocity() {
+			return this.velocity;
+		}
+
+		public void setVelocity(int velocity) {
+			this.velocity = velocity;
+		}
+
+		public int getFlags() {
+			return this.flags;
+		}
+
+		public void setFlags(int flags) {
+			this.flags = flags;
+		}
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGInputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGInputStream.java
new file mode 100644
index 00000000..3a5aa10f
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGInputStream.java
@@ -0,0 +1,786 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v12;
+
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGInputStreamBase;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGInputStream extends TGStream implements TGInputStreamBase{
+
+	private DataInputStream dataInputStream;
+	private String version;
+	private TGFactory factory;
+
+	public TGInputStream() {
+		super();
+	}
+
+	@Override
+	public void init(TGFactory factory,InputStream stream) {
+		this.factory = factory;
+		this.dataInputStream = new DataInputStream(stream);
+		this.version = null;
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	public boolean isSupportedVersion(String version){
+		return (version.equals(TG_FORMAT_VERSION));
+	}
+
+	@Override
+	public boolean isSupportedVersion(){
+		try{
+			readVersion();
+			return isSupportedVersion(this.version);
+		}catch(Throwable throwable){
+			return false;
+		}
+	}
+
+	@Override
+	public TGSong readSong() throws TGFileFormatException{
+		try {
+			if(this.isSupportedVersion()){
+				TGSong song = this.read();
+				this.dataInputStream.close();
+				return song;
+			}
+			throw new TGFileFormatException("Unsopported Version");
+		} catch (Throwable throwable) {
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void readVersion(){
+		if(this.version == null){
+			this.version = readUnsignedByteString();
+		}
+	}
+
+	private TGSong read(){
+		TGSong song = this.factory.newSong();
+
+		//leo el nombre
+		song.setName(readUnsignedByteString());
+
+		//leo el artista
+		song.setArtist(readUnsignedByteString());
+
+		//leo el album
+		song.setAlbum(readUnsignedByteString());
+
+		//leo el autor
+		song.setAuthor(readUnsignedByteString());
+
+		//leo la fecha
+		song.setDate(readUnsignedByteString());
+
+		//leo el copyright
+		song.setCopyright(readUnsignedByteString());
+
+		//leo el creador
+		song.setWriter(readUnsignedByteString());
+
+		//leo el transcriptor
+		song.setTranscriber(readUnsignedByteString());
+
+		//leo los comentarios
+		song.setComments(readIntegerString());
+
+		//leo la cantidad de measure headers
+		int headerCount = readShort();
+
+		//leo las pistas
+		TGMeasureHeader lastHeader = null;
+		long headerStart = TGDuration.QUARTER_TIME;
+		for(int i = 0;i < headerCount;i++){
+			TGMeasureHeader header = readMeasureHeader(i + 1,headerStart,lastHeader);
+			song.addMeasureHeader(header);
+			headerStart += header.getLength();
+			lastHeader = header;
+		}
+
+		//leo la cantidad de pistas
+		int trackCount = readByte();
+
+		//leo las pistas
+		for(int i = 0;i < trackCount;i++){
+			song.addTrack(readTrack(i + 1,song));
+		}
+
+		return song;
+	}
+
+	private TGTrack readTrack(int number,TGSong song){
+		//header
+		int header = readHeader();
+
+		TGTrack track = this.factory.newTrack();
+
+		track.setNumber(number);
+
+		//leo el nombre
+		track.setName(readUnsignedByteString());
+
+		//leo el solo
+		track.setSolo((header & TRACK_SOLO) != 0);
+
+		//leo el mute
+		track.setMute((header & TRACK_MUTE) != 0);
+
+		//leo el canal
+		readChannel(song, track);
+
+		//leo la cantidad de compases
+		int measureCount = song.countMeasureHeaders();
+
+		//leo los compases
+		TGMeasure lastMeasure = null;
+		for(int i = 0;i < measureCount;i++){
+			TGMeasure measure = readMeasure(song.getMeasureHeader(i),lastMeasure);
+			track.addMeasure(measure);
+			lastMeasure = measure;
+		}
+
+		//leo la cantidad de cuerdas
+		int stringCount = readByte();
+
+		//leo las cuerdas
+		for(int i = 0;i < stringCount;i++){
+			track.getStrings().add(readInstrumentString(i + 1));
+		}
+
+		//leo el offset
+		track.setOffset(TGTrack.MIN_OFFSET + readByte());
+
+		//leo el color
+		readRGBColor(track.getColor());
+
+		//leo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			readLyrics(track.getLyrics());
+		}
+
+		return track;
+	}
+
+	private TGMeasureHeader readMeasureHeader(int number,long start,TGMeasureHeader lastMeasureHeader){
+		int header = readHeader();
+
+		TGMeasureHeader measureHeader = this.factory.newHeader();
+		measureHeader.setNumber(number);
+		measureHeader.setStart(start);
+
+		//leo el time signature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			readTimeSignature(measureHeader.getTimeSignature());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTimeSignature().copy(measureHeader.getTimeSignature());
+		}
+
+		//leo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			readTempo(measureHeader.getTempo());
+		}else if(lastMeasureHeader != null){
+			lastMeasureHeader.getTempo().copy(measureHeader.getTempo());
+		}
+
+		//leo el comienzo de la repeticion
+		measureHeader.setRepeatOpen((header & MEASURE_HEADER_REPEAT_OPEN) != 0);
+
+		//leo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			 measureHeader.setRepeatClose(readShort());
+		}
+
+		//leo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			 measureHeader.setRepeatAlternative(readByte());
+		}
+
+		//leo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			measureHeader.setMarker(readMarker(number));
+		}
+
+		measureHeader.setTripletFeel((lastMeasureHeader != null)?lastMeasureHeader.getTripletFeel():TGMeasureHeader.TRIPLET_FEEL_NONE);
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			measureHeader.setTripletFeel(readByte());
+		}
+
+		return measureHeader;
+	}
+
+	private TGMeasure readMeasure(TGMeasureHeader measureHeader,TGMeasure lastMeasure){
+		int header = readHeader();
+
+		TGMeasure measure = this.factory.newMeasure(measureHeader);
+		TGBeatData data = new TGBeatData(measure);
+
+		//leo la los beats
+		readBeats(measure, data);
+
+		//leo la clave
+		measure.setClef( (lastMeasure == null)?TGMeasure.CLEF_TREBLE:lastMeasure.getClef());
+		if(((header & MEASURE_CLEF) != 0)){
+			measure.setClef(readByte());
+		}
+
+		//leo el key signature
+		measure.setKeySignature((lastMeasure == null)?0:lastMeasure.getKeySignature());
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			measure.setKeySignature(readByte());
+		}
+
+		return measure;
+	}
+
+	private void readChannel(TGSong song, TGTrack track){
+		TGChannel channel = this.factory.newChannel();
+
+		//leo el canal
+		channel.setChannel(readByte());
+
+		//leo el canal de efectos
+		channel.setEffectChannel(readByte());
+
+		//leo el instrumento
+		channel.setProgram(readByte());
+
+		//leo el volumen
+		channel.setVolume(readByte());
+
+		//leo el balance
+		channel.setBalance(readByte());
+
+		//leo el chorus
+		channel.setChorus(readByte());
+
+		//leo el reverb
+		channel.setReverb(readByte());
+
+		//leo el phaser
+		channel.setPhaser(readByte());
+
+		//leo el tremolo
+		channel.setTremolo(readByte());
+
+		//------------------------------------------//
+		for( int i = 0 ; i < song.countChannels() ; i ++ ){
+			TGChannel channelAux = song.getChannel(i);
+			if( channelAux.getChannel() == channel.getChannel() ){
+				channel.setChannelId(channelAux.getChannelId());
+			}
+		}
+		if( channel.getChannelId() <= 0 ){
+			channel.setChannelId( song.countChannels() + 1 );
+			channel.setName(("#" + channel.getChannelId()));
+			song.addChannel(channel);
+		}
+		track.setChannelId(channel.getChannelId());
+	}
+
+	private void readBeats(TGMeasure measure,TGBeatData data){
+		int header = BEAT_HAS_NEXT;
+		while(((header & BEAT_HAS_NEXT) != 0)){
+			header = readHeader();
+			readBeat(header, measure, data);
+		}
+	}
+
+	private void readBeat(int header, TGMeasure measure,TGBeatData data){
+		TGBeat beat = this.factory.newBeat();
+
+		beat.setStart(data.getCurrentStart());
+
+		readVoices(header, beat, data);
+
+		//leo el stroke
+		if(((header & BEAT_HAS_STROKE) != 0)){
+			readStroke(beat.getStroke());
+		}
+
+		//leo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			readChord(beat);
+		}
+
+		//leo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			readText(beat);
+		}
+
+		measure.addBeat(beat);
+	}
+
+	private void readVoices(int header, TGBeat beat, TGBeatData data){
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+
+			beat.getVoice(i).setEmpty(true);
+
+			if(((header & (BEAT_HAS_VOICE << shift)) != 0)){
+				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
+					data.getVoice(i).setFlags( readHeader() );
+				}
+
+				int flags = data.getVoice(i).getFlags();
+
+				//leo la duracion
+				if(((flags & VOICE_NEXT_DURATION) != 0)){
+					readDuration(data.getVoice(i).getDuration());
+				}
+
+				//leo las notas
+				if(((flags & VOICE_HAS_NOTES) != 0)){
+					readNotes(beat.getVoice(i), data);
+				}
+
+				//leo la direccion
+				if(((flags & VOICE_DIRECTION_UP) != 0)){
+					beat.getVoice(i).setDirection( TGVoice.DIRECTION_UP );
+				}
+				else if(((flags & VOICE_DIRECTION_DOWN) != 0)){
+					beat.getVoice(i).setDirection( TGVoice.DIRECTION_DOWN );
+				}
+				data.getVoice(i).getDuration().copy(beat.getVoice(i).getDuration());
+				data.getVoice(i).setStart(data.getVoice(i).getStart() + beat.getVoice(i).getDuration().getTime());
+
+				beat.getVoice(i).setEmpty(false);
+			}
+		}
+	}
+
+	private void readNotes(TGVoice voice,TGBeatData data){
+		int header = NOTE_HAS_NEXT;
+		while(((header & NOTE_HAS_NEXT) != 0)){
+			header = readHeader();
+			readNote(header, voice, data);
+		}
+	}
+
+	private void readNote(int header,TGVoice voice,TGBeatData data){
+		TGNote note = this.factory.newNote();
+
+		//leo el valor
+		note.setValue(readByte());
+
+		//leo la cuerda
+		note.setString(readByte());
+
+		//leo la ligadura
+		note.setTiedNote((header & NOTE_TIED) != 0);
+
+		//leo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			data.getVoice(voice.getIndex()).setVelocity(readByte());
+		}
+		note.setVelocity(data.getVoice(voice.getIndex()).getVelocity());
+
+		//leo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			readNoteEffect(note.getEffect());
+		}
+
+		voice.addNote(note);
+	}
+
+	private void readChord(TGBeat beat){
+		TGChord chord = this.factory.newChord(readByte());
+
+		//leo el nombre
+		chord.setName( readUnsignedByteString() );
+
+		//leo el primer fret
+		chord.setFirstFret(readByte());
+
+		//leo las cuerdas
+		for(int string = 0; string < chord.countStrings(); string ++){
+			chord.addFretValue(string, readByte());
+		}
+		beat.setChord(chord);
+	}
+
+	private void readText(TGBeat beat){
+		TGText text = this.factory.newText();
+
+		//leo el texto
+		text.setValue(readUnsignedByteString());
+
+		beat.setText(text);
+	}
+
+	private TGString readInstrumentString(int number){
+		TGString string = this.factory.newString();
+
+		string.setNumber(number);
+
+		//leo el valor
+		string.setValue(readByte());
+
+		return string;
+	}
+
+	private void readTempo(TGTempo tempo){
+		//leo el valor
+		tempo.setValue(readShort());
+	}
+
+	private void readTimeSignature(TGTimeSignature timeSignature){
+		//leo el numerador
+		timeSignature.setNumerator(readByte());
+
+		//leo el denominador
+		readDuration(timeSignature.getDenominator());
+	}
+
+	private void readDuration(TGDuration duration){
+		int header = readHeader();
+
+		// leo el puntillo
+		duration.setDotted((header & DURATION_DOTTED) != 0);
+
+		//leo el doble puntillo
+		duration.setDoubleDotted((header & DURATION_DOUBLE_DOTTED) != 0);
+
+		//leo el valor
+		duration.setValue(readByte());
+
+		//leo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			readDivisionType(duration.getDivision());
+		}
+		else{
+			TGDivisionType.NORMAL.copy(duration.getDivision());
+		}
+	}
+
+	private void readDivisionType(TGDivisionType divisionType){
+		//leo los enters
+		divisionType.setEnters(readByte());
+
+		//leo los tiempos
+		divisionType.setTimes(readByte());
+	}
+
+	private void readStroke(TGStroke stroke){
+		//leo la direccion
+		stroke.setDirection( readByte() );
+
+		//leo el valor
+		stroke.setValue( readByte() );
+	}
+
+	private void readNoteEffect(TGNoteEffect effect){
+		int header = readHeader(3);
+
+		//leo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			effect.setBend(readBendEffect());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			effect.setTremoloBar(readTremoloBarEffect());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			effect.setHarmonic(readHarmonicEffect());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			effect.setGrace(readGraceEffect());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			effect.setTrill(readTrillEffect());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			effect.setTremoloPicking(readTremoloPickingEffect());
+		}
+
+		//vibrato
+		effect.setVibrato(((header & EFFECT_VIBRATO) != 0));
+
+		//dead note
+		effect.setDeadNote(((header & EFFECT_DEAD) != 0));
+
+		//slide
+		effect.setSlide(((header & EFFECT_SLIDE) != 0));
+
+		//hammer-on/pull-off
+		effect.setHammer(((header & EFFECT_HAMMER) != 0));
+
+		//ghost note
+		effect.setGhostNote(((header & EFFECT_GHOST) != 0));
+
+		//accentuated note
+		effect.setAccentuatedNote(((header & EFFECT_ACCENTUATED) != 0));
+
+		//heavy accentuated note
+		effect.setHeavyAccentuatedNote(((header & EFFECT_HEAVY_ACCENTUATED) != 0));
+
+		//palm mute
+		effect.setPalmMute(((header & EFFECT_PALM_MUTE) != 0));
+
+		//staccato
+		effect.setStaccato(((header & EFFECT_STACCATO) != 0));
+
+		//tapping
+		effect.setTapping(((header & EFFECT_TAPPING) != 0));
+
+		//slapping
+		effect.setSlapping(((header & EFFECT_SLAPPING) != 0));
+
+		//popping
+		effect.setPopping(((header & EFFECT_POPPING) != 0));
+
+		//fade in
+		effect.setFadeIn(((header & EFFECT_FADE_IN) != 0));
+
+		//let ring
+		effect.setLetRing(((header & EFFECT_LET_RING) != 0));
+	}
+
+	private TGEffectBend readBendEffect(){
+		TGEffectBend bend = this.factory.newEffectBend();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value = readByte();
+
+			//agrego el punto
+			bend.addPoint(position,value);
+		}
+		return bend;
+	}
+
+	private TGEffectTremoloBar readTremoloBarEffect(){
+		TGEffectTremoloBar tremoloBar = this.factory.newEffectTremoloBar();
+
+		//leo la cantidad de puntos
+		int count = readByte();
+
+		for(int i = 0;i < count;i++){
+			//leo la posicion
+			int position = readByte();
+
+			//leo el valor
+			int value =  (readByte() - TGEffectTremoloBar.MAX_VALUE_LENGTH);
+
+			//agrego el punto
+			tremoloBar.addPoint(position,value);
+		}
+		return tremoloBar;
+	}
+
+	private TGEffectHarmonic readHarmonicEffect(){
+		TGEffectHarmonic effect = this.factory.newEffectHarmonic();
+
+		//leo el tipo
+		effect.setType(readByte());
+
+		//leo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			effect.setData(readByte());
+		}
+		return effect;
+	}
+
+	private TGEffectGrace readGraceEffect(){
+		int header = readHeader();
+
+		TGEffectGrace effect = this.factory.newEffectGrace();
+
+		effect.setDead((header & GRACE_FLAG_DEAD) != 0) ;
+
+		effect.setOnBeat((header & GRACE_FLAG_ON_BEAT) != 0) ;
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.setDuration(readByte());
+
+		//leo el velocity
+		effect.setDynamic(readByte());
+
+		//leo la transicion
+		effect.setTransition(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTremoloPicking readTremoloPickingEffect(){
+		TGEffectTremoloPicking effect = this.factory.newEffectTremoloPicking();
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGEffectTrill readTrillEffect(){
+		TGEffectTrill effect = this.factory.newEffectTrill();
+
+		//leo el fret
+		effect.setFret(readByte());
+
+		//leo la duracion
+		effect.getDuration().setValue(readByte());
+
+		return effect;
+	}
+
+	private TGMarker readMarker(int measure){
+		TGMarker marker = this.factory.newMarker();
+
+		marker.setMeasure(measure);
+
+		//leo el titulo
+		marker.setTitle(readUnsignedByteString());
+
+		//leo el color
+		readRGBColor(marker.getColor());
+
+		return marker;
+	}
+
+	private void readRGBColor(TGColor color){
+		//leo el RGB
+		color.setR((readByte() & 0xff));
+		color.setG((readByte() & 0xff));
+		color.setB((readByte() & 0xff));
+	}
+
+	private void readLyrics(TGLyric lyrics){
+		//leo el compas de comienzo
+		lyrics.setFrom(readShort());
+
+		//leo el texto
+		lyrics.setLyrics(readIntegerString());
+	}
+
+	private byte readByte(){
+		try {
+			return (byte)this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(){
+		try {
+			return this.dataInputStream.read();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private int readHeader(int bCount){
+		int header = 0;
+		for(int i = bCount; i > 0; i --){
+			header += ( readHeader() << ( (8 * i) - 8 ) );
+		}
+		return header;
+	}
+
+	private short readShort(){
+		try {
+			return this.dataInputStream.readShort();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return 0;
+	}
+
+	private String readUnsignedByteString(){
+		try {
+			return readString( (this.dataInputStream.read() & 0xFF ));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readIntegerString(){
+		try {
+			return readString(this.dataInputStream.readInt());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	private String readString(int length){
+		try {
+			char[] chars = new char[length];
+			for(int i = 0;i < chars.length; i++){
+				chars[i] = this.dataInputStream.readChar();
+			}
+			return String.copyValueOf(chars);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGOutputStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGOutputStream.java
new file mode 100644
index 00000000..5c441473
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGOutputStream.java
@@ -0,0 +1,750 @@
+/*
+ * Created on 16-dic-2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.herac.tuxguitar.io.tg.v12;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+
+import org.herac.tuxguitar.io.base.TGFileFormat;
+import org.herac.tuxguitar.io.base.TGFileFormatException;
+import org.herac.tuxguitar.io.base.TGLocalFileExporter;
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGChannel;
+import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGColor;
+import org.herac.tuxguitar.song.models.TGDivisionType;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGLyric;
+import org.herac.tuxguitar.song.models.TGMarker;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGNoteEffect;
+import org.herac.tuxguitar.song.models.TGSong;
+import org.herac.tuxguitar.song.models.TGString;
+import org.herac.tuxguitar.song.models.TGStroke;
+import org.herac.tuxguitar.song.models.TGTempo;
+import org.herac.tuxguitar.song.models.TGText;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+import org.herac.tuxguitar.song.models.TGTrack;
+import org.herac.tuxguitar.song.models.TGVoice;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend;
+import org.herac.tuxguitar.song.models.effects.TGEffectBend.BendPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
+import org.herac.tuxguitar.song.models.effects.TGEffectHarmonic;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloBar.TremoloBarPoint;
+import org.herac.tuxguitar.song.models.effects.TGEffectTremoloPicking;
+import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
+/**
+ * @author julian
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class TGOutputStream extends TGStream implements TGLocalFileExporter{
+
+	private TGFactory factory;
+	private TGChannel channelAux;
+	private DataOutputStream dataOutputStream;
+
+	public boolean isSupportedExtension(String extension) {
+		return (extension.toLowerCase().equals(TG_FORMAT_EXTENSION));
+	}
+
+	@Override
+	public String getExportName(){
+		return "TuxGuitar 1.2";
+	}
+
+	@Override
+	public TGFileFormat getFileFormat(){
+		return new TGFileFormat("TuxGuitar","*.tg");
+	}
+
+	@Override
+	public boolean configure(boolean setDefaults){
+		return true;
+	}
+
+	@Override
+	public void init(TGFactory factory,OutputStream stream) {
+		this.factory = factory;
+		this.channelAux = null;
+		this.dataOutputStream = new DataOutputStream(stream);
+	}
+
+	@Override
+	public void exportSong(TGSong song) throws TGFileFormatException {
+		try{
+			this.writeVersion();
+			this.write(song);
+			this.dataOutputStream.flush();
+			this.dataOutputStream.close();
+		}catch( Throwable throwable){
+			throw new TGFileFormatException(throwable);
+		}
+	}
+
+	private void writeVersion(){
+		writeUnsignedByteString(TG_FORMAT_VERSION);
+	}
+
+	private void write(TGSong song){
+		//escribo el nombre
+		writeUnsignedByteString(song.getName());
+
+		//escribo el artista
+		writeUnsignedByteString(song.getArtist());
+
+		//escribo el album
+		writeUnsignedByteString(song.getAlbum());
+
+		//escribo el autor
+		writeUnsignedByteString(song.getAuthor());
+
+		//escribo la fecha
+		writeUnsignedByteString(song.getDate());
+
+		//escribo el copyright
+		writeUnsignedByteString(song.getCopyright());
+
+		//escribo el creador
+		writeUnsignedByteString(song.getWriter());
+
+		//escribo el transcriptor
+		writeUnsignedByteString(song.getTranscriber());
+
+		//escribo los comentarios
+		writeIntegerString(song.getComments());
+
+		//escribo la cantidad de measure headers
+		writeShort((short)song.countMeasureHeaders());
+
+		//escribo las pistas
+		TGMeasureHeader lastHeader = null;
+		Iterator<TGMeasureHeader> headers = song.getMeasureHeaders();
+		while(headers.hasNext()){
+			TGMeasureHeader header = headers.next();
+			writeMeasureHeader(header,lastHeader);
+			lastHeader = header;
+		}
+
+		//escribo la cantidad de pistas
+		writeByte(song.countTracks());
+
+		//escribo las pistas
+		for(int i = 0;i < song.countTracks();i++){
+			TGTrack track = song.getTrack(i);
+			writeTrack(track);
+		}
+	}
+
+	private void writeTrack(TGTrack track){
+		//header
+		int header = 0;
+		if (track.isSolo()) {
+			header |= TRACK_SOLO;
+		}
+		if (track.isMute()) {
+			header |= TRACK_MUTE;
+		}
+		if(!track.getLyrics().isEmpty()){
+			header |= TRACK_LYRICS;
+		}
+		writeHeader(header);
+
+		//escribo el nombre
+		writeUnsignedByteString(track.getName());
+
+		//escribo el canal
+		writeChannel(getChannel(track.getSong(), track));
+
+		//escribo los compases
+		TGMeasure lastMeasure = null;
+		Iterator<TGMeasure> measures  = track.getMeasures();
+		while(measures.hasNext()){
+			TGMeasure measure = measures.next();
+			writeMeasure(measure,lastMeasure);
+			lastMeasure = measure;
+		}
+
+		//escribo la cantidad de cuerdas
+		writeByte(track.getStrings().size());
+
+		//escribo las cuerdas
+		Iterator<TGString> stringIt  = track.getStrings().iterator();
+		while(stringIt.hasNext()){
+			TGString string = stringIt.next();
+			writeInstrumentString(string);
+		}
+
+		//escribo el offset
+		writeByte(track.getOffset() - TGTrack.MIN_OFFSET);
+
+		//escribo el color
+		writeRGBColor(track.getColor());
+
+		//escribo el lyrics
+		if(((header & TRACK_LYRICS) != 0)){
+			writeLyrics(track.getLyrics());
+		}
+	}
+
+	private void writeMeasureHeader(TGMeasureHeader measureheader,TGMeasureHeader lastMeasureHeader){
+		int header = 0;
+		if(lastMeasureHeader == null){
+			header |= MEASURE_HEADER_TIMESIGNATURE;
+			header |= MEASURE_HEADER_TEMPO;
+			if(measureheader.getTripletFeel() != TGMeasureHeader.TRIPLET_FEEL_NONE){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}else{
+			//Time Signature
+			int numerator = measureheader.getTimeSignature().getNumerator();
+			int value = measureheader.getTimeSignature().getDenominator().getValue();
+			int prevNumerator = lastMeasureHeader.getTimeSignature().getNumerator();
+			int prevValue = lastMeasureHeader.getTimeSignature().getDenominator().getValue();
+			if(numerator != prevNumerator || value != prevValue){
+				header |= MEASURE_HEADER_TIMESIGNATURE;
+			}
+			//Tempo
+			if(measureheader.getTempo().getValue() != lastMeasureHeader.getTempo().getValue()){
+				header |= MEASURE_HEADER_TEMPO;
+			}
+			//Triplet Feel
+			if(measureheader.getTripletFeel() != lastMeasureHeader.getTripletFeel()){
+				header |= MEASURE_HEADER_TRIPLET_FEEL;
+			}
+		}
+		header = (measureheader.isRepeatOpen())?header |= MEASURE_HEADER_REPEAT_OPEN:header;
+		header = (measureheader.getRepeatClose() > 0)?header |= MEASURE_HEADER_REPEAT_CLOSE:header;
+		header = (measureheader.getRepeatAlternative() > 0)?header |= MEASURE_HEADER_REPEAT_ALTERNATIVE:header;
+		header = (measureheader.hasMarker())?header |= MEASURE_HEADER_MARKER:header;
+
+		writeHeader(header);
+
+		//escribo el timeSignature
+		if(((header & MEASURE_HEADER_TIMESIGNATURE) != 0)){
+			writeTimeSignature(measureheader.getTimeSignature());
+		}
+
+		//escribo el tempo
+		if(((header & MEASURE_HEADER_TEMPO) != 0)){
+			writeTempo(measureheader.getTempo());
+		}
+
+		//escribo el numero de repeticiones
+		if(((header & MEASURE_HEADER_REPEAT_CLOSE) != 0)){
+			writeShort((short)measureheader.getRepeatClose());
+		}
+
+		//escribo los finales alternativos
+		if(((header & MEASURE_HEADER_REPEAT_ALTERNATIVE) != 0)){
+			writeByte(measureheader.getRepeatAlternative());
+		}
+
+		//escribo el marker
+		if(((header & MEASURE_HEADER_MARKER) != 0)){
+			writeMarker(measureheader.getMarker());
+		}
+
+		//escribo el triplet feel
+		if(((header & MEASURE_HEADER_TRIPLET_FEEL) != 0)){
+			writeByte(measureheader.getTripletFeel());
+		}
+	}
+
+	private void writeMeasure(TGMeasure measure,TGMeasure lastMeasure){
+		int header = 0;
+		if(lastMeasure == null){
+			header |= MEASURE_CLEF;
+			header |= MEASURE_KEYSIGNATURE;
+		}else{
+			//Clef
+			if(measure.getClef() != lastMeasure.getClef()){
+				header |= MEASURE_CLEF;
+			}
+			//KeySignature
+			if(measure.getKeySignature() != lastMeasure.getKeySignature()){
+				header |= MEASURE_KEYSIGNATURE;
+			}
+		}
+		//escribo la cabecera
+		writeHeader(header);
+
+		//escribo los beats
+		TGBeatData data = new TGBeatData(measure);
+		writeBeats(measure, data);
+
+		//escribo la clave
+		if(((header & MEASURE_CLEF) != 0)){
+			writeByte(measure.getClef());
+		}
+
+		//escribo el key signature
+		if(((header & MEASURE_KEYSIGNATURE) != 0)){
+			writeByte(measure.getKeySignature());
+		}
+	}
+
+	private void writeChannel(TGChannel channel){
+		//escribo el canal
+		writeByte(channel.getChannel());
+
+		//escribo el canal de efectos
+		writeByte(channel.getEffectChannel());
+
+		//escribo el instrumento
+		writeByte(channel.getProgram());
+
+		//escribo el volumen
+		writeByte(channel.getVolume());
+
+		//escribo el balance
+		writeByte(channel.getBalance());
+
+		//escribo el chorus
+		writeByte(channel.getChorus());
+
+		//escribo el reverb
+		writeByte(channel.getReverb());
+
+		//escribo el phaser
+		writeByte(channel.getPhaser());
+
+		//escribo el tremolo
+		writeByte(channel.getTremolo());
+	}
+
+	private void writeBeats(TGMeasure measure,TGBeatData data){
+		int count = measure.countBeats();
+		for(int i = 0; i < count; i ++){
+			TGBeat beat = measure.getBeat(i);
+			writeBeat(beat,data, (i + 1 < count ));
+		}
+	}
+
+	private void writeBeat(TGBeat beat,TGBeatData data, boolean hasNext){
+		int header = hasNext ? BEAT_HAS_NEXT : 0;
+
+		//Berifico si hay cambios en las voces
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+			if(!beat.getVoice(i).isEmpty()){
+				header |= ( BEAT_HAS_VOICE << shift );
+
+				int flags = ( beat.getVoice(i).isRestVoice() ? 0 : VOICE_HAS_NOTES );
+				if(!beat.getVoice(i).getDuration().isEqual(data.getVoice(i).getDuration())){
+					flags |= VOICE_NEXT_DURATION;
+					data.getVoice(i).setDuration(beat.getVoice(i).getDuration());
+				}
+				if(beat.getVoice(i).getDirection() != TGVoice.DIRECTION_NONE ){
+					if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_UP ){
+						flags |= VOICE_DIRECTION_UP;
+					}
+					else if(beat.getVoice(i).getDirection() == TGVoice.DIRECTION_DOWN ){
+						flags |= VOICE_DIRECTION_DOWN;
+					}
+				}
+				if( data.getVoice(i).getFlags() != flags ){
+					header |= ( BEAT_HAS_VOICE_CHANGES << shift );
+					data.getVoice(i).setFlags( flags );
+				}
+			}
+
+		}
+		//Berifico si tiene stroke
+		if(beat.getStroke().getDirection() != TGStroke.STROKE_NONE){
+			header |= BEAT_HAS_STROKE;
+		}
+		//Berifico si tiene acorde
+		if(beat.getChord() != null){
+			header |= BEAT_HAS_CHORD;
+		}
+		//Berifico si tiene texto
+		if(beat.getText() != null){
+			header |= BEAT_HAS_TEXT;
+		}
+
+		// escribo la cabecera
+		writeHeader(header);
+
+		//escribo las voces
+		writeVoices(header, beat, data);
+
+		//escribo el stroke
+		if(((header & BEAT_HAS_STROKE) != 0)){
+			writeStroke(beat.getStroke());
+		}
+
+		//escribo el acorde
+		if(((header & BEAT_HAS_CHORD) != 0)){
+			writeChord(beat.getChord());
+		}
+
+		//escribo el texto
+		if(((header & BEAT_HAS_TEXT) != 0)){
+			writeText(beat.getText());
+		}
+	}
+
+	private void writeVoices(int header, TGBeat beat,TGBeatData data){
+		for(int i = 0 ; i < TGBeat.MAX_VOICES; i ++ ){
+			int shift = (i * 2 );
+			if((( header & (BEAT_HAS_VOICE << shift)) != 0)){
+
+				if(((header & (BEAT_HAS_VOICE_CHANGES << shift)) != 0)){
+					writeHeader( data.getVoice(i).getFlags() );
+				}
+
+				//escribo la duracion
+				if((( data.getVoice(i).getFlags() & VOICE_NEXT_DURATION) != 0)){
+					writeDuration(beat.getVoice(i).getDuration());
+				}
+
+				//escribo las notas
+				if((( data.getVoice(i).getFlags() & VOICE_HAS_NOTES) != 0)){
+					writeNotes(beat.getVoice(i), data);
+				}
+			}
+		}
+	}
+
+	private void writeNotes(TGVoice voice,TGBeatData data){
+		for( int i = 0 ; i < voice.countNotes() ; i ++){
+			TGNote note = voice.getNote(i);
+
+			int header = ( i + 1 < voice.countNotes() ? NOTE_HAS_NEXT : 0 );
+			header = (note.isTiedNote())?header |= NOTE_TIED:header;
+			if(note.getVelocity() != data.getVoice(voice.getIndex()).getVelocity()){
+				data.getVoice(voice.getIndex()).setVelocity(note.getVelocity());
+				header |= NOTE_VELOCITY;
+			}
+			header = (note.getEffect().hasAnyEffect())?header |= NOTE_EFFECT:header;
+
+			writeHeader(header);
+
+			writeNote(header,note);
+		}
+	}
+
+	private void writeNote(int header,TGNote note){
+		//escribo el valor
+		writeByte(note.getValue());
+
+		//escribo la cuerda
+		writeByte(note.getString());
+
+		//escribo el velocity
+		if(((header & NOTE_VELOCITY) != 0)){
+			writeByte(note.getVelocity());
+		}
+
+		//escribo los efectos
+		if(((header & NOTE_EFFECT) != 0)){
+			writeNoteEffect(note.getEffect());
+		}
+	}
+
+	private void writeStroke(TGStroke stroke){
+		//escribo la direccion
+		writeByte(stroke.getDirection());
+
+		//escribo el valor
+		writeByte(stroke.getValue());
+	}
+
+	private void writeChord(TGChord chord){
+		//escribo la cantidad de cuerdas
+		writeByte(chord.countStrings());
+
+		//escribo el nombre
+		writeUnsignedByteString(chord.getName());
+
+		//escribo el primer fret
+		writeByte(chord.getFirstFret());
+
+		//escribo el valor de cada cuerda
+		for(int string = 0; string < chord.countStrings(); string ++){
+			writeByte(chord.getFretValue(string));
+		}
+	}
+
+	private void writeText(TGText text){
+		//escribo el texto
+		writeUnsignedByteString(text.getValue());
+	}
+
+	private void writeInstrumentString(TGString string){
+		//escribo el valor
+		writeByte(string.getValue());
+	}
+
+	private void writeTempo(TGTempo tempo){
+		//escribo el valor
+		writeShort((short)tempo.getValue());
+	}
+
+	private void writeTimeSignature(TGTimeSignature timeSignature){
+		//escribo el numerador
+		writeByte(timeSignature.getNumerator());
+
+		//escribo el denominador
+		writeDuration(timeSignature.getDenominator());
+	}
+
+	private void writeDuration(TGDuration duration){
+		int header = 0;
+		header = (duration.isDotted())?header |= DURATION_DOTTED:header;
+		header = (duration.isDoubleDotted())?header |= DURATION_DOUBLE_DOTTED:header;
+		header = (!duration.getDivision().isEqual(TGDivisionType.NORMAL))?header |= DURATION_NO_TUPLET:header;
+		writeHeader(header);
+
+		//escribo el valor
+		writeByte(duration.getValue());
+
+		//escribo el tipo de divisiones
+		if(((header & DURATION_NO_TUPLET) != 0)){
+			writeDivisionType(duration.getDivision());
+		}
+	}
+
+	private void writeDivisionType(TGDivisionType divisionType){
+		//escribo los enters
+		writeByte(divisionType.getEnters());
+
+		//escribo los tiempos
+		writeByte(divisionType.getTimes());
+	}
+
+	private void writeNoteEffect(TGNoteEffect effect){
+		int header = 0;
+
+		header = (effect.isBend())?header |= EFFECT_BEND:header;
+		header = (effect.isTremoloBar())?header |= EFFECT_TREMOLO_BAR:header;
+		header = (effect.isHarmonic())?header |= EFFECT_HARMONIC:header;
+		header = (effect.isGrace())?header |= EFFECT_GRACE:header;
+		header = (effect.isTrill())?header |= EFFECT_TRILL:header;
+		header = (effect.isTremoloPicking())?header |= EFFECT_TREMOLO_PICKING:header;
+		header = (effect.isVibrato())?header |= EFFECT_VIBRATO:header;
+		header = (effect.isDeadNote())?header |= EFFECT_DEAD:header;
+		header = (effect.isSlide())?header |= EFFECT_SLIDE:header;
+		header = (effect.isHammer())?header |= EFFECT_HAMMER:header;
+		header = (effect.isGhostNote())?header |= EFFECT_GHOST:header;
+		header = (effect.isAccentuatedNote())?header |= EFFECT_ACCENTUATED:header;
+		header = (effect.isHeavyAccentuatedNote())?header |= EFFECT_HEAVY_ACCENTUATED:header;
+		header = (effect.isPalmMute())?header |= EFFECT_PALM_MUTE:header;
+		header = (effect.isStaccato())?header |= EFFECT_STACCATO:header;
+		header = (effect.isTapping())?header |= EFFECT_TAPPING:header;
+		header = (effect.isSlapping())?header |= EFFECT_SLAPPING:header;
+		header = (effect.isPopping())?header |= EFFECT_POPPING:header;
+		header = (effect.isFadeIn())?header |= EFFECT_FADE_IN:header;
+		header = (effect.isLetRing())?header |= EFFECT_LET_RING:header;
+
+		writeHeader(header,3);
+
+		//escribo el bend
+		if(((header & EFFECT_BEND) != 0)){
+			writeBendEffect(effect.getBend());
+		}
+
+		//leo el tremolo bar
+		if(((header & EFFECT_TREMOLO_BAR) != 0)){
+			writeTremoloBarEffect(effect.getTremoloBar());
+		}
+
+		//leo el harmonic
+		if(((header & EFFECT_HARMONIC) != 0)){
+			writeHarmonicEffect(effect.getHarmonic());
+		}
+
+		//leo el grace
+		if(((header & EFFECT_GRACE) != 0)){
+			writeGraceEffect(effect.getGrace());
+		}
+
+		//leo el trill
+		if(((header & EFFECT_TRILL) != 0)){
+			writeTrillEffect(effect.getTrill());
+		}
+
+		//leo el tremolo picking
+		if(((header & EFFECT_TREMOLO_PICKING) != 0)){
+			writeTremoloPickingEffect(effect.getTremoloPicking());
+		}
+	}
+
+	private void writeBendEffect(TGEffectBend effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<BendPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectBend.BendPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte(point.getValue());
+		}
+	}
+
+	private void writeTremoloBarEffect(TGEffectTremoloBar effect){
+		//escribo la cantidad de puntos
+		writeByte(effect.getPoints().size());
+
+		Iterator<TremoloBarPoint> it = effect.getPoints().iterator();
+		while(it.hasNext()){
+			TGEffectTremoloBar.TremoloBarPoint point = it.next();
+
+			//escribo la posicion
+			writeByte(point.getPosition());
+
+			//escribo el valor
+			writeByte( (point.getValue() + TGEffectTremoloBar.MAX_VALUE_LENGTH) );
+		}
+	}
+
+	private void writeHarmonicEffect(TGEffectHarmonic effect){
+		//excribo el tipo
+		writeByte(effect.getType());
+
+		//excribo la data
+		if(effect.getType() != TGEffectHarmonic.TYPE_NATURAL){
+			writeByte(effect.getData());
+		}
+	}
+
+	private void writeGraceEffect(TGEffectGrace effect){
+		int header = 0;
+		header = (effect.isDead())?header |= GRACE_FLAG_DEAD:header;
+		header = (effect.isOnBeat())?header |= GRACE_FLAG_ON_BEAT:header;
+
+		//excribo el header
+		writeHeader(header);
+
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration());
+
+		//excribo el velocity
+		writeByte(effect.getDynamic());
+
+		//excribo la transicion
+		writeByte(effect.getTransition());
+	}
+
+	private void writeTremoloPickingEffect(TGEffectTremoloPicking effect){
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeTrillEffect(TGEffectTrill effect){
+		//excribo el fret
+		writeByte(effect.getFret());
+
+		//excribo la duracion
+		writeByte(effect.getDuration().getValue());
+	}
+
+	private void writeMarker(TGMarker marker){
+		//escribo el titulo
+		writeUnsignedByteString(marker.getTitle());
+
+		//escribo el color
+		writeRGBColor(marker.getColor());
+	}
+
+	private void writeRGBColor(TGColor color){
+		//escribo el RGB
+		writeByte(color.getR());
+		writeByte(color.getG());
+		writeByte(color.getB());
+	}
+
+	private void writeLyrics(TGLyric lyrics){
+		//escribo el compas de comienzo
+		writeShort((short)lyrics.getFrom());
+
+		//escribo el texto
+		writeIntegerString(lyrics.getLyrics());
+	}
+
+	public void writeByte(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeUnsignedByteString(String v){
+		try {
+			String byteString = (v == null ? new String() : ((v.length() > 0xFF)?v.substring(0, 0xFF):v) );
+			this.dataOutputStream.write(byteString.length());
+			this.dataOutputStream.writeChars(byteString);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void writeIntegerString(String v){
+		try {
+			this.dataOutputStream.writeInt(v.length());
+			this.dataOutputStream.writeChars(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v){
+		try {
+			this.dataOutputStream.write(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void writeHeader(int v,int bCount){
+		for(int i = bCount; i > 0; i --){
+			writeHeader( (v >>> ( (8 * i) - 8 ) )  &  0xFF);
+		}
+	}
+
+	public void writeShort(short v){
+		try {
+			this.dataOutputStream.writeShort(v);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private TGChannel getChannel( TGSong song, TGTrack track ){
+		TGSongManager tgSongManager = new TGSongManager(this.factory);
+		tgSongManager.setSong( song );
+
+		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
+		if( tgChannel != null ){
+			return tgChannel;
+		}
+		if( this.channelAux == null ){
+			this.channelAux = tgSongManager.createChannel();
+			if( this.channelAux.getChannel() < 0 && song.countChannels() > 0 ){
+				this.channelAux = (song.getChannel(song.countChannels() - 1));
+			}
+		}
+		return this.channelAux;
+	}
+}
diff --git a/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGStream.java b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGStream.java
new file mode 100644
index 00000000..10bb0f0f
--- /dev/null
+++ b/plugins/compat/src/main/java/org/herac/tuxguitar/io/tg/v12/TGStream.java
@@ -0,0 +1,205 @@
+package org.herac.tuxguitar.io.tg.v12;
+
+import org.herac.tuxguitar.song.factory.TGFactory;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGVelocities;
+import org.herac.tuxguitar.util.TGVersion;
+
+public class TGStream {
+
+	public static final String TG_FORMAT_NAME = ("TuxGuitar File Format");
+
+	public static final String TG_FORMAT_VERSION = (TG_FORMAT_NAME + " - " + new TGVersion(1,2,0).getVersion() );
+
+	public static final String TG_FORMAT_EXTENSION = (".tg");
+
+	protected static final int TRACK_SOLO = 0x01;
+
+	protected static final int TRACK_MUTE = 0x02;
+
+	protected static final int TRACK_LYRICS = 0x04;
+
+	protected static final int MEASURE_HEADER_TIMESIGNATURE = 0x01;
+
+	protected static final int MEASURE_HEADER_TEMPO = 0x02;
+
+	protected static final int MEASURE_HEADER_REPEAT_OPEN = 0x04;
+
+	protected static final int MEASURE_HEADER_REPEAT_CLOSE = 0x08;
+
+	protected static final int MEASURE_HEADER_REPEAT_ALTERNATIVE = 0x10;
+
+	protected static final int MEASURE_HEADER_MARKER = 0x20;
+
+	protected static final int MEASURE_HEADER_TRIPLET_FEEL = 0x40;
+
+	protected static final int MEASURE_CLEF = 0x01;
+
+	protected static final int MEASURE_KEYSIGNATURE = 0x02;
+
+	protected static final int BEAT_HAS_NEXT = 0x01;
+
+	protected static final int BEAT_HAS_STROKE = 0x02;
+
+	protected static final int BEAT_HAS_CHORD = 0x04;
+
+	protected static final int BEAT_HAS_TEXT = 0x08;
+
+	protected static final int BEAT_HAS_VOICE = 0x10;
+
+	protected static final int BEAT_HAS_VOICE_CHANGES = 0x20;
+
+	protected static final int VOICE_HAS_NOTES = 0x01;
+
+	protected static final int VOICE_NEXT_DURATION = 0x02;
+
+	protected static final int VOICE_DIRECTION_UP = 0x04;
+
+	protected static final int VOICE_DIRECTION_DOWN = 0x08;
+
+	protected static final int NOTE_HAS_NEXT = 0x01;
+
+	protected static final int NOTE_TIED = 0x02;
+
+	protected static final int NOTE_EFFECT = 0x04;
+
+	protected static final int NOTE_VELOCITY = 0x08;
+
+	protected static final int DURATION_DOTTED = 0x01;
+
+	protected static final int DURATION_DOUBLE_DOTTED = 0x02;
+
+	protected static final int DURATION_NO_TUPLET = 0x04;
+
+	protected static final int EFFECT_BEND = 0x000001;
+
+	protected static final int EFFECT_TREMOLO_BAR = 0x000002;
+
+	protected static final int EFFECT_HARMONIC = 0x000004;
+
+	protected static final int EFFECT_GRACE = 0x000008;
+
+	protected static final int EFFECT_TRILL = 0x000010;
+
+	protected static final int EFFECT_TREMOLO_PICKING = 0x000020;
+
+	protected static final int EFFECT_VIBRATO = 0x000040;
+
+	protected static final int EFFECT_DEAD = 0x000080;
+
+	protected static final int EFFECT_SLIDE = 0x000100;
+
+	protected static final int EFFECT_HAMMER = 0x000200;
+
+	protected static final int EFFECT_GHOST = 0x000400;
+
+	protected static final int EFFECT_ACCENTUATED = 0x000800;
+
+	protected static final int EFFECT_HEAVY_ACCENTUATED = 0x001000;
+
+	protected static final int EFFECT_PALM_MUTE = 0x002000;
+
+	protected static final int EFFECT_STACCATO = 0x004000;
+
+	protected static final int EFFECT_TAPPING = 0x008000;
+
+	protected static final int EFFECT_SLAPPING = 0x010000;
+
+	protected static final int EFFECT_POPPING = 0x020000;
+
+	protected static final int EFFECT_FADE_IN = 0x040000;
+
+	protected static final int EFFECT_LET_RING = 0x080000;
+
+	protected static final int GRACE_FLAG_DEAD = 0x01;
+
+	protected static final int GRACE_FLAG_ON_BEAT = 0x02;
+
+	protected class TGBeatData {
+		private long currentStart;
+		private TGVoiceData[] voices;
+
+		protected TGBeatData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.currentStart = measure.getStart();
+			this.voices = new TGVoiceData[TGBeat.MAX_VOICES];
+			for(int i = 0 ; i < this.voices.length ; i ++ ){
+				this.voices[i] = new TGVoiceData(measure);
+			}
+		}
+
+		protected TGVoiceData getVoice(int index){
+			return this.voices[index];
+		}
+
+		public long getCurrentStart(){
+			long minimumStart = -1;
+			for(int i = 0 ; i < this.voices.length ; i ++ ){
+				if( this.voices[i].getStart() > this.currentStart ){
+					if( minimumStart < 0 || this.voices[i].getStart() < minimumStart ){
+						minimumStart = this.voices[i].getStart();
+					}
+				}
+			}
+			if( minimumStart > this.currentStart ){
+				this.currentStart = minimumStart;
+			}
+			return this.currentStart;
+		}
+	}
+
+	protected class TGVoiceData {
+		private long start;
+		private int velocity;
+		private int flags;
+		private TGDuration duration;
+
+		protected TGVoiceData(TGMeasure measure){
+			this.init(measure);
+		}
+
+		private void init(TGMeasure measure){
+			this.flags = 0;
+			this.setStart(measure.getStart());
+			this.setVelocity(TGVelocities.DEFAULT);
+			this.setDuration(new TGFactory().newDuration());
+		}
+
+		public TGDuration getDuration() {
+			return this.duration;
+		}
+
+		public void setDuration(TGDuration duration) {
+			this.duration = duration;
+		}
+
+		public long getStart() {
+			return this.start;
+		}
+
+		public void setStart(long start) {
+			this.start = start;
+		}
+
+		public int getVelocity() {
+			return this.velocity;
+		}
+
+		public void setVelocity(int velocity) {
+			this.velocity = velocity;
+		}
+
+		public int getFlags() {
+			return this.flags;
+		}
+
+		public void setFlags(int flags) {
+			this.flags = flags;
+		}
+	}
+}
diff --git a/TuxGuitar-compat/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/compat/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-compat/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/compat/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/converter/pom.xml b/plugins/converter/pom.xml
new file mode 100644
index 00000000..16221453
--- /dev/null
+++ b/plugins/converter/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-converter</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Converter</name>
+	<description>Converter plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverter.java b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverter.java
similarity index 96%
rename from TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverter.java
rename to plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverter.java
index 700963cd..3f830411 100644
--- a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverter.java
+++ b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverter.java
@@ -22,7 +22,7 @@
 public class TGConverter {
 	// This value will delay the process something like 1 minute for 3000 files.
 	public static final int SLEEP_TIME = 20;
-	
+
 	public static final int FILE_OK = 250;
 	public static final int FILE_BAD = 403;
 	public static final int FILE_COULDNT_WRITE = 401;
@@ -30,22 +30,22 @@ public class TGConverter {
 	public static final int OUT_OF_MEMORY = 500;
 	public static final int EXPORTER_NOT_FOUND = 590;
 	public static final int UNKNOWN_ERROR = 666;
-	
-	private String sourceFolder;
-	private String destinationFolder;
+
+	private final String sourceFolder;
+	private final String destinationFolder;
 	private TGConverterFormat format;
 	private TGConverterListener listener;
 	private boolean cancelled;
-	
+
 	public TGConverter(String sourceFolder,String destinationFolder){
 		this.sourceFolder = sourceFolder;
 		this.destinationFolder = destinationFolder;
 	}
-	
+
 	public void convert(String fileName, String convertFileName) {
 		try {
 			this.getListener().notifyFileProcess(convertFileName);
-			
+
 			TGSongManager manager = new TGSongManager();
 			TGSong song = null;
 			try {
@@ -53,14 +53,14 @@ public void convert(String fileName, String convertFileName) {
 			} catch (TGFileFormatException e) {
 				song = importSong(manager.getFactory(), fileName);
 			}
-			
+
 			if (song != null){
 				manager.setSong(song);
 				manager.autoCompleteSilences();
 				manager.orderBeats();
-				
+
 				new File(new File(convertFileName).getParent()).mkdirs();
-				
+
 				if( this.format != null && this.format.getExporter() instanceof TGOutputStreamBase ){
 					TGOutputStreamBase exporter = (TGOutputStreamBase) this.format.getExporter();
 					exporter.init(manager.getFactory(), new BufferedOutputStream(new FileOutputStream(convertFileName)));
@@ -78,7 +78,7 @@ else if( this.format != null && this.format.getExporter() instanceof TGLocalFile
 				this.getListener().notifyFileResult(fileName,FILE_BAD);
 			}
 		} catch (TGFileFormatException e) {
-			this.getListener().notifyFileResult(fileName,FILE_COULDNT_WRITE); 
+			this.getListener().notifyFileResult(fileName,FILE_COULDNT_WRITE);
 		} catch (FileNotFoundException ex) {
 			this.getListener().notifyFileResult(fileName,FILE_NOT_FOUND);
 		} catch (OutOfMemoryError e) {
@@ -87,14 +87,14 @@ else if( this.format != null && this.format.getExporter() instanceof TGLocalFile
 			this.getListener().notifyFileResult(convertFileName,UNKNOWN_ERROR);
 		}
 	}
-	
+
 	private String checkIfExists(String convertFileName, int level) {
 		if (new File(convertFileName).exists()) {
 			String tmpName = convertFileName;
 			String tmpExtension = "";
 			String tmpLevel = "(" + (level + 1) + ")";
 			String lastLevel = "(" + (level ) + ")";
-			
+
 			int index = convertFileName.lastIndexOf( (level == 0 ? "." : lastLevel + ".") );
 			if (index!=-1) {
 				tmpExtension = tmpName.substring(index + ( level == 0 ? 0 : lastLevel.length() ), tmpName.length());
@@ -104,13 +104,13 @@ private String checkIfExists(String convertFileName, int level) {
 		}
 		return convertFileName;
 	}
-	
+
 	public void process() {
 		this.getListener().notifyStart();
 		this.process(new File(this.sourceFolder));
 		this.getListener().notifyFinish();
 	}
-	
+
 	private void process(File folder) {
 		if(!isCancelled()){
 			String[] fileNames = folder.list();
@@ -123,7 +123,7 @@ private void process(File folder) {
 						String fileName = file.getAbsolutePath();
 						String convertFileName = getConvertFileName(fileName);
 						convert(fileName, convertFileName);
-						
+
 						// Just release the thread some milliseconds
 						sleep();
 					}
@@ -132,7 +132,7 @@ private void process(File folder) {
 			}
 		}
 	}
-	
+
 	private String getConvertFileName(String path) {
 		String convertPath = (this.destinationFolder + File.separator +path.substring(this.sourceFolder.length()));
 		int lastDot = convertPath.lastIndexOf(".");
@@ -141,12 +141,12 @@ private String getConvertFileName(String path) {
 		}
 		return checkIfExists( new File(convertPath).getAbsolutePath() , 0 );
 	}
-	
+
 	private TGSong importSong(TGFactory factory, String filename) {
-		Iterator importers = TGFileFormatManager.instance().getImporters();
+		Iterator<TGRawImporter> importers = TGFileFormatManager.instance().getImporters();
 		while (importers.hasNext() ) {
 			try {
-				TGRawImporter rawImporter = (TGRawImporter)importers.next();
+				TGRawImporter rawImporter = importers.next();
 				if( rawImporter instanceof TGLocalFileImporter ){
 					TGLocalFileImporter currentImporter = (TGLocalFileImporter)rawImporter;
 					currentImporter.configure(true);
@@ -162,7 +162,7 @@ private TGSong importSong(TGFactory factory, String filename) {
 		}
 		return null;
 	}
-	
+
 	private boolean isSupportedExtension(String filename, TGLocalFileImporter currentImporter) {
 		try {
 			String extension = filename.substring(filename.lastIndexOf("."),filename.length());
@@ -174,10 +174,10 @@ private boolean isSupportedExtension(String filename, TGLocalFileImporter curren
 		} catch (Exception ex) {
 			return false;
 		}
-		
+
 		return false;
 	}
-	
+
 	private void sleep(){
 		try {
 			Thread.sleep( SLEEP_TIME );
@@ -185,23 +185,23 @@ private void sleep(){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public void setFormat( TGConverterFormat format ) {
 		this.format = format;
 	}
-	
+
 	public TGConverterListener getListener() {
 		return this.listener;
 	}
-	
+
 	public void setListener(TGConverterListener listener) {
 		this.listener = listener;
 	}
-	
+
 	public boolean isCancelled() {
 		return this.cancelled;
 	}
-	
+
 	public void setCancelled(boolean cancelled) {
 		this.cancelled = cancelled;
 	}
diff --git a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterDialog.java b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterDialog.java
similarity index 94%
rename from TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterDialog.java
rename to plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterDialog.java
index 66bea0a4..ffd8ea4f 100644
--- a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterDialog.java
+++ b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterDialog.java
@@ -31,9 +31,9 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class TGConverterDialog implements LanguageLoader,IconLoader{
-	
+
 	private static final int SHELL_WIDTH = 500;
-	
+
 	protected Shell dialog;
 	protected Group group;
 	protected Label outputFormatLabel;
@@ -43,48 +43,50 @@ public class TGConverterDialog implements LanguageLoader,IconLoader{
 	protected Button outputFolderChooser;
 	protected Button buttonOK;
 	protected Button buttonCancel;
-	
-	protected List outputFormats;
-	
+
+	protected List<TGConverterFormat> outputFormats;
+
 	public TGConverterDialog() {
-		this.outputFormats = new ArrayList();
+		this.outputFormats = new ArrayList<TGConverterFormat>();
 	}
-	
+
 	public void show() {
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(),SWT.DIALOG_TRIM);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setMinimumSize(SHELL_WIDTH,SWT.DEFAULT);
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				TuxGuitar.instance().getIconManager().removeLoader( TGConverterDialog.this );
 				TuxGuitar.instance().getLanguageManager().removeLoader( TGConverterDialog.this );
 			}
 		});
-		
+
 		// Settings
 		this.group = new Group(this.dialog,SWT.SHADOW_ETCHED_IN);
 		this.group.setLayout(new GridLayout());
 		this.group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Composite composite = new Composite(this.group,SWT.NONE);
 		composite.setLayout(new GridLayout(3,false));
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.outputFormatLabel = new Label(composite,SWT.LEFT);
 		this.outputFormatLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,false,false));
-		
+
 		final Combo outputFormat = new Combo(composite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		outputFormat.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,false,2,1));
 		addFileFormats(outputFormat);
-		
+
 		this.inputFolderLabel = new Label(composite,SWT.LEFT);
 		this.inputFolderLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,false,false));
-		
+
 		final Text inputFolder = new Text(composite,SWT.BORDER);
 		inputFolder.setLayoutData(new GridData(SWT.FILL, SWT.CENTER,true,false));
-		
+
 		this.inputFolderChooser = new Button(composite,SWT.PUSH);
 		this.inputFolderChooser.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				DirectoryDialog directoryDialog = new DirectoryDialog(TGConverterDialog.this.dialog);
 				String selection = directoryDialog.open();
@@ -93,15 +95,16 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		this.outputFolderLabel = new Label(composite,SWT.LEFT);
 		this.outputFolderLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,false,false));
-		
+
 		final Text outputFolder = new Text(composite,SWT.BORDER);
 		outputFolder.setLayoutData(new GridData(SWT.FILL, SWT.CENTER,true,false));
-		
+
 		this.outputFolderChooser = new Button(composite,SWT.PUSH);
 		this.outputFolderChooser.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				DirectoryDialog directoryDialog = new DirectoryDialog(TGConverterDialog.this.dialog);
 				String selection = directoryDialog.open();
@@ -110,20 +113,21 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
-		
+
 		this.buttonOK = new Button(buttons, SWT.PUSH);
 		this.buttonOK.setLayoutData(getGridData(80,25));
 		this.buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				String inputFolderValue = inputFolder.getText();
 				String outputFolderValue = outputFolder.getText();
 				TGConverterFormat outputFormatValue = getFileFormat( outputFormat.getSelectionIndex() );
-				
+
 				if(inputFolderValue == null || inputFolderValue.trim().length() == 0){
 					MessageDialog.errorMessage(TGConverterDialog.this.dialog,TuxGuitar.getProperty("batch.converter.input.folder.invalid"));
 				}
@@ -140,49 +144,50 @@ else if(outputFormatValue == null){
 				}
 			}
 		});
-		
+
 		this.buttonCancel = new Button(buttons, SWT.PUSH);
 		this.buttonCancel.setLayoutData(getGridData(80,25));
 		this.buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TGConverterDialog.this.dialog.dispose();
 			}
 		});
-		
+
 		this.dialog.setDefaultButton( this.buttonOK );
-		
+
 		this.loadIcons(false);
 		this.loadProperties(false);
-		
+
 		TuxGuitar.instance().getIconManager().addLoader( this );
 		TuxGuitar.instance().getLanguageManager().addLoader( this );
-		
+
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.dialog == null || this.dialog.isDisposed());
 	}
-	
+
 	private GridData getGridData(int minimumWidth, int minimumHeight){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = minimumWidth;
 		data.minimumHeight = minimumHeight;
 		return data;
 	}
-	
+
 	private void addFileFormats(Combo combo){
 		this.outputFormats.clear();
-		
-		Iterator outputStreams = TGFileFormatManager.instance().getOutputStreams();
+
+		Iterator<TGOutputStreamBase> outputStreams = TGFileFormatManager.instance().getOutputStreams();
 		while(outputStreams.hasNext()){
-			TGOutputStreamBase stream = (TGOutputStreamBase)outputStreams.next();
+			TGOutputStreamBase stream = outputStreams.next();
 			addFileFormats(combo, stream.getFileFormat() , stream );
 		}
-		
-		Iterator exporters = TGFileFormatManager.instance().getExporters();
+
+		Iterator<TGRawExporter> exporters = TGFileFormatManager.instance().getExporters();
 		while (exporters.hasNext()) {
-			TGRawExporter exporter = (TGRawExporter)exporters.next();
+			TGRawExporter exporter = exporters.next();
 			if( exporter instanceof TGLocalFileExporter ){
 				addFileFormats(combo, ((TGLocalFileExporter)exporter).getFileFormat() , exporter );
 			}
@@ -191,7 +196,7 @@ private void addFileFormats(Combo combo){
 			combo.select( 0 );
 		}
 	}
-	
+
 	private void addFileFormats(Combo combo, TGFileFormat format, Object exporter ){
 		if(format.getSupportedFormats() != null){
 			String[] extensions = format.getSupportedFormats().split(TGFileFormat.EXTENSION_SEPARATOR);
@@ -210,18 +215,19 @@ private void addFileFormats(Combo combo, TGFileFormat format, Object exporter ){
 			}
 		}
 	}
-	
+
 	protected TGConverterFormat getFileFormat(int index){
 		if(index >= 0 && index < this.outputFormats.size()){
-			return (TGConverterFormat)this.outputFormats.get(index);
+			return this.outputFormats.get(index);
 		}
 		return null;
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.loadProperties(true);
 	}
-	
+
 	public void loadProperties(boolean layout){
 		if(!isDisposed()){
 			this.dialog.setText(TuxGuitar.getProperty("batch.converter"));
@@ -236,11 +242,12 @@ public void loadProperties(boolean layout){
 			}
 		}
 	}
-	
+
+	@Override
 	public void loadIcons() {
 		this.loadIcons(true);
 	}
-	
+
 	public void loadIcons(boolean layout){
 		if(!isDisposed()){
 			this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
diff --git a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterFormat.java b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterFormat.java
similarity index 97%
rename from TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterFormat.java
rename to plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterFormat.java
index 4a5bff0a..1bf5765f 100644
--- a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterFormat.java
+++ b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterFormat.java
@@ -1,19 +1,19 @@
 package org.herac.tuxguitar.app.tools.custom.converter;
 
 public class TGConverterFormat {
-	
+
 	private String extension;
 	private Object exporter;
-	
+
 	public TGConverterFormat(String extension, Object exporter){
 		this.extension = extension;
 		this.exporter = exporter;
 	}
-	
+
 	public String getExtension() {
 		return this.extension;
 	}
-	
+
 	public Object getExporter() {
 		return this.exporter;
 	}
diff --git a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterListener.java b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterListener.java
similarity index 96%
rename from TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterListener.java
rename to plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterListener.java
index 3d501c4d..892f13a3 100644
--- a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterListener.java
+++ b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterListener.java
@@ -1,13 +1,13 @@
 package org.herac.tuxguitar.app.tools.custom.converter;
 
 public interface TGConverterListener {
-	
+
 	public void notifyStart();
-	
+
 	public void notifyFinish();
-	
+
 	public void notifyFileProcess( String filename );
-	
+
 	public void notifyFileResult( String filename, int errorCode );
-	
+
 }
diff --git a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterPlugin.java b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterPlugin.java
similarity index 90%
rename from TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterPlugin.java
rename to plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterPlugin.java
index 40aeb278..b942d7da 100644
--- a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterPlugin.java
+++ b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterPlugin.java
@@ -1,28 +1,34 @@
 package org.herac.tuxguitar.app.tools.custom.converter;
 
 public class TGConverterPlugin extends org.herac.tuxguitar.app.system.plugins.base.TGToolItemPlugin {
-	
+
+	@Override
 	protected void doAction() {
 		new TGConverterDialog().show();
 	}
-	
+
+	@Override
 	protected String getItemName() {
 		return "File format batch converter";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "BatchConverter";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Nikola Kolarovic & Julian Casadesus";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Converts folder containing various tab formats into wanted file format.\n" +
 		       "Depending on your loaded file format plugins, you can read and write.";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterProcess.java b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterProcess.java
similarity index 97%
rename from TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterProcess.java
rename to plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterProcess.java
index 664882e9..fcdd3c8e 100644
--- a/TuxGuitar-converter/src/org/herac/tuxguitar/app/tools/custom/converter/TGConverterProcess.java
+++ b/plugins/converter/src/main/java/org/herac/tuxguitar/app/tools/custom/converter/TGConverterProcess.java
@@ -22,109 +22,115 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class TGConverterProcess implements TGConverterListener,LanguageLoader,IconLoader{
-	
+
 	private static final int SHELL_WIDTH = 650;
 	private static final int SHELL_HEIGHT = 350;
-	
+
 	protected static final String EOL = ("\n");
-	
+
 	protected static final Color COLOR_INFO  = TuxGuitar.instance().getDisplay().getSystemColor(SWT.COLOR_BLUE);
 	protected static final Color COLOR_ERROR = TuxGuitar.instance().getDisplay().getSystemColor(SWT.COLOR_RED );
-	
+
 	protected Shell dialog;
 	protected StyledText output;
 	protected Button buttonCancel;
 	protected Button buttonClose;
 	protected TGConverter converter;
 	protected boolean finished;
-	
+
 	public void start(final String initFolder,String destFolder, TGConverterFormat format ){
 		this.converter = new TGConverter(initFolder,destFolder);
 		this.converter.setFormat(format);
 		this.converter.setListener(this);
-		
+
 		this.showProcess();
-		
+
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				TGConverterProcess.this.converter.process();
 			}
 		}).start();
 	}
-	
+
 	protected void showProcess() {
 		this.finished = false;
-		
+
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(),SWT.SHELL_TRIM);
 		this.dialog.setLayout(new GridLayout());
 		this.dialog.setSize( SHELL_WIDTH , SHELL_HEIGHT );
 		this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent e) {
 				TuxGuitar.instance().getIconManager().removeLoader( TGConverterProcess.this );
 				TuxGuitar.instance().getLanguageManager().removeLoader( TGConverterProcess.this );
 			}
 		});
 		this.dialog.addShellListener(new ShellAdapter() {
+			@Override
 			public void shellClosed(ShellEvent e) {
 				e.doit = TGConverterProcess.this.finished;
 			}
 		});
-		
+
 		Composite composite = new Composite(this.dialog,SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.output = new StyledText(composite,SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
 		this.output.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		this.output.setEditable(false);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(this.dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
-		
+
 		this.buttonCancel = new Button(buttons, SWT.PUSH);
 		this.buttonCancel.setEnabled( false );
 		this.buttonCancel.setLayoutData(getButtonsData());
 		this.buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TGConverterProcess.this.converter.setCancelled( true );
 			}
 		});
-		
+
 		this.buttonClose = new Button(buttons, SWT.PUSH);
 		this.buttonClose.setEnabled( false );
 		this.buttonClose.setLayoutData(getButtonsData());
 		this.buttonClose.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TGConverterProcess.this.dialog.dispose();
 			}
 		});
-		
+
 		this.loadIcons(false);
 		this.loadProperties(false);
-		
+
 		TuxGuitar.instance().getIconManager().addLoader( this );
 		TuxGuitar.instance().getLanguageManager().addLoader( this );
-		
+
 		DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER);
 	}
-	
+
 	private GridData getButtonsData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	public boolean isDisposed(){
 		return (this.dialog == null || this.dialog.isDisposed() );
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.loadProperties(true);
 	}
-	
+
 	public void loadProperties(boolean layout){
 		if(!isDisposed()){
 			this.dialog.setText(TuxGuitar.getProperty("batch.converter"));
@@ -135,11 +141,12 @@ public void loadProperties(boolean layout){
 			}
 		}
 	}
-	
+
+	@Override
 	public void loadIcons() {
 		this.loadIcons(true);
 	}
-	
+
 	public void loadIcons(boolean layout){
 		if(!isDisposed()){
 			this.dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
@@ -148,15 +155,17 @@ public void loadIcons(boolean layout){
 			}
 		}
 	}
-	
+
 	//------------------------------------------------------------------------------------------------//
 	//---TGConverterListener Implementation ----------------------------------------------------------//
 	//------------------------------------------------------------------------------------------------//
-	
+
+	@Override
 	public void notifyFileProcess(final String filename) {
 		if(!isDisposed() ){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed() ){
 							TGConverterProcess.this.output.append(TuxGuitar.getProperty("batch.converter.messages.converting", new String[] {filename}));
@@ -169,11 +178,13 @@ public void run() {
 			}
 		}
 	}
-	
+
+	@Override
 	public void notifyFileResult(final String filename, final int result) {
 		if(!isDisposed() ){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed() ){
 							TGConverterProcess.this.appendLogMessage(result, filename);
@@ -186,11 +197,13 @@ public void run() {
 			}
 		}
 	}
-	
+
+	@Override
 	public void notifyStart() {
 		if(!isDisposed() ){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed() ){
 							TGConverterProcess.this.finished = false;
@@ -205,11 +218,13 @@ public void run() {
 			}
 		}
 	}
-	
+
+	@Override
 	public void notifyFinish() {
 		if(!isDisposed() ){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed() ){
 							TGConverterProcess.this.finished = true;
@@ -224,10 +239,10 @@ public void run() {
 			}
 		}
 	}
-	
+
 	protected void appendLogMessage(int result, String fileName) {
 		String message = (TuxGuitar.getProperty( "batch.converter.messages." + (result == TGConverter.FILE_OK ? "ok" : "failed") ) + EOL);
-		
+
 		switch (result) {
 			case TGConverter.FILE_COULDNT_WRITE :
 				message += ( TuxGuitar.getProperty("batch.converter.messages.couldnt-write", new String[] {fileName}) + EOL );
@@ -248,12 +263,12 @@ protected void appendLogMessage(int result, String fileName) {
 				message += ( TuxGuitar.getProperty("batch.converter.messages.unknown-error", new String[] {fileName}) + EOL );
 				break;
 		}
-		
+
 		StyleRange range = new StyleRange();
 		range.foreground = ( result == TGConverter.FILE_OK ? TGConverterProcess.COLOR_INFO : TGConverterProcess.COLOR_ERROR );
 		range.start = TGConverterProcess.this.output.getCharCount();
 		range.length = message.length();
-		
+
 		TGConverterProcess.this.output.append( message );
 		TGConverterProcess.this.output.setStyleRange(range);
 	}
diff --git a/TuxGuitar-converter/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/converter/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-converter/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/converter/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-converter/share/lang/messages.properties b/plugins/converter/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-converter/share/lang/messages.properties
rename to plugins/converter/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-converter/share/lang/messages_en.properties b/plugins/converter/src/main/resources/lang/messages_en.properties
similarity index 100%
rename from TuxGuitar-converter/share/lang/messages_en.properties
rename to plugins/converter/src/main/resources/lang/messages_en.properties
diff --git a/TuxGuitar-converter/share/lang/messages_ja.properties b/plugins/converter/src/main/resources/lang/messages_ja.properties
similarity index 100%
rename from TuxGuitar-converter/share/lang/messages_ja.properties
rename to plugins/converter/src/main/resources/lang/messages_ja.properties
diff --git a/TuxGuitar-converter/share/lang/messages_sr.properties b/plugins/converter/src/main/resources/lang/messages_sr.properties
similarity index 100%
rename from TuxGuitar-converter/share/lang/messages_sr.properties
rename to plugins/converter/src/main/resources/lang/messages_sr.properties
diff --git a/TuxGuitar-converter/share/lang/messages_sv.properties b/plugins/converter/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-converter/share/lang/messages_sv.properties
rename to plugins/converter/src/main/resources/lang/messages_sv.properties
diff --git a/TuxGuitar-converter/share/lang/messages_zh_TW.properties b/plugins/converter/src/main/resources/lang/messages_zh_TW.properties
similarity index 100%
rename from TuxGuitar-converter/share/lang/messages_zh_TW.properties
rename to plugins/converter/src/main/resources/lang/messages_zh_TW.properties
diff --git a/plugins/coreaudio/CLEAN+TEST b/plugins/coreaudio/CLEAN+TEST
new file mode 100644
index 00000000..e69de29b
diff --git a/TuxGuitar-CoreAudio/How to Install.txt b/plugins/coreaudio/How to Install.txt
similarity index 100%
rename from TuxGuitar-CoreAudio/How to Install.txt
rename to plugins/coreaudio/How to Install.txt
diff --git a/plugins/coreaudio/Makefile b/plugins/coreaudio/Makefile
new file mode 100644
index 00000000..0d203366
--- /dev/null
+++ b/plugins/coreaudio/Makefile
@@ -0,0 +1,24 @@
+CXX = g++
+
+ARCH = -arch x86_64
+
+SDK = $(shell xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk # works for 10.8.2
+JAVA_FRAMEWORK = $(SDK)/System/Library/Frameworks/JavaVM.framework
+
+#INCLUDES = -I $(JAVA_FRAMEWORK)/Headers/
+
+LIBRARIES = -framework CoreAudio -framework JavaVM -framework AudioUnit -framework AudioToolbox -framework Carbon
+
+LIBRARY = libtuxguitar-coreaudio-jni.jnilib
+
+FILENAME = org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.cpp
+
+all:	$(LIBRARY)
+
+$(LIBRARY):	clean
+#	g++ $(INCLUDES) -isysroot $(SDK) -arch ppc $(LIBRARIES) -msse -dynamiclib -o ppc_$(LIBRARY) $(FILENAME)
+	g++ $(ARCH) $(LIBRARIES) -msse -dynamiclib -o intel_$(LIBRARY) $(FILENAME)
+	lipo -create intel_$(LIBRARY) -output $(LIBRARY)
+
+clean:
+	rm -f ppc_$(LIBRARY) intel_$(LIBRARY) $(LIBRARY)
diff --git a/plugins/coreaudio/pom.xml b/plugins/coreaudio/pom.xml
new file mode 100644
index 00000000..cd4943d0
--- /dev/null
+++ b/plugins/coreaudio/pom.xml
@@ -0,0 +1,112 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-coreaudio</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: CoreAudio</name>
+	<description>MacOS CoreAudio plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- generate the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+					<phase>validate</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- the jar is also an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+				  <execution>
+					<phase>validate</phase>
+					<goals>
+					  <goal>attach-artifact</goal>
+					</goals>
+					<configuration>
+					  <artifacts>
+						<artifact>
+						  <file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+						  <type>jar</type>
+						</artifact>
+					  </artifacts>
+					</configuration>
+				  </execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>       
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption></compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption></linkerStartOption> 
+					</linkerStartOptions>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.cpp</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/JNILibraryLoader.java b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/JNILibraryLoader.java
new file mode 100644
index 00000000..11a686ce
--- /dev/null
+++ b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/JNILibraryLoader.java
@@ -0,0 +1,65 @@
+package org.herac.tuxguitar.player.impl.midiport.coreaudio;
+
+import java.io.File;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_EXTENSION = ".jnilib";
+
+	//private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		System.out.println("trying to load" + libname + " (void loadLibrary)");
+		JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION);
+		/*
+		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
+			//System.loadLibrary(libname);
+		}
+		 */
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		System.out.println("trying to load" + filename + " (bool loadFromClassPath)");
+
+		File file = new File(/*JNI_TMP_PATH +*/ filename);
+		/*
+		try{
+			if(!file.exists()){
+				OutputStream outputStream = new FileOutputStream(file);
+				InputStream inputStream = JNILibraryLoader.class.getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			*/
+			if(file.exists()){
+				System.out.println("calling file.getAbsolutePath() : "+ file.getAbsolutePath());
+				System.load(file.getAbsolutePath());
+				//System.load(file.getAbsolutePath());
+				return true;
+			}
+			//else
+			//{
+				System.out.println("Can't find file " + file.getAbsolutePath());
+				return false;
+			//}
+			/*
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+			 */
+	}
+}
+
+
diff --git a/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java
new file mode 100644
index 00000000..a6624343
--- /dev/null
+++ b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortImpl.java
@@ -0,0 +1,50 @@
+package org.herac.tuxguitar.player.impl.midiport.coreaudio;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiPortImpl implements MidiOutputPort{
+
+	private String key;
+	private String name;
+	private MidiReceiverImpl receiver;
+
+	public MidiPortImpl(MidiReceiverImpl midiOut,String name,String key){
+        this.key = key;
+        this.name = name;
+		this.receiver = midiOut;
+	}
+
+	@Override
+	public void open(){
+		if(!this.receiver.isConnected()){
+			this.receiver.connect();
+		}
+	}
+
+	@Override
+	public void close(){
+		this.receiver.disconnect();
+	}
+
+	@Override
+	public MidiReceiver getReceiver(){
+		this.open();
+		return this.receiver;
+	}
+
+	@Override
+	public void check(){
+		// Not implemented
+	}
+
+	@Override
+	public String getKey(){
+		return this.key;
+	}
+
+	@Override
+	public String getName(){
+		return this.name;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderCoreAudio.java b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderCoreAudio.java
similarity index 75%
rename from TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderCoreAudio.java
rename to plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderCoreAudio.java
index f6fb0118..86fe59c3 100644
--- a/TuxGuitar-CoreAudio/src/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderCoreAudio.java
+++ b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderCoreAudio.java
@@ -2,26 +2,28 @@
 
 import java.util.List;
 
+import org.herac.tuxguitar.player.base.MidiOutputPort;
 import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
-import org.herac.tuxguitar.player.impl.midiport.coreaudio.MidiReceiverImpl;
 
 public class MidiPortReaderCoreAudio implements MidiOutputPortProvider{
 
 	private static final MidiReceiverImpl midiOut = new MidiReceiverImpl();
-	
+
 	public MidiPortReaderCoreAudio(){
 		super();
 	}
-	
-	public List listPorts() {
+
+	@Override
+	public List<MidiOutputPort> listPorts() {
 		if(!midiOut.isOpen()){
 			midiOut.open();
 		}
 		return midiOut.listPorts();
 	}
 
-	public void closeAll(){	
+	@Override
+	public void closeAll(){
 		midiOut.close();
 	}
-	
+
 }
diff --git a/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderPlugin.java b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderPlugin.java
new file mode 100644
index 00000000..d4121c14
--- /dev/null
+++ b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiPortReaderPlugin.java
@@ -0,0 +1,33 @@
+package org.herac.tuxguitar.player.impl.midiport.coreaudio;
+
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiPortReaderPlugin extends TGMidiOutputPortProviderPlugin{
+
+	@Override
+	protected MidiOutputPortProvider getProvider() {
+		return new MidiPortReaderCoreAudio();
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Auria";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Core Audio output plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "Core Audio output plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+
+}
diff --git a/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverImpl.java b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverImpl.java
new file mode 100644
index 00000000..a2830ff7
--- /dev/null
+++ b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverImpl.java
@@ -0,0 +1,116 @@
+package org.herac.tuxguitar.player.impl.midiport.coreaudio;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiControllers;
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiReceiverImpl extends MidiReceiverJNI implements MidiReceiver{
+	private boolean open; // unncessary
+    private boolean connected;
+	private final List<MidiOutputPort> ports;
+
+	public MidiReceiverImpl(){
+		this.ports = new ArrayList<MidiOutputPort>();
+        this.connected = false;
+	}
+
+	@Override
+	public void open(){
+		super.open();
+		this.open = true;
+	}
+
+	@Override
+	public void close(){
+		if(this.isOpen()){
+			this.disconnect();
+			super.close();
+			this.open = false;
+		}
+	}
+
+	public boolean isOpen(){
+		return (this.open);
+	}
+
+	public boolean isConnected(){
+		return (this.isOpen() && this.connected);
+	}
+
+    public void connect(){
+        if(isOpen()){
+            if(!isConnected()){
+                this.connected = true;
+                this.openDevice();
+            }
+        }
+    }
+
+	public void disconnect() {
+		if(isConnected()){
+			this.closeDevice();
+			this.connected = false;
+		}
+	}
+
+	public List<MidiOutputPort> listPorts(){
+		if(isOpen()){
+			this.ports.clear();
+			this.ports.add(new MidiPortImpl(this, "Core Audio midi playback" , "coreaudio" ));
+			return this.ports;
+		}
+		return Collections.emptyList();
+	}
+
+	public void sendSystemReset() {
+		if(isOpen()){
+			//not implemented
+		}
+	}
+
+	@Override
+	public void sendAllNotesOff() {
+		for(int i = 0; i < 16; i ++){
+			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
+		}
+	}
+
+	@Override
+	public void sendControlChange(int channel, int controller, int value) {
+		if(isOpen()){
+			super.controlChange(channel, controller, value);
+		}
+	}
+
+	@Override
+	public void sendNoteOff(int channel, int key, int velocity) {
+		if(isOpen()){
+			super.noteOff(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendNoteOn(int channel, int key, int velocity) {
+		if(isOpen()){
+			super.noteOn(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendPitchBend(int channel, int value) {
+		if(isOpen()){
+			super.pitchBend(channel, value);
+		}
+	}
+
+	@Override
+	public void sendProgramChange(int channel, int value) {
+		if(isOpen()){
+			super.programChange(channel, value);
+		}
+	}
+}
diff --git a/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverJNI.java b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverJNI.java
new file mode 100644
index 00000000..e8d7dc2d
--- /dev/null
+++ b/plugins/coreaudio/src/main/java/org/herac/tuxguitar/player/impl/midiport/coreaudio/MidiReceiverJNI.java
@@ -0,0 +1,37 @@
+package org.herac.tuxguitar.player.impl.midiport.coreaudio;
+
+public abstract class MidiReceiverJNI{
+
+	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-coreaudio-jni");
+
+	static{
+		System.loadLibrary (JNI_LIBRARY_NAME);
+	}
+
+	public MidiReceiverJNI() {
+		super();
+	}
+
+	protected native void open();
+
+	protected native void close();
+
+	//protected native void findDevices();
+
+	protected native void openDevice();
+
+	protected native void closeDevice();
+
+	protected native void noteOn(int channel,int note,int velocity);
+
+	protected native void noteOff(int channel,int note,int velocity);
+
+	protected native void controlChange(int channel,int control,int value);
+
+	protected native void programChange(int channel,int program);
+
+	protected native void pitchBend(int channel,int value);
+
+
+	//protected abstract void addDevice(String name);
+}
diff --git a/TuxGuitar-CoreAudio/jni/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.cpp b/plugins/coreaudio/src/main/native/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.cpp
similarity index 100%
rename from TuxGuitar-CoreAudio/jni/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.cpp
rename to plugins/coreaudio/src/main/native/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.cpp
diff --git a/TuxGuitar-CoreAudio/jni/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.h b/plugins/coreaudio/src/main/native/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.h
similarity index 100%
rename from TuxGuitar-CoreAudio/jni/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.h
rename to plugins/coreaudio/src/main/native/org_herac_tuxguitar_player_impl_midiport_coreaudio_MidiReceiverJNI.h
diff --git a/plugins/coreaudio/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/coreaudio/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
new file mode 100644
index 00000000..10992568
--- /dev/null
+++ b/plugins/coreaudio/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
@@ -0,0 +1 @@
+org.herac.tuxguitar.player.impl.midiport.coreaudio.MidiPortReaderPlugin
\ No newline at end of file
diff --git a/plugins/fluidsynth/CLEAN+TEST b/plugins/fluidsynth/CLEAN+TEST
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/fluidsynth/pom.xml b/plugins/fluidsynth/pom.xml
new file mode 100644
index 00000000..59a433dd
--- /dev/null
+++ b/plugins/fluidsynth/pom.xml
@@ -0,0 +1,145 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-fluidsynth</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: Fluidsynth</name>
+	<description>Fluidsynth plugin for TuxGuitar</description>
+
+	<!-- TODO clean up, this pom is full of hack, if there is something cleaner, with only 1 pom, it is welcome -->
+	<build>
+
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+		<plugins>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile java files -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- package the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${version}</finalName>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- install .jar as an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>jar-artefact</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+									<type>jar</type>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared</linkerStartOption>
+					</linkerStartOptions>
+					<linkerEndOptions>
+						<linkerEndOption>-lfluidsynth</linkerEndOption>
+					</linkerEndOptions>
+					<!-- easy way to package the shared lib with jar -->
+					<linkerOutputDirectory>${project.build.directory}/classes</linkerOutputDirectory>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.herac.tuxguitar</groupId>
+			<artifactId>tuxguitar-app</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java
new file mode 100644
index 00000000..62fca6bb
--- /dev/null
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortImpl.java
@@ -0,0 +1,75 @@
+package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
+
+import java.io.File;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiOutputPortImpl implements MidiOutputPort{
+
+	private String key;
+	private String name;
+	private MidiSynth synth;
+	private MidiReceiverImpl receiver;
+	private String soundFont;
+
+	public MidiOutputPortImpl(MidiSynth synth,File soundfont){
+		this.key = getUniqueKey(soundfont);
+		this.name = getUniqueName(soundfont);
+		this.soundFont = soundfont.getAbsolutePath();
+		this.receiver = new MidiReceiverImpl(synth);
+		this.synth = synth;
+	}
+
+	@Override
+	public void open(){
+		if(!this.synth.isConnected(this)){
+			this.synth.connect(this);
+		}
+	}
+
+	@Override
+	public void close(){
+		if(this.synth.isConnected(this)){
+			this.synth.disconnect(this);
+		}
+	}
+
+	@Override
+	public MidiReceiver getReceiver(){
+		this.open();
+		return this.receiver;
+	}
+
+	@Override
+	public void check(){
+		// Not implemented
+	}
+
+	public String getSoundFont() {
+		return this.soundFont;
+	}
+
+	@Override
+	public String getKey(){
+		return this.key;
+	}
+
+	@Override
+	public String getName(){
+		return this.name;
+	}
+
+	public String getUniqueKey(File soundfont){
+		return ("tuxguitar-fluidsynth_" + soundfont.getAbsolutePath());
+	}
+
+	private String getUniqueName(File soundfont){
+		String name = soundfont.getName();
+		int extensionIndex = name.lastIndexOf(".");
+		if( extensionIndex > 0 ){
+			name = name.substring( 0, extensionIndex );
+		}
+		return ("TG Fluidsynth " + "[" + name + "]");
+	}
+}
diff --git a/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java
new file mode 100644
index 00000000..84695220
--- /dev/null
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderImpl.java
@@ -0,0 +1,65 @@
+package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+
+public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
+
+	private MidiSynth synth;
+	private MidiOutputPortSettings settings;
+
+	public MidiOutputPortProviderImpl(){
+		super();
+	}
+
+	@Override
+	public List<MidiOutputPort> listPorts() throws MidiPlayerException {
+		try{
+			List<MidiOutputPort> ports = new ArrayList<MidiOutputPort>();
+			Iterator<String> it = getSettings().getSoundfonts().iterator();
+			while(it.hasNext()){
+				String path = it.next();
+				File soundfont = new File( path );
+				if( soundfont.exists() && !soundfont.isDirectory() ){
+					ports.add( new MidiOutputPortImpl( getSynth(), soundfont ) );
+				}
+			}
+			return ports;
+		}catch(Throwable throwable){
+			throw new MidiPlayerException(throwable.getMessage(), throwable);
+		}
+	}
+
+	@Override
+	public void closeAll() throws MidiPlayerException {
+		try{
+			if(this.synth != null && this.synth.isInitialized()){
+				this.synth.finalize();
+				this.synth = null;
+			}
+		}catch(Throwable throwable){
+			throw new MidiPlayerException(throwable.getMessage(), throwable);
+		}
+	}
+
+	public MidiSynth getSynth(){
+		if(this.synth == null || !this.synth.isInitialized()){
+			this.synth = new MidiSynth();
+			this.getSettings().apply();
+		}
+		return this.synth;
+	}
+
+	public MidiOutputPortSettings getSettings(){
+		if(this.settings == null){
+			this.settings = new MidiOutputPortSettings( this );
+		}
+		return this.settings;
+	}
+}
diff --git a/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderPlugin.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderPlugin.java
new file mode 100644
index 00000000..178a2710
--- /dev/null
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortProviderPlugin.java
@@ -0,0 +1,48 @@
+package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
+
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin implements TGPluginSetup{
+
+	private MidiOutputPortProviderImpl provider;
+
+	@Override
+	protected MidiOutputPortProvider getProvider() {
+		return getProviderImpl();
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "FluidSynth output plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "FluidSynth output plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+
+	@Override
+	public void setupDialog(Shell parent) {
+		getProviderImpl().getSettings().configure(parent);
+	}
+
+	private MidiOutputPortProviderImpl getProviderImpl() {
+		if(this.provider == null){
+			this.provider = new MidiOutputPortProviderImpl();
+		}
+		return this.provider;
+	}
+}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java
similarity index 86%
rename from TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java
rename to plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java
index 7139e070..2cc63aee 100644
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiOutputPortSettings.java
@@ -28,185 +28,188 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class MidiOutputPortSettings extends MidiSettings {
-	
+
 	private static final int TABLE_WIDTH = 350;
 	private static final int TABLE_HEIGHT = 200;
-	
+
 	public MidiOutputPortSettings(MidiOutputPortProviderImpl provider){
 		super( provider );
 	}
-	
+
 	public void configure(Shell parent) {
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setText(TuxGuitar.getProperty("fluidsynth.settings"));
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		TabFolder tabs = new TabFolder(dialog, SWT.TOP);
 		tabs.setLayout( new FormLayout() );
-		
+
 		// ----------------------------------------------------------------------
 		Composite cSoundfonts = new Composite( tabs , SWT.NONE);
 		cSoundfonts.setLayout(getGridLayout( 2 ));
 		cSoundfonts.setLayoutData(new FormData());
-		
-		TabItem tSoundfonts = new TabItem( tabs  , SWT.None ); 
+
+		TabItem tSoundfonts = new TabItem( tabs  , SWT.None );
 		tSoundfonts.setText(TuxGuitar.getProperty("fluidsynth.settings.soundfonts"));
 		tSoundfonts.setControl(cSoundfonts);
-		
+
 		Composite cSoundfontsTable = new Composite(cSoundfonts, SWT.NONE);
 		cSoundfontsTable.setLayout(new GridLayout());
 		cSoundfontsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		final Table soundfontsTable = new Table(cSoundfontsTable, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
 		soundfontsTable.setLayoutData(getTableData());
 		soundfontsTable.setHeaderVisible(true);
-		
+
 		TableColumn soundfontsTableColumn = new TableColumn(soundfontsTable, SWT.NONE);
 		soundfontsTableColumn.setWidth(TABLE_WIDTH);
 		soundfontsTableColumn.setText(TuxGuitar.getProperty("fluidsynth.settings.soundfonts.list"));
-		
+
 		Composite cSoundfontsButtons = new Composite(cSoundfonts, SWT.NONE);
 		cSoundfontsButtons.setLayout(new GridLayout());
 		cSoundfontsButtons.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		Button buttonAdd = new Button(cSoundfontsButtons, SWT.PUSH);
 		buttonAdd.setLayoutData(getButtonData(SWT.FILL,SWT.TOP, true,false));
 		buttonAdd.setText(TuxGuitar.getProperty("add"));
 		buttonAdd.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				addMidiPort(soundfontsTable);
 			}
 		});
-		
+
 		Button buttonDelete = new Button(cSoundfontsButtons, SWT.PUSH);
 		buttonDelete.setText(TuxGuitar.getProperty("remove"));
 		buttonDelete.setLayoutData(getButtonData(SWT.FILL,SWT.TOP, true,false));
 		buttonDelete.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				removeMidiPort(soundfontsTable);
 			}
 		});
-		
+
 		this.addMidiPorts( soundfontsTable);
-		
+
 		// ----------------------------------------------------------------------
 		Composite cAudio = new Composite( tabs , SWT.NONE);
 		cAudio.setLayout(new GridLayout(2, false));
 		cAudio.setLayoutData(new FormData());
-		
-		TabItem tAudio = new TabItem( tabs  , SWT.None ); 
+
+		TabItem tAudio = new TabItem( tabs  , SWT.None );
 		tAudio.setText(TuxGuitar.getProperty("fluidsynth.settings.audio"));
 		tAudio.setControl( cAudio );
-		
+
 		// Audio Driver  --------------------------------------------------------
-		final List audioDriverOptions = this.getAudioDriverOptions();
-		
+		final List<String> audioDriverOptions = this.getAudioDriverOptions();
+
 		Label lAudioDriver = new Label(cAudio, SWT.NONE);
 		lAudioDriver.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lAudioDriver.setText(TuxGuitar.getProperty("fluidsynth.settings.audio.driver"));
-		
+
 		final Combo cAudioDriver = new Combo(cAudio, SWT.DROP_DOWN | SWT.READ_ONLY);
 		cAudioDriver.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		
+
 		fillAudioDriverCombo( audioDriverOptions , cAudioDriver );
-		
+
 		// Audio Sample Format  -----------------------------------------------------
-		final List audioSampleFormatOptions = this.getAudioSampleFormatOptions();
-		
+		final List<String> audioSampleFormatOptions = this.getAudioSampleFormatOptions();
+
 		Label lAudioSampleFormat = new Label(cAudio, SWT.NONE);
 		lAudioSampleFormat.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lAudioSampleFormat.setText(TuxGuitar.getProperty("fluidsynth.settings.audio.sample-format"));
-		
+
 		final Combo cAudioSampleFormat = new Combo(cAudio, SWT.DROP_DOWN | SWT.READ_ONLY);
 		cAudioSampleFormat.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		
+
 		fillAudioSampleFormatCombo( audioSampleFormatOptions , cAudioSampleFormat );
-		
+
 		// Audio Period Size -------------------------------------------------------
-		final List audioPeriodSizeOptions = this.getAudioPeriodSizeOptions();
-		
+		final List<Integer> audioPeriodSizeOptions = this.getAudioPeriodSizeOptions();
+
 		Label lAudioPeriodSize = new Label( cAudio , SWT.NONE);
 		lAudioPeriodSize.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lAudioPeriodSize.setText(TuxGuitar.getProperty("fluidsynth.settings.audio.period-size"));
-		
+
 		final Combo cAudioPeriodSize = new Combo( cAudio , SWT.DROP_DOWN | SWT.READ_ONLY);
 		cAudioPeriodSize.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		
+
 		fillAudioPeriodSizeCombo( audioPeriodSizeOptions , cAudioPeriodSize );
-		
+
 		// Audio Period Count -------------------------------------------------------
-		final List audioPeriodCountOptions = this.getAudioPeriodCountOptions();
-		
+		final List<Integer> audioPeriodCountOptions = this.getAudioPeriodCountOptions();
+
 		Label lAudioPeriodCount = new Label( cAudio , SWT.NONE);
 		lAudioPeriodCount.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lAudioPeriodCount.setText(TuxGuitar.getProperty("fluidsynth.settings.audio.periods"));
-		
+
 		final Combo cAudioPeriodCount = new Combo( cAudio , SWT.DROP_DOWN | SWT.READ_ONLY);
 		cAudioPeriodCount.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		
+
 		fillAudioPeriodCountCombo( audioPeriodCountOptions , cAudioPeriodCount );
-		
+
 		// ----------------------------------------------------------------------
 		Composite cSynth = new Composite( tabs , SWT.NONE);
 		cSynth.setLayout(new GridLayout(2, false));
 		cSynth.setLayoutData(new FormData());
-		
-		TabItem tSynth = new TabItem( tabs  , SWT.None ); 
+
+		TabItem tSynth = new TabItem( tabs  , SWT.None );
 		tSynth.setText(TuxGuitar.getProperty("fluidsynth.settings.synth"));
 		tSynth.setControl( cSynth );
-		
+
 		// Synth Gain -------------------------------------------------------
 		Label lSynthGain = new Label( cSynth , SWT.NONE);
 		lSynthGain.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lSynthGain.setText(TuxGuitar.getProperty("fluidsynth.settings.synth.gain"));
-		
+
 		final Scale sSynthGain = new Scale( cSynth , SWT.HORIZONTAL );
 		sSynthGain.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		fillSynthGainScale( sSynthGain );
-		
+
 		// Synth Sample Rate -------------------------------------------------------
-		final List synthSampleRateOptions = this.getSynthSampleRateOptions();
-		
+		final List<Double> synthSampleRateOptions = this.getSynthSampleRateOptions();
+
 		Label lSynthSampleRate = new Label( cSynth , SWT.NONE);
 		lSynthSampleRate.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lSynthSampleRate.setText(TuxGuitar.getProperty("fluidsynth.settings.synth.sample-rate"));
-		
+
 		final Combo cSynthSampleRate = new Combo( cSynth , SWT.DROP_DOWN | SWT.READ_ONLY);
 		cSynthSampleRate.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		
+
 		fillSynthSampleRateCombo( synthSampleRateOptions , cSynthSampleRate );
-		
+
 		// Synth Polyphony -------------------------------------------------------
 		Label lSynthPolyphony = new Label( cSynth , SWT.NONE);
 		lSynthPolyphony.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
 		lSynthPolyphony.setText(TuxGuitar.getProperty("fluidsynth.settings.synth.polyphony"));
-		
+
 		final Spinner sSynthPolyphony = new Spinner( cSynth , SWT.BORDER );
 		sSynthPolyphony.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		fillSynthPolyphonySpinner( sSynthPolyphony );
-		
+
 		// Synth Reverb -------------------------------------------------------
 		final Button bSynthReverbActive = new Button( cSynth , SWT.CHECK);
 		bSynthReverbActive.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,2,1));
 		bSynthReverbActive.setText(TuxGuitar.getProperty("fluidsynth.settings.synth.reverb.active"));
 		fillSynthReverbActiveCheckbox(bSynthReverbActive);
-		
+
 		// Synth Chorus -------------------------------------------------------
 		final Button bSynthChorusActive = new Button( cSynth , SWT.CHECK);
 		bSynthChorusActive.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false,2,1));
 		bSynthChorusActive.setText(TuxGuitar.getProperty("fluidsynth.settings.synth.chorus.active"));
 		fillSynthChorusActiveCheckbox(bSynthChorusActive);
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite compositeButtons = new Composite(dialog, SWT.NONE);
 		compositeButtons.setLayout(new GridLayout(2,false));
 		compositeButtons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(compositeButtons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData(SWT.FILL, SWT.FILL, true, true));
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				updateSoundfontsSelection( soundfontsTable );
 				updateAudioDriverSelection( audioDriverOptions, cAudioDriver.getSelectionIndex() );
@@ -218,59 +221,61 @@ public void widgetSelected(SelectionEvent arg0) {
 				updateSynthPolyphonySelection( sSynthPolyphony.getSelection() );
 				updateSynthReverbActiveSelection( bSynthReverbActive.getSelection() );
 				updateSynthChorusActiveSelection( bSynthChorusActive.getSelection() );
-				
+
 				new Thread( new Runnable() {
+					@Override
 					public void run() {
 						update();
 					}
 				}).start();
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(compositeButtons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData(SWT.FILL, SWT.FILL, true, true));
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected GridLayout getGridLayout(int columns){
 		GridLayout layout = new GridLayout(columns, false);
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
 		return layout;
 	}
-	
+
 	protected GridData getTableData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumHeight = TABLE_HEIGHT;
 		return data;
 	}
-	
+
 	protected GridData getButtonData(int hAlignment,int vAlignment,boolean grabExcessHSpace,boolean grabExcessVSpace){
 		GridData data = new GridData(hAlignment,vAlignment,grabExcessHSpace,grabExcessVSpace);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void addMidiPorts(Table table){
-		Iterator it = getSoundfonts().iterator();
+		Iterator<String> it = getSoundfonts().iterator();
 		while(it.hasNext()){
-			String path = (String)it.next();
+			String path = it.next();
 			this.addMidiPort(table, path );
 		}
 	}
-	
+
 	protected void addMidiPort(final Table table) {
 		FileDialog chooser = new FileDialog(table.getShell());
 		String path = chooser.open();
@@ -278,30 +283,30 @@ protected void addMidiPort(final Table table) {
 			addMidiPort(table, path);
 		}
 	}
-	
+
 	protected void addMidiPort(Table table, String path){
 		TableItem item = new TableItem(table, SWT.NONE);
 		item.setText( path );
 		item.setData( path );
 	}
-	
+
 	protected void removeMidiPort(Table table){
 		int index = table.getSelectionIndex();
 		if(index >= 0 && index < table.getItemCount()){
 			table.remove( index );
 		}
 	}
-	
-	protected List getAudioDriverOptions(){
+
+	protected List<String> getAudioDriverOptions(){
 		return this.getSynth().getPropertyOptions(MidiSettings.AUDIO_DRIVER);
 	}
-	
-	protected List getAudioSampleFormatOptions(){
+
+	protected List<String> getAudioSampleFormatOptions(){
 		return this.getSynth().getPropertyOptions(MidiSettings.AUDIO_SAMPLE_FORMAT);
 	}
-	
-	protected List getAudioPeriodSizeOptions(){
-		List options = new ArrayList();
+
+	protected List<Integer> getAudioPeriodSizeOptions(){
+		List<Integer> options = new ArrayList<Integer>();
 		int[] range = getSynth().getIntegerPropertyRange( MidiSettings.AUDIO_PERIOD_SIZE );
 		if( range.length == 2 && range[0] < range[1] ){
 			int value = range[0];
@@ -312,9 +317,9 @@ protected List getAudioPeriodSizeOptions(){
 		}
 		return options;
 	}
-	
-	protected List getAudioPeriodCountOptions(){
-		List options = new ArrayList();
+
+	protected List<Integer> getAudioPeriodCountOptions(){
+		List<Integer> options = new ArrayList<Integer>();
 		int[] range = getSynth().getIntegerPropertyRange( MidiSettings.AUDIO_PERIOD_COUNT );
 		if( range.length == 2 && range[0] < range[1] ){
 			int value = range[0];
@@ -325,9 +330,9 @@ protected List getAudioPeriodCountOptions(){
 		}
 		return options;
 	}
-	
-	protected List getSynthSampleRateOptions(){
-		List options = new ArrayList();
+
+	protected List<Double> getSynthSampleRateOptions(){
+		List<Double> options = new ArrayList<Double>();
 		double[] range = getSynth().getDoublePropertyRange( MidiSettings.SYNTH_SAMPLE_RATE );
 		double[] values = new double[]{ 22050f , 44100f , 48000f , 88200f , 96000f };
 		if( range.length == 2 && range[0] < range[1] ){
@@ -339,12 +344,12 @@ protected List getSynthSampleRateOptions(){
 		}
 		return options;
 	}
-	
-	protected void fillAudioDriverCombo( List options, Combo combo ){
+
+	protected void fillAudioDriverCombo( List<String> options, Combo combo ){
 		int selectedIndex = 0;
 		String selectedValue = getStringValue( AUDIO_DRIVER );
 		for(int i = 0 ; i < options.size(); i ++){
-			String currentValue = (String)options.get(i);
+			String currentValue = options.get(i);
 			combo.add( currentValue );
 			if( selectedValue != null && selectedValue.equals( currentValue )){
 				selectedIndex = i;
@@ -352,12 +357,12 @@ protected void fillAudioDriverCombo( List options, Combo combo ){
 		}
 		combo.select( selectedIndex );
 	}
-	
-	protected void fillAudioSampleFormatCombo( List options, Combo combo ){
+
+	protected void fillAudioSampleFormatCombo( List<String> options, Combo combo ){
 		int selectedIndex = 0;
 		String selectedValue = getStringValue( AUDIO_SAMPLE_FORMAT );
 		for(int i = 0 ; i < options.size(); i ++){
-			String currentValue = (String)options.get(i);
+			String currentValue = options.get(i);
 			combo.add( currentValue );
 			if( selectedValue != null && selectedValue.equals( currentValue )){
 				selectedIndex = i;
@@ -365,12 +370,12 @@ protected void fillAudioSampleFormatCombo( List options, Combo combo ){
 		}
 		combo.select( selectedIndex );
 	}
-	
-	protected void fillAudioPeriodSizeCombo( List options, Combo combo ){
+
+	protected void fillAudioPeriodSizeCombo( List<Integer> options, Combo combo ){
 		int selectedIndex = 0;
 		int selectedValue = getIntegerValue( AUDIO_PERIOD_SIZE );
 		for(int i = 0 ; i < options.size(); i ++){
-			int currentValue = ((Integer)options.get(i)).intValue();
+			int currentValue = options.get(i).intValue();
 			combo.add( Integer.toString(currentValue) );
 			if( selectedValue == currentValue ){
 				selectedIndex = i;
@@ -378,12 +383,12 @@ protected void fillAudioPeriodSizeCombo( List options, Combo combo ){
 		}
 		combo.select( selectedIndex );
 	}
-	
-	protected void fillAudioPeriodCountCombo( List options, Combo combo ){
+
+	protected void fillAudioPeriodCountCombo( List<Integer> options, Combo combo ){
 		int selectedIndex = 0;
 		int selectedValue = getIntegerValue( AUDIO_PERIOD_COUNT );
 		for(int i = 0 ; i < options.size(); i ++){
-			int currentValue = ((Integer)options.get(i)).intValue();
+			int currentValue = options.get(i).intValue();
 			combo.add( Integer.toString(currentValue) );
 			if( selectedValue == currentValue ){
 				selectedIndex = i;
@@ -391,7 +396,7 @@ protected void fillAudioPeriodCountCombo( List options, Combo combo ){
 		}
 		combo.select( selectedIndex );
 	}
-	
+
 	protected void fillSynthGainScale( Scale scale ){
 		double[] range = getSynth().getDoublePropertyRange( MidiSettings.SYNTH_GAIN );
 		if( range.length == 2 ){
@@ -409,12 +414,12 @@ protected void fillSynthGainScale( Scale scale ){
 			}
 		}
 	}
-	
-	protected void fillSynthSampleRateCombo( List options, Combo combo ){
+
+	protected void fillSynthSampleRateCombo( List<Double> options, Combo combo ){
 		int selectedIndex = 0;
 		double selectedValue = getDoubleValue( MidiSettings.SYNTH_SAMPLE_RATE );
 		for(int i = 0 ; i < options.size(); i ++){
-			double currentValue = ((Double)options.get(i)).doubleValue();
+			double currentValue = options.get(i).doubleValue();
 			combo.add( Double.toString(currentValue) );
 			if( selectedValue == currentValue ){
 				selectedIndex = i;
@@ -422,7 +427,7 @@ protected void fillSynthSampleRateCombo( List options, Combo combo ){
 		}
 		combo.select( selectedIndex );
 	}
-	
+
 	protected void fillSynthPolyphonySpinner( Spinner spinner ){
 		int value = getIntegerValue( MidiSettings.SYNTH_POLYPHONY );
 		int[] range = getSynth().getIntegerPropertyRange( MidiSettings.SYNTH_POLYPHONY );
@@ -436,39 +441,39 @@ protected void fillSynthPolyphonySpinner( Spinner spinner ){
 			}
 		}
 	}
-	
+
 	protected void fillSynthReverbActiveCheckbox( Button button ){
 		button.setSelection( getBooleanValue( SYNTH_REVERB_ACTIVE ) );
 	}
-	
+
 	protected void fillSynthChorusActiveCheckbox( Button button ){
 		button.setSelection( getBooleanValue( SYNTH_CHORUS_ACTIVE ) );
 	}
-	
-	protected void updateAudioDriverSelection( List options , int index ){
+
+	protected void updateAudioDriverSelection( List<String> options , int index ){
 		if( index >=0 && index < options.size() ){
-			setStringValue(MidiSettings.AUDIO_DRIVER, (( String )options.get( index )) ); 
+			setStringValue(MidiSettings.AUDIO_DRIVER, options.get( index ) );
 		}
 	}
-	
-	protected void updateAudioSampleFormatSelection( List options , int index ){
+
+	protected void updateAudioSampleFormatSelection( List<String> options , int index ){
 		if( index >=0 && index < options.size() ){
-			setStringValue(MidiSettings.AUDIO_SAMPLE_FORMAT, (( String )options.get( index )) ); 
+			setStringValue(MidiSettings.AUDIO_SAMPLE_FORMAT, options.get( index ) );
 		}
 	}
-	
-	protected void updateAudioPeriodSizeSelection( List options , int index ){
+
+	protected void updateAudioPeriodSizeSelection( List<Integer> options , int index ){
 		if( index >=0 && index < options.size() ){
-			setIntegerValue(MidiSettings.AUDIO_PERIOD_SIZE, (( Integer )options.get( index )).intValue() ); 
+			setIntegerValue(MidiSettings.AUDIO_PERIOD_SIZE, options.get( index ).intValue() );
 		}
 	}
-	
-	protected void updateAudioPeriodCountSelection( List options , int index ){
+
+	protected void updateAudioPeriodCountSelection( List<Integer> options , int index ){
 		if( index >=0 && index < options.size() ){
-			setIntegerValue(MidiSettings.AUDIO_PERIOD_COUNT, (( Integer )options.get( index )).intValue() );
+			setIntegerValue(MidiSettings.AUDIO_PERIOD_COUNT, options.get( index ).intValue() );
 		}
 	}
-	
+
 	protected void updateSynthGainSelection( int value ){
 		double doubleValue = ( value / 10.00 );
 		double[] range = getSynth().getDoublePropertyRange( MidiSettings.SYNTH_GAIN );
@@ -480,13 +485,13 @@ protected void updateSynthGainSelection( int value ){
 			}
 		}
 	}
-	
-	protected void updateSynthSampleRateSelection( List options , int index ){
+
+	protected void updateSynthSampleRateSelection( List<Double> options , int index ){
 		if( index >=0 && index < options.size() ){
-			setDoubleValue(MidiSettings.SYNTH_SAMPLE_RATE, (( Double )options.get( index )).doubleValue() );
+			setDoubleValue(MidiSettings.SYNTH_SAMPLE_RATE, options.get( index ).doubleValue() );
 		}
 	}
-	
+
 	protected void updateSynthPolyphonySelection( int value ){
 		int[] range = getSynth().getIntegerPropertyRange( MidiSettings.SYNTH_POLYPHONY );
 		if( range.length == 2 && range[0] < range[1] && value >= range[0] && value <= range[1] ){
@@ -495,30 +500,30 @@ protected void updateSynthPolyphonySelection( int value ){
 			}
 		}
 	}
-	
+
 	protected void updateSynthReverbActiveSelection( boolean value ){
 		setBooleanValue( MidiSettings.SYNTH_REVERB_ACTIVE, value );
 	}
-	
+
 	protected void updateSynthChorusActiveSelection( boolean value ){
 		setBooleanValue( MidiSettings.SYNTH_CHORUS_ACTIVE, value );
 	}
-	
+
 	protected void updateSoundfontsSelection(Table table){
-		List soundfonts = new ArrayList();
+		List<String> soundfonts = new ArrayList<String>();
 		int count = table.getItemCount();
 		for( int i = 0 ; i < count; i ++ ){
 			TableItem item = table.getItem( i );
 			if( item.getData() instanceof String ){
-				soundfonts.add( item.getData() );
+				soundfonts.add( (String) item.getData() );
 			}
 		}
 		setSoundfonts( soundfonts );
 	}
-	
+
 	protected void update(){
 		this.save();
 		this.apply();
 	}
-	
+
 }
diff --git a/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiReceiverImpl.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiReceiverImpl.java
new file mode 100644
index 00000000..d827951f
--- /dev/null
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiReceiverImpl.java
@@ -0,0 +1,49 @@
+package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
+
+import org.herac.tuxguitar.player.base.MidiControllers;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiReceiverImpl implements MidiReceiver{
+
+	private MidiSynth synth;
+
+	public MidiReceiverImpl(MidiSynth synth){
+		this.synth = synth;
+	}
+
+	public void sendSystemReset() {
+		this.synth.sendSystemReset();
+	}
+
+	@Override
+	public void sendNoteOn(int channel, int key, int velocity) {
+		this.synth.sendNoteOn(channel, key, velocity);
+	}
+
+	@Override
+	public void sendNoteOff(int channel, int key, int velocity) {
+		this.synth.sendNoteOff(channel, key, velocity);
+	}
+
+	@Override
+	public void sendControlChange(int channel, int controller, int value) {
+		this.synth.sendControlChange(channel, controller, value);
+	}
+
+	@Override
+	public void sendProgramChange(int channel, int value) {
+		this.synth.sendProgramChange(channel, value);
+	}
+
+	@Override
+	public void sendPitchBend(int channel, int value) {
+		this.synth.sendPitchBend(channel, value);
+	}
+
+	@Override
+	public void sendAllNotesOff() {
+		for(int i = 0; i < 16; i ++){
+			this.sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
+		}
+	}
+}
diff --git a/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java
new file mode 100644
index 00000000..13090e1c
--- /dev/null
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSettings.java
@@ -0,0 +1,156 @@
+package org.herac.tuxguitar.player.impl.midiport.fluidsynth;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.app.system.config.TGConfigManager;
+import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
+
+public class MidiSettings {
+
+	public static final String AUDIO_DRIVER = "audio.driver";
+	public static final String AUDIO_SAMPLE_FORMAT = "audio.sample-format";
+	public static final String AUDIO_PERIOD_SIZE = "audio.period-size";
+	public static final String AUDIO_PERIOD_COUNT = "audio.periods";
+	public static final String SYNTH_GAIN = "synth.gain";
+	public static final String SYNTH_POLYPHONY = "synth.polyphony";
+	public static final String SYNTH_SAMPLE_RATE = "synth.sample-rate";
+	public static final String SYNTH_REVERB_ACTIVE = "synth.reverb.active";
+	public static final String SYNTH_CHORUS_ACTIVE = "synth.chorus.active";
+
+	public static final String SYNTH_AUDIO_CHANNELS = "synth.audio-channels";
+	public static final String SYNTH_AUDIO_GROUPS = "synth.audio-groups";
+
+	private TGConfigManager config;
+	private final MidiOutputPortProviderImpl provider;
+
+	private boolean restartSynth;
+
+	public MidiSettings(MidiOutputPortProviderImpl provider){
+		this.provider = provider;
+	}
+
+	public MidiSynth getSynth(){
+		return this.provider.getSynth();
+	}
+
+	public TGConfigManager getConfig(){
+		if(this.config == null){
+			this.config = new TGPluginConfigManager("tuxguitar-fluidsynth");
+			this.config.init();
+		}
+		return this.config;
+	}
+
+	public double getDoubleValue( String property ){
+		return getConfig().getDoubleConfigValue(property, this.getSynth().getDoubleProperty( property ));
+	}
+
+	public int getIntegerValue( String property ){
+		return getConfig().getIntConfigValue(property, this.getSynth().getIntegerProperty( property ));
+	}
+
+	public String getStringValue( String property ){
+		return getConfig().getStringConfigValue(property, this.getSynth().getStringProperty( property ));
+	}
+
+	public boolean getBooleanValue( String property ){
+		String value = this.getStringValue(property);
+		return (value != null && value.equals("yes"));
+	}
+
+	public void setDoubleValue( String property , double value ){
+		getConfig().setProperty( property , value );
+	}
+
+	public void setIntegerValue( String property , int value ){
+		getConfig().setProperty( property , value );
+	}
+
+	public void setStringValue( String property , String value ){
+		if( value == null ){
+			getConfig().removeProperty( property );
+		}else{
+			getConfig().setProperty( property , value );
+		}
+	}
+
+	public void setBooleanValue( String property , boolean value ){
+		this.setStringValue(property, ( value ? "yes" : "no" ) );
+	}
+
+	public List<String> getSoundfonts(){
+		List<String> ports = new ArrayList<String>();
+		TGConfigManager config = getConfig();
+
+		int count = config.getIntConfigValue("soundfont.count");
+		for(int i = 0; i < count;i ++){
+			String path = config.getStringConfigValue("soundfont.path" + i);
+			if(path != null && path.length() > 0 ){
+				ports.add( path );
+			}
+		}
+		return ports;
+	}
+
+	public void setSoundfonts(List<String> soundfonts){
+		TGConfigManager config = getConfig();
+		config.setProperty("soundfont.count", soundfonts.size() );
+		for( int i = 0 ; i < soundfonts.size() ; i ++ ){
+			String path = soundfonts.get( i );
+			config.setProperty("soundfont.path" + i, path );
+		}
+	}
+
+	public void save(){
+		this.getConfig().save();
+	}
+
+	public void apply(){
+		if(this.getSynth() != null && this.getSynth().isInitialized()){
+			this.restartSynth = false;
+			this.applyStringProperty( AUDIO_DRIVER );
+			this.applyStringProperty( AUDIO_SAMPLE_FORMAT );
+			this.applyIntegerProperty(AUDIO_PERIOD_SIZE );
+			this.applyIntegerProperty(AUDIO_PERIOD_COUNT );
+			this.applyDoubleProperty(SYNTH_GAIN );
+			this.applyDoubleProperty(SYNTH_SAMPLE_RATE );
+			this.applyStringProperty(SYNTH_REVERB_ACTIVE );
+			this.applyStringProperty(SYNTH_CHORUS_ACTIVE );
+			this.applyIntegerProperty(SYNTH_POLYPHONY );
+			if( this.restartSynth ){
+				this.getSynth().reconnect();
+				this.restartSynth = false;
+			}
+		}
+	}
+
+	private void applyStringProperty( String property ){
+		String newValue = this.getStringValue( property );
+		String oldValue = this.getSynth().getStringProperty( property );
+		if( newValue != null ){
+			if( oldValue == null || !newValue.equals( oldValue ) ){
+				this.getSynth().setStringProperty( property, newValue );
+				this.restartSynth = (this.restartSynth || !this.getSynth().isRealtimeProperty( property ));
+			}
+		}
+	}
+
+	private void applyDoubleProperty( String property ){
+		double newValue = this.getDoubleValue( property );
+		double oldValue = this.getSynth().getDoubleProperty( property );
+		if( newValue != oldValue ){
+			this.getSynth().setDoubleProperty( property, newValue );
+			this.restartSynth = (this.restartSynth || !this.getSynth().isRealtimeProperty( property ));
+		}
+	}
+
+	private void applyIntegerProperty( String property ){
+		int newValue = this.getIntegerValue( property );
+		int oldValue = this.getSynth().getIntegerProperty( property );
+		if( newValue != oldValue ){
+			this.getSynth().setIntegerProperty( property, newValue );
+			this.restartSynth = (this.restartSynth || !this.getSynth().isRealtimeProperty( property ));
+		}
+	}
+}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java
similarity index 94%
rename from TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java
rename to plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java
index 983f17f2..dcf831c3 100644
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/MidiSynth.java
@@ -7,38 +7,40 @@
 import org.herac.tuxguitar.player.impl.midiport.fluidsynth.type.DoubleRef;
 import org.herac.tuxguitar.player.impl.midiport.fluidsynth.type.IntegerRef;
 import org.herac.tuxguitar.player.impl.midiport.fluidsynth.type.StringRef;
+import org.herac.tuxguitar.util.JNILibraryLoader;
 
 public class MidiSynth {
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-fluidsynth-jni");
-	
+
+	private static final String JNI_LIBRARY_NAME = "tuxguitar-fluidsynth";
+
 	static{
-		System.loadLibrary(JNI_LIBRARY_NAME);
+		JNILibraryLoader.loadLibrary(JNI_LIBRARY_NAME);
 	}
-	
+
 	private long instance;
 	private MidiOutputPortImpl loadedPort;
-	
+
 	public MidiSynth(){
 		this.instance = malloc();
 		this.loadedPort = null;
 	}
-	
+
 	public boolean isInitialized(){
 		return (this.instance != 0);
 	}
-	
+
+	@Override
 	public void finalize(){
 		if(isInitialized()){
 			this.free(this.instance);
 			this.instance = 0;
 		}
 	}
-	
+
 	public boolean isConnected(MidiOutputPortImpl port){
 		return (port != null && this.loadedPort != null && this.loadedPort.equals( port ) );
 	}
-	
+
 	public void connect(MidiOutputPortImpl port){
 		if(isInitialized()){
 			this.disconnect( this.loadedPort );
@@ -47,7 +49,7 @@ public void connect(MidiOutputPortImpl port){
 			this.loadedPort = port;
 		}
 	}
-	
+
 	public void disconnect(MidiOutputPortImpl port){
 		if(isInitialized() && isConnected(port)){
 			this.unloadFont(this.instance);
@@ -55,7 +57,7 @@ public void disconnect(MidiOutputPortImpl port){
 			this.loadedPort = null;
 		}
 	}
-	
+
 	public void reconnect(){
 		MidiOutputPortImpl connection = this.loadedPort;
 		if( isConnected( connection ) ){
@@ -63,61 +65,61 @@ public void reconnect(){
 			this.connect( connection );
 		}
 	}
-	
+
 	public void sendSystemReset() {
 		if(isInitialized()){
 			this.systemReset(this.instance);
 		}
 	}
-	
+
 	public void sendNoteOn(int channel, int key, int velocity) {
 		if(isInitialized()){
 			this.noteOn(this.instance,channel, key, velocity);
 		}
 	}
-	
+
 	public void sendNoteOff(int channel, int key, int velocity) {
 		if(isInitialized()){
 			this.noteOff(this.instance,channel, key, velocity);
 		}
 	}
-	
+
 	public void sendControlChange(int channel, int controller, int value) {
 		if(isInitialized()){
 			this.controlChange(this.instance,channel, controller, value);
 		}
 	}
-	
+
 	public void sendProgramChange(int channel, int value) {
 		if(isInitialized()){
 			this.programChange(this.instance,channel, value);
 		}
 	}
-	
+
 	public void sendPitchBend(int channel, int value) {
 		if(isInitialized()){
 			this.pitchBend(this.instance,channel, value);
 		}
 	}
-	
+
 	public void setDoubleProperty( String key , double value ){
 		if(isInitialized()){
 			this.setDoubleProperty(this.instance, key, value);
 		}
 	}
-	
+
 	public void setIntegerProperty( String key , int value ){
 		if(isInitialized()){
 			this.setIntegerProperty(this.instance, key, value);
 		}
 	}
-	
+
 	public void setStringProperty( String key , String value ){
 		if(isInitialized()){
 			this.setStringProperty(this.instance, key, value);
 		}
 	}
-	
+
 	public double getDoubleProperty( String key ){
 		DoubleRef value = new DoubleRef();
 		if(isInitialized()){
@@ -125,7 +127,7 @@ public double getDoubleProperty( String key ){
 		}
 		return value.getValue();
 	}
-	
+
 	public int getIntegerProperty( String key ){
 		IntegerRef value = new IntegerRef();
 		if(isInitialized()){
@@ -133,7 +135,7 @@ public int getIntegerProperty( String key ){
 		}
 		return value.getValue();
 	}
-	
+
 	public String getStringProperty( String key ){
 		StringRef value = new StringRef();
 		if(isInitialized()){
@@ -141,7 +143,7 @@ public String getStringProperty( String key ){
 		}
 		return value.getValue();
 	}
-	
+
 	public double getDoublePropertyDefault( String key ){
 		DoubleRef value = new DoubleRef();
 		if(isInitialized()){
@@ -149,7 +151,7 @@ public double getDoublePropertyDefault( String key ){
 		}
 		return value.getValue();
 	}
-	
+
 	public int getIntegerPropertyDefault( String key ){
 		IntegerRef value = new IntegerRef();
 		if(isInitialized()){
@@ -157,7 +159,7 @@ public int getIntegerPropertyDefault( String key ){
 		}
 		return value.getValue();
 	}
-	
+
 	public String getStringPropertyDefault( String key ){
 		StringRef value = new StringRef();
 		if(isInitialized()){
@@ -165,15 +167,15 @@ public String getStringPropertyDefault( String key ){
 		}
 		return value.getValue();
 	}
-	
-	public List getPropertyOptions( String key ){
-		List options = new ArrayList();
+
+	public List<String> getPropertyOptions( String key ){
+		List<String> options = new ArrayList<String>();
 		if(isInitialized()){
 			this.getPropertyOptions(this.instance, key, options);
 		}
 		return options;
 	}
-	
+
 	public int[] getIntegerPropertyRange( String key ){
 		IntegerRef minimum = new IntegerRef();
 		IntegerRef maximum = new IntegerRef();
@@ -182,7 +184,7 @@ public int[] getIntegerPropertyRange( String key ){
 		}
 		return new int[]{ minimum.getValue() , maximum.getValue() };
 	}
-	
+
 	public double[] getDoublePropertyRange( String key ){
 		DoubleRef minimum = new DoubleRef();
 		DoubleRef maximum = new DoubleRef();
@@ -191,7 +193,7 @@ public double[] getDoublePropertyRange( String key ){
 		}
 		return new double[]{ minimum.getValue() , maximum.getValue() };
 	}
-	
+
 	public boolean isRealtimeProperty( String key ){
 		BooleanRef value = new BooleanRef();
 		if(isInitialized()){
@@ -199,54 +201,54 @@ public boolean isRealtimeProperty( String key ){
 		}
 		return value.getValue();
 	}
-	
+
 	private native long malloc();
-	
+
 	private native void free(long instance);
-	
+
 	private native void open(long instance);
-	
+
 	private native void close(long instance);
-	
+
 	private native void loadFont(long instance, String path);
-	
+
 	private native void unloadFont(long instance);
-	
+
 	private native void systemReset(long instance);
-	
+
 	private native void noteOn(long instance,int channel,int note,int velocity);
-	
+
 	private native void noteOff(long instance,int channel,int note,int velocity);
-	
+
 	private native void controlChange(long instance,int channel,int control,int value);
-	
+
 	private native void programChange(long instance,int channel,int program);
-	
+
 	private native void pitchBend(long instance,int channel,int value);
-	
+
 	private native void setDoubleProperty(long instance, String key , double value );
-	
+
 	private native void setIntegerProperty(long instance, String key , int value );
-	
+
 	private native void setStringProperty(long instance, String key , String value );
-	
+
 	private native void getDoubleProperty(long instance, String key , DoubleRef ref );
-	
+
 	private native void getIntegerProperty(long instance, String key , IntegerRef ref );
-	
+
 	private native void getStringProperty(long instance, String key , StringRef ref );
-	
+
 	private native void getDoublePropertyDefault(long instance, String key , DoubleRef ref );
-	
+
 	private native void getIntegerPropertyDefault(long instance, String key , IntegerRef ref );
-	
+
 	private native void getStringPropertyDefault(long instance, String key , StringRef ref );
-	
+
 	private native void getDoublePropertyRange(long instance, String key , DoubleRef minimum , DoubleRef maximum );
-	
+
 	private native void getIntegerPropertyRange(long instance, String key , IntegerRef minimum , IntegerRef maximum );
-	
-	private native void getPropertyOptions(long instance, String key , List options );
-	
+
+	private native void getPropertyOptions(long instance, String key , List<String> options );
+
 	private native void isRealtimeProperty(long instance, String key , BooleanRef ref );
 }
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java
similarity index 97%
rename from TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java
rename to plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java
index 28df7e0b..ecdd7111 100644
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/BooleanRef.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.player.impl.midiport.fluidsynth.type;
 
 public class BooleanRef {
-	
+
 	private boolean value;
-	
+
 	public BooleanRef(){
 		this.value = false;
 	}
-	
+
 	public boolean getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(boolean value) {
 		this.value = value;
 	}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java
similarity index 97%
rename from TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java
rename to plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java
index 049a24d0..2a80b2ab 100644
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/DoubleRef.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.player.impl.midiport.fluidsynth.type;
 
 public class DoubleRef {
-	
+
 	private double value;
-	
+
 	public DoubleRef(){
 		this.value = 0;
 	}
-	
+
 	public double getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(double value) {
 		this.value = value;
 	}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java
similarity index 97%
rename from TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java
rename to plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java
index aa3c7280..84f30234 100644
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/IntegerRef.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.player.impl.midiport.fluidsynth.type;
 
 public class IntegerRef {
-	
+
 	private int value;
-	
+
 	public IntegerRef(){
 		this.value = 0;
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(int value) {
 		this.value = value;
 	}
diff --git a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java
similarity index 97%
rename from TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java
rename to plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java
index 161922e2..fe258909 100644
--- a/TuxGuitar-fluidsynth/src/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/player/impl/midiport/fluidsynth/type/StringRef.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.player.impl.midiport.fluidsynth.type;
 
 public class StringRef {
-	
+
 	private String value;
-	
+
 	public StringRef(){
 		this.value = new String();
 	}
-	
+
 	public String getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(String value) {
 		this.value = value;
 	}
diff --git a/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
new file mode 100644
index 00000000..e95f1535
--- /dev/null
+++ b/plugins/fluidsynth/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		if(!JNILibraryLoader.loadFromClassPath(getFileName(libname))){
+			System.loadLibrary(libname);
+		}
+	}
+
+	/**
+	 * Return filename of the library, which is platform dependent: .so, .dll...
+	 * @param libraryName Name of the library
+	 * @return Name of the file
+	 */
+	private static String getFileName(String libraryName) {
+		// FIXME fix other platforms
+		return libraryName + ".so";
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		File file = new File(JNI_TMP_PATH + filename);
+		try{
+			if(!file.exists()){
+				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					OutputStream outputStream = new FileOutputStream(file);
+
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			if(file.exists()){
+				System.load(file.getAbsolutePath());
+				return true;
+			}
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+	}
+}
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth.h b/plugins/fluidsynth/src/main/native/include/fluidsynth.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/audio.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/audio.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/audio.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/audio.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/event.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/event.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/event.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/event.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/gen.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/gen.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/gen.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/gen.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/log.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/log.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/log.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/log.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/midi.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/midi.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/midi.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/midi.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/misc.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/misc.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/misc.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/misc.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/mod.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/mod.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/mod.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/mod.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/ramsfont.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/ramsfont.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/ramsfont.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/ramsfont.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/seq.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/seq.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/seq.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/seq.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/seqbind.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/seqbind.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/seqbind.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/seqbind.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/settings.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/settings.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/settings.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/settings.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/sfont.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/sfont.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/sfont.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/sfont.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/shell.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/shell.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/shell.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/shell.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/synth.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/synth.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/synth.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/synth.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/types.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/types.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/types.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/types.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/version.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/version.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/version.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/version.h
diff --git a/TuxGuitar-fluidsynth/winbuild/include/fluidsynth/voice.h b/plugins/fluidsynth/src/main/native/include/fluidsynth/voice.h
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/include/fluidsynth/voice.h
rename to plugins/fluidsynth/src/main/native/include/fluidsynth/voice.h
diff --git a/TuxGuitar-fluidsynth/winbuild/libfluidsynth-1.dll b/plugins/fluidsynth/src/main/native/lib/libfluidsynth-1.dll
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/libfluidsynth-1.dll
rename to plugins/fluidsynth/src/main/native/lib/libfluidsynth-1.dll
diff --git a/TuxGuitar-fluidsynth/winbuild/tuxguitar-fluidsynth-jni.dll b/plugins/fluidsynth/src/main/native/lib/tuxguitar-fluidsynth-jni.dll
similarity index 100%
rename from TuxGuitar-fluidsynth/winbuild/tuxguitar-fluidsynth-jni.dll
rename to plugins/fluidsynth/src/main/native/lib/tuxguitar-fluidsynth-jni.dll
diff --git a/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c b/plugins/fluidsynth/src/main/native/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
similarity index 100%
rename from TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
rename to plugins/fluidsynth/src/main/native/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.c
diff --git a/TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h b/plugins/fluidsynth/src/main/native/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h
similarity index 100%
rename from TuxGuitar-fluidsynth/jni/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h
rename to plugins/fluidsynth/src/main/native/org_herac_tuxguitar_player_impl_midiport_fluidsynth_MidiSynth.h
diff --git a/TuxGuitar-fluidsynth/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/fluidsynth/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-fluidsynth/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/fluidsynth/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-fluidsynth/share/lang/messages.properties b/plugins/fluidsynth/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-fluidsynth/share/lang/messages.properties
rename to plugins/fluidsynth/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-fluidsynth/share/lang/messages_sv.properties b/plugins/fluidsynth/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-fluidsynth/share/lang/messages_sv.properties
rename to plugins/fluidsynth/src/main/resources/lang/messages_sv.properties
diff --git a/TuxGuitar-fluidsynth/share/lang/messages_zh_TW.properties b/plugins/fluidsynth/src/main/resources/lang/messages_zh_TW.properties
similarity index 100%
rename from TuxGuitar-fluidsynth/share/lang/messages_zh_TW.properties
rename to plugins/fluidsynth/src/main/resources/lang/messages_zh_TW.properties
diff --git a/plugins/gervill/pom.xml b/plugins/gervill/pom.xml
new file mode 100644
index 00000000..3d3af0c2
--- /dev/null
+++ b/plugins/gervill/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-gervill</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Gervill</name>
+	<description>Gervill plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiMessageUtils.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiMessageUtils.java
new file mode 100644
index 00000000..a048c16f
--- /dev/null
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiMessageUtils.java
@@ -0,0 +1,115 @@
+package org.herac.tuxguitar.io.gervill;
+
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MetaMessage;
+import javax.sound.midi.MidiMessage;
+import javax.sound.midi.ShortMessage;
+
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiMessageUtils {
+
+	public static final byte TICK_MOVE = 0x01;
+
+	private static int fixValue(int value){
+		int fixedValue = value;
+		fixedValue = Math.min(fixedValue,127);
+		fixedValue = Math.max(fixedValue,0);
+		return fixedValue;
+	}
+
+	private static int fixChannel(int channel){
+		int fixedChannel = channel;
+		fixedChannel = Math.min(fixedChannel,15);
+		fixedChannel = Math.max(fixedChannel,0);
+		return fixedChannel;
+	}
+
+	public static MidiMessage noteOn(int channel,int note,int velocity){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.NOTE_ON, fixChannel(channel), fixValue(note), fixValue(velocity));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage noteOff(int channel,int note,int velocity){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.NOTE_OFF, fixChannel(channel), fixValue(note), fixValue(velocity));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage controlChange(int channel,int controller,int value){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.CONTROL_CHANGE,fixChannel(channel),fixValue(controller), fixValue(value));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage programChange(int channel,int instrument){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.PROGRAM_CHANGE, fixChannel(channel), fixValue(instrument), 0);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage pitchBend(int channel,int value){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.PITCH_BEND, fixChannel(channel), 0, fixValue(value));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage systemReset(){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.SYSTEM_RESET);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage tempoInUSQ(int usq){
+		try {
+			MetaMessage message = new MetaMessage();
+			message.setMessage(0x51, new byte[]{ (byte)((usq >> 16) & 0x00FF),(byte)((usq >> 8) & 0x00FF),(byte)((usq) & 0x00FF) }, 3);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage timeSignature(TGTimeSignature ts){
+		try {
+			MetaMessage message = new MetaMessage();
+			message.setMessage(0x58, new byte[]{  (byte)ts.getNumerator(),(byte)ts.getDenominator().getIndex(),(byte)(96 / ts.getDenominator().getValue()),8 }, 4);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
diff --git a/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiSequenceHandlerImpl.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiSequenceHandlerImpl.java
new file mode 100644
index 00000000..12980dee
--- /dev/null
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiSequenceHandlerImpl.java
@@ -0,0 +1,63 @@
+package org.herac.tuxguitar.io.gervill;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.sound.midi.MidiEvent;
+
+import org.herac.tuxguitar.player.base.MidiSequenceHandler;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
+
+	private List<MidiEvent> events;
+
+	public MidiSequenceHandlerImpl(int tracks ){
+		super(tracks);
+		this.events = new ArrayList<MidiEvent>();
+	}
+
+	@Override
+	public void addControlChange(long tick,int track,int channel, int controller, int value) {
+		this.events.add(new MidiEvent(MidiMessageUtils.controlChange(channel, controller, value), tick ));
+	}
+
+	@Override
+	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
+		this.events.add(new MidiEvent(MidiMessageUtils.noteOff(channel, note, velocity), tick ));
+	}
+
+	@Override
+	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
+		this.events.add(new MidiEvent(MidiMessageUtils.noteOn(channel, note, velocity), tick ));
+	}
+
+	@Override
+	public void addPitchBend(long tick,int track,int channel, int value) {
+		this.events.add(new MidiEvent(MidiMessageUtils.pitchBend(channel, value), tick ));
+	}
+
+	@Override
+	public void addProgramChange(long tick,int track,int channel, int instrument) {
+		this.events.add(new MidiEvent(MidiMessageUtils.programChange(channel, instrument), tick ));
+	}
+
+	@Override
+	public void addTempoInUSQ(long tick,int track,int usq) {
+		this.events.add(new MidiEvent(MidiMessageUtils.tempoInUSQ(usq), tick ));
+	}
+
+	@Override
+	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
+		this.events.add(new MidiEvent(MidiMessageUtils.timeSignature(ts), tick ));
+	}
+
+	@Override
+	public void notifyFinish() {
+		// not implemented
+	}
+
+	public List<MidiEvent> getEvents(){
+		return this.events;
+	}
+}
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java
similarity index 96%
rename from TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java
rename to plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java
index 65633fd8..dd546698 100644
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioExporter.java
@@ -11,36 +11,41 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class MidiToAudioExporter implements TGLocalFileExporter{
-	
+
 	private MidiToAudioSettings settings;
 	private OutputStream stream;
-	
+
 	public MidiToAudioExporter(){
 		this.settings = new MidiToAudioSettings();
 		this.settings.setDefaults();
 	}
-	
+
+	@Override
 	public String getExportName() {
 		return "Audio File";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat(this.settings.getType().toString(), ("*." + this.settings.getType().getExtension()) );
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		if( !setDefaults ){
 			return new MidiToAudioSettingsDialog().open( this.settings );
 		}
 		this.settings.setDefaults();
-		
+
 		return true;
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) throws TGFileFormatException {
 		try{
 			if( this.stream != null ){
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java
similarity index 93%
rename from TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java
rename to plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java
index 19901a1d..5c2cd890 100644
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioPlugin.java
@@ -5,50 +5,58 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class MidiToAudioPlugin extends TGExporterPlugin{
-	
+
 	private boolean available;
-	
+
 	public MidiToAudioPlugin(){
 		this.available = MidiToAudioSynth.instance().isAvailable();
 	}
-	
+
+	@Override
 	public void init() throws TGPluginException {
 		if( this.available ){
 			super.init();
 		}
 	}
-	
+
+	@Override
 	public void close() throws TGPluginException {
 		if( this.available ){
 			super.close();
 		}
 	}
-	
+
+	@Override
 	public void setEnabled( boolean enabled ) throws TGPluginException {
 		if( this.available ){
 			super.setEnabled( enabled );
 		}
 	}
-	
+
+	@Override
 	protected TGRawExporter getExporter() throws TGPluginException {
 		if( this.available ){
 			return new MidiToAudioExporter();
 		}
 		return null;
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.1";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Gervill Plugin";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		String description = new String();
 		description += ("The purpose of this plugin is to add gervill support to tuxguitar.\n");
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSettings.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSettings.java
similarity index 98%
rename from TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSettings.java
rename to plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSettings.java
index d366f84f..74a73f11 100644
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSettings.java
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSettings.java
@@ -4,39 +4,39 @@
 import javax.sound.sampled.AudioFormat;
 
 public class MidiToAudioSettings {
-	
+
 	public static final String DEFAULT_SOUNDBANK_PATH = null;
 	public static final AudioFormat DEFAULT_FORMAT = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 44100, 16, 2, 4, 44100, false);
 	public static final AudioFileFormat.Type DEFAULT_TYPE = AudioFileFormat.Type.WAVE;
-	
+
 	private AudioFileFormat.Type type;
 	private AudioFormat format;
 	private String soundbankPath;
-	
+
 	public AudioFileFormat.Type getType() {
 		return this.type;
 	}
-	
+
 	public void setType(AudioFileFormat.Type type) {
 		this.type = type;
 	}
-	
+
 	public AudioFormat getFormat() {
 		return this.format;
 	}
-	
+
 	public void setFormat(AudioFormat format) {
 		this.format = format;
 	}
-	
+
 	public String getSoundbankPath() {
 		return this.soundbankPath;
 	}
-	
+
 	public void setSoundbankPath(String soundbankPath) {
 		this.soundbankPath = soundbankPath;
 	}
-	
+
 	public void setDefaults(){
 		this.setType(DEFAULT_TYPE);
 		this.setFormat(DEFAULT_FORMAT);
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSettingsDialog.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSettingsDialog.java
similarity index 92%
rename from TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSettingsDialog.java
rename to plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSettingsDialog.java
index a487c25a..df3d083f 100644
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSettingsDialog.java
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSettingsDialog.java
@@ -27,89 +27,91 @@
 import org.herac.tuxguitar.io.base.TGFileFormat;
 
 public class MidiToAudioSettingsDialog {
-	
+
 	protected boolean success;
-	
+
 	public MidiToAudioSettingsDialog(){
 		super();
 	}
-	
+
 	public boolean open(final MidiToAudioSettings settings) {
 		this.success = false;
-		
-		final List formats = getAvailableFormats();
-		final List soundbankFormats = getSupportedSoundbankFormats();
-		
+
+		final List<MidiToAudioFormat> formats = getAvailableFormats();
+		final List<TGFileFormat> soundbankFormats = getSupportedSoundbankFormats();
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("gervill.options"));
-		
+
 		//------------------AUDIO FORMAT------------------
 		Group audioFormatGroup = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		audioFormatGroup.setLayout(new GridLayout(2,false));
 		audioFormatGroup.setLayoutData(getGroupData());
 		audioFormatGroup.setText(TuxGuitar.getProperty("gervill.options.audio-format"));
-		
+
 		Label eLabel = new Label(audioFormatGroup, SWT.NONE);
 		eLabel.setText(TuxGuitar.getProperty("gervill.options.file-encoding") + ":");
 		eLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
+
 		final Combo eCombo = new Combo(audioFormatGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		eCombo.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
-		
+
 		Label tLabel = new Label(audioFormatGroup, SWT.NONE);
 		tLabel.setText(TuxGuitar.getProperty("gervill.options.file-type") + ":");
 		tLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
+
 		final Combo tCombo = new Combo(audioFormatGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		tCombo.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
-		
+
 		int eSelectionIndex = 0;
 		for( int i = 0 ; i < formats.size() ; i ++ ) {
-			MidiToAudioFormat format = (MidiToAudioFormat)formats.get(i);
+			MidiToAudioFormat format = formats.get(i);
 			eCombo.add( format.getFormat().getEncoding().toString() );
 			if( isSameEncoding(settings.getFormat(), format.getFormat() )){
 				eSelectionIndex = i;
 			}
 		}
-		
+
 		if( !formats.isEmpty() ){
 			eCombo.select( eSelectionIndex );
 			updateTypesCombo( settings, formats, eCombo, tCombo );
 		}
-		
+
 		eCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				updateTypesCombo( settings, formats, eCombo, tCombo );
 			}
 		});
-		
+
 		//------------------SOUNDBANK-----------------------
 		Group soundbankGroup = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		soundbankGroup.setLayout(new GridLayout());
 		soundbankGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		soundbankGroup.setText(TuxGuitar.getProperty("gervill.options.soundbank.tip"));
-		
+
 		final Button sbDefault = new Button(soundbankGroup,SWT.RADIO);
 		sbDefault.setText(TuxGuitar.getProperty("gervill.options.soundbank.default"));
 		sbDefault.setSelection( (settings.getSoundbankPath() == null) );
-		
+
 		final Button sbCustom = new Button(soundbankGroup,SWT.RADIO);
 		sbCustom.setText(TuxGuitar.getProperty("gervill.options.soundbank.custom"));
 		sbCustom.setSelection( (settings.getSoundbankPath() != null) );
-		
+
 		Composite chooser = new Composite(soundbankGroup,SWT.NONE);
 		chooser.setLayout(new GridLayout(2,false));
-		
+
 		final Text sbCustomPath = new Text(chooser,SWT.BORDER);
 		sbCustomPath.setLayoutData(new GridData(350,SWT.DEFAULT));
 		sbCustomPath.setText( (settings.getSoundbankPath() == null ? new String() : settings.getSoundbankPath())  );
 		sbCustomPath.setEnabled( (settings.getSoundbankPath() != null) );
-		
+
 		final Button sbCustomChooser = new Button(chooser,SWT.PUSH);
 		sbCustomChooser.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
 		sbCustomChooser.setEnabled( (settings.getSoundbankPath() != null) );
 		sbCustomChooser.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				String fileName = FileChooser.instance().open(dialog, soundbankFormats);
 				if(fileName != null){
@@ -117,8 +119,9 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		SelectionListener sbRadioSelectionListener = new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				sbCustomPath.setEnabled(sbCustom.getSelection());
 				sbCustomChooser.setEnabled(sbCustom.getSelection());
@@ -126,26 +129,27 @@ public void widgetSelected(SelectionEvent e) {
 		};
 		sbDefault.addSelectionListener(sbRadioSelectionListener);
 		sbCustom.addSelectionListener(sbRadioSelectionListener);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(data);
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				String soundbankPath = (sbCustom.getSelection() ? sbCustomPath.getText() : null);
 				int tIndex = tCombo.getSelectionIndex();
 				int eIndex = eCombo.getSelectionIndex();
 				if( eIndex >= 0 && eIndex < formats.size() ){
-					MidiToAudioFormat format = (MidiToAudioFormat)formats.get( eIndex );
+					MidiToAudioFormat format = formats.get( eIndex );
 					if( tIndex >= 0 && tIndex < format.getTypes().length ){
 						settings.setType( format.getTypes()[tIndex] );
 						settings.setFormat( format.getFormat() );
@@ -156,35 +160,36 @@ public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(data);
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return this.success;
 	}
-	
+
 	private GridData getGroupData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 300;
 		return data;
 	}
-	
-	private void updateTypesCombo( MidiToAudioSettings settings, List encodings, Combo eCombo , Combo tCombo ){
+
+	private void updateTypesCombo( MidiToAudioSettings settings, List<MidiToAudioFormat> encodings, Combo eCombo , Combo tCombo ){
 		tCombo.removeAll();
-		
-		int eIndex = eCombo.getSelectionIndex();		
+
+		int eIndex = eCombo.getSelectionIndex();
 		if( eIndex >= 0 && eIndex < encodings.size() ){
-			MidiToAudioFormat encoding = (MidiToAudioFormat)encodings.get( eIndex );
+			MidiToAudioFormat encoding = encodings.get( eIndex );
 			AudioFileFormat.Type[] types = encoding.getTypes();
 			int tSelectionIndex = 0;
 			for( int tIndex = 0 ; tIndex < types.length ; tIndex ++ ) {
@@ -196,9 +201,9 @@ private void updateTypesCombo( MidiToAudioSettings settings, List encodings, Com
 			tCombo.select( tSelectionIndex );
 		}
 	}
-	
-	public List getAvailableFormats(){
-		List list = new ArrayList();
+
+	public List<MidiToAudioFormat> getAvailableFormats(){
+		List<MidiToAudioFormat> list = new ArrayList<MidiToAudioFormat>();
 		AudioFormat srcFormat = MidiToAudioSettings.DEFAULT_FORMAT;
 		AudioFormat.Encoding[] encodings = AudioSystem.getTargetEncodings(srcFormat);
 		for( int i = 0 ; i < encodings.length ; i ++ ){
@@ -211,35 +216,35 @@ public List getAvailableFormats(){
 		}
 		return list;
 	}
-	
-	private List getSupportedSoundbankFormats(){
-		List list = new ArrayList();
+
+	private List<TGFileFormat> getSupportedSoundbankFormats(){
+		List<TGFileFormat> list = new ArrayList<TGFileFormat>();
 		list.add(new TGFileFormat("SF2 files","*.sf2"));
 		list.add(new TGFileFormat("DLS files","*.dls"));
 		return list;
 	}
-	
+
 	public boolean isSameEncoding( AudioFormat f1, AudioFormat f2 ){
 		if( f1 == null || f2 == null || f1.getEncoding() == null || f2.getEncoding() == null ){
 			return false;
 		}
 		return ( f1.getEncoding().toString().equals( f2.getEncoding().toString() ) );
 	}
-	
+
 	private class MidiToAudioFormat {
-		
+
 		private AudioFormat format;
 		private AudioFileFormat.Type[] types;
-		
+
 		public MidiToAudioFormat(AudioFormat format, AudioFileFormat.Type[] types){
 			this.format = format;
 			this.types = types;
 		}
-		
+
 		public AudioFormat getFormat() {
 			return this.format;
 		}
-		
+
 		public AudioFileFormat.Type[] getTypes() {
 			return this.types;
 		}
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java
similarity index 81%
rename from TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java
rename to plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java
index 37fd519d..bc45dd86 100644
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioSynth.java
@@ -1,6 +1,7 @@
 package org.herac.tuxguitar.io.gervill;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -17,41 +18,41 @@
 import javax.sound.sampled.AudioInputStream;
 
 public class MidiToAudioSynth {
-	
+
 	private static final AudioFormat SRC_FORMAT = MidiToAudioSettings.DEFAULT_FORMAT;
-	
+
 	private static final String MODEL_PATCH_CLASSNAME = "com.sun.media.sound.ModelPatch";
 	private static final String SYNTHESIZER_CLASSNAME = "com.sun.media.sound.SoftSynthesizer";
 	private static final String SYNTHESIZER_OPEN_STREAM_METHOD = "openStream";
 	private static final String SYNTHESIZER_LOAD_DEFAULT_SOUNDBANK_PARAM = "load default soundbank";
-	
+
 	private static MidiToAudioSynth instance;
-	
+
 	private Synthesizer synthesizer;
 	private AudioInputStream stream;
 	private Receiver receiver;
-	
+
 	private MidiToAudioSynth(){
 		this.stream = null;
 		this.receiver = null;
 		this.synthesizer = null;
 	}
-	
+
 	public static MidiToAudioSynth instance(){
 		if( instance == null ){
 			instance = new MidiToAudioSynth();
 		}
 		return instance;
 	}
-	
+
 	public Receiver getReceiver(){
 		return this.receiver;
 	}
-	
+
 	public AudioInputStream getStream(){
 		return this.stream;
 	}
-	
+
 	public void openSynth() throws Throwable {
 		if( this.synthesizer == null || !this.synthesizer.isOpen() ){
 			this.synthesizer = createSynthesizer();
@@ -59,7 +60,7 @@ public void openSynth() throws Throwable {
 			this.stream = invokeOpenStream(this.synthesizer, SRC_FORMAT, getDefaultInfo());
 		}
 	}
-	
+
 	public void closeSynth() throws Throwable {
 		if( this.receiver != null ){
 			this.receiver.close();
@@ -71,36 +72,36 @@ public void closeSynth() throws Throwable {
 		this.receiver = null;
 		this.synthesizer = null;
 	}
-	
-	private Map getDefaultInfo(){
-		Map map = new HashMap();
+
+	private Map<String, Boolean> getDefaultInfo(){
+		Map<String, Boolean> map = new HashMap<String, Boolean>();
 		map.put(SYNTHESIZER_LOAD_DEFAULT_SOUNDBANK_PARAM, new Boolean(false));
 		return map;
 	}
-	
-	public void loadSoundbank(List patchList, String soundbankPath) throws Throwable {
+
+	public void loadSoundbank(List<Patch> patchList, String soundbankPath) throws Throwable {
 		Soundbank soundbank = null;
 		if( soundbankPath == null || soundbankPath.length() == 0 ){
 			soundbank = this.synthesizer.getDefaultSoundbank();
 		} else{
 			soundbank = MidiSystem.getSoundbank(new File(soundbankPath));
 		}
-		
-		Iterator it = patchList.iterator();
+
+		Iterator<Patch> it = patchList.iterator();
 		while( it.hasNext() ){
-			Patch patch = (Patch)it.next();
-			
+			Patch patch = it.next();
+
 			boolean percussion = (patch.getBank() == 128);
 			int bank = (percussion ? 0 : patch.getBank());
 			int program = patch.getProgram();
-			
+
 			Instrument instrument = soundbank.getInstrument(createModelPatch(bank, program, percussion));
 			if( instrument != null ){
 				this.synthesizer.loadInstrument(instrument);
 			}
 		}
 	}
-	
+
 	public boolean isAvailable(){
 		try {
 			Class.forName(SYNTHESIZER_CLASSNAME, false, getClass().getClassLoader() );
@@ -109,34 +110,32 @@ public boolean isAvailable(){
 			return false;
 		}
 	}
-	
-	private AudioInputStream invokeOpenStream(Synthesizer synthesizer, AudioFormat audioFormat, Map map) throws Throwable {
-		Class[] methodSignature = new Class[]{AudioFormat.class,Map.class};
+
+	private AudioInputStream invokeOpenStream(Synthesizer synthesizer, AudioFormat audioFormat, Map<String, Boolean> map) throws Throwable {
 		Object[] methodArguments = new Object[]{audioFormat, map};
-		
-		Class classInstance = synthesizer.getClass();
-		Method method = classInstance.getMethod(SYNTHESIZER_OPEN_STREAM_METHOD, methodSignature);
+
+		Class<?> classInstance = synthesizer.getClass();
+		Method method = classInstance.getMethod(SYNTHESIZER_OPEN_STREAM_METHOD, AudioFormat.class,Map.class);
 		Object returnValue = method.invoke(synthesizer, methodArguments);
-		
+
 		return (AudioInputStream)returnValue;
 	}
-	
+
 	private Synthesizer createSynthesizer() throws Throwable {
 		ClassLoader classLoader = getClass().getClassLoader();
-		Class classInstance = classLoader.loadClass(SYNTHESIZER_CLASSNAME);
+		Class<?> classInstance = classLoader.loadClass(SYNTHESIZER_CLASSNAME);
 		Object objectInstance = classInstance.getConstructor(new Class[0]).newInstance(new Object[0]);
-		
+
 		return (Synthesizer) objectInstance;
 	}
-	
+
 	private Patch createModelPatch(int bank, int program, boolean percussion) throws Throwable {
-		Class[] constructorSignature = new Class[]{int.class, int.class, boolean.class};
 		Object[] constructorArguments = new Object[]{new Integer(bank), new Integer(program), new Boolean(percussion)};
-		
+
 		ClassLoader classLoader = getClass().getClassLoader();
-		Class classInstance = classLoader.loadClass(MODEL_PATCH_CLASSNAME);
-		Object objectInstance = classInstance.getConstructor(constructorSignature).newInstance(constructorArguments);
-		
-		return (Patch) objectInstance;
+		Class<?> classInstance = classLoader.loadClass(MODEL_PATCH_CLASSNAME);
+		Constructor<?> constructor = classInstance.getConstructor(int.class, int.class, boolean.class);
+
+		return (Patch) constructor.newInstance(constructorArguments);
 	}
 }
diff --git a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioWriter.java b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioWriter.java
similarity index 86%
rename from TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioWriter.java
rename to plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioWriter.java
index c52315e1..9719ab29 100644
--- a/TuxGuitar-gervill/src/org/herac/tuxguitar/io/gervill/MidiToAudioWriter.java
+++ b/plugins/gervill/src/main/java/org/herac/tuxguitar/io/gervill/MidiToAudioWriter.java
@@ -20,25 +20,25 @@
 import org.herac.tuxguitar.song.models.TGDuration;
 
 public class MidiToAudioWriter {
-	
-	public static void write(OutputStream out, List events, MidiToAudioSettings settings) throws Throwable {
+
+	public static void write(OutputStream out, List<MidiEvent> events, MidiToAudioSettings settings) throws Throwable {
 		MidiToAudioSynth.instance().openSynth();
 		MidiToAudioSynth.instance().loadSoundbank(getPatchs(events), settings.getSoundbankPath());
-		
+
 		int usqTempo = 60000000 / 120;
 		long previousTick = 0;
 		long timePosition = 0;
 		MidiToAudioWriter.sort(events);
 		Receiver receiver = MidiToAudioSynth.instance().getReceiver();
 		AudioInputStream stream = MidiToAudioSynth.instance().getStream();
-		
-		Iterator it = events.iterator();
+
+		Iterator<MidiEvent> it = events.iterator();
 		while(it.hasNext()){
-			MidiEvent event = (MidiEvent)it.next();
+			MidiEvent event = it.next();
 			MidiMessage msg = event.getMessage();
-			
+
 			timePosition += ( (event.getTick() - previousTick) * usqTempo) / TGDuration.QUARTER_TIME;
-			
+
 			if (msg instanceof MetaMessage) {
 				if (((MetaMessage) msg).getType() == 0x51) {
 					byte[] data = ((MetaMessage) msg).getData();
@@ -49,21 +49,22 @@ public static void write(OutputStream out, List events, MidiToAudioSettings sett
 			}
 			previousTick = event.getTick();
 		}
-		
+
 		long duration = (long) (stream.getFormat().getFrameRate() * ( (timePosition / 1000000.0) ));
-		
+
 		AudioInputStream srcStream = new AudioInputStream(stream, stream.getFormat(), duration );
 		AudioInputStream dstStream = AudioSystem.getAudioInputStream(settings.getFormat(), srcStream );
 		AudioSystem.write(new AudioInputStream(dstStream, dstStream.getFormat(), duration ), settings.getType(), out);
-		
+
 		dstStream.close();
 		srcStream.close();
-		
+
 		MidiToAudioSynth.instance().closeSynth();
 	}
-	
-	private static void sort(List events){
-		Collections.sort(events, new Comparator() {
+
+	private static void sort(List<MidiEvent> events){
+		Collections.sort(events, new Comparator<Object>() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				if( o1 instanceof MidiEvent && o2 instanceof MidiEvent ){
 					MidiEvent e1 = (MidiEvent)o1;
@@ -79,17 +80,17 @@ else if(e1.getTick() < e2.getTick()){
 			}
 		});
 	}
-	
-	private static List getPatchs(List events){
+
+	private static List<Patch> getPatchs(List<MidiEvent> events){
 		Patch[] channels = new Patch[16];
-		
-		Iterator it = events.iterator();
+
+		Iterator<MidiEvent> it = events.iterator();
 		while(it.hasNext()){
-			MidiEvent event = (MidiEvent)it.next();
+			MidiEvent event = it.next();
 			MidiMessage msg = event.getMessage();
 			if( msg instanceof ShortMessage ){
 				ShortMessage shortMessage = (ShortMessage)msg;
-				
+
 				int channel = shortMessage.getChannel();
 				if( channel >= 0 && channel < channels.length ){
 					int command = shortMessage.getCommand();
@@ -109,13 +110,13 @@ private static List getPatchs(List events){
 				}
 			}
 		}
-		List patchs = new ArrayList();
+		List<Patch> patchs = new ArrayList<Patch>();
 		for( int i = 0 ; i < channels.length ; i ++ ){
 			if( channels[i] != null ){
 				boolean patchExists = false;
-				Iterator patchIt = patchs.iterator();
+				Iterator<Patch> patchIt = patchs.iterator();
 				while( patchIt.hasNext() ){
-					Patch patch = (Patch) patchIt.next();
+					Patch patch = patchIt.next();
 					if( patch.getBank() == channels[i].getBank() && patch.getProgram() == channels[i].getProgram() ){
 						patchExists = true;
 					}
@@ -126,7 +127,7 @@ private static List getPatchs(List events){
 			}
 		}
 		patchs.add(new Patch(128, 0));
-		
+
 		return patchs;
 	}
 }
diff --git a/TuxGuitar-gervill/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/gervill/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-gervill/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/gervill/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-gervill/share/lang/messages.properties b/plugins/gervill/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-gervill/share/lang/messages.properties
rename to plugins/gervill/src/main/resources/lang/messages.properties
diff --git a/plugins/gpx/pom.xml b/plugins/gpx/pom.xml
new file mode 100644
index 00000000..641a150f
--- /dev/null
+++ b/plugins/gpx/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-gpx</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: GPX</name>
+	<description>Guitar Pro 6 plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXByteBuffer.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXByteBuffer.java
similarity index 98%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXByteBuffer.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXByteBuffer.java
index 62648d25..cc009a04 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXByteBuffer.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXByteBuffer.java
@@ -1,29 +1,29 @@
 package org.herac.tuxguitar.io.gpx;
 
 public class GPXByteBuffer {
-	
+
 	private static final int BUFFER_TYPE_BITS = 8;
-	
+
 	private int position;
 	private byte[] buffer;
-	
+
 	public GPXByteBuffer( byte[] buffer ){
 		this.buffer = buffer;
 		this.position = 0;
 	}
-	
+
 	public int length(){
 		return ( this.buffer.length );
 	}
-	
+
 	public int offset(){
 		return ( this.position / BUFFER_TYPE_BITS );
 	}
-	
+
 	public boolean end(){
 		return ( this.offset() >= this.length() );
 	}
-	
+
 	public int readBit(){
 		int bit = -1;
 		int byteIndex = ( this.position / BUFFER_TYPE_BITS );
@@ -34,7 +34,7 @@ public int readBit(){
 		}
 		return bit;
 	}
-	
+
 	public int readBits(int count){
 		int bits = 0;
 		for( int i = (count - 1) ; i >= 0 ; i -- ){
@@ -42,7 +42,7 @@ public int readBits(int count){
 		}
 		return bits;
 	}
-	
+
 	public int readBitsReversed(int count){
 		int bits = 0;
 		for( int i = 0 ; i < count ; i ++ ){
@@ -50,7 +50,7 @@ public int readBitsReversed(int count){
 		}
 		return bits;
 	}
-	
+
 	public byte[] readBytes(int count){
 		byte[] bytes = new byte[count];
 		for( int i = 0 ; i < count ; i++ ){
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXDocumentParser.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXDocumentParser.java
similarity index 96%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXDocumentParser.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXDocumentParser.java
index d47c2d75..fb9ed79d 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXDocumentParser.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXDocumentParser.java
@@ -36,30 +36,30 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectTrill;
 
 public class GPXDocumentParser {
-	
+
 	private static final float GP_BEND_POSITION = 100f;
 	private static final float GP_BEND_SEMITONE =  25f;
 	private static final float GP_WHAMMY_BAR_POSITION = 100f;
 	private static final float GP_WHAMMY_BAR_SEMITONE =  50f;
-	
+
 	private TGFactory factory;
 	private GPXDocument document;
-	
+
 	public GPXDocumentParser(TGFactory factory, GPXDocument document){
 		this.factory = factory;
 		this.document = document;
 	}
-	
+
 	public TGSong parse(){
 		TGSong tgSong =  this.factory.newSong();
-		
+
 		this.parseScore(tgSong);
 		this.parseTracks(tgSong);
 		this.parseMasterBars(tgSong);
-		
+
 		return tgSong;
 	}
-	
+
 	private void parseScore(TGSong tgSong){
 		tgSong.setName(this.document.getScore().getTitle());
 		tgSong.setArtist(this.document.getScore().getArtist());
@@ -69,17 +69,17 @@ private void parseScore(TGSong tgSong){
 		tgSong.setWriter(this.document.getScore().getTabber());
 		tgSong.setComments(this.document.getScore().getNotices());
 	}
-	
+
 	private void parseTracks(TGSong tgSong){
-		List tracks = this.document.getTracks();
+		List<GPXTrack> tracks = this.document.getTracks();
 		for( int i = 0 ; i < tracks.size(); i ++ ){
-			GPXTrack gpTrack = (GPXTrack) this.document.getTracks().get(i);
-			
+			GPXTrack gpTrack = this.document.getTracks().get(i);
+
 			TGChannel tgChannel = this.factory.newChannel();
 			tgChannel.setProgram((short)gpTrack.getGmProgram());
 			tgChannel.setChannel((short)gpTrack.getGmChannel1());
 			tgChannel.setEffectChannel((short)gpTrack.getGmChannel2());
-			
+
 			for( int c = 0 ; c < tgSong.countChannels() ; c ++ ){
 				TGChannel tgChannelAux = tgSong.getChannel(c);
 				if( tgChannelAux.getChannel() == tgChannel.getChannel() ){
@@ -91,12 +91,12 @@ private void parseTracks(TGSong tgSong){
 				tgChannel.setName(("#" + tgChannel.getChannelId()));
 				tgSong.addChannel(tgChannel);
 			}
-			
+
 			TGTrack tgTrack = this.factory.newTrack();
 			tgTrack.setNumber( i + 1 );
 			tgTrack.setName(gpTrack.getName());
 			tgTrack.setChannelId(tgChannel.getChannelId());
-			
+
 			if( gpTrack.getTunningPitches() != null ){
 				for( int s = 1; s <= gpTrack.getTunningPitches().length ; s ++ ){
 					TGString tgString = this.factory.newString();
@@ -124,15 +124,15 @@ private void parseTracks(TGSong tgSong){
 			tgSong.addTrack(tgTrack);
 		}
 	}
-	
+
 	private void parseMasterBars(TGSong tgSong){
 		long tgStart = TGDuration.QUARTER_TIME;
-		
-		List masterBars = this.document.getMasterBars();
+
+		List<GPXMasterBar> masterBars = this.document.getMasterBars();
 		for( int i = 0 ; i < masterBars.size() ; i ++ ){
-			GPXMasterBar mbar = (GPXMasterBar) masterBars.get(i);
+			GPXMasterBar mbar = masterBars.get(i);
 			GPXAutomation gpTempoAutomation = this.document.getAutomation("Tempo", i);
-			
+
 			TGMeasureHeader tgMeasureHeader = this.factory.newHeader();
 			tgMeasureHeader.setStart(tgStart);
 			tgMeasureHeader.setNumber( i + 1 );
@@ -157,11 +157,11 @@ private void parseMasterBars(TGSong tgSong){
 				tgMeasureHeader.getTempo().setValue( tgTempo );
 			}
 			tgSong.addMeasureHeader(tgMeasureHeader);
-			
+
 			for( int t = 0 ; t < tgSong.countTracks() ; t ++ ){
 				TGTrack tgTrack = tgSong.getTrack(t);
 				TGMeasure tgMeasure = this.factory.newMeasure(tgMeasureHeader);
-				
+
 				int accidental = mbar.getAccidentalCount();
 				if( accidental < 0 ){
 					accidental = 7 - accidental; // translate -1 to 8, etc.
@@ -169,9 +169,9 @@ private void parseMasterBars(TGSong tgSong){
 				if( accidental >= 0 && accidental <= 14 ){
 					tgMeasure.setKeySignature(accidental);
 				}
-				
+
 				tgTrack.addMeasure(tgMeasure);
-				
+
 				int gpMasterBarIndex = i;
 				GPXBar gpBar = ( t < mbar.getBarIds().length ? this.document.getBar( mbar.getBarIds()[t] ) : null );
 				while( gpBar != null && gpBar.getSimileMark() != null ){
@@ -182,22 +182,22 @@ private void parseMasterBars(TGSong tgSong){
 						gpMasterBarIndex = (gpMasterBarIndex - 2);
 					}
 					if( gpMasterBarIndex >= 0 ){
-						GPXMasterBar gpMasterBarCopy = (GPXMasterBar) masterBars.get(gpMasterBarIndex);
+						GPXMasterBar gpMasterBarCopy = masterBars.get(gpMasterBarIndex);
 						gpBar = (t < gpMasterBarCopy.getBarIds().length ? this.document.getBar(gpMasterBarCopy.getBarIds()[t]) : null);
 					}else{
 						gpBar = null;
 					}
 				}
-				
+
 				if( gpBar != null ){
 					this.parseBar( gpBar , tgMeasure );
 				}
 			}
-			
+
 			tgStart += tgMeasureHeader.getLength();
 		}
 	}
-	
+
 	private void parseBar(GPXBar bar , TGMeasure tgMeasure){
 		if (bar.getClef() != null) {
 			String clef = bar.getClef();
@@ -209,7 +209,7 @@ private void parseBar(GPXBar bar , TGMeasure tgMeasure){
 				tgMeasure.setClef(TGMeasure.CLEF_TENOR);
 			}
 		}
-		
+
 		int[] voiceIds = bar.getVoiceIds();
 		for( int v = 0; v < TGBeat.MAX_VOICES; v ++ ){
 			if( voiceIds.length > v ){
@@ -220,7 +220,7 @@ private void parseBar(GPXBar bar , TGMeasure tgMeasure){
 						for( int b = 0 ; b < voice.getBeatIds().length ; b ++){
 							GPXBeat beat = this.document.getBeat( voice.getBeatIds()[b] );
 							GPXRhythm gpRhythm = this.document.getRhythm( beat.getRhythmId() );
-							
+
 							TGBeat tgBeat = getBeat(tgMeasure, tgStart);
 							TGVoice tgVoice = tgBeat.getVoice( v % tgBeat.countVoices() );
 							tgVoice.setEmpty(false);
@@ -232,11 +232,11 @@ private void parseBar(GPXBar bar , TGMeasure tgMeasure){
 								text.setBeat(tgBeat);
 								tgBeat.setText(text);
 							}
-							
+
 							this.parseRhythm(gpRhythm, tgVoice.getDuration());
 							if( beat.getNoteIds() != null ){
 								int tgVelocity = this.parseDynamic(beat);
-								
+
 								for( int n = 0 ; n < beat.getNoteIds().length; n ++ ){
 									GPXNote gpNote = this.document.getNote( beat.getNoteIds()[n] );
 									if( gpNote != null ){
@@ -244,23 +244,23 @@ private void parseBar(GPXBar bar , TGMeasure tgMeasure){
 									}
 								}
 							}
-							
+
 							tgStart += tgVoice.getDuration().getTime();
 						}
 					}
 				}
 			}
 		}
-		
+
 		if( tgMeasure.getNumber() == 1 ){
 			this.fixFirstMeasureStartPositions(tgMeasure);
 		}
 	}
-	
+
 	private void parseNote(GPXNote gpNote, TGVoice tgVoice, int tgVelocity, GPXBeat gpBeat){
 		int tgValue = -1;
 		int tgString = -1;
-		
+
 		if( gpNote.getString() >= 0 && gpNote.getFret() >= 0 ){
 			tgValue = gpNote.getFret();
 			tgString = (tgVoice.getBeat().getMeasure().getTrack().stringCount() - gpNote.getString());
@@ -277,7 +277,7 @@ private void parseNote(GPXNote gpNote, TGVoice tgVoice, int tgVelocity, GPXBeat
 					}
 				}
 			}
-			
+
 			if( gmValue >= 0 ){
 				TGString tgStringAlternative = getStringFor(tgVoice.getBeat(), gmValue );
 				if( tgStringAlternative != null ){
@@ -286,7 +286,7 @@ private void parseNote(GPXNote gpNote, TGVoice tgVoice, int tgVelocity, GPXBeat
 				}
 			}
 		}
-		
+
 		if( tgValue >= 0 && tgString > 0 ){
 			TGNote tgNote = this.factory.newNote();
 			tgNote.setValue(tgValue);
@@ -311,11 +311,11 @@ private void parseNote(GPXNote gpNote, TGVoice tgVoice, int tgVelocity, GPXBeat
 			tgNote.getEffect().setHarmonic(parseHarmonic( gpNote ) );
 			tgNote.getEffect().setBend(parseBend( gpNote ) );
 			tgNote.getEffect().setTremoloBar(parseTremoloBar( gpBeat ));
-			
+
 			tgVoice.addNote( tgNote );
 		}
 	}
-	
+
 	private TGEffectTrill parseTrill(GPXNote gpNote){
 		TGEffectTrill tr = null;
 		if( gpNote.getTrill() > 0 ){
@@ -327,7 +327,7 @@ private TGEffectTrill parseTrill(GPXNote gpNote){
 		}
 		return tr;
 	}
-	
+
 	private TGEffectTremoloPicking parseTremoloPicking(GPXBeat gpBeat, GPXNote gpNote){
 		TGEffectTremoloPicking tp = null;
 		if (gpBeat.getTremolo() != null && gpBeat.getTremolo().length == 2) {
@@ -336,12 +336,12 @@ private TGEffectTremoloPicking parseTremoloPicking(GPXBeat gpBeat, GPXNote gpNot
 		}
 		return tp;
 	}
-	
+
 	private TGEffectHarmonic parseHarmonic(GPXNote note){
 		TGEffectHarmonic harmonic = null;
 		if( note.getHarmonicType() != null && note.getHarmonicType().length() > 0 ){
 			harmonic = this.factory.newEffectHarmonic();
-			
+
 			String type = note.getHarmonicType();
 			if (type.equals("Artificial")){
 				harmonic.setType(TGEffectHarmonic.TYPE_ARTIFICIAL);
@@ -353,12 +353,12 @@ private TGEffectHarmonic parseHarmonic(GPXNote note){
 				// Default type.
 				harmonic.setType(TGEffectHarmonic.TYPE_NATURAL);
 			}
-			
+
 			int hFret = note.getHarmonicFret();
-			
+
 			// midi export does this, but not for natural harmonics
 			// key = (orig + TGEffectHarmonic.NATURAL_FREQUENCIES[note.getEffect().getHarmonic().getData()][1]);
-			
+
 			if (hFret >= 0){
 				for(int i = 0;i < TGEffectHarmonic.NATURAL_FREQUENCIES.length;i ++){
 					if(hFret == (TGEffectHarmonic.NATURAL_FREQUENCIES[i][0] ) ){
@@ -370,15 +370,15 @@ private TGEffectHarmonic parseHarmonic(GPXNote note){
 		}
 		return harmonic;
 	}
-	
+
 	private TGEffectBend parseBend(GPXNote note){
 		TGEffectBend bend = null;
 		if( note.isBendEnabled() && note.getBendOriginValue() != null && note.getBendDestinationValue() != null ){
 			bend = this.factory.newEffectBend();
-			
+
 			// Add the first point
 			bend.addPoint(0, parseBendValue(note.getBendOriginValue()));
-			
+
 			if( note.getBendOriginOffset() != null ){
 				bend.addPoint(parseBendPosition(note.getBendOriginOffset()), parseBendValue(note.getBendOriginValue()));
 			}
@@ -396,29 +396,29 @@ private TGEffectBend parseBend(GPXNote note){
 			if( note.getBendDestinationOffset() != null && note.getBendDestinationOffset().intValue() < GP_BEND_POSITION ){
 				bend.addPoint(parseBendPosition(note.getBendDestinationOffset()), parseBendValue(note.getBendDestinationValue()));
 			}
-			
+
 			// Add last point
 			bend.addPoint(TGEffectBend.MAX_POSITION_LENGTH, parseBendValue(note.getBendDestinationValue()));
 		}
 		return bend;
 	}
-	
+
 	private int parseBendValue( Integer gpValue ){
 		return Math.round(gpValue.intValue() * (TGEffectBend.SEMITONE_LENGTH / GP_BEND_SEMITONE));
 	}
-	
+
 	private int parseBendPosition( Integer gpOffset ){
 		return Math.round(gpOffset.intValue() * (TGEffectBend.MAX_POSITION_LENGTH / GP_BEND_POSITION));
 	}
-	
+
 	private TGEffectTremoloBar parseTremoloBar(GPXBeat beat){
 		TGEffectTremoloBar tremoloBar = null;
 		if( beat.isWhammyBarEnabled() && beat.getWhammyBarOriginValue() != null && beat.getWhammyBarDestinationValue() != null){
 			tremoloBar = this.factory.newEffectTremoloBar();
-			
+
 			// Add the first point
 			tremoloBar.addPoint(0, parseTremoloBarValue(beat.getWhammyBarOriginValue()));
-			
+
 			if( beat.getWhammyBarOriginOffset() != null ){
 				tremoloBar.addPoint(parseTremoloBarPosition(beat.getWhammyBarOriginOffset()), parseTremoloBarValue(beat.getWhammyBarOriginValue()));
 			}
@@ -435,7 +435,7 @@ private TGEffectTremoloBar parseTremoloBar(GPXBeat beat){
 					if( beat.getWhammyBarOriginOffset() == null || offset1.intValue() >= beat.getWhammyBarOriginOffset().intValue() ){
 						tremoloBar.addPoint(parseTremoloBarPosition(offset1), parseTremoloBarValue(beat.getWhammyBarMiddleValue()));
 					}
-					
+
 					Integer offset2 = (beat.getWhammyBarMiddleOffset2() != null ? beat.getWhammyBarMiddleOffset2() : defaultMiddleOffset);
 					if( beat.getWhammyBarOriginOffset() == null || offset1.intValue() >= beat.getWhammyBarOriginOffset().intValue() && offset2.intValue() > offset1.intValue() ){
 						tremoloBar.addPoint(parseTremoloBarPosition(offset2), parseTremoloBarValue(beat.getWhammyBarMiddleValue()));
@@ -445,13 +445,13 @@ private TGEffectTremoloBar parseTremoloBar(GPXBeat beat){
 			if( beat.getWhammyBarDestinationOffset() != null && beat.getWhammyBarDestinationOffset().intValue() < GP_WHAMMY_BAR_POSITION ){
 				tremoloBar.addPoint(parseTremoloBarPosition(beat.getWhammyBarDestinationOffset()), parseTremoloBarValue(beat.getWhammyBarDestinationValue()));
 			}
-			
+
 			// Add last point
 			tremoloBar.addPoint(TGEffectTremoloBar.MAX_POSITION_LENGTH, parseTremoloBarValue(beat.getWhammyBarDestinationValue()));
 		}
 		return tremoloBar;
 	}
-	
+
 	private int parseTremoloBarValue( Integer gpValue ){
 		int value = Math.round(gpValue.intValue() * (1f / GP_WHAMMY_BAR_SEMITONE));
 		if( value > TGEffectTremoloBar.MAX_VALUE_LENGTH ){
@@ -462,11 +462,11 @@ private int parseTremoloBarValue( Integer gpValue ){
 		}
 		return value;
 	}
-	
+
 	private int parseTremoloBarPosition( Integer gpOffset ){
 		return Math.round(gpOffset.intValue() * (TGEffectTremoloBar.MAX_POSITION_LENGTH / GP_WHAMMY_BAR_POSITION));
 	}
-	
+
 	private void parseRhythm(GPXRhythm gpRhythm , TGDuration tgDuration){
 		tgDuration.setDotted(gpRhythm.getAugmentationDotCount() == 1);
 		tgDuration.setDoubleDotted(gpRhythm.getAugmentationDotCount() == 2);
@@ -488,10 +488,10 @@ private void parseRhythm(GPXRhythm gpRhythm , TGDuration tgDuration){
 			tgDuration.setValue(TGDuration.SIXTY_FOURTH);
 		}
 	}
-	
+
 	private int parseStroke(GPXBeat beat){
 		int tgStroke = TGStroke.STROKE_NONE;
-		String stroke = beat.getBrush(); 
+		String stroke = beat.getBrush();
 		if ( stroke.equals("Down")){
 			tgStroke = TGStroke.STROKE_DOWN;
 		}else if ( stroke.equals("Up")){
@@ -499,7 +499,7 @@ private int parseStroke(GPXBeat beat){
 		}
 		return tgStroke;
 	}
-	
+
 	private int parseDynamic(GPXBeat beat){
 		int tgVelocity = TGVelocities.DEFAULT;
 		if( beat.getDynamic() != null ){
@@ -523,11 +523,11 @@ private int parseDynamic(GPXBeat beat){
 		}
 		return tgVelocity;
 	}
-	
+
 	private int parseTripletFeel(GPXMasterBar gpMasterBar){
 		if( gpMasterBar.getTripletFeel() != null ){
 			if( gpMasterBar.getTripletFeel().equals("Triplet8th") ){
-				return TGMeasureHeader.TRIPLET_FEEL_EIGHTH; 
+				return TGMeasureHeader.TRIPLET_FEEL_EIGHTH;
 			}
 			if( gpMasterBar.getTripletFeel().equals("Triplet16th") ){
 				return TGMeasureHeader.TRIPLET_FEEL_SIXTEENTH;
@@ -535,7 +535,7 @@ private int parseTripletFeel(GPXMasterBar gpMasterBar){
 		}
 		return TGMeasureHeader.TRIPLET_FEEL_NONE;
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure, long start){
 		int count = measure.countBeats();
 		for(int i = 0 ; i < count ; i ++ ){
@@ -549,17 +549,17 @@ private TGBeat getBeat(TGMeasure measure, long start){
 		measure.addBeat(beat);
 		return beat;
 	}
-	
+
 	private TGString getStringFor(TGBeat tgBeat, int value ){
-		List strings = tgBeat.getMeasure().getTrack().getStrings();
+		List<TGString> strings = tgBeat.getMeasure().getTrack().getStrings();
 		for(int i = 0;i < strings.size();i ++){
-			TGString string = (TGString)strings.get(i);
+			TGString string = strings.get(i);
 			if(value >= string.getValue()){
 				boolean emptyString = true;
-				
+
 				for(int v = 0; v < tgBeat.countVoices(); v ++){
 					TGVoice voice = tgBeat.getVoice( v );
-					Iterator it = voice.getNotes().iterator();
+					Iterator<TGNote> it = voice.getNotes().iterator();
 					while (it.hasNext()) {
 						TGNoteImpl note = (TGNoteImpl) it.next();
 						if (note.getString() == string.getNumber()) {
@@ -575,7 +575,7 @@ private TGString getStringFor(TGBeat tgBeat, int value ){
 		}
 		return null;
 	}
-	
+
 	private void fixFirstMeasureStartPositions(TGMeasure tgMeasure){
 		if( tgMeasure.getNumber() == 1 ){
 			long measureEnd = (tgMeasure.getStart() + tgMeasure.getLength());
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXDocumentReader.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXDocumentReader.java
similarity index 97%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXDocumentReader.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXDocumentReader.java
index 5921d1e0..4a765c2e 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXDocumentReader.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXDocumentReader.java
@@ -19,15 +19,15 @@
 import org.w3c.dom.NodeList;
 
 public class GPXDocumentReader {
-	
+
 	private Document xmlDocument;
 	private GPXDocument gpxDocument;
-	
+
 	public GPXDocumentReader(InputStream stream){
 		this.xmlDocument = getDocument(stream);
 		this.gpxDocument = new GPXDocument();
 	}
-	
+
 	private Document getDocument(InputStream stream) {
 		try {
 			return DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream);
@@ -36,7 +36,7 @@ private Document getDocument(InputStream stream) {
 		}
 		return null;
 	}
-	
+
 	public GPXDocument read(){
 		if( this.xmlDocument != null ){
 			this.readScore();
@@ -51,7 +51,7 @@ public GPXDocument read(){
 		}
 		return this.gpxDocument;
 	}
-	
+
 	public void readScore(){
 		if( this.xmlDocument != null ){
 			Node scoreNode = getChildNode(this.xmlDocument.getFirstChild(), "Score");
@@ -70,7 +70,7 @@ public void readScore(){
 			}
 		}
 	}
-	
+
 	public void readAutomations(){
 		if( this.xmlDocument != null ){
 			Node masterTrackNode = getChildNode(this.xmlDocument.getFirstChild(), "MasterTrack");
@@ -86,14 +86,14 @@ public void readAutomations(){
 						automation.setLinear( getChildNodeBooleanContent(automationNode, "Linear"));
 						automation.setPosition( getChildNodeIntegerContent(automationNode, "Position"));
 						automation.setVisible( getChildNodeBooleanContent(automationNode, "Visible"));
-						
+
 						this.gpxDocument.getAutomations().add( automation );
 					}
 				}
 			}
 		}
 	}
-	
+
 	public void readTracks(){
 		if( this.xmlDocument != null ){
 			NodeList trackNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "Tracks");
@@ -110,12 +110,12 @@ public void readTracks(){
 						track.setGmChannel1(getChildNodeIntegerContent(gmNode, "PrimaryChannel"));
 						track.setGmChannel2(getChildNodeIntegerContent(gmNode, "SecondaryChannel"));
 					}
-					
+
 					NodeList propertyNodes = getChildNodeList(trackNode, "Properties");
 					if( propertyNodes != null ){
 						for( int p = 0 ; p < propertyNodes.getLength() ; p ++ ){
 							Node propertyNode = propertyNodes.item( p );
-							if (propertyNode.getNodeName().equals("Property") ){ 
+							if (propertyNode.getNodeName().equals("Property") ){
 								if( getAttributeValue(propertyNode, "name").equals("Tuning") ){
 									track.setTunningPitches( getChildNodeIntegerContentArray(propertyNode, "Pitches") );
 								}
@@ -127,7 +127,7 @@ public void readTracks(){
 			}
 		}
 	}
-	
+
 	public void readMasterBars(){
 		if( this.xmlDocument != null ){
 			NodeList masterBarNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "MasterBars");
@@ -138,7 +138,7 @@ public void readMasterBars(){
 					masterBar.setBarIds( getChildNodeIntegerContentArray(masterBarNode, "Bars"));
 					masterBar.setTime( getChildNodeIntegerContentArray(masterBarNode, "Time", "/"));
 					masterBar.setTripletFeel(getChildNodeContent(masterBarNode, "TripletFeel"));
-					
+
 					Node repeatNode = getChildNode(masterBarNode, "Repeat");
 					if( repeatNode != null ){
 						masterBar.setRepeatStart(getAttributeBooleanValue(repeatNode, "start"));
@@ -146,19 +146,19 @@ public void readMasterBars(){
 							masterBar.setRepeatCount( getAttributeIntegerValue(repeatNode, "count"));
 						}
 					}
-					
+
 					Node keyNode = getChildNode(masterBarNode, "Key");
 					if (keyNode != null) {
-						masterBar.setAccidentalCount(this.getChildNodeIntegerContent(keyNode, "AccidentalCount") ); 
-						masterBar.setMode(this.getChildNodeContent(keyNode, "Mode") ); 
+						masterBar.setAccidentalCount(this.getChildNodeIntegerContent(keyNode, "AccidentalCount") );
+						masterBar.setMode(this.getChildNodeContent(keyNode, "Mode") );
 					}
-					
+
 					this.gpxDocument.getMasterBars().add( masterBar );
 				}
 			}
 		}
 	}
-	
+
 	public void readBars(){
 		if( this.xmlDocument != null ){
 			NodeList barNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "Bars");
@@ -170,13 +170,13 @@ public void readBars(){
 					bar.setVoiceIds( getChildNodeIntegerContentArray(barNode, "Voices"));
 					bar.setClef(getChildNodeContent(barNode, "Clef"));
 					bar.setSimileMark(getChildNodeContent(barNode,"SimileMark"));
-					
+
 					this.gpxDocument.getBars().add( bar );
 				}
 			}
 		}
 	}
-	
+
 	public void readVoices(){
 		if( this.xmlDocument != null ){
 			NodeList voiceNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "Voices");
@@ -186,13 +186,13 @@ public void readVoices(){
 					GPXVoice voice = new GPXVoice();
 					voice.setId(getAttributeIntegerValue(voiceNode, "id"));
 					voice.setBeatIds( getChildNodeIntegerContentArray(voiceNode, "Beats"));
-					
+
 					this.gpxDocument.getVoices().add( voice );
 				}
 			}
 		}
 	}
-	
+
 	public void readBeats(){
 		if( this.xmlDocument != null ){
 			NodeList beatNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "Beats");
@@ -205,14 +205,14 @@ public void readBeats(){
 					beat.setRhythmId(getAttributeIntegerValue(getChildNode(beatNode, "Rhythm"), "ref"));
 					beat.setTremolo( getChildNodeIntegerContentArray(beatNode, "Tremolo", "/"));
 					beat.setNoteIds( getChildNodeIntegerContentArray(beatNode, "Notes"));
-					
+
 					NodeList propertyNodes = getChildNodeList(beatNode, "Properties");
 					if( propertyNodes != null ){
 						for( int p = 0 ; p < propertyNodes.getLength() ; p ++ ){
 							Node propertyNode = propertyNodes.item( p );
-							if (propertyNode.getNodeName().equals("Property") ){ 
+							if (propertyNode.getNodeName().equals("Property") ){
 								String propertyName = getAttributeValue(propertyNode, "name");
-								
+
 								if( propertyName.equals("WhammyBar") ){
 									beat.setWhammyBarEnabled( getChildNode(propertyNode, "Enable") != null );
 								}
@@ -240,13 +240,13 @@ public void readBeats(){
 							}
 						}
 					}
-					
+
 					this.gpxDocument.getBeats().add( beat );
 				}
 			}
 		}
 	}
-	
+
 	public void readNotes(){
 		if( this.xmlDocument != null ){
 			NodeList noteNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "Notes");
@@ -255,25 +255,25 @@ public void readNotes(){
 				if( noteNode.getNodeName().equals("Note") ){
 					GPXNote note = new GPXNote();
 					note.setId( getAttributeIntegerValue(noteNode, "id") );
-					
+
 					Node tieNode = getChildNode(noteNode, "Tie");
 					note.setTieDestination( tieNode != null ? getAttributeValue(tieNode, "destination").equals("true") : false);
-					
+
 					String ghostNodeContent = getChildNodeContent(noteNode, "AntiAccent");
 					if( ghostNodeContent != null ){
 						note.setGhost(ghostNodeContent.equals("Normal"));
 					}
-					
+
 					note.setAccent(getChildNodeIntegerContent(noteNode, "Accent"));
 					note.setTrill(getChildNodeIntegerContent(noteNode, "Trill"));
 
 					note.setVibrato( getChildNode(noteNode, "Vibrato") != null );
-					
+
 					NodeList propertyNodes = getChildNodeList(noteNode, "Properties");
 					if( propertyNodes != null ){
 						for( int p = 0 ; p < propertyNodes.getLength() ; p ++ ){
 							Node propertyNode = propertyNodes.item( p );
-							if (propertyNode.getNodeName().equals("Property") ){ 
+							if (propertyNode.getNodeName().equals("Property") ){
 								String propertyName = getAttributeValue(propertyNode, "name");
 								if( propertyName.equals("String") ){
 									note.setString( getChildNodeIntegerContent(propertyNode, "String") );
@@ -348,13 +348,13 @@ public void readNotes(){
 							}
 						}
 					}
-					
+
 					this.gpxDocument.getNotes().add( note );
 				}
 			}
 		}
 	}
-	
+
 	public void readRhythms(){
 		if( this.xmlDocument != null ){
 			NodeList rhythmNodes = getChildNodeList(this.xmlDocument.getFirstChild(), "Rhythms");
@@ -363,35 +363,35 @@ public void readRhythms(){
 				if( rhythmNode.getNodeName().equals("Rhythm") ){
 					Node primaryTupletNode = getChildNode(rhythmNode, "PrimaryTuplet");
 					Node augmentationDotNode = getChildNode(rhythmNode, "AugmentationDot");
-					
+
 					GPXRhythm rhythm = new GPXRhythm();
 					rhythm.setId( getAttributeIntegerValue(rhythmNode, "id") );
 					rhythm.setNoteValue(getChildNodeContent(rhythmNode, "NoteValue") );
 					rhythm.setPrimaryTupletDen(primaryTupletNode != null ? getAttributeIntegerValue(primaryTupletNode, "den") : 1);
 					rhythm.setPrimaryTupletNum(primaryTupletNode != null ? getAttributeIntegerValue(primaryTupletNode, "num") : 1);
 					rhythm.setAugmentationDotCount(augmentationDotNode != null ? getAttributeIntegerValue(augmentationDotNode, "count") : 0);
-					
+
 					this.gpxDocument.getRhythms().add( rhythm );
 				}
 			}
 		}
 	}
-	
+
 	private String getAttributeValue(Node node, String attribute ){
 		if( node != null ){
 			return node.getAttributes().getNamedItem( attribute ).getNodeValue();
 		}
 		return null;
 	}
-	
+
 	private int getAttributeIntegerValue(Node node, String attribute ){
 		try {
 			return new BigDecimal(this.getAttributeValue(node, attribute)).intValue();
-		} catch( Throwable throwable ){ 
+		} catch( Throwable throwable ){
 			return 0;
 		}
 	}
-	
+
 	private boolean getAttributeBooleanValue(Node node, String attribute ){
 		String value = this.getAttributeValue(node, attribute);
 		if( value != null ){
@@ -399,7 +399,7 @@ private boolean getAttributeBooleanValue(Node node, String attribute ){
 		}
 		return false;
 	}
-	
+
 	private Node getChildNode(Node node, String name ){
 		NodeList childNodes = node.getChildNodes();
 		for( int i = 0 ; i < childNodes.getLength() ; i ++ ){
@@ -410,7 +410,7 @@ private Node getChildNode(Node node, String name ){
 		}
 		return null;
 	}
-	
+
 	private NodeList getChildNodeList(Node node, String name ){
 		Node childNode = getChildNode(node, name);
 		if( childNode != null ){
@@ -418,7 +418,7 @@ private NodeList getChildNodeList(Node node, String name ){
 		}
 		return null;
 	}
-	
+
 	private String getChildNodeContent(Node node, String name ){
 		Node childNode = getChildNode(node, name);
 		if( childNode != null ){
@@ -426,7 +426,7 @@ private String getChildNodeContent(Node node, String name ){
 		}
 		return null;
 	}
-	
+
 	private boolean getChildNodeBooleanContent(Node node, String name ){
 		String value = this.getChildNodeContent(node, name);
 		if( value != null ){
@@ -434,7 +434,7 @@ private boolean getChildNodeBooleanContent(Node node, String name ){
 		}
 		return false;
 	}
-	
+
 	private int getChildNodeIntegerContent(Node node, String name){
 		try {
 			return new BigDecimal(this.getChildNodeContent(node, name)).intValue();
@@ -442,7 +442,7 @@ private int getChildNodeIntegerContent(Node node, String name){
 			return 0;
 		}
 	}
-	
+
 	private int[] getChildNodeIntegerContentArray(Node node, String name , String regex){
 		String rawContents = this.getChildNodeContent(node, name);
 		if( rawContents != null ){
@@ -459,7 +459,7 @@ private int[] getChildNodeIntegerContentArray(Node node, String name , String re
 		}
 		return null;
 	}
-	
+
 	private int[] getChildNodeIntegerContentArray(Node node, String name ){
 		return getChildNodeIntegerContentArray(node, name, (" ") );
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXFileSystem.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXFileSystem.java
similarity index 92%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXFileSystem.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXFileSystem.java
index 5e76d8f8..980193f4 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXFileSystem.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXFileSystem.java
@@ -8,39 +8,39 @@
 import java.util.List;
 
 public class GPXFileSystem {
-	
+
 	private static final int HEADER_BCFS = 1397113666;
 	private static final int HEADER_BCFZ = 1514554178;
-	
-	private List fileSystem;
-	
+
+	private List<GPXFile> fileSystem;
+
 	public GPXFileSystem(){
-		this.fileSystem = new ArrayList();
+		this.fileSystem = new ArrayList<GPXFile>();
 	}
-	
-	public List getFileNames(){
-		List gpxFileNames = new ArrayList();
-		
-		Iterator it = this.fileSystem.iterator();
+
+	public List<String> getFileNames(){
+		List<String> gpxFileNames = new ArrayList<String>();
+
+		Iterator<GPXFile> it = this.fileSystem.iterator();
 		while( it.hasNext() ){
-			GPXFile file = (GPXFile)it.next();
+			GPXFile file = it.next();
 			gpxFileNames.add( file.getFileName() );
 		}
-		
+
 		return gpxFileNames;
 	}
-	
+
 	public byte[] getFileContents( String fileName ){
-		Iterator it = this.fileSystem.iterator();
+		Iterator<GPXFile> it = this.fileSystem.iterator();
 		while( it.hasNext() ){
-			GPXFile file = (GPXFile)it.next();
+			GPXFile file = it.next();
 			if( file.getFileName().equals( fileName ) ){
 				return file.getFileContents();
 			}
 		}
 		return null;
 	}
-	
+
 	public String getFileContentsAsString( String fileName ){
 		byte[] fileContents = this.getFileContents(fileName);
 		if( fileContents != null ){
@@ -48,7 +48,7 @@ public String getFileContentsAsString( String fileName ){
 		}
 		return null;
 	}
-	
+
 	public InputStream getFileContentsAsStream( String fileName ){
 		byte[] fileContents = this.getFileContents(fileName);
 		if( fileContents != null ){
@@ -56,42 +56,42 @@ public InputStream getFileContentsAsStream( String fileName ){
 		}
 		return null;
 	}
-	
+
 	public boolean isSupportedHeader( int header ){
 		return (header == HEADER_BCFS || header == HEADER_BCFZ);
 	}
-	
+
 	public int getHeader(InputStream in) throws Throwable{
 		return getInteger(in);
 	}
-	
+
 	public void load(InputStream in) throws Throwable {
 		this.load(getHeader(in), in);
 	}
-	
+
 	public void load(int header, InputStream in) throws Throwable {
 		this.load(header, new GPXByteBuffer( getBytes(in) ) );
 	}
-	
+
 	public void load(int header, GPXByteBuffer srcBuffer) throws Throwable {
 		if (header == HEADER_BCFS ) {
 			byte[] bcfsBytes = srcBuffer.readBytes( srcBuffer.length() );
-			
+
 			int sectorSize = 0x1000;
 			int offset = 0;
 			while ( (offset = (offset + sectorSize)) + 3 < bcfsBytes.length ) {
-				if (getInteger(bcfsBytes, offset) == 2) {					
+				if (getInteger(bcfsBytes, offset) == 2) {
 					int indexFileName = (offset + 4);
 					int indexFileSize = (offset + 0x8C);
 					int indexOfBlock  = (offset + 0x94);
-					
+
 					int block = 0;
 					int blockCount = 0;
 					ByteArrayOutputStream fileBytesStream = new ByteArrayOutputStream();
 					while( (block = (getInteger(bcfsBytes, (indexOfBlock + (4 * (blockCount ++)))))) != 0 ){
 						fileBytesStream.write( getBytes(bcfsBytes, (offset = (block * sectorSize)), sectorSize) );
 					}
-					
+
 					int fileSize = getInteger(bcfsBytes , indexFileSize);
 					byte[] fileBytes = fileBytesStream.toByteArray();
 					if ( fileBytes.length >= fileSize ){
@@ -101,7 +101,7 @@ public void load(int header, GPXByteBuffer srcBuffer) throws Throwable {
 			}
 		} else if ( header == HEADER_BCFZ ) {
 			ByteArrayOutputStream bcfsBuffer = new ByteArrayOutputStream();
-			
+
 			int expectLength = getInteger(srcBuffer.readBytes(4),0);
 			while ( !srcBuffer.end() && srcBuffer.offset() < expectLength ){
 				int flag = srcBuffer.readBits(1);
@@ -109,7 +109,7 @@ public void load(int header, GPXByteBuffer srcBuffer) throws Throwable {
 					int bits = srcBuffer.readBits(4);
 					int offs = srcBuffer.readBitsReversed(bits);
 					int size = srcBuffer.readBitsReversed(bits);
-					
+
 					byte[] bcfsBytes = bcfsBuffer.toByteArray();
 					int pos = ( bcfsBytes.length - offs );
 					for( int i = 0; i < (size > offs ? offs : size) ; i ++ ){
@@ -127,13 +127,13 @@ public void load(int header, GPXByteBuffer srcBuffer) throws Throwable {
 			throw new Exception("This is not a GPX file");
 		}
 	}
-	
+
 	private int getInteger(InputStream in) throws Throwable{
 		byte[] bytes = new byte[4];
 		in.read( bytes );
 		return getInteger(bytes, 0);
 	}
-	
+
 	private byte[] getBytes(InputStream in) throws Throwable {
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
 		int read = 0;
@@ -146,7 +146,7 @@ private byte[] getBytes(InputStream in) throws Throwable {
 		out.flush();
 		return bytes;
 	}
-	
+
 	private int getInteger(byte[] source, int offset)  {
 		byte[] bytes = new byte[4];
 		bytes[0] = source[ offset + 0];
@@ -155,7 +155,7 @@ private int getInteger(byte[] source, int offset)  {
 		bytes[3] = source[ offset + 3];
 		return ((bytes[3] & 0xff) << 24) | ((bytes[2] & 0xff) << 16) | ((bytes[1] & 0xff) << 8) | (bytes[0] & 0xff);
 	}
-	
+
 	private byte[] getBytes(byte[] source, int offset, int length ){
 		byte[] bytes = new byte[length];
 		for( int i = 0 ; i < length ; i ++ ){
@@ -165,10 +165,10 @@ private byte[] getBytes(byte[] source, int offset, int length ){
 		}
 		return bytes;
 	}
-	
+
 	private String getString(byte[] source, int offset, int length ){
 		int charsLength = 0;
-		
+
 		char[] chars = new char[length];
 		for( int i = 0 ; i < length ; i ++ ){
 			int charValue = ((source[ offset + i ]) & 0xff);
@@ -178,28 +178,28 @@ private String getString(byte[] source, int offset, int length ){
 			chars[i] = (char)charValue;
 			charsLength = (i + 1);
 		}
-		
+
 		char[] string = new char[ charsLength ];
 		for( int i = 0 ; i < charsLength ; i ++ ){
 			string[i] = chars[i];
 		}
-		
+
 		return new String( string );
 	}
-	
+
 	private class GPXFile {
 		private String fileName;
 		private byte[] fileContents;
-		
+
 		public GPXFile(String fileName, byte[] fileContents){
 			this.fileName = fileName;
 			this.fileContents = fileContents;
 		}
-		
+
 		public String getFileName() {
 			return this.fileName;
 		}
-		
+
 		public byte[] getFileContents() {
 			return this.fileContents;
 		}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXInputStream.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXInputStream.java
similarity index 96%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXInputStream.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXInputStream.java
index 43004d53..257ed8c0 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXInputStream.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXInputStream.java
@@ -10,40 +10,44 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class GPXInputStream implements TGInputStreamBase{
-	
+
 	private int gpxHeader;
 	private InputStream gpxStream;
 	private GPXFileSystem gpxFileSystem;
 	private TGFactory factory;
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Guitar Pro 6","*.gpx");
 	}
-	
+
+	@Override
 	public void init(TGFactory factory, InputStream stream) {
 		this.factory = factory;
 		this.gpxStream = stream;
 		this.gpxHeader = 0;
 		this.gpxFileSystem = new GPXFileSystem();
 	}
-	
+
+	@Override
 	public boolean isSupportedVersion() {
 		try {
 			this.gpxHeader = this.gpxFileSystem.getHeader( this.gpxStream );
-			
+
 			return this.gpxFileSystem.isSupportedHeader(this.gpxHeader);
 		} catch (Throwable throwable) {
 			return false;
 		}
 	}
-	
+
+	@Override
 	public TGSong readSong() throws TGFileFormatException, IOException {
 		try {
 			this.gpxFileSystem.load(this.gpxHeader, this.gpxStream);
-			
+
 			GPXDocumentReader gpxReader = new GPXDocumentReader( this.gpxFileSystem.getFileContentsAsStream("score.gpif"));
 			GPXDocumentParser gpxParser = new GPXDocumentParser( this.factory , gpxReader.read() );
-			
+
 			return gpxParser.parse();
 		} catch (Throwable throwable) {
 			throw new TGFileFormatException( throwable );
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXInputStreamPlugin.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXInputStreamPlugin.java
similarity index 91%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXInputStreamPlugin.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXInputStreamPlugin.java
index 236f47e8..46ddb9f4 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/GPXInputStreamPlugin.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/GPXInputStreamPlugin.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGInputStreamBase;
 
 public class GPXInputStreamPlugin extends TGInputStreamPlugin{
-	
+
+	@Override
 	protected TGInputStreamBase getInputStream() {
 		return new GPXInputStream();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "J.Jørgen von Bargen, Julian Casadesus <julian@casadesus.com.ar>, b4dc0d3r";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "GPX File Format plugin based on code contributed by J.Jørgen von Bargen, updates by b4dc0d3r";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "GPX File Format plugin";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "0.2";
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXAutomation.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXAutomation.java
similarity index 99%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXAutomation.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXAutomation.java
index be49a8cb..ec50a7cb 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXAutomation.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXAutomation.java
@@ -1,14 +1,14 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXAutomation {
-	
+
 	private String type;
 	private int barId;
 	private int position;
 	private boolean linear;
 	private boolean visible;
 	private int[] value;
-	
+
 	public GPXAutomation(){
 		super();
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXBar.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXBar.java
similarity index 97%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXBar.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXBar.java
index a535fefc..8c7d0acd 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXBar.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXBar.java
@@ -1,36 +1,36 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXBar {
-	
+
 	private int id;
 	private int[] voiceIds;
 	private String clef;
 	private String simileMark;
-	
+
 	public GPXBar(){
 		super();
 	}
-	
+
 	public int getId() {
 		return this.id;
 	}
-	
+
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	public int[] getVoiceIds() {
 		return this.voiceIds;
 	}
-	
+
 	public void setVoiceIds(int[] voiceIds) {
 		this.voiceIds = voiceIds;
 	}
-	
+
 	public String getClef() {
 		return this.clef;
 	}
-	
+
 	public void setClef(String clef) {
 		this.clef = clef;
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXBeat.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXBeat.java
similarity index 99%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXBeat.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXBeat.java
index 84f63aae..7d2faf27 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXBeat.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXBeat.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXBeat {
-	
+
 	private int id;
 	private int rhythmId;
 	private int[] noteIds;
@@ -13,7 +13,7 @@ public class GPXBeat {
 	private boolean FadeIn;
 	private boolean FadeOut;
 	private String text;
-	
+
 	private boolean whammyBarEnabled;
 	private Integer whammyBarOriginValue;
 	private Integer whammyBarMiddleValue;
@@ -22,7 +22,7 @@ public class GPXBeat {
 	private Integer whammyBarMiddleOffset1;
 	private Integer whammyBarMiddleOffset2;
 	private Integer whammyBarDestinationOffset;
-	
+
 	public GPXBeat(){
 		this.slapped = false;
 		this.popped = false;
@@ -32,35 +32,35 @@ public GPXBeat(){
 		this.brush = new String();
 		this.text = new String();
 	}
-	
+
 	public int getId() {
 		return this.id;
 	}
-	
+
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	public int getRhythmId() {
 		return this.rhythmId;
 	}
-	
+
 	public void setRhythmId(int rhythmId) {
 		this.rhythmId = rhythmId;
 	}
-	
+
 	public int[] getNoteIds() {
 		return this.noteIds;
 	}
-	
+
 	public void setNoteIds(int[] noteIds) {
 		this.noteIds = noteIds;
 	}
-	
+
 	public String getDynamic() {
 		return this.dynamic;
 	}
-	
+
 	public void setDynamic(String dynamic) {
 		this.dynamic = dynamic;
 	}
diff --git a/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXDocument.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXDocument.java
new file mode 100644
index 00000000..84769ba2
--- /dev/null
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXDocument.java
@@ -0,0 +1,136 @@
+package org.herac.tuxguitar.io.gpx.score;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class GPXDocument {
+
+	private GPXScore score;
+	private List<GPXTrack> tracks;
+	private List<GPXMasterBar> masterBars;
+	private List<GPXBar> bars;
+	private List<GPXVoice> voices;
+	private List<GPXBeat> beats;
+	private List<GPXNote> notes;
+	private List<GPXRhythm> rhythms;
+	private List<GPXAutomation> automations;
+
+	public GPXDocument(){
+		this.score = new GPXScore();
+		this.tracks = new ArrayList<GPXTrack>();
+		this.masterBars = new ArrayList<GPXMasterBar>();
+		this.bars = new ArrayList<GPXBar>();
+		this.voices = new ArrayList<GPXVoice>();
+		this.beats = new ArrayList<GPXBeat>();
+		this.notes = new ArrayList<GPXNote>();
+		this.rhythms = new ArrayList<GPXRhythm>();
+		this.automations = new ArrayList<GPXAutomation>();
+	}
+
+	public GPXScore getScore(){
+		return this.score;
+	}
+
+	public List<GPXTrack> getTracks() {
+		return this.tracks;
+	}
+
+	public List<GPXMasterBar> getMasterBars() {
+		return this.masterBars;
+	}
+
+	public List<GPXBar> getBars() {
+		return this.bars;
+	}
+
+	public List<GPXVoice> getVoices() {
+		return this.voices;
+	}
+
+	public List<GPXBeat> getBeats() {
+		return this.beats;
+	}
+
+	public List<GPXNote> getNotes() {
+		return this.notes;
+	}
+
+	public List<GPXRhythm> getRhythms() {
+		return this.rhythms;
+	}
+
+	public List<GPXAutomation> getAutomations() {
+		return this.automations;
+	}
+
+	public GPXBar getBar( int id ){
+		Iterator<GPXBar> it = this.bars.iterator();
+		while( it.hasNext() ){
+			GPXBar bar = it.next();
+			if( bar.getId() == id ){
+				return bar;
+			}
+		}
+		return null;
+	}
+
+	public GPXVoice getVoice( int id ){
+		Iterator<GPXVoice> it = this.voices.iterator();
+		while( it.hasNext() ){
+			GPXVoice voice = it.next();
+			if( voice.getId() == id ){
+				return voice;
+			}
+		}
+		return null;
+	}
+
+	public GPXBeat getBeat( int id ){
+		Iterator<GPXBeat> it = this.beats.iterator();
+		while( it.hasNext() ){
+			GPXBeat beat = it.next();
+			if( beat.getId() == id ){
+				return beat;
+			}
+		}
+		return null;
+	}
+
+	public GPXNote getNote( int id ){
+		Iterator<GPXNote> it = this.notes.iterator();
+		while( it.hasNext() ){
+			GPXNote note = it.next();
+			if( note.getId() == id ){
+				return note;
+			}
+		}
+		return null;
+	}
+
+	public GPXRhythm getRhythm( int id ){
+		Iterator<GPXRhythm> it = this.rhythms.iterator();
+		while( it.hasNext() ){
+			GPXRhythm rhythm = it.next();
+			if( rhythm.getId() == id ){
+				return rhythm;
+			}
+		}
+		return null;
+	}
+
+	public GPXAutomation getAutomation( String type, int untilBarId ){
+		GPXAutomation result = null;
+
+		Iterator<GPXAutomation> it = this.automations.iterator();
+		while( it.hasNext() ){
+			GPXAutomation automation = it.next();
+			if( automation.getType() != null && automation.getType().equals( type ) ){
+				if( automation.getBarId() <= untilBarId  && ( result == null || automation.getBarId() > result.getBarId() )){
+					result = automation;
+				}
+			}
+		}
+		return result;
+	}
+}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXDrumkit.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXDrumkit.java
similarity index 99%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXDrumkit.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXDrumkit.java
index 01ffba7a..097967e9 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXDrumkit.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXDrumkit.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXDrumkit {
-	
+
 	public static final GPXDrumkit[] DRUMKITS = new GPXDrumkit[]{
 		new GPXDrumkit(36, 0 , 0),
 		new GPXDrumkit(36, 0 , 0),
@@ -25,11 +25,11 @@ public class GPXDrumkit {
 		new GPXDrumkit(57, 13 ,0),
 		new GPXDrumkit(59, 15 ,1),
 	};
-	
+
 	private int element;
 	private int variation;
 	private int midiValue;
-	
+
 	public GPXDrumkit(int midiValue, int element, int variation){
 		this.midiValue = midiValue;
 		this.element = element;
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXMasterBar.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXMasterBar.java
similarity index 98%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXMasterBar.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXMasterBar.java
index 13133ba7..920b86fc 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXMasterBar.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXMasterBar.java
@@ -1,33 +1,33 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXMasterBar {
-	
+
 	private int[] barIds;
 	private int[] time;
-	
+
 	private int repeatCount;
 	private boolean repeatStart;
 	private int accidentalCount;
 	private String mode;
 	private String tripletFeel;
-	
+
 	public GPXMasterBar(){
 		this.accidentalCount = 0;
 		this.mode = null;
 	}
-	
+
 	public int[] getBarIds() {
 		return this.barIds;
 	}
-	
+
 	public void setBarIds(int[] barIds) {
 		this.barIds = barIds;
 	}
-	
+
 	public int[] getTime() {
 		return time;
 	}
-	
+
 	public void setTime(int[] time) {
 		this.time = time;
 	}
@@ -67,7 +67,7 @@ public void setMode(String mode) {
 	public String getTripletFeel() {
 		return this.tripletFeel;
 	}
-	
+
 	public void setTripletFeel(String tripletFeel) {
 		this.tripletFeel = tripletFeel;
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXNote.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXNote.java
similarity index 99%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXNote.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXNote.java
index daa47b8c..f48b32d4 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXNote.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXNote.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXNote {
-	
+
 	private int id;
 	private int fret;
 	private int string;
@@ -20,7 +20,7 @@ public class GPXNote {
 	private Integer bendMiddleOffset1;
 	private Integer bendMiddleOffset2;
 	private Integer bendDestinationOffset;
-	
+
 	private boolean hammer;
 	private boolean ghost;
 	private boolean slide;
@@ -31,7 +31,7 @@ public class GPXNote {
 	private boolean tieDestination;
 	private boolean mutedEnabled;
 	private boolean palmMutedEnabled;
-	
+
 	private int harmonicFret;
 	private String harmonicType;
 
@@ -53,51 +53,51 @@ public GPXNote(){
 		this.harmonicType = "";
 		this.harmonicFret = -1;
 	}
-	
+
 	public int getId() {
 		return this.id;
 	}
-	
+
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	public int getFret() {
 		return this.fret;
 	}
-	
+
 	public void setFret(int fret) {
 		this.fret = fret;
 	}
-	
+
 	public int getString() {
 		return this.string;
 	}
-	
+
 	public void setString(int string) {
 		this.string = string;
 	}
-	
+
 	public int getTone() {
 		return tone;
 	}
-	
+
 	public void setTone(int tone) {
 		this.tone = tone;
 	}
-	
+
 	public int getOctave() {
 		return octave;
 	}
-	
+
 	public void setOctave(int octave) {
 		this.octave = octave;
 	}
-	
+
 	public boolean isTieDestination() {
 		return tieDestination;
 	}
-	
+
 	public void setTieDestination(boolean tieDestination) {
 		this.tieDestination = tieDestination;
 	}
@@ -269,7 +269,7 @@ public boolean isTapped() {
 	public void setTapped(boolean tapped) {
 		this.tapped = tapped;
 	}
-	
+
 	public int getHarmonicFret() {
 		return harmonicFret;
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXRhythm.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXRhythm.java
similarity index 99%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXRhythm.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXRhythm.java
index d585d9b5..10d09dc1 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXRhythm.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXRhythm.java
@@ -1,13 +1,13 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXRhythm {
-	
+
 	private int id;
 	private int augmentationDotCount;
 	private int primaryTupletNum;
 	private int primaryTupletDen;
 	private String noteValue;
-	
+
 	public GPXRhythm(){
 		super();
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXScore.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXScore.java
similarity index 99%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXScore.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXScore.java
index e654b78f..111ba1da 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXScore.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXScore.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXScore {
-	
+
 	private String title;
 	private String subTitle;
 	private String artist;
@@ -13,7 +13,7 @@ public class GPXScore {
 	private String tabber;
 	private String instructions;
 	private String notices;
-	
+
 	public GPXScore(){
 		super();
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXTrack.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXTrack.java
similarity index 98%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXTrack.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXTrack.java
index 3fd41f29..7a59e2ec 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXTrack.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXTrack.java
@@ -1,32 +1,32 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXTrack {
-	
+
 	private int id;
 	private int[] tunningPitches;
 	private int[] color;
 	private String name;
-	
+
 	private int gmProgram;
 	private int gmChannel1;
 	private int gmChannel2;
-	
+
 	public GPXTrack(){
 		super();
 	}
-	
+
 	public int getId() {
 		return this.id;
 	}
-	
+
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	public int[] getTunningPitches() {
 		return this.tunningPitches;
 	}
-	
+
 	public void setTunningPitches(int[] tunningPitches) {
 		this.tunningPitches = tunningPitches;
 	}
@@ -38,19 +38,19 @@ public String getName() {
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public int[] getColor() {
 		return color;
 	}
-	
+
 	public void setColor(int[] color) {
 		this.color = color;
 	}
-	
+
 	public int getGmProgram() {
 		return gmProgram;
 	}
-	
+
 	public void setGmProgram(int gmProgram) {
 		this.gmProgram = gmProgram;
 	}
diff --git a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXVoice.java b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXVoice.java
similarity index 96%
rename from TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXVoice.java
rename to plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXVoice.java
index c22479e1..f63f40a3 100644
--- a/TuxGuitar-gpx/src/org/herac/tuxguitar/io/gpx/score/GPXVoice.java
+++ b/plugins/gpx/src/main/java/org/herac/tuxguitar/io/gpx/score/GPXVoice.java
@@ -1,26 +1,26 @@
 package org.herac.tuxguitar.io.gpx.score;
 
 public class GPXVoice {
-	
+
 	private int id;
 	private int[] beatIds;
-	
+
 	public GPXVoice(){
 		super();
 	}
-	
+
 	public int getId() {
 		return this.id;
 	}
-	
+
 	public void setId(int id) {
 		this.id = id;
 	}
-	
+
 	public int[] getBeatIds() {
 		return this.beatIds;
 	}
-	
+
 	public void setBeatIds(int[] beatIds) {
 		this.beatIds = beatIds;
 	}
diff --git a/TuxGuitar-gpx/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/gpx/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-gpx/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/gpx/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/gtp/pom.xml b/plugins/gtp/pom.xml
new file mode 100644
index 00000000..00e02f36
--- /dev/null
+++ b/plugins/gtp/pom.xml
@@ -0,0 +1,37 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-gtp</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: GTP</name>
+	<description>Guitar Pro 1,2,3,4,5 plugin for TuxGuitar</description>
+
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP1InputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP1InputStream.java
similarity index 94%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP1InputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP1InputStream.java
index f0833fe1..00424494 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP1InputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP1InputStream.java
@@ -26,15 +26,15 @@
 
 /**
  * @author julian
- * 
+ *
  * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class GP1InputStream extends GTPInputStream {
-	
+
 	private static final String SUPPORTED_VERSIONS[] = new String[]{
 		"FICHIER GUITARE PRO v1", "FICHIER GUITARE PRO v1.01","FICHIER GUITARE PRO v1.02", "FICHIER GUITARE PRO v1.03","FICHIER GUITARE PRO v1.04"
 	};
-	
+
 	private static final short TRACK_CHANNELS[][] = new short[][]{
 		new short[]{1,0,1},
 		new short[]{2,2,3},
@@ -45,17 +45,19 @@ public class GP1InputStream extends GTPInputStream {
 		new short[]{7,13,14},
 		new short[]{8,9,9},
 	};
-	
+
 	private int trackCount;
-	
+
 	public GP1InputStream(GTPSettings settings){
 		super(settings, SUPPORTED_VERSIONS);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro","*.gtp");
 	}
-	
+
+	@Override
 	public TGSong readSong() throws GTPFormatException, IOException {
 		readVersion();
 		if (!isSupportedVersion(getVersion())) {
@@ -63,18 +65,18 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			throw new GTPFormatException("Unsupported Version");
 		}
 		this.trackCount = ((getVersionIndex() > 2)?8:1);
-		
+
 		TGSong song = getFactory().newSong();
-		
+
 		readInfo(song);
-		
+
 		int tempo = readInt();
 		int tripletFeel = ((readInt() == 1)?TGMeasureHeader.TRIPLET_FEEL_EIGHTH:TGMeasureHeader.TRIPLET_FEEL_NONE);
-		
+
 		if(getVersionIndex() > 2){
 			readInt(); //key
 		}
-		
+
 		for (int i = 0; i < this.trackCount; i++) {
 			TGChannel channel = getFactory().newChannel();
 			channel.setChannelId(TRACK_CHANNELS[ i ][0]);
@@ -87,7 +89,7 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			track.setNumber( (i + 1) );
 			track.setChannelId(TRACK_CHANNELS[ i ][0]);
 			TGColor.RED.copy(track.getColor());
-			
+
 			int strings = ((getVersionIndex() > 1)?readInt():6);
 			for (int j = 0; j < strings; j++) {
 				TGString string = getFactory().newString();
@@ -97,17 +99,17 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			}
 			song.addTrack(track);
 		}
-		
+
 		int measureCount = readInt();
-		
+
 		for (int i = 0; i < this.trackCount; i++) {
 			readTrack(song.getTrack(i), song.getChannel(i));
 		}
-		
+
 		if(getVersionIndex() > 2){
 			skip(10);
 		}
-		
+
 		TGMeasureHeader previous = null;
 		long[] lastReadedStarts = new long[this.trackCount];
 		for (int i = 0; i < measureCount; i++) {
@@ -119,33 +121,33 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			readTrackMeasures(song,header,lastReadedStarts);
 			previous = header;
 		}
-		
+
 		TGSongManager manager = new TGSongManager(getFactory());
 		manager.setSong(song);
 		manager.autoCompleteSilences();
-		
+
 		this.close();
-		
+
 		return song;
 	}
-	
+
 	private void readInfo(TGSong song) throws IOException{
 		song.setName(readStringByteSizeOfByte());
 		song.setAuthor(readStringByteSizeOfByte());
 		readStringByteSizeOfByte();
 	}
-	
+
 	private TGDuration readDuration() throws IOException {
 		TGDuration duration = getFactory().newDuration();
 		duration.setValue( (int) (Math.pow( 2 , (readByte() + 4) ) / 4 ) );
 		return duration;
 	}
-	
+
 	private void readTrackMeasures(TGSong song,TGMeasureHeader header,long[] lastReadedStarts) throws IOException {
 		readTimeSignature(header.getTimeSignature());
-		
+
 		skip(6);
-		
+
 		int[] beats = new int[this.trackCount];
 		for (int i = 0; i < this.trackCount; i++) {
 			readUnsignedByte();
@@ -156,25 +158,25 @@ private void readTrackMeasures(TGSong song,TGMeasureHeader header,long[] lastRea
 			}
 			skip(9);
 		}
-		
+
 		skip(2);
-		
+
 		int flags = readUnsignedByte();
-		
+
 		header.setRepeatOpen( ((flags & 0x01) != 0) );
 		if ((flags & 0x02) != 0) {
 			header.setRepeatClose( readUnsignedByte() );
 		}
-		
+
 		if ((flags & 0x04) != 0) {
 			header.setRepeatAlternative( parseRepeatAlternative(song, header.getNumber(), readUnsignedByte()) );
 		}
-		
+
 		song.addMeasureHeader(header);
 		for (int i = 0; i < this.trackCount; i++) {
 			TGTrack track = song.getTrack(i);
 			TGMeasure measure = getFactory().newMeasure(header);
-			
+
 			long start = measure.getStart();
 			for (int j = 0; j < beats[i]; j++) {
 				long length = readBeat(track, measure,start,lastReadedStarts[i]);
@@ -185,58 +187,58 @@ private void readTrackMeasures(TGSong song,TGMeasureHeader header,long[] lastRea
 			track.addMeasure(measure);
 		}
 	}
-	
+
 	private void readTimeSignature(TGTimeSignature timeSignature) throws IOException {
 		timeSignature.setNumerator(readUnsignedByte());
 		timeSignature.getDenominator().setValue(readUnsignedByte());
 	}
-	
+
 	private long readBeat(TGTrack track, TGMeasure measure, long start, long lastReadedStart) throws IOException {
 		readInt();
-		
+
 		TGBeat beat = getFactory().newBeat();
 		TGVoice voice = beat.getVoice(0);
 		TGDuration duration = readDuration();
 		TGNoteEffect effect = getFactory().newEffect();
-		
+
 		int flags = readUnsignedByte();
-		
+
 		duration.setDotted( ((flags & 0x10) != 0) );
 		if ((flags & 0x20) != 0) {
 			duration.getDivision().setEnters(3);
 			duration.getDivision().setTimes(2);
 			skip(1);
 		}
-		
+
 		// beat effects
 		if ((flags & 0x04) != 0) {
 			readBeatEffects(effect);
 		}
-		
+
 		// chord diagram
 		if ((flags & 0x02) != 0) {
 			readChord(track.stringCount(), beat);
 		}
-		
+
 		// text
 		if ((flags & 0x01) != 0) {
 			readText(beat);
 		}
-		
+
 		if((flags & 0x40) != 0){
 			if(lastReadedStart < start){
 				TGBeat previousBeat = getBeat(track, measure, lastReadedStart);
 				if(previousBeat != null){
 					TGVoice previousVoice = previousBeat.getVoice(0);
-					Iterator it = previousVoice.getNotes().iterator();
+					Iterator<TGNote> it = previousVoice.getNotes().iterator();
 					while(it.hasNext()){
-						TGNote previous = (TGNote)it.next();
+						TGNote previous = it.next();
 						TGNote note = getFactory().newNote();
 						note.setValue(previous.getValue());
 						note.setString(previous.getString());
 						note.setVelocity(previous.getVelocity());
 						note.setTiedNote(true);
-						
+
 						voice.addNote(note);
 					}
 				}
@@ -245,40 +247,40 @@ private long readBeat(TGTrack track, TGMeasure measure, long start, long lastRea
 		else if ((flags & 0x08) == 0) {
 			int stringsFlags = readUnsignedByte();
 			int effectsFlags = readUnsignedByte();
-			
+
 			for (int i = 5; i >= 0; i--) {
 				if ((stringsFlags & (1 << i)) != 0) {
 					TGNote note = getFactory().newNote();
-					
+
 					int fret = readUnsignedByte();
 					if ((effectsFlags & (1 << i)) != 0) {
 						readNoteEffects(effect);
 					}
 					note.setValue( (fret >= 0 && fret < 100)?fret:0);
-					note.setVelocity(TGVelocities.DEFAULT); 
+					note.setVelocity(TGVelocities.DEFAULT);
 					note.setString( track.stringCount() - i );
 					note.setEffect(effect.clone(getFactory()));
 					note.getEffect().setDeadNote(  (fret < 0 || fret >= 100)  );
-					
+
 					voice.addNote(note);
 				}
 			}
 		}
-		
+
 		beat.setStart(start);
 		voice.setEmpty(false);
 		duration.copy(voice.getDuration());
 		measure.addBeat(beat);
-		
+
 		return duration.getTime();
 	}
-	
+
 	private void readText(TGBeat beat) throws IOException{
 		TGText text = getFactory().newText();
 		text.setValue(readStringByte(0));
 		beat.setText(text);
 	}
-	
+
 	private void readBeatEffects(TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		effect.setVibrato( (flags == 1 || flags == 2) );
@@ -296,7 +298,7 @@ else if(flags == 8 || flags == 9){
 			effect.setHarmonic(harmonic);
 		}
 	}
-	
+
 	private void readNoteEffects(TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		effect.setHammer( (flags == 1 || flags == 2) );
@@ -305,7 +307,7 @@ private void readNoteEffects(TGNoteEffect effect) throws IOException {
 			readBend(effect);
 		}
 	}
-	
+
 	private void readBend(TGNoteEffect effect) throws IOException {
 		skip(6);
 		float value = Math.max(  ((readUnsignedByte() / 8f) - 26f) , 1f);
@@ -316,7 +318,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 		effect.setBend(bend);
 		skip(1);
 	}
-	
+
 	private void readTrack(TGTrack track, TGChannel channel) throws IOException {
 		track.setName("Track 1");
 		channel.setProgram((short)readInt());
@@ -331,17 +333,17 @@ private void readTrack(TGTrack track, TGChannel channel) throws IOException {
 			track.setOffset(readInt());
 		}
 	}
-	
+
 	private void readChord(int strings, TGBeat beat) throws IOException {
 		if(getVersionIndex() > 3){
 			TGChord chord = getFactory().newChord(strings);
 			chord.setName(readStringByte(0));
-			
+
 			this.skip(1);
 			if ( readInt() < 12 ) {
 				skip(32);
 			}
-			
+
 			chord.setFirstFret(readInt());
 			if (chord.getFirstFret() != 0) {
 				for (int i = 0; i < 6; i++) {
@@ -358,13 +360,13 @@ private void readChord(int strings, TGBeat beat) throws IOException {
 			readStringByteSizeOfByte();
 		}
 	}
-	
+
 	private int parseRepeatAlternative(TGSong song,int measure,int value){
 		int repeatAlternative = 0;
 		int existentAlternatives = 0;
-		Iterator it = song.getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = song.getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.getNumber() == measure){
 				break;
 			}
@@ -373,7 +375,7 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 			}
 			existentAlternatives |= header.getRepeatAlternative();
 		}
-		
+
 		for(int i = 0; i < 8; i ++){
 			if(value > i && (existentAlternatives & (1 << i)) == 0){
 				repeatAlternative |= (1 << i);
@@ -381,12 +383,12 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 		}
 		return repeatAlternative;
 	}
-	
+
 	private int getClef( TGTrack track ){
 		if(!isPercussionChannel(track.getSong(),track.getChannelId())){
-			Iterator it = track.getStrings().iterator();
+			Iterator<TGString> it = track.getStrings().iterator();
 			while( it.hasNext() ){
-				TGString string = (TGString) it.next();
+				TGString string = it.next();
 				if( string.getValue() <= 34 ){
 					return TGMeasure.CLEF_BASS;
 				}
@@ -394,7 +396,7 @@ private int getClef( TGTrack track ){
 		}
 		return TGMeasure.CLEF_TREBLE;
 	}
-	
+
 	private TGBeat getBeat(TGTrack track, TGMeasure measure,long start){
 		TGBeat beat = getBeat(measure,start);
 		if(beat == null){
@@ -407,12 +409,12 @@ private TGBeat getBeat(TGTrack track, TGMeasure measure,long start){
 		}
 		return beat;
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure,long start){
 		if(start >= measure.getStart() && start < (measure.getStart() + measure.getLength())){
-			Iterator beats = measure.getBeats().iterator();
+			Iterator<TGBeat> beats = measure.getBeats().iterator();
 			while(beats.hasNext()){
-				TGBeat beat = (TGBeat)beats.next();
+				TGBeat beat = beats.next();
 				if(beat.getStart() == start){
 					return beat;
 				}
@@ -420,11 +422,11 @@ private TGBeat getBeat(TGMeasure measure,long start){
 		}
 		return null;
 	}
-	
+
 	private boolean isPercussionChannel( TGSong song, int channelId ){
-		Iterator it = song.getChannels();
+		Iterator<TGChannel> it = song.getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel.isPercussionChannel();
 			}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP2InputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP2InputStream.java
similarity index 95%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP2InputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP2InputStream.java
index c4697346..275c11bf 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP2InputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP2InputStream.java
@@ -27,15 +27,15 @@
 
 /**
  * @author julian
- * 
+ *
  * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class GP2InputStream extends GTPInputStream {
-	
+
 	private static final String SUPPORTED_VERSIONS[] = new String[]{ "FICHIER GUITAR PRO v2.20", "FICHIER GUITAR PRO v2.21" };
-	
+
 	private static final int TRACK_COUNT = 8;
-	
+
 	private static final short TRACK_CHANNELS[][] = new short[][]{
 		new short[]{1,0,1},
 		new short[]{2,2,3},
@@ -46,15 +46,17 @@ public class GP2InputStream extends GTPInputStream {
 		new short[]{7,13,14},
 		new short[]{8,9,9},
 	};
-	
+
 	public GP2InputStream(GTPSettings settings){
 		super(settings, SUPPORTED_VERSIONS);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 2","*.gtp");
 	}
-	
+
+	@Override
 	public TGSong readSong() throws GTPFormatException, IOException {
 		readVersion();
 		if (!isSupportedVersion(getVersion())) {
@@ -62,14 +64,14 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			throw new GTPFormatException("Unsupported Version");
 		}
 		TGSong song = getFactory().newSong();
-		
+
 		readInfo(song);
-		
+
 		int tempo = readInt();
 		int tripletFeel = ((readInt() == 1)?TGMeasureHeader.TRIPLET_FEEL_EIGHTH:TGMeasureHeader.TRIPLET_FEEL_NONE);
-		
+
 		readInt(); //key
-		
+
 		for (int i = 0; i < TRACK_COUNT; i++) {
 			TGChannel channel = getFactory().newChannel();
 			channel.setChannelId(TRACK_CHANNELS[ i ][0]);
@@ -82,7 +84,7 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			track.setNumber( (i + 1) );
 			track.setChannelId(TRACK_CHANNELS[ i ][0]);
 			TGColor.RED.copy(track.getColor());
-			
+
 			int strings = readInt();
 			for (int j = 0; j < strings; j++) {
 				TGString string = getFactory().newString();
@@ -92,15 +94,15 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			}
 			song.addTrack(track);
 		}
-		
+
 		int measureCount = readInt();
-		
+
 		for (int i = 0; i < TRACK_COUNT; i++) {
 			readTrack(song.getTrack(i), song.getChannel(i));
 		}
-		
+
 		skip(10);
-		
+
 		TGMeasureHeader previous = null;
 		long[] lastReadedStarts = new long[TRACK_COUNT];
 		for (int i = 0; i < measureCount; i++) {
@@ -112,33 +114,33 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			readTrackMeasures(song,header,lastReadedStarts);
 			previous = header;
 		}
-		
+
 		TGSongManager manager = new TGSongManager(getFactory());
 		manager.setSong(song);
 		manager.autoCompleteSilences();
-		
+
 		this.close();
-		
+
 		return song;
 	}
-	
+
 	private void readInfo(TGSong song) throws IOException{
 		song.setName(readStringByteSizeOfByte());
 		song.setAuthor(readStringByteSizeOfByte());
 		readStringByteSizeOfByte();
 	}
-	
+
 	private TGDuration readDuration() throws IOException {
 		TGDuration duration = getFactory().newDuration();
 		duration.setValue( (int) (Math.pow( 2 , (readByte() + 4) ) / 4 ) );
 		return duration;
 	}
-	
+
 	private void readTrackMeasures(TGSong song,TGMeasureHeader header,long[] lastReadedStarts) throws IOException {
 		readTimeSignature(header.getTimeSignature());
-		
+
 		skip(6);
-		
+
 		int[] beats = new int[TRACK_COUNT];
 		for (int i = 0; i < TRACK_COUNT; i++) {
 			readUnsignedByte();
@@ -150,23 +152,23 @@ private void readTrackMeasures(TGSong song,TGMeasureHeader header,long[] lastRea
 			skip(9);
 		}
 		skip(2);
-		
+
 		int flags = readUnsignedByte();
-		
+
 		header.setRepeatOpen( ((flags & 0x01) != 0) );
 		if ((flags & 0x02) != 0) {
 			header.setRepeatClose( readUnsignedByte() );
 		}
-		
+
 		if ((flags & 0x04) != 0) {
 			header.setRepeatAlternative( parseRepeatAlternative(song, header.getNumber(), readUnsignedByte()) );
 		}
-		
+
 		song.addMeasureHeader(header);
 		for (int i = 0; i < TRACK_COUNT; i++) {
 			TGTrack track = song.getTrack(i);
 			TGMeasure measure = getFactory().newMeasure(header);
-			
+
 			long start = measure.getStart();
 			for (int j = 0; j < beats[i]; j++) {
 				long length = readBeat(track, measure,start,lastReadedStarts[i]);
@@ -177,68 +179,68 @@ private void readTrackMeasures(TGSong song,TGMeasureHeader header,long[] lastRea
 			track.addMeasure(measure);
 		}
 	}
-	
+
 	private void readTimeSignature(TGTimeSignature timeSignature) throws IOException {
 		timeSignature.setNumerator(readUnsignedByte());
 		timeSignature.getDenominator().setValue(readUnsignedByte());
 	}
-	
+
 	private long readBeat(TGTrack track, TGMeasure measure, long start, long lastReadedStart) throws IOException {
 		readInt();
-		
+
 		TGBeat beat = getFactory().newBeat();
 		TGVoice voice = beat.getVoice(0);
 		TGDuration duration = readDuration();
 		TGNoteEffect effect = getFactory().newEffect();
-		
+
 		int flags1 = readUnsignedByte();
 		int flags2 = readUnsignedByte();
-		
+
 		if ((flags2 & 0x02) != 0) {
 			readMixChange(measure.getTempo());
 		}
-		
+
 		if ((flags2 & 0x01) != 0) {
 			readUnsignedByte(); //strokeType
 			readUnsignedByte(); //strokeDuration
 		}
-		
+
 		duration.setDotted( ((flags1 & 0x10) != 0) );
 		if ((flags1 & 0x20) != 0) {
 			duration.getDivision().setEnters(3);
 			duration.getDivision().setTimes(2);
 			skip(1);
 		}
-		
+
 		// beat effects
 		if ((flags1 & 0x04) != 0) {
 			readBeatEffects(effect);
 		}
-		
+
 		// chord diagram
 		if ((flags1 & 0x02) != 0) {
 			readChord(track.stringCount(), beat);
 		}
-		
+
 		// text
 		if ((flags1 & 0x01) != 0) {
 			readText(beat);
 		}
-		
+
 		if((flags1 & 0x40) != 0){
 			if(lastReadedStart < start){
 				TGBeat previousBeat = getBeat(track, measure, lastReadedStart);
 				if(previousBeat != null){
 					TGVoice previousVoice = previousBeat.getVoice(0);
-					Iterator it = previousVoice.getNotes().iterator();
+					Iterator<TGNote> it = previousVoice.getNotes().iterator();
 					while(it.hasNext()){
-						TGNote previous = (TGNote)it.next();
+						TGNote previous = it.next();
 						TGNote note = getFactory().newNote();
 						note.setValue(previous.getValue());
 						note.setString(previous.getString());
 						note.setVelocity(previous.getVelocity());
 						note.setTiedNote(true);
-						
+
 						voice.addNote(note);
 					}
 				}
@@ -248,11 +250,11 @@ else if ((flags1 & 0x08) == 0) {
 			int stringsFlags = readUnsignedByte();
 			int effectsFlags = readUnsignedByte();
 			int graceFlags = readUnsignedByte();
-			
+
 			for (int i = 5; i >= 0; i--) {
 				if ((stringsFlags & (1 << i)) != 0) {
 					TGNote note = getFactory().newNote();
-					
+
 					int fret = readUnsignedByte();
 					int dynamic = readUnsignedByte();
 					if ((effectsFlags & (1 << i)) != 0) {
@@ -263,31 +265,31 @@ else if ((flags1 & 0x08) == 0) {
 					note.setString( track.stringCount() - i );
 					note.setEffect(effect.clone(getFactory()));
 					note.getEffect().setDeadNote(  (fret < 0 || fret >= 100)  );
-					
+
 					voice.addNote(note);
 				}
-				
+
 				// Grace note
 				if ((graceFlags & (1 << i)) != 0) {
 					readGraceNote();
 				}
 			}
 		}
-		
+
 		beat.setStart(start);
 		voice.setEmpty(false);
 		duration.copy(voice.getDuration());
 		measure.addBeat(beat);
-		
+
 		return duration.getTime();
 	}
-	
+
 	private void readText(TGBeat beat) throws IOException{
 		TGText text = getFactory().newText();
 		text.setValue(readStringByte(0));
 		beat.setText(text);
 	}
-	
+
 	private void readBeatEffects(TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		effect.setVibrato( (flags == 1 || flags == 2) );
@@ -305,7 +307,7 @@ else if(flags == 8 || flags == 9){
 			effect.setHarmonic(harmonic);
 		}
 	}
-	
+
 	private void readNoteEffects(TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		effect.setHammer( (flags == 1 || flags == 2) );
@@ -314,7 +316,7 @@ private void readNoteEffects(TGNoteEffect effect) throws IOException {
 			readBend(effect);
 		}
 	}
-	
+
 	private void readBend(TGNoteEffect effect) throws IOException {
 		skip(6);
 		float value = Math.max(  ((readUnsignedByte() / 8f) - 26f) , 1f);
@@ -325,12 +327,12 @@ private void readBend(TGNoteEffect effect) throws IOException {
 		effect.setBend(bend);
 		skip(1);
 	}
-	
+
 	private void readGraceNote() throws IOException {
 		byte bytes[] = new byte[3];
 		read(bytes);
 	}
-	
+
 	private void readTrack(TGTrack track, TGChannel channel) throws IOException {
 		channel.setProgram((short)readInt());
 		readInt(); // Number of frets
@@ -342,16 +344,16 @@ private void readTrack(TGTrack track, TGChannel channel) throws IOException {
 		channel.setReverb((short)readInt());
 		track.setOffset(readInt());
 	}
-	
+
 	private void readChord(int strings, TGBeat beat) throws IOException {
 		TGChord chord = getFactory().newChord(strings);
 		chord.setName(readStringByte(0));
-		
+
 		this.skip(1);
 		if ( readInt() < 12 ) {
 			skip(32);
 		}
-		
+
 		chord.setFirstFret(readInt());
 		if (chord.getFirstFret() != 0) {
 			for (int i = 0; i < 6; i++) {
@@ -365,7 +367,7 @@ private void readChord(int strings, TGBeat beat) throws IOException {
 			beat.setChord(chord);
 		}
 	}
-	
+
 	private void readMixChange(TGTempo tempo) throws IOException {
 		int flags = readUnsignedByte();
 		// Tempo
@@ -398,13 +400,13 @@ private void readMixChange(TGTempo tempo) throws IOException {
 			readUnsignedByte();
 		}
 	}
-	
+
 	private int parseRepeatAlternative(TGSong song,int measure,int value){
 		int repeatAlternative = 0;
 		int existentAlternatives = 0;
-		Iterator it = song.getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = song.getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.getNumber() == measure){
 				break;
 			}
@@ -413,7 +415,7 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 			}
 			existentAlternatives |= header.getRepeatAlternative();
 		}
-		
+
 		for(int i = 0; i < 8; i ++){
 			if(value > i && (existentAlternatives & (1 << i)) == 0){
 				repeatAlternative |= (1 << i);
@@ -421,12 +423,12 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 		}
 		return repeatAlternative;
 	}
-	
+
 	private int getClef( TGTrack track ){
 		if(!isPercussionChannel(track.getSong(),track.getChannelId())){
-			Iterator it = track.getStrings().iterator();
+			Iterator<TGString> it = track.getStrings().iterator();
 			while( it.hasNext() ){
-				TGString string = (TGString) it.next();
+				TGString string = it.next();
 				if( string.getValue() <= 34 ){
 					return TGMeasure.CLEF_BASS;
 				}
@@ -434,7 +436,7 @@ private int getClef( TGTrack track ){
 		}
 		return TGMeasure.CLEF_TREBLE;
 	}
-	
+
 	private TGBeat getBeat(TGTrack track, TGMeasure measure,long start){
 		TGBeat beat = getBeat(measure,start);
 		if(beat == null){
@@ -447,12 +449,12 @@ private TGBeat getBeat(TGTrack track, TGMeasure measure,long start){
 		}
 		return beat;
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure,long start){
 		if(start >= measure.getStart() && start < (measure.getStart() + measure.getLength())){
-			Iterator beats = measure.getBeats().iterator();
+			Iterator<TGBeat> beats = measure.getBeats().iterator();
 			while(beats.hasNext()){
-				TGBeat beat = (TGBeat)beats.next();
+				TGBeat beat = beats.next();
 				if(beat.getStart() == start){
 					return beat;
 				}
@@ -460,11 +462,11 @@ private TGBeat getBeat(TGMeasure measure,long start){
 		}
 		return null;
 	}
-	
+
 	private boolean isPercussionChannel( TGSong song, int channelId ){
-		Iterator it = song.getChannels();
+		Iterator<TGChannel> it = song.getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel.isPercussionChannel();
 			}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3InputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP3InputStream.java
similarity index 95%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3InputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP3InputStream.java
index e26f491f..8c5c5308 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3InputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP3InputStream.java
@@ -32,25 +32,27 @@
 
 /**
  * @author julian
- * 
+ *
  * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class GP3InputStream extends GTPInputStream {
 	private static final String SUPPORTED_VERSIONS[] = new String[]{ "FICHIER GUITAR PRO v3.00" };
 	private static final float GP_BEND_SEMITONE = 25f;
 	private static final float GP_BEND_POSITION = 60f;
-	
+
 	private int tripletFeel;
 	private int keySignature;
-	
+
 	public GP3InputStream(GTPSettings settings){
 		super(settings, SUPPORTED_VERSIONS);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 3","*.gp3");
 	}
-	
+
+	@Override
 	public TGSong readSong() throws GTPFormatException, IOException {
 		readVersion();
 		if (!isSupportedVersion(getVersion())) {
@@ -58,32 +60,32 @@ public TGSong readSong() throws GTPFormatException, IOException {
 			throw new GTPFormatException("Unsupported Version");
 		}
 		TGSong song = getFactory().newSong();
-		
+
 		readInfo(song);
-		
+
 		this.tripletFeel = ((readBoolean())?TGMeasureHeader.TRIPLET_FEEL_EIGHTH:TGMeasureHeader.TRIPLET_FEEL_NONE);
-		
+
 		int tempoValue = readInt();
-				
+
 		this.keySignature = readKeySignature();
 		this.skip(3);
-		
-		List channels = readChannels();
-		
+
+		List<TGChannel> channels = readChannels();
+
 		int measures = readInt();
 		int tracks = readInt();
-		
+
 		readMeasureHeaders(song, measures);
 		readTracks(song, tracks, channels);
 		readMeasures(song, measures, tracks, tempoValue);
-		
+
 		this.close();
-		
+
 		return song;
 	}
-	
-	private List readChannels() throws IOException{
-		List channels = new ArrayList();
+
+	private List<TGChannel> readChannels() throws IOException{
+		List<TGChannel> channels = new ArrayList<TGChannel>();
 		for (int i = 0; i < 64; i++) {
 			TGChannel channel = getFactory().newChannel();
 			channel.setChannel((short)i);
@@ -100,7 +102,7 @@ private List readChannels() throws IOException{
 		}
 		return channels;
 	}
-	
+
 	private void readInfo(TGSong song) throws IOException{
 		song.setName(readStringByteSizeOfInteger());
 		readStringByteSizeOfInteger();
@@ -115,20 +117,20 @@ private void readInfo(TGSong song) throws IOException{
 			song.setComments( song.getComments() + readStringByteSizeOfInteger() );
 		}
 	}
-	
+
 	private void readMeasureHeaders(TGSong song, int count) throws IOException{
 		TGTimeSignature timeSignature = getFactory().newTimeSignature();
 		for (int i = 0; i < count; i++) {
 			song.addMeasureHeader(readMeasureHeader((i + 1),song,timeSignature));
 		}
 	}
-	
-	private void readTracks(TGSong song, int count, List channels) throws IOException{
+
+	private void readTracks(TGSong song, int count, List<TGChannel> channels) throws IOException{
 		for (int number = 1; number <= count; number++) {
 			song.addTrack(readTrack(song,number, channels));
 		}
 	}
-	
+
 	private void readMeasures(TGSong song, int measures, int tracks, int tempoValue) throws IOException{
 		TGTempo tempo = getFactory().newTempo();
 		tempo.setValue(tempoValue);
@@ -139,7 +141,7 @@ private void readMeasures(TGSong song, int measures, int tracks, int tempoValue)
 			for (int j = 0; j < tracks; j++) {
 				TGTrack track = song.getTrack(j);
 				TGMeasure measure = getFactory().newMeasure(header);
-				
+
 				track.addMeasure(measure);
 				readMeasure(measure, track, tempo);
 			}
@@ -147,7 +149,7 @@ private void readMeasures(TGSong song, int measures, int tracks, int tempoValue)
 			start += header.getLength();
 		}
 	}
-	
+
 	private TGDuration readDuration(int flags) throws IOException {
 		TGDuration duration = getFactory().newDuration();
 		duration.setValue( (int) (Math.pow( 2 , (readByte() + 4) ) / 4 ) );
@@ -191,7 +193,7 @@ private TGDuration readDuration(int flags) throws IOException {
 		}
 		return duration;
 	}
-	
+
 	private int getTiedNoteValue(int string, TGTrack track) {
 		int measureCount = track.countMeasures();
 		if (measureCount > 0) {
@@ -199,7 +201,7 @@ private int getTiedNoteValue(int string, TGTrack track) {
 				TGMeasure measure = track.getMeasure( m );
 				for (int b = measure.countBeats() - 1; b >= 0; b--) {
 					TGBeat beat = measure.getBeat( b );
-					TGVoice voice = beat.getVoice(0);  
+					TGVoice voice = beat.getVoice(0);
 					for (int n = 0; n < voice.countNotes(); n ++) {
 						TGNote note = voice.getNote( n );
 						if (note.getString() == string) {
@@ -211,14 +213,14 @@ private int getTiedNoteValue(int string, TGTrack track) {
 		}
 		return -1;
 	}
-	
+
 	private void readColor(TGColor color) throws IOException {
 		color.setR(readUnsignedByte());
 		color.setG(readUnsignedByte());
 		color.setB(readUnsignedByte());
 		read();
 	}
-	
+
 	private TGMarker readMarker(int measure) throws IOException {
 		TGMarker marker = getFactory().newMarker();
 		marker.setMeasure(measure);
@@ -226,7 +228,7 @@ private TGMarker readMarker(int measure) throws IOException {
 		readColor(marker.getColor());
 		return marker;
 	}
-	
+
 	private TGMeasureHeader readMeasureHeader(int number,TGSong song,TGTimeSignature timeSignature) throws IOException {
 		int flags = readUnsignedByte();
 		TGMeasureHeader header = getFactory().newHeader();
@@ -235,7 +237,7 @@ private TGMeasureHeader readMeasureHeader(int number,TGSong song,TGTimeSignature
 		header.getTempo().setValue(120);
 		header.setTripletFeel(this.tripletFeel);
 		header.setRepeatOpen( ((flags & 0x04) != 0) );
-		
+
 		if ((flags & 0x01) != 0) {
 			timeSignature.setNumerator(readByte());
 		}
@@ -256,9 +258,12 @@ private TGMeasureHeader readMeasureHeader(int number,TGSong song,TGTimeSignature
 			this.keySignature = readKeySignature();
 			this.skip(1);
 		}
+		if ((flags & 0x80) != 0) {
+			header.setDoubleBar(true);
+		}
 		return header;
 	}
-	
+
 	private void readMeasure(TGMeasure measure, TGTrack track, TGTempo tempo) throws IOException{
 		long nextNoteStart = measure.getStart();
 		int numberOfBeats = readInt();
@@ -268,13 +273,13 @@ private void readMeasure(TGMeasure measure, TGTrack track, TGTempo tempo) throws
 		measure.setClef( getClef(track) );
 		measure.setKeySignature(this.keySignature);
 	}
-	
+
 	private long readBeat(long start, TGMeasure measure,TGTrack track, TGTempo tempo) throws IOException{
 		int flags = readUnsignedByte();
 		if((flags & 0x40) != 0){
 			readUnsignedByte();
 		}
-		
+
 		TGBeat beat = getFactory().newBeat();
 		TGVoice voice = beat.getVoice(0);
 		TGDuration duration = readDuration(flags);
@@ -303,16 +308,16 @@ private long readBeat(long start, TGMeasure measure,TGTrack track, TGTempo tempo
 		voice.setEmpty(false);
 		duration.copy(voice.getDuration());
 		measure.addBeat(beat);
-		
+
 		return duration.getTime();
 	}
-	
+
 	private void readText(TGBeat beat) throws IOException{
 		TGText text = getFactory().newText();
 		text.setValue(readStringByteSizeOfInteger());
 		beat.setText(text);
 	}
-	
+
 	private TGNote readNote(TGString string,TGTrack track,TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		TGNote note = getFactory().newNote();
@@ -343,8 +348,8 @@ private TGNote readNote(TGString string,TGTrack track,TGNoteEffect effect) throw
 		}
 		return note;
 	}
-	
-	private TGTrack readTrack(TGSong song, int number, List channels) throws IOException {
+
+	private TGTrack readTrack(TGSong song, int number, List<TGChannel> channels) throws IOException {
 		TGTrack track = getFactory().newTrack();
 		track.setNumber(number);
 		readUnsignedByte();
@@ -366,21 +371,21 @@ private TGTrack readTrack(TGSong song, int number, List channels) throws IOExcep
 		readColor(track.getColor());
 		return track;
 	}
-	
-	private void readChannel(TGSong song, TGTrack track,List channels) throws IOException {
+
+	private void readChannel(TGSong song, TGTrack track,List<TGChannel> channels) throws IOException {
 		int index = (readInt() - 1);
 		int effectChannel = (readInt() - 1);
 		if(index >= 0 && index < channels.size()){
 			TGChannel channel = getFactory().newChannel();
-			
-			((TGChannel) channels.get(index)).copy(channel);
+
+			channels.get(index).copy(channel);
 			if (channel.getProgram() < 0) {
 				channel.setProgram((short)0);
 			}
 			if(!channel.isPercussionChannel()){
 				channel.setEffectChannel((short)effectChannel);
 			}
-			
+
 			//------------------------------------------//
 			for( int i = 0 ; i < song.countChannels() ; i ++ ){
 				TGChannel channelAux = song.getChannel(i);
@@ -396,13 +401,13 @@ private void readChannel(TGSong song, TGTrack track,List channels) throws IOExce
 			track.setChannelId(channel.getChannelId());
 		}
 	}
-	
+
 	private int parseRepeatAlternative(TGSong song,int measure,int value){
 		int repeatAlternative = 0;
 		int existentAlternatives = 0;
-		Iterator it = song.getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = song.getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.getNumber() == measure){
 				break;
 			}
@@ -411,7 +416,7 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 			}
 			existentAlternatives |= header.getRepeatAlternative();
 		}
-		
+
 		for(int i = 0; i < 8; i ++){
 			if(value > i && (existentAlternatives & (1 << i)) == 0){
 				repeatAlternative |= (1 << i);
@@ -419,7 +424,7 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 		}
 		return repeatAlternative;
 	}
-	
+
 	private void readChord(int strings, TGBeat beat) throws IOException {
 		TGChord chord = getFactory().newChord(strings);
 		int header = readUnsignedByte();
@@ -451,7 +456,7 @@ private void readChord(int strings, TGBeat beat) throws IOException {
 			beat.setChord(chord);
 		}
 	}
-	
+
 	private void readGrace(TGNoteEffect effect) throws IOException {
 		int fret = readUnsignedByte();
 		TGEffectGrace grace = getFactory().newEffectGrace();
@@ -475,7 +480,7 @@ else if(transition == 3){
 		grace.setDuration(readUnsignedByte());
 		effect.setGrace(grace);
 	}
-	
+
 	private void readBend(TGNoteEffect effect) throws IOException {
 		TGEffectBend bend = getFactory().newEffectBend();
 		skip(5);
@@ -484,7 +489,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 			int bendPosition = readInt();
 			int bendValue = readInt();
 			readByte(); //vibrato
-			
+
 			int pointPosition = Math.round(bendPosition * TGEffectBend.MAX_POSITION_LENGTH / GP_BEND_POSITION);
 			int pointValue = Math.round(bendValue * TGEffectBend.SEMITONE_LENGTH / GP_BEND_SEMITONE);
 			bend.addPoint(pointPosition,pointValue);
@@ -493,7 +498,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 			effect.setBend(bend);
 		}
 	}
-	
+
 	private void readTremoloBar(TGNoteEffect noteEffect) throws IOException {
 		int value = readInt();
 		TGEffectTremoloBar effect = getFactory().newEffectTremoloBar();
@@ -502,7 +507,7 @@ private void readTremoloBar(TGNoteEffect noteEffect) throws IOException {
 		effect.addPoint(TGEffectTremoloBar.MAX_POSITION_LENGTH,0);
 		noteEffect.setTremoloBar(effect);
 	}
-	
+
 	private void readNoteEffects(TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		effect.setHammer( ((flags & 0x02) != 0) );
@@ -515,7 +520,7 @@ private void readNoteEffects(TGNoteEffect effect) throws IOException {
 			readGrace(effect);
 		}
 	}
-	
+
 	private void readBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOException {
 		int flags = readUnsignedByte();
 		effect.setVibrato(((flags & 0x01) != 0) || ((flags & 0x02) != 0));
@@ -554,7 +559,7 @@ private void readBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOException
 			effect.setHarmonic(harmonic);
 		}
 	}
-	
+
 	private void readMixChange(TGTempo tempo) throws IOException {
 		readByte(); //instrument
 		int volume = readByte();
@@ -587,17 +592,17 @@ private void readMixChange(TGTempo tempo) throws IOException {
 			readByte();
 		}
 	}
-	
+
 	private int readKeySignature() throws IOException {
-		// 0: C 1: G, -1: F		
+		// 0: C 1: G, -1: F
 		int keySignature = readByte();
 		if (keySignature < 0){
 			keySignature = 7 - keySignature; // translate -1 to 8, etc.
 		}
-		
+
 		return keySignature;
 	}
-	
+
 	private int toStrokeValue( int value ){
 		if( value == 1 || value == 2){
 			return TGDuration.SIXTY_FOURTH;
@@ -616,17 +621,17 @@ private int toStrokeValue( int value ){
 		}
 		return TGDuration.SIXTY_FOURTH;
 	}
-	
+
 	private short toChannelShort(byte b){
 		short value = (short)(( b * 8 ) - 1);
 		return (short)Math.max(value,0);
 	}
-	
+
 	private int getClef( TGTrack track ){
 		if(!isPercussionChannel(track.getSong(),track.getChannelId())){
-			Iterator it = track.getStrings().iterator();
+			Iterator<TGString> it = track.getStrings().iterator();
 			while( it.hasNext() ){
-				TGString string = (TGString) it.next();
+				TGString string = it.next();
 				if( string.getValue() <= 34 ){
 					return TGMeasure.CLEF_BASS;
 				}
@@ -634,11 +639,11 @@ private int getClef( TGTrack track ){
 		}
 		return TGMeasure.CLEF_TREBLE;
 	}
-	
+
 	private boolean isPercussionChannel( TGSong song, int channelId ){
-		Iterator it = song.getChannels();
+		Iterator<TGChannel> it = song.getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel.isPercussionChannel();
 			}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3OutputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP3OutputStream.java
similarity index 96%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3OutputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP3OutputStream.java
index dcdaef44..aac2d3fd 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP3OutputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP3OutputStream.java
@@ -38,7 +38,7 @@
 
 /**
  * @author julian
- * 
+ *
  * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class GP3OutputStream extends GTPOutputStream{
@@ -46,19 +46,22 @@ public class GP3OutputStream extends GTPOutputStream{
 	private static final String GP3_VERSION = "FICHIER GUITAR PRO v3.00";
 	private static final int GP_BEND_SEMITONE = 25;
 	private static final int GP_BEND_POSITION = 60;
-	
+
 	public GP3OutputStream(GTPSettings settings){
 		super(settings);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 3",("*" + GP3_FORMAT_EXTENSION));
 	}
-	
+
+	@Override
 	public boolean isSupportedExtension(String extension) {
 		return (extension.toLowerCase().equals(GP3_FORMAT_EXTENSION)) ;
 	}
-	
+
+	@Override
 	public void writeSong(TGSong song){
 		try {
 			if(song.isEmpty()){
@@ -81,9 +84,9 @@ public void writeSong(TGSong song){
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void writeInfo(TGSong song) throws IOException{
-		List comments = toCommentLines(song.getComments());
+		List<String> comments = toCommentLines(song.getComments());
 		writeStringByteSizeOfInteger(song.getName());
 		writeStringByteSizeOfInteger("");
 		writeStringByteSizeOfInteger(song.getArtist());
@@ -94,10 +97,10 @@ private void writeInfo(TGSong song) throws IOException{
 		writeStringByteSizeOfInteger("");
 		writeInt( comments.size() );
 		for (int i = 0; i < comments.size(); i++) {
-			writeStringByteSizeOfInteger( (String)comments.get(i) );
+			writeStringByteSizeOfInteger( comments.get(i) );
 		}
 	}
-	
+
 	private void writeChannels(TGSong song) throws IOException{
 		TGChannel[] channels = makeChannels(song);
 		for (int i = 0; i < channels.length; i++) {
@@ -111,7 +114,7 @@ private void writeChannels(TGSong song) throws IOException{
 			writeBytes(new byte[]{0,0});
 		}
 	}
-	
+
 	private void writeMeasureHeaders(TGSong song) throws IOException {
 		TGTimeSignature timeSignature = getFactory().newTimeSignature();
 		if (song.countMeasureHeaders() > 0) {
@@ -123,7 +126,7 @@ private void writeMeasureHeaders(TGSong song) throws IOException {
 			}
 		}
 	}
-	
+
 	private void writeMeasures(TGSong song,TGTempo tempo) throws IOException{
 		for (int i = 0; i < song.countMeasureHeaders(); i++) {
 			TGMeasureHeader header = song.getMeasureHeader(i);
@@ -135,7 +138,7 @@ private void writeMeasures(TGSong song,TGTempo tempo) throws IOException{
 			header.getTempo().copy( tempo );
 		}
 	}
-	
+
 	private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSignature) throws IOException {
 		int flags = 0;
 		if (measure.getNumber() == 1 || measure.getTimeSignature().getNumerator() != timeSignature.getNumerator()) {
@@ -153,8 +156,11 @@ private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSig
 		if (measure.hasMarker()) {
 			flags |= 0x20;
 		}
+		if (measure.hasDoubleBar()) {
+			flags |= 0x80;
+		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x01) != 0) {
 			writeByte((byte) measure.getTimeSignature().getNumerator());
 		}
@@ -168,29 +174,29 @@ private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSig
 			writeMarker(measure.getMarker());
 		}
 	}
-	
+
 	private void writeTracks(TGSong song) throws IOException {
 		for (int i = 0; i < song.countTracks(); i++) {
 			TGTrack track = song.getTrack(i);
 			createTrack(track);
 		}
 	}
-	
+
 	private void createTrack(TGTrack track) throws IOException {
 		TGChannel channel = getChannel(track.getSong(), track);
-		
+
 		int flags = 0;
 		if (isPercussionChannel(track.getSong(),track.getChannelId())) {
 			flags |= 0x01;
 		}
 		writeUnsignedByte(flags);
-		
+
 		writeStringByte(track.getName(), 40);
 		writeInt(track.getStrings().size());
 		for (int i = 0; i < 7; i++) {
 			int value = 0;
 			if (track.getStrings().size() > i) {
-				TGString string = (TGString) track.getStrings().get(i);
+				TGString string = track.getStrings().get(i);
 				value = string.getValue();
 			}
 			writeInt(value);
@@ -202,10 +208,10 @@ private void createTrack(TGTrack track) throws IOException {
 		writeInt(Math.min(Math.max(track.getOffset(),0),12));
 		writeColor(track.getColor());
 	}
-	
+
 	private void writeMeasure(TGMeasure srcMeasure, boolean changeTempo) throws IOException {
 		TGMeasure measure = new GTPVoiceJoiner(getFactory(),srcMeasure).process();
-		
+
 		int beatCount = measure.countBeats();
 		writeInt(beatCount);
 		for (int i = 0; i < beatCount; i++) {
@@ -213,7 +219,7 @@ private void writeMeasure(TGMeasure srcMeasure, boolean changeTempo) throws IOEx
 			writeBeat(beat, measure, ( changeTempo && i == 0 ) );
 		}
 	}
-	
+
 	private void writeBeat(TGBeat beat,TGMeasure measure, boolean changeTempo) throws IOException {
 		TGVoice voice = beat.getVoice(0);
 		TGDuration duration = voice.getDuration();
@@ -248,7 +254,7 @@ private void writeBeat(TGBeat beat,TGMeasure measure, boolean changeTempo) throw
 			}
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x40) != 0) {
 			writeUnsignedByte(2);
 		}
@@ -286,12 +292,12 @@ private void writeBeat(TGBeat beat,TGMeasure measure, boolean changeTempo) throw
 			}
 		}
 	}
-	
+
 	private void writeNote(TGNote note) throws IOException {
 		int flags = ( 0x20 | 0x10 );
 		if(note.getEffect().isGhostNote()){
 			flags |= 0x04;
-		} 
+		}
 		if (note.getEffect().isBend() || note.getEffect().isGrace() || note.getEffect().isSlide() || note.getEffect().isHammer() || note.getEffect().isLetRing()) {
 			flags |= 0x08;
 		}
@@ -315,7 +321,7 @@ private void writeNote(TGNote note) throws IOException {
 			writeNoteEffects(note.getEffect());
 		}
 	}
-	
+
 	private byte parseDuration(TGDuration duration) {
 		byte value = 0;
 		switch (duration.getValue()) {
@@ -343,11 +349,11 @@ private byte parseDuration(TGDuration duration) {
 		}
 		return value;
 	}
-	
+
 	private void writeText(TGText text) throws IOException {
 		writeStringByteSizeOfInteger(text.getValue());
 	}
-	
+
 	private void writeBeatEffects(TGBeat beat, TGNoteEffect noteEffect) throws IOException {
 		int flags = 0;
 		if (noteEffect.isVibrato()) {
@@ -369,7 +375,7 @@ private void writeBeatEffects(TGBeat beat, TGNoteEffect noteEffect) throws IOExc
 			flags += 0x10;
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x20) != 0) {
 			if (noteEffect.isTremoloBar()){
 				writeUnsignedByte(0);
@@ -393,7 +399,7 @@ else if (noteEffect.isPopping()){
 			writeUnsignedByte( (beat.getStroke().getDirection() == TGStroke.STROKE_UP ? toStrokeValue(beat.getStroke()) : 0 ) );
 		}
 	}
-	
+
 	private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 		int flags = 0;
 		if (effect.isBend()) {
@@ -412,7 +418,7 @@ private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 			flags |= 0x10;
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x01) != 0) {
 			writeBend(effect.getBend());
 		}
@@ -420,20 +426,20 @@ private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 			writeGrace(effect.getGrace());
 		}
 	}
-	
+
 	private void writeBend(TGEffectBend bend) throws IOException {
 		int points = bend.getPoints().size();
 		writeByte((byte) 1);
 		writeInt(0);
 		writeInt(points);
 		for (int i = 0; i < points; i++) {
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint) bend.getPoints().get(i);
+			TGEffectBend.BendPoint point = bend.getPoints().get(i);
 			writeInt( (point.getPosition() * GP_BEND_POSITION / TGEffectBend.MAX_POSITION_LENGTH) );
 			writeInt( (point.getValue() * GP_BEND_SEMITONE / TGEffectBend.SEMITONE_LENGTH) );
 			writeByte((byte) 0);
 		}
 	}
-	
+
 	private void writeGrace(TGEffectGrace grace) throws IOException {
 		if(grace.isDead()){
 			writeUnsignedByte(0xff);
@@ -455,7 +461,7 @@ else if(grace.getTransition() == TGEffectGrace.TRANSITION_HAMMER){
 		}
 		writeUnsignedByte(grace.getDuration());
 	}
-	
+
 	private void writeMixChange(TGTempo tempo) throws IOException {
 		for (int i = 0; i < 7; i++) {
 			writeByte((byte) -1);
@@ -463,19 +469,19 @@ private void writeMixChange(TGTempo tempo) throws IOException {
 		writeInt(tempo.getValue());
 		writeByte((byte) 0);
 	}
-	
+
 	private void writeMarker(TGMarker marker) throws IOException {
 		writeStringByteSizeOfInteger(marker.getTitle());
 		writeColor(marker.getColor());
 	}
-	
+
 	private void writeColor(TGColor color) throws IOException {
 		writeUnsignedByte(color.getR());
 		writeUnsignedByte(color.getG());
 		writeUnsignedByte(color.getB());
 		writeByte((byte)0);
 	}
-	
+
 	private TGChannel[] makeChannels(TGSong song) {
 		TGChannel[] channels = new TGChannel[64];
 		for (int i = 0; i < channels.length; i++) {
@@ -490,10 +496,10 @@ private TGChannel[] makeChannels(TGSong song) {
 			channels[i].setPhaser((short)0);
 			channels[i].setTremolo((short)0);
 		}
-		
-		Iterator it = song.getChannels();
+
+		Iterator<TGChannel> it = song.getChannels();
 		while (it.hasNext()) {
-			TGChannel tgChannel = (TGChannel) it.next();
+			TGChannel tgChannel = it.next();
 			channels[tgChannel.getChannel()].setProgram(tgChannel.getProgram());
 			channels[tgChannel.getChannel()].setVolume(tgChannel.getVolume());
 			channels[tgChannel.getChannel()].setBalance(tgChannel.getBalance());
@@ -501,10 +507,10 @@ private TGChannel[] makeChannels(TGSong song) {
 			channels[tgChannel.getEffectChannel()].setVolume(tgChannel.getVolume());
 			channels[tgChannel.getEffectChannel()].setBalance(tgChannel.getBalance());
 		}
-		
+
 		return channels;
 	}
-	
+
 	private int toStrokeValue( TGStroke stroke ){
 		if( stroke.getValue() == TGDuration.SIXTY_FOURTH ){
 			return 2;
@@ -523,14 +529,14 @@ private int toStrokeValue( TGStroke stroke ){
 		}
 		return 2;
 	}
-	
+
 	private byte toChannelByte(short s){
 		return  (byte) ((s + 1) / 8);
 	}
-	
-	private List toCommentLines( String comments ){
-		List lines = new ArrayList();
-		
+
+	private List<String> toCommentLines( String comments ){
+		List<String> lines = new ArrayList<String>();
+
 		String line = comments;
 		while( line.length() > Byte.MAX_VALUE ) {
 			String subline = line.substring(0, Byte.MAX_VALUE);
@@ -538,7 +544,7 @@ private List toCommentLines( String comments ){
 			line = line.substring( Byte.MAX_VALUE );
 		}
 		lines.add( line );
-		
+
 		return lines;
 	}
 }
\ No newline at end of file
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4InputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP4InputStream.java
similarity index 95%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4InputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP4InputStream.java
index 7ed635df..ca348dd3 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4InputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP4InputStream.java
@@ -37,18 +37,20 @@ public class GP4InputStream extends GTPInputStream {
 	private static final String SUPPORTED_VERSIONS[] = { "FICHIER GUITAR PRO v4.00", "FICHIER GUITAR PRO v4.06", "FICHIER GUITAR PRO L4.06" };
 	private static final float GP_BEND_SEMITONE = 25f;
 	private static final float GP_BEND_POSITION = 60f;
-	
+
 	private int tripletFeel;
 	private int keySignature;
-	
+
 	public GP4InputStream(GTPSettings settings){
 		super(settings, SUPPORTED_VERSIONS);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 4","*.gp4");
 	}
-	
+
+	@Override
 	public TGSong readSong() throws IOException, GTPFormatException {
 		readVersion();
 		if (!isSupportedVersion(getVersion())) {
@@ -56,35 +58,35 @@ public TGSong readSong() throws IOException, GTPFormatException {
 			throw new GTPFormatException("Unsupported Version");
 		}
 		TGSong song = getFactory().newSong();
-		
+
 		readInfo(song);
-		
+
 		this.tripletFeel = ((readBoolean())?TGMeasureHeader.TRIPLET_FEEL_EIGHTH:TGMeasureHeader.TRIPLET_FEEL_NONE);
-		
+
 		int lyricTrack = readInt();
 		TGLyric lyric = readLyrics();
-		
+
 		int tempoValue = readInt();
 
 		this.keySignature = readKeySignature();
 		this.skip(3);
-		
+
 		readByte(); //octave
-		
-		List channels = readChannels();
-		
+
+		List<TGChannel> channels = readChannels();
+
 		int measures = readInt();
 		int tracks = readInt();
-		
+
 		readMeasureHeaders(song, measures);
 		readTracks(song, tracks, channels, lyric, lyricTrack);
 		readMeasures(song, measures, tracks, tempoValue);
-		
+
 		this.close();
-		
+
 		return song;
 	}
-	
+
 	private void readInfo(TGSong song) throws IOException{
 		song.setName(readStringByteSizeOfInteger());
 		readStringByteSizeOfInteger();
@@ -99,20 +101,20 @@ private void readInfo(TGSong song) throws IOException{
 			song.setComments( song.getComments() + readStringByteSizeOfInteger() );
 		}
 	}
-	
+
 	private void readMeasureHeaders(TGSong song, int count) throws IOException{
 		TGTimeSignature timeSignature = getFactory().newTimeSignature();
 		for (int i = 0; i < count; i++) {
 			song.addMeasureHeader(readMeasureHeader((i + 1),song,timeSignature));
 		}
 	}
-	
-	private void readTracks(TGSong song, int count, List channels,TGLyric lyric, int lyricTrack) throws IOException{
+
+	private void readTracks(TGSong song, int count, List<TGChannel> channels,TGLyric lyric, int lyricTrack) throws IOException{
 		for (int number = 1; number <= count; number++) {
 			song.addTrack(readTrack(song, number, channels,(number == lyricTrack)?lyric:getFactory().newLyric()));
 		}
 	}
-	
+
 	private void readMeasures(TGSong song, int measures, int tracks, int tempoValue) throws IOException{
 		TGTempo tempo = getFactory().newTempo();
 		tempo.setValue(tempoValue);
@@ -130,7 +132,7 @@ private void readMeasures(TGSong song, int measures, int tracks, int tempoValue)
 			start += header.getLength();
 		}
 	}
-	
+
 	private TGLyric readLyrics() throws IOException{
 		TGLyric lyric = getFactory().newLyric();
 		lyric.setFrom(readInt());
@@ -141,9 +143,9 @@ private TGLyric readLyrics() throws IOException{
 		}
 		return lyric;
 	}
-	
-	private List readChannels() throws IOException{
-		List channels = new ArrayList();
+
+	private List<TGChannel> readChannels() throws IOException{
+		List<TGChannel> channels = new ArrayList<TGChannel>();
 		for (int i = 0; i < 64; i++) {
 			TGChannel channel = getFactory().newChannel();
 			channel.setChannel((short)i);
@@ -160,13 +162,13 @@ private List readChannels() throws IOException{
 		}
 		return channels;
 	}
-	
+
 	private long readBeat(long start, TGMeasure measure,TGTrack track, TGTempo tempo) throws IOException {
 		int flags = readUnsignedByte();
 		if((flags & 0x40) != 0){
 			readUnsignedByte();
 		}
-		
+
 		TGBeat beat = getFactory().newBeat();
 		TGVoice voice = beat.getVoice(0);
 		TGDuration duration = readDuration(flags);
@@ -195,16 +197,16 @@ private long readBeat(long start, TGMeasure measure,TGTrack track, TGTempo tempo
 		voice.setEmpty(false);
 		duration.copy(voice.getDuration());
 		measure.addBeat(beat);
-		
+
 		return duration.getTime();
 	}
-	
+
 	private void readText(TGBeat beat) throws IOException{
 		TGText text = getFactory().newText();
 		text.setValue(readStringByteSizeOfInteger());
 		beat.setText(text);
 	}
-	
+
 	private TGDuration readDuration(int flags) throws IOException {
 		TGDuration duration = getFactory().newDuration();
 		duration.setValue( (int) (Math.pow( 2 , (readByte() + 4) ) / 4 ) );
@@ -248,7 +250,7 @@ private TGDuration readDuration(int flags) throws IOException {
 		}
 		return duration;
 	}
-	
+
 	private int getTiedNoteValue(int string, TGTrack track) {
 		int measureCount = track.countMeasures();
 		if (measureCount > 0) {
@@ -256,7 +258,7 @@ private int getTiedNoteValue(int string, TGTrack track) {
 				TGMeasure measure = track.getMeasure( m );
 				for (int b = measure.countBeats() - 1; b >= 0; b--) {
 					TGBeat beat = measure.getBeat( b );
-					TGVoice voice = beat.getVoice(0);  
+					TGVoice voice = beat.getVoice(0);
 					for (int n = 0; n < voice.countNotes(); n ++) {
 						TGNote note = voice.getNote( n );
 						if (note.getString() == string) {
@@ -268,14 +270,14 @@ private int getTiedNoteValue(int string, TGTrack track) {
 		}
 		return -1;
 	}
-	
+
 	private void readColor(TGColor color) throws IOException {
 		color.setR(readUnsignedByte());
 		color.setG(readUnsignedByte());
 		color.setB(readUnsignedByte());
 		read();
 	}
-	
+
 	private TGMarker readMarker(int measure) throws IOException {
 		TGMarker marker = getFactory().newMarker();
 		marker.setMeasure(measure);
@@ -283,7 +285,7 @@ private TGMarker readMarker(int measure) throws IOException {
 		readColor(marker.getColor());
 		return marker;
 	}
-	
+
 	private TGMeasureHeader readMeasureHeader(int number,TGSong song,TGTimeSignature timeSignature) throws IOException {
 		int flags = readUnsignedByte();
 		TGMeasureHeader header = getFactory().newHeader();
@@ -312,9 +314,12 @@ private TGMeasureHeader readMeasureHeader(int number,TGSong song,TGTimeSignature
 			this.keySignature = readKeySignature();
 			this.skip(1);
 		}
+		if ((flags & 0x80) != 0) {
+			header.setDoubleBar(true);
+		}
 		return header;
 	}
-	
+
 	private void readMeasure(TGMeasure measure,TGTrack track, TGTempo tempo) throws IOException{
 		long nextNoteStart = measure.getStart();
 		int numberOfBeats = readInt();
@@ -324,7 +329,7 @@ private void readMeasure(TGMeasure measure,TGTrack track, TGTempo tempo) throws
 		measure.setClef( getClef(track) );
 		measure.setKeySignature(this.keySignature);
 	}
-	
+
 	private TGNote readNote(TGString string, TGTrack track,TGNoteEffect effect)throws IOException {
 		int flags = readUnsignedByte();
 		TGNote note = getFactory().newNote();
@@ -356,8 +361,8 @@ private TGNote readNote(TGString string, TGTrack track,TGNoteEffect effect)throw
 		}
 		return note;
 	}
-	
-	private TGTrack readTrack(TGSong song, int number, List channels,TGLyric lyrics) throws IOException {
+
+	private TGTrack readTrack(TGSong song, int number, List<TGChannel> channels,TGLyric lyrics) throws IOException {
 		TGTrack track = getFactory().newTrack();
 		track.setNumber(number);
 		track.setLyrics(lyrics);
@@ -380,21 +385,21 @@ private TGTrack readTrack(TGSong song, int number, List channels,TGLyric lyrics)
 		readColor(track.getColor());
 		return track;
 	}
-	
-	private void readChannel(TGSong song, TGTrack track,List channels) throws IOException {
+
+	private void readChannel(TGSong song, TGTrack track,List<TGChannel> channels) throws IOException {
 		int index = (readInt() - 1);
 		int effectChannel = (readInt() - 1);
 		if(index >= 0 && index < channels.size()){
 			TGChannel channel = getFactory().newChannel();
-			
-			((TGChannel) channels.get(index)).copy(channel);
+
+			channels.get(index).copy(channel);
 			if (channel.getProgram() < 0) {
 				channel.setProgram((short)0);
 			}
 			if(!channel.isPercussionChannel()){
 				channel.setEffectChannel((short)effectChannel);
 			}
-			
+
 			//------------------------------------------//
 			for( int i = 0 ; i < song.countChannels() ; i ++ ){
 				TGChannel channelAux = song.getChannel(i);
@@ -410,13 +415,13 @@ private void readChannel(TGSong song, TGTrack track,List channels) throws IOExce
 			track.setChannelId(channel.getChannelId());
 		}
 	}
-	
+
 	private int parseRepeatAlternative(TGSong song,int measure,int value){
 		int repeatAlternative = 0;
 		int existentAlternatives = 0;
-		Iterator it = song.getMeasureHeaders();
+		Iterator<TGMeasureHeader> it = song.getMeasureHeaders();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(header.getNumber() == measure){
 				break;
 			}
@@ -425,7 +430,7 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 			}
 			existentAlternatives |= header.getRepeatAlternative();
 		}
-		
+
 		for(int i = 0; i < 8; i ++){
 			if(value > i && (existentAlternatives & (1 << i)) == 0){
 				repeatAlternative |= (1 << i);
@@ -433,7 +438,7 @@ private int parseRepeatAlternative(TGSong song,int measure,int value){
 		}
 		return repeatAlternative;
 	}
-	
+
 	private void readChord(int strings,TGBeat beat) throws IOException {
 		TGChord chord = getFactory().newChord(strings);
 		if ((readUnsignedByte() & 0x01) == 0) {
@@ -465,7 +470,7 @@ private void readChord(int strings,TGBeat beat) throws IOException {
 			beat.setChord(chord);
 		}
 	}
-	
+
 	private void readGrace(TGNoteEffect effect) throws IOException {
 		int fret = readUnsignedByte();
 		TGEffectGrace grace = getFactory().newEffectGrace();
@@ -489,7 +494,7 @@ else if(transition == 3){
 		grace.setDuration(readUnsignedByte());
 		effect.setGrace(grace);
 	}
-	
+
 	private void readBend(TGNoteEffect effect) throws IOException {
 		TGEffectBend bend = getFactory().newEffectBend();
 		skip(5);
@@ -498,7 +503,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 			int position = readInt();
 			int value = readInt();
 			readByte();
-			
+
 			int pointPosition = Math.round(position * TGEffectBend.MAX_POSITION_LENGTH / GP_BEND_POSITION);
 			int pointValue = Math.round(value * TGEffectBend.SEMITONE_LENGTH / GP_BEND_SEMITONE);
 			bend.addPoint(pointPosition,pointValue);
@@ -507,7 +512,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 			effect.setBend(bend);
 		}
 	}
-	
+
 	private void readTremoloBar(TGNoteEffect effect) throws IOException {
 		TGEffectTremoloBar tremoloBar = getFactory().newEffectTremoloBar();
 		skip(5);
@@ -516,7 +521,7 @@ private void readTremoloBar(TGNoteEffect effect) throws IOException {
 			int position = readInt();
 			int value = readInt();
 			readByte();
-			
+
 			int pointPosition = Math.round(position * TGEffectTremoloBar.MAX_POSITION_LENGTH / GP_BEND_POSITION);
 			int pointValue = Math.round(value / (GP_BEND_SEMITONE * 2f));
 			tremoloBar.addPoint(pointPosition,pointValue);
@@ -525,7 +530,7 @@ private void readTremoloBar(TGNoteEffect effect) throws IOException {
 			effect.setTremoloBar(tremoloBar);
 		}
 	}
-	
+
 	public void readTremoloPicking(TGNoteEffect effect) throws IOException{
 		int value = readUnsignedByte();
 		TGEffectTremoloPicking tp = getFactory().newEffectTremoloPicking();
@@ -540,7 +545,7 @@ public void readTremoloPicking(TGNoteEffect effect) throws IOException{
 			effect.setTremoloPicking(tp);
 		}
 	}
-	
+
 	private void readNoteEffects(TGNoteEffect noteEffect) throws IOException {
 		int flags1 = readUnsignedByte();
 		int flags2 = readUnsignedByte();
@@ -602,7 +607,7 @@ private void readNoteEffects(TGNoteEffect noteEffect) throws IOException {
 			}
 		}
 	}
-	
+
 	private void readBeatEffects(TGBeat beat,TGNoteEffect noteEffect) throws IOException {
 		int flags1 = readUnsignedByte();
 		int flags2 = readUnsignedByte();
@@ -632,7 +637,7 @@ private void readBeatEffects(TGBeat beat,TGNoteEffect noteEffect) throws IOExcep
 			readByte();
 		}
 	}
-	
+
 	private void readMixChange(TGTempo tempo) throws IOException {
 		readByte();
 		int volume = readByte();
@@ -666,17 +671,17 @@ private void readMixChange(TGTempo tempo) throws IOException {
 		}
 		readByte();
 	}
-	
+
 	private int readKeySignature() throws IOException {
-		// 0: C 1: G, -1: F		
+		// 0: C 1: G, -1: F
 		int keySignature = readByte();
 		if (keySignature < 0){
 			keySignature = 7 - keySignature; // translate -1 to 8, etc.
 		}
-		
+
 		return keySignature;
 	}
-	
+
 	private int toStrokeValue( int value ){
 		if( value == 1 || value == 2){
 			return TGDuration.SIXTY_FOURTH;
@@ -695,17 +700,17 @@ private int toStrokeValue( int value ){
 		}
 		return TGDuration.SIXTY_FOURTH;
 	}
-	
+
 	private short toChannelShort(byte b){
 		short value = (short)(( b * 8 ) - 1);
 		return (short)Math.max(value,0);
 	}
-	
+
 	private int getClef( TGTrack track ){
 		if(!isPercussionChannel(track.getSong(),track.getChannelId())){
-			Iterator it = track.getStrings().iterator();
+			Iterator<TGString> it = track.getStrings().iterator();
 			while( it.hasNext() ){
-				TGString string = (TGString) it.next();
+				TGString string = it.next();
 				if( string.getValue() <= 34 ){
 					return TGMeasure.CLEF_BASS;
 				}
@@ -713,11 +718,11 @@ private int getClef( TGTrack track ){
 		}
 		return TGMeasure.CLEF_TREBLE;
 	}
-	
+
 	private boolean isPercussionChannel( TGSong song, int channelId ){
-		Iterator it = song.getChannels();
+		Iterator<TGChannel> it = song.getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel.isPercussionChannel();
 			}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4OutputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP4OutputStream.java
similarity index 96%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4OutputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP4OutputStream.java
index ae1c5f49..00402893 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP4OutputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP4OutputStream.java
@@ -41,7 +41,7 @@
 
 /**
  * @author julian
- * 
+ *
  * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class GP4OutputStream extends GTPOutputStream{
@@ -49,19 +49,22 @@ public class GP4OutputStream extends GTPOutputStream{
 	private static final String GP4_VERSION = "FICHIER GUITAR PRO v4.00";
 	private static final int GP_BEND_SEMITONE = 25;
 	private static final int GP_BEND_POSITION = 60;
-	
+
 	public GP4OutputStream(GTPSettings settings){
 		super(settings);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 4","*.gp4");
 	}
-	
+
+	@Override
 	public boolean isSupportedExtension(String extension) {
 		return (extension.toLowerCase().equals(GP4_FORMAT_EXTENSION)) ;
 	}
-	
+
+	@Override
 	public void writeSong(TGSong song) {
 		try {
 			if(song.isEmpty()){
@@ -86,9 +89,9 @@ public void writeSong(TGSong song) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void writeInfo(TGSong song) throws IOException{
-		List comments = toCommentLines(song.getComments());
+		List<String> comments = toCommentLines(song.getComments());
 		writeStringByteSizeOfInteger(song.getName());
 		writeStringByteSizeOfInteger("");
 		writeStringByteSizeOfInteger(song.getArtist());
@@ -99,10 +102,10 @@ private void writeInfo(TGSong song) throws IOException{
 		writeStringByteSizeOfInteger("");
 		writeInt( comments.size() );
 		for (int i = 0; i < comments.size(); i++) {
-			writeStringByteSizeOfInteger( (String)comments.get(i) );
+			writeStringByteSizeOfInteger( comments.get(i) );
 		}
 	}
-	
+
 	private void writeChannels(TGSong song) throws IOException{
 		TGChannel[] channels = makeChannels(song);
 		for (int i = 0; i < channels.length; i++) {
@@ -116,7 +119,7 @@ private void writeChannels(TGSong song) throws IOException{
 			writeBytes(new byte[]{0,0});
 		}
 	}
-	
+
 	private void writeMeasures(TGSong song, TGTempo tempo) throws IOException{
 		for (int i = 0; i < song.countMeasureHeaders(); i++) {
 			TGMeasureHeader header = song.getMeasureHeader(i);
@@ -128,12 +131,12 @@ private void writeMeasures(TGSong song, TGTempo tempo) throws IOException{
 			header.getTempo().copy( tempo );
 		}
 	}
-	
+
 	private void writeLyrics(TGSong song) throws IOException{
 		TGTrack lyricTrack = null;
-		Iterator it = song.getTracks();
+		Iterator<TGTrack> it = song.getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			if(!track.getLyrics().isEmpty()){
 				lyricTrack = track;
 				break;
@@ -147,7 +150,7 @@ private void writeLyrics(TGSong song) throws IOException{
 			writeStringInteger("");
 		}
 	}
-	
+
 	private void writeMeasures(TGSong song) throws IOException {
 		TGTimeSignature timeSignature = getFactory().newTimeSignature();
 		if (song.countMeasureHeaders() > 0) {
@@ -159,7 +162,7 @@ private void writeMeasures(TGSong song) throws IOException {
 			}
 		}
 	}
-	
+
 	private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSignature) throws IOException {
 		int flags = 0;
 		if (measure.getNumber() == 1 || measure.getTimeSignature().getNumerator() != timeSignature.getNumerator()) {
@@ -177,8 +180,11 @@ private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSig
 		if (measure.hasMarker()) {
 			flags |= 0x20;
 		}
+		if (measure.hasDoubleBar()) {
+			flags |= 0x80;
+		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x01) != 0) {
 			writeByte((byte) measure.getTimeSignature().getNumerator());
 		}
@@ -192,17 +198,17 @@ private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSig
 			writeMarker(measure.getMarker());
 		}
 	}
-	
+
 	private void writeTracks(TGSong song) throws IOException {
 		for (int i = 0; i < song.countTracks(); i++) {
 			TGTrack track = song.getTrack(i);
 			writeTrack(track);
 		}
 	}
-	
+
 	private void writeTrack(TGTrack track) throws IOException {
 		TGChannel channel = getChannel(track.getSong(), track);
-		
+
 		int flags = 0;
 		if (isPercussionChannel(track.getSong(),track.getChannelId())) {
 			flags |= 0x01;
@@ -213,7 +219,7 @@ private void writeTrack(TGTrack track) throws IOException {
 		for (int i = 0; i < 7; i++) {
 			int value = 0;
 			if (track.getStrings().size() > i) {
-				TGString string = (TGString) track.getStrings().get(i);
+				TGString string = track.getStrings().get(i);
 				value = string.getValue();
 			}
 			writeInt(value);
@@ -225,26 +231,26 @@ private void writeTrack(TGTrack track) throws IOException {
 		writeInt(Math.min(Math.max(track.getOffset(),0),12));
 		writeColor(track.getColor());
 	}
-	
+
 	private void writeMeasure(TGMeasure srcMeasure, boolean changeTempo) throws IOException {
 		TGMeasure measure = new GTPVoiceJoiner(getFactory(),srcMeasure).process();
-		
+
 		int beatCount = measure.countBeats();
 		writeInt(beatCount);
 		for (int i = 0; i < beatCount; i++) {
 			TGBeat beat = measure.getBeat( i );
 			writeBeat(beat, measure, ( changeTempo && i == 0 ));
 		}
-		
+
 	}
-	
+
 	private void writeBeat(TGBeat beat, TGMeasure measure, boolean changeTempo) throws IOException {
 		TGVoice voice = beat.getVoice(0);
 		TGDuration duration = voice.getDuration();
 		TGNoteEffect effect = getFactory().newEffect();
 		for (int i = 0; i < voice.countNotes(); i++) {
 			TGNote playedNote = voice.getNote(i);
-			
+
 			if(playedNote.getEffect().isFadeIn()){
 				effect.setFadeIn(true);
 			}
@@ -261,7 +267,7 @@ private void writeBeat(TGBeat beat, TGMeasure measure, boolean changeTempo) thro
 				effect.setPopping(true);
 			}
 		}
-		
+
 		int flags = 0;
 		if (duration.isDotted() || duration.isDoubleDotted() ) {
 			flags |= 0x01;
@@ -288,7 +294,7 @@ else if (effect.isTremoloBar() || effect.isTapping() || effect.isSlapping() || e
 			flags |= 0x40;
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x40) != 0) {
 			writeUnsignedByte(0x02);
 		}
@@ -329,7 +335,7 @@ else if (effect.isTremoloBar() || effect.isTapping() || effect.isSlapping() || e
 			}
 		}
 	}
-	
+
 	private void writeNote(TGNote note) throws IOException {
 		int flags = ( 0x20 | 0x10 );
 		if(note.getEffect().isGhostNote()){
@@ -355,7 +361,7 @@ private void writeNote(TGNote note) throws IOException {
 			flags |= 0x08;
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x20) != 0) {
 			int typeHeader = 0x01;
 			if (note.isTiedNote()) {
@@ -375,7 +381,7 @@ private void writeNote(TGNote note) throws IOException {
 			writeNoteEffects(note.getEffect());
 		}
 	}
-	
+
 	private byte parseDuration(TGDuration duration) {
 		byte value = 0;
 		switch (duration.getValue()) {
@@ -403,11 +409,11 @@ private byte parseDuration(TGDuration duration) {
 		}
 		return value;
 	}
-	
+
 	private void writeText(TGText text) throws IOException{
 		writeStringByteSizeOfInteger(text.getValue());
 	}
-	
+
 	private void writeChord(TGChord chord) throws IOException{
 		writeUnsignedByte( 0x01 );
 		skipBytes(16);
@@ -419,7 +425,7 @@ private void writeChord(TGChord chord) throws IOException{
 		}
 		skipBytes(32);
 	}
-	
+
 	private void writeBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOException{
 		int flags1 = 0;
 		int flags2 = 0;
@@ -437,7 +443,7 @@ private void writeBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOExceptio
 		}
 		writeUnsignedByte(flags1);
 		writeUnsignedByte(flags2);
-		
+
 		if ((flags1 & 0x20) != 0) {
 			if(effect.isTapping()){
 				writeUnsignedByte(1);
@@ -455,7 +461,7 @@ private void writeBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOExceptio
 			writeUnsignedByte( (beat.getStroke().getDirection() == TGStroke.STROKE_UP ? toStrokeValue(beat.getStroke()) : 0 ) );
 		}
 	}
-	
+
 	private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 		int flags1 = 0;
 		int flags2 = 0;
@@ -494,7 +500,7 @@ private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 		}
 		writeUnsignedByte(flags1);
 		writeUnsignedByte(flags2);
-		
+
 		if ((flags1 & 0x01) != 0) {
 			writeBend(effect.getBend());
 		}
@@ -531,33 +537,33 @@ private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 			}
 		}
 	}
-	
+
 	private void writeBend(TGEffectBend bend) throws IOException {
 		int points = bend.getPoints().size();
 		writeByte((byte) 1);
 		writeInt(0);
 		writeInt(points);
 		for (int i = 0; i < points; i++) {
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint) bend.getPoints().get(i);
+			TGEffectBend.BendPoint point = bend.getPoints().get(i);
 			writeInt( (point.getPosition() * GP_BEND_POSITION / TGEffectBend.MAX_POSITION_LENGTH) );
 			writeInt( (point.getValue() * GP_BEND_SEMITONE / TGEffectBend.SEMITONE_LENGTH) );
 			writeByte((byte) 0);
 		}
 	}
-	
+
 	private void writeTremoloBar(TGEffectTremoloBar effect) throws IOException {
 		int points = effect.getPoints().size();
 		writeByte((byte) 6);
 		writeInt(0);
 		writeInt(points);
 		for (int i = 0; i < points; i++) {
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint) effect.getPoints().get(i);
+			TGEffectTremoloBar.TremoloBarPoint point = effect.getPoints().get(i);
 			writeInt( (point.getPosition() * GP_BEND_POSITION / TGEffectTremoloBar.MAX_POSITION_LENGTH) );
 			writeInt( (point.getValue() * (GP_BEND_SEMITONE * 2)) );
 			writeByte((byte) 0);
 		}
 	}
-	
+
 	public void writeTremoloPicking(TGEffectTremoloPicking effect) throws IOException{
 		if(effect.getDuration().getValue() == TGDuration.EIGHTH){
 			writeUnsignedByte(1);
@@ -567,7 +573,7 @@ public void writeTremoloPicking(TGEffectTremoloPicking effect) throws IOExceptio
 			writeUnsignedByte(3);
 		}
 	}
-	
+
 	private void writeGrace(TGEffectGrace grace) throws IOException {
 		if(grace.isDead()){
 			writeUnsignedByte(255);
@@ -589,7 +595,7 @@ else if(grace.getTransition() == TGEffectGrace.TRANSITION_HAMMER){
 		}
 		writeUnsignedByte(grace.getDuration());
 	}
-	
+
 	private void writeMixChange(TGTempo tempo) throws IOException {
 		for (int i = 0; i < 7; i++) {
 			writeByte((byte) -1);
@@ -598,19 +604,19 @@ private void writeMixChange(TGTempo tempo) throws IOException {
 		writeByte((byte) 0);
 		writeUnsignedByte(1);
 	}
-	
+
 	private void writeMarker(TGMarker marker) throws IOException {
 		writeStringByteSizeOfInteger(marker.getTitle());
 		writeColor(marker.getColor());
 	}
-	
+
 	private void writeColor(TGColor color) throws IOException {
 		writeUnsignedByte(color.getR());
 		writeUnsignedByte(color.getG());
 		writeUnsignedByte(color.getB());
 		writeByte((byte)0);
 	}
-	
+
 	private TGChannel[] makeChannels(TGSong song) {
 		TGChannel[] channels = new TGChannel[64];
 		for (int i = 0; i < channels.length; i++) {
@@ -625,10 +631,10 @@ private TGChannel[] makeChannels(TGSong song) {
 			channels[i].setPhaser((short)0);
 			channels[i].setTremolo((short)0);
 		}
-		
-		Iterator it = song.getChannels();
+
+		Iterator<TGChannel> it = song.getChannels();
 		while (it.hasNext()) {
-			TGChannel tgChannel = (TGChannel) it.next();
+			TGChannel tgChannel = it.next();
 			channels[tgChannel.getChannel()].setProgram(tgChannel.getProgram());
 			channels[tgChannel.getChannel()].setVolume(tgChannel.getVolume());
 			channels[tgChannel.getChannel()].setBalance(tgChannel.getBalance());
@@ -636,10 +642,10 @@ private TGChannel[] makeChannels(TGSong song) {
 			channels[tgChannel.getEffectChannel()].setVolume(tgChannel.getVolume());
 			channels[tgChannel.getEffectChannel()].setBalance(tgChannel.getBalance());
 		}
-		
+
 		return channels;
 	}
-	
+
 	private int toStrokeValue( TGStroke stroke ){
 		if( stroke.getValue() == TGDuration.SIXTY_FOURTH ){
 			return 2;
@@ -658,14 +664,14 @@ private int toStrokeValue( TGStroke stroke ){
 		}
 		return 2;
 	}
-	
+
 	private byte toChannelByte(short s){
 		return  (byte) ((s + 1) / 8);
 	}
-	
-	private List toCommentLines( String comments ){
-		List lines = new ArrayList();
-		
+
+	private List<String> toCommentLines( String comments ){
+		List<String> lines = new ArrayList<String>();
+
 		String line = comments;
 		while( line.length() > Byte.MAX_VALUE ) {
 			String subline = line.substring(0, Byte.MAX_VALUE);
@@ -673,7 +679,7 @@ private List toCommentLines( String comments ){
 			line = line.substring( Byte.MAX_VALUE );
 		}
 		lines.add( line );
-		
+
 		return lines;
 	}
 }
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5InputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP5InputStream.java
similarity index 95%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5InputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP5InputStream.java
index 375efcae..2b9744ce 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5InputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP5InputStream.java
@@ -39,15 +39,17 @@ public class GP5InputStream extends GTPInputStream {
 	private static final float GP_BEND_POSITION = 60f;
 
 	private int keySignature;
-	
+
 	public GP5InputStream(GTPSettings settings) {
 		super(settings, supportedVersions);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 5","*.gp5");
 	}
-	
+
+	@Override
 	public TGSong readSong() throws IOException, GTPFormatException {
 		readVersion();
 		if (!isSupportedVersion(getVersion())) {
@@ -55,42 +57,42 @@ public TGSong readSong() throws IOException, GTPFormatException {
 			throw new GTPFormatException("Unsupported Version");
 		}
 		TGSong song = getFactory().newSong();
-		
+
 		readInfo(song);
-		
+
 		//lyrics
 		int lyricTrack = readInt();
 		TGLyric lyric = readLyrics();
-		
+
 		readPageSetup();
-		
+
 		int tempoValue = readInt();
-		
+
 		if(getVersionIndex() > 0){
 			skip(1);
 		}
-		
+
 		this.keySignature = readKeySignature();
 		this.skip(3);
-		
+
 		readByte(); //octave
-		
-		List channels = readChannels();
-		
+
+		List<TGChannel> channels = readChannels();
+
 		skip(42);
-		
+
 		int measures = readInt();
 		int tracks = readInt();
-		
+
 		readMeasureHeaders(song, measures);
 		readTracks(song, tracks, channels, lyric, lyricTrack);
 		readMeasures(song, measures, tracks, tempoValue);
-		
+
 		this.close();
-		
+
 		return song;
 	}
-	
+
 	private void readInfo(TGSong song) throws IOException{
 		song.setName(readStringByteSizeOfInteger());
 		readStringByteSizeOfInteger();
@@ -106,7 +108,7 @@ private void readInfo(TGSong song) throws IOException{
 			song.setComments( song.getComments() + readStringByteSizeOfInteger() );
 		}
 	}
-	
+
 	private void readPageSetup() throws IOException{
 		skip( (getVersionIndex() > 0 ?49 : 30 ) );
 		for (int i = 0; i < 11; i++) {
@@ -114,7 +116,7 @@ private void readPageSetup() throws IOException{
 			readStringByte(0);
 		}
 	}
-	
+
 	private void readMeasureHeaders(TGSong song, int count) throws IOException{
 		TGTimeSignature timeSignature = getFactory().newTimeSignature();
 		for (int i = 0; i < count; i++) {
@@ -124,14 +126,14 @@ private void readMeasureHeaders(TGSong song, int count) throws IOException{
 			song.addMeasureHeader(readMeasureHeader(i,timeSignature));
 		}
 	}
-	
-	private void readTracks(TGSong song, int count, List channels,TGLyric lyric, int lyricTrack) throws IOException{
+
+	private void readTracks(TGSong song, int count, List<TGChannel> channels,TGLyric lyric, int lyricTrack) throws IOException{
 		for (int number = 1; number <= count; number++) {
 			song.addTrack(readTrack(song,number, channels,(number == lyricTrack)?lyric:getFactory().newLyric()));
 		}
 		skip( (getVersionIndex() == 0 ? 2 : 1) );
 	}
-	
+
 	private void readMeasures(TGSong song, int measures, int tracks, int tempoValue) throws IOException{
 		TGTempo tempo = getFactory().newTempo();
 		tempo.setValue(tempoValue);
@@ -150,7 +152,7 @@ private void readMeasures(TGSong song, int measures, int tracks, int tempoValue)
 			start += header.getLength();
 		}
 	}
-	
+
 	private TGLyric readLyrics() throws IOException{
 		TGLyric lyric = getFactory().newLyric();
 		lyric.setFrom(readInt());
@@ -161,10 +163,10 @@ private TGLyric readLyrics() throws IOException{
 		}
 		return lyric;
 	}
-	
+
 	private long readBeat(long start, TGMeasure measure, TGTrack track, TGTempo tempo, int voiceIndex) throws IOException{
 		int flags = readUnsignedByte();
-		
+
 		TGBeat beat = getBeat(measure, start);
 		TGVoice voice = beat.getVoice(voiceIndex);
 		if((flags & 0x40) != 0){
@@ -194,20 +196,20 @@ private long readBeat(long start, TGMeasure measure, TGTrack track, TGTempo temp
 			}
 			duration.copy(voice.getDuration());
 		}
-		
+
 		skip(1);
-		
+
 		int read = readByte();
 		//if (read == 8 || read == 10 || read == 24 ) {
 		if( (read & 0x08) != 0 ){
 			skip(1);
 		}
-		
+
 		return (!voice.isEmpty() ? duration.getTime() : 0 );
 	}
-	
-	private List readChannels() throws IOException{
-		List channels = new ArrayList();
+
+	private List<TGChannel> readChannels() throws IOException{
+		List<TGChannel> channels = new ArrayList<TGChannel>();
 		for (int i = 0; i < 64; i++) {
 			TGChannel channel = getFactory().newChannel();
 			channel.setChannel((short)i);
@@ -224,13 +226,13 @@ private List readChannels() throws IOException{
 		}
 		return channels;
 	}
-	
+
 	private void readText(TGBeat beat) throws IOException{
 		TGText text = getFactory().newText();
 		text.setValue(readStringByteSizeOfInteger());
 		beat.setText(text);
 	}
-	
+
 	private TGDuration readDuration(int flags) throws IOException {
 		TGDuration duration = getFactory().newDuration();
 		duration.setValue( (int) (Math.pow( 2 , (readByte() + 4) ) / 4 ) );
@@ -278,7 +280,7 @@ private TGDuration readDuration(int flags) throws IOException {
 		}
 		return duration;
 	}
-	
+
 	private int getTiedNoteValue(int string, TGTrack track) {
 		int measureCount = track.countMeasures();
 		if (measureCount > 0) {
@@ -302,14 +304,14 @@ private int getTiedNoteValue(int string, TGTrack track) {
 		}
 		return -1;
 	}
-	
+
 	private void readColor(TGColor color) throws IOException {
 		color.setR(readUnsignedByte());
 		color.setG(readUnsignedByte());
 		color.setB(readUnsignedByte());
 		skip(1);
 	}
-	
+
 	private TGMarker readMarker(int measure) throws IOException {
 		TGMarker marker = getFactory().newMarker();
 		marker.setMeasure(measure);
@@ -317,7 +319,7 @@ private TGMarker readMarker(int measure) throws IOException {
 		readColor(marker.getColor());
 		return marker;
 	}
-	
+
 	private TGMeasureHeader readMeasureHeader(int index,TGTimeSignature timeSignature) throws IOException {
 		int flags = readUnsignedByte();
 		TGMeasureHeader header = getFactory().newHeader();
@@ -345,6 +347,9 @@ private TGMeasureHeader readMeasureHeader(int index,TGTimeSignature timeSignatur
 			this.keySignature = readKeySignature();
 			this.skip(1);
 		}
+		if ((flags & 0x80) != 0) {
+			header.setDoubleBar(true);
+		}
 		if ((flags & 0x01) != 0 || (flags & 0x02) != 0) {
 			skip(4);
 		}
@@ -361,7 +366,7 @@ private TGMeasureHeader readMeasureHeader(int index,TGTimeSignature timeSignatur
 		}
 		return header;
 	}
-	
+
 	private void readMeasure(TGMeasure measure, TGTrack track, TGTempo tempo) throws IOException {
 		for( int voice = 0 ; voice < 2 ; voice ++ ){
 			long start = measure.getStart();
@@ -370,8 +375,8 @@ private void readMeasure(TGMeasure measure, TGTrack track, TGTempo tempo) throws
 				start += readBeat(start, measure, track, tempo, voice);
 			}
 		}
-		
-		List emptyBeats = new ArrayList();
+
+		List<TGBeat> emptyBeats = new ArrayList<TGBeat>();
 		for( int i = 0 ; i < measure.countBeats() ; i ++ ){
 			TGBeat beat = measure.getBeat( i );
 			boolean empty = true;
@@ -384,15 +389,15 @@ private void readMeasure(TGMeasure measure, TGTrack track, TGTempo tempo) throws
 				emptyBeats.add( beat );
 			}
 		}
-		Iterator it = emptyBeats.iterator();
+		Iterator<TGBeat> it = emptyBeats.iterator();
 		while( it.hasNext() ){
-			TGBeat beat = (TGBeat)it.next();
+			TGBeat beat = it.next();
 			measure.removeBeat( beat );
 		}
 		measure.setClef( getClef(track) );
 		measure.setKeySignature(this.keySignature);
 	}
-	
+
 	private TGNote readNote(TGString string,TGTrack track,TGNoteEffect effect)throws IOException {
 		int flags = readUnsignedByte();
 		TGNote note = getFactory().newNote();
@@ -426,8 +431,8 @@ private TGNote readNote(TGString string,TGTrack track,TGNoteEffect effect)throws
 		}
 		return note;
 	}
-	
-	private TGTrack readTrack(TGSong song, int number, List channels,TGLyric lyrics) throws IOException {
+
+	private TGTrack readTrack(TGSong song, int number, List<TGChannel> channels,TGLyric lyrics) throws IOException {
 		readUnsignedByte();
 		if(number ==  1 || getVersionIndex() == 0){
 			skip(1);
@@ -458,21 +463,21 @@ private TGTrack readTrack(TGSong song, int number, List channels,TGLyric lyrics)
 		}
 		return track;
 	}
-	
-	private void readChannel(TGSong song, TGTrack track,List channels) throws IOException {
+
+	private void readChannel(TGSong song, TGTrack track,List<TGChannel> channels) throws IOException {
 		int index = (readInt() - 1);
 		int effectChannel = (readInt() - 1);
 		if(index >= 0 && index < channels.size()){
 			TGChannel channel = getFactory().newChannel();
-			
-			((TGChannel) channels.get(index)).copy(channel);
+
+			channels.get(index).copy(channel);
 			if (channel.getProgram() < 0) {
 				channel.setProgram((short)0);
 			}
 			if(!channel.isPercussionChannel()){
 				channel.setEffectChannel((short)effectChannel);
 			}
-			
+
 			//------------------------------------------//
 			for( int i = 0 ; i < song.countChannels() ; i ++ ){
 				TGChannel channelAux = song.getChannel(i);
@@ -488,7 +493,7 @@ private void readChannel(TGSong song, TGTrack track,List channels) throws IOExce
 			track.setChannelId(channel.getChannelId());
 		}
 	}
-	
+
 	private void readChord(int strings,TGBeat beat) throws IOException{
 		TGChord chord = getFactory().newChord(strings);
 		this.skip(17);
@@ -506,7 +511,7 @@ private void readChord(int strings,TGBeat beat) throws IOException{
 			beat.setChord(chord);
 		}
 	}
-	
+
 	private void readBeatEffects(TGBeat beat, TGNoteEffect noteEffect) throws IOException {
 		int flags1 = readUnsignedByte();
 		int flags2 = readUnsignedByte();
@@ -530,13 +535,13 @@ private void readBeatEffects(TGBeat beat, TGNoteEffect noteEffect) throws IOExce
 			}else if( strokeDown > 0 ){
 				beat.getStroke().setDirection( TGStroke.STROKE_DOWN );
 				beat.getStroke().setValue( toStrokeValue(strokeDown) );
-			} 
+			}
 		}
 		if ((flags2 & 0x02) != 0) {
 			readByte();
 		}
 	}
-	
+
 	private void readNoteEffects(TGNoteEffect noteEffect) throws IOException {
 		int flags1 = readUnsignedByte();
 		int flags2 = readUnsignedByte();
@@ -565,7 +570,7 @@ private void readNoteEffects(TGNoteEffect noteEffect) throws IOException {
 		noteEffect.setPalmMute(((flags2 & 0x02) != 0));
 		noteEffect.setStaccato(((flags2 & 0x01) != 0));
 	}
-	
+
 	private void readGrace(TGNoteEffect effect) throws IOException {
 		int fret = readUnsignedByte();
 		int dynamic = readUnsignedByte();
@@ -592,7 +597,7 @@ else if(transition == 3){
 		}
 		effect.setGrace(grace);
 	}
-	
+
 	private void readBend(TGNoteEffect effect) throws IOException {
 		skip(5);
 		TGEffectBend bend = getFactory().newEffectBend();
@@ -601,7 +606,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 			int bendPosition = readInt();
 			int bendValue = readInt();
 			readByte();
-			
+
 			int pointPosition = Math.round(bendPosition * TGEffectBend.MAX_POSITION_LENGTH / GP_BEND_POSITION);
 			int pointValue = Math.round(bendValue * TGEffectBend.SEMITONE_LENGTH / GP_BEND_SEMITONE);
 			bend.addPoint(pointPosition,pointValue);
@@ -610,7 +615,7 @@ private void readBend(TGNoteEffect effect) throws IOException {
 			effect.setBend(bend);
 		}
 	}
-	
+
 	private void readTremoloBar(TGNoteEffect effect) throws IOException {
 		skip(5);
 		TGEffectTremoloBar tremoloBar = getFactory().newEffectTremoloBar();
@@ -619,7 +624,7 @@ private void readTremoloBar(TGNoteEffect effect) throws IOException {
 			int position = readInt();
 			int value = readInt();
 			readByte();
-			
+
 			int pointPosition = Math.round(position * TGEffectTremoloBar.MAX_POSITION_LENGTH / GP_BEND_POSITION);
 			int pointValue = Math.round(value / (GP_BEND_SEMITONE * 2f));
 			tremoloBar.addPoint(pointPosition,pointValue);
@@ -628,7 +633,7 @@ private void readTremoloBar(TGNoteEffect effect) throws IOException {
 			effect.setTremoloBar(tremoloBar);
 		}
 	}
-	
+
 	private void readTrill(TGNoteEffect effect) throws IOException{
 		byte fret = readByte();
 		byte period = readByte();
@@ -645,7 +650,7 @@ private void readTrill(TGNoteEffect effect) throws IOException{
 			effect.setTrill(trill);
 		}
 	}
-	
+
 	private void readArtificialHarmonic(TGNoteEffect effect) throws IOException{
 		int type = readByte();
 		TGEffectHarmonic harmonic = getFactory().newEffectHarmonic();
@@ -669,7 +674,7 @@ private void readArtificialHarmonic(TGNoteEffect effect) throws IOException{
 			effect.setHarmonic(harmonic);
 		}
 	}
-	
+
 	public void readTremoloPicking(TGNoteEffect effect) throws IOException{
 		int value = readUnsignedByte();
 		TGEffectTremoloPicking tp = getFactory().newEffectTremoloPicking();
@@ -684,10 +689,10 @@ public void readTremoloPicking(TGNoteEffect effect) throws IOException{
 			effect.setTremoloPicking(tp);
 		}
 	}
-	
+
 	private void readMixChange(TGTempo tempo) throws IOException {
 		readByte(); //instrument
-		
+
 		skip(16);
 		int volume = readByte();
 		int pan = readByte();
@@ -729,17 +734,17 @@ private void readMixChange(TGTempo tempo) throws IOException {
 			readStringByteSizeOfInteger();
 		}
 	}
-	
+
 	private int readKeySignature() throws IOException {
-		// 0: C 1: G, -1: F		
+		// 0: C 1: G, -1: F
 		int keySignature = readByte();
 		if (keySignature < 0){
 			keySignature = 7 - keySignature; // translate -1 to 8, etc.
 		}
-		
+
 		return keySignature;
 	}
-	
+
 	private int toStrokeValue( int value ){
 		if( value == 1 || value == 2){
 			return TGDuration.SIXTY_FOURTH;
@@ -758,17 +763,17 @@ private int toStrokeValue( int value ){
 		}
 		return TGDuration.SIXTY_FOURTH;
 	}
-	
+
 	private short toChannelShort(byte b){
 		short value = (short)(( b * 8 ) - 1);
 		return (short)Math.max(value,0);
 	}
-	
+
 	private int getClef( TGTrack track ){
 		if(!isPercussionChannel(track.getSong(),track.getChannelId())){
-			Iterator it = track.getStrings().iterator();
+			Iterator<TGString> it = track.getStrings().iterator();
 			while( it.hasNext() ){
-				TGString string = (TGString) it.next();
+				TGString string = it.next();
 				if( string.getValue() <= 34 ){
 					return TGMeasure.CLEF_BASS;
 				}
@@ -776,7 +781,7 @@ private int getClef( TGTrack track ){
 		}
 		return TGMeasure.CLEF_TREBLE;
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure, long start){
 		int count = measure.countBeats();
 		for(int i = 0 ; i < count ; i ++ ){
@@ -790,11 +795,11 @@ private TGBeat getBeat(TGMeasure measure, long start){
 		measure.addBeat(beat);
 		return beat;
 	}
-	
+
 	private boolean isPercussionChannel( TGSong song, int channelId ){
-		Iterator it = song.getChannels();
+		Iterator<TGChannel> it = song.getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel.isPercussionChannel();
 			}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5OutputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP5OutputStream.java
similarity index 96%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5OutputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP5OutputStream.java
index 8f5810c9..391e3461 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GP5OutputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GP5OutputStream.java
@@ -41,7 +41,7 @@
 
 /**
  * @author julian
- * 
+ *
  * TODO To change the template for this generated type comment go to Window - Preferences - Java - Code Style - Code Templates
  */
 public class GP5OutputStream extends GTPOutputStream {
@@ -49,7 +49,7 @@ public class GP5OutputStream extends GTPOutputStream {
 	private static final String GP5_VERSION = "FICHIER GUITAR PRO v5.00";
 	private static final int GP_BEND_SEMITONE = 25;
 	private static final int GP_BEND_POSITION = 60;
-	
+
 	private static final String[] PAGE_SETUP_LINES = {
 		"%TITLE%",
 		"%SUBTITLE%",
@@ -63,19 +63,22 @@ public class GP5OutputStream extends GTPOutputStream {
 		"Page %N%/%P%",
 		"Moderate",
 	};
-	
+
 	public GP5OutputStream(GTPSettings settings) {
 		super(settings);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("Guitar Pro 5","*.gp5");
 	}
-	
+
+	@Override
 	public boolean isSupportedExtension(String extension) {
 		return (extension.toLowerCase().equals(GP5_FORMAT_EXTENSION)) ;
 	}
-	
+
+	@Override
 	public void writeSong(TGSong song){
 		try {
 			if(song.isEmpty()){
@@ -104,9 +107,9 @@ public void writeSong(TGSong song){
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void writeInfo(TGSong song) throws IOException{
-		List comments = toCommentLines(song.getComments());
+		List<String> comments = toCommentLines(song.getComments());
 		writeStringByteSizeOfInteger(song.getName());
 		writeStringByteSizeOfInteger("");
 		writeStringByteSizeOfInteger(song.getArtist());
@@ -118,15 +121,15 @@ private void writeInfo(TGSong song) throws IOException{
 		writeStringByteSizeOfInteger("");
 		writeInt( comments.size() );
 		for (int i = 0; i < comments.size(); i++) {
-			writeStringByteSizeOfInteger( (String)comments.get(i) );
+			writeStringByteSizeOfInteger( comments.get(i) );
 		}
 	}
-	
+
 	private void writeLyrics(TGSong song) throws IOException{
 		TGTrack lyricTrack = null;
-		Iterator it = song.getTracks();
+		Iterator<TGTrack> it = song.getTracks();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			if(!track.getLyrics().isEmpty()){
 				lyricTrack = track;
 				break;
@@ -140,7 +143,7 @@ private void writeLyrics(TGSong song) throws IOException{
 			writeStringInteger("");
 		}
 	}
-	
+
 	private void writePageSetup() throws IOException{
 		writeInt( 210 ); // Page width
 		writeInt( 297 ); // Page height
@@ -149,16 +152,16 @@ private void writePageSetup() throws IOException{
 		writeInt( 15 );  // Margin top
 		writeInt( 10 );  // Margin bottom
 		writeInt( 100 ); // Score size percent
-		
+
 		writeByte( ( byte )0xff ); // View flags
 		writeByte( ( byte )0x01 ); // View flags
-		
+
 		for (int i = 0; i < PAGE_SETUP_LINES.length; i++) {
 			writeInt( (PAGE_SETUP_LINES[i].length() + 1) );
 			writeStringByte(PAGE_SETUP_LINES[i],0);
 		}
 	}
-	
+
 	private void writeChannels(TGSong song) throws IOException{
 		TGChannel[] channels = makeChannels(song);
 		for (int i = 0; i < channels.length; i++) {
@@ -172,7 +175,7 @@ private void writeChannels(TGSong song) throws IOException{
 			writeBytes(new byte[]{0,0});
 		}
 	}
-	
+
 	private void writeMeasureHeaders(TGSong song) throws IOException {
 		TGTimeSignature timeSignature = getFactory().newTimeSignature();
 		if (song.countMeasureHeaders() > 0) {
@@ -182,13 +185,13 @@ private void writeMeasureHeaders(TGSong song) throws IOException {
 				}
 				TGMeasureHeader measure = song.getMeasureHeader(i);
 				writeMeasureHeader(measure, timeSignature);
-				
+
 				timeSignature.setNumerator(measure.getTimeSignature().getNumerator());
 				timeSignature.getDenominator().setValue(measure.getTimeSignature().getDenominator().getValue());
 			}
 		}
 	}
-	
+
 	private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSignature) throws IOException {
 		int flags = 0;
 		if(measure.getNumber() == 1){
@@ -210,8 +213,11 @@ private void writeMeasureHeader(TGMeasureHeader measure, TGTimeSignature timeSig
 		if (measure.hasMarker()) {
 			flags |= 0x20;
 		}
+		if (measure.hasDoubleBar()) {
+			flags |= 0x80;
+		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x01) != 0) {
 			writeByte((byte) measure.getTimeSignature().getNumerator());
 		}
@@ -246,17 +252,17 @@ else if(measure.getTripletFeel() == TGMeasureHeader.TRIPLET_FEEL_SIXTEENTH){
 			writeByte((byte)2);
 		}
 	}
-	
+
 	private void writeTracks(TGSong song) throws IOException {
 		for (int i = 0; i < song.countTracks(); i++) {
 			TGTrack track = song.getTrack(i);
 			writeTrack(track);
 		}
 	}
-	
+
 	private void writeTrack(TGTrack track) throws IOException {
 		TGChannel channel = getChannel(track.getSong(), track);
-		
+
 		int flags = 0;
 		if (isPercussionChannel(track.getSong(),track.getChannelId())) {
 			flags |= 0x01;
@@ -268,7 +274,7 @@ private void writeTrack(TGTrack track) throws IOException {
 		for (int i = 0; i < 7; i++) {
 			int value = 0;
 			if (track.getStrings().size() > i) {
-				TGString string = (TGString) track.getStrings().get(i);
+				TGString string = track.getStrings().get(i);
 				value = string.getValue();
 			}
 			writeInt(value);
@@ -281,7 +287,7 @@ private void writeTrack(TGTrack track) throws IOException {
 		writeColor(track.getColor());
 		writeBytes(new byte[]{ 67, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, -1, 3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1});
 	}
-	
+
 	private void writeMeasures(TGSong song, TGTempo tempo) throws IOException{
 		for (int i = 0; i < song.countMeasureHeaders(); i++) {
 			TGMeasureHeader header = song.getMeasureHeader(i);
@@ -294,10 +300,10 @@ private void writeMeasures(TGSong song, TGTempo tempo) throws IOException{
 			header.getTempo().copy( tempo );
 		}
 	}
-	
+
 	private void writeMeasure(TGMeasure measure, boolean changeTempo) throws IOException {
 		for(int v = 0; v < 2 ; v ++){
-			List voices = new ArrayList();
+			List<TGVoice> voices = new ArrayList<TGVoice>();
 			for (int m = 0; m < measure.countBeats(); m ++) {
 				TGBeat beat = measure.getBeat( m );
 				if( v < beat.countVoices() ){
@@ -310,8 +316,8 @@ private void writeMeasure(TGMeasure measure, boolean changeTempo) throws IOExcep
 			if( voices.size() > 0 ){
 				writeInt( voices.size() );
 				for( int i = 0; i < voices.size() ; i ++ ){
-					TGVoice voice = (TGVoice) voices.get( i );
-					writeBeat(voice, voice.getBeat(), measure, ( changeTempo && i == 0 ) );					
+					TGVoice voice = voices.get( i );
+					writeBeat(voice, voice.getBeat(), measure, ( changeTempo && i == 0 ) );
 				}
 			}else{
 				// Fill empty voices.
@@ -321,7 +327,7 @@ private void writeMeasure(TGMeasure measure, boolean changeTempo) throws IOExcep
 					TGVoice voice = beat.getVoice( v );
 					voice.getDuration().setValue( measure.getTimeSignature().getDenominator().getValue() );
 					voice.setEmpty(true);
-					
+
 					writeInt( count );
 					for( int i = 0; i < count ; i ++ ){
 						writeBeat(voice, voice.getBeat(), measure, ( changeTempo && i == 0 ));
@@ -330,13 +336,13 @@ private void writeMeasure(TGMeasure measure, boolean changeTempo) throws IOExcep
 			}
 		}
 	}
-	
+
 	private void writeBeat(TGVoice voice, TGBeat beat, TGMeasure measure, boolean changeTempo) throws IOException {
 		TGDuration duration = voice.getDuration();
 		TGNoteEffect effect = getFactory().newEffect();
 		for (int i = 0; i < voice.countNotes(); i++) {
 			TGNote playedNote = voice.getNote(i);
-			
+
 			if(playedNote.getEffect().isFadeIn()){
 				effect.setFadeIn(true);
 			}
@@ -353,7 +359,7 @@ private void writeBeat(TGVoice voice, TGBeat beat, TGMeasure measure, boolean ch
 				effect.setPopping(true);
 			}
 		}
-		
+
 		int flags = 0;
 		if (duration.isDotted() || duration.isDoubleDotted()) {
 			flags |= 0x01;
@@ -380,28 +386,28 @@ else if (effect.isTremoloBar() || effect.isTapping() || effect.isSlapping() || e
 			flags |= 0x40;
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x40) != 0) {
 			writeUnsignedByte( (voice.isEmpty() ? 0x00 : 0x02) );
-			
+
 		}
 		writeByte(parseDuration(duration));
 		if ((flags & 0x20) != 0) {
 			writeInt(duration.getDivision().getEnters());
 		}
-		
+
 		if ((flags & 0x02) != 0) {
 			writeChord(beat.getChord());
 		}
-		
+
 		if ((flags & 0x04) != 0) {
 			writeText(beat.getText());
 		}
-		
+
 		if ((flags & 0x08) != 0) {
 			writeBeatEffects(beat, effect);
 		}
-		
+
 		if ((flags & 0x10) != 0) {
 			writeMixChange(measure.getTempo());
 		}
@@ -425,14 +431,14 @@ else if (effect.isTremoloBar() || effect.isTapping() || effect.isSlapping() || e
 				}
 			}
 		}
-		
+
 		skipBytes(2);
 	}
-	
+
 	private void writeNote(TGNote note) throws IOException {
 		//int flags = 0x20;
 		int flags = ( 0x20 | 0x10 );
-		
+
 		if (note.getEffect().isVibrato()  ||
 		    note.getEffect().isBend()     ||
 		    note.getEffect().isSlide()    ||
@@ -456,7 +462,7 @@ private void writeNote(TGNote note) throws IOException {
 			flags |= 0x40;
 		}
 		writeUnsignedByte(flags);
-		
+
 		if ((flags & 0x20) != 0) {
 			int typeHeader = 0x01;
 			if (note.isTiedNote()) {
@@ -477,7 +483,7 @@ private void writeNote(TGNote note) throws IOException {
 			writeNoteEffects(note.getEffect());
 		}
 	}
-	
+
 	private byte parseDuration(TGDuration duration) {
 		byte value = 0;
 		switch (duration.getValue()) {
@@ -505,7 +511,7 @@ private byte parseDuration(TGDuration duration) {
 		}
 		return value;
 	}
-	
+
 	private void writeChord(TGChord chord) throws IOException{
 		this.writeBytes( new byte[] {1,1,0,0,0,12,0,0,-1,-1,-1,-1,0,0,0,0,0} );
 		writeStringByte( chord.getName(), 21);
@@ -516,11 +522,11 @@ private void writeChord(TGChord chord) throws IOException{
 		}
 		this.skipBytes(32);
 	}
-	
+
 	private void writeBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOException{
 		int flags1 = 0;
 		int flags2 = 0;
-		
+
 		if(effect.isFadeIn()){
 			flags1 |= 0x10;
 		}
@@ -535,7 +541,7 @@ private void writeBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOExceptio
 		}
 		writeUnsignedByte(flags1);
 		writeUnsignedByte(flags2);
-		
+
 		if ((flags1 & 0x20) != 0) {
 			if(effect.isTapping()){
 				writeUnsignedByte(1);
@@ -553,7 +559,7 @@ private void writeBeatEffects(TGBeat beat,TGNoteEffect effect) throws IOExceptio
 			writeUnsignedByte( (beat.getStroke().getDirection() == TGStroke.STROKE_DOWN ? toStrokeValue(beat.getStroke()) : 0 ) );
 		}
 	}
-	
+
 	private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 		int flags1 = 0;
 		int flags2 = 0;
@@ -595,55 +601,55 @@ private void writeNoteEffects(TGNoteEffect effect) throws IOException {
 		if ((flags1 & 0x01) != 0) {
 			writeBend(effect.getBend());
 		}
-		
+
 		if ((flags1 & 0x10) != 0) {
 			writeGrace(effect.getGrace());
 		}
-		
+
 		if ((flags2 & 0x04) != 0) {
 			writeTremoloPicking(effect.getTremoloPicking());
 		}
-		
+
 		if ((flags2 & 0x08) != 0) {
 			writeByte((byte)1);
 		}
-		
+
 		if ((flags2 & 0x10) != 0) {
 			writeByte((byte)1);
 		}
-		
+
 		if ((flags2 & 0x20) != 0) {
 			writeTrill(effect.getTrill());
 		}
-		
+
 	}
-	
+
 	private void writeBend(TGEffectBend bend) throws IOException {
 		int points = bend.getPoints().size();
 		writeByte((byte) 1);
 		writeInt(0);
 		writeInt(points);
 		for (int i = 0; i < points; i++) {
-			TGEffectBend.BendPoint point = (TGEffectBend.BendPoint) bend.getPoints().get(i);
+			TGEffectBend.BendPoint point = bend.getPoints().get(i);
 			writeInt( (point.getPosition() * GP_BEND_POSITION / TGEffectBend.MAX_POSITION_LENGTH) );
 			writeInt( (point.getValue() * GP_BEND_SEMITONE / TGEffectBend.SEMITONE_LENGTH) );
 			writeByte((byte) 0);
 		}
 	}
-	
+
 	private void writeTremoloBar(TGEffectTremoloBar tremoloBar) throws IOException {
 		int points = tremoloBar.getPoints().size();
 		writeByte((byte) 1);
 		writeInt(0);
 		writeInt(points);
 		for (int i = 0; i < points; i++) {
-			TGEffectTremoloBar.TremoloBarPoint point = (TGEffectTremoloBar.TremoloBarPoint) tremoloBar.getPoints().get(i);
+			TGEffectTremoloBar.TremoloBarPoint point = tremoloBar.getPoints().get(i);
 			writeInt( (point.getPosition() * GP_BEND_POSITION / TGEffectBend.MAX_POSITION_LENGTH) );
 			writeInt( (point.getValue() * (GP_BEND_SEMITONE * 2)) );
 			writeByte((byte) 0);
 		}
 	}
-	
+
 	private void writeGrace(TGEffectGrace grace) throws IOException {
 		writeUnsignedByte(grace.getFret());
 		writeUnsignedByte(((grace.getDynamic() - TGVelocities.MIN_VELOCITY) / TGVelocities.VELOCITY_INCREMENT) + 1);
@@ -662,7 +668,7 @@ else if(grace.getTransition() == TGEffectGrace.TRANSITION_HAMMER){
 		writeUnsignedByte(grace.getDuration());
 		writeUnsignedByte( (grace.isDead() ? 0x01 : 0) | (grace.isOnBeat() ? 0x02 : 0) );
 	}
-	
+
 	private void writeTrill(TGEffectTrill trill) throws IOException {
 		writeByte((byte)trill.getFret());
 		if(trill.getDuration().getValue() == TGDuration.SIXTEENTH){
@@ -673,7 +679,7 @@ private void writeTrill(TGEffectTrill trill) throws IOException {
 			writeByte((byte)3);
 		}
 	}
-	
+
 	private void writeTremoloPicking(TGEffectTremoloPicking tremoloPicking) throws IOException{
 		if(tremoloPicking.getDuration().getValue() == TGDuration.EIGHTH){
 			writeByte((byte)1);
@@ -683,11 +689,11 @@ private void writeTremoloPicking(TGEffectTremoloPicking tremoloPicking) throws I
 			writeByte((byte)3);
 		}
 	}
-	
+
 	private void writeText(TGText text) throws IOException {
 		writeStringByteSizeOfInteger(text.getValue());
 	}
-	
+
 	private void writeMixChange(TGTempo tempo) throws IOException {
 		writeByte((byte) 0xff);
 		for(int i = 0; i < 16; i++){
@@ -707,19 +713,19 @@ private void writeMixChange(TGTempo tempo) throws IOException {
 		writeByte((byte)1);
 		writeByte((byte)0xff);
 	}
-	
+
 	private void writeMarker(TGMarker marker) throws IOException {
 		writeStringByteSizeOfInteger(marker.getTitle());
 		writeColor(marker.getColor());
 	}
-	
+
 	private void writeColor(TGColor color) throws IOException {
 		writeUnsignedByte(color.getR());
 		writeUnsignedByte(color.getG());
 		writeUnsignedByte(color.getB());
 		writeByte((byte)0);
 	}
-	
+
 	private TGChannel[] makeChannels(TGSong song) {
 		TGChannel[] channels = new TGChannel[64];
 		for (int i = 0; i < channels.length; i++) {
@@ -734,10 +740,10 @@ private TGChannel[] makeChannels(TGSong song) {
 			channels[i].setPhaser((short)0);
 			channels[i].setTremolo((short)0);
 		}
-		
-		Iterator it = song.getChannels();
+
+		Iterator<TGChannel> it = song.getChannels();
 		while (it.hasNext()) {
-			TGChannel tgChannel = (TGChannel) it.next();
+			TGChannel tgChannel = it.next();
 			channels[tgChannel.getChannel()].setProgram(tgChannel.getProgram());
 			channels[tgChannel.getChannel()].setVolume(tgChannel.getVolume());
 			channels[tgChannel.getChannel()].setBalance(tgChannel.getBalance());
@@ -745,10 +751,10 @@ private TGChannel[] makeChannels(TGSong song) {
 			channels[tgChannel.getEffectChannel()].setVolume(tgChannel.getVolume());
 			channels[tgChannel.getEffectChannel()].setBalance(tgChannel.getBalance());
 		}
-		
+
 		return channels;
 	}
-	
+
 	private byte[] makeBeamEighthNoteBytes(TGTimeSignature ts){
 		byte[] bytes = new byte[]{0,0,0,0};
 		if( ts.getDenominator().getValue() <= TGDuration.EIGHTH ){
@@ -765,7 +771,7 @@ private byte[] makeBeamEighthNoteBytes(TGTimeSignature ts){
 		}
 		return bytes;
 	}
-	
+
 	private int toStrokeValue( TGStroke stroke ){
 		if( stroke.getValue() == TGDuration.SIXTY_FOURTH ){
 			return 2;
@@ -784,14 +790,14 @@ private int toStrokeValue( TGStroke stroke ){
 		}
 		return 2;
 	}
-	
+
 	private byte toChannelByte(short s){
 		return  (byte) ((s + 1) / 8);
 	}
-	
-	private List toCommentLines( String comments ){
-		List lines = new ArrayList();
-		
+
+	private List<String> toCommentLines( String comments ){
+		List<String> lines = new ArrayList<String>();
+
 		String line = comments;
 		while( line.length() > Byte.MAX_VALUE ) {
 			String subline = line.substring(0, Byte.MAX_VALUE);
@@ -799,7 +805,7 @@ private List toCommentLines( String comments ){
 			line = line.substring( Byte.MAX_VALUE );
 		}
 		lines.add( line );
-		
+
 		return lines;
 	}
 }
\ No newline at end of file
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPFileFormat.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPFileFormat.java
similarity index 97%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPFileFormat.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPFileFormat.java
index e4d9f506..ea0529ba 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPFileFormat.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPFileFormat.java
@@ -3,25 +3,25 @@
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 public class GTPFileFormat {
-	
+
 	public static final String DEFAULT_TG_CHARSET = "UTF-8";
 	public static final String DEFAULT_VERSION_CHARSET = "UTF-8";
-	
+
 	private GTPSettings settings;
 	private TGFactory factory;
-	
+
 	public GTPFileFormat(GTPSettings settings){
 		this.settings = settings;
 	}
-	
+
 	public void init(TGFactory factory) {
 		this.factory = factory;
 	}
-	
+
 	protected GTPSettings getSettings(){
 		return this.settings;
 	}
-	
+
 	protected TGFactory getFactory(){
 		return this.factory;
 	}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPFormatException.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPFormatException.java
similarity index 99%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPFormatException.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPFormatException.java
index db5de3d2..041e1d03 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPFormatException.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPFormatException.java
@@ -15,9 +15,9 @@
  * Window - Preferences - Java - Code Style - Code Templates
  */
 public class GTPFormatException extends TGFileFormatException {
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public GTPFormatException(String s) {
 		super(s);
 	}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPInputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPInputStream.java
similarity index 98%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPInputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPInputStream.java
index a6ab7c12..dfaf6d7e 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPInputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPInputStream.java
@@ -7,31 +7,32 @@
 import org.herac.tuxguitar.song.factory.TGFactory;
 
 public abstract class GTPInputStream extends GTPFileFormat implements TGInputStreamBase{
-	
+
 	private int versionIndex;
 	private String version;
 	private String[] versions;
 	private InputStream stream;
-	
+
 	public GTPInputStream(GTPSettings settings, String[] versions){
 		super(settings);
 		this.versions = versions;
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,InputStream stream) {
 		super.init(factory);
 		this.stream = stream;
 		this.version = null;
 	}
-	
+
 	protected String getVersion(){
 		return this.version;
 	}
-	
+
 	protected int getVersionIndex(){
 		return this.versionIndex;
 	}
-	
+
 	public boolean isSupportedVersion(String version) {
 		for (int i = 0; i < this.versions.length; i++) {
 			if (version.equals(this.versions[i])) {
@@ -41,7 +42,8 @@ public boolean isSupportedVersion(String version) {
 		}
 		return false;
 	}
-	
+
+	@Override
 	public boolean isSupportedVersion(){
 		try{
 			readVersion();
@@ -52,7 +54,7 @@ public boolean isSupportedVersion(){
 			return false;
 		}
 	}
-	
+
 	protected void readVersion(){
 		try {
 			if(this.version == null){
@@ -62,94 +64,94 @@ protected void readVersion(){
 			this.version = "NOT_SUPPORTED";
 		}
 	}
-	
+
 	protected int read() throws IOException {
 		return this.stream.read();
 	}
-	
+
 	protected int read(byte[] bytes) throws IOException {
 		return this.stream.read(bytes);
 	}
-	
+
 	protected int read(byte[] bytes,int off,int len) throws IOException {
 		return this.stream.read(bytes,off,len);
 	}
-	
+
 	protected void skip(int bytes) throws IOException{
 		this.stream.read(new byte[bytes]);
 	}
-	
+
 	protected int readUnsignedByte() throws IOException {
 		return (this.stream.read() & 0xff);
 	}
-	
+
 	protected byte readByte() throws IOException {
 		return ((byte)this.stream.read());
 	}
-	
+
 	protected boolean readBoolean() throws IOException {
 		return (this.stream.read() == 1);
 	}
-	
+
 	protected int readInt() throws IOException {
 		byte[] bytes = new byte[4];
 		this.stream.read(bytes);
 		return ((bytes[3] & 0xff) << 24) | ((bytes[2] & 0xff) << 16) | ((bytes[1] & 0xff) << 8) | (bytes[0] & 0xff);
 	}
-	
+
 	protected long readLong() throws IOException {
 		byte[] bytes = new byte[8];
 		this.stream.read(bytes);
 		return ((long) (bytes[7] & 0xff) << 56) | ((long) (bytes[6] & 0xff) << 48) | ((long) (bytes[5] & 0xff) << 40) | ((long) (bytes[4] & 0xff) << 32) |
 			   ((long) (bytes[3] & 0xff) << 24) | ((long) (bytes[2] & 0xff) << 16) | ((long) (bytes[1] & 0xff) << 8) | (bytes[0] & 0xff);
 	}
-	
+
 	protected String readString(int size, int len, String charset) throws IOException{
 		byte[] bytes = new byte[ (size > 0 ? size : len ) ];
 		this.stream.read(bytes);
 		return newString(bytes,(len >= 0 && len <= bytes.length ? len : size ), charset);
 	}
-	
+
 	protected String readString(int length, String charset) throws IOException{
 		return readString(length, length, charset);
 	}
-	
+
 	protected String readString(int length) throws IOException{
 		return readString(length, getSettings().getCharset());
 	}
-	
+
 	protected String readStringInteger(String charset) throws IOException {
 		return readString( readInt(), charset);
 	}
-	
+
 	protected String readStringInteger() throws IOException {
 		return readStringInteger( getSettings().getCharset() );
 	}
-	
+
 	protected String readStringByte(int size, String charset) throws IOException {
 		return readString( size, readUnsignedByte(), charset);
 	}
-	
+
 	protected String readStringByte(int size) throws IOException {
 		return readStringByte( size, getSettings().getCharset() );
 	}
-	
+
 	protected String readStringByteSizeOfByte(String charset) throws IOException {
 		return readStringByte( (readUnsignedByte() - 1), charset);
 	}
-	
+
 	protected String readStringByteSizeOfByte() throws IOException {
 		return readStringByteSizeOfByte( getSettings().getCharset() );
 	}
-	
+
 	protected String readStringByteSizeOfInteger(String charset) throws IOException {
 		return readStringByte( (readInt() - 1), charset);
 	}
-	
+
 	protected String readStringByteSizeOfInteger() throws IOException {
 		return readStringByteSizeOfInteger( getSettings().getCharset() );
 	}
-	
+
 	private String newString(byte[] bytes, int length, String charset) {
 		try {
 			return new String(new String(bytes, 0, length, charset).getBytes(DEFAULT_TG_CHARSET), DEFAULT_TG_CHARSET);
@@ -158,7 +160,7 @@ private String newString(byte[] bytes, int length, String charset) {
 		}
 		return new String(bytes, 0, length);
 	}
-	
+
 	protected void close() throws IOException{
 		this.stream.close();
 	}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPOutputStream.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPOutputStream.java
similarity index 96%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPOutputStream.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPOutputStream.java
index c6646ef1..f1fedaa5 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPOutputStream.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPOutputStream.java
@@ -12,94 +12,95 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public abstract class GTPOutputStream extends GTPFileFormat implements TGOutputStreamBase{
-	
+
 	private TGChannel channelAux;
 	private OutputStream outputStream;
-	
+
 	public GTPOutputStream(GTPSettings settings){
 		super(settings);
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream) {
 		super.init(factory);
 		this.channelAux = null;
 		this.outputStream = stream;
 	}
-	
+
 	protected void skipBytes(int count) throws IOException {
 		for(int i = 0;i < count;i++){
 			this.outputStream.write(0);
 		}
 	}
-	
+
 	protected void writeByte(byte v) throws IOException {
 		this.outputStream.write(v);
 	}
-	
+
 	protected void writeUnsignedByte(int v) throws IOException {
 		this.outputStream.write(v);
 	}
-	
+
 	protected void writeBytes(byte[] v) throws IOException {
 		this.outputStream.write(v);
 	}
-	
+
 	protected void writeBoolean(boolean v) throws IOException {
 		this.outputStream.write(v ? 1 : 0);
 	}
-	
+
 	protected void writeInt(int v) throws IOException {
 		byte[] bytes = { (byte)(v & 0x00FF),(byte)((v >> 8) & 0x000000FF),(byte) ((v >> 16) & 0x000000FF),(byte)((v >> 24) & 0x000000FF) };
 		this.outputStream.write(bytes);
 	}
-	
+
 	protected void writeString(byte[] bytes, int maximumLength) throws IOException {
 		int length = (maximumLength == 0 || maximumLength > bytes.length ? bytes.length : maximumLength );
 		for(int i = 0 ; i < length; i ++){
 			this.outputStream.write( bytes[ i ] );
 		}
 	}
-	
+
 	protected void writeStringInteger(String string, String charset) throws IOException {
 		byte[] bytes = string.getBytes(charset);
 		this.writeInt( bytes.length );
 		this.writeString( bytes , 0 );
 	}
-	
+
 	protected void writeStringInteger(String string) throws IOException {
 		this.writeStringInteger(string, getSettings().getCharset());
 	}
-	
+
 	protected void writeStringByte(String string, int size, String charset) throws IOException {
 		byte[] bytes = string.getBytes(charset);
 		this.writeByte( (byte)( size == 0 || size > bytes.length ? bytes.length : size ));
 		this.writeString( bytes , size );
 		this.skipBytes( size - bytes.length );
 	}
-	
+
 	protected void writeStringByte(String string, int size) throws IOException {
 		this.writeStringByte(string, size, getSettings().getCharset());
 	}
-	
+
 	protected void writeStringByteSizeOfInteger(String string, String charset) throws IOException {
 		byte[] bytes = string.getBytes(charset);
 		this.writeInt( (bytes.length + 1) );
 		this.writeStringByte(string, bytes.length, charset);
 	}
-	
+
 	protected void writeStringByteSizeOfInteger(String string) throws IOException {
 		writeStringByteSizeOfInteger(string, getSettings().getCharset());
 	}
-	
+
 	protected void close() throws IOException{
 		this.outputStream.flush();
 		this.outputStream.close();
 	}
-	
+
 	protected TGChannel getChannel( TGSong song, TGTrack track ){
 		TGSongManager tgSongManager = new TGSongManager(getFactory());
 		tgSongManager.setSong( song );
-		
+
 		TGChannel tgChannel = tgSongManager.getChannel( track.getChannelId() );
 		if( tgChannel != null ){
 			return tgChannel;
@@ -112,11 +113,11 @@ protected TGChannel getChannel( TGSong song, TGTrack track ){
 		}
 		return this.channelAux;
 	}
-	
+
 	protected boolean isPercussionChannel( TGSong song, int channelId ){
-		Iterator it = song.getChannels();
+		Iterator<TGChannel> it = song.getChannels();
 		while( it.hasNext() ){
-			TGChannel channel = (TGChannel)it.next();
+			TGChannel channel = it.next();
 			if( channel.getChannelId() == channelId ){
 				return channel.isPercussionChannel();
 			}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPPluginList.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPPluginList.java
similarity index 88%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPPluginList.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPPluginList.java
index 269df36b..492a377e 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPPluginList.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPPluginList.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
 import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
 import org.herac.tuxguitar.app.system.plugins.base.TGInputStreamPlugin;
 import org.herac.tuxguitar.app.system.plugins.base.TGOutputStreamPlugin;
@@ -12,70 +13,84 @@
 import org.herac.tuxguitar.io.base.TGOutputStreamBase;
 
 public class GTPPluginList extends TGPluginList implements TGPluginSetup{
-	
-	protected List getPlugins() {
+
+	@Override
+	protected List<TGPlugin> getPlugins() {
 		GTPSettingsUtil.instance().load();
-		
-		List plugins = new ArrayList();
+
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new GP5InputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new GP4InputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new GP3InputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new GP2InputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGInputStreamPlugin() {
+			@Override
 			protected TGInputStreamBase getInputStream() {
 				return new GP1InputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGOutputStreamPlugin() {
+			@Override
 			protected TGOutputStreamBase getOutputStream() {
 				return new GP5OutputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGOutputStreamPlugin() {
+			@Override
 			protected TGOutputStreamBase getOutputStream() {
 				return new GP4OutputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		plugins.add(new TGOutputStreamPlugin() {
+			@Override
 			protected TGOutputStreamBase getOutputStream() {
 				return new GP3OutputStream(GTPSettingsUtil.instance().getSettings());
 			}
 		});
 		return plugins;
 	}
-	
+
+	@Override
 	public void setupDialog(Shell parent) {
 		GTPSettingsUtil.instance().configure(parent);
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Guitar Pro File Format plugin";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Guitar Pro File Format plugin for TuxGuitar";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPSettings.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPSettings.java
similarity index 97%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPSettings.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPSettings.java
index 8af15d4b..ce6068f6 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPSettings.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPSettings.java
@@ -1,19 +1,19 @@
 package org.herac.tuxguitar.io.gtp;
 
 public class GTPSettings {
-	
+
 	public static final String DEFAULT_CHARSET = "UTF-8";
-	
+
 	private String charset;
-	
+
 	public GTPSettings(){
 		this.charset = DEFAULT_CHARSET;
 	}
-	
+
 	public String getCharset() {
 		return this.charset;
 	}
-	
+
 	public void setCharset(String charset) {
 		this.charset = charset;
 	}
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPSettingsUtil.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPSettingsUtil.java
similarity index 88%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPSettingsUtil.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPSettingsUtil.java
index 47d673a5..4ab40cea 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPSettingsUtil.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPSettingsUtil.java
@@ -4,7 +4,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
+import java.util.Map.Entry;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -23,38 +23,38 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class GTPSettingsUtil {
-	
+
 	private static final String KEY_CHARSET = "charset";
-	
+
 	private static GTPSettingsUtil instance;
-	
+
 	private TGConfigManager config;
-	
-	private GTPSettings settings;
-	
+
+	private final GTPSettings settings;
+
 	private GTPSettingsUtil(){
 		this.settings = new GTPSettings();
 	}
-	
+
 	public static GTPSettingsUtil instance(){
 		if( instance == null ){
 			instance = new GTPSettingsUtil();
 		}
 		return instance;
 	}
-	
+
 	public GTPSettings getSettings(){
 		return this.settings;
 	}
-	
+
 	public TGConfigManager getConfig(){
-		if(this.config == null){ 
+		if(this.config == null){
 			this.config = new TGPluginConfigManager("tuxguitar-gtp");
 			this.config.init();
 		}
 		return this.config;
 	}
-	
+
 	public void load(){
 		String charsetDefault = System.getProperty("file.encoding");
 		if( charsetDefault == null ){
@@ -62,77 +62,79 @@ public void load(){
 		}
 		this.settings.setCharset( getConfig().getStringConfigValue(KEY_CHARSET, charsetDefault) );
 	}
-	
+
 	public void configure(Shell parent) {
-		final List charsets = getAvailableCharsets();
-		
+		final List<String> charsets = getAvailableCharsets();
+
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("gtp.settings.title"));
-		
+
 		//------------------DEVICE-----------------------
 		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout(2,false));
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("gtp.settings.charset.tip"));
-		
+
 		final Label label = new Label(group,SWT.LEFT);
 		label.setText(TuxGuitar.getProperty("gtp.settings.charset.select") + ":");
-		
+
 		final Combo value = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		value.setLayoutData(new GridData(250,SWT.DEFAULT));
 		for(int i = 0 ; i < charsets.size(); i ++){
-			String charset = (String)charsets.get(i);
+			String charset = charsets.get(i);
 			value.add( charset );
 			if(charset.equals(this.settings.getCharset())){
 				value.select( i );
 			}
 		}
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(data);
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int selection = value.getSelectionIndex();
 				if(selection >= 0 && selection < charsets.size() ){
 					TGConfigManager config = getConfig();
-					config.setProperty(KEY_CHARSET, (String)charsets.get(selection));
+					config.setProperty(KEY_CHARSET, charsets.get(selection));
 					config.save();
 					load();
 				}
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(data);
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
-	private List getAvailableCharsets(){
-		List charsets = new ArrayList();
-		Iterator it = Charset.availableCharsets().entrySet().iterator();
+
+	private List<String> getAvailableCharsets(){
+		List<String> charsets = new ArrayList<String>();
+		Iterator<Entry<String, Charset>> it = Charset.availableCharsets().entrySet().iterator();
 		while( it.hasNext() ){
-			Map.Entry entry = (Map.Entry) it.next();
+			Entry<String, Charset> entry = it.next();
 			charsets.add(entry.getKey());
 		}
 		return charsets;
diff --git a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPVoiceJoiner.java b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPVoiceJoiner.java
similarity index 99%
rename from TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPVoiceJoiner.java
rename to plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPVoiceJoiner.java
index 7a18b161..0a73db7d 100644
--- a/TuxGuitar-gtp/src/org/herac/tuxguitar/io/gtp/GTPVoiceJoiner.java
+++ b/plugins/gtp/src/main/java/org/herac/tuxguitar/io/gtp/GTPVoiceJoiner.java
@@ -10,23 +10,23 @@
 public class GTPVoiceJoiner {
 	private TGFactory factory;
 	private TGMeasure measure;
-	
+
 	public GTPVoiceJoiner(TGFactory factory,TGMeasure measure){
 		this.factory = factory;
 		this.measure = measure.clone(factory, measure.getHeader());
 		this.measure.setTrack( measure.getTrack() );
 	}
-	
+
 	public TGMeasure process(){
 		this.orderBeats();
 		this.joinBeats();
 		return this.measure;
 	}
-	
+
 	public void joinBeats(){
 		TGBeat previous = null;
 		boolean finish = true;
-		
+
 		long measureStart = this.measure.getStart();
 		long measureEnd = (measureStart + this.measure.getLength());
 		for(int i = 0;i < this.measure.countBeats();i++){
@@ -46,11 +46,11 @@ public void joinBeats(){
 				finish = false;
 				break;
 			}
-			
+
 			long beatStart = beat.getStart();
 			if(previous != null){
 				long previousStart = previous.getStart();
-				
+
 				TGDuration previousBestDuration = null;
 				for(int v = /*1*/0; v < previous.countVoices(); v++ ){
 					TGVoice previousVoice = previous.getVoice(v);
@@ -63,7 +63,7 @@ public void joinBeats(){
 						}
 					}
 				}
-				
+
 				if(previousBestDuration != null){
 					previousBestDuration.copy( previous.getVoice(0).getDuration() );
 				}else{
@@ -76,7 +76,7 @@ public void joinBeats(){
 					duration.copy( previous.getVoice(0).getDuration() );
 				}
 			}
-			
+
 			TGDuration beatBestDuration = null;
 			for(int v = /*1*/0; v < beat.countVoices(); v++ ){
 				TGVoice currentVoice = beat.getVoice(v);
@@ -89,7 +89,7 @@ public void joinBeats(){
 					}
 				}
 			}
-			
+
 			if(beatBestDuration == null){
 				if(voice.isRestVoice()){
 					this.measure.removeBeat(beat);
@@ -105,7 +105,7 @@ public void joinBeats(){
 			joinBeats();
 		}
 	}
-	
+
 	public void orderBeats(){
 		for(int i = 0;i < this.measure.countBeats();i++){
 			TGBeat minBeat = null;
diff --git a/TuxGuitar-gtp/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/gtp/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-gtp/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/gtp/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-gtp/share/lang/messages.properties b/plugins/gtp/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-gtp/share/lang/messages.properties
rename to plugins/gtp/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-gtp/share/lang/messages_sv.properties b/plugins/gtp/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-gtp/share/lang/messages_sv.properties
rename to plugins/gtp/src/main/resources/lang/messages_sv.properties
diff --git a/TuxGuitar-gtp/share/tuxguitar-gtp.cfg b/plugins/gtp/src/main/resources/tuxguitar-gtp.cfg
similarity index 100%
rename from TuxGuitar-gtp/share/tuxguitar-gtp.cfg
rename to plugins/gtp/src/main/resources/tuxguitar-gtp.cfg
diff --git a/plugins/image/pom.xml b/plugins/image/pom.xml
new file mode 100644
index 00000000..b70c1d59
--- /dev/null
+++ b/plugins/image/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-image</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Image</name>
+	<description>Image plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporter.java b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporter.java
similarity index 94%
rename from TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporter.java
rename to plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporter.java
index f901fa85..35b4911c 100644
--- a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporter.java
+++ b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporter.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.editors.TGPainterImpl;
 import org.herac.tuxguitar.app.editors.TGResourceFactoryImpl;
@@ -23,42 +24,43 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class ImageExporter implements TGRawExporter{
-	
+
 	private static final int PAGE_WIDTH = 550;
 	private static final int PAGE_HEIGHT = 800;
-	
+
 	private PrintStyles styles;
 	private ImageFormat format;
 	private String path;
-	
+
+	@Override
 	public String getExportName() {
 		return TuxGuitar.getProperty("tuxguitar-image.export-label");
 	}
-	
+
 	public PrintStyles getStyles() {
 		return this.styles;
 	}
-	
+
 	public void setStyles(PrintStyles styles) {
 		this.styles = styles;
 	}
-	
+
 	public ImageFormat getFormat() {
 		return this.format;
 	}
-	
+
 	public void setFormat(ImageFormat format) {
 		this.format = format;
 	}
-	
+
 	public String getPath() {
 		return this.path;
 	}
-	
+
 	public void setPath(String path) {
 		this.path = path;
 	}
-	
+
 	public PrintStyles getDefaultStyles(TGSong song){
 		PrintStyles styles = new PrintStyles();
 		styles.setStyle(TGLayout.DISPLAY_TABLATURE);
@@ -68,7 +70,8 @@ public PrintStyles getDefaultStyles(TGSong song){
 		styles.setBlackAndWhite(false);
 		return styles;
 	}
-	
+
+	@Override
 	public void exportSong(final TGSong song) {
 		if( this.path != null ){
 			if( this.styles == null ){
@@ -80,15 +83,16 @@ public void exportSong(final TGSong song) {
 			export(song);
 		}
 	}
-	
+
 	public void export(final TGSong song){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					TGSongManager manager = new TGSongManager();
 					manager.setFactory(new TGFactoryImpl());
 					manager.setSong(song.clone(manager.getFactory()));
-					
+
 					export(manager);
 				}catch(Throwable throwable){
 					MessageDialog.errorMessage(throwable);
@@ -96,16 +100,17 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void export(final TGSongManager manager){
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					TGResourceFactory factory = new TGResourceFactoryImpl(TuxGuitar.instance().getDisplay());
-					
+
 					PrintController controller = new PrintController(manager, factory);
 					PrintLayout layout = new PrintLayout(controller, getStyles());
-					
+
 					export(layout);
 				}catch(Throwable throwable){
 					MessageDialog.errorMessage(throwable);
@@ -113,9 +118,10 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void export(final PrintLayout layout){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					layout.loadStyles(1f);
@@ -127,47 +133,53 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	private class PrintDocumentImpl implements PrintDocument{
-		
+
 		private TGPainterImpl painter;
 		private TGRectangle bounds;
 		private String path;
 		private Image buffer;
-		private List pages;
+		private List<ImageData> pages;
 		private ImageFormat format;
-		
+
 		public PrintDocumentImpl(TGRectangle bounds, ImageFormat format, String path){
 			this.bounds = bounds;
 			this.path = path;
 			this.painter = new TGPainterImpl();
-			this.pages = new ArrayList();
+			this.pages = new ArrayList<ImageData>();
 			this.format = format;
 		}
-		
+
+		@Override
 		public TGPainter getPainter() {
 			return this.painter;
 		}
-		
+
+		@Override
 		public TGRectangle getBounds(){
 			return this.bounds;
 		}
-		
+
+		@Override
 		public void pageStart() {
 			this.buffer = new Image(TuxGuitar.instance().getDisplay(),this.bounds.getWidth() + (this.bounds.getX() * 2), this.bounds.getHeight() + (this.bounds.getY() * 2) );
 			this.painter.init( this.buffer );
 		}
-		
+
+		@Override
 		public void pageFinish() {
 			this.pages.add( this.buffer.getImageData() );
 			this.painter.dispose();
 			this.buffer.dispose();
 		}
-		
+
+		@Override
 		public void start() {
 			// Not implemented
 		}
-		
+
+		@Override
 		public void finish() {
 			try {
 				ImageWriter.write(this.format, this.path, this.pages);
@@ -175,7 +187,8 @@ public void finish() {
 				MessageDialog.errorMessage(throwable);
 			}
 		}
-		
+
+		@Override
 		public boolean isPaintable(int page) {
 			return true;
 		}
diff --git a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporterDialog.java b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporterDialog.java
similarity index 98%
rename from TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporterDialog.java
rename to plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporterDialog.java
index 9ce8bea6..39f16d61 100644
--- a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporterDialog.java
+++ b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporterDialog.java
@@ -21,9 +21,11 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class ImageExporterDialog extends ImageExporter {
-	
+
+	@Override
 	public void exportSong(final TGSong song) {
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					exportSongDialog(song, TuxGuitar.instance().getShell());
@@ -33,7 +35,7 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void exportSong(TGSong song, PrintStyles styles, ImageFormat format){
 		try{
 			DirectoryDialog dialog = new DirectoryDialog( TuxGuitar.instance().getShell() );
@@ -49,55 +51,55 @@ public void exportSong(TGSong song, PrintStyles styles, ImageFormat format){
 			return;
 		}
 	}
-	
+
 	public void exportSongDialog(final TGSong song, final Shell shell) {
 		final PrintStyles styles = getDefaultStyles(song) ;
-		
+
 		final Shell dialog = DialogUtils.newDialog(shell, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("options"));
-		
+
 		//------------------FORMAT SELECTION------------------
 		Group formatGroup = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		formatGroup.setLayout(new GridLayout(2,false));
 		formatGroup.setLayoutData(getGroupData());
 		formatGroup.setText(TuxGuitar.getProperty("tuxguitar-image.format"));
-		
+
 		Label formatLabel = new Label(formatGroup, SWT.NULL);
 		formatLabel.setText(TuxGuitar.getProperty("tuxguitar-image.format"));
-		
+
 		final Combo formatCombo = new Combo(formatGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		formatCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		for(int i = 0; i < ImageFormat.IMAGE_FORMATS.length; i ++){
 			formatCombo.add( ImageFormat.IMAGE_FORMATS[i].getName() );
 		}
 		formatCombo.select(0);
-		
+
 		//------------------TRACK SELECTION------------------
 		Group track = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		track.setLayout(new GridLayout(2,false));
 		track.setLayoutData(getGroupData());
 		track.setText(TuxGuitar.getProperty("track"));
-		
+
 		Label trackLabel = new Label(track, SWT.NULL);
 		trackLabel.setText(TuxGuitar.getProperty("track"));
-		
+
 		final Combo tracks = new Combo(track, SWT.DROP_DOWN | SWT.READ_ONLY);
 		tracks.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		for(int number = 1; number <= TuxGuitar.instance().getSongManager().getSong().countTracks(); number ++){
 			tracks.add(TuxGuitar.instance().getSongManager().getTrack(number).getName());
 		}
 		tracks.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber() - 1);
-		
+
 		//------------------MEASURE RANGE------------------
 		Group range = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		range.setLayout(new GridLayout(2,false));
 		range.setLayoutData(getGroupData());
 		range.setText(TuxGuitar.getProperty("print.range"));
-		
+
 		final int minSelection = 1;
 		final int maxSelection = TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders();
-		
+
 		Label fromLabel = new Label(range, SWT.NULL);
 		fromLabel.setText(TuxGuitar.getProperty("edit.from"));
 		final Spinner fromSpinner = new Spinner(range, SWT.BORDER);
@@ -105,7 +107,7 @@ public void exportSongDialog(final TGSong song, final Shell shell) {
 		fromSpinner.setMaximum(maxSelection);
 		fromSpinner.setMinimum(minSelection);
 		fromSpinner.setSelection(minSelection);
-		
+
 		Label toLabel = new Label(range, SWT.NULL);
 		toLabel.setText(TuxGuitar.getProperty("edit.to"));
 		final Spinner toSpinner = new Spinner(range, SWT.BORDER);
@@ -113,12 +115,13 @@ public void exportSongDialog(final TGSong song, final Shell shell) {
 		toSpinner.setMinimum(minSelection);
 		toSpinner.setMaximum(maxSelection);
 		toSpinner.setSelection(maxSelection);
-		
+
 		fromSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int fromSelection = fromSpinner.getSelection();
 				int toSelection = toSpinner.getSelection();
-				
+
 				if(fromSelection < minSelection){
 					fromSpinner.setSelection(minSelection);
 				}else if(fromSelection > toSelection){
@@ -127,6 +130,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		toSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int toSelection = toSpinner.getSelection();
 				int fromSelection = fromSpinner.getSelection();
@@ -142,28 +146,29 @@ public void widgetSelected(SelectionEvent e) {
 		options.setLayout(new GridLayout());
 		options.setLayoutData(getGroupData());
 		options.setText(TuxGuitar.getProperty("options"));
-		
+
 		final Button tablatureEnabled = new Button(options,SWT.CHECK);
 		tablatureEnabled.setText(TuxGuitar.getProperty("export.tablature-enabled"));
 		tablatureEnabled.setSelection(true);
-		
+
 		final Button scoreEnabled = new Button(options,SWT.CHECK);
 		scoreEnabled.setText(TuxGuitar.getProperty("export.score-enabled"));
 		scoreEnabled.setSelection(true);
-		
+
 		final Button chordNameEnabled = new Button(options,SWT.CHECK);
 		chordNameEnabled.setText(TuxGuitar.getProperty("export.chord-name-enabled"));
 		chordNameEnabled.setSelection(true);
-		
+
 		final Button chordDiagramEnabled = new Button(options,SWT.CHECK);
 		chordDiagramEnabled.setText(TuxGuitar.getProperty("export.chord-diagram-enabled"));
 		chordDiagramEnabled.setSelection(true);
-		
+
 		final Button blackAndWhite = new Button(options,SWT.CHECK);
 		blackAndWhite.setText(TuxGuitar.getProperty("export.black-and-white"));
 		blackAndWhite.setSelection(true);
-		
+
 		tablatureEnabled.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!tablatureEnabled.getSelection()){
 					scoreEnabled.setSelection(true);
@@ -171,28 +176,30 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		scoreEnabled.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!scoreEnabled.getSelection()){
 					tablatureEnabled.setSelection(true);
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int format = formatCombo.getSelectionIndex();
 				if( format < 0 || format >= ImageFormat.IMAGE_FORMATS.length ){
 					format = 0;
 				}
-				
+
 				int style = 0;
 				style |= (scoreEnabled.getSelection() ? TGLayout.DISPLAY_SCORE : 0);
 				style |= (tablatureEnabled.getSelection() ? TGLayout.DISPLAY_TABLATURE : 0);
@@ -203,41 +210,42 @@ public void widgetSelected(SelectionEvent arg0) {
 				styles.setToMeasure(toSpinner.getSelection());
 				styles.setBlackAndWhite(blackAndWhite.getSelection());
 				styles.setStyle(style);
-				
+
 				dialog.dispose();
-				
+
 				exportSong(song, styles, ImageFormat.IMAGE_FORMATS[ format ] );
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 	}
-	
+
 	private static GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private static GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 60;
 		return data;
 	}
-	
+
 	private static GridData getGroupData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 300;
diff --git a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporterPlugin.java b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporterPlugin.java
similarity index 90%
rename from TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporterPlugin.java
rename to plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporterPlugin.java
index eebd1a0f..3b3cd9d4 100644
--- a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageExporterPlugin.java
+++ b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageExporterPlugin.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class ImageExporterPlugin extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new ImageExporterDialog();
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "0.1";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Image exporter";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Image exporter";
 	}
diff --git a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageFormat.java b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageFormat.java
similarity index 98%
rename from TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageFormat.java
rename to plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageFormat.java
index f83a1f34..635e4904 100644
--- a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageFormat.java
+++ b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageFormat.java
@@ -3,31 +3,31 @@
 import org.eclipse.swt.SWT;
 
 public class ImageFormat {
-	
+
 	public final static ImageFormat[] IMAGE_FORMATS = new ImageFormat[] {
 		new ImageFormat( SWT.IMAGE_PNG , "PNG" , ".png" ),
 		new ImageFormat( SWT.IMAGE_JPEG , "JPEG" , ".jpg" ),
 		new ImageFormat( SWT.IMAGE_BMP , "BMP", ".bmp" ),
 	};
-	
+
 	private int format;
 	private String name;
 	private String extension;
-	
+
 	public ImageFormat(int format, String name, String extension){
 		this.format = format;
 		this.name = name;
 		this.extension = extension;
 	}
-	
+
 	public int getFormat() {
 		return this.format;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public String getExtension() {
 		return this.extension;
 	}
diff --git a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageWriter.java b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageWriter.java
similarity index 80%
rename from TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageWriter.java
rename to plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageWriter.java
index 3f18fb2c..a7be8bd4 100644
--- a/TuxGuitar-image/src/org/herac/tuxguitar/io/image/ImageWriter.java
+++ b/plugins/image/src/main/java/org/herac/tuxguitar/io/image/ImageWriter.java
@@ -10,16 +10,16 @@
 import org.herac.tuxguitar.io.base.TGFileFormatException;
 
 public class ImageWriter {
-	
-	public static void write(ImageFormat format, String path, List pages) throws TGFileFormatException {
+
+	public static void write(ImageFormat format, String path, List<ImageData> pages) throws TGFileFormatException {
 		try {
 			for(int i = 0; i < pages.size() ; i ++ ) {
 				OutputStream stream = new FileOutputStream(new File(path + File.separator + "page-" + i + format.getExtension() ));
-				
+
 				ImageLoader loader = new ImageLoader();
-				loader.data = new ImageData[] { (ImageData)pages.get(i) };
+				loader.data = new ImageData[] { pages.get(i) };
 				loader.save(stream, format.getFormat() );
-				
+
 				stream.flush();
 				stream.close();
 			}
diff --git a/TuxGuitar-image/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/image/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-image/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/image/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-image/share/lang/messages.properties b/plugins/image/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-image/share/lang/messages.properties
rename to plugins/image/src/main/resources/lang/messages.properties
diff --git a/plugins/jack/pom.xml b/plugins/jack/pom.xml
new file mode 100644
index 00000000..395d88f4
--- /dev/null
+++ b/plugins/jack/pom.xml
@@ -0,0 +1,143 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-jack</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: JACK</name>
+	<description>JACK plugin for TuxGuitar</description>
+
+	<!-- TODO clean up, this pom is full of hack, if there is something cleaner, with only 1 pom, it is welcome -->
+	<build>
+
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+		<plugins>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile java files -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- package the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${version}</finalName>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- install .jar as an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>jar-artefact</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+									<type>jar</type>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared</linkerStartOption>
+					</linkerStartOptions>
+					<linkerEndOptions>
+						<linkerEndOption>-ljack</linkerEndOption>
+					</linkerEndOptions>
+					<!-- easy way to package the shared lib with jar -->
+					<linkerOutputDirectory>${project.build.directory}/classes</linkerOutputDirectory>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.herac.tuxguitar</groupId>
+			<artifactId>tuxguitar-app</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackClient.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/JackClient.java
similarity index 94%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackClient.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/JackClient.java
index b88f835a..b3d534fd 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackClient.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/JackClient.java
@@ -1,38 +1,42 @@
 package org.herac.tuxguitar.jack;
 
+import org.herac.tuxguitar.util.JNILibraryLoader;
+
+
 public class JackClient{
-	
-	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-jack-jni");
-	
-	static{
-		System.loadLibrary(JNI_LIBRARY_NAME);
-	}
-	
+
+	private static final String JNI_LIBRARY_NAME = "tuxguitar-jack";
+
 	private long instance;
 	private boolean open;
 	private boolean openPorts;
 	private boolean openTransport;
-	
+
+	static {
+		JNILibraryLoader.loadLibrary(JNI_LIBRARY_NAME);
+	}
+
 	public JackClient() {
 		this.instance = malloc();
 		this.open = false;
 		this.openPorts = false;
 	}
-	
+
+	@Override
 	public void finalize(){
 		if(this.instance != 0 ){
 			this.free(this.instance);
 			this.instance = 0;
 		}
 	}
-	
+
 	private void open(){
 		if(this.instance != 0 && !this.open){
 			this.open(this.instance);
 			this.open = true;
 		}
 	}
-	
+
 	private void close( boolean force ){
 		if( force ){
 			this.closePorts();
@@ -45,19 +49,19 @@ private void close( boolean force ){
 			}
 		}
 	}
-	
+
 	public void close(){
 		this.close( true );
 	}
-	
+
 	public boolean isOpen(){
 		return (this.instance != 0 && this.open);
 	}
-	
+
 	public boolean isPortsOpen(){
 		return (this.isOpen() && this.openPorts);
 	}
-	
+
 	public void openPorts(int count){
 		if(!this.isOpen()){
 			this.open();
@@ -67,7 +71,7 @@ public void openPorts(int count){
 			this.openPorts = true;
 		}
 	}
-	
+
 	public void closePorts(){
 		if(this.isOpen() && this.openPorts){
 			this.closePorts(this.instance);
@@ -75,11 +79,11 @@ public void closePorts(){
 		}
 		this.close( false );
 	}
-	
+
 	public boolean isTransportOpen(){
 		return (this.isOpen() && this.openTransport);
 	}
-	
+
 	public void openTransport(){
 		if(!this.isOpen()){
 			this.open();
@@ -88,66 +92,66 @@ public void openTransport(){
 			this.openTransport = true;
 		}
 	}
-	
+
 	public void closeTransport(){
 		if(this.isOpen() && this.openTransport){
 			this.openTransport = false;
 		}
 		this.close( false );
 	}
-	
+
 	public void addEventToQueue( int port , byte[] data){
 		if(this.instance != 0 && this.open){
 			this.addEventToQueue(this.instance, port, data );
 		}
 	}
-	
+
 	public long getTransportUID(){
 		if(this.instance != 0 && this.open){
 			return this.getTransportUID(this.instance);
 		}
 		return 0;
 	}
-	
+
 	public long getTransportFrame(){
 		if(this.instance != 0 && this.open){
 			return this.getTransportFrame(this.instance);
 		}
 		return 0;
 	}
-	
+
 	public long getTransportFrameRate(){
 		if(this.instance != 0 && this.open){
 			return this.getTransportFrameRate(this.instance);
 		}
 		return 0;
 	}
-	
+
 	public void setTransportFrame( long frame ){
 		if(this.instance != 0 && this.open){
 			this.setTransportFrame(this.instance, frame );
 		}
 	}
-	
+
 	public void setTransportStart(){
 		if(this.instance != 0 && this.open){
 			this.setTransportStart(this.instance);
 		}
 	}
-	
+
 	public void setTransportStop(){
 		if(this.instance != 0 && this.open){
 			this.setTransportStop(this.instance);
 		}
 	}
-	
+
 	public boolean isTransportRunning(){
 		if(this.instance != 0 && this.open){
 			return this.isTransportRunning(this.instance);
 		}
 		return false;
 	}
-	
+
 	public boolean isServerRunning(){
 		if(this.instance != 0 && this.open){
 			if( this.isServerRunning(this.instance) ){
@@ -157,34 +161,34 @@ public boolean isServerRunning(){
 		}
 		return false;
 	}
-	
+
 	private native long malloc();
-	
+
 	private native void free(long instance);
-	
+
 	private native void open(long instance);
-	
+
 	private native void close(long instance);
-	
+
 	private native void openPorts(long instance, int count);
-	
+
 	private native void closePorts(long instance);
-	
+
 	private native long getTransportUID(long instance);
-	
+
 	private native long getTransportFrame(long instance);
-	
+
 	private native long getTransportFrameRate(long instance);
-	
+
 	private native void setTransportFrame(long instance, long frame);
-	
+
 	private native void setTransportStart(long instance);
-	
+
 	private native void setTransportStop(long instance);
-	
+
 	private native boolean isTransportRunning(long instance);
-	
+
 	private native boolean isServerRunning(long instance);
-	
+
 	private native void addEventToQueue(long instance, int port, byte[] data);
 }
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackPluginImpl.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/JackPluginImpl.java
similarity index 82%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackPluginImpl.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/JackPluginImpl.java
index b466e697..60b17ead 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/JackPluginImpl.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/JackPluginImpl.java
@@ -4,6 +4,7 @@
 import java.util.List;
 
 import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
 import org.herac.tuxguitar.app.system.plugins.TGPluginException;
 import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
@@ -13,45 +14,51 @@
 import org.herac.tuxguitar.jack.synthesizer.JackOutputPortProviderPlugin;
 
 public class JackPluginImpl extends TGPluginList implements TGPluginSetup {
-	
-	private JackClient jackClient;
-	private JackSettings jackSettings;
-	
+
+	private final JackClient jackClient;
+	private final JackSettings jackSettings;
+
 	public JackPluginImpl(){
 		this.jackClient = new JackClient();
 		this.jackSettings = new JackSettings();
 	}
-	
-	protected List getPlugins() throws TGPluginException {
-		List plugins = new ArrayList();
+
+	@Override
+	protected List<TGPlugin> getPlugins() throws TGPluginException {
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
 		plugins.add( new JackOutputPortProviderPlugin(this.jackClient , this.jackSettings) );
 		plugins.add( new JackSequencerProviderPlugin(this.jackClient) );
 		return plugins;
 	}
-	
+
 	public void closeAll(){
 		if(this.jackClient.isOpen()){
 			this.jackClient.close();
 			this.jackClient.finalize();
 		}
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Jack Audio Connection Kit plugin support";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Jack Audio Connection Kit plugin support";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
-	
+
+	@Override
 	public void setupDialog(Shell parent){
 		JackSettingsDialog jackSettingsDialog = new JackSettingsDialog( this.jackSettings );
 		jackSettingsDialog.open( parent );
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEvent.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEvent.java
similarity index 98%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEvent.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEvent.java
index b18554bb..877c1841 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEvent.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEvent.java
@@ -1,72 +1,72 @@
 package org.herac.tuxguitar.jack.sequencer;
 
 public class JackEvent {
-	
+
 	public static final int ALL_TRACKS = -1;
-	
+
 	public static final int MIDI_SYSTEM_EVENT = 1;
 	public static final int MIDI_EVENT_NOTEON = 2;
 	public static final int MIDI_EVENT_NOTEOFF = 3;
 	public static final int MIDI_EVENT_PROGRAM_CHANGE = 4;
 	public static final int MIDI_EVENT_CONTROL_CHANGE = 5;
 	public static final int MIDI_EVENT_PITCH_BEND = 6;
-	
+
 	private long tick;
 	private int type;
 	private int track;
 	private byte[] data;
-	
+
 	public JackEvent(long tick,int type,byte[] data){
 		this(tick,type,ALL_TRACKS,data);
 	}
-	
+
 	public JackEvent(long tick,int type,int track,byte[] data){
 		this.tick = tick;
 		this.type = type;
 		this.track = track;
 		this.data = data;
 	}
-	
+
 	public long getTick() {
 		return this.tick;
 	}
-	
+
 	public int getType() {
 		return this.type;
 	}
-	
+
 	public int getTrack() {
 		return this.track;
 	}
-	
+
 	public byte[] getData() {
 		return this.data;
 	}
-	
+
 	public static JackEvent systemReset(final long tick){
 		return new JackEvent(tick,MIDI_SYSTEM_EVENT,ALL_TRACKS,null);
 	}
-	
+
 	public static JackEvent noteOn(final long tick,final int track,final int channel,final int key,final int velocity){
 		return new JackEvent(tick,MIDI_EVENT_NOTEON,track,new byte[]{(byte)channel,(byte)key,(byte)velocity});
 	}
-	
+
 	public static JackEvent noteOff(final long tick,final int track,final int channel,final int key,final int velocity){
 		return new JackEvent(tick,MIDI_EVENT_NOTEOFF,track,new byte[]{(byte)channel,(byte)key,(byte)velocity});
 	}
-	
+
 	public static JackEvent controlChange(final long tick,final int track,final int channel,final int controller,final int value){
 		return new JackEvent(tick,MIDI_EVENT_CONTROL_CHANGE,track,new byte[]{(byte)channel,(byte)controller,(byte)value});
 	}
-	
+
 	public static JackEvent programChange(final long tick,final int track,final int channel,final int value){
 		return new JackEvent(tick,MIDI_EVENT_PROGRAM_CHANGE,track,new byte[]{(byte)channel,(byte)value});
 	}
-	
+
 	public static JackEvent pitchBend(final long tick,final int track,final int channel,final int value){
 		return new JackEvent(tick,MIDI_EVENT_PITCH_BEND,track,new byte[]{(byte)channel,(byte)value});
 	}
-	
+
 	public static JackEvent tempoInUSQ(final long tick,final int usq){
 		return new JackEvent(tick,MIDI_SYSTEM_EVENT,new byte[]{0x51,(byte) (usq & 0xff),(byte) ((usq >> 8) & 0xff),(byte) ((usq >> 16) & 0xff)});
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventController.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEventController.java
similarity index 88%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventController.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEventController.java
index 2e51d964..a9e8e912 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventController.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEventController.java
@@ -8,30 +8,30 @@
 
 public class JackEventController{
 	private JackSequencer sequencer;
-	private List events;
-	
+	private List<JackEvent> events;
+
 	private double tick;
 	private double lastTick;
 	private boolean reset;
-	
+
 	public JackEventController(JackSequencer sequencer){
 		this.sequencer = sequencer;
-		this.events = new ArrayList();
+		this.events = new ArrayList<JackEvent>();
 		this.reset();
 	}
-	
+
 	public void process() throws MidiPlayerException {
 		this.lastTick = this.tick;
 		this.tick = this.sequencer.getJackTickController().getTick();
 		for(int i = 0;i < this.events.size();i ++){
-			JackEvent event = (JackEvent)this.events.get(i);
+			JackEvent event = this.events.get(i);
 			if(shouldSend(event,this.tick,this.lastTick)){
 				this.sequencer.sendEvent(event);
 			}
 		}
 		this.reset = false;
 	}
-	
+
 	private boolean shouldSend(JackEvent event,double tick,double lastTick){
 		if(event.getTick() > tick){
 			return false;
@@ -57,28 +57,28 @@ private boolean shouldSend(JackEvent event,double tick,double lastTick){
 		}
 		return (event.getTick() > lastTick);
 	}
-	
-	public List getEvents(){
+
+	public List<JackEvent> getEvents(){
 		return this.events;
 	}
-	
+
 	public void addEvent(JackEvent event){
 		this.events.add(event);
 	}
-	
+
 	public void clearEvents(){
 		this.events.clear();
 	}
-	
+
 	public void reset(){
 		this.tick = (this.sequencer.getTickPosition() - (TGDuration.QUARTER_TIME / 8) );
 		this.reset = true;
 	}
-	
-	public List getTempoChanges(){
-		List tempoChanges = new ArrayList();
+
+	public List<long[]> getTempoChanges(){
+		List<long[]> tempoChanges = new ArrayList<long[]>();
 		for(int i = 0; i < this.events.size(); i ++){
-			JackEvent event = (JackEvent) events.get(i);				
+			JackEvent event = events.get(i);
 			if(event.getType() == JackEvent.MIDI_SYSTEM_EVENT){
 				if(event.getData()[0] == 0x51){
 					int usq = ((event.getData()[1] & 0xff) | ((event.getData()[2] & 0xff) << 8) | ((event.getData()[3] & 0xff) << 16));
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java
similarity index 99%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java
index ed348545..ab656214 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackEventDispacher.java
@@ -4,11 +4,11 @@
 
 public class JackEventDispacher{
 	private JackSequencer sequencer;
-	
+
 	public JackEventDispacher(JackSequencer sequencer){
 		this.sequencer = sequencer;
 	}
-	
+
 	public void dispatch(JackEvent event) throws MidiPlayerException{
 		if(event.getType() == JackEvent.MIDI_EVENT_NOTEON){
 			this.sequencer.getTransmitter().sendNoteOn(event.getData()[0],event.getData()[1],event.getData()[2]);
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackMidiPlayerStarter.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackMidiPlayerStarter.java
similarity index 95%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackMidiPlayerStarter.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackMidiPlayerStarter.java
index 8e0f3e88..c1da2b45 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackMidiPlayerStarter.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackMidiPlayerStarter.java
@@ -5,52 +5,57 @@
 import org.herac.tuxguitar.player.base.MidiPlayerListener;
 
 public class JackMidiPlayerStarter implements MidiPlayerListener{
-	
+
 	private JackSequencer jackSequencer;
 	private boolean countDownByPass;
-	
+
 	public JackMidiPlayerStarter(JackSequencer jackSequencer){
 		this.jackSequencer = jackSequencer;
 	}
-	
+
 	private MidiPlayer getPlayer(){
 		return TuxGuitar.instance().getPlayer();
 	}
-	
+
 	public void open(){
 		getPlayer().addListener(this);
 	}
-	
+
 	public void close(){
 		getPlayer().removeListener(this);
 	}
-	
+
 	public void start(){
 		TuxGuitar.instance().getTransport().play();
 	}
-	
+
+	@Override
 	public void notifyCountDownStarted() {
 		this.countDownByPass = (this.jackSequencer.getJackClient().isTransportRunning() && getPlayer().getCountDown().isEnabled());
 		if( this.countDownByPass ){
 			this.getPlayer().getCountDown().setEnabled( false );
 		}
 	}
-	
+
+	@Override
 	public void notifyCountDownStopped() {
 		if( this.countDownByPass ){
 			this.countDownByPass = false;
 			this.getPlayer().getCountDown().setEnabled( true );
 		}
 	}
-	
+
+	@Override
 	public void notifyStarted() {
 		// TODO Auto-generated method stub
 	}
-	
+
+	@Override
 	public void notifyStopped() {
 		// TODO Auto-generated method stub
 	}
-	
+
+	@Override
 	public void notifyLoop() {
 		// TODO Auto-generated method stub
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java
similarity index 93%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java
index fa58af59..42591b15 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequenceHandler.java
@@ -4,43 +4,51 @@
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 
 public class JackSequenceHandler extends MidiSequenceHandler{
-	
+
 	private JackSequencer seq;
-	
+
 	public JackSequenceHandler(JackSequencer seq,int tracks) {
 		super(tracks);
 		this.seq = seq;
 		this.seq.getJackTrackController().init(getTracks());
 	}
-	
+
+	@Override
 	public void addControlChange(long tick,int track,int channel, int controller, int value) {
 		this.seq.addEvent(JackEvent.controlChange(tick, track, channel, controller, value));
 	}
-	
+
+	@Override
 	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
 		this.seq.addEvent(JackEvent.noteOff(tick, track, channel, note, velocity));
 	}
-	
+
+	@Override
 	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
 		this.seq.addEvent(JackEvent.noteOn(tick, track, channel, note, velocity));
 	}
-	
+
+	@Override
 	public void addPitchBend(long tick,int track,int channel, int value) {
 		this.seq.addEvent(JackEvent.pitchBend(tick, track, channel, value));
 	}
-	
+
+	@Override
 	public void addProgramChange(long tick,int track,int channel, int instrument) {
 		this.seq.addEvent(JackEvent.programChange(tick, track, channel, instrument));
 	}
-	
+
+	@Override
 	public void addTempoInUSQ(long tick,int track,int usq) {
 		this.seq.addEvent(JackEvent.tempoInUSQ(tick, usq));
 	}
-	
+
+	@Override
 	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
 		//not implemented
 	}
-	
+
+	@Override
 	public void notifyFinish(){
 		//not implemented
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencer.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencer.java
similarity index 97%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencer.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencer.java
index 2c4f03e4..696fe057 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencer.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencer.java
@@ -7,7 +7,7 @@
 import org.herac.tuxguitar.player.base.MidiTransmitter;
 
 public class JackSequencer implements MidiSequencer{
-	
+
 	private long transportUID;
 	private long transportTryCount;
 	private long transportTryNumber;
@@ -25,7 +25,7 @@ public class JackSequencer implements MidiSequencer{
 	private JackTimer jackTimer;
 	private JackClient jackClient;
 	private JackMidiPlayerStarter jackMidiPlayerStarter;
-	
+
 	public JackSequencer(JackClient jackClient){
 		this.stopped = true;
 		this.running = false;
@@ -42,69 +42,74 @@ public JackSequencer(JackClient jackClient){
 		this.jackTimer = new JackTimer(this);
 		this.jackMidiPlayerStarter = new JackMidiPlayerStarter(this);
 	}
-	
+
 	public JackClient getJackClient(){
 		return this.jackClient;
 	}
-	
+
 	public JackTickController getJackTickController(){
 		return this.jackTickController;
 	}
-	
+
 	public JackEventController getJackEventController(){
 		return this.jackEventController;
 	}
-	
+
 	public JackTrackController getJackTrackController(){
 		return this.jackTrackController;
 	}
-	
+
 	public void setTempo(int tempo){
 		this.jackTickController.setTempo(tempo);
 	}
-	
+
+	@Override
 	public long getTickPosition(){
 		return Math.round(this.jackTickController.getTick());
 	}
-	
+
+	@Override
 	public void setTickPosition(long tickPosition){
 		this.setTickPosition(tickPosition, !this.transportLockTick );
 		this.transportLockTick = false;
 	}
-	
+
 	public void setTickPosition(long tickPosition, boolean transportUpdate ){
 		this.reset = true;
 		this.jackTickController.setTick(tickPosition , transportUpdate);
 	}
-	
+
+	@Override
 	public long getTickLength(){
 		return this.jackTickController.getTickLength();
 	}
-	
+
 	public void sendEvent(JackEvent event) throws MidiPlayerException{
 		if(!this.reset){
 			this.jackEventDispacher.dispatch(event);
 		}
 	}
-	
+
 	public void addEvent(JackEvent event){
 		this.jackEventController.addEvent(event);
 		this.jackTickController.notifyTick(event.getTick());
 	}
-	
+
 	public void clearEvents() {
 		this.jackEventController.clearEvents();
 		this.jackTickController.clearTick();
 	}
-	
+
+	@Override
 	public boolean isRunning() {
 		return this.running;
 	}
-	
+
+	@Override
 	public void start() throws MidiPlayerException{
 		this.start( true );
 	}
-	
+
 	public void start( boolean startTransport ) throws MidiPlayerException{
 		synchronized ( this.jackLock ) {
 			if(!this.running ){
@@ -116,11 +121,12 @@ public void start( boolean startTransport ) throws MidiPlayerException{
 			}
 		}
 	}
-	
+
+	@Override
 	public void stop() throws MidiPlayerException{
 		this.stop( true );
 	}
-	
+
 	public void stop( boolean stopTransport ) throws MidiPlayerException{
 		synchronized ( this.jackLock ) {
 			if( this.running ){
@@ -131,7 +137,7 @@ public void stop( boolean stopTransport ) throws MidiPlayerException{
 			}
 		}
 	}
-	
+
 	public void stopAndClearEvents() throws MidiPlayerException{
 		synchronized ( this.jackLock ) {
 			this.stop( true );
@@ -140,14 +146,14 @@ public void stopAndClearEvents() throws MidiPlayerException{
 			this.stopped = true;
 		}
 	}
-	
+
 	public void reset()  throws MidiPlayerException{
 		this.getTransmitter().sendAllNotesOff();
 		for(int channel = 0; channel < 16;channel ++){
 			this.getTransmitter().sendPitchBend(channel, 64);
 		}
 	}
-	
+
 	protected void startPlayer(){
 		// Make sure sequencer was already initialized.
 		if( this.transmitter != null ){
@@ -155,15 +161,17 @@ protected void startPlayer(){
 			this.jackMidiPlayerStarter.start();
 		}
 	}
-	
+
 	public MidiTransmitter getTransmitter() {
 		return this.transmitter;
 	}
-	
+
+	@Override
 	public void setTransmitter(MidiTransmitter transmitter) {
 		this.transmitter = transmitter;
 	}
-	
+
+	@Override
 	public void open() {
 		if(!this.jackClient.isTransportOpen() ){
 			this.jackClient.openTransport();
@@ -171,7 +179,8 @@ public void open() {
 		this.jackMidiPlayerStarter.open();
 		this.jackTimer.setRunning( true );
 	}
-	
+
+	@Override
 	public void close() throws MidiPlayerException {
 		this.jackTimer.setRunning( false );
 		if(this.isRunning()){
@@ -182,7 +191,8 @@ public void close() throws MidiPlayerException {
 			this.jackClient.closeTransport();
 		}
 	}
-	
+
+	@Override
 	public void check() throws MidiPlayerException {
 		if( !this.jackClient.isServerRunning() || !this.jackClient.isTransportOpen() ){
 			this.open();
@@ -191,33 +201,38 @@ public void check() throws MidiPlayerException {
 			}
 		}
 	}
-	
+
+	@Override
 	public MidiSequenceHandler createSequence(int tracks) throws MidiPlayerException{
 		this.stopAndClearEvents();
-		
+
 		return new JackSequenceHandler(this,tracks);
 	}
-	
+
+	@Override
 	public void setSolo(int index,boolean solo) throws MidiPlayerException{
 		this.getJackTrackController().setSolo(index, solo);
 	}
-	
+
+	@Override
 	public void setMute(int index,boolean mute) throws MidiPlayerException{
 		this.getJackTrackController().setMute(index, mute);
 	}
-	
+
+	@Override
 	public String getKey() {
 		return "tuxguitar-jack";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Jack Sequencer";
 	}
-	
+
 	protected void process() throws MidiPlayerException{
 		synchronized ( this.jackLock ) {
 			boolean transportRunning = this.jackClient.isTransportRunning();
-			
+
 			// Check if transport was started
 			if( transportRunning && !this.transportRunning && !this.running ){
 				this.startPlayer();
@@ -255,28 +270,29 @@ else if(!this.stopped){
 			this.transportRunning = transportRunning;
 		}
 	}
-	
+
 	private class JackTimer implements Runnable{
-		
+
 		private static final int TIMER_DELAY = 10;
-		
+
 		private Object sequencerSync;
 		private JackSequencer sequencer;
 		private boolean running;
-		
+
 		public JackTimer(JackSequencer sequencer){
 			this.sequencerSync = new Object();
 			this.sequencer = sequencer;
 			this.running = false;
 		}
-		
+
 		public void setRunning( boolean running ){
 			this.running = running;
 			if( this.running ){
 				new Thread( this ).start();
 			}
 		}
-		
+
+		@Override
 		public void run() {
 			try {
 				synchronized(this.sequencerSync) {
diff --git a/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java
new file mode 100644
index 00000000..57bd97b3
--- /dev/null
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencerProvider.java
@@ -0,0 +1,39 @@
+package org.herac.tuxguitar.jack.sequencer;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.herac.tuxguitar.jack.JackClient;
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+import org.herac.tuxguitar.player.base.MidiSequencer;
+import org.herac.tuxguitar.player.base.MidiSequencerProvider;
+
+public class JackSequencerProvider implements MidiSequencerProvider{
+
+	private List<MidiSequencer> jackSequencerProviders;
+	private final JackClient jackClient;
+
+	public JackSequencerProvider(JackClient jackClient){
+		this.jackClient = jackClient;
+	}
+
+	@Override
+	public List<MidiSequencer> listSequencers() throws MidiPlayerException {
+		if(this.jackSequencerProviders == null){
+			this.jackSequencerProviders = new ArrayList<MidiSequencer>();
+			this.jackSequencerProviders.add(new JackSequencer(this.jackClient));
+		}
+		return this.jackSequencerProviders;
+	}
+
+	@Override
+	public void closeAll() throws MidiPlayerException {
+		Iterator<MidiSequencer> it = listSequencers().iterator();
+		while(it.hasNext()){
+			MidiSequencer sequencer = it.next();
+			sequencer.close();
+		}
+	}
+
+}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java
similarity index 98%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java
index 988bf8d4..952c50d7 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackSequencerProviderPlugin.java
@@ -6,17 +6,18 @@
 import org.herac.tuxguitar.player.base.MidiSequencerProvider;
 
 public class JackSequencerProviderPlugin extends TGMidiSequencerProviderPlugin {
-	
+
 	private MidiSequencerProvider jackSequencerProvider;
-	
+
 	public JackSequencerProviderPlugin(){
 		this(new JackClient());
 	}
-	
+
 	public JackSequencerProviderPlugin(JackClient jackClient){
 		this.jackSequencerProvider = new JackSequencerProvider( jackClient );
 	}
-	
+
+	@Override
 	protected MidiSequencerProvider getProvider() throws TGPluginException {
 		return this.jackSequencerProvider;
 	}
diff --git a/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTickController.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTickController.java
new file mode 100644
index 00000000..f8adb5d7
--- /dev/null
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTickController.java
@@ -0,0 +1,148 @@
+package org.herac.tuxguitar.jack.sequencer;
+
+import java.util.List;
+
+import org.herac.tuxguitar.jack.JackClient;
+import org.herac.tuxguitar.song.models.TGDuration;
+
+public class JackTickController {
+
+	private static final int TRANSPORT_FRAME_WAIT_TIME = 10;
+	private static final int TRANSPORT_FRAME_WAIT_COUNT = 10;
+
+	private int tempo;
+	private long frame;
+	private long lastFrame;
+	private long tickLength;
+	private double tick;
+
+	private final Object lock;
+	private final JackSequencer sequencer;
+
+	public JackTickController(JackSequencer sequencer){
+		this.lock = new Object();
+		this.sequencer = sequencer;
+	}
+
+	public void process() {
+		synchronized (this.lock) {
+			long frameRate = this.sequencer.getJackClient().getTransportFrameRate();
+			this.lastFrame = this.frame;
+			this.frame = this.sequencer.getJackClient().getTransportFrame();
+			this.tick += (TGDuration.QUARTER_TIME * ((double)getTempo() * (double)(this.frame - this.lastFrame) / 60.00) / frameRate);
+		}
+	}
+
+	public void setTick(long tick , boolean updateTransport ) {
+		synchronized (this.lock) {
+			long frameRate = this.sequencer.getJackClient().getTransportFrameRate();
+			if( updateTransport ){
+				this.setTransportFrame(Math.round( tickToFrame(tick, frameRate )));
+			}
+			this.frame = this.sequencer.getJackClient().getTransportFrame();
+			this.tick = this.frameToTick( this.frame , frameRate );
+		}
+	}
+
+	public double getTick() {
+		return this.tick;
+	}
+
+	public long getTickLength() {
+		return this.tickLength;
+	}
+
+	public void clearTick(){
+		this.tickLength = 0;
+	}
+
+	public void notifyTick(long tick){
+		this.tickLength = Math.max(this.tickLength,tick);
+	}
+
+	public void setTempo(int tempo) {
+		this.tempo = tempo;
+	}
+
+	public int getTempo() {
+		return this.tempo;
+	}
+
+	public void setTransportFrame( long frame ){
+		JackClient jackClient = this.sequencer.getJackClient();
+		jackClient.setTransportFrame( frame );
+		try{
+			Object transportFrameLock = new Object();
+
+			int tryIndex = 0;
+			int tryCount = TRANSPORT_FRAME_WAIT_COUNT;
+			while(!jackClient.isTransportRunning() && jackClient.getTransportFrame() != frame && (tryIndex++ < tryCount)){
+				synchronized (transportFrameLock) {
+					transportFrameLock.wait(TRANSPORT_FRAME_WAIT_TIME);
+				}
+			}
+		}catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	public double frameToTick( long frame , long frameRate ){
+		double framePos = 0;
+		double tempo = 120;
+		double tick = TGDuration.QUARTER_TIME;
+
+		List<long[]> tempoChanges = this.sequencer.getJackEventController().getTempoChanges();
+		for(int i = 0; i < tempoChanges.size(); i ++){
+			long[] tc = tempoChanges.get(i);
+			double tcTick = tc[0];
+			double tcValue = tc[1];
+
+			double tickFrames = ( ((frameRate * (tcTick - tick)) / TGDuration.QUARTER_TIME ) * (60.00 / tempo) );
+			if( framePos + tickFrames <= frame ){
+				framePos += tickFrames;
+				tempo = tcValue;
+				tick = tcTick;
+			}else{
+				break;
+			}
+		}
+		if( frame > framePos ){
+			double timeFrame = ( ( (frame - framePos) / frameRate ) * 1000.00 );
+			double timeTick =  ( ( timeFrame * TGDuration.QUARTER_TIME ) / 1000.00 );
+
+			tick += ( timeTick * ( tempo / 60.00 ) );
+		}
+
+		return tick;
+	}
+
+	public double tickToFrame( long tick , long frameRate ){
+		double tickPos = TGDuration.QUARTER_TIME;
+		double tempo = 120;
+		double frame = 0;
+
+		List<long[]> tempoChanges = this.sequencer.getJackEventController().getTempoChanges();
+		for(int i = 0; i < tempoChanges.size(); i ++){
+			long[] tc = tempoChanges.get(i);
+			double tcTick = tc[0];
+			double tcValue = tc[1];
+
+			double tickFrames = (((frameRate * (tcTick - tickPos)) / TGDuration.QUARTER_TIME ) * (60.00 / tempo));
+			if( tcTick <= tick ){
+				frame += tickFrames;
+				tempo = tcValue;
+				tickPos = tcTick;
+			}else{
+				break;
+			}
+		}
+		if( tick > tickPos ){
+			double timeTick = ( ( ( tick - tickPos ) / TGDuration.QUARTER_TIME ) * 1000.00 );
+			double timeFrame = ( ( timeTick * frameRate ) / 1000.00 );
+
+			frame += (timeFrame * ( 60.00 / tempo));
+		}
+
+		return frame;
+	}
+}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrack.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTrack.java
similarity index 97%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrack.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTrack.java
index 0bb486c2..6affff28 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrack.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTrack.java
@@ -1,27 +1,27 @@
 package org.herac.tuxguitar.jack.sequencer;
 
 public class JackTrack {
-	
+
 	private boolean solo;
 	private boolean mute;
-	
+
 	public JackTrack(){
 		this.solo = false;
 		this.mute = false;
 	}
-	
+
 	public boolean isMute() {
 		return this.mute;
 	}
-	
+
 	public void setMute(boolean mute) {
 		this.mute = mute;
 	}
-	
+
 	public boolean isSolo() {
 		return this.solo;
 	}
-	
+
 	public void setSolo(boolean solo) {
 		this.solo = solo;
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrackController.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTrackController.java
similarity index 81%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrackController.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTrackController.java
index 5a606099..30cec633 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/sequencer/JackTrackController.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/sequencer/JackTrackController.java
@@ -6,43 +6,43 @@
 import org.herac.tuxguitar.player.base.MidiPlayerException;
 
 public class JackTrackController {
-	
-	
-	private List tracks;
+
+
+	private List<JackTrack> tracks;
 	private JackSequencer sequencer;
 	private boolean anySolo;
-	
+
 	public JackTrackController(JackSequencer sequencer){
 		this.sequencer = sequencer;
-		this.tracks = new ArrayList();
+		this.tracks = new ArrayList<JackTrack>();
 		this.anySolo = false;
 	}
-	
+
 	public void init(int count){
 		this.tracks.clear();
 		for(int i = 0; i < count; i ++){
 			this.tracks.add(new JackTrack());
 		}
 	}
-	
+
 	public void clearTracks(){
 		this.tracks.clear();
 	}
-	
+
 	public void checkAnySolo(){
 		this.anySolo = false;
 		for(int i = 0; i < this.tracks.size(); i ++){
-			JackTrack track = (JackTrack)this.tracks.get(i);
+			JackTrack track = this.tracks.get(i);
 			if(track.isSolo()){
 				this.anySolo = true;
 				break;
 			}
 		}
 	}
-	
+
 	public void setSolo(int index,boolean solo) throws MidiPlayerException{
 		if(index >= 0 && index < this.tracks.size()){
-			JackTrack track = (JackTrack)this.tracks.get(index);
+			JackTrack track = this.tracks.get(index);
 			track.setSolo(solo);
 			checkAnySolo();
 			if(track.isSolo()){
@@ -51,10 +51,10 @@ public void setSolo(int index,boolean solo) throws MidiPlayerException{
 			}
 		}
 	}
-	
+
 	public void setMute(int index,boolean mute) throws MidiPlayerException{
 		if(index >= 0 && index < this.tracks.size()){
-			JackTrack track = (JackTrack)this.tracks.get(index);
+			JackTrack track = this.tracks.get(index);
 			track.setMute(mute);
 			if(track.isMute()){
 				setSolo(index,false);
@@ -62,23 +62,23 @@ public void setMute(int index,boolean mute) throws MidiPlayerException{
 			}
 		}
 	}
-	
+
 	public boolean isSolo(int index){
 		if(index >= 0 && index < this.tracks.size()){
-			JackTrack track = (JackTrack)this.tracks.get(index);
+			JackTrack track = this.tracks.get(index);
 			return track.isSolo();
 		}
 		return false;
 	}
-	
+
 	public boolean isMute(int index){
 		if(index >= 0 && index < this.tracks.size()){
-			JackTrack track = (JackTrack)this.tracks.get(index);
+			JackTrack track = this.tracks.get(index);
 			return track.isMute();
 		}
 		return false;
 	}
-	
+
 	public boolean isAnySolo(){
 		return this.anySolo;
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettings.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettings.java
similarity index 81%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettings.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettings.java
index f0026ea1..bc4fc3bb 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettings.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettings.java
@@ -8,42 +8,42 @@
 import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
 
 public class JackSettings {
-	
-	private List listeners;
+
+	private List<JackSettingsListener> listeners;
 	private TGConfigManager config;
-	
+
 	public JackSettings(){
-		this.listeners = new ArrayList();
+		this.listeners = new ArrayList<JackSettingsListener>();
 		this.config = new TGPluginConfigManager("tuxguitar-jack");
 		this.config.init();
 	}
-	
+
 	public TGConfigManager getConfig(){
 		return this.config;
 	}
-	
+
 	public void notifyChanges(){
 		this.getConfig().save();
 		this.getConfig().load();
 		this.fireListeners();
 	}
-	
+
 	public void addListener(JackSettingsListener listener){
 		if( !this.listeners.contains( listener ) ){
 			this.listeners.add( listener );
 		}
 	}
-	
+
 	public void removeListener(JackSettingsListener listener){
 		if( this.listeners.contains( listener ) ){
 			this.listeners.remove( listener );
 		}
 	}
-	
+
 	public void fireListeners(){
-		Iterator it = this.listeners.iterator();
+		Iterator<JackSettingsListener> it = this.listeners.iterator();
 		while( it.hasNext() ){
-			JackSettingsListener listener = (JackSettingsListener) it.next();
+			JackSettingsListener listener = it.next();
 			listener.loadSettings( getConfig() );
 		}
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java
similarity index 98%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java
index 71c0c2cf..712d9dfa 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettingsDialog.java
@@ -24,54 +24,54 @@
 import org.herac.tuxguitar.jack.synthesizer.JackOutputPortRouter;
 
 public class JackSettingsDialog {
-	
+
 	private static final int TAB_WIDTH = 720;
 	private static final int TAB_HEIGHT = 350;
-	
+
 	private JackSettings settings;
-	
+
 	public JackSettingsDialog( JackSettings settings ){
 		this.settings = settings;
 	}
-	
+
 	public void open( Shell parent ){
 		final int[][] channelRouting = getChannelRoutingSettings();
 		final int[][][] programRouting = getProgramRoutingSettings();
-		
+
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setText(TuxGuitar.getProperty("jack.settings.dialog"));
 		dialog.setLayout(new GridLayout());
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		final TabFolder tabFolder = new TabFolder(dialog, SWT.TOP);
 		tabFolder.setLayout( new FormLayout() );
-		
+
 		final TabItem[] routingTabs = new TabItem[2];
-		
+
 		// ----------------------------------------------------------------------
 		int synthRouteType = this.settings.getConfig().getIntConfigValue("jack.midi.ports.type", JackOutputPortRouter.CREATE_UNIQUE_PORT );
-		
+
 		Composite tabControl = new Composite( tabFolder, SWT.NONE);
 		tabControl.setLayout(new GridLayout());
 		tabControl.setLayoutData(new FormData(TAB_WIDTH,TAB_HEIGHT));
-		
-		TabItem tabItem = new TabItem( tabFolder  , SWT.None ); 
+
+		TabItem tabItem = new TabItem( tabFolder  , SWT.None );
 		tabItem.setText(TuxGuitar.getProperty("jack.settings.dialog.options"));
 		tabItem.setControl(tabControl);
-		
+
 		Group groupSynth = new Group(tabControl,SWT.SHADOW_ETCHED_IN);
 		groupSynth.setLayout(new GridLayout(1,false));
 		groupSynth.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		groupSynth.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port"));
-		
+
 		final Button buttonSynthRouteType1 = new Button(groupSynth, SWT.RADIO);
 		final Button buttonSynthRouteType2 = new Button(groupSynth, SWT.RADIO);
 		final Button buttonSynthRouteType3 = new Button(groupSynth, SWT.RADIO);
-		
+
 		buttonSynthRouteType1.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.type.single"));
 		buttonSynthRouteType2.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.type.multiple-by-channel") );
 		buttonSynthRouteType3.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.type.multiple-by-program") );
-		
+
 		if( synthRouteType == JackOutputPortRouter.CREATE_MULTIPLE_PORTS_BY_CHANNEL ){
 			buttonSynthRouteType2.setSelection( true );
 			routingTabs[0] = openChannelRoutingTab(tabFolder, channelRouting);
@@ -81,12 +81,13 @@ public void open( Shell parent ){
 		}else{
 			buttonSynthRouteType1.setSelection( true );
 		}
-		
+
 		final SelectionListener routeTypeListener = new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				boolean channelRoutingTabsEnabled = buttonSynthRouteType2.getSelection();
 				boolean programRoutingTabsEnabled = buttonSynthRouteType3.getSelection();
-				
+
 				if( channelRoutingTabsEnabled && routingTabs[0] == null ){
 					routingTabs[0] = openChannelRoutingTab(tabFolder, channelRouting);
 				}else if( !channelRoutingTabsEnabled && routingTabs[0] != null ){
@@ -104,16 +105,17 @@ public void widgetSelected(SelectionEvent arg0) {
 		buttonSynthRouteType1.addSelectionListener(routeTypeListener);
 		buttonSynthRouteType2.addSelectionListener(routeTypeListener);
 		buttonSynthRouteType3.addSelectionListener(routeTypeListener);
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite compositeButtons = new Composite(dialog, SWT.NONE);
 		compositeButtons.setLayout(new GridLayout(2,false));
 		compositeButtons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(compositeButtons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int type = JackOutputPortRouter.CREATE_UNIQUE_PORT;
 				if( buttonSynthRouteType2.getSelection() ){
@@ -126,28 +128,29 @@ else if( buttonSynthRouteType3.getSelection() ){
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(compositeButtons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	protected GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected void saveChanges( int type , int[][] channelRouting, int[][][] programRouting){
 		if( type == JackOutputPortRouter.CREATE_MULTIPLE_PORTS_BY_CHANNEL ){
 			this.setChannelRoutingSettings(channelRouting);
@@ -158,7 +161,7 @@ else if( type == JackOutputPortRouter.CREATE_MULTIPLE_PORTS_BY_PROGRAM ){
 		this.settings.getConfig().setProperty("jack.midi.ports.type", type );
 		this.settings.notifyChanges();
 	}
-	
+
 	protected int[][] getChannelRoutingSettings(){
 		int[][] channelsRoute = new int[16][];
 		for( int i = 0 ; i < channelsRoute.length ; i ++ ){
@@ -170,7 +173,7 @@ protected int[][] getChannelRoutingSettings(){
 		}
 		return channelsRoute;
 	}
-	
+
 	protected void setChannelRoutingSettings(int[][] channelsRoute){
 		for( int i = 0 ; i < channelsRoute.length ; i ++ ){
 			if( channelsRoute[i].length == 4 ){
@@ -180,7 +183,7 @@ protected void setChannelRoutingSettings(int[][] channelsRoute){
 			}
 		}
 	}
-	
+
 	protected int[][][] getProgramRoutingSettings(){
 		int[][][] routing = new int[129][128][];
 		for( int bank = 0 ; bank < routing.length ; bank ++ ){
@@ -196,7 +199,7 @@ protected int[][][] getProgramRoutingSettings(){
 		}
 		return routing;
 	}
-	
+
 	protected void setProgramRoutingSettings(int[][][] routing){
 		for( int bank = 0 ; bank < routing.length ; bank ++ ){
 			for( int prg = 0 ; prg < routing[bank].length ; prg ++ ){
@@ -210,24 +213,24 @@ protected void setProgramRoutingSettings(int[][][] routing){
 			}
 		}
 	}
-	
+
 	// ----------------------------------------------------------------------------------------------------//
 	// PROGRAM ROUTING ------------------------------------------------------------------------------------//
 	// ----------------------------------------------------------------------------------------------------//
-	
+
 	public TabItem openProgramRoutingTab( TabFolder tabFolder , final int[][][] routing ){
 		Composite tabControl = new Composite( tabFolder, SWT.NONE);
 		tabControl.setLayout(new GridLayout());
 		tabControl.setLayoutData(new FormData(TAB_WIDTH,TAB_HEIGHT));
-		
-		TabItem tabItem = new TabItem( tabFolder  , SWT.None ); 
+
+		TabItem tabItem = new TabItem( tabFolder  , SWT.None );
 		tabItem.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.options"));
 		tabItem.setControl(tabControl);
-		
+
 		Composite composite = new Composite( tabControl, SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		final Combo srcBankCombo = new Combo( composite, SWT.DROP_DOWN | SWT.READ_ONLY );
 		for( int bank = 0; bank < routing.length ; bank ++ ){
 			srcBankCombo.add(
@@ -237,32 +240,33 @@ public TabItem openProgramRoutingTab( TabFolder tabFolder , final int[][][] rout
 			);
 		}
 		srcBankCombo.select(0);
-		
+
 		final Table table = new Table( composite, SWT.BORDER | SWT.FULL_SELECTION);
 		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		table.setHeaderVisible(true);
-		
+
 		TableColumn srcProgramColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstPortColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstChannelColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstProgramColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstBankColumn = new TableColumn(table, SWT.LEFT);
-		
+
 		srcProgramColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.src-program"));
 		dstPortColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-port"));
 		dstChannelColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-channel"));
 		dstProgramColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-program"));
 		dstBankColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-bank"));
-		
+
 		srcProgramColumn.setWidth(130);
 		dstPortColumn.setWidth(130);
 		dstChannelColumn.setWidth(130);
 		dstProgramColumn.setWidth(130);
 		dstBankColumn.setWidth(130);
-		
+
 		loadProgramRoutingItems( table , routing[0] );
-		
+
 		srcBankCombo.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int srcBank = srcBankCombo.getSelectionIndex();
 				if( srcBank >= 0 && srcBank < routing.length ){
@@ -270,16 +274,17 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//-------------------------------------------------------//
 		Composite buttons = new Composite( composite , SWT.NONE);
 		buttons.setLayout(new GridLayout(1,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("edit"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int index = table.getSelectionIndex();
 				if( index >= 0 && index < table.getItemCount() ){
@@ -290,20 +295,20 @@ public void widgetSelected(SelectionEvent arg0) {
 		//-------------------------------------------------------//
 		return tabItem;
 	}
-	
+
 	protected void loadProgramRoutingItems( Table table , int[][] routing ){
 		table.removeAll();
-		
+
 		for( int i = 0 ; i < routing.length ; i ++ ){
 			this.addProgramRoutingItem(table, routing[i]);
 		}
 	}
-	
+
 	protected void addProgramRoutingItem( Table table, int[] route){
 		TableItem item = new TableItem(table, SWT.NONE );
 		this.addProgramRoutingItem(item, route);
 	}
-	
+
 	protected void addProgramRoutingItem( TableItem item, int[] route){
 		if( route.length == 5 ){
 			String[] text = new String[5];
@@ -336,10 +341,10 @@ protected void addProgramRoutingItem( TableItem item, int[] route){
 			item.setData( route );
 		}
 	}
-	
+
 	public void editProgramRoutingItem( Shell parent , final TableItem item){
 		final int[] route = (int [])item.getData();
-		
+
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM);
 		dialog.setLayout(new GridLayout(1,false));
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
@@ -349,11 +354,11 @@ public void editProgramRoutingItem( Shell parent , final TableItem item){
 		group.setLayout(new GridLayout(2,false));
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.options"));
-		
+
 		Label program = new Label(group, SWT.NULL);
 		program.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		program.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.src-program") + ":");
-		
+
 		Label programValue = new Label(group, SWT.NULL);
 		programValue.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
 		if( route[0] < 128 ){
@@ -361,21 +366,21 @@ public void editProgramRoutingItem( Shell parent , final TableItem item){
 		}else{
 			programValue.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.src-program.percussion"));
 		}
-		
+
 		Label programPort = new Label(group, SWT.NULL);
 		programPort.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		programPort.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-port") + ":");
-		
+
 		final Combo programPortValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		programPortValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		programPortValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-port.default"));
 		programPortValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-port.dedicated"));
 		programPortValue.select( route[1] );
-		
+
 		Label channelRoute = new Label(group, SWT.NULL);
 		channelRoute.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		channelRoute.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-channel") + ":");
-		
+
 		final Combo channelRouteValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		channelRouteValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		channelRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-channel.default"));
@@ -383,11 +388,11 @@ public void editProgramRoutingItem( Shell parent , final TableItem item){
 			channelRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-channel.item", new String[]{Integer.toString(i)}));
 		}
 		channelRouteValue.select( route[2] + 1 );
-		
+
 		Label programRoute = new Label(group, SWT.NULL);
 		programRoute.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		programRoute.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-program") + ":");
-		
+
 		final Combo programRouteValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		programRouteValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		programRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-program.default"));
@@ -395,11 +400,11 @@ public void editProgramRoutingItem( Shell parent , final TableItem item){
 			programRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-program.item", new String[]{Integer.toString(i)}));
 		}
 		programRouteValue.select( route[3] + 1 );
-		
+
 		Label bankRoute = new Label(group, SWT.NULL);
 		bankRoute.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		bankRoute.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-bank") + ":");
-		
+
 		final Combo bankRouteValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		bankRouteValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		bankRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-bank.default"));
@@ -407,16 +412,17 @@ public void editProgramRoutingItem( Shell parent , final TableItem item){
 			bankRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.program-router.dst-bank.item", new String[]{Integer.toString(i)}));
 		}
 		bankRouteValue.select( route[4] + 1 );
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				route[1] = programPortValue.getSelectionIndex();
 				route[2] = channelRouteValue.getSelectionIndex() - 1;
@@ -426,68 +432,70 @@ public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonCancel );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	// ----------------------------------------------------------------------------------------------------//
 	// CHANNEL ROUTING ------------------------------------------------------------------------------------//
 	// ----------------------------------------------------------------------------------------------------//
-	
+
 	public TabItem openChannelRoutingTab( TabFolder tabFolder , int[][] routing ){
 		Composite tabControl = new Composite( tabFolder, SWT.NONE);
 		tabControl.setLayout(new GridLayout());
 		tabControl.setLayoutData(new FormData(TAB_WIDTH,TAB_HEIGHT));
-		
-		TabItem tabItem = new TabItem( tabFolder  , SWT.None ); 
+
+		TabItem tabItem = new TabItem( tabFolder  , SWT.None );
 		tabItem.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.options"));
 		tabItem.setControl(tabControl);
-		
+
 		Composite composite = new Composite( tabControl, SWT.NONE);
 		composite.setLayout(new GridLayout());
 		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
+
 		final Table table = new Table( composite, SWT.BORDER | SWT.FULL_SELECTION);
 		table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		table.setHeaderVisible(true);
-		
+
 		TableColumn srcChannelColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstChannelColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstProgramColumn = new TableColumn(table, SWT.LEFT);
 		TableColumn dstBankColumn = new TableColumn(table, SWT.LEFT);
-		
+
 		srcChannelColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.src-channel"));
 		dstChannelColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-channel"));
 		dstProgramColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-program"));
 		dstBankColumn.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-bank"));
-		
+
 		srcChannelColumn.setWidth(166);
 		dstChannelColumn.setWidth(166);
 		dstProgramColumn.setWidth(166);
 		dstBankColumn.setWidth(166);
-		
+
 		loadChannelRoutingItems( table , routing );
-		
+
 		//-------------------------------------------------------//
 		Composite buttons = new Composite( composite , SWT.NONE);
 		buttons.setLayout(new GridLayout(1,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
-		
+
 		final Button buttonEdit = new Button(buttons, SWT.PUSH);
 		buttonEdit.setText(TuxGuitar.getProperty("edit"));
 		buttonEdit.setLayoutData(getButtonData());
 		buttonEdit.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int index = table.getSelectionIndex();
 				if( index >= 0 && index < table.getItemCount() ){
@@ -496,25 +504,25 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		//-------------------------------------------------------//
-		
+
 		return tabItem;
 	}
-	
+
 	protected void loadChannelRoutingItems( Table table , int[][] routing ){
 		for( int i = 0 ; i < routing.length ; i ++ ){
 			this.addChannelRoutingItem(table, routing[i]);
 		}
 	}
-	
+
 	protected void addChannelRoutingItem( Table table, int[] route){
 		TableItem item = new TableItem(table, SWT.NONE );
 		this.addChannelRoutingItem(item, route);
 	}
-	
+
 	protected void addChannelRoutingItem( TableItem item, int[] route){
 		if( route.length == 4 ){
 			String[] text = new String[4];
-			
+
 			text[0] = (TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.src-channel.item", new String[]{ Integer.toString(route[0]) }));
 			if( route[1] >= 0 ){
 				text[1] = (TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-channel.item", new String[]{ Integer.toString(route[1]) }));
@@ -535,10 +543,10 @@ protected void addChannelRoutingItem( TableItem item, int[] route){
 			item.setData( route );
 		}
 	}
-	
+
 	public void editChannelRoutingItem( Shell parent , final TableItem item){
 		final int[] route = (int [])item.getData();
-		
+
 		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM);
 		dialog.setLayout(new GridLayout(1,false));
 		dialog.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
@@ -548,31 +556,31 @@ public void editChannelRoutingItem( Shell parent , final TableItem item){
 		group.setLayout(new GridLayout(2,false));
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.options"));
-		
+
 		Label channel = new Label(group, SWT.NULL);
 		channel.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		channel.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.src-channel") + ":");
-		
+
 		Label channelValue = new Label(group, SWT.NULL);
 		channelValue.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
 		channelValue.setText( TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.src-channel.item", new String[]{ Integer.toString(route[0]) }) );
-		
+
 		Label channelRoute = new Label(group, SWT.NULL);
 		channelRoute.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		channelRoute.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-channel") + ":");
-		
+
 		final Combo channelRouteValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		channelRouteValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		channelRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-channel.default"));
 		for( int i = 0 ; i < 16 ; i ++ ){
 			channelRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-channel.item", new String[]{Integer.toString(i)}));
-		} 
+		}
 		channelRouteValue.select( route[1] + 1 );
-		
+
 		Label programRoute = new Label(group, SWT.NULL);
 		programRoute.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		programRoute.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-program") + ":");
-		
+
 		final Combo programRouteValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		programRouteValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		programRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-program.default"));
@@ -580,11 +588,11 @@ public void editChannelRoutingItem( Shell parent , final TableItem item){
 			programRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-program.item", new String[]{Integer.toString(i)}));
 		}
 		programRouteValue.select( route[2] + 1 );
-		
+
 		Label bankRoute = new Label(group, SWT.NULL);
 		bankRoute.setLayoutData(new GridData(SWT.RIGHT,SWT.CENTER,false,true));
 		bankRoute.setText(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-bank") + ":");
-		
+
 		final Combo bankRouteValue = new Combo(group,SWT.DROP_DOWN | SWT.READ_ONLY);
 		bankRouteValue.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
 		bankRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-bank.default"));
@@ -592,16 +600,17 @@ public void editChannelRoutingItem( Shell parent , final TableItem item){
 			bankRouteValue.add(TuxGuitar.getProperty("jack.settings.dialog.options.midi-port.channel-router.dst-bank.item", new String[]{Integer.toString(i)}));
 		}
 		bankRouteValue.select( route[3] + 1 );
-		
+
 		// ------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				route[1] = channelRouteValue.getSelectionIndex() - 1;
 				route[2] = programRouteValue.getSelectionIndex() - 1;
@@ -610,18 +619,19 @@ public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonCancel );
-		
+
 		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
 }
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsListener.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettingsListener.java
similarity index 98%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsListener.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettingsListener.java
index 45784aeb..790fd526 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/settings/JackSettingsListener.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/settings/JackSettingsListener.java
@@ -3,7 +3,7 @@
 import org.herac.tuxguitar.app.system.config.TGConfigManager;
 
 public interface JackSettingsListener {
-	
+
 	public void loadSettings( TGConfigManager config );
-	
+
 }
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java
similarity index 96%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java
index fd7c7fde..101e7a64 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPort.java
@@ -9,19 +9,20 @@
 import org.herac.tuxguitar.player.base.MidiReceiver;
 
 public class JackOutputPort implements JackSettingsListener, MidiOutputPort {
-	
+
 	private JackClient jackClient;
 	private JackSettings jackSettings;
 	private JackReceiver jackReceiver;
 	private JackOutputPortRouter jackOutputPortRouter;
-	
+
 	public JackOutputPort( JackClient jackClient , JackSettings jackSettings ){
 		this.jackOutputPortRouter = new JackOutputPortRouter();
 		this.jackReceiver = new JackReceiver(jackClient, this);
 		this.jackSettings = jackSettings;
 		this.jackClient = jackClient;
 	}
-	
+
+	@Override
 	public void open(){
 		if(!this.jackClient.isPortsOpen()){
 			this.loadSettings( this.jackSettings.getConfig() );
@@ -29,14 +30,16 @@ public void open(){
 			this.jackClient.openPorts(this.jackOutputPortRouter.getPortCount());
 		}
 	}
-	
+
+	@Override
 	public void close(){
 		if(this.jackClient.isPortsOpen()){
 			this.jackClient.closePorts();
 			this.jackSettings.removeListener( this );
 		}
 	}
-	
+
+	@Override
 	public void check() throws MidiPlayerException {
 		if( !this.jackClient.isServerRunning() || !this.jackClient.isPortsOpen() ){
 			this.open();
@@ -45,15 +48,17 @@ public void check() throws MidiPlayerException {
 			}
 		}
 	}
-	
+
+	@Override
 	public MidiReceiver getReceiver(){
 		return this.jackReceiver;
 	}
-	
+
 	public JackOutputPortRouter getRouter(){
 		return this.jackOutputPortRouter;
 	}
-	
+
+	@Override
 	public void loadSettings(TGConfigManager config) {
 		boolean connected = this.jackClient.isPortsOpen();
 		if( connected ){
@@ -64,11 +69,13 @@ public void loadSettings(TGConfigManager config) {
 			this.jackClient.openPorts(this.jackOutputPortRouter.getPortCount());
 		}
 	}
-	
+
+	@Override
 	public String getKey(){
 		return ("tuxguitar-jack");
 	}
-	
+
+	@Override
 	public String getName(){
 		return ("Jack Midi Port");
 	}
diff --git a/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java
new file mode 100644
index 00000000..e8d29ab9
--- /dev/null
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProvider.java
@@ -0,0 +1,38 @@
+package org.herac.tuxguitar.jack.synthesizer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.jack.JackClient;
+import org.herac.tuxguitar.jack.settings.JackSettings;
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class JackOutputPortProvider implements MidiOutputPortProvider{
+
+	private List<MidiOutputPort> jackOutputPorts;
+	private final JackClient jackClient;
+	private final JackSettings jackSettings;
+
+	public JackOutputPortProvider(JackClient jackClient,JackSettings jackSettings){
+		this.jackClient = jackClient;
+		this.jackSettings = jackSettings;
+	}
+
+	@Override
+	public List<MidiOutputPort> listPorts() {
+		if(this.jackOutputPorts == null){
+			this.jackOutputPorts = new ArrayList<MidiOutputPort>();
+			this.jackOutputPorts.add(new JackOutputPort( this.jackClient , this.jackSettings ));
+		}
+		return this.jackOutputPorts;
+	}
+
+	@Override
+	public void closeAll(){
+		if(this.jackClient.isPortsOpen()){
+			this.jackClient.closePorts();
+		}
+	}
+
+}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java
similarity index 98%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java
index 3cfb3760..cadc1099 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortProviderPlugin.java
@@ -6,17 +6,18 @@
 import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
 
 public class JackOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin {
-	
+
 	private JackOutputPortProvider jackOutputPortProvider;
-	
+
 	public JackOutputPortProviderPlugin(){
 		this(new JackClient(),new JackSettings());
 	}
-	
+
 	public JackOutputPortProviderPlugin(JackClient jackClient,JackSettings jackSettings){
 		this.jackOutputPortProvider = new JackOutputPortProvider( jackClient , jackSettings);
 	}
-	
+
+	@Override
 	protected MidiOutputPortProvider getProvider() {
 		return this.jackOutputPortProvider;
 	}
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java
similarity index 99%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java
index 18d71092..a116bfd9 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackOutputPortRouter.java
@@ -3,32 +3,32 @@
 import org.herac.tuxguitar.app.system.config.TGConfigManager;
 
 public class JackOutputPortRouter {
-	
+
 	public static final int CREATE_UNIQUE_PORT = 0;
 	public static final int CREATE_MULTIPLE_PORTS_BY_CHANNEL = 1;
 	public static final int CREATE_MULTIPLE_PORTS_BY_PROGRAM = 2;
-	
+
 	private static final int PORT_INDEX = 0;
 	private static final int CHANNEL_INDEX = 1;
 	private static final int PROGRAM_INDEX = 2;
 	private static final int BANK_INDEX = 3;
-	
+
 	private int ports;
 	private int[] banks;
 	private int[][] channels;
 	private int[][][] programs;
-	
+
 	public JackOutputPortRouter(){
 		this.ports = 1;
 		this.banks = new int[16];
 		this.channels = new int[16][4];
 		this.programs = new int[129][128][4];
 	}
-	
+
 	public int getPortCount(){
 		return this.ports;
 	}
-	
+
 	public int getPortRoute( int channel ){
 		if( channel >= 0 && channel < this.channels.length ){
 			int route = this.channels[ channel ][ PORT_INDEX ];
@@ -36,7 +36,7 @@ public int getPortRoute( int channel ){
 		}
 		return 0;
 	}
-	
+
 	public int getChannelRoute( int channel ){
 		if( channel >= 0 && channel < this.channels.length ){
 			int route = this.channels[ channel ][ CHANNEL_INDEX ];
@@ -44,7 +44,7 @@ public int getChannelRoute( int channel ){
 		}
 		return 0;
 	}
-	
+
 	public int getProgramRoute( int channel , int program ){
 		if( channel >= 0 && channel < this.channels.length ){
 			int route = this.channels[ channel ][ PROGRAM_INDEX ];
@@ -52,7 +52,7 @@ public int getProgramRoute( int channel , int program ){
 		}
 		return 0;
 	}
-	
+
 	public int getBankRoute( int channel ){
 		if( channel >= 0 && channel < this.channels.length ){
 			int route = this.channels[ channel ][ BANK_INDEX ];
@@ -60,7 +60,7 @@ public int getBankRoute( int channel ){
 		}
 		return 0;
 	}
-	
+
 	public void setProgram( int channel , int program ){
 		if( channel >= 0 && channel < this.channels.length && program >= 0 && program < this.programs.length ){
 			if( this.channels[ channel ][ PROGRAM_INDEX ] >= 0 ){
@@ -84,20 +84,20 @@ public void setProgram( int channel , int program ){
 			}
 		}
 	}
-	
+
 	public void setBank( int channel , int bank ){
 		if( channel != 9 && channel >= 0 && channel < this.banks.length ){
 			this.banks[channel] = bank;
 		}
 	}
-	
+
 	public int getBank( int channel ){
 		if( channel >= 0 && channel < this.banks.length ){
 			return (channel == 9 ? 128 : this.banks[channel]);
 		}
 		return 0;
 	}
-	
+
 	protected void createUniquePort(){
 		this.ports = 1;
 		for( int channel = 0 ; channel < this.channels.length ; channel ++ ){
@@ -115,10 +115,10 @@ protected void createUniquePort(){
 			}
 		}
 	}
-	
+
 	protected void createMultiplePortsByChannel( int[][] routing ){
 		this.ports = this.channels.length;
-		
+
 		// Initialize default channel values
 		for( int channel = 0 ; channel < this.channels.length ; channel ++ ){
 			this.channels[channel][ PORT_INDEX ] = channel;
@@ -135,7 +135,7 @@ protected void createMultiplePortsByChannel( int[][] routing ){
 				this.programs[bank][program][ BANK_INDEX ] = -1;
 			}
 		}
-		
+
 		// load new routing
 		for( int i = 0 ; i < routing.length ; i ++ ){
 			if( routing[i].length == 4 ){
@@ -148,10 +148,10 @@ protected void createMultiplePortsByChannel( int[][] routing ){
 			}
 		}
 	}
-	
+
 	protected void createMultiplePortsByProgram( int[][][] routing ){
 		this.ports = 1;
-		
+
 		// Initialize default channel values
 		for( int i = 0 ; i < this.channels.length ; i ++ ){
 			this.channels[i][ PORT_INDEX ] = -1;
@@ -159,7 +159,7 @@ protected void createMultiplePortsByProgram( int[][][] routing ){
 			this.channels[i][ PROGRAM_INDEX ] = 0;
 			this.channels[i][ BANK_INDEX ] = 0;
 		}
-		
+
 		// Initialize default program values
 		for( int bank = 0 ; bank < this.programs.length ; bank ++ ){
 			for( int program = 0 ; program < this.programs[bank].length ; program ++ ){
@@ -169,7 +169,7 @@ protected void createMultiplePortsByProgram( int[][][] routing ){
 				this.programs[bank][program][ CHANNEL_INDEX ] = -1;
 			}
 		}
-		
+
 		// load new routing
 		for( int bank = 0 ; bank < routing.length ; bank ++ ){
 			for( int prg = 0 ; prg < routing[bank].length ; prg ++ ){
@@ -186,7 +186,7 @@ protected void createMultiplePortsByProgram( int[][][] routing ){
 			}
 		}
 	}
-	
+
 	public void loadSettings( TGConfigManager config ){
 		int type = config.getIntConfigValue("jack.midi.ports.type", CREATE_UNIQUE_PORT );
 		if( type == CREATE_MULTIPLE_PORTS_BY_PROGRAM ){
diff --git a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java
similarity index 97%
rename from TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java
rename to plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java
index 7635e64b..c36100e6 100644
--- a/TuxGuitar-jack/src/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/jack/synthesizer/JackReceiver.java
@@ -5,21 +5,23 @@
 import org.herac.tuxguitar.player.base.MidiReceiver;
 
 public class JackReceiver implements MidiReceiver{
-	
+
 	private JackClient jackClient;
 	private JackOutputPort jackOutputPort;
-	
+
 	public JackReceiver(JackClient jackClient, JackOutputPort jackOutputPort){
 		this.jackClient = jackClient;
 		this.jackOutputPort = jackOutputPort;
 	}
-	
+
+	@Override
 	public void sendAllNotesOff() {
 		for(int i = 0; i < 16; i ++){
 			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
 		}
 	}
-	
+
+	@Override
 	public void sendNoteOn(int channel, int key, int velocity) {
 		byte[] event = new byte[3];
 		event[0] = (byte)(0x90 | this.jackOutputPort.getRouter().getChannelRoute(channel) );
@@ -27,7 +29,8 @@ public void sendNoteOn(int channel, int key, int velocity) {
 		event[2] = (byte)velocity;
 		this.jackClient.addEventToQueue( this.jackOutputPort.getRouter().getPortRoute(channel) , event);
 	}
-	
+
+	@Override
 	public void sendNoteOff(int channel, int key, int velocity) {
 		byte[] event = new byte[3];
 		event[0] = (byte)(0x80 | this.jackOutputPort.getRouter().getChannelRoute(channel) );
@@ -35,7 +38,8 @@ public void sendNoteOff(int channel, int key, int velocity) {
 		event[2] = (byte)velocity;
 		this.jackClient.addEventToQueue( this.jackOutputPort.getRouter().getPortRoute(channel) , event);
 	}
-	
+
+	@Override
 	public void sendPitchBend(int channel, int value) {
 		byte[] event = new byte[3];
 		event[0] = (byte)(0xE0 | this.jackOutputPort.getRouter().getChannelRoute(channel) );
@@ -43,23 +47,25 @@ public void sendPitchBend(int channel, int value) {
 		event[2] = (byte)value;
 		this.jackClient.addEventToQueue( this.jackOutputPort.getRouter().getPortRoute(channel) , event);
 	}
-	
+
+	@Override
 	public void sendProgramChange(int channel, int value) {
 		this.jackOutputPort.getRouter().setProgram(channel, value);
-		
+
 		byte[] event1 = new byte[3];
 		event1[0] = (byte)(0xB0 | this.jackOutputPort.getRouter().getChannelRoute(channel) );
 		event1[1] = (byte)MidiControllers.BANK_SELECT;
 		event1[2] = (byte)this.jackOutputPort.getRouter().getBankRoute(channel);
-		
+
 		byte[] event2 = new byte[2];
 		event2[0] = (byte)(0xC0 | this.jackOutputPort.getRouter().getChannelRoute(channel) );
 		event2[1] = (byte)this.jackOutputPort.getRouter().getProgramRoute(channel , value);
-		
+
 		this.jackClient.addEventToQueue( this.jackOutputPort.getRouter().getPortRoute(channel) , event1);
 		this.jackClient.addEventToQueue( this.jackOutputPort.getRouter().getPortRoute(channel) , event2);
 	}
-	
+
+	@Override
 	public void sendControlChange(int channel, int controller, int value) {
 		if( controller == MidiControllers.BANK_SELECT){
 			this.jackOutputPort.getRouter().setBank(channel, value);
@@ -71,7 +77,7 @@ public void sendControlChange(int channel, int controller, int value) {
 			this.jackClient.addEventToQueue( this.jackOutputPort.getRouter().getPortRoute(channel) , event);
 		}
 	}
-	
+
 	public void sendSystemReset() {
 		//not implemented
 	}
diff --git a/plugins/jack/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java b/plugins/jack/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
new file mode 100644
index 00000000..e95f1535
--- /dev/null
+++ b/plugins/jack/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		if(!JNILibraryLoader.loadFromClassPath(getFileName(libname))){
+			System.loadLibrary(libname);
+		}
+	}
+
+	/**
+	 * Return filename of the library, which is platform dependent: .so, .dll...
+	 * @param libraryName Name of the library
+	 * @return Name of the file
+	 */
+	private static String getFileName(String libraryName) {
+		// FIXME fix other platforms
+		return libraryName + ".so";
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		File file = new File(JNI_TMP_PATH + filename);
+		try{
+			if(!file.exists()){
+				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					OutputStream outputStream = new FileOutputStream(file);
+
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			if(file.exists()){
+				System.load(file.getAbsolutePath());
+				return true;
+			}
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+	}
+}
diff --git a/TuxGuitar-jack/jni/org_herac_tuxguitar_jack_JackClient.c b/plugins/jack/src/main/native/org_herac_tuxguitar_jack_JackClient.c
similarity index 100%
rename from TuxGuitar-jack/jni/org_herac_tuxguitar_jack_JackClient.c
rename to plugins/jack/src/main/native/org_herac_tuxguitar_jack_JackClient.c
diff --git a/TuxGuitar-jack/jni/org_herac_tuxguitar_jack_JackClient.h b/plugins/jack/src/main/native/org_herac_tuxguitar_jack_JackClient.h
similarity index 100%
rename from TuxGuitar-jack/jni/org_herac_tuxguitar_jack_JackClient.h
rename to plugins/jack/src/main/native/org_herac_tuxguitar_jack_JackClient.h
diff --git a/TuxGuitar-jack/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/jack/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-jack/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/jack/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-jack/share/lang/messages.properties b/plugins/jack/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-jack/share/lang/messages.properties
rename to plugins/jack/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-jack/share/lang/messages_sv.properties b/plugins/jack/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-jack/share/lang/messages_sv.properties
rename to plugins/jack/src/main/resources/lang/messages_sv.properties
diff --git a/plugins/jsa/pom.xml b/plugins/jsa/pom.xml
new file mode 100644
index 00000000..0f50ee82
--- /dev/null
+++ b/plugins/jsa/pom.xml
@@ -0,0 +1,40 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-jsa</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Java Sound API</name>
+	<description>Java Sound API plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/MidiPluginList.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/MidiPluginList.java
new file mode 100644
index 00000000..820eca55
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/MidiPluginList.java
@@ -0,0 +1,62 @@
+package org.herac.tuxguitar.player.impl.jsa;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
+import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiSequencerProviderPlugin;
+import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+import org.herac.tuxguitar.player.base.MidiSequencerProvider;
+import org.herac.tuxguitar.player.impl.jsa.midiport.MidiPortProviderImpl;
+import org.herac.tuxguitar.player.impl.jsa.sequencer.MidiSequencerProviderImpl;
+import org.herac.tuxguitar.player.impl.jsa.utils.MidiConfigUtils;
+
+public class MidiPluginList extends TGPluginList implements TGPluginSetup{
+
+	@Override
+	protected List<TGPlugin> getPlugins() {
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
+		plugins.add(new TGMidiOutputPortProviderPlugin() {
+			@Override
+			protected MidiOutputPortProvider getProvider() {
+				return new MidiPortProviderImpl();
+			}
+		});
+		plugins.add(new TGMidiSequencerProviderPlugin() {
+			@Override
+			protected MidiSequencerProvider getProvider() {
+				return new MidiSequencerProviderImpl();
+			}
+		});
+		return plugins;
+	}
+
+	@Override
+	public void setupDialog(Shell parent) {
+		MidiConfigUtils.setupDialog(parent);
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Java Sound Api plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "Java Sound Api plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
similarity index 91%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
index 1f9a4d75..9813b7e9 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBAssistant.java
@@ -27,22 +27,24 @@ public class SBAssistant {
 	};
 
 	private MidiPortSynthesizer synthesizer;
-	
+
 	public SBAssistant(MidiPortSynthesizer synthesizer){
 		this.synthesizer = synthesizer;
 	}
-	
+
 	public void process(){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try {
 					TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+						@Override
 						public void run() {
 							ConfirmDialog dialog = new ConfirmDialog(TuxGuitar.getProperty("jsa.soundbank-assistant.confirm-message"));
 							dialog.setDefaultStatus( ConfirmDialog.STATUS_NO );
 							if (dialog.confirm(ConfirmDialog.BUTTON_YES | ConfirmDialog.BUTTON_NO , ConfirmDialog.BUTTON_YES) == ConfirmDialog.STATUS_YES){
 								open();
-							}		
+							}
 						}
 					});
 				} catch (Throwable e) {
@@ -51,18 +53,18 @@ public void run() {
 			}
 		}).start();
 	}
-	
-	protected void open(){		
+
+	protected void open(){
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
-		
+
 		//------------------------------------------------------------------------------
         Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
         group.setLayout(new GridLayout());
-        group.setLayoutData(getGroupData());   
+        group.setLayoutData(getGroupData());
         group.setText(TuxGuitar.getProperty("jsa.soundbank-assistant.select"));
-        
-        
+
+
         final Button urls[] = new Button[ URLS.length ];
         for(int i = 0; i < URLS.length ; i ++){
 	        urls[i] = new Button(group, SWT.RADIO);
@@ -70,54 +72,56 @@ protected void open(){
 	        urls[i].setData(URLS[i]);
 	        urls[i].setSelection(i == 0);
         }
-		
-        //------------------BUTTONS--------------------------            
+
+        //------------------BUTTONS--------------------------
         Composite buttons = new Composite(dialog, SWT.NONE);
         buttons.setLayout(new GridLayout(2,false));
-        buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));    	
+        buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
 
         Button buttonOk = new Button(buttons, SWT.PUSH);
         buttonOk.setText(TuxGuitar.getProperty("ok"));
         buttonOk.setLayoutData(getButtonsData());
         buttonOk.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
             	URL url = getSelection(urls);
-            	
+
             	dialog.dispose();
-            	
+
             	if(url != null ){
             		install(url);
             	}
             }
-        });		
-		
+        });
+
         Button buttonCancel = new Button(buttons, SWT.PUSH);
         buttonCancel.setText(TuxGuitar.getProperty("cancel"));
         buttonCancel.setLayoutData(getButtonsData());
         buttonCancel.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
                 dialog.dispose();
             }
         });
-		
+
         dialog.setDefaultButton( buttonOk );
-        
+
         DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
-	
+
 	protected GridData getGroupData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 250;
 		return data;
-	}	
-	
+	}
+
 	protected GridData getButtonsData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	protected URL getSelection(Button[] buttons){
     	for(int i = 0; i < buttons.length ; i ++){
     		if( buttons[i].getSelection() && buttons[i].getData() instanceof SBUrl ){
@@ -126,7 +130,7 @@ protected URL getSelection(Button[] buttons){
     	}
     	return null;
 	}
-	
+
 	protected void install(URL url ){
 		new SBInstallerGui(url,this.synthesizer).open();
 	}
@@ -139,5 +143,5 @@ private static URL toURL(String s){
 		}
 		return null;
 	}
-	
+
 }
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstaller.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstaller.java
similarity index 97%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstaller.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstaller.java
index 97130735..b2886ec9 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstaller.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstaller.java
@@ -19,16 +19,16 @@ public class SBInstaller {
 
 	private static final String SB_PREFIX = "soundbank";
 	private static final String SB_EXTENSION = ".gm";
-	
+
 	private boolean cancelled;
-	
+
 	private URL url;
 	private File tmpPath;
 	private File dstPath;
-	
+
 	private MidiPortSynthesizer synthesizer;
 	private SBInstallerlistener listener;
-	
+
 	public SBInstaller(URL url,File tmpPath,File dstPath,MidiPortSynthesizer synthesizer, SBInstallerlistener listener){
 		this.url = url;
 		this.tmpPath = tmpPath;
@@ -37,7 +37,7 @@ public SBInstaller(URL url,File tmpPath,File dstPath,MidiPortSynthesizer synthes
 		this.listener = listener;
 		this.cancelled = false;
 	}
-	
+
 	public void process(){
 		File tmpFile = new File(this.tmpPath.getAbsolutePath() + File.separator + "soundbank.zip");
 		boolean success = download(this.url, tmpFile);
@@ -52,15 +52,15 @@ public void process(){
 		}
 		this.listener.notifyFinish();
 	}
-	
+
 	private boolean download(URL url, File dst){
 		try{
 			this.listener.notifyProcess(TuxGuitar.getProperty("jsa.soundbank-assistant.process.downloading"));
-			
+
 			InputStream is = url.openStream();
-			
+
 			OutputStream os = new FileOutputStream(dst);
-			
+
 			byte[] buffer = new byte[1024];
 			int length = 0;
 			while(!isCancelled() && (length = is.read(buffer)) != -1 ){
@@ -69,26 +69,26 @@ private boolean download(URL url, File dst){
 			is.close();
 			os.flush();
 			os.close();
-			
+
 			return true;
 		}catch(Throwable throwable){
 			throwable.printStackTrace();
 		}
 		return false;
 	}
-	
+
 	private File uncompress(File file){
 		try{
 			this.listener.notifyProcess(TuxGuitar.getProperty("jsa.soundbank-assistant.process.uncompressing",new String[]{file.getAbsolutePath()}));
-			
+
 			if(file.exists()){
 				File soundbank = null;
-				
+
 				ZipInputStream is = new ZipInputStream(new FileInputStream(file));
 				ZipEntry entry = null;
 				while( ( entry = is.getNextEntry() ) != null ){
-					
-					String name = entry.getName();					
+
+					String name = entry.getName();
 					if(name.indexOf(SB_PREFIX) == 0 && name.indexOf(SB_EXTENSION) == (name.length() - SB_EXTENSION.length())){
 						soundbank = new File(this.dstPath.getAbsolutePath() + File.separator + name);
 						OutputStream os = new FileOutputStream(soundbank);
@@ -102,8 +102,8 @@ private File uncompress(File file){
 					}
 				}
 				is.close();
-				
-				
+
+
 				return soundbank;
 			}
 		}catch(Throwable throwable){
@@ -111,16 +111,16 @@ private File uncompress(File file){
 		}
 		return null;
 	}
-	
+
 	private void install(File file){
 		try {
 			this.listener.notifyProcess(TuxGuitar.getProperty("jsa.soundbank-assistant.process.installing",new String[]{file.getAbsolutePath()}));
-			
+
 			if( ! this.synthesizer.loadSoundbank(file) ){
 				this.listener.notifyFailed(new MidiPlayerException(TuxGuitar.getProperty("jsa.error.soundbank.custom")));
 				return;
 			}
-			
+
 			TGConfigManager config = MidiConfigUtils.getConfig();
 			config.setProperty(MidiConfigUtils.SOUNDBANK_KEY,file.getAbsolutePath());
 			config.save();
@@ -128,7 +128,7 @@ private void install(File file){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public boolean isCancelled() {
 		return this.cancelled;
 	}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerGui.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerGui.java
similarity index 92%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerGui.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerGui.java
index 1323d248..2575d8f2 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerGui.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerGui.java
@@ -27,20 +27,20 @@
 public class SBInstallerGui implements SBInstallerlistener{
 
 	private static final String SB_PATH = ( TGFileUtils.PATH_USER_PLUGINS_CONFIG + File.separator + "tuxguitar-jsa" );
-	
+
 	private Shell dialog;
 	private Label progressLabel;
 
-	private SBInstaller installer;	
-	
+	private SBInstaller installer;
+
 	public SBInstallerGui(URL url,MidiPortSynthesizer synthesizer){
 		initInstaller(url,synthesizer);
 	}
-	
+
 	public void initInstaller(URL url,MidiPortSynthesizer synthesizer){
 		File tmpPath = new File(SB_PATH);
 		File dstPath = new File(SB_PATH);
-		
+
 		if(!tmpPath.exists()){
 			tmpPath.mkdirs();
 		}
@@ -49,7 +49,7 @@ public void initInstaller(URL url,MidiPortSynthesizer synthesizer){
 		}
 		this.installer = new SBInstaller(url,tmpPath,dstPath,synthesizer,this);
 	}
-	
+
 	public void open(){
 		this.dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		this.dialog.setLayout(new GridLayout());
@@ -57,16 +57,16 @@ public void open(){
 		//-----------------------------------------------------
 		Composite header = new Composite(this.dialog,SWT.NONE);
 		header.setLayout(new GridLayout(2,false));
-		header.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));		
-        
+		header.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
+
 		Label headerImage = new Label(header, SWT.NONE);
 		headerImage.setImage(TuxGuitar.instance().getDisplay().getSystemImage(SWT.ICON_INFORMATION));
 		headerImage.setLayoutData(new GridData(SWT.LEFT,SWT.TOP,false,false));
-		
+
 		Label headerTip = new Label(header, SWT.WRAP);
 		headerTip.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
 		headerTip.setText(TuxGuitar.getProperty("jsa.soundbank-assistant.process.tip"));
-		
+
 		FontData[] fontData = headerTip.getFont().getFontData();
 		for(int i = 0; i < fontData.length; i ++){
 			fontData[i].setStyle(SWT.BOLD);
@@ -74,61 +74,66 @@ public void open(){
 		final Font font = new Font(headerTip.getDisplay(),fontData);
 		headerTip.setFont(font);
 		headerTip.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent arg0) {
 				font.dispose();
 			}
 		});
-			
-		
-        //------------------PROGRESS--------------------------		
-        Composite composite = new Composite(this.dialog,SWT.NONE);            
+
+
+        //------------------PROGRESS--------------------------
+        Composite composite = new Composite(this.dialog,SWT.NONE);
         composite.setLayout(new GridLayout());
-        composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));		
-	        
+        composite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+
 		final ProgressBar progressBar = new ProgressBar(composite, SWT.INDETERMINATE);
 		progressBar.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,false));
-		
+
 		this.progressLabel = new Label(composite, SWT.WRAP);
 		this.progressLabel.setLayoutData(new GridData(SWT.FILL,SWT.TOP,true,true));
-		
-        //------------------BUTTONS--------------------------            
+
+        //------------------BUTTONS--------------------------
         Composite buttons = new Composite(this.dialog, SWT.NONE);
         buttons.setLayout(new GridLayout());
-        buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));    	
+        buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.BOTTOM,true,false));
 
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
-		data.minimumHeight = 25;        
+		data.minimumHeight = 25;
 
         Button buttonCancel = new Button(buttons, SWT.PUSH);
         buttonCancel.setText(TuxGuitar.getProperty("cancel"));
         buttonCancel.setLayoutData(data);
         buttonCancel.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
                 getInstaller().setCancelled(true);
             	getDialog().dispose();
             }
         });
 
         this.process();
-        
+
         DialogUtils.openDialog(this.dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
 
 	private void process(){
 		new Thread(new Runnable() {
-			public void run() {				
+			@Override
+			public void run() {
 				if(!isDisposed()){
 					getInstaller().process();
 				}
 			}
 		}).start();
 	}
-	
+
+	@Override
 	public void notifyProcess(final String process){
 		if(!isDisposed()){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							getProgressLabel().setText(process);
@@ -141,10 +146,12 @@ public void run() {
 		}
 	}
 
+	@Override
 	public void notifyFinish(){
 		if(!isDisposed()){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							getDialog().dispose();
@@ -156,11 +163,13 @@ public void run() {
 			}
 		}
 	}
-	
+
+	@Override
 	public void notifyFailed(final Throwable throwable){
 		if(!isDisposed()){
 			try {
 				TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					@Override
 					public void run() {
 						if(!isDisposed()){
 							getDialog().dispose();
@@ -172,20 +181,20 @@ public void run() {
 				e.printStackTrace();
 			}
 		}
-	}	
+	}
 
 	public boolean isDisposed(){
 		return ( TuxGuitar.isDisposed() || getDialog().isDisposed() );
 	}
-	
+
 	public Shell getDialog() {
 		return this.dialog;
 	}
-	
+
 	public Label getProgressLabel() {
 		return this.progressLabel;
 	}
-	
+
 	public SBInstaller getInstaller() {
 		return this.installer;
 	}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerlistener.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerlistener.java
similarity index 97%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerlistener.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerlistener.java
index 149214af..3c08d702 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerlistener.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBInstallerlistener.java
@@ -3,9 +3,9 @@
 public interface SBInstallerlistener {
 
 	public void notifyProcess(String process);
-	
+
 	public void notifyFinish();
-	
+
 	public void notifyFailed(Throwable throwable);
-	
+
 }
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBUrl.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBUrl.java
similarity index 98%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBUrl.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBUrl.java
index 4110b214..096dddb0 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/assistant/SBUrl.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/assistant/SBUrl.java
@@ -6,16 +6,16 @@ public class SBUrl {
 
 	private URL url;
 	private String name;
-	
+
 	public SBUrl(URL url, String name){
 		this.url = url;
 		this.name = name;
 	}
-	
+
 	public URL getUrl() {
 		return this.url;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
similarity index 95%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
index 583dc684..0435ac39 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortOut.java
@@ -11,21 +11,23 @@
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class MidiPortOut implements MidiOutputPort {
-	
+
 	private String key;
 	private String name;
 	private MidiReceiverImpl receiver;
-	
+
 	public MidiPortOut(MidiDevice device){
 		this.key = device.getDeviceInfo().getName();
 		this.name = device.getDeviceInfo().getName();
 		this.receiver = new MidiReceiverImpl(device);
 	}
-	
+
+	@Override
 	public MidiReceiver getReceiver(){
 		return this.receiver;
 	}
-	
+
+	@Override
 	public void open() throws MidiPlayerException{
 		try {
 			this.receiver.open();
@@ -33,7 +35,8 @@ public void open() throws MidiPlayerException{
 			throw new MidiPlayerException(throwable.getMessage(),throwable);
 		}
 	}
-	
+
+	@Override
 	public void close() throws MidiPlayerException{
 		try {
 			this.receiver.close();
@@ -41,7 +44,8 @@ public void close() throws MidiPlayerException{
 			throw new MidiPlayerException(throwable.getMessage(),throwable);
 		}
 	}
-	
+
+	@Override
 	public void check() throws MidiPlayerException{
 		try {
 			this.receiver.open();
@@ -49,29 +53,32 @@ public void check() throws MidiPlayerException{
 			throw new MidiPlayerException(throwable.getMessage(),throwable);
 		}
 	}
-	
+
+	@Override
 	public String getKey() {
 		return this.key;
 	}
-	
+
+	@Override
 	public String getName() {
 		return this.name;
 	}
 }
 
 class MidiReceiverImpl implements MidiReceiver{
-	
+
 	private MidiDevice device;
 	private Receiver receiver;
-	
+
 	public MidiReceiverImpl(MidiDevice device){
 		this.device = device;
 	}
-	
+
 	protected synchronized void open() throws Throwable{
 		if(!this.device.isOpen()){
 			final MidiDevice device = this.device;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					device.open();
 				}
@@ -80,17 +87,19 @@ public void run() throws Throwable {
 		if(this.receiver == null){
 			final MidiDevice device = this.device;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					setReceiver(device.getReceiver());
 				}
 			});
 		}
 	}
-	
+
 	protected synchronized void close() throws Throwable{
 		if(this.receiver != null){
 			final Receiver receiver = this.receiver;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					receiver.close();
 					setReceiver(null);
@@ -100,27 +109,29 @@ public void run() throws Throwable {
 		if(this.device.isOpen()){
 			final MidiDevice device = this.device;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					device.close();
 				}
 			});
 		}
 	}
-	
+
 	protected void setReceiver(Receiver receiver){
 		this.receiver = receiver;
 	}
-	
+
 	protected Receiver getReceiver(){
 		return this.receiver;
 	}
-	
+
 	public void sendSystemReset(){
 		if(getReceiver() != null){
 			getReceiver().send(MidiMessageUtils.systemReset(),-1);
 		}
 	}
-	
+
+	@Override
 	public void sendAllNotesOff(){
 		if(getReceiver() != null){
 			for(int channel = 0; channel < 16; channel ++){
@@ -128,31 +139,36 @@ public void sendAllNotesOff(){
 			}
 		}
 	}
-	
+
+	@Override
 	public void sendNoteOn(int channel, int key, int velocity) {
 		if(getReceiver() != null){
 			getReceiver().send(MidiMessageUtils.noteOn(channel, key, velocity),-1);
 		}
 	}
-	
+
+	@Override
 	public void sendNoteOff(int channel, int key, int velocity) {
 		if(getReceiver() != null){
 			getReceiver().send(MidiMessageUtils.noteOff(channel, key, velocity),-1);
 		}
 	}
-	
+
+	@Override
 	public void sendControlChange(int channel, int controller, int value) {
 		if(getReceiver() != null){
 			getReceiver().send(MidiMessageUtils.controlChange(channel,controller, value),-1);
 		}
 	}
-	
+
+	@Override
 	public void sendProgramChange(int channel, int value) {
 		if(getReceiver() != null){
 			getReceiver().send(MidiMessageUtils.programChange(channel, value),-1);
 		}
 	}
-	
+
+	@Override
 	public void sendPitchBend(int channel, int value) {
 		if(getReceiver() != null){
 			getReceiver().send(MidiMessageUtils.pitchBend(channel, value),-1);
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
similarity index 85%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
index ddabfd16..cdebf54e 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortProviderImpl.java
@@ -11,26 +11,27 @@
 import javax.sound.midi.Synthesizer;
 
 import org.herac.tuxguitar.app.TuxGuitar;
-import org.herac.tuxguitar.player.base.MidiPlayerException;
 import org.herac.tuxguitar.player.base.MidiOutputPort;
 import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+import org.herac.tuxguitar.player.base.MidiPlayerException;
 
 public class MidiPortProviderImpl implements MidiOutputPortProvider{
-	
+
 	public MidiPortProviderImpl(){
 		super();
 	}
-	
-	public List listPorts() throws MidiPlayerException{
+
+	@Override
+	public List<MidiOutputPort> listPorts() throws MidiPlayerException{
 		try {
-			List ports = new ArrayList();
+			List<MidiOutputPort> ports = new ArrayList<MidiOutputPort>();
 			MidiDevice.Info[] infos = MidiSystem.getMidiDeviceInfo();
 			for(int i = 0; i < infos.length; i++){
 				try {
-					Iterator it = ports.iterator();
+					Iterator<MidiOutputPort> it = ports.iterator();
 					boolean exists = false;
 					while(it.hasNext()){
-						if( ((MidiOutputPort)it.next()).getKey().equals(infos[i].getName()) ){
+						if( it.next().getKey().equals(infos[i].getName()) ){
 							exists = true;
 							break;
 						}
@@ -56,7 +57,8 @@ public List listPorts() throws MidiPlayerException{
 			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.unknown"),t);
 		}
 	}
-	
+
+	@Override
 	public void closeAll() {
 		// Not implemented
 	}
diff --git a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
similarity index 97%
rename from TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
index 75f5346d..a66ed65f 100644
--- a/TuxGuitar-jsa/src/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/midiport/MidiPortSynthesizer.java
@@ -17,44 +17,50 @@
 import org.herac.tuxguitar.player.impl.jsa.utils.MidiConfigUtils;
 
 public class MidiPortSynthesizer implements MidiOutputPort{
-	
+
 	private String key;
 	private String name;
 	private Synthesizer synthesizer;
 	private MidiReceiver receiver;
 	private boolean synthesizerLoaded;
 	private boolean soundbankLoaded;
-	
+
 	public MidiPortSynthesizer(Synthesizer synthesizer){
 		this.key = synthesizer.getDeviceInfo().getName();
 		this.name = synthesizer.getDeviceInfo().getName();
 		this.synthesizer = synthesizer;
 		this.receiver = new MidiPortSynthesizerReceiver(this);
 	}
-	
+
+	@Override
 	public String getKey() {
 		return this.key;
 	}
-	
+
+	@Override
 	public String getName() {
 		return this.name;
 	}
-	
+
+	@Override
 	public void open(){
 		getSynthesizer();
 	}
-	
+
+	@Override
 	public void close(){
 		if(this.synthesizer != null && this.synthesizer.isOpen()){
 			this.unloadSoundbank();
 			this.synthesizer.close();
 		}
 	}
-	
+
+	@Override
 	public MidiReceiver getReceiver(){
 		return this.receiver;
 	}
-	
+
+	@Override
 	public void check() throws MidiPlayerException{
 		if(!isSynthesizerLoaded()){
 			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.midi.unavailable"));
@@ -63,7 +69,7 @@ public void check() throws MidiPlayerException{
 			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.soundbank.unavailable"));
 		}
 	}
-	
+
 	public Synthesizer getSynthesizer() {
 		try {
 			if(!this.synthesizer.isOpen()){
@@ -73,11 +79,11 @@ public Synthesizer getSynthesizer() {
 					if(path != null){
 						this.loadSoundbank(new File(path));
 					}
-					
+
 					if(!isSoundbankLoaded( true )){
 						this.loadSoundbank( this.synthesizer.getDefaultSoundbank() );
 					}
-					
+
 					if(!isSoundbankLoaded( true )){
 						new SBAssistant(this).process();
 					}
@@ -89,7 +95,7 @@ public Synthesizer getSynthesizer() {
 		}
 		return this.synthesizer;
 	}
-	
+
 	public boolean loadSoundbank(File file){
 		try {
 			return loadSoundbank( MidiSystem.getSoundbank(file) );
@@ -98,13 +104,13 @@ public boolean loadSoundbank(File file){
 		}
 		return false;
 	}
-	
+
 	public boolean loadSoundbank(Soundbank sb) {
 		try {
 			if (sb != null && getSynthesizer().isSoundbankSupported(sb)){
 				//unload the old soundbank
 				this.unloadSoundbank();
-				
+
 				//load all soundbank instruments
 				this.soundbankLoaded = getSynthesizer().loadAllInstruments(sb);
 			}
@@ -113,11 +119,11 @@ public boolean loadSoundbank(Soundbank sb) {
 		}
 		return this.soundbankLoaded;
 	}
-	
+
 	public void unloadSoundbank(){
 		try {
 			this.soundbankLoaded = false;
-			
+
 			//unload all available instruments
 			Instrument[] available = this.synthesizer.getAvailableInstruments();
 			if(available != null){
@@ -125,7 +131,7 @@ public void unloadSoundbank(){
 					getSynthesizer().unloadInstrument(available[i]);
 				}
 			}
-			
+
 			//unload all loaded instruments
 			Instrument[] loaded = this.synthesizer.getLoadedInstruments();
 			if(loaded != null){
@@ -137,11 +143,11 @@ public void unloadSoundbank(){
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	public boolean isSynthesizerLoaded(){
 		return this.synthesizerLoaded;
 	}
-	
+
 	public boolean isSoundbankLoaded(boolean checkSynth){
 		if( checkSynth ){
 			Instrument[] loaded = this.synthesizer.getLoadedInstruments();
@@ -153,21 +159,21 @@ public boolean isSoundbankLoaded(boolean checkSynth){
 }
 
 class MidiPortSynthesizerReceiver implements MidiReceiver{
-	
+
 	private MidiPortSynthesizer port;
 	private MidiChannel[] channels;
-	
+
 	public MidiPortSynthesizerReceiver(MidiPortSynthesizer port){
 		this.port = port;
 	}
-	
+
 	private MidiChannel[] getChannels(){
 		if(this.channels == null && this.port.getSynthesizer() != null){
 			this.channels = this.port.getSynthesizer().getChannels();
 		}
 		return this.channels;
 	}
-	
+
 	public void sendSystemReset(){
 		if(getChannels() != null){
 			for(int i = 0;i < getChannels().length; i ++){
@@ -175,7 +181,8 @@ public void sendSystemReset(){
 			}
 		}
 	}
-	
+
+	@Override
 	public void sendAllNotesOff(){
 		if(getChannels() != null){
 			for(int channel = 0;channel < getChannels().length;channel ++){
@@ -183,31 +190,36 @@ public void sendAllNotesOff(){
 			}
 		}
 	}
-	
+
+	@Override
 	public void sendNoteOn(int channel, int key, int velocity){
 		if(getChannels() != null && channel >= 0 && channel < getChannels().length){
 			getChannels()[channel].noteOn(key, velocity);
 		}
 	}
-	
+
+	@Override
 	public void sendNoteOff(int channel, int key, int velocity){
 		if(getChannels() != null && channel >= 0 && channel < getChannels().length){
 			getChannels()[channel].noteOff(key, velocity);
 		}
 	}
-	
+
+	@Override
 	public void sendControlChange(int channel, int controller, int value){
 		if(getChannels() != null && channel >= 0 && channel < getChannels().length){
 			getChannels()[channel].controlChange(controller, value);
 		}
 	}
-	
+
+	@Override
 	public void sendProgramChange(int channel, int value){
 		if(getChannels() != null && channel >= 0 && channel < getChannels().length){
 			getChannels()[channel].programChange(value);
 		}
 	}
-	
+
+	@Override
 	public void sendPitchBend(int channel, int value){
 		if(getChannels() != null && channel >= 0 && channel < getChannels().length){
 			getChannels()[channel].setPitchBend( (value * 128) );
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
new file mode 100644
index 00000000..bb43dd22
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiReceiverImpl.java
@@ -0,0 +1,108 @@
+package org.herac.tuxguitar.player.impl.jsa.sequencer;
+
+import javax.sound.midi.MidiMessage;
+import javax.sound.midi.Receiver;
+import javax.sound.midi.ShortMessage;
+
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+
+public class MidiReceiverImpl implements Receiver{
+
+	private MidiSequencerImpl sequencer;
+
+	public MidiReceiverImpl(MidiSequencerImpl sequencer){
+		this.sequencer = sequencer;
+	}
+
+	@Override
+	public void send(MidiMessage message, long timeStamp) {
+		try {
+			if( this.sequencer.isRunning() ){
+				parseMessage(message.getMessage());
+			}
+		} catch (MidiPlayerException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void close(){
+		//not implemented
+	}
+
+	private void parseMessage(byte[] data) throws MidiPlayerException{
+		int length = data.length;
+
+		//NOTE ON
+		if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.NOTE_ON){
+			parseNoteOn(data);
+		}
+		//NOTE OFF
+		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.NOTE_OFF){
+			parseNoteOff(data);
+		}
+		//PROGRAM CHANGE
+		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.PROGRAM_CHANGE){
+			parseProgramChange(data);
+		}
+		//CONTROL CHANGE
+		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.CONTROL_CHANGE){
+			parseControlChange(data);
+		}
+		//PITCH BEND
+		else if((((length > 0)?(data[0] & 0xFF):0) & 0xF0) == ShortMessage.PITCH_BEND){
+			parsePitchBend(data);
+		}
+	}
+
+	private void parseNoteOn(byte[] data) throws MidiPlayerException{
+		int length = data.length;
+		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):0;
+		int value = (length > 1)?(data[1] & 0xFF):0;
+		int velocity = (length > 2)?(data[2] & 0xFF):0;
+
+		if(velocity == 0){
+			parseNoteOff(data);
+		}else if(value > 0){
+			this.sequencer.getTransmitter().sendNoteOn(channel,value,velocity);
+		}
+	}
+
+	private void parseNoteOff(byte[] data) throws MidiPlayerException{
+		int length = data.length;
+
+		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):0;
+		int value = (length > 1)?(data[1] & 0xFF):0;
+		int velocity = (length > 2)?(data[2] & 0xFF):0;
+
+		this.sequencer.getTransmitter().sendNoteOff(channel,value,velocity);
+	}
+
+	private void parseProgramChange(byte[] data) throws MidiPlayerException{
+		int length = data.length;
+		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
+		int instrument = (length > 1)?(data[1] & 0xFF):-1;
+		if(channel != -1 && instrument != -1){
+			this.sequencer.getTransmitter().sendProgramChange(channel,instrument);
+		}
+	}
+
+	private void parseControlChange(byte[] data) throws MidiPlayerException{
+		int length = data.length;
+		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
+		int control = (length > 1)?(data[1] & 0xFF):-1;
+		int value = (length > 2)?(data[2] & 0xFF):-1;
+		if(channel != -1 && control != -1 && value != -1){
+			this.sequencer.getTransmitter().sendControlChange(channel,control,value);
+		}
+	}
+
+	private void parsePitchBend(byte[] data) throws MidiPlayerException{
+		int length = data.length;
+		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
+		int value = (length > 2)?(data[2] & 0xFF):-1;
+		if(channel != -1 && value != -1){
+			this.sequencer.getTransmitter().sendPitchBend(channel,value);
+		}
+	}
+}
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
new file mode 100644
index 00000000..e637d2ba
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceHandlerImpl.java
@@ -0,0 +1,86 @@
+package org.herac.tuxguitar.player.impl.jsa.sequencer;
+
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MidiEvent;
+import javax.sound.midi.Sequence;
+import javax.sound.midi.Track;
+
+import org.herac.tuxguitar.player.base.MidiSequenceHandler;
+import org.herac.tuxguitar.player.impl.jsa.utils.MidiMessageUtils;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
+
+	private MidiSequenceLoader loader;
+	private Sequence sequence;
+	private Track[] midiTracks;
+
+	public MidiSequenceHandlerImpl(MidiSequenceLoader loader,int tracks){
+		super(tracks);
+		this.loader = loader;
+		this.init();
+	}
+
+	private void init(){
+		try {
+			this.sequence = new Sequence(Sequence.PPQ,(int)TGDuration.QUARTER_TIME);
+			this.midiTracks = new Track[getTracks()];
+			for (int i = 0; i < this.midiTracks.length; i++) {
+				this.midiTracks[i] = this.sequence.createTrack();
+			}
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public Sequence getSequence(){
+		return this.sequence;
+	}
+
+	public void addEvent(int track, MidiEvent event) {
+		if(track >= 0 && track < this.midiTracks.length){
+			this.midiTracks[track].add(event);
+		}
+	}
+
+	@Override
+	public void addControlChange(long tick,int track,int channel, int controller, int value) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.controlChange(channel, controller, value), tick ));
+	}
+
+	@Override
+	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.noteOff(channel, note, velocity), tick ));
+	}
+
+	@Override
+	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.noteOn(channel, note, velocity), tick ));
+	}
+
+	@Override
+	public void addPitchBend(long tick,int track,int channel, int value) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.pitchBend(channel, value), tick ));
+	}
+
+	@Override
+	public void addProgramChange(long tick,int track,int channel, int instrument) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.programChange(channel, instrument), tick ));
+	}
+
+	@Override
+	public void addTempoInUSQ(long tick,int track,int usq) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.tempoInUSQ(usq), tick ));
+	}
+
+	@Override
+	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.timeSignature(ts), tick ));
+	}
+
+	@Override
+	public void notifyFinish(){
+		this.loader.setSequence(getSequence());
+	}
+}
diff --git a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
similarity index 97%
rename from TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
rename to plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
index 7385f05f..64c51978 100644
--- a/TuxGuitar-viewer/src/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequenceLoader.java
@@ -3,7 +3,7 @@
 import javax.sound.midi.Sequence;
 
 public interface MidiSequenceLoader {
-	
+
 	public void setSequence(Sequence sequence);
-	
+
 }
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
new file mode 100644
index 00000000..a7dd24ca
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerImpl.java
@@ -0,0 +1,245 @@
+package org.herac.tuxguitar.player.impl.jsa.sequencer;
+
+import javax.sound.midi.Sequence;
+import javax.sound.midi.Sequencer;
+import javax.sound.midi.Track;
+import javax.sound.midi.Transmitter;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+import org.herac.tuxguitar.player.base.MidiSequenceHandler;
+import org.herac.tuxguitar.player.base.MidiSequencer;
+import org.herac.tuxguitar.player.base.MidiTransmitter;
+
+public class MidiSequencerImpl implements MidiSequencer,MidiSequenceLoader{
+
+	private static final int TICK_MOVE = 1;
+
+	private Object lock;
+	private Sequencer sequencer;
+	private Transmitter sequencerTransmitter;
+	private MidiTransmitter transmitter;
+
+	public MidiSequencerImpl(Sequencer sequencer){
+		this.lock = new Object();
+		this.sequencer = sequencer;
+	}
+
+	@Override
+	public synchronized void open() {
+		try {
+			if(!this.sequencer.isOpen()){
+				this.sequencer.open();
+				this.closeTransmitter();
+				this.openTransmitter();
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public synchronized void close() {
+		try {
+			if(this.sequencer.isOpen()){
+				this.sequencer.close();
+				this.closeTransmitter();
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	public void openTransmitter(){
+		try {
+			this.sequencerTransmitter = getSequencer().getTransmitter();
+			this.sequencerTransmitter.setReceiver( new MidiReceiverImpl(this) );
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	public void closeTransmitter(){
+		try {
+			if(this.sequencerTransmitter != null){
+				this.sequencerTransmitter.close();
+				this.sequencerTransmitter = null;
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	protected Sequencer getSequencer(boolean open) {
+		if( open ){
+			this.open();
+		}
+		return this.sequencer;
+	}
+
+	protected Sequencer getSequencer() {
+		return this.getSequencer(true);
+	}
+
+	@Override
+	public MidiSequenceHandler createSequence(int tracks) {
+		this.resetTracks();
+		return new MidiSequenceHandlerImpl(this,tracks);
+	}
+
+	public synchronized MidiTransmitter getTransmitter() {
+		return this.transmitter;
+	}
+
+	@Override
+	public synchronized void setTransmitter(MidiTransmitter transmitter) {
+		this.transmitter = transmitter;
+	}
+
+	@Override
+	public long getTickLength() {
+		try {
+			return getSequencer().getTickLength();
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+		return 0;
+	}
+
+	@Override
+	public long getTickPosition() {
+		try {
+			return (getSequencer().getTickPosition() + TICK_MOVE);
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+		return 0;
+	}
+
+	@Override
+	public void setTickPosition(long tickPosition) {
+		try {
+			this.getSequencer().setTickPosition(tickPosition - TICK_MOVE);
+			this.reset();
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public void setMute(int index, boolean mute) {
+		try {
+			getSequencer().setTrackMute(index, mute);
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public void setSolo(int index, boolean solo) {
+		try {
+			getSequencer().setTrackSolo(index, solo);
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public void setSequence(Sequence sequence){
+		try {
+			getSequencer().setSequence(sequence);
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public void start() {
+		try {
+			this.setRunning( true );
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public void stop() {
+		try {
+			this.setRunning( false );
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public boolean isRunning() {
+		try {
+			return ( getSequencer( false ) != null && getSequencer( false ).isRunning() );
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+		return false;
+	}
+
+	public void setRunning( boolean running ) {
+		try {
+			synchronized ( this.lock ) {
+				if( running && !this.isRunning() ){
+					this.getSequencer().start();
+				}else if( !running && this.isRunning() ){
+					this.getSequencer().stop();
+					this.reset();
+				}
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	public void reset(){
+		try {
+			this.getTransmitter().sendAllNotesOff();
+			for(int channel = 0; channel < 16;channel ++){
+				this.getTransmitter().sendPitchBend(channel, 64);
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	public void resetTracks(){
+		try {
+			Sequence sequence = this.getSequencer().getSequence();
+			if(sequence != null){
+				Track[] tracks = sequence.getTracks();
+				if( tracks != null ){
+					int count = tracks.length;
+					for( int i = 0 ; i < count; i++ ){
+						this.setSolo( i , false );
+						this.setMute( i , false );
+					}
+				}
+			}
+		} catch (Throwable throwable) {
+			throwable.printStackTrace();
+		}
+	}
+
+	@Override
+	public String getKey() {
+		return this.sequencer.getDeviceInfo().getName();
+	}
+
+	@Override
+	public String getName() {
+		return this.sequencer.getDeviceInfo().getName();
+	}
+
+	@Override
+	public void check() throws MidiPlayerException {
+		this.getSequencer( true );
+		if( this.sequencer == null || !this.sequencer.isOpen() ){
+			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.midi.unavailable"));
+		}
+	}
+}
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
new file mode 100644
index 00000000..d6743250
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/sequencer/MidiSequencerProviderImpl.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.player.impl.jsa.sequencer;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.sound.midi.MidiDevice;
+import javax.sound.midi.MidiSystem;
+import javax.sound.midi.MidiUnavailableException;
+import javax.sound.midi.Sequencer;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.player.base.MidiPlayerException;
+import org.herac.tuxguitar.player.base.MidiSequencer;
+import org.herac.tuxguitar.player.base.MidiSequencerProvider;
+
+public class MidiSequencerProviderImpl implements MidiSequencerProvider{
+
+	public MidiSequencerProviderImpl(){
+		super();
+	}
+
+	@Override
+	public List<MidiSequencer> listSequencers() throws MidiPlayerException {
+		try {
+			List<MidiSequencer> sequencers = new ArrayList<MidiSequencer>();
+			MidiDevice.Info[] infos = MidiSystem.getMidiDeviceInfo();
+			for(int i = 0; i < infos.length; i++){
+				try {
+					Iterator<MidiSequencer> it = sequencers.iterator();
+					boolean exists = false;
+					while(it.hasNext()){
+						if( it.next().getKey().equals(infos[i].getName()) ){
+							exists = true;
+							break;
+						}
+					}
+					if(!exists){
+						MidiDevice device = MidiSystem.getMidiDevice(infos[i]);
+						if(device instanceof Sequencer){
+							sequencers.add(new MidiSequencerImpl((Sequencer)device));
+						}
+					}
+				} catch (MidiUnavailableException e) {
+					throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.midi.unavailable"),e);
+				}
+			}
+			return sequencers;
+		}catch (Throwable t) {
+			throw new MidiPlayerException(TuxGuitar.getProperty("jsa.error.unknown"),t);
+		}
+	}
+
+	@Override
+	public void closeAll() throws MidiPlayerException {
+		// Not implemented
+	}
+}
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiConfigUtils.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiConfigUtils.java
new file mode 100644
index 00000000..2b503764
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiConfigUtils.java
@@ -0,0 +1,132 @@
+package org.herac.tuxguitar.player.impl.jsa.utils;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.system.config.TGConfigManager;
+import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
+import org.herac.tuxguitar.app.util.DialogUtils;
+import org.herac.tuxguitar.app.util.FileChooser;
+import org.herac.tuxguitar.app.util.MessageDialog;
+
+public class MidiConfigUtils {
+
+	public static final String SOUNDBANK_KEY = "soundbank.custom.path";
+
+	public static TGConfigManager getConfig(){
+		TGConfigManager config = new TGPluginConfigManager("tuxguitar-jsa");
+		config.init();
+		return config;
+	}
+
+	public static String getSoundbankPath(){
+		return getSoundbankPath(getConfig());
+	}
+
+	public static String getSoundbankPath(final TGConfigManager config){
+		return config.getStringConfigValue(SOUNDBANK_KEY);
+	}
+
+	public static void setupDialog(Shell parent) {
+		setupDialog(parent,getConfig());
+	}
+
+	public static void setupDialog(Shell parent,final TGConfigManager config) {
+		final String soundbank = getSoundbankPath(config);
+
+		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+		dialog.setLayout(new GridLayout());
+		dialog.setText(TuxGuitar.getProperty("jsa.settings.title"));
+
+		//------------------SOUNDBANK-----------------------
+
+		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
+		group.setLayout(new GridLayout());
+		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+		group.setText(TuxGuitar.getProperty("jsa.settings.soundbank.tip"));
+
+		final Button sbDefault = new Button(group,SWT.RADIO);
+		sbDefault.setText(TuxGuitar.getProperty("jsa.settings.soundbank.default"));
+		sbDefault.setSelection( (soundbank == null) );
+
+		final Button sbCustom = new Button(group,SWT.RADIO);
+		sbCustom.setText(TuxGuitar.getProperty("jsa.settings.soundbank.custom"));
+		sbCustom.setSelection( (soundbank != null) );
+
+		Composite chooser = new Composite(group,SWT.NONE);
+		chooser.setLayout(new GridLayout(2,false));
+
+		final Text sbCustomPath = new Text(chooser,SWT.BORDER);
+		sbCustomPath.setLayoutData(new GridData(350,SWT.DEFAULT));
+		sbCustomPath.setText( (soundbank == null ? new String() : soundbank)  );
+
+		final Button sbCustomChooser = new Button(chooser,SWT.PUSH);
+		sbCustomChooser.setImage(TuxGuitar.instance().getIconManager().getFileOpen());
+		sbCustomChooser.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				String fileName = FileChooser.instance().open(dialog,FileChooser.ALL_FORMATS);
+				if(fileName != null){
+					sbCustomPath.setText(fileName);
+				}
+			}
+		});
+
+		//------------------BUTTONS--------------------------
+		Composite buttons = new Composite(dialog, SWT.NONE);
+		buttons.setLayout(new GridLayout(2,false));
+		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
+
+		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
+		data.minimumWidth = 80;
+		data.minimumHeight = 25;
+
+		final Button buttonOK = new Button(buttons, SWT.PUSH);
+		buttonOK.setText(TuxGuitar.getProperty("ok"));
+		buttonOK.setLayoutData(data);
+		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				String selection = ( sbCustom.getSelection() ? sbCustomPath.getText() : null);
+
+				boolean changed = false;
+				changed = (selection == null && soundbank != null);
+				changed = changed || (selection != null && soundbank == null);
+				changed = changed || (selection != null && !selection.equals(soundbank) ) ;
+				if(changed){
+					if(selection != null){
+						config.setProperty(SOUNDBANK_KEY,selection);
+					}else{
+						config.removeProperty(SOUNDBANK_KEY);
+					}
+					config.save();
+
+					MessageDialog.infoMessage(TuxGuitar.getProperty("warning"), TuxGuitar.getProperty("jsa.settings.soundbank-restart-message"));
+				}
+				dialog.dispose();
+			}
+		});
+
+		Button buttonCancel = new Button(buttons, SWT.PUSH);
+		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
+		buttonCancel.setLayoutData(data);
+		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				dialog.dispose();
+			}
+		});
+
+		dialog.setDefaultButton( buttonOK );
+
+		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
+	}
+}
diff --git a/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
new file mode 100644
index 00000000..05b07145
--- /dev/null
+++ b/plugins/jsa/src/main/java/org/herac/tuxguitar/player/impl/jsa/utils/MidiMessageUtils.java
@@ -0,0 +1,115 @@
+package org.herac.tuxguitar.player.impl.jsa.utils;
+
+import javax.sound.midi.InvalidMidiDataException;
+import javax.sound.midi.MetaMessage;
+import javax.sound.midi.MidiMessage;
+import javax.sound.midi.ShortMessage;
+
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiMessageUtils {
+
+	public static final byte TICK_MOVE = 0x01;
+
+	private static int fixValue(int value){
+		int fixedValue = value;
+		fixedValue = Math.min(fixedValue,127);
+		fixedValue = Math.max(fixedValue,0);
+		return fixedValue;
+	}
+
+	private static int fixChannel(int channel){
+		int fixedChannel = channel;
+		fixedChannel = Math.min(fixedChannel,15);
+		fixedChannel = Math.max(fixedChannel,0);
+		return fixedChannel;
+	}
+
+	public static MidiMessage noteOn(int channel,int note,int velocity){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.NOTE_ON, fixChannel(channel), fixValue(note), fixValue(velocity));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage noteOff(int channel,int note,int velocity){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.NOTE_OFF, fixChannel(channel), fixValue(note), fixValue(velocity));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage controlChange(int channel,int controller,int value){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.CONTROL_CHANGE,fixChannel(channel),fixValue(controller), fixValue(value));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage programChange(int channel,int instrument){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.PROGRAM_CHANGE, fixChannel(channel), fixValue(instrument), 0);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage pitchBend(int channel,int value){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.PITCH_BEND, fixChannel(channel), 0, fixValue(value));
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage systemReset(){
+		try {
+			ShortMessage message = new ShortMessage();
+			message.setMessage(ShortMessage.SYSTEM_RESET);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage tempoInUSQ(int usq){
+		try {
+			MetaMessage message = new MetaMessage();
+			message.setMessage(0x51, new byte[]{ (byte)((usq >> 16) & 0x00FF),(byte)((usq >> 8) & 0x00FF),(byte)((usq) & 0x00FF) }, 3);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	public static MidiMessage timeSignature(TGTimeSignature ts){
+		try {
+			MetaMessage message = new MetaMessage();
+			message.setMessage(0x58, new byte[]{  (byte)ts.getNumerator(),(byte)ts.getDenominator().getIndex(),(byte)(96 / ts.getDenominator().getValue()),8 }, 4);
+			return message;
+		} catch (InvalidMidiDataException e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar-jsa/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/jsa/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-jsa/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/jsa/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-jsa/share/lang/messages.properties b/plugins/jsa/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-jsa/share/lang/messages.properties
rename to plugins/jsa/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-jsa/share/lang/messages_ja.properties b/plugins/jsa/src/main/resources/lang/messages_ja.properties
similarity index 100%
rename from TuxGuitar-jsa/share/lang/messages_ja.properties
rename to plugins/jsa/src/main/resources/lang/messages_ja.properties
diff --git a/TuxGuitar-jsa/share/lang/messages_sv.properties b/plugins/jsa/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-jsa/share/lang/messages_sv.properties
rename to plugins/jsa/src/main/resources/lang/messages_sv.properties
diff --git a/plugins/lilypond/pom.xml b/plugins/lilypond/pom.xml
new file mode 100644
index 00000000..72808639
--- /dev/null
+++ b/plugins/lilypond/pom.xml
@@ -0,0 +1,40 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-lilypond</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Lilypond</name>
+	<description>Lilypond plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java
similarity index 96%
rename from TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java
rename to plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java
index 077615e0..edfa67dc 100644
--- a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java
+++ b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondOutputStream.java
@@ -9,6 +9,7 @@
 import org.herac.tuxguitar.song.managers.TGSongManager;
 import org.herac.tuxguitar.song.models.TGBeat;
 import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
@@ -20,40 +21,39 @@
 import org.herac.tuxguitar.song.models.TGTempo;
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.TGVoice;
 import org.herac.tuxguitar.song.models.effects.TGEffectGrace;
 
 public class LilypondOutputStream {
-	
+
 	private static final String[] LILYPOND_SHARP_NOTES = new String[]{"c","cis","d","dis","e","f","fis","g","gis","a","ais","b"};
 	private static final String[] LILYPOND_FLAT_NOTES = new String[]{"c","des","d","ees","e","f","ges","g","aes","a","bes","b"};
-	
+
 	private static final String[] LILYPOND_KEY_SIGNATURES = new String[]{ "c","g","d","a","e","b","fis","cis","f","bes","ees","aes", "des", "ges","ces" };
-	
+
 	private static final String INDENT = new String("   ");
-	
+
 	// anything over high C should be printed 8vb
 	private static final int MAX_PITCH = 72;
-	
+
 	private TGSongManager manager;
-	
-	private PrintWriter writer;
-	
-	private LilypondSettings settings;
-	
-	private LilypondTempData temp;
-	
+
+	private final PrintWriter writer;
+
+	private final LilypondSettings settings;
+
+	private final LilypondTempData temp;
+
 	public LilypondOutputStream(OutputStream stream,LilypondSettings settings){
 		this.writer = new PrintWriter(stream);
 		this.temp = new LilypondTempData();
 		this.settings = settings;
 	}
-	
+
 	public void writeSong(TGSong song){
 		this.manager = new TGSongManager();
 		this.manager.setSong(song);
-		
+
 		this.addFunctions();
 		this.addVersion();
 		this.addPaper(song);
@@ -61,15 +61,15 @@ public void writeSong(TGSong song){
 		this.addCommands();
 		this.addSongDefinitions(song);
 		this.addSong(song);
-		
+
 		this.writer.flush();
 		this.writer.close();
 	}
-	
+
 	private void addVersion(){
 		this.writer.println("\\version \"" + this.settings.getLilypondVersion() + "\"");
 	}
-	
+
 	private void addFunctions(){
 		// tab-clear-tied-fret-numbers
 		this.writer.println("#(define (tie::tab-clear-tied-fret-numbers grob)");
@@ -77,7 +77,7 @@ private void addFunctions(){
 		this.writer.println(indent(2) + "(ly:grob-set-property! tied-fret-nr 'transparent #t)))");
 		this.writer.println();
 	}
-	
+
 	private void addCommands(){
 		// TODO: use "ly:gulp-file name" to add a custom header
 		if ( this.settings.getLilypondVersion().compareTo("2.13.17") < 0 ){
@@ -89,7 +89,7 @@ private void addCommands(){
 			this.writer.println(indent(5) + "(ly:music-property note 'tweaks)))))");
 			this.writer.println(indent(1) + "note)");
 			this.writer.println();
-	
+
 			// palmMute - native in 2.14
 			this.writer.println("palmMute = #(define-music-function (parser location note) (ly:music?)");
 			this.writer.println(indent(1) + "(set! (ly:music-property note 'tweaks)");
@@ -98,10 +98,10 @@ private void addCommands(){
 			this.writer.println();
 		}
 	}
-	
+
 	private void addPaper(TGSong song){
 		this.writer.println("\\paper {");
-		
+
 		this.writer.println(indent(1) + "indent = #" + (this.addTrackTitleOnGroup(song) ? 30 : 0));
 
 		if ( this.settings.getLilypondVersion().compareTo("2.11.60") < 0) {
@@ -113,7 +113,7 @@ private void addPaper(TGSong song){
 		this.writer.println(indent(1) + "ragged-bottom = #" + getLilypondBoolean(true));
 		this.writer.println("}");
 	}
-	
+
 	private void addHeader(TGSong song, String instrument, int indent){
 		this.writer.println(indent(indent) + "\\header {");
 		this.writer.println(indent(indent + 1) + "title = \"" + song.getName() + "\" ");
@@ -123,7 +123,7 @@ private void addHeader(TGSong song, String instrument, int indent){
 		}
 		this.writer.println(indent(indent) + "}");
 	}
-	
+
 	private void addLayout(){
 		this.writer.println("\\layout {");
 		this.writer.println(indent(1) + "\\context { \\Score");
@@ -149,7 +149,7 @@ private void addLayout(){
 		this.writer.println(indent(1) + "}");
 		this.writer.println("}");
 	}
-	
+
 	private void addSongDefinitions(TGSong song){
 		for(int i = 0; i < song.countTracks(); i ++){
 			TGTrack track = song.getTrack(i);
@@ -162,7 +162,7 @@ private void addSongDefinitions(TGSong song){
 			this.addStaffGroup(track,id);
 		}
 	}
-	
+
 	private void addSong(TGSong song){
 		int trackCount = song.countTracks();
 		if(this.settings.isTrackGroupEnabled() && trackCount > 1){
@@ -171,7 +171,7 @@ private void addSong(TGSong song){
 				this.writer.println(indent(1) + "<<");
 			}
 		}
-		
+
 		for(int i = 0; i < trackCount; i ++){
 			TGTrack track = song.getTrack(i);
 			if(this.settings.getTrack() == LilypondSettings.ALL_TRACKS || this.settings.getTrack() == track.getNumber()){
@@ -185,7 +185,7 @@ private void addSong(TGSong song){
 				}
 			}
 		}
-		
+
 		if(this.settings.isTrackGroupEnabled() && trackCount > 1){
 			if(this.settings.getTrack() == LilypondSettings.ALL_TRACKS){
 				this.writer.println(indent(1) + ">>");
@@ -194,7 +194,7 @@ private void addSong(TGSong song){
 			this.writer.println("}");
 		}
 	}
-	
+
 	private void addMusic(TGTrack track,String id){
 		for( int voice = 0 ; voice < TGBeat.MAX_VOICES ; voice ++ ){
 			this.writer.println(trackVoiceID(voice,id,"Music") + " = #(define-music-function (parser location inTab) (boolean?)");
@@ -204,7 +204,7 @@ private void addMusic(TGTrack track,String id){
 				int count = track.countMeasures();
 				for(int i = 0; i < count; i ++){
 					TGMeasure measure = track.getMeasure(i);
-					
+
 					int measureFrom = this.settings.getMeasureFrom();
 					int measureTo = this.settings.getMeasureTo();
 					if((measureFrom <= measure.getNumber() || measureFrom == LilypondSettings.FIRST_MEASURE) && (measureTo >= measure.getNumber() || measureTo == LilypondSettings.LAST_MEASURE )){
@@ -218,14 +218,14 @@ private void addMusic(TGTrack track,String id){
 			this.writer.println("#})");
 		}
 	}
-	
+
 	private void addScoreStaff(TGTrack track,String id){
 		boolean addLyrics = (this.settings.isLyricsEnabled() && !this.settings.isTablatureEnabled() && !track.getLyrics().isEmpty());
 		boolean addChordDiagrams = this.settings.isChordDiagramEnabled();
 		boolean addTexts = this.settings.isTextEnabled();
-		
+
 		this.writer.println(id + "Staff = \\new Staff <<" );
-		
+
 		for( int v = 0 ; v < TGBeat.MAX_VOICES ; v ++ ){
 			String vId =  trackVoiceID(v, id, "Music") ;
 			this.writer.println(indent(1) + "\\context Voice = \"" + vId + "\" {");
@@ -238,21 +238,21 @@ private void addScoreStaff(TGTrack track,String id){
 			this.writer.println(indent(2) + "\\" + vId + " #" + getLilypondBoolean( false ) );
 			this.writer.println(indent(1) + "}");
 		}
-		
+
 		if(addLyrics){
 			this.writer.println(indent(1) + "\\new Lyrics \\lyricsto \"" + trackVoiceID(0, id, "Music") + "\" \\" + id + "Lyrics");
 		}
-		
+
 		this.writer.println(">>");
 	}
-	
+
 	private void addTabStaff(TGTrack track,String id){
 		boolean addLyrics = (this.settings.isLyricsEnabled() && !track.getLyrics().isEmpty());
 		boolean addChordDiagrams = (this.settings.isChordDiagramEnabled() && !this.settings.isScoreEnabled());
 		boolean addTexts = (this.settings.isTextEnabled() && !this.settings.isScoreEnabled());
-		
+
 		this.writer.println(id + "TabStaff = \\new TabStaff " + getLilypondTuning(track) + " <<" );
-		
+
 		for( int v = 0 ; v < TGBeat.MAX_VOICES ; v ++ ){
 			String vId =  trackVoiceID(v, id, "Music") ;
 			this.writer.println(indent(1) + "\\context TabVoice = \"" + vId + "\" {");
@@ -264,14 +264,14 @@ private void addTabStaff(TGTrack track,String id){
 			}
 			this.writer.println(indent(2) + "\\" + vId + " #" + getLilypondBoolean( true ) );
 			this.writer.println(indent(1) + "}");
-			
+
 		}
 		if(addLyrics){
 			this.writer.println(indent(1) + "\\new Lyrics \\lyricsto \"" + trackVoiceID(0, id, "Music") + "\" \\" + id + "Lyrics");
 		}
 		this.writer.println(">>");
 	}
-	
+
 	private void addLyrics(TGTrack track,String id){
 		this.writer.println(id + "Lyrics = \\lyricmode {");
 		this.writer.println(indent(1) + "\\set ignoreMelismata = #" + getLilypondBoolean(true));
@@ -279,7 +279,7 @@ private void addLyrics(TGTrack track,String id){
 		if(skippedCount > 0){
 			this.writer.print(indent(1));
 			for(int i = 0 ; i <  skippedCount ; i ++){
-				this.writer.print("\\skip " + ((String)this.temp.getSkippedLyricBeats().get(i)) + " ");
+				this.writer.print("\\skip " + this.temp.getSkippedLyricBeats().get(i) + " ");
 			}
 			this.writer.println();
 		}
@@ -287,7 +287,7 @@ private void addLyrics(TGTrack track,String id){
 		this.writer.println(indent(1) + "\\unset ignoreMelismata");
 		this.writer.println("}");
 	}
-	
+
 	private void addStaffGroup(TGTrack track,String id){
 		this.writer.println(id + "StaffGroup = \\new StaffGroup <<");
 		if(this.addTrackTitleOnGroup(track.getSong())){
@@ -301,26 +301,26 @@ private void addStaffGroup(TGTrack track,String id){
 		}
 		this.writer.println(">>");
 	}
-	
+
 	private void addMeasure(TGMeasure measure,TGMeasure previous,int voice,int indent,boolean isLast){
 		if(previous == null || measure.getTempo().getValue() != previous.getTempo().getValue()){
 			this.addTempo(measure.getTempo(),indent);
 		}
-		
+
 		if(previous == null || measure.getClef() != previous.getClef()){
 			this.addClef(measure.getClef(),indent);
 		}
 		if(previous == null || measure.getKeySignature() != previous.getKeySignature()){
 			this.addKeySignature(measure.getKeySignature(),indent);
 		}
-		
+
 		if(previous == null || !measure.getTimeSignature().isEqual(previous.getTimeSignature())){
 			this.addTimeSignature(measure.getTimeSignature(),indent);
 		}
-		
+
 		// Set the specific voice
 		this.addMeasureVoice(measure,voice, (previous == null), indent);
-		
+
 		// Open repeat
 		if(measure.isRepeatOpen()){
 			this.addRepeatOpen(measure.getHeader(),indent);
@@ -337,9 +337,9 @@ else if(measure.getNumber() == 1){
 		if(!measure.isRepeatOpen() && measure.getHeader().getRepeatAlternative() > 0){
 			this.addRepeatAlternativeOpen(indent);
 		}
-		
+
 		this.addMeasureComponents(measure,voice,(this.temp.isRepeatOpen() || this.temp.isRepeatAlternativeOpen() ? (indent + 1): indent));
-		
+
 		// If is last alternative, we can close it now
 		if(this.temp.isRepeatAlternativeOpen() && this.temp.getRepeatAlternativeNumber() >= this.temp.getRepeatCount()){
 			this.addRepeatClose(indent);
@@ -355,17 +355,17 @@ else if(measure.getNumber() == 1){
 			this.addRepeatAlternativeClose(indent);
 		}
 	}
-	
+
 	private void addRepeatOpen(TGMeasureHeader measure,int indent){
 		// Close any existent first
 		this.addRepeatClose(indent);
 		this.addRepeatAlternativeClose(indent);
-		
+
 		this.checkRepeatCount(measure);
 		this.writer.println(indent(indent) + "\\repeat volta " + this.temp.getRepeatCount() + " {");
 		this.temp.setRepeatOpen(true);
 	}
-	
+
 	private void addRepeatClose(int indent){
 		if(this.temp.isRepeatOpen()){
 			this.writer.println(indent(indent) + "}");
@@ -375,7 +375,7 @@ private void addRepeatClose(int indent){
 			this.temp.setRepeatCount( 0 );
 		}
 	}
-	
+
 	private void addRepeatAlternativeOpen( int indent){
 		if(this.temp.isRepeatOpen() && !this.temp.isRepeatAlternativeOpen()){
 			this.temp.setRepeatAlternativeOpen( true );
@@ -390,7 +390,7 @@ private void addRepeatAlternativeOpen( int indent){
 			this.temp.setRepeatAlternativeNumber( this.temp.getRepeatAlternativeNumber() + 1 );
 		}
 	}
-	
+
 	private void addRepeatAlternativeClose(int indent){
 		if(this.temp.isRepeatAlternativeOpen()){
 			if(this.temp.getRepeatAlternativeNumber() > 0){
@@ -404,21 +404,21 @@ private void addRepeatAlternativeClose(int indent){
 			this.temp.setRepeatCount( 0 );
 		}
 	}
-	
+
 	private void addTempo(TGTempo tempo,int indent){
 		this.writer.println(indent(indent) + "\\tempo 4=" + tempo.getValue());
 	}
-	
+
 	private void addTimeSignature(TGTimeSignature ts,int indent){
 		this.writer.println(indent(indent) + "\\time " + ts.getNumerator() + "/" + ts.getDenominator().getValue());
 	}
-	
+
 	private void addKeySignature(int keySignature,int indent){
 		if(keySignature >= 0 && keySignature < LILYPOND_KEY_SIGNATURES.length){
 			this.writer.println(indent(indent) + "\\key " + LILYPOND_KEY_SIGNATURES[keySignature] + " \\major");
 		}
 	}
-	
+
 	private void addClef(int clef,int indent){
 		String clefName = "";
 		if(clef == TGMeasure.CLEF_TREBLE){
@@ -437,7 +437,7 @@ else if(clef == TGMeasure.CLEF_TENOR){
 			this.writer.println(indent(indent) + "\\clef #(if $inTab \"tab\" \"" + clefName + "_8\")");
 		}
 	}
-	
+
 	private void addMeasureVoice(TGMeasure measure, int voice , boolean force ,int indent){
 		boolean multipleVoices = hasMultipleVoices(measure);
 		if ( force || multipleVoices != this.temp.isMultipleVoices() ){
@@ -445,52 +445,52 @@ private void addMeasureVoice(TGMeasure measure, int voice , boolean force ,int i
 		}
 		this.temp.setMultipleVoices( multipleVoices );
 	}
-	
+
 	private void addMeasureComponents(TGMeasure measure,int voice,int indent){
 		this.writer.print(indent(indent));
 		this.addComponents(measure,voice);
 		this.writer.println();
 	}
-	
+
 	private void addComponents(TGMeasure measure,int vIndex){
 		int key = measure.getKeySignature();
 		TGBeat previous = null;
-		
+
 		for(int i = 0 ; i < measure.countBeats() ; i ++){
 			TGBeat beat = measure.getBeat( i );
 			TGVoice voice = beat.getVoice( vIndex );
 			if( !voice.isEmpty() ){
 				TGDivisionType divisionType = voice.getDuration().getDivision();
-				
+
 				if(previous != null && this.temp.isDivisionTypeOpen() && !divisionType.isEqual( previous.getVoice( vIndex ).getDuration().getDivision() )){
 					this.writer.print("} ");
 					this.temp.setDivisionTypeOpen(false);
 				}
-				
+
 				if(!this.temp.isDivisionTypeOpen() && !divisionType.isEqual(TGDivisionType.NORMAL)){
 					this.writer.print("\\times " + divisionType.getTimes() + "/" + divisionType.getEnters() + " {");
 					this.temp.setDivisionTypeOpen(true);
 				}
-				
+
 				this.addBeat(key, beat, voice);
-				
+
 				previous = beat;
 			}
 		}
-		// It Means that all voice beats are empty 
+		// It Means that all voice beats are empty
 		if( previous == null ){
 			this.writer.print("\\skip ");
 			this.addDuration( measure.getTimeSignature().getDenominator() );
 			this.writer.print("*" + measure.getTimeSignature().getNumerator() + " ");
 		}
-		
+
 		if(this.temp.isDivisionTypeOpen()){
 			this.writer.print("} ");
 			this.temp.setDivisionTypeOpen(false);
 		}
 	}
-	
-	private void addBeat(int key,TGBeat beat, TGVoice voice){		
+
+	private void addBeat(int key,TGBeat beat, TGVoice voice){
 		if(voice.isRestVoice()){
 			boolean skip = false;
 			for( int v = 0 ; v < beat.countVoices() ; v ++ ){
@@ -508,7 +508,7 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 			this.addEffectsBeforeBeat(voice);
 
 			int size = voice.countNotes();
-			
+
 			int ottava = 0;
 			for(int i = 0 ; i < size ; i ++){
 				TGNote note = voice.getNote(i);
@@ -525,24 +525,24 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 
 			for(int i = 0 ; i < size ; i ++){
 				TGNote note = voice.getNote(i);
-				
+
 				this.addEffectsBeforeNote(note);
-				
+
 				this.addKey(key, (beat.getMeasure().getTrack().getString(note.getString()).getValue() + note.getValue()) );
 				if(this.isAnyTiedTo(note)){
 					this.writer.print("~");
 				}
-				
+
 				this.addString(note.getString());
 				this.addEffectsOnNote(note.getEffect());
-				
+
 				if(size > 1){
 					this.writer.print(" ");
 				}
 			}
-			
+
 			this.writer.print(">");
-			
+
 			this.addDuration( voice.getDuration() );
 			this.addEffectsOnDuration( voice );
 			this.addEffectsOnBeat( voice );
@@ -550,7 +550,7 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 				this.addOttava(0);
 			}
 		}
-		
+
 		// Add Chord, if was not previously added in another voice
 		if( beat.isChordBeat() && !voice.isRestVoice() ){
 			boolean skip = false;
@@ -567,7 +567,7 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 				this.writer.print("\"");
 			}
 		}
-		
+
 		// Add Text, if was not previously added in another voice
 		if( beat.isTextBeat() ){
 			boolean skip = false;
@@ -578,7 +578,7 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 				this.writer.print("-\\tag #'texts ^\\markup {\"" + beat.getText().getValue() + "\"}");
 			}
 		}
-		
+
 		// Check if it's a lyric beat to skip
 		// For now we only support lyrics for first voice.
 		if( voice.getIndex() == 0 && !voice.isRestVoice() ){
@@ -586,28 +586,28 @@ private void addBeat(int key,TGBeat beat, TGVoice voice){
 				this.temp.addSkippedLyricBeat( getLilypondDuration(voice.getDuration()));
 			}
 		}
-		
+
 		this.writer.print(" ");
 	}
-	
+
 	private void addKey(int keySignature,int value){
 		this.writer.print( getLilypondKey(keySignature, value) );
 	}
-	
+
 	private void addString(int string){
 		this.writer.print("\\" + string);
 	}
-	
+
 	private void addOttava(int ottava){
 		this.writer.print(" \\ottava #" + ottava);
 		if (ottava != 0)
 			this.writer.print(" ");
 	}
-	
+
 	private void addDuration(TGDuration duration){
 		this.writer.print(getLilypondDuration(duration));
 	}
-	
+
 	private void addEffectsBeforeNote(TGNote note){
 		TGNoteEffect effect = note.getEffect();
 		if( effect.isDeadNote() ){
@@ -623,13 +623,13 @@ private void addEffectsBeforeNote(TGNote note){
 			this.writer.print("\\bendAfter #+6 ");
 		}
 	}
-	
+
 	private void addEffectsOnNote(TGNoteEffect effect){
 		if( effect.isHarmonic() ){
 			this.writer.print("\\harmonic");
 		}
 	}
-	
+
 	private void addEffectsOnDuration(TGVoice voice){
 		int tremoloPicking = -1;
 		for( int i = 0 ; i < voice.countNotes() ; i ++ ){
@@ -642,7 +642,7 @@ private void addEffectsOnDuration(TGVoice voice){
 			this.writer.print(":" + tremoloPicking );
 		}
 	}
-	
+
 	private void addEffectsOnBeat(TGVoice voice){
 		boolean hammer = false;
 		boolean slide = false;
@@ -654,7 +654,7 @@ private void addEffectsOnBeat(TGVoice voice){
 		boolean arpeggio = ( voice.getBeat().getStroke().getDirection() != TGStroke.STROKE_NONE );
 		for( int i = 0 ; i < voice.countNotes() ; i ++ ){
 			TGNoteEffect effect = voice.getNote(i).getEffect();
-			
+
 			hammer = (hammer || effect.isHammer() );
 			slide = (slide || effect.isSlide() );
 			trill = (trill || effect.isTrill() );
@@ -690,9 +690,9 @@ private void addEffectsOnBeat(TGVoice voice){
 			this.writer.print("\\arpeggio");
 		}
 	}
-	
+
 	private void addEffectsBeforeBeat(TGVoice voice){
-		List graceNotes = new ArrayList();
+		List<TGNote> graceNotes = new ArrayList<TGNote>();
 		for( int i = 0 ; i < voice.countNotes() ; i ++ ){
 			TGNote note = voice.getNote(i);
 			if( note.getEffect().isGrace() ){
@@ -702,14 +702,14 @@ private void addEffectsBeforeBeat(TGVoice voice){
 		if( !graceNotes.isEmpty() ){
 			this.writer.print("\\grace ");
 			this.writer.print("<");
-			
+
 			int duration = 0;
 			for( int i = 0 ; i < graceNotes.size() ; i ++ ){
-				TGNote note = (TGNote)graceNotes.get( i );
+				TGNote note = graceNotes.get( i );
 				TGMeasure measure = voice.getBeat().getMeasure();
 				TGString string = measure.getTrack().getString(note.getString());
 				TGEffectGrace grace = note.getEffect().getGrace();
-				
+
 				if( duration < TGDuration.SIXTY_FOURTH && grace.getDuration() == 1 ){
 					duration = TGDuration.SIXTY_FOURTH;
 				}else if( duration < TGDuration.THIRTY_SECOND && grace.getDuration() == 2 ){
@@ -728,7 +728,7 @@ private void addEffectsBeforeBeat(TGVoice voice){
 			this.writer.print(" ");
 		}
 	}
-	
+
 	private void checkRepeatCount(TGMeasureHeader header){
 		boolean alternativePresent = false;
 		TGMeasureHeader next = header;
@@ -746,7 +746,7 @@ private void checkRepeatCount(TGMeasureHeader header){
 			next = this.manager.getNextMeasureHeader(next);
 		}
 	}
-	
+
 	private boolean hasMultipleVoices( TGMeasure measure ){
 		int voiceCount = 0;
 		for( int voice = 0 ; voice < TGBeat.MAX_VOICES ; voice ++ ){
@@ -756,7 +756,7 @@ private boolean hasMultipleVoices( TGMeasure measure ){
 		}
 		return (voiceCount > 1);
 	}
-	
+
 	private boolean isVoiceAvailable( TGMeasure measure , int voice ){
 		for( int i = 0 ; i < measure.countBeats() ; i ++ ){
 			TGBeat beat = measure.getBeat( i );
@@ -766,7 +766,7 @@ private boolean isVoiceAvailable( TGMeasure measure , int voice ){
 		}
 		return false;
 	}
-	
+
 	private boolean isVoiceAvailable( TGTrack track , int voice ){
 		for( int i = 0 ; i < track.countMeasures() ; i ++ ){
 			TGMeasure measure = track.getMeasure( i );
@@ -776,7 +776,7 @@ private boolean isVoiceAvailable( TGTrack track , int voice ){
 		}
 		return false;
 	}
-	
+
 	private boolean addTrackTitleOnGroup(TGSong song){
 		if(this.settings.isTrackNameEnabled() && this.settings.isTrackGroupEnabled()){
 			if(this.settings.getTrack() == LilypondSettings.ALL_TRACKS && song.countTracks() > 1){
@@ -785,22 +785,22 @@ private boolean addTrackTitleOnGroup(TGSong song){
 		}
 		return false;
 	}
-	
+
 	private boolean isAnyTiedTo(TGNote note){
 		TGMeasure measure = note.getVoice().getBeat().getMeasure();
 		TGBeat beat = this.manager.getMeasureManager().getNextBeat( measure.getBeats(), note.getVoice().getBeat());
 		while( measure != null){
 			while( beat != null ){
 				TGVoice voice = beat.getVoice( note.getVoice().getIndex() );
-				
+
 				// If is a rest beat, all voice sounds must be stopped.
 				if(voice.isRestVoice()){
 					return false;
 				}
 				// Check if is there any note at same string.
-				Iterator it = voice.getNotes().iterator();
+				Iterator<TGNote> it = voice.getNotes().iterator();
 				while( it.hasNext() ){
-					TGNote current = (TGNote) it.next();
+					TGNote current = it.next();
 					if(current.getString() == note.getString()){
 						return current.isTiedNote();
 					}
@@ -814,7 +814,7 @@ private boolean isAnyTiedTo(TGNote note){
 		}
 		return false;
 	}
-	
+
 	private String indent(int level){
 		String indent = new String();
 		for(int i = 0; i < level; i ++){
@@ -822,11 +822,11 @@ private String indent(int level){
 		}
 		return indent;
 	}
-	
+
 	private String getLilypondBoolean(boolean value){
 		return (value ? "#t" : "#f");
 	}
-	
+
 	private String getLilypondKey(int keySignature , int value){
 		String[] LILYPOND_NOTES = (keySignature <= 7 ? LILYPOND_SHARP_NOTES : LILYPOND_FLAT_NOTES );
 		String key = (LILYPOND_NOTES[ value % 12 ]);
@@ -838,7 +838,7 @@ private String getLilypondKey(int keySignature , int value){
 		}
 		return key;
 	}
-	
+
 	private String getLilypondDuration(TGDuration value){
 		String duration = Integer.toString(value.getValue());
 		if(value.isDotted()){
@@ -849,7 +849,7 @@ else if(value.isDoubleDotted()){
 		}
 		return duration;
 	}
-	
+
 	private String getLilypondChordFret(int value){
 		if(value < 0){
 			return ("x");
@@ -859,13 +859,13 @@ private String getLilypondChordFret(int value){
 		}
 		return Integer.toString(value);
 	}
-	
+
 	private String getLilypondPitch(int value){
 		// ly:make-pitch octave note alter
-		// octave is specified by an integer, zero for the octave containing middle C. 
-		// note is a number indexing the global default scale, with 0 corresponding to 
-		// pitch C and 6 usually corresponding to pitch B. alter is a rational number 
-		// of 200-cent whole tones for alteration. 
+		// octave is specified by an integer, zero for the octave containing middle C.
+		// note is a number indexing the global default scale, with 0 corresponding to
+		// pitch C and 6 usually corresponding to pitch B. alter is a rational number
+		// of 200-cent whole tones for alteration.
 		//
 		// String retval = "(ly:make-pitch 1 5 0)";
 		int[] pitches = new int[]{0,0,1,1,2,3,3,4,4,5,5,6};
@@ -887,17 +887,17 @@ private String getLilypondPitch(int value){
 		retval += " " + alters[note];
 		return retval + ")";
 	}
-	
+
 	private String getLilypondTuning(TGTrack track){
 		String tuning = ("\\with { stringTunings = #`( ");
-		Iterator strings = track.getStrings().iterator();
+		Iterator<TGString> strings = track.getStrings().iterator();
 		while(strings.hasNext()){
-			TGString string = (TGString)strings.next();
+			TGString string = strings.next();
 			if ( this.settings.getLilypondVersion().compareTo("2.13.46") < 0) {
 				tuning += ( (string.getValue() - 60) + " ");
 			} else {
 				// 2.13.46: Change stringTunings from a list of semitones to a
-				// list of pitches (in scheme syntax).  There is the option of 
+				// list of pitches (in scheme syntax).  There is the option of
 				// pre-defining a custom tuning as follows instead.
 				// \makeStringTuning #'custom-tuning <c' g' d'' a''>
 				// TODO: if this is a normal guitar tuning, skip this whole thing
@@ -907,14 +907,14 @@ private String getLilypondTuning(TGTrack track){
 		tuning += (") }");
 		return tuning;
 	}
-	
+
 	private String getLilypondVoice(int voice){
 		if( voice == -1 ){
 			return "\\oneVoice";
 		}
 		return ( voice == 0 ? "\\voiceOne" : "\\voiceTwo" );
 	}
-	
+
 	private String toBase26(int value){
 		String result = new String();
 		int base = value;
@@ -924,30 +924,30 @@ private String toBase26(int value){
 		}
 		return ((char)(base + 'A') + result);
 	}
-	
+
 	private String trackID(int index, String suffix){
 		return ("Track" + this.toBase26(index) + suffix);
 	}
-	
+
 	private String trackVoiceID(int index, String prefix, String suffix){
 		return (prefix + "Voice" + this.toBase26(index) + suffix);
 	}
-	
+
 	protected class LilypondTempData{
-		
+
 		private int repeatCount;
 		private int repeatAlternativeNumber;
 		private boolean repeatOpen;
 		private boolean repeatAlternativeOpen;
 		private boolean divisionTypeOpen;
 		private boolean multipleVoices;
-		private List skippedLyricBeats;
-		
+		private final List<String> skippedLyricBeats;
+
 		protected LilypondTempData(){
-			this.skippedLyricBeats = new ArrayList();
+			this.skippedLyricBeats = new ArrayList<String>();
 			this.reset();
 		}
-		
+
 		public void reset(){
 			this.multipleVoices = false;
 			this.repeatCount = 0;
@@ -955,60 +955,60 @@ public void reset(){
 			this.divisionTypeOpen = false;
 			this.skippedLyricBeats.clear();
 		}
-		
+
 		public int getRepeatCount() {
 			return this.repeatCount;
 		}
-		
+
 		public void setRepeatCount(int repeatCount) {
 			this.repeatCount = repeatCount;
 		}
-		
+
 		public boolean isRepeatOpen() {
 			return this.repeatOpen;
 		}
-		
+
 		public void setRepeatOpen(boolean repeatOpen) {
 			this.repeatOpen = repeatOpen;
 		}
-		
+
 		public int getRepeatAlternativeNumber() {
 			return this.repeatAlternativeNumber;
 		}
-		
+
 		public void setRepeatAlternativeNumber(int repeatAlternativeNumber) {
 			this.repeatAlternativeNumber = repeatAlternativeNumber;
 		}
-		
+
 		public boolean isRepeatAlternativeOpen() {
 			return this.repeatAlternativeOpen;
 		}
-		
+
 		public void setRepeatAlternativeOpen(boolean repeatAlternativeOpen) {
 			this.repeatAlternativeOpen = repeatAlternativeOpen;
 		}
-		
+
 		public boolean isDivisionTypeOpen() {
 			return this.divisionTypeOpen;
 		}
-		
+
 		public void setDivisionTypeOpen(boolean divisionTypeOpen) {
 			this.divisionTypeOpen = divisionTypeOpen;
 		}
-		
+
 		public void setMultipleVoices( boolean multipleVoices ){
 			this.multipleVoices = multipleVoices;
 		}
-		
+
 		public boolean isMultipleVoices() {
 			return this.multipleVoices;
 		}
-		
+
 		public void addSkippedLyricBeat( String duration ){
 			this.skippedLyricBeats.add( duration );
 		}
-		
-		public List getSkippedLyricBeats(){
+
+		public List<String> getSkippedLyricBeats(){
 			return this.skippedLyricBeats;
 		}
 	}
diff --git a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java
similarity index 90%
rename from TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java
rename to plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java
index 46ec798b..eeb6c694 100644
--- a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java
+++ b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondPluginExporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class LilypondPluginExporter extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new LilypondSongExporter();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>, updates by b4dc0d3r";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "Lilypond exporter plugin";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "Lilypond exporter";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.1";
 	}
diff --git a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSettings.java b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSettings.java
similarity index 97%
rename from TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSettings.java
rename to plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSettings.java
index 952055b8..4b006e8a 100644
--- a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSettings.java
+++ b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSettings.java
@@ -1,17 +1,17 @@
 package org.herac.tuxguitar.io.lilypond;
 
 public class LilypondSettings {
-	
+
 	public static final int ALL_TRACKS = -1;
-	
+
 	public static final int FIRST_MEASURE = -1;
-	
+
 	public static final int LAST_MEASURE = -1;
-	
+
 	private String lilypondVersion;
 
 	private int track;
-	private int measureFrom;	
+	private int measureFrom;
 	private int measureTo;
 
 	private boolean trackGroupEnabled;
@@ -21,95 +21,95 @@ public class LilypondSettings {
 	private boolean lyricsEnabled;
 	private boolean chordDiagramEnabled;
 	private boolean textEnabled;
-	
+
 	public LilypondSettings(){
 		super();
 	}
-	
+
 	public String getLilypondVersion() {
 		return this.lilypondVersion;
 	}
-	
+
 	public void setLilypondVersion(String lilypondVersion) {
 		this.lilypondVersion = lilypondVersion;
 	}
-	
+
 	public int getMeasureFrom() {
 		return this.measureFrom;
 	}
-	
+
 	public void setMeasureFrom(int measureFrom) {
 		this.measureFrom = measureFrom;
 	}
-	
+
 	public int getMeasureTo() {
 		return this.measureTo;
 	}
-	
+
 	public void setMeasureTo(int measureTo) {
 		this.measureTo = measureTo;
 	}
-	
+
 	public int getTrack() {
 		return this.track;
 	}
-	
+
 	public void setTrack(int track) {
 		this.track = track;
 	}
-	
+
 	public boolean isTrackGroupEnabled() {
 		return this.trackGroupEnabled;
 	}
-	
+
 	public void setTrackGroupEnabled(boolean trackGroupEnabled) {
 		this.trackGroupEnabled = trackGroupEnabled;
 	}
-	
+
 	public boolean isTrackNameEnabled() {
 		return this.trackNameEnabled;
 	}
-	
+
 	public void setTrackNameEnabled(boolean trackNameEnabled) {
 		this.trackNameEnabled = trackNameEnabled;
 	}
-	
+
 	public boolean isScoreEnabled() {
 		return this.scoreEnabled;
 	}
-	
+
 	public void setScoreEnabled(boolean scoreEnabled) {
 		this.scoreEnabled = scoreEnabled;
 	}
-	
+
 	public boolean isTablatureEnabled() {
 		return this.tablatureEnabled;
 	}
-	
+
 	public void setTablatureEnabled(boolean tablatureEnabled) {
 		this.tablatureEnabled = tablatureEnabled;
 	}
-	
+
 	public boolean isLyricsEnabled() {
 		return this.lyricsEnabled;
 	}
-	
+
 	public void setLyricsEnabled(boolean lyricsEnabled) {
 		this.lyricsEnabled = lyricsEnabled;
 	}
-	
+
 	public boolean isChordDiagramEnabled() {
 		return this.chordDiagramEnabled;
 	}
-	
+
 	public void setChordDiagramEnabled(boolean chordDiagramEnabled) {
 		this.chordDiagramEnabled = chordDiagramEnabled;
 	}
-	
+
 	public boolean isTextEnabled() {
 		return this.textEnabled;
 	}
-	
+
 	public void setTextEnabled(boolean textEnabled) {
 		this.textEnabled = textEnabled;
 	}
@@ -120,7 +120,7 @@ public void check(){
 			this.setTablatureEnabled( true );
 		}
 	}
-	
+
 	public static LilypondSettings getDefaults(){
 		LilypondSettings settings = new LilypondSettings();
 		settings.setTrack(ALL_TRACKS);
diff --git a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSettingsDialog.java b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSettingsDialog.java
similarity index 98%
rename from TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSettingsDialog.java
rename to plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSettingsDialog.java
index 63de915b..ad7594d1 100644
--- a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSettingsDialog.java
+++ b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSettingsDialog.java
@@ -17,45 +17,45 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class LilypondSettingsDialog {
-	
+
 	private static final int STATUS_NONE = 0;
-	
+
 	private static final int STATUS_CANCELLED = 1;
-	
+
 	private static final int STATUS_ACCEPTED = 2;
-	
+
 	protected int status;
-	
+
 	public LilypondSettingsDialog(){
 		super();
 	}
-	
+
 	public LilypondSettings open() {
 		this.status = STATUS_NONE;
 		final LilypondSettings settings = LilypondSettings.getDefaults();
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout(2, false));
 		dialog.setText(TuxGuitar.getProperty("lilypond.options"));
-		
+
 		Composite columnLeft = new Composite(dialog, SWT.NONE);
 		columnLeft.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		columnLeft.setLayout(getColumnLayout());
-		
+
 		Composite columnRight = new Composite(dialog, SWT.NONE);
 		columnRight.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		columnRight.setLayout(getColumnLayout());
-		
+
 		//------------------TRACK SELECTION------------------
 		Group trackGroup = new Group(columnLeft ,SWT.SHADOW_ETCHED_IN);
 		trackGroup.setLayout(new GridLayout(2,false));
 		trackGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackGroup.setText(TuxGuitar.getProperty("lilypond.options.select-track.tip"));
-		
+
 		final Label trackLabel = new Label(trackGroup, SWT.NULL);
 		trackLabel.setText(TuxGuitar.getProperty("lilypond.options.select-track") + ":");
 		trackLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Combo trackCombo = new Combo(trackGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		trackCombo.setLayoutData(getComboData());
 		for(int number = 1; number <= TuxGuitar.instance().getSongManager().getSong().countTracks(); number ++){
@@ -63,46 +63,47 @@ public LilypondSettings open() {
 		}
 		trackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber() - 1);
 		trackCombo.setEnabled( settings.getTrack() != LilypondSettings.ALL_TRACKS );
-		
+
 		final Button trackAllCheck = new Button(trackGroup,SWT.CHECK);
 		trackAllCheck.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true,2,1));
 		trackAllCheck.setText(TuxGuitar.getProperty("lilypond.options.select-all-tracks"));
 		trackAllCheck.setSelection( settings.getTrack() == LilypondSettings.ALL_TRACKS );
-		
+
 		//------------------MEASURE RANGE------------------
 		Group measureGroup = new Group(columnLeft,SWT.SHADOW_ETCHED_IN);
 		measureGroup.setLayout(new GridLayout(2,false));
 		measureGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		measureGroup.setText(TuxGuitar.getProperty("lilypond.options.measure-range.tip"));
-		
+
 		final int minSelection = 1;
 		final int maxSelection = TuxGuitar.instance().getSongManager().getSong().countMeasureHeaders();
-		
+
 		Label measureFromLabel = new Label(measureGroup, SWT.NULL);
 		measureFromLabel.setText(TuxGuitar.getProperty("lilypond.options.measure-range.from"));
 		measureFromLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner measureFromSpinner = new Spinner(measureGroup, SWT.BORDER);
 		measureFromSpinner.setLayoutData(getSpinnerData());
 		measureFromSpinner.setMaximum(maxSelection);
 		measureFromSpinner.setMinimum(minSelection);
 		measureFromSpinner.setSelection(minSelection);
-		
+
 		Label measureToLabel = new Label(measureGroup, SWT.NULL);
 		measureToLabel.setText(TuxGuitar.getProperty("lilypond.options.measure-range.to"));
 		measureToLabel.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,false,true));
-		
+
 		final Spinner measureToSpinner = new Spinner(measureGroup, SWT.BORDER);
 		measureToSpinner.setLayoutData(getSpinnerData());
 		measureToSpinner.setMinimum(minSelection);
 		measureToSpinner.setMaximum(maxSelection);
 		measureToSpinner.setSelection(maxSelection);
-		
+
 		measureFromSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int fromSelection = measureFromSpinner.getSelection();
 				int toSelection = measureToSpinner.getSelection();
-				
+
 				if(fromSelection < minSelection){
 					measureFromSpinner.setSelection(minSelection);
 				}else if(fromSelection > toSelection){
@@ -111,6 +112,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 		measureToSpinner.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				int toSelection = measureToSpinner.getSelection();
 				int fromSelection = measureFromSpinner.getSelection();
@@ -121,39 +123,39 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-		
+
 		//------------------VERSION OPTIONS------------------
 		Group versionGroup = new Group(columnRight,SWT.SHADOW_ETCHED_IN);
 		versionGroup.setLayout(new GridLayout());
 		versionGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		versionGroup.setText(TuxGuitar.getProperty("lilypond.options.format-version"));
-		
+
 		final Text lilyVersion = new Text(versionGroup, SWT.LEFT | SWT.BORDER);
 		lilyVersion.setText(settings.getLilypondVersion());
 		lilyVersion.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		//------------------LAYOUT OPTIONS------------------
 		Group layoutGroup = new Group(columnRight,SWT.SHADOW_ETCHED_IN);
 		layoutGroup.setLayout(new GridLayout());
 		layoutGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		layoutGroup.setText(TuxGuitar.getProperty("lilypond.options.layout.tip"));
-		
+
 		final Button scoreCheck = new Button(layoutGroup,SWT.CHECK);
 		scoreCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		scoreCheck.setText(TuxGuitar.getProperty("lilypond.options.layout.enable-score"));
 		scoreCheck.setSelection(settings.isScoreEnabled());
-		
+
 		final Button tablatureCheck = new Button(layoutGroup,SWT.CHECK);
 		tablatureCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		tablatureCheck.setText(TuxGuitar.getProperty("lilypond.options.layout.enable-tablature"));
 		tablatureCheck.setSelection(settings.isTablatureEnabled());
-		
+
 		final Button trackGroupCheck = new Button(layoutGroup,SWT.CHECK);
 		trackGroupCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackGroupCheck.setText(TuxGuitar.getProperty("lilypond.options.layout.enable-track-groups"));
 		trackGroupCheck.setSelection(settings.isTrackGroupEnabled());
 		trackGroupCheck.setEnabled(settings.getTrack() == LilypondSettings.ALL_TRACKS);
-		
+
 		final Button trackNameCheck = new Button(layoutGroup,SWT.CHECK);
 		trackNameCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		trackNameCheck.setSelection(settings.isTrackNameEnabled());
@@ -168,13 +170,14 @@ public void widgetSelected(SelectionEvent e) {
 		textsCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		textsCheck.setSelection(settings.isTextEnabled());
 		textsCheck.setText(TuxGuitar.getProperty("lilypond.options.layout.enable-texts"));
-		
+
 		final Button chordDiagramsCheck = new Button(layoutGroup,SWT.CHECK);
 		chordDiagramsCheck.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		chordDiagramsCheck.setSelection(settings.isChordDiagramEnabled());
 		chordDiagramsCheck.setText(TuxGuitar.getProperty("lilypond.options.layout.enable-chord-diagrams"));
-		
+
 		tablatureCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!tablatureCheck.getSelection()){
 					scoreCheck.setSelection(true);
@@ -182,6 +185,7 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		scoreCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!scoreCheck.getSelection()){
 					tablatureCheck.setSelection(true);
@@ -189,25 +193,27 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		trackAllCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				trackLabel.setEnabled( !trackAllCheck.getSelection() );
 				trackCombo.setEnabled( !trackAllCheck.getSelection() );
 				trackGroupCheck.setEnabled( trackAllCheck.getSelection() );
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.RIGHT,SWT.FILL,true,true,2,1));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				LilypondSettingsDialog.this.status = STATUS_ACCEPTED;
-				
+
 				settings.setTrack( trackAllCheck.getSelection()?LilypondSettings.ALL_TRACKS:trackCombo.getSelectionIndex() + 1);
 				settings.setTrackGroupEnabled( trackAllCheck.getSelection()? trackGroupCheck.getSelection() : false);
 				settings.setTrackNameEnabled( trackNameCheck.getSelection() );
@@ -220,47 +226,48 @@ public void widgetSelected(SelectionEvent arg0) {
 				settings.setTextEnabled(textsCheck.getSelection());
 				settings.setLilypondVersion(lilyVersion.getText());
 				settings.check();
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				LilypondSettingsDialog.this.status = STATUS_CANCELLED;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return ( ( this.status == STATUS_ACCEPTED )? settings : null );
 	}
-	
+
 	private GridLayout getColumnLayout(){
 		GridLayout layout = new GridLayout();
 		layout.marginWidth = 0;
 		layout.marginHeight = 0;
 		return layout;
 	}
-	
+
 	private GridData getComboData(){
 		GridData data = new GridData(SWT.FILL,SWT.CENTER,true,true);
 		data.minimumWidth = 120;
 		return data;
 	}
-	
+
 	private GridData getSpinnerData(){
 		GridData data = new GridData(SWT.FILL,SWT.CENTER,true,true);
 		data.minimumWidth = 60;
 		return data;
 	}
-	
+
 	private GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
diff --git a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java
similarity index 94%
rename from TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java
rename to plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java
index eb0c0163..e6a3d576 100644
--- a/TuxGuitar-lilypond/src/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java
+++ b/plugins/lilypond/src/main/java/org/herac/tuxguitar/io/lilypond/LilypondSongExporter.java
@@ -8,27 +8,32 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class LilypondSongExporter implements TGLocalFileExporter{
-	
+
 	private OutputStream stream;
 	private LilypondSettings settings;
-	
+
+	@Override
 	public String getExportName() {
 		return "Lilypond";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Lilypond","*.ly");
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		this.settings = (setDefaults ? LilypondSettings.getDefaults() : new LilypondSettingsDialog().open());
 		return (this.settings != null);
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) {
 		if(this.stream != null && this.settings != null){
 			new LilypondOutputStream(this.stream,this.settings).writeSong(song);
diff --git a/TuxGuitar-lilypond/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/lilypond/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-lilypond/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/lilypond/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-lilypond/share/lang/messages.properties b/plugins/lilypond/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-lilypond/share/lang/messages.properties
rename to plugins/lilypond/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-lilypond/share/lang/messages_ja.properties b/plugins/lilypond/src/main/resources/lang/messages_ja.properties
similarity index 100%
rename from TuxGuitar-lilypond/share/lang/messages_ja.properties
rename to plugins/lilypond/src/main/resources/lang/messages_ja.properties
diff --git a/TuxGuitar-lilypond/share/lang/messages_sv.properties b/plugins/lilypond/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-lilypond/share/lang/messages_sv.properties
rename to plugins/lilypond/src/main/resources/lang/messages_sv.properties
diff --git a/plugins/midi-input/pom.xml b/plugins/midi-input/pom.xml
new file mode 100644
index 00000000..4d5f47d5
--- /dev/null
+++ b/plugins/midi-input/pom.xml
@@ -0,0 +1,40 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-midi-input</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: MIDI input</name>
+	<description>MIDI input plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiBuffer.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiBuffer.java
similarity index 90%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiBuffer.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiBuffer.java
index 40d0bbf8..2b7ec4c1 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiBuffer.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiBuffer.java
@@ -13,12 +13,12 @@
 
 class MiBuffer
 {
-	private ArrayList	f_Notes			= new ArrayList();	// time-ordered list of notes
-	private ArrayList	f_NoteOffMap	= new ArrayList();	// time-ordered map of NOTE_OFF events
+	private final ArrayList<MiNote>	f_Notes			= new ArrayList<MiNote>();	// time-ordered list of notes
+	private final ArrayList<MiNote>	f_NoteOffMap	= new ArrayList<MiNote>();	// time-ordered map of NOTE_OFF events
 	private	long		f_StartTime		= -1;				// first MIDI time stamp [microseconds]
 	private	long		f_StopTime		= -1;				// last MIDI time stamp [microseconds]
 
-	private	boolean		s_TESTING = true;
+	private final	boolean		s_TESTING = true;
 
 
 	public void startRecording(long inTimeStamp)
@@ -46,9 +46,9 @@ public void addEvent(byte inString, byte inFret, byte inPitch, byte inVelocity,
 	}
 
 
-	static void	dump(ArrayList inList, String inTitle)
+	static void	dump(ArrayList<MiNote> inList, String inTitle)
 	{
-	Iterator	it = inList.iterator();
+	Iterator<MiNote>	it = inList.iterator();
 
 	System.out.println();
 	System.out.println("dumping " + inTitle + "...");
@@ -58,7 +58,7 @@ static void	dump(ArrayList inList, String inTitle)
 
 	while(it.hasNext())
 		{
-		MiNote	n = (MiNote)it.next();
+		MiNote	n = it.next();
 
 		System.out.println(
 			"str: "		+ n.getString() +
@@ -192,20 +192,20 @@ public int	finalize(byte inMinVelocity, long inMinDuration)
 
 		}
 
-	Iterator	onIt;
+	Iterator<MiNote>	onIt;
 
 	// determine notes duration
 	onIt = f_Notes.iterator();
 	while(onIt.hasNext())
 		{
-		MiNote	on = (MiNote)onIt.next();
+		MiNote	on = onIt.next();
 
-		Iterator	offIt = f_NoteOffMap.iterator();
+		Iterator<MiNote>	offIt = f_NoteOffMap.iterator();
 		boolean		found = false;
 
 		while(offIt.hasNext() && !found)
 			{
-			MiNote	off = (MiNote)offIt.next();
+			MiNote	off = offIt.next();
 
 			if(	on.getString()	== off.getString() &&
 				on.getFret()	== off.getFret())
@@ -225,7 +225,7 @@ public int	finalize(byte inMinVelocity, long inMinDuration)
 	onIt = f_Notes.iterator();
 	while(onIt.hasNext())
 		{
-		MiNote	on = (MiNote)onIt.next();
+		MiNote	on = onIt.next();
 /*
 		System.out.println(
 				"str: "		+ on.getString() +
@@ -258,11 +258,11 @@ public TGChord	toChord(int inStringsCount)
 	{
 	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
 	TGChord			tgChord		= tgSongMgr.getFactory().newChord(inStringsCount);
-	Iterator		it			= f_Notes.iterator();
+	Iterator<MiNote>		it			= f_Notes.iterator();
 
 	while(it.hasNext())
 		{
-		MiNote	note = (MiNote)it.next();
+		MiNote	note = it.next();
 
 		tgChord.addFretValue(note.getString() - 1, note.getFret());
 		}
@@ -275,11 +275,11 @@ public TGBeat	toBeat()
 	{
 	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
 	TGBeat			tgBeat		= tgSongMgr.getFactory().newBeat();
-	Iterator		it			= f_Notes.iterator();
+	Iterator<MiNote>		it			= f_Notes.iterator();
 
 	while(it.hasNext())
 		{
-		MiNote	note	= (MiNote)it.next();
+		MiNote	note	= it.next();
 		TGNote	tgNote	= tgSongMgr.getFactory().newNote();
 
 		tgNote.setString(note.getString());
@@ -291,14 +291,14 @@ public TGBeat	toBeat()
 	}
 
 
-	public TreeSet	toPitchesSet()
+	public TreeSet<Byte>	toPitchesSet()
 	{
-	TreeSet		pitches	= new TreeSet();
-	Iterator	it		= f_Notes.iterator();
+	TreeSet<Byte>		pitches	= new TreeSet<Byte>();
+	Iterator<MiNote>	it		= f_Notes.iterator();
 
 	while(it.hasNext())
 		{
-		MiNote	note = (MiNote)it.next();
+		MiNote	note = it.next();
 
 		pitches.add(new Byte(note.getPitch()));
 		}
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiConfig.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiConfig.java
similarity index 98%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiConfig.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiConfig.java
index 12f50592..60f55ed1 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiConfig.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiConfig.java
@@ -22,7 +22,7 @@
 
 class MiConfig
 {
-	private			TGConfigManager	f_Config;
+	private final			TGConfigManager	f_Config;
 	static final	String			KEY_MIDI_INPUT_PORT		= "midi.input.port";
 	static final	String			KEY_MIDI_BASE_CHANNEL	= "midi.input.base.channel";
 	static final	String			KEY_MIN_VELOCITY		= "midi.input.min.velocity";
@@ -98,7 +98,7 @@ static TGConfigManager	getConfig()
 	void	showDialog(Shell parent)
 	{
 	try {
-		final List		portsNames			= MiPortProvider.listPortsNames();
+		final List<String>	portsNames		= MiPortProvider.listPortsNames();
 		final String	currPortName		= getMidiInputPortName();
 		final int		currBaseChannel		= getMidiBaseChannel();
 		final int		currMinVelocity		= getMinVelocity();
@@ -126,7 +126,7 @@ void	showDialog(Shell parent)
 
 		for(int i = 0 ; i < portsNames.size(); i++)
 			{
-			String	portName = (String)portsNames.get(i);
+			String	portName = portsNames.get(i);
 
 			cmbPort.add(portName);
 
@@ -256,13 +256,14 @@ void	showDialog(Shell parent)
 		buttonOK.setLayoutData(data);
 		buttonOK.addSelectionListener(new SelectionAdapter()
 			{
+			@Override
 			public void widgetSelected(SelectionEvent arg0)
 				{
 				int		portSelection = cmbPort.getSelectionIndex();
 
 				if(portSelection >= 0 && portSelection < portsNames.size())
 					{
-					String	portName = (String)portsNames.get(portSelection);
+					String	portName = portsNames.get(portSelection);
 
 					s_Instance.f_Config.setProperty(KEY_MIDI_INPUT_PORT, portName);
 					s_Instance.f_Config.save();
@@ -346,6 +347,7 @@ public void widgetSelected(SelectionEvent arg0)
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(data);
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiException.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiException.java
similarity index 100%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiException.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiException.java
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiNote.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiNote.java
similarity index 100%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiNote.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiNote.java
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPanel.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPanel.java
similarity index 98%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPanel.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPanel.java
index 72aa5000..5c0e1e8d 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPanel.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPanel.java
@@ -10,7 +10,6 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.util.DialogUtils;
 import org.herac.tuxguitar.app.util.MessageDialog;
@@ -91,6 +90,7 @@ void	showDialog(Shell parent)
 			f_CmbMode.select(MiConfig.instance().getMode());
 
 			f_CmbMode.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					int		mode = f_CmbMode.getSelectionIndex();
 
@@ -111,6 +111,7 @@ public void widgetSelected(SelectionEvent arg0) {
 
 			f_BtnConfig.setText(TuxGuitar.getProperty("midiinput.panel.button.config"));
 			f_BtnConfig.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					MiConfig.instance().showDialog(f_Dialog);
 				}
@@ -129,6 +130,7 @@ public void widgetSelected(SelectionEvent arg0) {
 
 			f_BtnRecord.setText(TuxGuitar.getProperty("midiinput.panel.button.start"));
 			f_BtnRecord.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					MiRecorder.instance().start();
 					updateControls();
@@ -141,6 +143,7 @@ public void widgetSelected(SelectionEvent arg0) {
 
 			f_BtnStop.setText(TuxGuitar.getProperty("midiinput.panel.button.stop"));
 			f_BtnStop.addSelectionListener(new SelectionAdapter() {
+				@Override
 				public void widgetSelected(SelectionEvent arg0) {
 					MiRecorder.instance().stop();
 					updateControls();
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPort.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPort.java
similarity index 97%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPort.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPort.java
index b0b41648..d34dc3f1 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPort.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPort.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.midiinput;
 
 import javax.sound.midi.MidiDevice;
-import javax.sound.midi.Transmitter;
-import javax.sound.midi.Receiver;
 import javax.sound.midi.MidiMessage;
+import javax.sound.midi.Receiver;
 import javax.sound.midi.ShortMessage;
+import javax.sound.midi.Transmitter;
 
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.util.TGSynchronizer;
@@ -14,7 +14,7 @@ public class MiPort
 {
 	private MidiDevice	f_Device;
 	private Transmitter	f_Transmitter;
-	
+
 	private static MiPort	s_NotesPort;
 	private static MiPort	s_ControlPort;
 
@@ -47,6 +47,7 @@ protected synchronized void openPort()
 		if(!f_Device.isOpen()) {
 			final MidiDevice device = f_Device;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					device.open();
 					}
@@ -56,6 +57,7 @@ public void run() throws Throwable {
 		if(f_Transmitter == null) {
 			final MidiDevice device = f_Device;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					connectTransmitter(device.getTransmitter());
 					}
@@ -75,6 +77,7 @@ protected synchronized void closePort()
 		if(f_Transmitter != null) {
 			final Transmitter transmitter = f_Transmitter;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					transmitter.close();
 					connectTransmitter(null);
@@ -85,6 +88,7 @@ public void run() throws Throwable {
 		if(f_Device.isOpen()) {
 			final MidiDevice device = f_Device;
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() throws Throwable {
 					device.close();
 					}
@@ -146,18 +150,20 @@ public static void setControlPort(String inDeviceName)
 	/*
 	 *	javax.sound.midi.Receiver implementation
 	 */
-	
+
+	@Override
 	public void close()
-	{	
+	{
 	}
 
 
+	@Override
 	public void send(MidiMessage inMessage, long inTimeStamp)
 	{
 	if(inMessage instanceof ShortMessage)
 		{
 		ShortMessage	mm = (ShortMessage)inMessage;
-		
+
 		switch(mm.getCommand())
 			{
 			case ShortMessage.NOTE_ON:
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPortProvider.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPortProvider.java
similarity index 88%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPortProvider.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPortProvider.java
index e7c223c4..9dcb0fb8 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiPortProvider.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiPortProvider.java
@@ -12,22 +12,22 @@
 import org.herac.tuxguitar.app.TuxGuitar;
 
 public class MiPortProvider
-{	
-	public static List listPortsNames() throws MiException
+{
+	public static List<String> listPortsNames() throws MiException
 	{
 	try {
-		ArrayList			portsNames	= new ArrayList();
+		ArrayList<String>			portsNames	= new ArrayList<String>();
 		MidiDevice.Info[]	infos		= MidiSystem.getMidiDeviceInfo();
-		
+
 		for(int i = 0; i < infos.length; i++)
 			{
 			try {
-				Iterator	it		= portsNames.iterator();
+				Iterator<String>	it		= portsNames.iterator();
 				boolean		exists	= false;
-				
+
 				while(it.hasNext())
 					{
-					if(((String)it.next()).equals(infos[i].getName()))
+					if(it.next().equals(infos[i].getName()))
 						{
 						exists = true;
 						break;
@@ -51,7 +51,7 @@ public static List listPortsNames() throws MiException
 				throw new MiException(TuxGuitar.getProperty("midiinput.error.midi.unavailable"), mue);
 				}
 			}
-		
+
 		return portsNames;
 		}
 	catch(Throwable t)
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiProvider.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiProvider.java
similarity index 97%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiProvider.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiProvider.java
index e588e56a..344a4f03 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiProvider.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiProvider.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.midiinput;
 
-import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
-
+import java.awt.event.ActionListener;
 import java.util.Iterator;
 import java.util.TreeSet;
+
 import javax.sound.midi.ShortMessage;
 import javax.swing.Timer;
 
@@ -18,15 +18,13 @@
 import org.herac.tuxguitar.app.util.MessageDialog;
 import org.herac.tuxguitar.graphics.control.TGMeasureImpl;
 import org.herac.tuxguitar.graphics.control.TGTrackImpl;
-
 import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.models.TGBeat;
 import org.herac.tuxguitar.song.models.TGChord;
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGNote;
 import org.herac.tuxguitar.song.models.TGString;
 import org.herac.tuxguitar.song.models.TGVoice;
-import org.herac.tuxguitar.song.models.TGBeat;
-
 import org.herac.tuxguitar.util.TGSynchronizer;
 
 public class MiProvider
@@ -39,7 +37,7 @@ public class MiProvider
 private byte		f_MinVelocity	= MiConfig.DEF_VELOCITY_THRESHOLD;	// notes with velocity lower than this threshold are considered unwanted noise
 private long		f_MinDuration	= MiConfig.DEF_DURATION_THRESHOLD;	// notes with duration lower than this threshold are considered unwanted noise
 
-private int[]		f_EchoNotes		= new int[6];					// list of notes for echo
+private final int[]		f_EchoNotes		= new int[6];					// list of notes for echo
 private	Timer		f_EchoTimer		= null;							// timer for echo rendering
 private int			f_EchoTimeOut	= MiConfig.DEF_ECHO_TIMEOUT;	// time out for echo rendering [msec]
 private boolean		f_EchoLastWasOn	= false;						// indicates if last note message was NOTE_ON
@@ -48,7 +46,7 @@ public class MiProvider
 private	Timer		f_InputTimer	= null;							// timer for chord/scale input
 private int			f_InputTimeOut	= MiConfig.DEF_INPUT_TIMEOUT;	// time out for chord/scale input [msec]
 
-private	MiBuffer	f_Buffer		= new MiBuffer();				// input notes buffer
+private final	MiBuffer	f_Buffer		= new MiBuffer();				// input notes buffer
 
 static private	MiProvider	s_Instance;
 
@@ -88,7 +86,7 @@ public void	setMode(int inValue)
 	public void	echo_ResetNotes()
 	{
 	f_EchoLastWasOn = false;
-		
+
 	for(int s = 0; s < f_EchoNotes.length; s++)
 		f_EchoNotes[s] = -1;
 	}
@@ -147,17 +145,17 @@ public void	noteReceived(ShortMessage inMessage, long inTimeStamp)
 						case MiConfig.MODE_FRETBOARD_ECHO:
 							echo(stringIndex, fretIndex, false);
 							break;
-	
+
 						case MiConfig.MODE_CHORDS_RECORDING:
 							echo(stringIndex, fretIndex, false);
 							chord_AddNote(stringIndex, fretIndex, pitch, (byte)0, inTimeStamp);
 							break;
-	
+
 						case MiConfig.MODE_SCALES_RECOGNITION:
 							echo(stringIndex, fretIndex, false);
 							scale_AddNote(stringIndex, fretIndex, pitch, (byte)0, inTimeStamp);
 							break;
-	
+
 						case MiConfig.MODE_SONG_RECORDING:
 							echo(stringIndex, fretIndex, false);
 							MiRecorder.instance().addNote(stringIndex, fretIndex, pitch, (byte)0, inTimeStamp);
@@ -231,6 +229,7 @@ private void	echo_UpdateExternalBeat(boolean inIsEmpty)
 	if(inIsEmpty)
 		{
 		task = new TGSynchronizer.TGRunnable() {
+			@Override
 			public void run() throws Throwable {
 				TuxGuitar.instance().hideExternalBeat();
 				}
@@ -239,6 +238,7 @@ public void run() throws Throwable {
 	else
 		{
 		task = new TGSynchronizer.TGRunnable() {
+			@Override
 			public void run() throws Throwable {
 				TuxGuitar.instance().showExternalBeat(f_EchoBeat);
 				}
@@ -264,7 +264,7 @@ private void	echo_BuildAndShowBeat(int inString, int inFret, boolean inIsOn)
 	f_EchoLastWasOn = inIsOn;
 
 	TGSongManager	songMgr	= TuxGuitar.instance().getSongManager();
-	
+
 	f_EchoBeat = songMgr.getFactory().newBeat();
 
 	for(int s = 0; s < f_EchoNotes.length; s++)
@@ -281,13 +281,14 @@ private void	echo_BuildAndShowBeat(int inString, int inFret, boolean inIsOn)
 
 	echo_UpdateExternalBeat(false);
 	}
-	
+
 
 	private void	echo(int inString, int inFret, boolean inIsNoteOn)
 	{
 	if(f_EchoTimer == null)
 		{
 		ActionListener taskPerformer = new ActionListener() {
+			@Override
 			public void actionPerformed(ActionEvent evt)
 				{
 				if(f_EchoLastWasOn)
@@ -323,6 +324,7 @@ private void	chord_AddNote(byte inString, byte inFret, byte inPitch, byte inVelo
 	if(f_InputTimer == null)
 		{
 		ActionListener taskPerformer = new ActionListener() {
+			@Override
 			public void actionPerformed(ActionEvent evt) {
 				f_InputTimer.stop();
 				f_InputTimer = null;
@@ -354,11 +356,11 @@ public void actionPerformed(ActionEvent evt) {
 							songMgr.getMeasureManager().cleanBeat(beat);
 
 							TGVoice		voice	= beat.getVoice(caret.getVoice());
-							Iterator	it		= track.getStrings().iterator();
+							Iterator<TGString>	it		= track.getStrings().iterator();
 
 							while(it.hasNext())
 								{
-								TGString	string	= (TGString)it.next();
+								TGString	string	= it.next();
 								int			value	= chord.getFretValue(string.getNumber() - 1);
 
 								if(value >= 0)
@@ -375,7 +377,7 @@ public void actionPerformed(ActionEvent evt) {
 									}
 								}
 							}
-							
+
 						songMgr.getMeasureManager().addChord(beat, chord);
 						TuxGuitar.instance().getFileHistory().setUnsavedFile();
 						editor.getTablature().updateMeasure(measure.getNumber());
@@ -388,7 +390,7 @@ public void actionPerformed(ActionEvent evt) {
 					}
 				}
 			};
-		
+
 		if(inVelocity > 0)
 			{
 			//System.out.println("New chord");
@@ -408,13 +410,14 @@ public void actionPerformed(ActionEvent evt) {
 			f_InputTimer.restart();
 		}
 	}
-	
+
 
 	private void	scale_AddNote(byte inString, byte inFret, byte inPitch, byte inVelocity, long inTimeStamp)
 	{
 	if(f_InputTimer == null)
 		{
 		ActionListener taskPerformer = new ActionListener() {
+			@Override
 			public void actionPerformed(ActionEvent evt) {
 				f_InputTimer.stop();
 				f_InputTimer = null;
@@ -425,7 +428,7 @@ public void actionPerformed(ActionEvent evt) {
 				if(f_Buffer.finalize(f_MinVelocity, f_MinDuration * 1000) > 0)
 					{
 					TGBeat		beat		= f_Buffer.toBeat();
-					TreeSet		pitches		= f_Buffer.toPitchesSet();
+					TreeSet<Byte>	pitches	= f_Buffer.toPitchesSet();
 
 					MiScaleFinder.findMatchingScale(pitches);
 					TuxGuitar.instance().showExternalBeat(beat);
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiRecorder.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiRecorder.java
similarity index 99%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiRecorder.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiRecorder.java
index f8659507..55d3ae42 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiRecorder.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiRecorder.java
@@ -104,7 +104,7 @@ public void		stop()
 
 	TuxGuitar.instance().getAction(TransportStopAction.NAME).process(null);
 	TuxGuitar.instance().getPlayer().setMetronomeEnabled(f_SavedMetronomeStatus);
-	
+
 	// qui deve cancellare la traccia di servizio...
 	tgSongMgr.removeTrack(f_TempTrack);
 
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiScaleFinder.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiScaleFinder.java
similarity index 92%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiScaleFinder.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiScaleFinder.java
index 258e47c9..1bb43eac 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiScaleFinder.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiScaleFinder.java
@@ -2,7 +2,6 @@
 
 import java.util.Iterator;
 import java.util.TreeSet;
-//import java.util.Arrays;	// just for debugging
 
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.tools.scale.ScaleManager;
@@ -91,14 +90,14 @@ static private TestScale[]	buildReferenceSequences(int inLoPitch, int inHiPitch,
 	}
 
 
-	static private int		countMatches(TreeSet inScale, int[] inRefSequence)
+	static private int		countMatches(TreeSet<Byte> inScale, int[] inRefSequence)
 	{
 	int			count	= 0;
-	Iterator	it		= inScale.iterator();
+	Iterator<Byte>	it		= inScale.iterator();
 
 	while(it.hasNext())
 		{
-		int		pitch = ((Byte)it.next()).intValue();
+		int		pitch = it.next().intValue();
 		boolean	found = false;
 
 		for(int i = 0; i < inRefSequence.length && !found; i++)
@@ -115,7 +114,7 @@ static private int		countMatches(TreeSet inScale, int[] inRefSequence)
 	}
 
 
-	static public int		findMatchingScale(TreeSet inScale)
+	static public int		findMatchingScale(TreeSet<Byte> inScale)
 	{
 	ScaleManager	scaleMgr		= TuxGuitar.instance().getScaleManager();
 	int				scalesCount		= scaleMgr.countScales(),
@@ -126,8 +125,8 @@ static public int		findMatchingScale(TreeSet inScale)
 
 	if(!inScale.isEmpty())
 		{
-		int		loPitch	= ((Byte)inScale.first()).intValue(),
-				hiPitch	= ((Byte)inScale.last()).intValue();
+		int		loPitch	= inScale.first().intValue(),
+				hiPitch	= inScale.last().intValue();
 
 		//System.out.println("Input: "	+ inScale);
 		//System.out.println("loPitch: "	+ loPitch);
@@ -176,6 +175,7 @@ static public void		selectScale(final int inIndex, final int inKey)
 	{
 	try	{
 		TGSynchronizer.instance().addRunnable( new TGSynchronizer.TGRunnable() {
+			@Override
 			public void run() throws Throwable {
 				TuxGuitar.instance().getScaleManager().selectScale(inIndex, inKey);
 			}
diff --git a/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaff.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaff.java
new file mode 100644
index 00000000..f6bd9df1
--- /dev/null
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaff.java
@@ -0,0 +1,440 @@
+package org.herac.tuxguitar.midiinput;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.TreeMap;
+
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.song.managers.TGSongManager;
+import org.herac.tuxguitar.song.managers.TGTrackManager;
+import org.herac.tuxguitar.song.models.TGBeat;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGMeasure;
+import org.herac.tuxguitar.song.models.TGMeasureHeader;
+import org.herac.tuxguitar.song.models.TGNote;
+import org.herac.tuxguitar.song.models.TGTrack;
+
+
+class MiStaff
+{
+	private TreeMap<Long, MiStaffEvent>	f_Events				= new TreeMap<Long, MiStaffEvent>();	// staff events map
+	private TGTrack	f_TgTrack				= null;				// work track
+	private final	boolean	f_Dump_Input			= false;			// for debugging...
+	private final	boolean	f_Dump_TrackGeneration	= false;			// for debugging...
+
+
+	MiStaff(
+		final ArrayList<MiNote>	inBufferNotes,		// MIDI input notes from buffer [microseconds]
+		int				inTempo,			// quarters per minute
+		long			inStartTime,		// first MIDI time stamp [microseconds]
+		long			inStopTime,			// last MIDI time stamp [microseconds]
+		long			inStartPosition,	// recording start position [ticks]
+		String			inTrackName)		// name for the TuxGuitar track to be created
+	{
+	ArrayList<MiNote>	midiNotes = new ArrayList<MiNote>();
+
+	// make a deep copy of input buffer notes
+	for(Iterator<MiNote> it = inBufferNotes.iterator(); it.hasNext();)
+		midiNotes.add(new MiNote(it.next()));
+
+	// convert time stamps from absolute microseconds to song relative ticks
+	for(Iterator<MiNote> it = midiNotes.iterator(); it.hasNext();)
+		{
+		MiNote	note	= it.next();
+		long	timeOn	= note.getTimeOn(),
+				timeOff	= note.getTimeOff();
+
+		// absolute to relative time stamps
+		timeOn	-= inStartTime;
+		timeOff	-= inStartTime;
+
+		// time stamps to ticks
+		timeOn	= inStartPosition + timestampToTicks(inTempo, timeOn);
+		timeOff	= inStartPosition + timestampToTicks(inTempo, timeOff);
+
+		// update values
+		note.setTimeOn(timeOn);
+		note.setTimeOff(timeOff);
+		}
+
+	if(f_Dump_Input)
+		{
+		MiBuffer.dump(inBufferNotes, "input buffer MIDI notes");
+		MiBuffer.dump(midiNotes, "converted MIDI notes");
+		}
+
+	TGSongManager	tgSongMgr		= TuxGuitar.instance().getSongManager();
+	long			startTick		= inStartPosition,
+					stopTick		= inStartPosition + timestampToTicks(inTempo, inStopTime - inStartTime);
+	TGMeasureHeader	mh				= tgSongMgr.getMeasureHeaderAt(startTick);
+	long			firstBarTick	= mh.getStart();
+
+	// insert bars into staff
+	for(long tick = firstBarTick; tick <= stopTick; tick += 4 * TGDuration.QUARTER_TIME)
+		addBar(tick);
+
+	// insert note events into staff
+	for(Iterator<MiNote> it = midiNotes.iterator(); it.hasNext();)
+		addNote(it.next());
+
+	// generate bars
+	createMeasures();
+
+	// generate beats
+	insertNotesIntoTrack(inTrackName);
+	}
+
+
+	static	long	timestampToTicks(int inTempo, long inTimeStamp)
+	{
+	long	ticks = (inTimeStamp * inTempo * TGDuration.QUARTER_TIME) / 60000000L;
+
+	return(ticks);
+	}
+
+
+	static	long	ticksToTimestamp(int inTempo, long inTicks)
+	{
+	long	timeStamp = (inTicks * 60000000L) / (inTempo * TGDuration.QUARTER_TIME);
+
+	return(timeStamp);
+	}
+
+
+	void	addBar(long inTime)
+	{
+	MiStaffEvent	se = f_Events.get( new Long(inTime) );
+
+	if(se == null)
+		{
+		se = new MiStaffEvent(inTime);
+		f_Events.put( new Long(inTime) , se);
+		}
+
+	se.markAsBar();
+	}
+
+
+	void	addNote(MiNote inNote)
+	{
+	MiStaffEvent	se;
+
+	se = f_Events.get( new Long(inNote.getTimeOn()) );
+
+	if(se == null)
+		{
+		se = new MiStaffEvent(inNote.getTimeOn());
+		f_Events.put( new Long(inNote.getTimeOn()) , se);
+		}
+
+	se.addNoteOn(inNote);
+	}
+
+
+	private void	mergeEvent(TreeMap<Long, MiStaffEvent> inEventsMap, MiStaffEvent inSE)
+	{
+	MiStaffEvent	se = inEventsMap.get( new Long(inSE.getBeginTime()) );
+
+	if(se == null)
+		inEventsMap.put( new Long(inSE.getBeginTime()) , inSE);
+	else
+		se.merge(inSE);
+	}
+
+
+	private void	addTiedNote(long inTime, MiStaffNote inSN, long inResidualDuration)
+	{
+	MiStaffEvent	se = f_Events.get( new Long(inTime) );
+
+	if(se == null)
+		{
+		se = new MiStaffEvent(inTime);
+		f_Events.put( new Long(inTime), se);
+		}
+
+	MiStaffNote sn = new MiStaffNote(inSN);
+
+	sn.setDuration(inResidualDuration);
+	se.addTiedNote(sn);
+	}
+
+
+	private void	dump(String inTitle)
+	{
+	Iterator<Long>	it = f_Events.keySet().iterator();
+
+	System.out.println();
+	System.out.println("MiStaff dump " + inTitle + "...");
+	System.out.println();
+
+	while(it.hasNext())
+		{
+		Long			time	= it.next();
+		MiStaffEvent	se		= f_Events.get(time);
+
+		System.out.print(se);
+		}
+	}
+
+
+	void	createMeasures()
+	{
+	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
+	Iterator<Long>		it			= f_Events.keySet().iterator();
+
+	while(it.hasNext())
+		{
+		Long			key	= it.next();
+		MiStaffEvent	se	= f_Events.get(key);
+
+		if(	se.isBar() &&
+			tgSongMgr.getMeasureHeaderAt(key.longValue()) == null)
+			{
+			tgSongMgr.addNewMeasure(tgSongMgr.getSong().countMeasureHeaders() + 1);
+			}
+		}
+	}
+
+
+	private TGBeat	getEventBeat(long inTime)
+	{
+	MiStaffEvent	se		= f_Events.get( new Long(inTime) );
+	TGBeat			tgBeat	= se.getBeat();
+
+	// creates a TGBeat if needed
+	if(tgBeat == null)
+		{
+		TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
+		TGTrackManager	tgTrackMgr	= tgSongMgr.getTrackManager();
+		TGMeasure		tgMeasure	= tgTrackMgr.getMeasureAt(f_TgTrack, inTime);
+
+		if(tgMeasure != null)
+			{
+			tgBeat = tgSongMgr.getFactory().newBeat();
+
+			tgBeat.setStart(inTime);
+			tgMeasure.addBeat(tgBeat);
+			se.setBeat(tgBeat);
+			}
+		}
+
+	return(tgBeat);
+	}
+
+
+	private void	insertNoteIntoTrack(TGBeat inTgBeat, MiStaffNote inSN)
+	{
+	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
+	TGNote			tgNote		= tgSongMgr.getFactory().newNote();
+	TGDuration		tgDuration	= tgSongMgr.getFactory().newDuration();
+
+	tgNote.setString	(inSN.getString());
+	tgNote.setValue		(inSN.getFret());
+	tgNote.setVelocity	(inSN.getVelocity());
+	tgNote.setTiedNote	(inSN.isTied());
+
+	int		noteType = MiStaffNote.durationToNoteType(inSN.getNominalDuration());
+
+	tgDuration.setValue(noteType);
+	tgDuration.setDotted(inSN.getDotCount() == 1);
+	tgDuration.setDoubleDotted(inSN.getDotCount() == 2);
+
+	if(f_Dump_TrackGeneration)
+		{
+		System.out.println(
+				"" + inTgBeat.getMeasure().getNumber() + " " + inTgBeat.getStart() +
+				" (" + tgNote.getString() + "," + tgNote.getValue() + "," + tgNote.getVelocity() + ") " +
+				"1/"	+ tgDuration.getValue() +
+				", d: "	+ tgDuration.getTime() +
+				(tgNote.isTiedNote() ? " (tied)" : "") +
+				(tgDuration.getTime() != inSN.getOverallDuration() ? " snDur=" + inSN.getOverallDuration() : ""));
+		}
+
+	// here we probably should choose the voice
+	// it would be nice to have one voice for each string...
+	inTgBeat.getVoice(0).setDuration(tgDuration);
+	inTgBeat.getVoice(0).addNote(tgNote);
+	}
+
+
+	private void	generateTrack(String inTrackName)
+	{
+	TGSongManager	tgSongMgr	= TuxGuitar.instance().getSongManager();
+	TGTrack			tgTrack		= tgSongMgr.addTrack();
+	Iterator<Long>		eventsIt;
+
+	if(f_Dump_TrackGeneration)
+		{
+		System.out.println();
+		System.out.println("generating track: " + inTrackName + "...");
+		System.out.println();
+		}
+
+	tgTrack.setName(inTrackName);
+
+	f_TgTrack = tgTrack;
+
+	// clears events TGBeats
+	for(eventsIt = f_Events.keySet().iterator(); eventsIt.hasNext();)
+		{
+		Long			time	= eventsIt.next();
+		MiStaffEvent	se		= f_Events.get(time);
+
+		se.setBeat(null);
+		}
+
+	// generate TuxGuitar track
+	for(eventsIt = f_Events.keySet().iterator(); eventsIt.hasNext();)
+		{
+		Long			time	= eventsIt.next();
+		MiStaffEvent	se		= f_Events.get(time);
+
+		if(se.isOnBeat() || se.isTieBeat())
+			{
+			TGBeat		tgBeat	= getEventBeat(se.getBeginTime());
+			Iterator<MiStaffNote>	it		= se.getNotes().iterator();
+
+			while(it.hasNext())
+				{
+				MiStaffNote	sn = it.next();
+
+				insertNoteIntoTrack(tgBeat, sn);
+				}
+			}
+		}
+	}
+
+
+	void	insertNotesIntoTrack(String inTrackName)
+	{
+	// normalize beats
+	TreeMap<Long, MiStaffEvent>		normalizedEvents = new TreeMap<Long, MiStaffEvent>();
+
+	for(Iterator<Entry<Long, MiStaffEvent>> eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
+		{
+		Map.Entry<Long, MiStaffEvent>		me	= eventsIt.next();
+		MiStaffEvent	se	= me.getValue();
+
+		se.normalizeBeat(TGDuration.SIXTY_FOURTH);
+		mergeEvent(normalizedEvents, se);
+		}
+
+	f_Events = normalizedEvents;
+
+	dump("after beat normalization");
+	generateTrack("after beat normalization");
+
+	// add tie events due to bar crossing at the beginning of each crossed bar
+	boolean	keepGoing = true;
+
+	while(keepGoing)
+		{
+		long	nextBarBeginTime = 0;
+
+		keepGoing = false;
+
+		for(Iterator<Entry<Long, MiStaffEvent>> eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
+			{
+			Map.Entry<Long, MiStaffEvent>		me	= eventsIt.next();
+			MiStaffEvent	se	= me.getValue();
+
+			if(se.isBar())
+				nextBarBeginTime = se.getBeginTime() + 4 * TGDuration.QUARTER_TIME;	// bar length should be a MiStaff member
+
+			for(Iterator<MiStaffNote> snIt = se.getNotes().iterator(); snIt.hasNext();)
+				{
+				MiStaffNote	sn = snIt.next();
+
+				if(se.getBeginTime() + sn.getOverallDuration() > nextBarBeginTime)
+					{
+					long	limitedDuration		= (nextBarBeginTime - se.getBeginTime()),
+							residualDuration	= sn.getOverallDuration() - limitedDuration;
+
+					sn.setDuration(limitedDuration);
+					addTiedNote(nextBarBeginTime, sn, residualDuration);
+					keepGoing = true;
+					break;
+					}
+				}
+
+			if(keepGoing)
+				break;
+			}
+		}
+
+	dump("after tied due to bar crossing");
+	generateTrack("after tied due to bar crossing");
+
+	// normalize durations
+	for(Iterator<Entry<Long, MiStaffEvent>> eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
+		{
+		Map.Entry<Long, MiStaffEvent>		me	= eventsIt.next();
+		MiStaffEvent	se	= me.getValue();
+
+		se.normalizeDurations();
+		}
+
+	dump("after duration normalization");
+	generateTrack("after duration normalization");
+
+	// add tie events due to note crossing
+	keepGoing = true;
+
+	while(keepGoing)
+		{
+		keepGoing = false;
+
+		Iterator<Long> eventsIt2 = f_Events.keySet().iterator();
+
+		if(eventsIt2.hasNext())
+			eventsIt2.next();
+
+		for(Iterator<Entry<Long, MiStaffEvent>> eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
+			{
+			Map.Entry<Long, MiStaffEvent>		me	= eventsIt.next();
+			MiStaffEvent	se	= me.getValue();
+
+			if(eventsIt.hasNext() && eventsIt2.hasNext())
+				{
+				long	nextTime	= eventsIt2.next().longValue();
+
+				for(Iterator<MiStaffNote> snIt = se.getNotes().iterator(); snIt.hasNext();)
+					{
+					MiStaffNote	sn = snIt.next();
+
+					if(se.getBeginTime() + sn.getOverallDuration() > nextTime)
+						{
+						long	limitedDuration		= (nextTime - se.getBeginTime()),
+								residualDuration	= sn.getOverallDuration() - limitedDuration;
+
+						sn.setDuration(limitedDuration);
+						addTiedNote(nextTime, sn, residualDuration);
+						keepGoing = true;
+						break;
+						}
+					}
+
+				if(keepGoing)
+					break;
+				}
+			}
+		}
+
+	dump("after tied due to note crossing");
+	generateTrack("after tied due to note crossing");
+
+	// normalize durations
+	for(Iterator<Entry<Long, MiStaffEvent>> eventsIt = f_Events.entrySet().iterator(); eventsIt.hasNext();)
+		{
+		Map.Entry<Long, MiStaffEvent>		me	= eventsIt.next();
+		MiStaffEvent	se	= me.getValue();
+
+		se.normalizeDurations();
+		}
+
+	dump("after duration normalization 2");
+	generateTrack("after duration normalization 2");
+	}
+}
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaffEvent.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaffEvent.java
similarity index 88%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaffEvent.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaffEvent.java
index 63ebf20e..1f4e29f5 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaffEvent.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaffEvent.java
@@ -16,7 +16,7 @@ class MiStaffEvent
 	static final byte	TIE_BEAT	= 8;
 
 	private byte		f_Type		= NONE;				// event type
-	private ArrayList	f_Notes		= new ArrayList();	// note on list
+	private ArrayList<MiStaffNote>	f_Notes		= new ArrayList<MiStaffNote>();	// note on list
 	private TGBeat		f_Beat;							// TuxGuitar beat (optional)
 	private long		f_BeginTime;					// begin time [ticks]
 
@@ -31,13 +31,14 @@ public	MiStaffEvent(long inBeginTime)
 	boolean		isOnBeat()		{ return((f_Type & ON_BEAT) == ON_BEAT); }
 	boolean		isOffBeat()		{ return((f_Type & OFF_BEAT) == OFF_BEAT); }
 	boolean		isTieBeat()		{ return((f_Type & TIE_BEAT) == TIE_BEAT); }
-	ArrayList	getNotes()		{ return(f_Notes); }
+	ArrayList<MiStaffNote>	getNotes()		{ return(f_Notes); }
 	long		getBeginTime()	{ return(f_BeginTime); }
 
 	void		setBeat(TGBeat inBeat)	{ f_Beat = inBeat; }
 	TGBeat		getBeat()				{ return(f_Beat); }
 
 
+	@Override
 	public String	toString()
 	{
 	String	out = Long.toString(f_BeginTime);
@@ -49,9 +50,9 @@ public String	toString()
 
 	if(!f_Notes.isEmpty())
 		{
-		for(Iterator it = f_Notes.iterator(); it.hasNext();)
+		for(Iterator<MiStaffNote> it = f_Notes.iterator(); it.hasNext();)
 			{
-			MiStaffNote	sn	= (MiStaffNote)it.next();
+			MiStaffNote	sn	= it.next();
 
 			out += (sn.isTied() ? "   T: " : "   N: ");
 			out += sn;
@@ -131,9 +132,9 @@ void	normalizeBeat(int inNoteType)
 
 	void	normalizeDurations()
 	{
-	for(Iterator it = f_Notes.iterator(); it.hasNext();)
+	for(Iterator<MiStaffNote> it = f_Notes.iterator(); it.hasNext();)
 		{
-		MiStaffNote	sn	= (MiStaffNote)it.next();
+		MiStaffNote	sn	= it.next();
 		sn.normalizeDuration();
 		}
 	}
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaffNote.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaffNote.java
similarity index 99%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaffNote.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaffNote.java
index cf48f3dd..e1039180 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MiStaffNote.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MiStaffNote.java
@@ -73,7 +73,7 @@ public	MiStaffNote(MiStaffNote inNote)
 	long	getOverallDuration()
 	{
 	long	time = f_Duration;
-	
+
 	if(f_DotCount == 1)
 		time += time / 2;
 	else if(f_DotCount == 2)
@@ -83,6 +83,7 @@ else if(f_DotCount == 2)
 	}
 
 
+	@Override
 	public String	toString()
 	{
 	String	out =
@@ -184,7 +185,7 @@ static	long	noteToTicks(int inNoteType)
 	static int	durationToNoteType(long inDuration)
 	{
 	// converts duration [ticks] into note type
-		
+
 	if(inDuration >= noteToTicks(TGDuration.WHOLE))					return(TGDuration.WHOLE);
 	else if(inDuration >= noteToTicks(TGDuration.HALF))				return(TGDuration.HALF);
 	else if(inDuration >= noteToTicks(TGDuration.QUARTER))			return(TGDuration.QUARTER);
diff --git a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MidiInputPlugin.java b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MidiInputPlugin.java
similarity index 96%
rename from TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MidiInputPlugin.java
rename to plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MidiInputPlugin.java
index 9b32ebe6..353deda5 100644
--- a/TuxGuitar-midi-input/src/org/herac/tuxguitar/midiinput/MidiInputPlugin.java
+++ b/plugins/midi-input/src/main/java/org/herac/tuxguitar/midiinput/MidiInputPlugin.java
@@ -1,7 +1,6 @@
 package org.herac.tuxguitar.midiinput;
 
 import org.eclipse.swt.widgets.Shell;
-
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.system.plugins.TGPluginException;
 import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
@@ -12,6 +11,7 @@ public class MidiInputPlugin
 	extends TGToolItemPlugin
 	implements TGPluginSetup
 {
+	@Override
 	public void setEnabled(boolean enabled)
 		throws TGPluginException
 	{
@@ -60,24 +60,28 @@ public void setEnabled(boolean enabled)
 	 *	TGPlugin implementation
 	 */
 
+	@Override
 	public String getAuthor()
 	{
 	return "Amedeo Farello <afarello@tiscalinet.it>";
 	}
 
 
+	@Override
 	public String getDescription()
 	{
 	return "Supports MIDI equipped guitars";
 	}
 
 
+	@Override
 	public String getName()
 	{
 	return "MIDI input plugin";
 	}
 
 
+	@Override
 	public String getVersion()
 	{
 	return "1.0";
@@ -87,6 +91,7 @@ public String getVersion()
 	 *	TGPluginSetup implementation
 	 */
 
+	@Override
 	public void setupDialog(Shell parent)
 	{
 	MiConfig.instance().showDialog(parent);
@@ -96,12 +101,14 @@ public void setupDialog(Shell parent)
 	 *	TGToolItemPlugin implementation
 	 */
 
+	@Override
 	protected void doAction()
 	{
 	MiPanel.instance().showDialog(TuxGuitar.instance().getShell());
 	}
 
 
+	@Override
 	protected String getItemName()
 	{
 	return "MIDI input";
diff --git a/TuxGuitar-midi-input/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/midi-input/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-midi-input/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/midi-input/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/TuxGuitar-midi-input/share/lang/messages.properties b/plugins/midi-input/src/main/resources/lang/messages.properties
similarity index 100%
rename from TuxGuitar-midi-input/share/lang/messages.properties
rename to plugins/midi-input/src/main/resources/lang/messages.properties
diff --git a/TuxGuitar-midi-input/share/lang/messages_sv.properties b/plugins/midi-input/src/main/resources/lang/messages_sv.properties
similarity index 100%
rename from TuxGuitar-midi-input/share/lang/messages_sv.properties
rename to plugins/midi-input/src/main/resources/lang/messages_sv.properties
diff --git a/TuxGuitar-midi/keyboard-bug/TEST_R25.mid b/plugins/midi/keyboard-bug/TEST_R25.mid
similarity index 100%
rename from TuxGuitar-midi/keyboard-bug/TEST_R25.mid
rename to plugins/midi/keyboard-bug/TEST_R25.mid
diff --git a/TuxGuitar-midi/keyboard-bug/description b/plugins/midi/keyboard-bug/description
similarity index 100%
rename from TuxGuitar-midi/keyboard-bug/description
rename to plugins/midi/keyboard-bug/description
diff --git a/plugins/midi/pom.xml b/plugins/midi/pom.xml
new file mode 100644
index 00000000..1261b188
--- /dev/null
+++ b/plugins/midi/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-midi</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: MIDI</name>
+	<description>MIDI plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileException.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileException.java
similarity index 98%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileException.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileException.java
index d5b9ff0a..3c1169ad 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileException.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileException.java
@@ -1,9 +1,9 @@
 package org.herac.tuxguitar.io.midi;
 
 public class MidiFileException extends Exception{
-	
+
 	private static final long serialVersionUID = 1L;
-	
+
 	public MidiFileException(String message) {
 		super(message);
 	}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileHeader.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileHeader.java
similarity index 97%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileHeader.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileHeader.java
index 575640e9..09006ce0 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileHeader.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileHeader.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.io.midi;
 
 public interface MidiFileHeader {
-	
+
 	public static final int	HEADER_LENGTH = 6;
-	
+
 	public static final int	HEADER_MAGIC = 0x4d546864;
-	
+
 	public static final int	TRACK_MAGIC = 0x4d54726b;
 }
\ No newline at end of file
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileReader.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileReader.java
similarity index 99%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileReader.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileReader.java
index 2087dcce..76535003 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileReader.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileReader.java
@@ -10,15 +10,15 @@
 import org.herac.tuxguitar.io.midi.base.MidiTrack;
 
 public class MidiFileReader implements MidiFileHeader{
-	
+
 	public static boolean CANCEL_RUNNING_STATUS_ON_META_AND_SYSEX = true;
-	
+
 	private static final int STATUS_NONE = 0;
 	private static final int STATUS_ONE_BYTE = 1;
 	private static final int STATUS_TWO_BYTES = 2;
 	private static final int STATUS_SYSEX = 3;
 	private static final int STATUS_META = 4;
-	
+
 	public MidiSequence getSequence(InputStream stream)throws MidiFileException, IOException{
 		DataInputStream	in = new DataInputStream(stream);
 		if (in.readInt() != HEADER_MAGIC){
@@ -63,21 +63,21 @@ public MidiSequence getSequence(InputStream stream)throws MidiFileException, IOE
 			divisionType = MidiSequence.PPQ;
 			resolution = division & 0x7fff;
 		}
-		
+
 		in.skip(headerLength - HEADER_LENGTH);
-		
+
 		MidiSequence sequence = new MidiSequence(divisionType,resolution);
 		for (int i = 0; i < trackCount; i++){
 			MidiTrack track = new MidiTrack();
 			sequence.addTrack(track);
 			readTrack(in, track);
 		}
-		
+
 		in.close();
-		
+
 		return sequence;
 	}
-	
+
 	private void readTrack(DataInputStream in, MidiTrack track)throws MidiFileException, IOException{
 		while (true){
 			if (in.readInt() == TRACK_MAGIC){
@@ -89,7 +89,7 @@ private void readTrack(DataInputStream in, MidiTrack track)throws MidiFileExcept
 			}
 			in.skip(chunkLength);
 		}
-		
+
 		MidiTrackReaderHelper helper = new MidiTrackReaderHelper(0,in.readInt(),-1);
 		while (helper.remainingBytes > 0){
 			helper.ticks += readVariableLengthQuantity(in, helper);
@@ -99,12 +99,12 @@ private void readTrack(DataInputStream in, MidiTrack track)throws MidiFileExcept
 			}
 		}
 	}
-	
+
 	private static MidiEvent readEvent(DataInputStream in, MidiTrackReaderHelper helper)throws MidiFileException, IOException{
 		int statusByte = readUnsignedByte(in, helper);
 		int savedByte = 0;
 		boolean runningStatusApplies = false;
-		
+
 		if (statusByte < 0x80){
 			if (helper.runningStatusByte != -1){
 				runningStatusApplies = true;
@@ -114,7 +114,7 @@ private static MidiEvent readEvent(DataInputStream in, MidiTrackReaderHelper hel
 				throw new MidiFileException("corrupt MIDI file: status byte missing");
 			}
 		}
-		
+
 		int type = getType(statusByte);
 		if(type == STATUS_ONE_BYTE){
 			int data = 0;
@@ -124,7 +124,7 @@ private static MidiEvent readEvent(DataInputStream in, MidiTrackReaderHelper hel
 				data = readUnsignedByte(in, helper);
 				helper.runningStatusByte = statusByte;
 			}
-			
+
 			return new MidiEvent(MidiMessage.shortMessage((statusByte & 0xF0),(statusByte & 0x0F) , data), helper.ticks);
 		}else if(type == STATUS_TWO_BYTES){
 			int	data1 = 0;
@@ -134,7 +134,7 @@ private static MidiEvent readEvent(DataInputStream in, MidiTrackReaderHelper hel
 				data1 = readUnsignedByte(in, helper);
 				helper.runningStatusByte = statusByte;
 			}
-			
+
 			return new MidiEvent(MidiMessage.shortMessage((statusByte & 0xF0),(statusByte & 0x0F) , data1, readUnsignedByte(in, helper)), helper.ticks);
 		}else if(type == STATUS_SYSEX){
 			if (CANCEL_RUNNING_STATUS_ON_META_AND_SYSEX){
@@ -155,13 +155,13 @@ private static MidiEvent readEvent(DataInputStream in, MidiTrackReaderHelper hel
 			for (int i = 0; i < dataLength; i++){
 				data[i] = (byte) readUnsignedByte(in, helper);
 			}
-			
+
 			return new MidiEvent(MidiMessage.metaMessage(typeByte, data), helper.ticks);
 		}
-		
+
 		return null;
 	}
-	
+
 	private static int getType(int statusByte){
 		if (statusByte < 0xf0) {
 			int command = statusByte & 0xf0;
@@ -183,7 +183,7 @@ else if (statusByte == 0xff){
 			return STATUS_NONE;
 		}
 	}
-	
+
 	public static long readVariableLengthQuantity(DataInputStream in, MidiTrackReaderHelper helper)throws MidiFileException, IOException{
 		int	count = 0;
 		long value = 0;
@@ -198,17 +198,17 @@ public static long readVariableLengthQuantity(DataInputStream in, MidiTrackReade
 		}
 		throw new MidiFileException("not a MIDI file: unterminated variable-length quantity");
 	}
-	
+
 	public static int readUnsignedByte(DataInputStream dataInputStream, MidiTrackReaderHelper helper)throws IOException{
 		helper.remainingBytes--;
 		return dataInputStream.readUnsignedByte();
 	}
-	
+
 	private class MidiTrackReaderHelper{
 		protected long ticks = 0;
 		protected long remainingBytes;
 		protected int runningStatusByte;
-		
+
 		protected MidiTrackReaderHelper(long ticks,long remainingBytes,int runningStatusByte){
 			this.ticks = ticks;
 			this.remainingBytes = remainingBytes;
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileWriter.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileWriter.java
similarity index 99%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileWriter.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileWriter.java
index 4f2060ab..80487e07 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiFileWriter.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiFileWriter.java
@@ -10,7 +10,7 @@
 import org.herac.tuxguitar.io.midi.base.MidiTrack;
 
 public class MidiFileWriter implements MidiFileHeader{
-	
+
 	public void write(MidiSequence sequence,int type,OutputStream stream)throws IOException{
 		DataOutputStream out = new DataOutputStream(stream);
 		out.writeInt(HEADER_MAGIC);
@@ -24,7 +24,7 @@ public void write(MidiSequence sequence,int type,OutputStream stream)throws IOEx
 		out.flush();
 		out.close();
 	}
-	
+
 	private static int writeTrack(MidiTrack track,DataOutputStream out)throws IOException{
 		int length = 0;
 		if (out != null){
@@ -41,7 +41,7 @@ private static int writeTrack(MidiTrack track,DataOutputStream out)throws IOExce
 		}
 		return length;
 	}
-	
+
 	private static int writeEvent(MidiEvent event,MidiEvent previous,OutputStream out)throws IOException{
 		int length = writeVariableLengthQuantity(((previous != null)?(event.getTick() - previous.getTick()):0), out);
 		MidiMessage	message = event.getMessage();
@@ -51,10 +51,10 @@ private static int writeEvent(MidiEvent event,MidiEvent previous,OutputStream ou
 		else if(message.getType() == MidiMessage.TYPE_META){
 			length += writeMetaMessage(message,out);
 		}
-		
+
 		return length;
 	}
-	
+
 	private static int writeShortMessage(MidiMessage message,OutputStream out)throws IOException{
 		byte[] data = message.getData();
 		int	length = data.length;
@@ -63,7 +63,7 @@ private static int writeShortMessage(MidiMessage message,OutputStream out)throws
 		}
 		return length;
 	}
-	
+
 	private static int writeMetaMessage(MidiMessage message,OutputStream out)throws IOException{
 		int	length = 0;
 		byte[] data = message.getData();
@@ -79,7 +79,7 @@ private static int writeMetaMessage(MidiMessage message,OutputStream out)throws
 		length += data.length;
 		return length;
 	}
-	
+
 	private static int writeVariableLengthQuantity(long value, OutputStream out)throws IOException{
 		boolean started = false;
 		int length = 0;
diff --git a/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiMessageUtils.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiMessageUtils.java
new file mode 100644
index 00000000..03865f89
--- /dev/null
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiMessageUtils.java
@@ -0,0 +1,64 @@
+package org.herac.tuxguitar.io.midi;
+
+import org.herac.tuxguitar.io.midi.base.MidiMessage;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiMessageUtils {
+
+	public static final byte TICK_MOVE = 0x01;
+
+	private static int fixValue(int value){
+		int fixedValue = value;
+		fixedValue = Math.min(fixedValue,127);
+		fixedValue = Math.max(fixedValue,0);
+		return fixedValue;
+	}
+
+	private static int fixChannel(int channel){
+		int fixedChannel = channel;
+		fixedChannel = Math.min(fixedChannel,15);
+		fixedChannel = Math.max(fixedChannel,0);
+		return fixedChannel;
+	}
+
+	public static MidiMessage noteOn(int channel,int note,int velocity){
+		return MidiMessage.shortMessage(MidiMessage.NOTE_ON, fixChannel(channel), fixValue(note), fixValue(velocity));
+	}
+
+	public static MidiMessage noteOff(int channel,int note,int velocity){
+		return MidiMessage.shortMessage(MidiMessage.NOTE_OFF, fixChannel(channel), fixValue(note), fixValue(velocity));
+	}
+
+	public static MidiMessage controlChange(int channel,int controller,int value){
+		return MidiMessage.shortMessage(MidiMessage.CONTROL_CHANGE, fixChannel(channel), fixValue(controller), fixValue(value));
+	}
+
+	public static MidiMessage programChange(int channel,int instrument){
+		return MidiMessage.shortMessage(MidiMessage.PROGRAM_CHANGE, fixChannel(channel), fixValue(instrument));
+	}
+
+	public static MidiMessage pitchBend(int channel,int value){
+		return MidiMessage.shortMessage(MidiMessage.PITCH_BEND, fixChannel(channel), 0, fixValue(value));
+	}
+
+	public static MidiMessage systemReset(){
+		return MidiMessage.shortMessage(MidiMessage.SYSTEM_RESET);
+	}
+
+	public static MidiMessage tempoInUSQ(int usq){
+		MidiMessage message = new MidiMessage(MidiMessage.TYPE_META, MidiMessage.TEMPO_CHANGE);
+		message.setData(new byte[]{(byte)((usq >> 16) & 0xff),(byte)((usq >> 8) & 0xff),(byte)((usq) & 0xff) });
+		//message.setData(new byte[]{(byte)((usq >> 16) & 0x00FF),(byte)((usq >> 8) & 0x00FF),(byte)((usq) & 0x00FF) });
+		return message;
+	}
+
+	public static MidiMessage timeSignature(TGTimeSignature ts){
+		MidiMessage message = new MidiMessage(MidiMessage.TYPE_META, MidiMessage.TIME_SIGNATURE_CHANGE);
+		message.setData(new byte[]{  (byte)ts.getNumerator(),(byte)ts.getDenominator().getIndex(),(byte)(96 / ts.getDenominator().getValue()),8 });
+		return message;
+	}
+
+	public static MidiMessage endOfTrack(){
+		return MidiMessage.metaMessage(47,new byte[]{});
+	}
+}
\ No newline at end of file
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginExporter.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginExporter.java
similarity index 96%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginExporter.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginExporter.java
index b15045cb..37511bf7 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginExporter.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginExporter.java
@@ -4,7 +4,8 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class MidiPluginExporter extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new MidiSongExporter();
 	}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginImporter.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginImporter.java
similarity index 96%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginImporter.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginImporter.java
index c55a7644..853c76ad 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiPluginImporter.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginImporter.java
@@ -4,7 +4,8 @@
 import org.herac.tuxguitar.io.base.TGRawImporter;
 
 public class MidiPluginImporter extends TGImporterPlugin{
-	
+
+	@Override
 	protected TGRawImporter getImporter() {
 		return new MidiSongImporter();
 	}
diff --git a/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginList.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginList.java
new file mode 100644
index 00000000..d2dd4f0f
--- /dev/null
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiPluginList.java
@@ -0,0 +1,38 @@
+package org.herac.tuxguitar.io.midi;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.app.system.plugins.TGPlugin;
+import org.herac.tuxguitar.app.system.plugins.base.TGPluginList;
+
+public class MidiPluginList extends TGPluginList{
+
+	@Override
+	protected List<TGPlugin> getPlugins() {
+		List<TGPlugin> plugins = new ArrayList<TGPlugin>();
+		plugins.add(new MidiPluginImporter());
+		plugins.add(new MidiPluginExporter());
+		return plugins;
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "Midi file format import-export plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "Midi file format import-export plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+}
diff --git a/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSequenceHandlerImpl.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSequenceHandlerImpl.java
new file mode 100644
index 00000000..80f6ff08
--- /dev/null
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSequenceHandlerImpl.java
@@ -0,0 +1,85 @@
+package org.herac.tuxguitar.io.midi;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.herac.tuxguitar.io.midi.base.MidiEvent;
+import org.herac.tuxguitar.io.midi.base.MidiSequence;
+import org.herac.tuxguitar.io.midi.base.MidiTrack;
+import org.herac.tuxguitar.player.base.MidiSequenceHandler;
+import org.herac.tuxguitar.song.models.TGDuration;
+import org.herac.tuxguitar.song.models.TGTimeSignature;
+
+public class MidiSequenceHandlerImpl extends MidiSequenceHandler{
+
+	private OutputStream stream;
+	private MidiSequence sequence;
+
+	public MidiSequenceHandlerImpl(int tracks,OutputStream stream){
+		super(tracks);
+		this.stream = stream;
+		this.init();
+	}
+
+	private void init(){
+		this.sequence = new MidiSequence(MidiSequence.PPQ,(int)TGDuration.QUARTER_TIME);
+		for (int i = 0; i < getTracks(); i++) {
+			this.sequence.addTrack(new MidiTrack());
+		}
+	}
+
+	public MidiSequence getSequence(){
+		return this.sequence;
+	}
+
+	public void addEvent(int track, MidiEvent event) {
+		if(track >= 0 && track < getSequence().countTracks()){
+			getSequence().getTrack(track).add(event);
+		}
+	}
+
+	@Override
+	public void addControlChange(long tick,int track,int channel, int controller, int value) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.controlChange(channel, controller, value), tick ));
+	}
+
+	@Override
+	public void addNoteOff(long tick,int track,int channel, int note, int velocity) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.noteOff(channel, note, velocity), tick ));
+	}
+
+	@Override
+	public void addNoteOn(long tick,int track,int channel, int note, int velocity) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.noteOn(channel, note, velocity), tick ));
+	}
+
+	@Override
+	public void addPitchBend(long tick,int track,int channel, int value) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.pitchBend(channel, value), tick ));
+	}
+
+	@Override
+	public void addProgramChange(long tick,int track,int channel, int instrument) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.programChange(channel, instrument), tick ));
+	}
+
+	@Override
+	public void addTempoInUSQ(long tick,int track,int usq) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.tempoInUSQ(usq), tick ));
+	}
+
+	@Override
+	public void addTimeSignature(long tick,int track,TGTimeSignature ts) {
+		addEvent(track,new MidiEvent(MidiMessageUtils.timeSignature(ts), tick ));
+	}
+
+	@Override
+	public void notifyFinish() {
+		try {
+			getSequence().finish();
+			new MidiFileWriter().write(getSequence(),1,this.stream);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSettings.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSettings.java
new file mode 100644
index 00000000..ba16b908
--- /dev/null
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSettings.java
@@ -0,0 +1,22 @@
+package org.herac.tuxguitar.io.midi;
+
+public class MidiSettings {
+
+	private int transpose;
+
+	public MidiSettings(){
+		this.transpose = 0;
+	}
+
+	public int getTranspose() {
+		return this.transpose;
+	}
+
+	public void setTranspose(int transpose) {
+		this.transpose = transpose;
+	}
+
+	public static MidiSettings getDefaults(){
+		return new MidiSettings();
+	}
+}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSettingsDialog.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSettingsDialog.java
similarity index 98%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSettingsDialog.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSettingsDialog.java
index 84ef5a75..a0f0fb2d 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSettingsDialog.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSettingsDialog.java
@@ -15,87 +15,89 @@
 import org.herac.tuxguitar.app.util.DialogUtils;
 
 public class MidiSettingsDialog {
-	
+
 	public static final int MAX_TRANSPOSE = 24;
-	
+
 	public static final int MIN_TRANSPOSE = -24;
-	
+
 	private static final int STATUS_NONE = 0;
-	
+
 	private static final int STATUS_CANCELLED = 1;
-	
+
 	private static final int STATUS_ACCEPTED = 2;
-	
+
 	protected int status;
-	
+
 	protected MidiSettings settings;
-	
+
 	public MidiSettingsDialog(){
 		this.settings = new MidiSettings();
 	}
-	
+
 	public MidiSettings open() {
 		this.status = STATUS_NONE;
-		
+
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText("Options");
-		
+
 		//------------------TRACK SELECTION------------------
 		Group trackGroup = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		trackGroup.setLayout(new GridLayout(2,false));
 		trackGroup.setLayoutData(getGroupData());
 		trackGroup.setText("Transpose notes");
-		
+
 		//------------------TRANSPOSE----------------------
 		Label transposeLabel = new Label(trackGroup, SWT.NONE);
 		transposeLabel.setText("Transpose:");
 		transposeLabel.setLayoutData(new GridData(SWT.LEFT,SWT.CENTER,true,true));
-		
+
 		final Combo transposeCombo = new Combo(trackGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		transposeCombo.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true));
 		for(int i = MIN_TRANSPOSE;i <= MAX_TRANSPOSE;i ++){
 			transposeCombo.add(Integer.toString(i));
 		}
 		transposeCombo.select(-MIN_TRANSPOSE);
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(data);
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				MidiSettingsDialog.this.status = STATUS_ACCEPTED;
 				MidiSettingsDialog.this.settings.setTranspose( (MIN_TRANSPOSE + transposeCombo.getSelectionIndex()) );
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(data);
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				MidiSettingsDialog.this.status = STATUS_CANCELLED;
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
-		
+
 		return ((this.status == STATUS_ACCEPTED)?MidiSettingsDialog.this.settings:null);
 	}
-	
+
 	private GridData getGroupData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 300;
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongExporter.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSongExporter.java
similarity index 95%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongExporter.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSongExporter.java
index 06acced0..642fac38 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongExporter.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSongExporter.java
@@ -10,27 +10,32 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class MidiSongExporter implements TGLocalFileExporter{
-	
+
 	private OutputStream stream;
 	private MidiSettings settings;
-	
+
+	@Override
 	public String getExportName() {
 		return "Midi";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Midi","*.mid;*.midi");
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		this.settings = (setDefaults ? MidiSettings.getDefaults(): new MidiSettingsDialog().open() );
 		return (this.settings != null);
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) {
 		if( this.stream != null && this.settings != null ){
 			TGSongManager manager = new TGSongManager();
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongImporter.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSongImporter.java
similarity index 88%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongImporter.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSongImporter.java
index 48cfb187..41be258a 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/MidiSongImporter.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/MidiSongImporter.java
@@ -29,42 +29,47 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class MidiSongImporter implements TGLocalFileImporter{
-	
+
 	private static final int MIN_DURATION_VALUE = TGDuration.SIXTY_FOURTH;
-	
+
 	private int resolution;
-	private List channels;
-	private List headers;
-	private List tracks;
-	private List tempNotes;
-	private List tempChannels;
-	private List trackTuningHelpers;
+	private List<TGChannel> channels;
+	private List<TGMeasureHeader> headers;
+	private List<TGTrack> tracks;
+	private List<TempNote> tempNotes;
+	private List<TempChannel> tempChannels;
+	private List<TrackTuningHelper> trackTuningHelpers;
 	private MidiSettings settings;
 	protected TGFactory factory;
 	protected InputStream stream;
-	
+
 	public MidiSongImporter(){
 		super();
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Midi","*.mid;*.midi");
 	}
-	
+
+	@Override
 	public String getImportName() {
 		return "Midi";
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults){
 		this.settings = (setDefaults ? MidiSettings.getDefaults() : new MidiSettingsDialog().open());
 		return (this.settings != null);
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,InputStream stream) {
 		this.factory = factory;
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public TGSong importSong() throws TGFileFormatException {
 		try {
 			if(this.settings == null || this.factory == null || this.stream == null ){
@@ -82,44 +87,44 @@ public TGSong importSong() throws TGFileFormatException {
 				}
 			}
 			checkAll();
-			
+
 			TGSong song = this.factory.newSong();
-			
-			Iterator channels = this.channels.iterator();
+
+			Iterator<TGChannel> channels = this.channels.iterator();
 			while(channels.hasNext()){
-				song.addChannel((TGChannel)channels.next());
+				song.addChannel(channels.next());
 			}
-			Iterator headers = this.headers.iterator();
+			Iterator<TGMeasureHeader> headers = this.headers.iterator();
 			while(headers.hasNext()){
-				song.addMeasureHeader((TGMeasureHeader)headers.next());
+				song.addMeasureHeader(headers.next());
 			}
-			Iterator tracks = this.tracks.iterator();
+			Iterator<TGTrack> tracks = this.tracks.iterator();
 			while(tracks.hasNext()){
-				song.addTrack((TGTrack)tracks.next());
+				song.addTrack(tracks.next());
 			}
 			return new SongAdjuster(this.factory,song).adjustSong();
 		} catch (Throwable throwable) {
 			throw new TGFileFormatException(throwable);
 		}
 	}
-	
+
 	private void initFields(MidiSequence sequence){
 		this.resolution = sequence.getResolution();
-		this.channels = new ArrayList();
-		this.headers = new ArrayList();
-		this.tracks = new ArrayList();
-		this.tempNotes = new ArrayList();
-		this.tempChannels = new ArrayList();
-		this.trackTuningHelpers = new ArrayList();
-	}
-	
+		this.channels = new ArrayList<TGChannel>();
+		this.headers = new ArrayList<TGMeasureHeader>();
+		this.tracks = new ArrayList<TGTrack>();
+		this.tempNotes = new ArrayList<TempNote>();
+		this.tempChannels = new ArrayList<TempChannel>();
+		this.trackTuningHelpers = new ArrayList<TrackTuningHelper>();
+	}
+
 	private int getNextTrackNumber(){
 		return (this.tracks.size() + 1);
 	}
-	
+
 	private void parseMessage(int trackNumber,long tick,MidiMessage message){
 		long parsedTick = parseTick(tick + this.resolution);
-		
+
 		//NOTE ON
 		if(message.getType() == MidiMessage.TYPE_SHORT && message.getCommand() == MidiMessage.NOTE_ON){
 			parseNoteOn(trackNumber,parsedTick,message.getData());
@@ -145,11 +150,11 @@ else if(message.getType() == MidiMessage.TYPE_META && message.getCommand() == Mi
 			parseTempo(parsedTick,message.getData());
 		}
 	}
-	
+
 	private long parseTick(long tick){
 		return Math.abs(TGDuration.QUARTER_TIME * tick / this.resolution);
 	}
-	
+
 	private void parseNoteOn(int track,long tick,byte[] data){
 		int length = data.length;
 		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):0;
@@ -164,16 +169,16 @@ private void parseNoteOn(int track,long tick,byte[] data){
 			this.tempNotes.add(new TempNote(track,channel,value,tick));
 		}
 	}
-	
+
 	private void parseNoteOff(int track,long tick,byte[] data){
 		int length = data.length;
-		
+
 		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):0;
 		int value = (length > 1)?(data[1] & 0xFF):0;
-		
+
 		makeNote(tick,track,channel,value);
 	}
-	
+
 	private void parseProgramChange(byte[] data){
 		int length = data.length;
 		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
@@ -182,7 +187,7 @@ private void parseProgramChange(byte[] data){
 			getTempChannel(channel).setInstrument(instrument);
 		}
 	}
-	
+
 	private void parseControlChange(byte[] data){
 		int length = data.length;
 		int channel = (length > 0)?((data[0] & 0xFF) & 0x0F):-1;
@@ -197,7 +202,7 @@ else if(control == MidiControllers.BALANCE){
 			}
 		}
 	}
-	
+
 	private void parseTimeSignature(long tick,byte[] data){
 		if(data.length >= 2){
 			TGTimeSignature timeSignature = this.factory.newTimeSignature();
@@ -219,38 +224,38 @@ private void parseTimeSignature(long tick,byte[] data){
 			getHeader(tick).setTimeSignature(timeSignature);
 		}
 	}
-	
+
 	private void parseTempo(long tick,byte[] data){
 		if(data.length >= 3){
 			TGTempo tempo = TGTempo.fromUSQ(this.factory,(data[2] & 0xff) | ((data[1] & 0xff) << 8) | ((data[0] & 0xff) << 16));
 			getHeader(tick).setTempo(tempo);
 		}
 	}
-	
+
 	private TGTrack getTrack(int number){
-		Iterator it = this.tracks.iterator();
+		Iterator<TGTrack> it = this.tracks.iterator();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			if(track.getNumber() == number){
 				return track;
 			}
 		}
-		
+
 		TGTrack track = this.factory.newTrack();
 		track.setNumber(number);
 		track.setChannelId(-1);
 		TGColor.RED.copy(track.getColor());
-		
+
 		this.tracks.add(track);
 		return track;
 	}
-	
+
 	private TGMeasureHeader getHeader(long tick){
 		long realTick = (tick >= TGDuration.QUARTER_TIME)?tick:TGDuration.QUARTER_TIME;
-		
-		Iterator it = this.headers.iterator();
+
+		Iterator<TGMeasureHeader> it = this.headers.iterator();
 		while(it.hasNext()){
-			TGMeasureHeader header = (TGMeasureHeader)it.next();
+			TGMeasureHeader header = it.next();
 			if(realTick >= header.getStart() && realTick < header.getStart() + header.getLength()){
 				return header;
 			}
@@ -267,25 +272,25 @@ private TGMeasureHeader getHeader(long tick){
 			header.getTimeSignature().getDenominator().setValue(TGDuration.QUARTER);
 		}
 		this.headers.add(header);
-		
+
 		if(realTick >= header.getStart() && realTick < header.getStart() + header.getLength()){
 			return header;
 		}
 		return getHeader(realTick);
 	}
-	
+
 	private TGMeasureHeader getLastHeader(){
 		if(!this.headers.isEmpty()){
-			return (TGMeasureHeader)this.headers.get(this.headers.size() - 1);
+			return this.headers.get(this.headers.size() - 1);
 		}
 		return null;
 	}
-	
+
 	private TGMeasure getMeasure(TGTrack track,long tick){
 		long realTick = (tick >= TGDuration.QUARTER_TIME)?tick:TGDuration.QUARTER_TIME;
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			if(realTick >= measure.getStart() && realTick < measure.getStart() + measure.getLength()){
 				return measure;
 			}
@@ -293,7 +298,7 @@ private TGMeasure getMeasure(TGTrack track,long tick){
 		getHeader(realTick);
 		for(int i = 0;i < this.headers.size();i++){
 			boolean exist = false;
-			TGMeasureHeader header = (TGMeasureHeader)this.headers.get(i);
+			TGMeasureHeader header = this.headers.get(i);
 			int measureCount = track.countMeasures();
 			for(int j = 0;j < measureCount;j++){
 				TGMeasure measure = track.getMeasure(j);
@@ -308,7 +313,7 @@ private TGMeasure getMeasure(TGTrack track,long tick){
 		}
 		return getMeasure(track,realTick);
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure, long start){
 		int beatCount = measure.countBeats();
 		for( int i = 0 ; i < beatCount ; i ++){
@@ -317,16 +322,16 @@ private TGBeat getBeat(TGMeasure measure, long start){
 				return beat;
 			}
 		}
-		
+
 		TGBeat beat = this.factory.newBeat();
 		beat.setStart(start);
 		measure.addBeat(beat);
 		return beat;
 	}
-	
+
 	private TempNote getTempNote(int track,int channel,int value,boolean purge){
 		for(int i = 0;i < this.tempNotes.size();i ++){
-			TempNote note = (TempNote)this.tempNotes.get(i);
+			TempNote note = this.tempNotes.get(i);
 			if(note.getTrack() == track && note.getChannel() == channel && note.getValue() == value){
 				if(purge){
 					this.tempNotes.remove(i);
@@ -336,28 +341,28 @@ private TempNote getTempNote(int track,int channel,int value,boolean purge){
 		}
 		return null;
 	}
-	
+
 	protected TrackTuningHelper getTrackTuningHelper(int track){
-		Iterator it = this.trackTuningHelpers.iterator();
+		Iterator<TrackTuningHelper> it = this.trackTuningHelpers.iterator();
 		while(it.hasNext()){
-			TrackTuningHelper helper = (TrackTuningHelper)it.next();
+			TrackTuningHelper helper = it.next();
 			if(helper.getTrack() == track){
 				return helper;
 			}
 		}
 		TrackTuningHelper helper = new TrackTuningHelper(track);
 		this.trackTuningHelpers.add(helper);
-		
+
 		return helper;
 	}
-	
+
 	private void makeTempNotesBefore(long tick,int track){
 		long nextTick = tick;
 		boolean check = true;
 		while(check){
 			check = false;
 			for(int i = 0;i < this.tempNotes.size();i ++){
-				TempNote note = (TempNote)this.tempNotes.get(i);
+				TempNote note = this.tempNotes.get(i);
 				if(note.getTick() < nextTick && note.getTrack() == track){
 					nextTick = note.getTick() + (TGDuration.QUARTER_TIME * 5); //First beat + 4/4 measure;
 					makeNote(nextTick,track,note.getChannel(),note.getValue());
@@ -367,7 +372,7 @@ private void makeTempNotesBefore(long tick,int track){
 			}
 		}
 	}
-	
+
 	private void makeNote(long tick,int track,int channel,int value){
 		TempNote tempNote = getTempNote(track,channel,value,true);
 		if(tempNote != null){
@@ -377,70 +382,70 @@ private void makeNote(long tick,int track,int channel,int value){
 			long nStart = tempNote.getTick();
 			TGDuration minDuration = newDuration(MIN_DURATION_VALUE);
 			TGDuration nDuration = TGDuration.fromTime(this.factory,tick - tempNote.getTick(),minDuration);
-			
+
 			TGMeasure measure = getMeasure(getTrack(track),tempNote.getTick());
 			TGBeat beat = getBeat(measure, nStart);
 			nDuration.copy(beat.getVoice(0).getDuration());
-			
+
 			TGNote note = this.factory.newNote();
 			note.setValue(nValue);
 			note.setString(nString);
 			note.setVelocity(nVelocity);
-			
+
 			beat.getVoice(0).addNote(note);
 		}
 	}
-	
+
 	public TempChannel getTempChannel(int channel){
-		Iterator it = this.tempChannels.iterator();
+		Iterator<TempChannel> it = this.tempChannels.iterator();
 		while(it.hasNext()){
-			TempChannel tempChannel = (TempChannel)it.next();
+			TempChannel tempChannel = it.next();
 			if(tempChannel.getChannel() == channel){
 				return tempChannel;
 			}
 		}
 		TempChannel tempChannel = new TempChannel(channel);
 		this.tempChannels.add(tempChannel);
-		
+
 		return tempChannel;
 	}
-	
+
 	private void checkAll()throws Exception{
 		checkChannels();
 		checkTracks();
-		
+
 		int headerCount = this.headers.size();
 		for(int i = 0;i < this.tracks.size();i ++){
-			TGTrack track = (TGTrack)this.tracks.get(i);
-			
+			TGTrack track = this.tracks.get(i);
+
 			while(track.countMeasures() < headerCount){
 				long start = TGDuration.QUARTER_TIME;
 				TGMeasure lastMeasure = ((track.countMeasures() > 0)?track.getMeasure(track.countMeasures() - 1) :null);
 				if(lastMeasure != null){
 					start = (lastMeasure.getStart() + lastMeasure.getLength());
 				}
-				
+
 				track.addMeasure(this.factory.newMeasure(getHeader(start)));
 			}
 		}
-		
+
 		if(this.headers.isEmpty() || this.tracks.isEmpty()){
 			throw new Exception("Empty Song");
 		}
 	}
-	
+
 	private void checkChannels(){
 		for(int tc = 0 ; tc < this.tempChannels.size() ; tc ++ ){
-			TempChannel tempChannel = (TempChannel)this.tempChannels.get( tc );
+			TempChannel tempChannel = this.tempChannels.get( tc );
 			if( tempChannel.getTrack() > 0 ){
 				boolean channelExists = false;
 				for(int c = 0 ; c < this.channels.size() ; c ++ ){
-					TGChannel tgChannel = (TGChannel) this.channels.get(c);
+					TGChannel tgChannel = this.channels.get(c);
 					if( tgChannel.getChannel() == tempChannel.getChannel() || tgChannel.getEffectChannel() == tempChannel.getChannel() ){
 						channelExists = true;
 					}
 				}
-				
+
 				if(!channelExists){
 					TGChannel tgChannel = this.factory.newChannel();
 					tgChannel.setChannelId(this.channels.size() + 1);
@@ -450,9 +455,9 @@ private void checkChannels(){
 					tgChannel.setVolume((short)tempChannel.getVolume());
 					tgChannel.setBalance((short)tempChannel.getBalance());
 					tgChannel.setName(("#" + tgChannel.getChannelId()));
-					
+
 					for(int tcAux = (tc + 1) ; tcAux < this.tempChannels.size() ; tcAux ++ ){
-						TempChannel tempChannelAux = (TempChannel)this.tempChannels.get( tcAux );
+						TempChannel tempChannelAux = this.tempChannels.get( tcAux );
 						if( tempChannel.getTrack() == tempChannelAux.getTrack() ){
 							if( tgChannel.getEffectChannel() ==  tgChannel.getChannel() ){
 								tgChannel.setEffectChannel((short)tempChannelAux.getChannel());
@@ -461,26 +466,26 @@ private void checkChannels(){
 							}
 						}
 					}
-					
+
 					this.channels.add( tgChannel );
 				}
 			}
 		}
 	}
-	
+
 	private void checkTracks(){
-		Iterator it = this.tracks.iterator();
+		Iterator<TGTrack> it = this.tracks.iterator();
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			TGChannel trackChannel = null;
-			
-			Iterator tcIt = this.tempChannels.iterator();
+
+			Iterator<TempChannel> tcIt = this.tempChannels.iterator();
 			while(tcIt.hasNext()){
-				TempChannel tempChannel = (TempChannel)tcIt.next();
+				TempChannel tempChannel = tcIt.next();
 				if( tempChannel.getTrack() == track.getNumber() ){
-					Iterator channelIt = this.channels.iterator();
+					Iterator<TGChannel> channelIt = this.channels.iterator();
 					while( channelIt.hasNext() ){
-						TGChannel tgChannel = (TGChannel)channelIt.next();
+						TGChannel tgChannel = channelIt.next();
 						if( tempChannel.getChannel() == tgChannel.getChannel() ){
 							trackChannel = tgChannel;
 						}
@@ -497,50 +502,50 @@ private void checkTracks(){
 			}
 		}
 	}
-	
+
 	protected TGDuration newDuration(int value){
 		TGDuration duration = this.factory.newDuration();
 		duration.setValue(value);
 		return duration;
 	}
-	
+
 	private class TempNote{
-		private int track;
-		private int channel;
-		private int value;
-		private long tick;
-		
+		private final int track;
+		private final int channel;
+		private final int value;
+		private final long tick;
+
 		public TempNote(int track, int channel, int value,long tick) {
 			this.track = track;
 			this.channel = channel;
 			this.value = value;
 			this.tick = tick;
 		}
-		
+
 		public int getChannel() {
 			return this.channel;
 		}
-		
+
 		public long getTick() {
 			return this.tick;
 		}
-		
+
 		public int getTrack() {
 			return this.track;
 		}
-		
+
 		public int getValue() {
 			return this.value;
 		}
 	}
-	
+
 	private class TempChannel{
-		private int channel;
+		private final int channel;
 		private int instrument;
 		private int volume;
 		private int balance;
 		private int track;
-		
+
 		public TempChannel(int channel) {
 			this.channel = channel;
 			this.instrument = 0;
@@ -548,56 +553,56 @@ public TempChannel(int channel) {
 			this.balance = 64;
 			this.track = -1;
 		}
-		
+
 		public int getBalance() {
 			return this.balance;
 		}
-		
+
 		public void setBalance(int balance) {
 			this.balance = balance;
 		}
-		
+
 		public int getChannel() {
 			return this.channel;
 		}
-		
+
 		public int getInstrument() {
 			return this.instrument;
 		}
-		
+
 		public void setInstrument(int instrument) {
 			this.instrument = instrument;
 		}
-		
+
 		public int getTrack() {
 			return this.track;
 		}
-		
+
 		public void setTrack(int track) {
 			this.track = track;
 		}
-		
+
 		public int getVolume() {
 			return this.volume;
 		}
-		
+
 		public void setVolume(int volume) {
 			this.volume = volume;
 		}
-		
+
 	}
-	
+
 	private class TrackTuningHelper{
-		private int track;
+		private final int track;
 		private int maxValue;
 		private int minValue;
-		
+
 		public TrackTuningHelper(int track){
 			this.track = track;
 			this.maxValue = -1;
 			this.minValue = -1;
 		}
-		
+
 		public void checkValue(int value){
 			if(this.minValue < 0 || value < this.minValue){
 				this.minValue = value;
@@ -606,12 +611,12 @@ public void checkValue(int value){
 				this.maxValue = value;
 			}
 		}
-		
-		public List getStrings() {
-			List strings = new ArrayList();
-			
+
+		public List<TGString> getStrings() {
+			List<TGString> strings = new ArrayList<TGString>();
+
 			int maxFret = 24;
-			
+
 			if(this.minValue >= 40 && this.maxValue <= 64 + maxFret){
 				strings.add(TGSongManager.newString(MidiSongImporter.this.factory,1, 64));
 				strings.add(TGSongManager.newString(MidiSongImporter.this.factory,2, 59));
@@ -656,63 +661,63 @@ else if(this.minValue >= 23 && this.maxValue <= 43 + maxFret){
 					stringCount = 7;
 					stringSpacing = ((this.maxValue - (maxFret - 4) - this.minValue) / stringCount);
 				}
-				
+
 				int maxStringValue = (this.minValue + (stringCount * stringSpacing));
 				while(strings.size() < stringCount){
 					maxStringValue -= stringSpacing;
 					strings.add(TGSongManager.newString(MidiSongImporter.this.factory,strings.size() + 1,maxStringValue));
 				}
 			}
-			
+
 			return strings;
 		}
-		
+
 		public int getTrack() {
 			return this.track;
 		}
-		
+
 	}
 }
 
 class SongAdjuster{
-	private TGFactory factory;
-	private TGSong song;
-	private long minDurationTime;
-	
+	private final TGFactory factory;
+	private final TGSong song;
+	private final long minDurationTime;
+
 	public SongAdjuster(TGFactory factory,TGSong song){
 		this.factory = factory;
 		this.song = song;
 		this.minDurationTime = 40;
 	}
-	
+
 	public TGSong adjustSong(){
-		Iterator it = this.song.getTracks();
-		
+		Iterator<TGTrack> it = this.song.getTracks();
+
 		while(it.hasNext()){
-			TGTrack track = (TGTrack)it.next();
+			TGTrack track = it.next();
 			adjustTrack(track);
 		}
 		return this.song;
 	}
-	
+
 	private void adjustTrack(TGTrack track){
-		Iterator it = track.getMeasures();
+		Iterator<TGMeasure> it = track.getMeasures();
 		while(it.hasNext()){
-			TGMeasure measure = (TGMeasure)it.next();
+			TGMeasure measure = it.next();
 			process(measure);
 		}
 	}
-	
+
 	public void process(TGMeasure measure){
 		orderBeats(measure);
 		joinBeats(measure);
 		adjustStrings(measure);
 	}
-	
+
 	public void joinBeats(TGMeasure measure){
 		TGBeat previous = null;
 		boolean finish = true;
-		
+
 		long measureStart = measure.getStart();
 		long measureEnd = (measureStart + measure.getLength());
 		for(int i = 0;i < measure.countBeats();i++){
@@ -722,7 +727,7 @@ public void joinBeats(TGMeasure measure){
 			if(previous != null){
 				long previousStart = previous.getStart();
 				long previousLength = previous.getVoice(0).getDuration().getTime();
-				
+
 				//if(previousStart == beatStart){
 				if(beatStart >= previousStart && (previousStart + this.minDurationTime) > beatStart ){
 					// add beat notes to previous
@@ -730,27 +735,27 @@ public void joinBeats(TGMeasure measure){
 						TGNote note = beat.getVoice(0).getNote( n );
 						previous.getVoice(0).addNote( note );
 					}
-					
+
 					// add beat chord to previous
 					if(!previous.isChordBeat() && beat.isChordBeat()){
 						previous.setChord( beat.getChord() );
 					}
-					
+
 					// add beat text to previous
 					if(!previous.isTextBeat() && beat.isTextBeat()){
 						previous.setText( beat.getText() );
 					}
-					
+
 					// set the best duration
 					if(beatLength > previousLength && (beatStart + beatLength) <= measureEnd){
 						beat.getVoice(0).getDuration().copy(previous.getVoice(0).getDuration());
 					}
-					
+
 					measure.removeBeat(beat);
 					finish = false;
 					break;
 				}
-				
+
 				else if(previousStart < beatStart && (previousStart + previousLength) > beatStart){
 					if(beat.getVoice(0).isRestVoice()){
 						measure.removeBeat(beat);
@@ -770,14 +775,14 @@ else if(previousStart < beatStart && (previousStart + previousLength) > beatStar
 				TGDuration duration = TGDuration.fromTime(this.factory, (measureEnd - beatStart) );
 				duration.copy( beat.getVoice(0).getDuration() );
 			}
-			
+
 			previous = beat;
 		}
 		if(!finish){
 			joinBeats(measure);
 		}
 	}
-	
+
 	public void orderBeats(TGMeasure measure){
 		for(int i = 0;i < measure.countBeats();i++){
 			TGBeat minBeat = null;
@@ -790,27 +795,27 @@ public void orderBeats(TGMeasure measure){
 			measure.moveBeat(i, minBeat);
 		}
 	}
-	
+
 	private void adjustStrings(TGMeasure measure){
 		for(int i = 0;i < measure.countBeats();i++){
 			TGBeat beat = measure.getBeat( i );
 			adjustStrings(beat);
 		}
 	}
-	
+
 	private void adjustStrings(TGBeat beat){
 		TGTrack track = beat.getMeasure().getTrack();
-		List freeStrings = new ArrayList( track.getStrings() );
-		List notesToRemove = new ArrayList();
-		
+		List<TGString> freeStrings = new ArrayList<TGString>( track.getStrings() );
+		List<TGNote> notesToRemove = new ArrayList<TGNote>();
+
 		//ajusto las cuerdas
-		Iterator it = beat.getVoice(0).getNotes().iterator();
+		Iterator<TGNote> it = beat.getVoice(0).getNotes().iterator();
 		while(it.hasNext()){
-			TGNote note = (TGNote)it.next();
-			
+			TGNote note = it.next();
+
 			int string = getStringForValue(freeStrings,note.getValue());
 			for(int j = 0;j < freeStrings.size();j ++){
-				TGString tempString = (TGString)freeStrings.get(j);
+				TGString tempString = freeStrings.get(j);
 				if(tempString.getNumber() == string){
 					note.setValue(note.getValue() - tempString.getValue());
 					note.setString(tempString.getNumber());
@@ -818,25 +823,25 @@ private void adjustStrings(TGBeat beat){
 					break;
 				}
 			}
-			
-			//Cannot have more notes on same string 
+
+			//Cannot have more notes on same string
 			if(note.getString() < 1){
 				notesToRemove.add( note );
 			}
 		}
-		
+
 		// Remove notes
 		while( notesToRemove.size() > 0 ){
-			beat.getVoice(0).removeNote( (TGNote)notesToRemove.get( 0 ) );
+			beat.getVoice(0).removeNote( notesToRemove.get( 0 ) );
 			notesToRemove.remove( 0 );
 		}
 	}
-	
-	private int getStringForValue(List strings,int value){
+
+	private int getStringForValue(List<TGString> strings,int value){
 		int minFret = -1;
 		int stringForValue = 0;
 		for(int i = 0;i < strings.size();i++){
-			TGString string = (TGString)strings.get(i);
+			TGString string = strings.get(i);
 			int fret = value - string.getValue();
 			if(minFret < 0 || (fret >= 0 && fret < minFret)){
 				stringForValue = string.getNumber();
diff --git a/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiEvent.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiEvent.java
new file mode 100644
index 00000000..159955a3
--- /dev/null
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiEvent.java
@@ -0,0 +1,20 @@
+package org.herac.tuxguitar.io.midi.base;
+
+public class MidiEvent {
+
+	private long tick;
+	private MidiMessage message;
+
+	public MidiEvent(MidiMessage message, long tick){
+		this.message = message;
+		this.tick = tick;
+	}
+
+	public MidiMessage getMessage() {
+		return this.message;
+	}
+
+	public long getTick() {
+		return this.tick;
+	}
+}
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiMessage.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiMessage.java
similarity index 98%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiMessage.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiMessage.java
index 11f9cb08..04ae3ac8 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiMessage.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiMessage.java
@@ -1,10 +1,10 @@
 package org.herac.tuxguitar.io.midi.base;
 
 public class MidiMessage{
-	
+
 	public static final int TYPE_SHORT = 1;
 	public static final int TYPE_META = 2;
-	
+
 	public static final int NOTE_OFF = 0x80;
 	public static final int NOTE_ON = 0x90;
 	public static final int CONTROL_CHANGE = 0xB0;
@@ -13,50 +13,50 @@ public class MidiMessage{
 	public static final int SYSTEM_RESET = 0xFF;
 	public static final int TEMPO_CHANGE = 0x51;
 	public static final int TIME_SIGNATURE_CHANGE = 0x58;
-	
+
 	private int message;
 	private int command;
 	private byte[] data;
-	
+
 	public MidiMessage(int message, int command) {
 		this.message = message;
 		this.command = command;
 	}
-	
+
 	public void setData(byte[] data) {
 		this.data = data;
 	}
-	
+
 	public byte[] getData() {
 		return this.data;
 	}
-	
+
 	public int getType(){
 		return this.message;
 	}
-	
+
 	public int getCommand(){
 		return this.command;
 	}
-	
+
 	public static MidiMessage shortMessage(int command, int channel, int data1, int data2){
 		MidiMessage message = new MidiMessage(TYPE_SHORT,command);
 		message.setData(new byte[]{ (byte)( (command & 0xF0) | (channel & 0x0F) ),(byte)data1, (byte)data2  });
 		return message;
 	}
-	
+
 	public static MidiMessage shortMessage(int command, int channel, int data){
 		MidiMessage message = new MidiMessage(TYPE_SHORT,command);
 		message.setData(new byte[]{ (byte)( (command & 0xF0) | (channel & 0x0F) ),(byte)data });
 		return message;
 	}
-	
+
 	public static MidiMessage shortMessage(int command){
 		MidiMessage message = new MidiMessage(TYPE_SHORT,command);
 		message.setData(new byte[]{ (byte)command  });
 		return message;
 	}
-	
+
 	public static MidiMessage metaMessage(int command, byte[] data){
 		MidiMessage message = new MidiMessage(TYPE_META,command);
 		message.setData(data);
diff --git a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiSequence.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiSequence.java
similarity index 83%
rename from TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiSequence.java
rename to plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiSequence.java
index fcf00ef0..fee5a3ff 100644
--- a/TuxGuitar-midi/src/org/herac/tuxguitar/io/midi/base/MidiSequence.java
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiSequence.java
@@ -4,56 +4,55 @@
 import java.util.List;
 
 public class MidiSequence {
-	
+
 	public static final float PPQ = 0.0f;
 	public static final float SMPTE_24 = 24.0f;
 	public static final float SMPTE_25 = 25.0f;
 	public static final float SMPTE_30DROP = 29.97f;
 	public static final float SMPTE_30 = 30.0f;
-	
+
 	protected float divisionType;
 	protected int resolution;
-	private List tracks;
-	
+	private List<MidiTrack> tracks;
+
 	public MidiSequence(float divisionType, int resolution){
 		this.divisionType = divisionType;
 		this.resolution = resolution;
-		this.tracks = new ArrayList();
+		this.tracks = new ArrayList<MidiTrack>();
 	}
-	
+
 	public void addTrack(MidiTrack track){
 		this.tracks.add(track);
 	}
-	
+
 	public MidiTrack getTrack(int index){
-		return (MidiTrack)this.tracks.get(index);
+		return this.tracks.get(index);
 	}
-	
+
 	public int countTracks(){
 		return this.tracks.size();
 	}
-	
+
 	public float getDivisionType() {
 		return this.divisionType;
 	}
-	
+
 	public int getResolution() {
 		return this.resolution;
 	}
-	
+
 	public void sort(){
 		for(int i = 0; i < this.tracks.size(); i ++){
-			MidiTrack track = (MidiTrack)this.tracks.get(i);
+			MidiTrack track = this.tracks.get(i);
 			track.sort();
 		}
 	}
-	
+
 	public void finish(){
 		for(int i = 0; i < this.tracks.size(); i ++){
-			MidiTrack track = (MidiTrack)this.tracks.get(i);
+			MidiTrack track = this.tracks.get(i);
 			track.add(new MidiEvent(MidiMessage.metaMessage(47,new byte[]{}),track.ticks()));
 			track.sort();
 		}
 	}
 }
- 
\ No newline at end of file
diff --git a/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiTrack.java b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiTrack.java
new file mode 100644
index 00000000..6902786e
--- /dev/null
+++ b/plugins/midi/src/main/java/org/herac/tuxguitar/io/midi/base/MidiTrack.java
@@ -0,0 +1,47 @@
+package org.herac.tuxguitar.io.midi.base;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class MidiTrack {
+
+	private long ticks;
+	private final List<MidiEvent> events = new ArrayList<MidiEvent>();
+
+	public void add(MidiEvent event) {
+		this.events.add(event);
+		this.ticks = Math.max(this.ticks,event.getTick());
+	}
+
+	public MidiEvent get(int index){
+		return this.events.get(index);
+	}
+
+	public int size(){
+		return this.events.size();
+	}
+
+	public long ticks(){
+		return this.ticks;
+	}
+
+	public void sort(){
+		final Comparator<Object> comparator = new Comparator<Object>() {
+			@Override
+			public int compare(Object o1, Object o2) {
+				if(o1 instanceof MidiEvent && o2 instanceof MidiEvent){
+					MidiEvent e1 = (MidiEvent)o1;
+					MidiEvent e2 = (MidiEvent)o2;
+					if(e1.getTick() == e2.getTick()){
+						return 0;
+					}
+					return (e1.getTick() > e2.getTick() ? 1 : -1);
+				}
+				return 0;
+			}
+		};
+		Collections.sort(this.events,comparator);
+	}
+}
diff --git a/TuxGuitar-midi/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/midi/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-midi/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/midi/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/musicxml/pom.xml b/plugins/musicxml/pom.xml
new file mode 100644
index 00000000..03593a7f
--- /dev/null
+++ b/plugins/musicxml/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-musicxml</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: MusicXML</name>
+	<description>MusicXML plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java b/plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java
similarity index 90%
rename from TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java
rename to plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java
index 01c2b68a..489f14c7 100644
--- a/TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java
+++ b/plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLPluginExporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class MusicXMLPluginExporter extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new MusicXMLSongExporter();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "MusicXML exporter plugin";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "MusicXML exporter";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java b/plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java
similarity index 93%
rename from TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java
rename to plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java
index aca1202d..5e8a913b 100644
--- a/TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java
+++ b/plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLSongExporter.java
@@ -9,25 +9,30 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class MusicXMLSongExporter implements TGLocalFileExporter{
-	
+
 	private OutputStream stream;
-	
+
+	@Override
 	public String getExportName() {
 		return "MusicXML";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("MusicXML","*.xml");
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		return true;
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) throws TGFileFormatException {
 		if( this.stream != null ){
 			new MusicXMLWriter(this.stream).writeSong(song);
diff --git a/TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java b/plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java
similarity index 96%
rename from TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java
rename to plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java
index 5bfd69ca..0800a619 100644
--- a/TuxGuitar-musicxml/src/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java
+++ b/plugins/musicxml/src/main/java/org/herac/tuxguitar/io/musicxml/MusicXMLWriter.java
@@ -33,19 +33,19 @@
 import org.w3c.dom.Node;
 
 public class MusicXMLWriter {
-	
+
 	private static final String[] NOTE_NAMES = new String[]{"C","D","E","F","G","A","B"};
-	
+
 	private static final int NOTE_SHARPS[] = new int[]{0,0,1,1,2,3,3,4,4,5,5,6};
-	
+
 	private static final int NOTE_FLATS[] = new int[]{0,1,1,2,2,3,4,4,5,5,6,6};
-	
+
 	private static final boolean[] NOTE_ALTERATIONS = new boolean[]{false,true,false,true,false,false,true,false,true,false,true,false};
-	
+
 	private static final String[] DURATION_NAMES = new String[]{ "whole", "half", "quarter", "eighth", "16th", "32nd", "64th", };
-	
+
 	private static final int DURATION_DIVISIONS = (int)TGDuration.QUARTER_TIME;
-	
+
 	private static final int[] DURATION_VALUES = new int[]{
 		DURATION_DIVISIONS * 4, // WHOLE
 		DURATION_DIVISIONS * 2, // HALF
@@ -55,103 +55,103 @@ public class MusicXMLWriter {
 		DURATION_DIVISIONS / 8, // THIRTY_SECOND
 		DURATION_DIVISIONS / 16, // SIXTY_FOURTH
 	};
-	
+
 	private TGSongManager manager;
-	
-	private OutputStream stream;
-	
+
+	private final OutputStream stream;
+
 	private Document document;
-	
+
 	public MusicXMLWriter(OutputStream stream){
 		this.stream = stream;
 	}
-	
+
 	public void writeSong(TGSong song) throws TGFileFormatException{
 		try {
 			this.manager = new TGSongManager();
 			this.manager.setSong(song);
 			this.document = newDocument();
-			
+
 			Node node = this.addNode(this.document,"score-partwise");
 			this.writeHeaders(node);
 			this.writeSong(node);
 			this.saveDocument();
-			
+
 			this.stream.flush();
 			this.stream.close();
 		}catch(Throwable throwable){
 			throw new TGFileFormatException("Could not write song!.",throwable);
 		}
 	}
-	
+
 	private void writeHeaders(Node parent){
 		this.writeWork(parent);
 		this.writeIdentification(parent);
 	}
-	
+
 	private void writeWork(Node parent){
 		this.addNode(this.addNode(parent,"work"),"work-title",this.manager.getSong().getName());
 	}
-	
+
 	private void writeIdentification(Node parent){
 		Node identification = this.addNode(parent,"identification");
 		this.addNode(this.addNode(identification,"encoding"), "software", "TuxGuitar");
 		this.addAttribute(this.addNode(identification,"creator",this.manager.getSong().getAuthor()),"type","composer");
 	}
-	
+
 	private void writeSong(Node parent){
 		this.writePartList(parent);
 		this.writeParts(parent);
 	}
-	
+
 	private void writePartList(Node parent){
 		Node partList = this.addNode(parent,"part-list");
-		
-		Iterator tracks = this.manager.getSong().getTracks();
+
+		Iterator<TGTrack> tracks = this.manager.getSong().getTracks();
 		while(tracks.hasNext()){
-			TGTrack track = (TGTrack)tracks.next();
+			TGTrack track = tracks.next();
 			TGChannel channel = this.manager.getChannel(track.getChannelId());
-			
+
 			Node scoreParts = this.addNode(partList,"score-part");
 			this.addAttribute(scoreParts, "id", "P" + track.getNumber());
-			
+
 			this.addNode(scoreParts, "part-name", track.getName());
-			
+
 			if( channel != null ){
 				Node scoreInstrument = this.addAttribute(this.addNode(scoreParts, "score-instrument"), "id", "P" + track.getNumber() + "-I1");
 				this.addNode(scoreInstrument, "instrument-name",channel.getName());
-			
+
 				Node midiInstrument = this.addAttribute(this.addNode(scoreParts, "midi-instrument"), "id", "P" + track.getNumber() + "-I1");
 				this.addNode(midiInstrument, "midi-channel",Integer.toString(channel.getChannel() + 1));
 				this.addNode(midiInstrument, "midi-program",Integer.toString(channel.getProgram() + 1));
 			}
 		}
 	}
-	
+
 	private void writeParts(Node parent){
-		Iterator tracks = this.manager.getSong().getTracks();
+		Iterator<TGTrack> tracks = this.manager.getSong().getTracks();
 		while(tracks.hasNext()){
-			TGTrack track = (TGTrack)tracks.next();
+			TGTrack track = tracks.next();
 			Node part = this.addAttribute(this.addNode(parent,"part"), "id", "P" + track.getNumber());
-			
+
 			TGMeasure previous = null;
-			
-			Iterator measures = track.getMeasures();
+
+			Iterator<TGMeasure> measures = track.getMeasures();
 			while(measures.hasNext()){
 				// TODO: Add multivoice support.
-				TGMeasure srcMeasure = (TGMeasure)measures.next();
+				TGMeasure srcMeasure = measures.next();
 				TGMeasure measure = new TGVoiceJoiner(this.manager.getFactory(),srcMeasure).process();
 				Node measureNode = this.addAttribute(this.addNode(part,"measure"), "number",Integer.toString(measure.getNumber()));
-				
+
 				this.writeMeasureAttributes(measureNode, measure, previous);
 				this.writeDirection(measureNode, measure, previous);
 				this.writeBeats(measureNode, measure);
-				
+
 				previous = measure;
 			}
 		}
 	}
-	
+
 	private void writeMeasureAttributes(Node parent,TGMeasure measure, TGMeasure previous){
 		boolean divisionChanges = (previous == null);
 		boolean keyChanges = (previous == null || measure.getKeySignature() != previous.getKeySignature());
@@ -177,7 +177,7 @@ private void writeMeasureAttributes(Node parent,TGMeasure measure, TGMeasure pre
 			}
 		}
 	}
-	
+
 	private void writeTuning(Node parent, TGTrack track){
 		Node staffDetailsNode = this.addNode(parent,"staff-details");
 		this.addNode(staffDetailsNode, "staff-lines", Integer.toString( track.stringCount() ));
@@ -189,13 +189,13 @@ private void writeTuning(Node parent, TGTrack track){
 			this.addNode(stringNode, "tuning-octave", Integer.toString(string.getValue() / 12) );
 		}
 	}
-	
+
 	private void writeTimeSignature(Node parent, TGTimeSignature ts){
 		Node node = this.addNode(parent,"time");
 		this.addNode(node,"beats",Integer.toString(ts.getNumerator()));
 		this.addNode(node,"beat-type",Integer.toString(ts.getDenominator().getValue()));
 	}
-	
+
 	private void writeKeySignature(Node parent, int ks){
 		int value = ks;
 		if(value != 0){
@@ -205,7 +205,7 @@ private void writeKeySignature(Node parent, int ks){
 		this.addNode(key,"fifths",Integer.toString( value ));
 		this.addNode(key,"mode","major");
 	}
-	
+
 	private void writeClef(Node parent, int clef){
 		Node node = this.addNode(parent,"clef");
 		if(clef == TGMeasure.CLEF_TREBLE){
@@ -225,20 +225,20 @@ else if(clef == TGMeasure.CLEF_ALTO){
 			this.addNode(node,"line","2");
 		}
 	}
-	
+
 	private void writeDirection(Node parent, TGMeasure measure, TGMeasure previous){
 		boolean tempoChanges = (previous == null || measure.getTempo().getValue() != previous.getTempo().getValue());
-		
+
 		if(tempoChanges){
 			Node direction = this.addAttribute(this.addNode(parent,"direction"),"placement","above");
 			this.writeMeasureTempo(direction, measure.getTempo());
 		}
 	}
-	
+
 	private void writeMeasureTempo(Node parent,TGTempo tempo){
 		this.addAttribute(this.addNode(parent,"sound"),"tempo",Integer.toString(tempo.getValue()));
 	}
-	
+
 	private void writeBeats(Node parent, TGMeasure measure){
 		int ks = measure.getKeySignature();
 		int beatCount = measure.countBeats();
@@ -255,24 +255,24 @@ private void writeBeats(Node parent, TGMeasure measure){
 				int noteCount = voice.countNotes();
 				for(int n = 0; n < noteCount; n ++){
 					TGNote note = voice.getNote( n );
-					
+
 					Node noteNode = this.addNode(parent,"note");
 					int value = (beat.getMeasure().getTrack().getString(note.getString()).getValue() + note.getValue());
-					
+
 					Node pitchNode = this.addNode(noteNode,"pitch");
 					this.addNode(pitchNode,"step",NOTE_NAMES[ (ks <= 7 ? NOTE_SHARPS[value % 12] : NOTE_FLATS[value % 12] )]);
 					this.addNode(pitchNode,"octave",Integer.toString(value / 12));
 					if(NOTE_ALTERATIONS[ value % 12 ]){
 						this.addNode(pitchNode,"alter", ( ks <= 7 ? "1" : "-1" ) );
 					}
-					
+
 					Node technicalNode = this.addNode(this.addNode(noteNode, "notations"), "technical");
 					this.addNode(technicalNode,"fret", Integer.toString( note.getValue() ));
 					this.addNode(technicalNode,"string", Integer.toString( note.getString() ));
-					
+
 					this.addNode(noteNode,"voice","1");
 					this.writeDuration(noteNode, voice.getDuration());
-					
+
 					if(note.isTiedNote()){
 						this.addAttribute(this.addNode(noteNode,"tie"),"type","stop");
 					}
@@ -283,7 +283,7 @@ private void writeBeats(Node parent, TGMeasure measure){
 			}
 		}
 	}
-	
+
 	private void writeDuration(Node parent, TGDuration duration){
 		int index = duration.getIndex();
 		if( index >=0 && index <= 6 ){
@@ -294,10 +294,10 @@ private void writeDuration(Node parent, TGDuration duration){
 			else if(duration.isDoubleDotted()){
 				value += ((value / 4) * 3);
 			}
-			
+
 			this.addNode(parent,"duration",Integer.toString(value));
 			this.addNode(parent,"type",DURATION_NAMES[ index ]);
-			
+
 			if(duration.isDotted()){
 				this.addNode(parent,"dot");
 			}
@@ -305,7 +305,7 @@ else if(duration.isDoubleDotted()){
 				this.addNode(parent,"dot");
 				this.addNode(parent,"dot");
 			}
-			
+
 			if(!duration.getDivision().isEqual(TGDivisionType.NORMAL)){
 				Node divisionType = this.addNode(parent,"time-modification");
 				this.addNode(divisionType,"actual-notes",Integer.toString(duration.getDivision().getEnters()));
@@ -313,26 +313,26 @@ else if(duration.isDoubleDotted()){
 			}
 		}
 	}
-	
+
 	private Node addAttribute(Node node, String name, String value){
 		Attr attribute = this.document.createAttribute(name);
 		attribute.setNodeValue(value);
 		node.getAttributes().setNamedItem(attribute);
 		return node;
 	}
-	
+
 	private Node addNode(Node parent, String name){
 		Node node = this.document.createElement(name);
 		parent.appendChild(node);
 		return node;
 	}
-	
+
 	private Node addNode(Node parent, String name, String content){
 		Node node = this.addNode(parent, name);
 		node.setTextContent(content);
 		return node;
 	}
-	
+
 	private Document newDocument() {
 		try {
 			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@@ -344,7 +344,7 @@ private Document newDocument() {
 		}
 		return null;
 	}
-	
+
 	private void saveDocument() {
 		try {
 			TransformerFactory xformFactory = TransformerFactory.newInstance();
@@ -357,27 +357,27 @@ private void saveDocument() {
 			throwable.printStackTrace();
 		}
 	}
-	
+
 	private static class TGVoiceJoiner {
-		private TGFactory factory;
-		private TGMeasure measure;
-		
+		private final TGFactory factory;
+		private final TGMeasure measure;
+
 		public TGVoiceJoiner(TGFactory factory,TGMeasure measure){
 			this.factory = factory;
 			this.measure = measure.clone(factory, measure.getHeader());
 			this.measure.setTrack( measure.getTrack() );
 		}
-		
+
 		public TGMeasure process(){
 			this.orderBeats();
 			this.joinBeats();
 			return this.measure;
 		}
-		
+
 		public void joinBeats(){
 			TGBeat previous = null;
 			boolean finish = true;
-			
+
 			long measureStart = this.measure.getStart();
 			long measureEnd = (measureStart + this.measure.getLength());
 			for(int i = 0;i < this.measure.countBeats();i++){
@@ -397,11 +397,11 @@ public void joinBeats(){
 					finish = false;
 					break;
 				}
-				
+
 				long beatStart = beat.getStart();
 				if(previous != null){
 					long previousStart = previous.getStart();
-					
+
 					TGDuration previousBestDuration = null;
 					for(int v = /*1*/0; v < previous.countVoices(); v++ ){
 						TGVoice previousVoice = previous.getVoice(v);
@@ -414,7 +414,7 @@ public void joinBeats(){
 							}
 						}
 					}
-					
+
 					if(previousBestDuration != null){
 						previousBestDuration.copy( previous.getVoice(0).getDuration() );
 					}else{
@@ -427,7 +427,7 @@ public void joinBeats(){
 						duration.copy( previous.getVoice(0).getDuration() );
 					}
 				}
-				
+
 				TGDuration beatBestDuration = null;
 				for(int v = /*1*/0; v < beat.countVoices(); v++ ){
 					TGVoice currentVoice = beat.getVoice(v);
@@ -440,7 +440,7 @@ public void joinBeats(){
 						}
 					}
 				}
-				
+
 				if(beatBestDuration == null){
 					if(voice.isRestVoice()){
 						this.measure.removeBeat(beat);
@@ -456,7 +456,7 @@ public void joinBeats(){
 				joinBeats();
 			}
 		}
-		
+
 		public void orderBeats(){
 			for(int i = 0;i < this.measure.countBeats();i++){
 				TGBeat minBeat = null;
diff --git a/TuxGuitar-musicxml/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/musicxml/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-musicxml/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/musicxml/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/oss/pom.xml b/plugins/oss/pom.xml
new file mode 100644
index 00000000..e5196cc0
--- /dev/null
+++ b/plugins/oss/pom.xml
@@ -0,0 +1,142 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-oss</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>so</packaging>
+	<name>TuxGuitar :: Plugin :: OSS</name>
+	<description>OSS plugin for TuxGuitar</description>
+
+	<!-- TODO clean up, this pom is full of hack, if there is something cleaner, with only 1 pom, it is welcome -->
+	<build>
+
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+		<plugins>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile java files -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- package the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${version}</finalName>
+							<includes>
+								<include>**/*</include>
+							</includes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- install .jar as an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>jar-artefact</id>
+						<phase>package</phase>
+						<goals>
+							<goal>attach-artifact</goal>
+						</goals>
+						<configuration>
+							<artifacts>
+								<artifact>
+									<file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+									<type>jar</type>
+								</artifact>
+							</artifacts>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared</linkerStartOption>
+					</linkerStartOptions>
+					<!-- easy way to package the shared lib with jar -->
+					<linkerOutputDirectory>${project.build.directory}/classes</linkerOutputDirectory>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.herac.tuxguitar</groupId>
+			<artifactId>tuxguitar-app</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiConfigUtils.java b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiConfigUtils.java
new file mode 100644
index 00000000..29149709
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiConfigUtils.java
@@ -0,0 +1,109 @@
+package org.herac.tuxguitar.player.impl.midiport.oss;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.herac.tuxguitar.app.TuxGuitar;
+import org.herac.tuxguitar.app.system.config.TGConfigManager;
+import org.herac.tuxguitar.app.system.plugins.TGPluginConfigManager;
+import org.herac.tuxguitar.app.util.DialogUtils;
+
+public class MidiConfigUtils {
+
+	public static final String DEVICE_KEY = "oss.device";
+
+	public static final String DEVICE_DEFAULT = "/dev/sequencer";
+
+	public static TGConfigManager getConfig(){
+		TGConfigManager config = new TGPluginConfigManager("tuxguitar-oss");
+		config.init();
+		return config;
+	}
+
+	public static String getDevice(){
+		return getDevice(getConfig());
+	}
+
+	public static String getDevice(final TGConfigManager config){
+		return config.getStringConfigValue(DEVICE_KEY,DEVICE_DEFAULT);
+	}
+
+	public static void setupDialog(Shell parent,final MidiOutputPortProviderImpl provider) {
+		setupDialog(parent,provider,getConfig());
+	}
+
+	public static void setupDialog(Shell parent,final MidiOutputPortProviderImpl provider,final TGConfigManager config) {
+		final String device = getDevice(config);
+
+		final Shell dialog = DialogUtils.newDialog(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
+		dialog.setLayout(new GridLayout());
+		dialog.setText("Configuration");
+
+		//------------------DEVICE-----------------------
+		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
+		group.setLayout(new GridLayout(2,false));
+		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
+		group.setText("Device Configuration");
+
+		final Label deviceLabel = new Label(group,SWT.LEFT);
+		deviceLabel.setText("Device:");
+
+		final Text deviceValue = new Text(group,SWT.BORDER);
+		deviceValue.setLayoutData(new GridData(250,SWT.DEFAULT));
+		deviceValue.setText( (device == null ? new String() : device) );
+
+		//------------------BUTTONS--------------------------
+		Composite buttons = new Composite(dialog, SWT.NONE);
+		buttons.setLayout(new GridLayout(2,false));
+		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
+
+		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
+		data.minimumWidth = 80;
+		data.minimumHeight = 25;
+
+		final Button buttonOK = new Button(buttons, SWT.PUSH);
+		buttonOK.setText(TuxGuitar.getProperty("ok"));
+		buttonOK.setLayoutData(data);
+		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				String selection = deviceValue.getText();
+
+				String value1 = (device == null ? new String() : device);
+				String value2 = (selection == null ? new String() : selection);
+				if(!value1.equals(value2)){
+					if(selection != null){
+						config.setProperty(DEVICE_KEY,selection);
+					}else{
+						config.removeProperty(DEVICE_KEY);
+					}
+					config.save();
+					provider.updateDevice(selection);
+				}
+				dialog.dispose();
+			}
+		});
+
+		Button buttonCancel = new Button(buttons, SWT.PUSH);
+		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
+		buttonCancel.setLayoutData(data);
+		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent arg0) {
+				dialog.dispose();
+			}
+		});
+
+		dialog.setDefaultButton( buttonOK );
+
+		DialogUtils.openDialog(dialog,DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
+	}
+}
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java
new file mode 100644
index 00000000..199e0374
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortImpl.java
@@ -0,0 +1,54 @@
+package org.herac.tuxguitar.player.impl.midiport.oss;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiOutputPortImpl implements MidiOutputPort{
+
+	private int device;
+	private String name;
+	private MidiReceiverImpl receiver;
+
+	public MidiOutputPortImpl(MidiSystem midiSystem,String name,int device){
+		this.name = name;
+		this.device = device;
+		this.receiver = new MidiReceiverImpl(this,midiSystem);
+	}
+
+	@Override
+	public void open(){
+		if(!this.receiver.isConnected()){
+			this.receiver.connect();
+		}
+	}
+
+	@Override
+	public void close(){
+		this.receiver.disconnect();
+	}
+
+	@Override
+	public MidiReceiver getReceiver(){
+		this.open();
+		return this.receiver;
+	}
+
+	@Override
+	public void check(){
+		// Not implemented
+	}
+
+	public int getDevice() {
+		return this.device;
+	}
+
+	@Override
+	public String getKey(){
+		return ("tuxguitar-oss_" + this.device);
+	}
+
+	@Override
+	public String getName(){
+		return (this.name +" #" + this.device);
+	}
+}
\ No newline at end of file
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderImpl.java b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderImpl.java
new file mode 100644
index 00000000..40c8ce41
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderImpl.java
@@ -0,0 +1,49 @@
+package org.herac.tuxguitar.player.impl.midiport.oss;
+
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
+
+	private MidiSystem midiSystem;
+
+	public MidiOutputPortProviderImpl(){
+		super();
+	}
+
+	@Override
+	public List<MidiOutputPort> listPorts() {
+		if(this.midiSystem == null){
+			this.midiSystem = new MidiSystem();
+		}
+		if(!this.midiSystem.isOpen()){
+			this.midiSystem.open(MidiConfigUtils.getDevice());
+		}
+		return this.midiSystem.findPorts();
+	}
+
+	@Override
+	public void closeAll(){
+		if(this.midiSystem != null){
+			this.midiSystem.close();
+			this.midiSystem.finalize();
+			this.midiSystem = null;
+		}
+	}
+
+	public void updateDevice(String device){
+		if(this.midiSystem != null && this.midiSystem.isOpen()){
+			MidiOutputPortImpl connection = this.midiSystem.getConnection();
+			if(connection != null){
+				connection.close();
+			}
+			this.midiSystem.close();
+			this.midiSystem.open(device);
+			if(connection != null){
+				connection.open();
+			}
+		}
+	}
+}
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderPlugin.java b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderPlugin.java
new file mode 100644
index 00000000..08c59b32
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiOutputPortProviderPlugin.java
@@ -0,0 +1,44 @@
+package org.herac.tuxguitar.player.impl.midiport.oss;
+
+import org.eclipse.swt.widgets.Shell;
+import org.herac.tuxguitar.app.system.plugins.TGPluginSetup;
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin implements TGPluginSetup{
+
+	private MidiOutputPortProviderImpl portReader;
+
+	@Override
+	protected MidiOutputPortProvider getProvider() {
+		if(this.portReader == null){
+			this.portReader = new MidiOutputPortProviderImpl();
+		}
+		return this.portReader;
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "OSS output plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "OSS output plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+
+	@Override
+	public void setupDialog(Shell parent) {
+		MidiConfigUtils.setupDialog(parent,(MidiOutputPortProviderImpl)getProvider());
+	}
+}
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiReceiverImpl.java b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiReceiverImpl.java
new file mode 100644
index 00000000..662e87f9
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiReceiverImpl.java
@@ -0,0 +1,81 @@
+package org.herac.tuxguitar.player.impl.midiport.oss;
+
+import org.herac.tuxguitar.player.base.MidiControllers;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiReceiverImpl implements MidiReceiver{
+
+	private boolean connected;
+	private MidiOutputPortImpl midiPort;
+	private MidiSystem midiSystem;
+
+	public MidiReceiverImpl(MidiOutputPortImpl midiPort, MidiSystem midiSystem){
+		this.midiPort = midiPort;
+		this.midiSystem = midiSystem;
+		this.connected = false;
+	}
+
+	public boolean isConnected(){
+		return this.connected;
+	}
+
+	public void connect(){
+		if(!isConnected()){
+			this.midiSystem.openPort(this.midiPort);
+			this.connected = true;
+		}
+	}
+
+	public void disconnect() {
+		if(isConnected()){
+			this.midiSystem.closePort();
+			this.connected = false;
+		}
+	}
+
+	@Override
+	public void sendAllNotesOff() {
+		for(int i = 0; i < 16; i ++){
+			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
+		}
+	}
+
+	@Override
+	public void sendControlChange(int channel, int controller, int value) {
+		if(isConnected()){
+			this.midiSystem.controlChange(channel, controller, value);
+		}
+	}
+
+	@Override
+	public void sendNoteOff(int channel, int key, int velocity) {
+		if(isConnected()){
+			this.midiSystem.noteOff(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendNoteOn(int channel, int key, int velocity) {
+		if(isConnected()){
+			this.midiSystem.noteOn(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendPitchBend(int channel, int value) {
+		if(isConnected()){
+			this.midiSystem.pitchBend(channel, value);
+		}
+	}
+
+	@Override
+	public void sendProgramChange(int channel, int value) {
+		if(isConnected()){
+			this.midiSystem.programChange(channel, value);
+		}
+	}
+
+	public void sendSystemReset() {
+		//not implemented
+	}
+}
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiSystem.java b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiSystem.java
new file mode 100644
index 00000000..e4888b48
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/player/impl/midiport/oss/MidiSystem.java
@@ -0,0 +1,139 @@
+package org.herac.tuxguitar.player.impl.midiport.oss;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.util.JNILibraryLoader;
+
+public class MidiSystem{
+
+	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-oss");
+
+	static{
+		JNILibraryLoader.loadLibrary(JNI_LIBRARY_NAME);
+	}
+
+	private long instance;
+	private boolean open;
+	private final List<MidiOutputPort> ports;
+	private MidiOutputPortImpl connection;
+
+	public MidiSystem() {
+		this.instance = malloc();
+		this.open = false;
+		this.ports = new ArrayList<MidiOutputPort>();
+		this.connection = null;
+	}
+
+	@Override
+	public void finalize(){
+		if(this.instance != 0 ){
+			this.free(this.instance);
+			this.instance = 0;
+		}
+	}
+
+	public boolean isOpen(){
+		return (this.instance != 0 && this.open);
+	}
+
+	public void open(String device){
+		if(this.instance != 0 && !this.open){
+			this.open(this.instance,device);
+			this.open = true;
+		}
+	}
+
+	public void close(){
+		if(this.instance != 0 && this.open){
+			this.close(this.instance);
+			this.open = false;
+		}
+	}
+
+	public List<MidiOutputPort> findPorts(){
+		this.ports.clear();
+		if(this.instance != 0 && this.open){
+			this.findPorts(this.instance);
+		}
+		return this.ports;
+	}
+
+	public void openPort(MidiOutputPortImpl port){
+		if(this.instance != 0 && this.open){
+			this.openPort(this.instance, port.getDevice());
+			this.connection = port;
+		}
+	}
+
+	public void closePort(){
+		if(this.instance != 0 && this.open){
+			this.closePort(this.instance);
+			this.connection = null;
+		}
+	}
+
+	public void noteOn(int channel,int note,int velocity){
+		if(this.instance != 0 && this.open){
+			this.noteOn(this.instance, channel, note, velocity);
+		}
+	}
+
+	public void noteOff(int channel,int note,int velocity){
+		if(this.instance != 0 && this.open){
+			this.noteOff(this.instance, channel, note, velocity);
+		}
+	}
+
+	public void controlChange(int channel,int control,int value){
+		if(this.instance != 0 && this.open){
+			this.controlChange(this.instance, channel, control, value);
+		}
+	}
+
+	public void programChange(int channel,int program){
+		if(this.instance != 0 && this.open){
+			this.programChange(this.instance, channel, program);
+		}
+	}
+
+	public void pitchBend(int channel,int value){
+		if(this.instance != 0 && this.open){
+			this.pitchBend(this.instance, channel, value);
+		}
+	}
+
+	public MidiOutputPortImpl getConnection(){
+		return this.connection;
+	}
+
+	protected void addPort(String name,int device){
+		this.ports.add(new MidiOutputPortImpl(this,name,device));
+	}
+
+	private native long malloc();
+
+	private native void free(long instance);
+
+	protected native void open(long instance,String device);
+
+	protected native void close(long instance);
+
+	protected native void findPorts(long instance);
+
+	protected native void openPort(long instance,int device);
+
+	protected native void closePort(long instance);
+
+	protected native void noteOn(long instance,int channel,int note,int velocity);
+
+	protected native void noteOff(long instance,int channel,int note,int velocity);
+
+	protected native void controlChange(long instance,int channel,int control,int value);
+
+	protected native void programChange(long instance,int channel,int program);
+
+	protected native void pitchBend(long instance,int channel,int value);
+
+}
diff --git a/plugins/oss/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java b/plugins/oss/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
new file mode 100644
index 00000000..e95f1535
--- /dev/null
+++ b/plugins/oss/src/main/java/org/herac/tuxguitar/util/JNILibraryLoader.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.util;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		if(!JNILibraryLoader.loadFromClassPath(getFileName(libname))){
+			System.loadLibrary(libname);
+		}
+	}
+
+	/**
+	 * Return filename of the library, which is platform dependent: .so, .dll...
+	 * @param libraryName Name of the library
+	 * @return Name of the file
+	 */
+	private static String getFileName(String libraryName) {
+		// FIXME fix other platforms
+		return libraryName + ".so";
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		File file = new File(JNI_TMP_PATH + filename);
+		try{
+			if(!file.exists()){
+				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					OutputStream outputStream = new FileOutputStream(file);
+
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			if(file.exists()){
+				System.load(file.getAbsolutePath());
+				return true;
+			}
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+	}
+}
diff --git a/TuxGuitar-oss/jni/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c b/plugins/oss/src/main/native/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
similarity index 100%
rename from TuxGuitar-oss/jni/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
rename to plugins/oss/src/main/native/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.c
diff --git a/TuxGuitar-oss/jni/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.h b/plugins/oss/src/main/native/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.h
similarity index 100%
rename from TuxGuitar-oss/jni/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.h
rename to plugins/oss/src/main/native/org_herac_tuxguitar_player_impl_midiport_oss_MidiSystem.h
diff --git a/TuxGuitar-oss/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/oss/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-oss/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/oss/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/pdf/pom.xml b/plugins/pdf/pom.xml
new file mode 100644
index 00000000..b4e5fccb
--- /dev/null
+++ b/plugins/pdf/pom.xml
@@ -0,0 +1,63 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-pdf</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: PDF</name>
+	<description>PDF plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+			
+			<!-- create JAR with dependencies-->
+			<plugin>
+			  <artifactId>maven-assembly-plugin</artifactId>
+			  <version>2.2-beta-2</version>
+			  <executions>
+			    <execution>
+			      <id>create-jar-with-dependencies</id>
+			      <phase>package</phase>
+			      <goals>
+			        <goal>single</goal>
+			      </goals>
+			      <configuration>
+					<!-- This descriptor file allow to include dependences into the jar -->
+			        <descriptors>
+			          <descriptor>src/main/assembly/assembly.xml</descriptor>
+			        </descriptors>
+			      </configuration>
+			    </execution>
+			  </executions>
+			</plugin>
+
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+			<dependency>
+				<groupId>com.lowagie</groupId>
+				<artifactId>itext</artifactId>
+				<version>2.1.7</version>
+			</dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/pdf/src/main/assembly/assembly.xml b/plugins/pdf/src/main/assembly/assembly.xml
new file mode 100644
index 00000000..53749dce
--- /dev/null
+++ b/plugins/pdf/src/main/assembly/assembly.xml
@@ -0,0 +1,22 @@
+<!-- Descriptor used to generate executable file from exemples -->
+<assembly>
+  <id>dep</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <!-- unpack dependencies before including them into final jar application -->
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+      <outputDirectory></outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java b/plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java
similarity index 92%
rename from TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java
rename to plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java
index 61982953..01e20a8f 100644
--- a/TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java
+++ b/plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFPluginExporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class PDFPluginExporter extends TGExporterPlugin{
-	
+
+	@Override
 	protected TGRawExporter getExporter() {
 		return new PDFSongExporter();
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "PDF file format exporter";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		String description = new String();
 		description += ("TuxGuitar-pdf is an \"iText\" based *.pdf exporter plugin.");
diff --git a/TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFSongExporter.java b/plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFSongExporter.java
similarity index 93%
rename from TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFSongExporter.java
rename to plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFSongExporter.java
index 01b87cd6..c830802f 100644
--- a/TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFSongExporter.java
+++ b/plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFSongExporter.java
@@ -5,6 +5,7 @@
 import java.util.List;
 
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.editors.TGPainterImpl;
 import org.herac.tuxguitar.app.editors.TGResourceFactoryImpl;
@@ -27,21 +28,23 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class PDFSongExporter implements TGLocalFileExporter{
-	
+
 	private static final int PAGE_WIDTH = 550;
 	private static final int PAGE_HEIGHT = 800;
-	
+
 	private PrintStyles styles;
 	private OutputStream stream;
-	
+
+	@Override
 	public String getExportName() {
 		return "PDF";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("PDF","*.pdf");
 	}
-	
+
 	public PrintStyles getDefaultStyles(TGSong song){
 		PrintStyles styles = new PrintStyles();
 		styles.setStyle(TGLayout.DISPLAY_TABLATURE);
@@ -51,16 +54,19 @@ public PrintStyles getDefaultStyles(TGSong song){
 		styles.setBlackAndWhite(false);
 		return styles;
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		this.styles = (!setDefaults ? PrintStylesDialog.open(TuxGuitar.instance().getShell()) : null );
 		return ( this.styles != null || setDefaults );
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,OutputStream stream){
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) {
 		try{
 			if( this.stream != null ){
@@ -70,15 +76,16 @@ public void exportSong(TGSong song) {
 			return;
 		}
 	}
-	
+
 	public void export(final OutputStream stream,final TGSong song,final PrintStyles data){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					TGSongManager manager = new TGSongManager();
 					manager.setFactory(new TGFactoryImpl());
 					manager.setSong(song.clone(manager.getFactory()));
-					
+
 					export(stream,manager,data);
 				}catch(Throwable throwable){
 					MessageDialog.errorMessage(throwable);
@@ -86,16 +93,17 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void export(final OutputStream stream,final TGSongManager manager, final PrintStyles data){
 		new SyncThread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					TGResourceFactory factory = new TGResourceFactoryImpl(TuxGuitar.instance().getDisplay());
-					
+
 					PrintController controller = new PrintController(manager, factory);
 					PrintLayout layout = new PrintLayout(controller,data);
-					
+
 					export(stream, layout);
 				}catch(Throwable throwable){
 					MessageDialog.errorMessage(throwable);
@@ -103,9 +111,10 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	public void export(final OutputStream stream, final PrintLayout layout){
 		new Thread(new Runnable() {
+			@Override
 			public void run() {
 				try{
 					layout.loadStyles(1f);
@@ -117,45 +126,51 @@ public void run() {
 			}
 		}).start();
 	}
-	
+
 	private class PrintDocumentImpl implements PrintDocument{
-		
+
 		private TGPainterImpl painter;
 		private TGRectangle bounds;
 		private OutputStream stream;
 		private Image buffer;
-		private List pages;
-		
+		private List<ImageData> pages;
+
 		public PrintDocumentImpl(TGRectangle bounds, OutputStream stream){
 			this.bounds = bounds;
 			this.stream = stream;
 			this.painter = new TGPainterImpl();
-			this.pages = new ArrayList();
+			this.pages = new ArrayList<ImageData>();
 		}
-		
+
+		@Override
 		public TGPainter getPainter() {
 			return this.painter;
 		}
-		
+
+		@Override
 		public TGRectangle getBounds(){
 			return this.bounds;
 		}
-		
+
+		@Override
 		public void pageStart() {
 			this.buffer = new Image(TuxGuitar.instance().getDisplay(),this.bounds.getWidth() - this.bounds.getX(), this.bounds.getHeight() - this.bounds.getY());
 			this.painter.init( this.buffer );
 		}
-		
+
+		@Override
 		public void pageFinish() {
 			this.pages.add( this.buffer.getImageData() );
 			this.painter.dispose();
 			this.buffer.dispose();
 		}
-		
+
+		@Override
 		public void start() {
 			// Not implemented
 		}
-		
+
+		@Override
 		public void finish() {
 			try{
 				PDFWriter.write(this.stream,this.pages);
@@ -163,7 +178,8 @@ public void finish() {
 				MessageDialog.errorMessage(throwable);
 			}
 		}
-		
+
+		@Override
 		public boolean isPaintable(int page) {
 			return true;
 		}
diff --git a/TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFWriter.java b/plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFWriter.java
similarity index 90%
rename from TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFWriter.java
rename to plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFWriter.java
index 2d8152ec..3ec47756 100644
--- a/TuxGuitar-pdf/src/org/herac/tuxguitar/io/pdf/PDFWriter.java
+++ b/plugins/pdf/src/main/java/org/herac/tuxguitar/io/pdf/PDFWriter.java
@@ -15,21 +15,21 @@
 import com.lowagie.text.pdf.PdfWriter;
 
 public class PDFWriter {
-	
+
 	/**
 	 * Escribe el documento PDF en el OutputStream
 	 * @param out
 	 * @param printDocument
 	 * @throws TGFileFormatException
 	 */
-	public static void write(OutputStream out,List pages) throws TGFileFormatException {
+	public static void write(OutputStream out,List<ImageData> pages) throws TGFileFormatException {
 		try {
 			Document document = new Document();
 			PdfWriter.getInstance(document,out);
 			document.open();
-			Iterator it = pages.iterator();
+			Iterator<ImageData> it = pages.iterator();
 			while(it.hasNext()){
-				ImageData data = (ImageData)it.next();
+				ImageData data = it.next();
 				document.newPage();
 				document.add(convertToIText(data));
 			}
@@ -40,7 +40,7 @@ public static void write(OutputStream out,List pages) throws TGFileFormatExcepti
 			throw new TGFileFormatException("Could not write song!.",throwable);
 		}
 	}
-	
+
 	/**
 	 * Crea un com.lowagie.text.Image a partir de un org.eclipse.swt.graphics.ImageData
 	 * @param data
@@ -51,7 +51,7 @@ public static Image convertToIText(ImageData data){
 			PaletteData palette = data.palette;
 			int width = data.width;
 			int height = data.height;
-			
+
 			byte bytes[] = new byte[(width * height * 3)];
 			for (int y = 0; y < height; y++) {
 				for (int x = 0; x < width; x++) {
diff --git a/TuxGuitar-pdf/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/pdf/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-pdf/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/pdf/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
new file mode 100644
index 00000000..e8b63c37
--- /dev/null
+++ b/plugins/pom.xml
@@ -0,0 +1,91 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>plugins</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>pom</packaging>
+	<name>TuxGuitar :: plugins</name>
+	<description>Plugins for TuxGuitar</description>
+
+	<profiles>
+		<profile>
+			<id>purejava</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<module>abc</module>
+				<module>ascii</module>
+				<module>browser-ftp</module>
+				<module>community</module>
+				<module>compat</module>
+				<module>converter</module>
+				<module>gervill</module>
+				<module>gpx</module>
+				<module>gtp</module>
+				<module>image</module>
+				<module>jsa</module>
+				<module>lilypond</module>
+				<module>midi</module>
+				<module>midi-input</module>
+				<module>musicxml</module>
+				<module>pdf</module>
+				<module>ptb</module>
+				<module>svg</module>
+				<module>tef</module>
+				<module>tray</module>
+				<module>tuner</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>linux-jni</id>
+			<modules>
+				<module>alsa</module>
+				<module>fluidsynth</module>
+				<module>jack</module>
+				<module>oss</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>windows-jni</id>
+			<modules>
+				<!-- JNI plugins -->
+				<!-- TODO the project need some fix to build with Windows -->
+				<!-- TODO maybe it need to split the project linux/windows -->
+				<module>fluidsynth</module>
+				<!-- TODO the project need some fix to build with Windows -->
+				<module>winmm</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>mac-jni</id>
+			<modules>
+				<!-- OS integration -->
+				<!-- TODO the project need some fix to build with Mac OS.-->
+				<!-- it is maybe needed to use another SWT version, for example http://swt-repo.googlecode.com/svn/repo/org/eclipse/swt/ -->
+				<module>cocoa-integration</module>
+				<!-- TODO the project need some fix to build with Mac OS -->
+				<module>carbon-integration</module>
+
+				<!-- JNI plugins -->
+				<!-- TODO the project need some fix to build with Mac OS -->
+				<module>audiounit</module>
+				<!-- TODO the project need some fix to build with Mac OS -->
+				<module>coreaudio</module>
+			</modules>
+		</profile>
+
+	</profiles>
+</project>
diff --git a/plugins/ptb/pom.xml b/plugins/ptb/pom.xml
new file mode 100644
index 00000000..6da8b4b2
--- /dev/null
+++ b/plugins/ptb/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-ptb</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Power Tab</name>
+	<description>Power Tab plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStream.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTInputStream.java
similarity index 98%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStream.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTInputStream.java
index b7bb3098..99cac1dd 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStream.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTInputStream.java
@@ -21,32 +21,35 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class PTInputStream implements TGInputStreamBase{
-	
+
 	private static final String PTB_VERSION = "ptab-4";
-	
+
 	private InputStream stream;
 	private String version;
 	private PTSong song;
 	private PTSongParser parser;
-	
+
 	public PTInputStream(){
 		super();
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,InputStream stream){
 		this.version = null;
 		this.stream = stream;
 		this.parser = new PTSongParser(factory);
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat(){
 		return new TGFileFormat("PowerTab","*.ptb");
 	}
-	
+
 	public boolean isSupportedVersion(String version){
 		return (version.equals(PTB_VERSION));
 	}
-	
+
+	@Override
 	public boolean isSupportedVersion(){
 		try{
 			readVersion();
@@ -57,13 +60,14 @@ public boolean isSupportedVersion(){
 			return false;
 		}
 	}
-	
+
 	private void readVersion(){
 		if(this.version == null){
 			this.version = (readString(4) + "-" + readShort());
 		}
 	}
-	
+
+	@Override
 	public TGSong readSong() throws IOException{
 		this.readVersion();
 		if (!isSupportedVersion(this.version)) {
@@ -74,10 +78,10 @@ public TGSong readSong() throws IOException{
 		this.readDataInstruments(this.song.getTrack1());
 		this.readDataInstruments(this.song.getTrack2());
 		this.close();
-		
+
 		return this.parser.parseSong(this.song);
 	}
-	
+
 	private void readSongInfo(){
 		this.song.getInfo().setClassification(readByte());
 		if(this.song.getInfo().getClassification() == 0) {
@@ -120,7 +124,7 @@ private void readSongInfo(){
 			this.song.getInfo().setCopyright(readString());
 		}
 	}
-	
+
 	private void readDataInstruments(PTTrack track){
 		// Guitar section
 		int itemCount = readHeaderItems();
@@ -166,7 +170,7 @@ private void readDataInstruments(PTTrack track){
 		itemCount = readHeaderItems();
 		for (int j = 0; j < itemCount; j++) {
 			readDynamic();
-			
+
 			if (j < itemCount - 1){
 				readShort();
 			}
@@ -188,7 +192,7 @@ private void readDataInstruments(PTTrack track){
 			}
 		}
 	}
-	
+
 	private void readTrackInfo(PTTrack track){
 		PTTrackInfo info = new PTTrackInfo();
 		info.setNumber(readByte());
@@ -200,40 +204,40 @@ private void readTrackInfo(PTTrack track){
 		info.setChorus((short)readByte());
 		info.setTremolo((short)readByte());
 		info.setPhaser((short)readByte());
-		
+
 		readByte();//capo
-		
+
 		// Tuning
 		readString();//tunningName
-		
+
 		//bit 7 = Music notation offset sign, bits 6 to 1 = Music notation offset value, bit 0 = display sharps or flats;
 		readByte();  //offset
-		
+
 		int[] strings = new int[ (readByte() & 0xff) ];
 		for (int i = 0; i < strings.length; i++) {
 			strings[i] = readByte();
 		}
 		info.setStrings(strings);
-		
+
 		track.getInfos().add(info);
 	}
-	
+
 	private void readSection(PTSection section){
 		readInt();//left
 		readInt();//top
 		readInt();//right
 		readInt();//bottom
-		
+
 		int lastBarData = readByte();
-		
+
 		readByte();
 		readByte();
 		readByte();
 		readByte();
-		
+
 		// BarLine
 		readBarLine(section);
-		
+
 		// Direction section
 		int itemCount = readHeaderItems();
 		for (int j = 0; j < itemCount; j++) {
@@ -278,14 +282,14 @@ private void readSection(PTSection section){
 		bar.setRepeatClose(((lastBarData >>> 5) == 4)?(lastBarData - 128):0);
 		section.getPosition(section.getNextPositionNumber()).addComponent(bar);
 	}
-	
+
 	private void readStaff(int staff,PTSection section){
 		readByte();
 		readByte();
 		readByte();
 		readByte();
 		readByte();
-		
+
 		for( int voice = 0 ; voice < 2 ; voice ++ ){
 			int itemCount = readHeaderItems();
 			for (int j = 0; j < itemCount; j++) {
@@ -296,33 +300,33 @@ private void readStaff(int staff,PTSection section){
 			}
 		}
 	}
-	
+
 	private void readPosition(int staff,int voice,PTSection section){
 		PTBeat beat = new PTBeat(staff,voice);
-		
+
 		int position = readByte();
 		int beaming = readByte();
 		beaming = ((beaming - 128 < 0)?beaming:beaming - 128);
-		
+
 		readByte();
-		
+
 		int data1 = readByte();
 		readByte();
 		int data3 = readByte();
 		int durationValue = readByte();
-		
+
 		int multiBarRest = 1;
 		int complexCount = readByte();
 		for (int i = 0; i < complexCount; i++) {
 			int count = readShort();
 			readByte();
-			
+
 			int type = readByte();
 			if((type & 0x08) != 0){
 				multiBarRest = count;
 			}
 		}
-		
+
 		int itemCount = readHeaderItems();
 		for (int j = 0; j < itemCount; j++) {
 			readNote(beat);
@@ -333,7 +337,7 @@ private void readPosition(int staff,int voice,PTSection section){
 		beat.setMultiBarRest((itemCount == 0)?multiBarRest:1);
 		beat.setVibrato(((data1 & 0x08) != 0) || ((data1 & 0x10) != 0));
 		beat.setGrace((data3 & 0x01) != 0);
-		
+
 		// Set the duration
 		beat.setDuration(durationValue);
 		beat.setDotted((data1 & 0x01) != 0);
@@ -342,10 +346,10 @@ private void readPosition(int staff,int voice,PTSection section){
 		beat.setArpeggioDown((data1 & 0x40) != 0);
 		beat.setEnters(((beaming - (beaming % 8)) / 8) + 1);
 		beat.setTimes((beaming % 8) + 1);
-		
+
 		section.getPosition(position).addComponent(beat);
 	}
-	
+
 	private void readNote(PTBeat beat){
 		PTNote note = new PTNote();
 		int position = readByte();
@@ -365,36 +369,36 @@ private void readNote(PTBeat beat){
 		note.setDead((simpleData & 0x02) != 0);
 		beat.addNote(note);
 	}
-	
+
 	private void readTimeSignature(PTBar bar){
 		int data = readInt();
 		readByte(); //measurePulses
-		
+
 		bar.setNumerator(((((data >> 24) - ((data >> 24) % 8)) / 8) + 1));
 		bar.setDenominator((int)Math.pow(2,(data >> 24) % 8));
 	}
-	
+
 	private void readKeySignature(){
 		readByte();
 	}
-	
+
 	private void readBarLine(PTSection section){
 		PTBar bar = new PTBar();
 		int position = readByte();
 		int type = readByte();
-		
+
 		//repeat start
 		bar.setRepeatStart(((type >>> 5) == 3));
-		
+
 		//repeat end
 		bar.setRepeatClose((((type >>> 5) == 4)?(type - 128):0));
-		
+
 		readKeySignature();
 		readTimeSignature(bar);
 		readRehearsalSign();
 		section.getPosition(position).addComponent(bar);
 	}
-	
+
 	private void readChord(){
 		readShort(); //chordKey
 		readByte();
@@ -406,7 +410,7 @@ private void readChord(){
 			readByte(); //fret
 		}
 	}
-	
+
 	private void readFloattingText(){
 		// Floating text
 		readString();
@@ -415,21 +419,21 @@ private void readFloattingText(){
 		readInt();//top
 		readInt();//right
 		readInt();//bottom
-		
+
 		readByte();
 		readFontSetting();
 	}
-	
+
 	private void readFontSetting(){
 		readString();//fontName
-		readInt();//pointSize	
+		readInt();//pointSize
 		readInt();//weight
 		readBoolean();//italic
 		readBoolean();//underline
 		readBoolean();//strikeout
 		readInt();//color
 	}
-	
+
 	private void readGuitarIn(PTTrack track){
 		int section = readShort();
 		int staff = readByte();
@@ -438,7 +442,7 @@ private void readGuitarIn(PTTrack track){
 		int info = (readByte() & 0xff);
 		track.getSection(section).getPosition(position).addComponent(new PTGuitarIn(staff,info));
 	}
-	
+
 	private void readTempoMarker(PTTrack track){
 		int section = readShort();
 		int position = readByte();
@@ -455,7 +459,7 @@ private void readTempoMarker(PTTrack track){
 			track.getSection(section).getPosition(position).addComponent(new PTTempo(tempo,tripletFeel));
 		}
 	}
-	
+
 	private void readSectionSymbol(PTTrack track){
 		int section = readShort();
 		int position = readByte();
@@ -464,19 +468,19 @@ private void readSectionSymbol(PTTrack track){
 		symbol.setEndNumber( (data >> 16) );
 		track.getSection(section).getPosition(position).addComponent(symbol);
 	}
-	
+
 	private void readDynamic(){
 		readShort();
 		readByte();
 		readByte();
 		readShort();
 	}
-	
+
 	private void readRehearsalSign(){
 		readByte();
 		readString();
 	}
-	
+
 	private void readDirection(PTSection section){
 		int position = readByte();
 		int symboleCount = readByte();
@@ -485,7 +489,7 @@ private void readDirection(PTSection section){
 			section.getPosition(position).addComponent(new PTDirection( ( data >> 8 ) , ((data & 0xc0) >> 6), (data & 0x1f) ) );
 		}
 	}
-	
+
 	private void readChordText(){
 		readByte();
 		readShort();
@@ -493,13 +497,13 @@ private void readChordText(){
 		readShort();
 		readByte();
 	}
-	
+
 	private void readRhythmSlash(){
 		readByte();
 		readByte();
 		readInt();
 	}
-	
+
 	private int readHeaderItems(){
 		int nbItems = readShort();
 		if (nbItems != 0){
@@ -513,7 +517,7 @@ private int readHeaderItems(){
 		}
 		return nbItems;
 	}
-	
+
 	private String readString(){
 		try {
 			int length = (this.stream.read() & 0xff);
@@ -523,7 +527,7 @@ private String readString(){
 		}
 		return null;
 	}
-	
+
 	private String readString(int length){
 		try {
 			byte[] bytes = new byte[length];
@@ -534,7 +538,7 @@ private String readString(int length){
 		}
 		return null;
 	}
-	
+
 	private int readInt(){
 		try {
 			byte[] b = new byte[4];
@@ -545,7 +549,7 @@ private int readInt(){
 		}
 		return 0;
 	}
-	
+
 	private int readShort(){
 		try {
 			byte[] b = {0, 0};
@@ -556,7 +560,7 @@ private int readShort(){
 		}
 		return 0;
 	}
-	
+
 	private boolean readBoolean(){
 		try {
 			return (this.stream.read() > 0);
@@ -565,7 +569,7 @@ private boolean readBoolean(){
 		}
 		return false;
 	}
-	
+
 	private int readByte(){
 		try {
 			return this.stream.read();
@@ -574,7 +578,7 @@ private int readByte(){
 		}
 		return 0;
 	}
-	
+
 	private void skip(int bytes){
 		try {
 			this.stream.read(new byte[bytes]);
@@ -582,7 +586,7 @@ private void skip(int bytes){
 			e.printStackTrace();
 		}
 	}
-	
+
 	private void close(){
 		try {
 			this.stream.close();
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStreamPlugin.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTInputStreamPlugin.java
similarity index 90%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStreamPlugin.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTInputStreamPlugin.java
index 06b22ec5..126aa7b5 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTInputStreamPlugin.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTInputStreamPlugin.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGInputStreamBase;
 
 public class PTInputStreamPlugin extends TGInputStreamPlugin{
-	
+
+	@Override
 	protected TGInputStreamBase getInputStream() {
 		return new PTInputStream();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "PTB File Format plugin";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "PTB File Format plugin";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongParser.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTSongParser.java
similarity index 95%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongParser.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTSongParser.java
index 66bf0838..96f209c2 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongParser.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTSongParser.java
@@ -30,30 +30,30 @@
 import org.herac.tuxguitar.song.models.effects.TGEffectBend;
 
 public class PTSongParser {
-	
-	private TGSongManager manager;
-	private TrackHelper helper;
-	
+
+	private final TGSongManager manager;
+	private final TrackHelper helper;
+
 	public PTSongParser(TGFactory factory){
 		this.manager = new TGSongManager(factory);
 		this.helper = new TrackHelper();
 	}
-	
+
 	public TGSong parseSong(PTSong src){
 		PTSong song = new PTSong();
 		PTSongSynchronizerUtil.synchronizeTracks(src, song);
-		
+
 		this.manager.setSong(this.manager.getFactory().newSong());
-		
+
 		this.parseTrack(song.getTrack1());
 		this.parseTrack(song.getTrack2());
 		this.parseProperties(song.getInfo());
-		
+
 		this.manager.orderBeats();
-		
+
 		return this.manager.getSong();
 	}
-	
+
 	private void parseProperties(PTSongInfo info){
 		if( info.getName() != null ){
 			this.manager.getSong().setName( info.getName() );
@@ -71,7 +71,7 @@ private void parseProperties(PTSongInfo info){
 			this.manager.getSong().setWriter( info.getArrenger() );
 		}
 		if( info.getGuitarTranscriber() != null || info.getBassTranscriber() != null ){
-			String transcriber = new String(); 
+			String transcriber = new String();
 			if(info.getGuitarTranscriber() != null ){
 				transcriber += info.getGuitarTranscriber();
 			}
@@ -84,7 +84,7 @@ private void parseProperties(PTSongInfo info){
 			this.manager.getSong().setTranscriber( transcriber );
 		}
 		if( info.getGuitarInstructions() != null || info.getBassInstructions() != null ){
-			String comments = new String(); 
+			String comments = new String();
 			if(info.getGuitarInstructions() != null ){
 				comments += info.getGuitarInstructions();
 			}
@@ -94,33 +94,33 @@ private void parseProperties(PTSongInfo info){
 			this.manager.getSong().setComments( comments );
 		}
 	}
-	
+
 	private void parseTrack(PTTrack track){
 		this.helper.reset( track.getDefaultInfo() );
-		
+
 		long start = TGDuration.QUARTER_TIME;
 		for( int sIndex = 0; sIndex < track.getSections().size(); sIndex ++){
-			PTSection section = (PTSection) track.getSections().get(sIndex);
+			PTSection section = track.getSections().get(sIndex);
 			section.sort();
-			
+
 			//calculo el siguiente start del compas
 			this.helper.getStartHelper().init(section.getNumber(),section.getStaffs());
 			this.helper.getStartHelper().initVoices(start);
-			
+
 			//parseo las posiciones
 			for( int pIndex = 0; pIndex < section.getPositions().size(); pIndex ++){
-				PTPosition position = (PTPosition)section.getPositions().get(pIndex);
+				PTPosition position = section.getPositions().get(pIndex);
 				parsePosition(track,position/*,number*/);
 			}
-			
+
 			//Calculo el start para la proxima seccion
 			start = this.helper.getStartHelper().getMaxStart();
 		}
 	}
-	
+
 	private void parsePosition(PTTrack track,PTPosition position/*,int fromTrack*/){
 		for(int i = 0; i < position.getComponents().size(); i ++){
-			PTComponent component = (PTComponent)position.getComponents().get(i);
+			PTComponent component = position.getComponents().get(i);
 			if(component instanceof PTBar){
 				parseBar((PTBar)component);
 			}
@@ -135,29 +135,29 @@ else if(component instanceof PTBeat){
 			}
 		}
 	}
-	
+
 	private void parseBar(PTBar bar){
 		this.helper.getStartHelper().initVoices( this.helper.getStartHelper().getMaxStart() );
-		
+
 		if(bar.getNumerator() > 0 && bar.getDenominator() > 0 ){
 			this.helper.getStartHelper().setBarStart( this.helper.getStartHelper().getMaxStart() );
 			this.helper.getStartHelper().setBarLength((long)(bar.getNumerator() *( TGDuration.QUARTER_TIME * ( 4.0f / bar.getDenominator()))));
 		}
 	}
-	
+
 	private void parseGuitarIn(PTTrack track,PTGuitarIn guitarIn){
 		PTTrackInfo info = track.getInfo(guitarIn.getTrackInfo());
 		if(info != null){
-			
+
 			// Remove used tracks after guitarIn staff.
 			while( this.helper.getInfoHelper().countStaffTracks() > guitarIn.getStaff() ){
 				this.helper.getInfoHelper().removeStaffTrack( this.helper.getInfoHelper().countStaffTracks() - 1 );
 			}
-			
+
 			// If track was already created, but it's not in use
-			Iterator it = this.manager.getSong().getTracks();
+			Iterator<TGTrack> it = this.manager.getSong().getTracks();
 			while( it.hasNext() ){
-				TGTrack tgTrack = (TGTrack )it.next();
+				TGTrack tgTrack = it.next();
 				if( hasSameInfo( tgTrack , info)){
 					boolean exists = false;
 					for( int i = 0 ; i < this.helper.getInfoHelper().countStaffTracks() ; i ++ ){
@@ -172,36 +172,36 @@ private void parseGuitarIn(PTTrack track,PTGuitarIn guitarIn){
 					}
 				}
 			}
-			
+
 			// Create track if not exists.
 			this.createTrack(info);
 		}
 	}
-	
+
 	private void parseTempo(PTTempo tempo){
 		TGMeasure measure = getMeasure(1,this.helper.getStartHelper().getMaxStart());
 		measure.getTempo().setValue( tempo.getTempo() );
 		measure.getHeader().setTripletFeel(tempo.getTripletFeel());
 	}
-	
+
 	private void parseBeat(PTBeat beat){
 		if(beat.isGrace()){
 			//TODO: agrear el efecto a las notas del siguiente beat
 			return;
 		}
-		
+
 		if( beat.getMultiBarRest() > 1){
 			// Multibar Rests, must allways have measure duration.
 			long start = this.helper.getStartHelper().getBarStart();
 			long duration = (beat.getMultiBarRest() * this.helper.getStartHelper().getBarLength());
-			
+
 			this.helper.getStartHelper().setVoiceStart(beat.getStaff(),beat.getVoice(),(start + duration));
-			
+
 			return ;
 		}
-		
+
 		long start = this.helper.getStartHelper().getVoiceStart(beat.getStaff(),beat.getVoice());
-		
+
 		TGMeasure measure = getMeasure( getStaffTrack(beat.getStaff()) , start );
 		TGBeat tgBeat = getBeat(measure, start);
 		TGVoice tgVoice = tgBeat.getVoice(beat.getVoice());
@@ -211,10 +211,10 @@ private void parseBeat(PTBeat beat){
 		tgVoice.getDuration().setDoubleDotted(beat.isDoubleDotted());
 		tgVoice.getDuration().getDivision().setTimes(beat.getTimes());
 		tgVoice.getDuration().getDivision().setEnters(beat.getEnters());
-		
-		Iterator it = beat.getNotes().iterator();
+
+		Iterator<PTNote> it = beat.getNotes().iterator();
 		while(it.hasNext()){
-			PTNote ptNote = (PTNote)it.next();
+			PTNote ptNote = it.next();
 			if( ptNote.getString() <= measure.getTrack().stringCount() && ptNote.getValue() >= 0 ){
 				TGNote note = this.manager.getFactory().newNote();
 				note.setString(ptNote.getString());
@@ -228,7 +228,7 @@ private void parseBeat(PTBeat beat){
 				tgVoice.addNote(note);
 			}
 		}
-		
+
 		if( beat.isArpeggioUp() ){
 			tgBeat.getStroke().setDirection( TGStroke.STROKE_DOWN );
 			tgBeat.getStroke().setValue( TGDuration.SIXTEENTH );
@@ -236,18 +236,18 @@ private void parseBeat(PTBeat beat){
 			tgBeat.getStroke().setDirection( TGStroke.STROKE_UP );
 			tgBeat.getStroke().setValue( TGDuration.SIXTEENTH );
 		}
-		
+
 		this.helper.getStartHelper().checkBeat( tgVoice.isRestVoice() );
-		
+
 		// If it's a rest measure, duration must fill the measure.
 		long duration = tgVoice.getDuration().getTime();
-		
+
 		if(tgVoice.isRestVoice() && tgBeat.getStart() == this.helper.getStartHelper().getBarStart() && duration > this.helper.getStartHelper().getBarLength()){
 			duration = this.helper.getStartHelper().getBarLength();
 		}
 		this.helper.getStartHelper().setVoiceStart(beat.getStaff(),beat.getVoice(),(tgBeat.getStart() + duration));
 	}
-	
+
 	private TGEffectBend makeBend(int value){
 		if(value >= 1 && value <= 8){
 			TGEffectBend bend = this.manager.getFactory().newEffectBend();
@@ -298,11 +298,11 @@ else if(value == 8){
 		}
 		return null;
 	}
-	
+
 	private TGMeasure getMeasure(int trackNumber,long start){
 		return getMeasure( getTrack(trackNumber) , start);
 	}
-	
+
 	private TGMeasure getMeasure(TGTrack track,long start){
 		TGMeasure measure = null;
 		while( (measure = this.manager.getTrackManager().getMeasureAt(track, start)) == null){
@@ -310,7 +310,7 @@ private TGMeasure getMeasure(TGTrack track,long start){
 		}
 		return measure;
 	}
-	
+
 	private TGTrack getTrack(int number){
 		TGTrack track = null;
 		while( (track = this.manager.getTrack(number)) == null){
@@ -318,29 +318,29 @@ private TGTrack getTrack(int number){
 		}
 		return track;
 	}
-	
+
 	public TGTrack getStaffTrack(int staff){
 		TGTrack track = this.helper.getInfoHelper().getStaffTrack( staff );
 		return ( track != null ? track : createTrack() );
 	}
-	
+
 	private TGTrack createTrack(){
 		return createTrack(this.helper.getInfoHelper().getDefaultInfo());
 	}
-	
+
 	private TGTrack createTrack(PTTrackInfo info){
 		TGTrack track = this.manager.addTrack();
 		this.helper.getInfoHelper().addStaffTrack( track );
 		this.setTrackInfo(track, info );
 		return track;
 	}
-	
+
 	private void setTrackInfo(TGTrack tgTrack , PTTrackInfo info){
 		TGChannel tgChannel = this.manager.addChannel();
 		tgChannel.setProgram((short) info.getInstrument() );
 		tgChannel.setVolume((short) info.getVolume() );
 		tgChannel.setBalance((short) info.getBalance() );
-		
+
 		tgTrack.setName( info.getName() );
 		tgTrack.setChannelId(tgChannel.getChannelId());
 		tgTrack.getStrings().clear();
@@ -351,7 +351,7 @@ private void setTrackInfo(TGTrack tgTrack , PTTrackInfo info){
 			tgTrack.getStrings().add(string);
 		}
 	}
-	
+
 	private boolean hasSameInfo(TGTrack track , PTTrackInfo info){
 		TGChannel tgChannel = this.manager.getChannel(track.getChannelId());
 		if( tgChannel == null ){
@@ -379,7 +379,7 @@ private boolean hasSameInfo(TGTrack track , PTTrackInfo info){
 		}
 		return true;
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure, long start){
 		int count = measure.countBeats();
 		for(int i = 0 ; i < count ; i ++ ){
@@ -396,13 +396,13 @@ private TGBeat getBeat(TGMeasure measure, long start){
 }
 /*
 class TGSongAdjuster{
-	
+
 	protected TGSongManager manager;
-	
+
 	public TGSongAdjuster(TGSongManager manager){
 		this.manager = manager;
 	}
-	
+
 	public TGSong process(){
 		Iterator tracks = this.manager.getSong().getTracks();
 		while(tracks.hasNext()){
@@ -415,17 +415,17 @@ public TGSong process(){
 		}
 		return this.manager.getSong();
 	}
-	
+
 	public void process(TGMeasure measure){
 		this.manager.getMeasureManager().orderBeats(measure);
-		
+
 		joinBeats(measure);
 	}
-	
+
 	public void joinBeats(TGMeasure measure){
 		TGBeat previous = null;
 		boolean finish = true;
-		
+
 		long measureStart = measure.getStart();
 		long measureEnd = (measureStart + measure.getLength());
 		for(int i = 0;i < measure.countBeats();i++){
@@ -435,34 +435,34 @@ public void joinBeats(TGMeasure measure){
 			if(previous != null){
 				long previousStart = previous.getStart();
 				long previousLength = previous.getDuration().getTime();
-				
+
 				if(previousStart == beatStart){
 					// add beat notes to previous
 					for(int n = 0;n < beat.countNotes();n++){
 						TGNote note = beat.getNote( n );
 						previous.addNote( note );
 					}
-					
+
 					// add beat chord to previous
 					if(!previous.isChordBeat() && beat.isChordBeat()){
 						previous.setChord( beat.getChord() );
 					}
-					
+
 					// add beat text to previous
 					if(!previous.isTextBeat() && beat.isTextBeat()){
 						previous.setText( beat.getText() );
 					}
-					
+
 					// set the best duration
 					if(beatLength > previousLength && (beatStart + beatLength) <= measureEnd){
 						beat.getDuration().copy(previous.getDuration());
 					}
-					
+
 					measure.removeBeat(beat);
 					finish = false;
 					break;
 				}
-				
+
 				else if(previousStart < beatStart && (previousStart + previousLength) > beatStart){
 					if(beat.isRestBeat()){
 						measure.removeBeat(beat);
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java
similarity index 91%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java
index c28406f3..d177c352 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/PTSongSynchronizerUtil.java
@@ -16,58 +16,58 @@
 import org.herac.tuxguitar.io.ptb.base.PTTrackInfo;
 
 public class PTSongSynchronizerUtil {
-	
+
 	public static void synchronizeTracks(PTSong src, PTSong dst){
 		applyInfo( src.getInfo() , dst.getInfo() );
 		synchronizeTrack( src.getTrack1(), dst.getTrack1() );
 		synchronizeTrack( src.getTrack2(), dst.getTrack2() );
 	}
-	
+
 	private static void synchronizeTrack(PTTrack src, PTTrack dst){
 		applyRepeats(src, dst);
 		applyInfos(src, dst);
 	}
-	
+
 	private static void applyInfo(PTSongInfo src, PTSongInfo dst){
 		src.copy( dst );
 	}
-	
+
 	private static void applyInfos(PTTrack src, PTTrack dst){
-		Iterator it = src.getInfos().iterator();
+		Iterator<PTTrackInfo> it = src.getInfos().iterator();
 		while( it.hasNext() ){
-			PTTrackInfo srcInfo = (PTTrackInfo)it.next();
+			PTTrackInfo srcInfo = it.next();
 			dst.getInfos().add( srcInfo.getClone() );
 		}
 	}
-	
+
 	private static void applyRepeats(PTTrack src, PTTrack dst){
-		applyRepeats(src, dst, new PTIndex(0,0,0), new PTSongSynchronizerData(), new ArrayList() );
+		applyRepeats(src, dst, new PTIndex(0,0,0), new PTSongSynchronizerData(), new ArrayList<PTDirection>() );
 	}
-	
-	private static void applyRepeats(PTTrack src, PTTrack dst, PTIndex index, PTSongSynchronizerData rd, List useds){
-		
+
+	private static void applyRepeats(PTTrack src, PTTrack dst, PTIndex index, PTSongSynchronizerData rd, List<PTDirection> useds){
+
 		for( int s = index.s; s < src.getSections().size(); s ++){
-			PTSection srcSection = (PTSection) src.getSections().get(s);
+			PTSection srcSection = src.getSections().get(s);
 			srcSection.sort();
-			
+
 			PTSection dstSection = new PTSection( srcSection.getNumber() );
 			dstSection.setStaffs( srcSection.getStaffs() );
 			dst.getSections().add( dstSection );
-			
+
 			for( int p = (s == index.s ? index.p : 0); p < srcSection.getPositions().size(); p ++){
-				PTPosition srcPosition = (PTPosition)srcSection.getPositions().get(p);
+				PTPosition srcPosition = srcSection.getPositions().get(p);
 				srcPosition.sort();
-				
+
 				PTPosition dstPosition = new PTPosition(srcPosition.getPosition() );
 				dstSection.getPositions().add( dstPosition );
-				
+
 				for(int c = (s == index.s && p == index.p ? index.c : 0); c < srcPosition.getComponents().size(); c ++){
-					PTComponent component = (PTComponent)srcPosition.getComponents().get(c);
-					
+					PTComponent component = srcPosition.getComponents().get(c);
+
 					if(!rd.skip){
 						dstPosition.addComponent( component.getClone() );
 					}
-					
+
 					// ------------------------------ PTBar ------------------------------//
 					if(component instanceof PTBar){
 						PTBar bar = (PTBar) component;
@@ -76,12 +76,12 @@ private static void applyRepeats(PTTrack src, PTTrack dst, PTIndex index, PTSong
 							rd.repeatInProgress = true;
 							rd.repeatAlternative = false;
 							rd.skip = false;
-							
+
 							if(rd.repeatNumber < bar.getRepeatClose()){
 								applyRepeats(src, dst, rd.repeatStart , rd, useds);
 								return;
 							}
-							
+
 							rd.repeatStart = null;
 							rd.repeatNumber = 0;
 						}
@@ -93,13 +93,13 @@ private static void applyRepeats(PTTrack src, PTTrack dst, PTIndex index, PTSong
 							rd.repeatInProgress = false;
 						}
 					}
-					
+
 					// ------------------------------ PTSymbol ------------------------------//
 					else if(component instanceof PTSymbol){
 						PTSymbol symbol = (PTSymbol)component;
-						
+
 						rd.skip = false;
-						
+
 						if( !rd.repeatAlternative && ((symbol.getEndNumber() & 1 ) != 0 ) ){
 							boolean validEnding = ((symbol.getEndNumber() & (1 << (rd.repeatNumber))) != 0 );
 							if(rd.repeatNumber > 0 && !validEnding ){
@@ -108,25 +108,25 @@ else if(component instanceof PTSymbol){
 							rd.repeatAlternative =  true;
 						}
 					}
-					
+
 					// ------------------------------ PTDirection ------------------------------//
 					else if(component instanceof PTDirection){
-						
+
 						PTDirection direction = (PTDirection)component;
-						
+
 						boolean validRepeat = (direction.getRepeat() == 0 || (rd.repeatStart != null && (rd.repeatNumber + 1) == direction.getRepeat()));
 						boolean validDirection = ( direction.getActiveSymbol() == rd.findActiveSymbol );
-						
+
 						if ( validDirection && validRepeat ){
 							rd.findActiveSymbol = 0;
-							
+
 							if( direction.getDirection() == PTDirection.DIRECTION_FINE ){
 								// Used to mark when to stop playing (usually the end of the score)
 								if ( canUseDirection(direction, useds) ){
 									return;
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO ){
 								// Go back to the beginning of the score and play from there
 								if ( canUseDirection(direction, useds) ){
@@ -134,7 +134,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO ){
 									return;
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO ){
 								// Go back to the Segno and play from there
 								if ( canUseDirection(direction, useds) ){
@@ -145,7 +145,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO ){
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO ){
 								// Go back to the Segno Segno and play from there
 								if ( canUseDirection(direction, useds) ){
@@ -156,7 +156,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO ){
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_TO_CODA ){
 								// Go to the Coda sign and play from there. Used in conjunction with D.C./D.S. al Coda signs.
 								if ( canUseDirection(direction, useds) ){
@@ -167,7 +167,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_TO_CODA ){
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_TO_DOUBLE_CODA ){
 								// Go to the Double Coda and play from there. Used in conjunction with D.C./D.S. al Double Coda signs.
 								if ( canUseDirection(direction, useds) ){
@@ -178,7 +178,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_TO_DOUBLE_CODA ){
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO_AL_CODA ){
 								// Go back to the beginning of the score and play from there until the To Coda sign is reached,
 								// then jump to the Coda sign.
@@ -187,9 +187,9 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO_AL_CODA ){
 									applyRepeats(src, dst, new PTIndex(0, 0, 0) , rd ,useds);
 									return;
 								}
-							
+
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO_AL_DOUBLE_CODA ){
 								// Go back to the beginning of the score and play from there until the To Double Coda sign is reached,
 								// then jump to the Double Coda sign.
@@ -199,7 +199,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO_AL_DOUBLE_COD
 									return;
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_AL_CODA ){
 								// Go back to the Segno sign and play from there until the To Coda sign is reached,
 								// then jump to the Coda sign.
@@ -212,7 +212,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_AL_CODA ){
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_AL_DOUBLE_CODA ){
 								// Go back to the Segno sign and play from there until the To Double Coda sign is reached,
 								// then jump to the Double Coda sign.
@@ -225,7 +225,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_AL_DOUBLE_C
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO_AL_CODA ){
 								// Go back to the Segno Segno sign and play from there until the To Coda sign is reached,
 								// then jump to the Coda sign.
@@ -238,7 +238,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO_AL_CO
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO_AL_DOUBLE_CODA ){
 								// Go back to the Segno Segno sign and play from there until the To Double Coda sign is reached,
 								// then jump to the Double Coda sign.
@@ -251,7 +251,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO_AL_DO
 									}
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO_AL_FINE ){
 								// Go back to the beginning and play until the Fine sign is reached.
 								if( canUseDirection(direction, useds)  ){
@@ -260,7 +260,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DA_CAPO_AL_FINE ){
 									return;
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_AL_FINE ){
 								// Go back to the Segno sign and play until the Fine sign is reached.
 								PTIndex segno = findUnusedDirection(src, useds, PTDirection.DIRECTION_SEGNO, s, p );
@@ -270,7 +270,7 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_AL_FINE ){
 									return;
 								}
 							}
-							
+
 							else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO_AL_FINE ){
 								// Go back to the Segno Segno sign and play until the Fine sign is reached.
 								PTIndex segno = findUnusedDirection(src, useds, PTDirection.DIRECTION_SEGNO_SEGNO, s, p );
@@ -286,11 +286,11 @@ else if( direction.getDirection() == PTDirection.DIRECTION_DAL_SEGNO_SEGNO_AL_FI
 			}
 		}
 	}
-	
-	private static boolean canUseDirection(PTDirection direction, List useds){
+
+	private static boolean canUseDirection(PTDirection direction, List<PTDirection> useds){
 		boolean inUse = false;
 		for( int i = 0 ; i < useds.size() && !inUse; i ++ ){
-			PTDirection used = (PTDirection)useds.get( i );
+			PTDirection used = useds.get( i );
 			if( used.equals( direction )){
 				return false;
 			}
@@ -298,20 +298,20 @@ private static boolean canUseDirection(PTDirection direction, List useds){
 		useds.add( direction );
 		return true;
 	}
-	
-	private static PTIndex findUnusedDirection(PTTrack src, List useds, int value, int sEndIndex, int pEndIndex){
+
+	private static PTIndex findUnusedDirection(PTTrack src, List<PTDirection> useds, int value, int sEndIndex, int pEndIndex){
 		return findUnusedDirection(src, useds, value, sEndIndex, pEndIndex, 0 );
 	}
-	
-	private static PTIndex findUnusedDirection(PTTrack src, List useds, int value, int sEndIndex, int pEndIndex, int activeSymbol){
+
+	private static PTIndex findUnusedDirection(PTTrack src, List<PTDirection> useds, int value, int sEndIndex, int pEndIndex, int activeSymbol){
 		for( int s = 0; s < ( sEndIndex >= 0 ? sEndIndex+1 : src.getSections().size() ); s ++){
-			PTSection section = (PTSection) src.getSections().get( s );
-			
+			PTSection section = src.getSections().get( s );
+
 			for( int p = 0; p < (s == sEndIndex ? pEndIndex+1 : section.getPositions().size() ); p ++){
-				PTPosition position = (PTPosition)section.getPositions().get(p);
-				
+				PTPosition position = section.getPositions().get(p);
+
 				for( int c = 0; c < position.getComponents().size() ; c ++){
-					PTComponent component = (PTComponent)position.getComponents().get( c );
+					PTComponent component = position.getComponents().get( c );
 					if(component instanceof PTDirection){
 						PTDirection direction = (PTDirection)component;
 						if( direction.getDirection() == value && ( activeSymbol == 0 || direction.getActiveSymbol() == activeSymbol)){
@@ -325,7 +325,7 @@ private static PTIndex findUnusedDirection(PTTrack src, List useds, int value, i
 		}
 		return null;
 	}
-	
+
 	private static class PTIndex{
 		/** Index Of Section **/
 		protected int s;
@@ -333,14 +333,14 @@ private static class PTIndex{
 		protected int p;
 		/** Index Of Component **/
 		protected int c;
-		
+
 		protected PTIndex(int s, int p,int c) {
 			this.s = s;
 			this.p = p;
 			this.c = c;
 		}
 	}
-	
+
 	private static class PTSongSynchronizerData{
 		/** Current Repeat Start Index **/
 		protected PTIndex repeatStart;
@@ -354,7 +354,7 @@ private static class PTSongSynchronizerData{
 		protected boolean skip;
 		/** Active Symbol To Search Directions ( D.C, D.S, D.SS ) **/
 		protected int findActiveSymbol;
-		
+
 		protected PTSongSynchronizerData(){
 			this.repeatStart = null;
 			this.repeatNumber = 0;
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTBar.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTBar.java
similarity index 97%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTBar.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTBar.java
index ba22c97c..08ba0d08 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTBar.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTBar.java
@@ -3,46 +3,47 @@
 public class PTBar implements PTComponent{
 	private int repeatClose;
 	private boolean repeatStart;
-	
+
 	private int numerator;
 	private int denominator;
-	
+
 	public PTBar(){
 		super();
 	}
-	
+
 	public int getDenominator() {
 		return this.denominator;
 	}
-	
+
 	public void setDenominator(int denominator) {
 		this.denominator = denominator;
 	}
-	
+
 	public int getNumerator() {
 		return this.numerator;
 	}
-	
+
 	public void setNumerator(int numerator) {
 		this.numerator = numerator;
 	}
-	
+
 	public int getRepeatClose() {
 		return this.repeatClose;
 	}
-	
+
 	public void setRepeatClose(int repeatClose) {
 		this.repeatClose = repeatClose;
 	}
-	
+
 	public boolean isRepeatStart() {
 		return this.repeatStart;
 	}
-	
+
 	public void setRepeatStart(boolean repeatStart) {
 		this.repeatStart = repeatStart;
 	}
-	
+
+	@Override
 	public PTComponent getClone(){
 		PTBar bar = new PTBar();
 		bar.setNumerator( getNumerator() );
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTBeat.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTBeat.java
similarity index 91%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTBeat.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTBeat.java
index 1a0aafe0..958e88b0 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTBeat.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTBeat.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 public class PTBeat implements PTComponent{
-	
+
 	private int staff;
 	private int voice;
 	private int multiBarRest;
@@ -18,111 +18,112 @@ public class PTBeat implements PTComponent{
 	private boolean grace;
 	private boolean arpeggioUp;
 	private boolean arpeggioDown;
-	private List notes;
-	
+	private List<PTNote> notes;
+
 	public PTBeat(int staff,int voice){
 		this.staff = staff;
 		this.voice = voice;
-		this.notes = new ArrayList();
+		this.notes = new ArrayList<PTNote>();
 		this.multiBarRest = 1;
 	}
-	
+
 	public int getStaff() {
 		return this.staff;
 	}
-	
+
 	public int getVoice() {
 		return this.voice;
 	}
-	
+
 	public void addNote(PTNote note){
 		this.notes.add(note);
 	}
-	
-	public List getNotes(){
+
+	public List<PTNote> getNotes(){
 		return this.notes;
 	}
-	
+
 	public boolean isGrace() {
 		return this.grace;
 	}
-	
+
 	public void setGrace(boolean grace) {
 		this.grace = grace;
 	}
-	
+
 	public boolean isVibrato() {
 		return this.vibrato;
 	}
-	
+
 	public void setVibrato(boolean vibrato) {
 		this.vibrato = vibrato;
 	}
-	
+
 	public int getMultiBarRest() {
 		return this.multiBarRest;
 	}
-	
+
 	public void setMultiBarRest(int multiBarRest) {
 		this.multiBarRest = multiBarRest;
 	}
-	
+
 	public boolean isDotted() {
 		return this.dotted;
 	}
-	
+
 	public void setDotted(boolean dotted) {
 		this.dotted = dotted;
 	}
-	
+
 	public boolean isDoubleDotted() {
 		return this.doubleDotted;
 	}
-	
+
 	public void setDoubleDotted(boolean doubleDotted) {
 		this.doubleDotted = doubleDotted;
 	}
-	
+
 	public int getDuration() {
 		return this.duration;
 	}
-	
+
 	public void setDuration(int duration) {
 		this.duration = duration;
 	}
-	
+
 	public int getEnters() {
 		return this.enters;
 	}
-	
+
 	public void setEnters(int enters) {
 		this.enters = enters;
 	}
-	
+
 	public int getTimes() {
 		return this.times;
 	}
-	
+
 	public void setTimes(int times) {
 		this.times = times;
 	}
-	
+
 	public boolean isArpeggioUp() {
 		return this.arpeggioUp;
 	}
-	
+
 	public void setArpeggioUp(boolean arpeggioUp) {
 		this.arpeggioUp = arpeggioUp;
 	}
-	
+
 	public boolean isArpeggioDown() {
 		return this.arpeggioDown;
 	}
-	
+
 	public void setArpeggioDown(boolean arpeggioDown) {
 		this.arpeggioDown = arpeggioDown;
 	}
-	
+
+	@Override
 	public PTComponent getClone(){
 		PTBeat beat = new PTBeat( getStaff(), getVoice() );
 		beat.setDuration( getDuration() );
@@ -135,9 +136,9 @@ public PTComponent getClone(){
 		beat.setVibrato( isVibrato() );
 		beat.setArpeggioUp( isArpeggioUp() );
 		beat.setArpeggioDown( isArpeggioDown() );
-		Iterator it = getNotes().iterator();
+		Iterator<PTNote> it = getNotes().iterator();
 		while( it.hasNext() ){
-			beat.addNote( ((PTNote)it.next()).getClone() );
+			beat.addNote( it.next().getClone() );
 		}
 		return beat;
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTComponent.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTComponent.java
similarity index 96%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTComponent.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTComponent.java
index 85ffbfaa..845b5cf5 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTComponent.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTComponent.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.io.ptb.base;
 
 public interface PTComponent {
-	
+
 	public PTComponent getClone();
-	
+
 }
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTDirection.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTDirection.java
similarity index 98%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTDirection.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTDirection.java
index 2dcb9f90..79547469 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTDirection.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTDirection.java
@@ -1,7 +1,7 @@
 package org.herac.tuxguitar.io.ptb.base;
 
 public class PTDirection implements PTComponent{
-	
+
 	public static final int DIRECTION_CODA = 0;
 	public static final int DIRECTION_DOUBLE_CODA = 1;
 	public static final int DIRECTION_SEGNO = 2;
@@ -21,33 +21,34 @@ public class PTDirection implements PTComponent{
 	public static final int DIRECTION_DA_CAPO_AL_FINE = 16;
 	public static final int DIRECTION_DAL_SEGNO_AL_FINE = 17;
 	public static final int DIRECTION_DAL_SEGNO_SEGNO_AL_FINE = 18;
-	
+
 	public static final int ACTIVE_SYMBOL_DC  = 1;
 	public static final int ACTIVE_SYMBOL_DS  = 2;
 	public static final int ACTIVE_SYMBOL_DSS = 3;
-	
+
 	private int direction;
 	private int activeSymbol;
 	private int repeat;
-	
+
 	public PTDirection(int direction, int activeSymbol, int repeat){
 		this.direction = direction;
 		this.activeSymbol = activeSymbol;
 		this.repeat = repeat;
 	}
-	
+
 	public int getDirection() {
 		return this.direction;
 	}
-	
+
 	public int getActiveSymbol() {
 		return this.activeSymbol;
 	}
-	
+
 	public int getRepeat() {
 		return this.repeat;
 	}
-	
+
+	@Override
 	public PTComponent getClone(){
 		return new PTDirection( getDirection() , getActiveSymbol(), getRepeat() );
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTGuitarIn.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTGuitarIn.java
similarity index 96%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTGuitarIn.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTGuitarIn.java
index a71d9d5e..1aca3a0f 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTGuitarIn.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTGuitarIn.java
@@ -3,20 +3,21 @@
 public class PTGuitarIn implements PTComponent{
 	private int staff;
 	private int trackInfo;
-	
+
 	public PTGuitarIn(int staff,int trackInfo){
 		this.staff = staff;
 		this.trackInfo = trackInfo;
 	}
-	
+
 	public int getStaff() {
 		return this.staff;
 	}
-	
+
 	public int getTrackInfo() {
 		return this.trackInfo;
 	}
-	
+
+	@Override
 	public PTComponent getClone(){
 		return new PTGuitarIn( getStaff(), getTrackInfo() );
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTNote.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTNote.java
similarity index 97%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTNote.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTNote.java
index 407ff5db..74d5fe07 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTNote.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTNote.java
@@ -8,67 +8,67 @@ public class PTNote{
 	private boolean dead;
 	private boolean hammer;
 	private boolean slide;
-	
+
 	public PTNote(){
 		super();
 	}
-	
+
 	public int getString() {
 		return this.string;
 	}
-	
+
 	public void setString(int string) {
 		this.string = string;
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
 	public void setValue(int value) {
 		this.value = value;
 	}
-	
+
 	public boolean isDead() {
 		return this.dead;
 	}
-	
+
 	public void setDead(boolean dead) {
 		this.dead = dead;
 	}
-	
+
 	public boolean isTied() {
 		return this.tied;
 	}
-	
+
 	public void setTied(boolean tied) {
 		this.tied = tied;
 	}
-	
+
 	public int getBend() {
 		return this.bend;
 	}
-	
+
 	public void setBend(int bend) {
 		this.bend = bend;
 	}
-	
+
 	public boolean isHammer() {
 		return this.hammer;
 	}
-	
+
 	public void setHammer(boolean hammer) {
 		this.hammer = hammer;
 	}
-	
+
 	public boolean isSlide() {
 		return this.slide;
 	}
-	
+
 	public void setSlide(boolean slide) {
 		this.slide = slide;
 	}
-	
+
 	public PTNote getClone(){
 		PTNote note = new PTNote();
 		note.setValue( getValue() );
diff --git a/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTPosition.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTPosition.java
new file mode 100644
index 00000000..2af0a8bf
--- /dev/null
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTPosition.java
@@ -0,0 +1,44 @@
+package org.herac.tuxguitar.io.ptb.base;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class PTPosition {
+
+	private final int position;
+	private final List<PTComponent> components;
+
+	public PTPosition(int position){
+		this.position = position;
+		this.components = new ArrayList<PTComponent>();
+	}
+
+	public int getPosition() {
+		return this.position;
+	}
+
+	public List<PTComponent> getComponents() {
+		return this.components;
+	}
+
+	public void addComponent(PTComponent component){
+		this.components.add(component);
+	}
+
+	public void sort(){
+		Collections.sort( getComponents(), new Comparator<Object>() {
+			@Override
+			public int compare(Object o1, Object o2) {
+				if( o1 instanceof PTDirection ){
+					return 1;
+				}
+				if( o2 instanceof PTDirection ){
+					return -1;
+				}
+				return 0;
+			}
+		});
+	}
+}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSection.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSection.java
similarity index 76%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSection.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSection.java
index 401030b1..5bb398aa 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSection.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSection.java
@@ -5,36 +5,36 @@
 import java.util.List;
 
 public class PTSection {
-	
+
 	private int number;
 	private int staffs;
-	private List positions;
-	
+	private List<PTPosition> positions;
+
 	public PTSection(int number){
 		this.number = number;
-		this.positions = new ArrayList();
+		this.positions = new ArrayList<PTPosition>();
 	}
-	
+
 	public int getNumber(){
 		return this.number;
 	}
-	
+
 	public int getStaffs() {
 		return this.staffs;
 	}
-	
+
 	public void setStaffs(int staffs) {
 		this.staffs = staffs;
 	}
-	
-	public List getPositions(){
+
+	public List<PTPosition> getPositions(){
 		return this.positions;
 	}
-	
+
 	public PTPosition getPosition(int position){
-		Iterator it = getPositions().iterator();
+		Iterator<PTPosition> it = getPositions().iterator();
 		while(it.hasNext()){
-			PTPosition p = (PTPosition)it.next();
+			PTPosition p = it.next();
 			if(p.getPosition() == position){
 				return p;
 			}
@@ -43,23 +43,23 @@ public PTPosition getPosition(int position){
 		getPositions().add(p);
 		return p;
 	}
-	
+
 	public int getNextPositionNumber(){
 		int next = 0;
-		Iterator it = getPositions().iterator();
+		Iterator<PTPosition> it = getPositions().iterator();
 		while(it.hasNext()){
-			PTPosition p = (PTPosition)it.next();
+			PTPosition p = it.next();
 			next = Math.max(next, (p.getPosition() + 1) );
 		}
 		return next;
 	}
-	
+
 	public void sort(){
 		int count = getPositions().size();
 		for(int i = 0;i < count;i++){
 			PTPosition minimum = null;
 			for(int j = i;j < count;j++){
-				PTPosition position = (PTPosition)getPositions().get(j);
+				PTPosition position = getPositions().get(j);
 				if(minimum == null || position.getPosition() < minimum.getPosition()){
 					minimum = position;
 				}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSong.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSong.java
similarity index 98%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSong.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSong.java
index 2f470067..6222a5ef 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSong.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSong.java
@@ -5,21 +5,21 @@ public class PTSong {
 	private PTSongInfo info;
 	private PTTrack track1;
 	private PTTrack track2;
-	
+
 	public PTSong(){
 		this.info = new PTSongInfo();
 		this.track1 = new PTTrack();
 		this.track2 = new PTTrack();
 	}
-	
+
 	public PTTrack getTrack1() {
 		return this.track1;
 	}
-	
+
 	public PTTrack getTrack2() {
 		return this.track2;
 	}
-	
+
 	public PTSongInfo getInfo(){
 		return this.info;
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java
similarity index 98%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java
index 80a45cdc..913cfcfe 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSongInfo.java
@@ -23,187 +23,187 @@ public class PTSongInfo {
 	private String bassInstructions;
 	private String instructions;
 	private String copyright;
-	
+
 	public PTSongInfo(){
 		super();
 	}
-	
+
 	public String getAlbum() {
 		return this.album;
 	}
-	
+
 	public void setAlbum(String album) {
 		this.album = album;
 	}
-	
+
 	public int getAlbumType() {
 		return this.albumType;
 	}
-	
+
 	public void setAlbumType(int albumType) {
 		this.albumType = albumType;
 	}
-	
+
 	public String getArrenger() {
 		return this.arrenger;
 	}
-	
+
 	public void setArrenger(String arrenger) {
 		this.arrenger = arrenger;
 	}
-	
+
 	public String getAuthor() {
 		return this.author;
 	}
-	
+
 	public void setAuthor(String author) {
 		this.author = author;
 	}
-	
+
 	public String getBassInstructions() {
 		return this.bassInstructions;
 	}
-	
+
 	public void setBassInstructions(String bassInstructions) {
 		this.bassInstructions = bassInstructions;
 	}
-	
+
 	public String getBassTranscriber() {
 		return this.bassTranscriber;
 	}
-	
+
 	public void setBassTranscriber(String bassTranscriber) {
 		this.bassTranscriber = bassTranscriber;
 	}
-	
+
 	public int getClassification() {
 		return this.classification;
 	}
-	
+
 	public void setClassification(int classification) {
 		this.classification = classification;
 	}
-	
+
 	public String getCopyright() {
 		return this.copyright;
 	}
-	
+
 	public void setCopyright(String copyright) {
 		this.copyright = copyright;
 	}
-	
+
 	public int getDay() {
 		return this.day;
 	}
-	
+
 	public void setDay(int day) {
 		this.day = day;
 	}
-	
+
 	public String getGuitarInstructions() {
 		return this.guitarInstructions;
 	}
-	
+
 	public void setGuitarInstructions(String guitarInstructions) {
 		this.guitarInstructions = guitarInstructions;
 	}
-	
+
 	public String getGuitarTranscriber() {
 		return this.guitarTranscriber;
 	}
-	
+
 	public void setGuitarTranscriber(String guitarTranscriber) {
 		this.guitarTranscriber = guitarTranscriber;
 	}
-	
+
 	public String getInstructions() {
 		return this.instructions;
 	}
-	
+
 	public void setInstructions(String instructions) {
 		this.instructions = instructions;
 	}
-	
+
 	public String getInterpret() {
 		return this.interpret;
 	}
-	
+
 	public void setInterpret(String interpret) {
 		this.interpret = interpret;
 	}
-	
+
 	public int getLevel() {
 		return this.level;
 	}
-	
+
 	public void setLevel(int level) {
 		this.level = level;
 	}
-	
+
 	public boolean isLiveRecording() {
 		return this.liveRecording;
 	}
-	
+
 	public void setLiveRecording(boolean liveRecording) {
 		this.liveRecording = liveRecording;
 	}
-	
+
 	public String getLyricist() {
 		return this.lyricist;
 	}
-	
+
 	public void setLyricist(String lyricist) {
 		this.lyricist = lyricist;
 	}
-	
+
 	public String getLyrics() {
 		return this.lyrics;
 	}
-	
+
 	public void setLyrics(String lyrics) {
 		this.lyrics = lyrics;
 	}
-	
+
 	public int getMonth() {
 		return this.month;
 	}
-	
+
 	public void setMonth(int month) {
 		this.month = month;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public int getReleaseType() {
 		return this.releaseType;
 	}
-	
+
 	public void setReleaseType(int releaseType) {
 		this.releaseType = releaseType;
 	}
-	
+
 	public int getStyle() {
 		return this.style;
 	}
-	
+
 	public void setStyle(int style) {
 		this.style = style;
 	}
-	
+
 	public int getYear() {
 		return this.year;
 	}
-	
+
 	public void setYear(int year) {
 		this.year = year;
 	}
-	
+
 	public void copy( PTSongInfo info ){
 		info.setClassification(getClassification());
 		info.setReleaseType(getReleaseType());
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSymbol.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSymbol.java
similarity index 96%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSymbol.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSymbol.java
index 0c7d2061..3cc63e4c 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTSymbol.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTSymbol.java
@@ -1,21 +1,22 @@
 package org.herac.tuxguitar.io.ptb.base;
 
 public class PTSymbol implements PTComponent{
-	
+
 	private int endNumber;
-	
+
 	public PTSymbol(){
 		super();
 	}
-	
+
 	public int getEndNumber() {
 		return this.endNumber;
 	}
-	
+
 	public void setEndNumber(int endNumber) {
 		this.endNumber = endNumber;
 	}
-	
+
+	@Override
 	public PTComponent getClone(){
 		PTSymbol symbol = new PTSymbol();
 		symbol.setEndNumber( getEndNumber() );
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTempo.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTempo.java
similarity index 96%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTempo.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTempo.java
index 397dddcd..1692dacc 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTempo.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTempo.java
@@ -3,20 +3,21 @@
 public class PTTempo implements PTComponent{
 	private int tempo;
 	private int tripletFeel;
-	
+
 	public PTTempo(int tempo,int tripletFeel){
 		this.tempo = tempo;
 		this.tripletFeel = tripletFeel;
 	}
-	
+
 	public int getTempo() {
 		return this.tempo;
 	}
-	
+
 	public int getTripletFeel() {
 		return this.tripletFeel;
 	}
-	
+
+	@Override
 	public PTComponent getClone(){
 		return new PTTempo( getTempo() , getTripletFeel() );
 	}
diff --git a/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTrack.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTrack.java
new file mode 100644
index 00000000..26d85d09
--- /dev/null
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTrack.java
@@ -0,0 +1,51 @@
+package org.herac.tuxguitar.io.ptb.base;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PTTrack {
+
+	private final List<PTSection> sections;
+	private final List<PTTrackInfo> infos;
+
+	public PTTrack(){
+		this.sections = new ArrayList<PTSection>();
+		this.infos = new ArrayList<PTTrackInfo>();
+	}
+
+	public List<PTTrackInfo> getInfos(){
+		return this.infos;
+	}
+
+	public List<PTSection> getSections(){
+		return this.sections;
+	}
+
+	public PTSection getSection(int index){
+		for(int i = getSections().size(); i <= index; i ++){
+			getSections().add(new PTSection(i));
+		}
+		return getSections().get(index);
+	}
+
+	public PTTrackInfo getInfo(int number){
+		for(int i = 0; i < getInfos().size(); i++){
+			PTTrackInfo info = getInfos().get(i);
+			if( (  (1 << info.getNumber()) & number ) != 0 ){
+				return info;
+			}
+		}
+		return null;
+	}
+
+	public PTTrackInfo getDefaultInfo(){
+		PTTrackInfo defaultInfo = null;
+		for(int i = 0; i < getInfos().size(); i++){
+			PTTrackInfo info = getInfos().get(i);
+			if( defaultInfo == null || info.getNumber() < defaultInfo.getNumber() ){
+				defaultInfo = info;
+			}
+		}
+		return defaultInfo;
+	}
+}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTrackInfo.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTrackInfo.java
similarity index 97%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTrackInfo.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTrackInfo.java
index 1c256853..f9f0c4e0 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/base/PTTrackInfo.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/base/PTTrackInfo.java
@@ -10,93 +10,93 @@ public class PTTrackInfo {
 	private int chorus;
 	private int tremolo;
 	private int phaser;
-	
+
 	private int[] strings;
-	
+
 	public PTTrackInfo(){
 		super();
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public void setName(String name) {
 		this.name = name;
 	}
-	
+
 	public int getNumber() {
 		return this.number;
 	}
-	
+
 	public void setNumber(int number) {
 		this.number = number;
 	}
-	
+
 	public int getBalance() {
 		return this.balance;
 	}
-	
+
 	public void setBalance(int balance) {
 		this.balance = balance;
 	}
-	
+
 	public int getChorus() {
 		return this.chorus;
 	}
-	
+
 	public void setChorus(int chorus) {
 		this.chorus = chorus;
 	}
-	
+
 	public int getInstrument() {
 		return this.instrument;
 	}
-	
+
 	public void setInstrument(int instrument) {
 		this.instrument = instrument;
 	}
-	
+
 	public int getPhaser() {
 		return this.phaser;
 	}
-	
+
 	public void setPhaser(int phaser) {
 		this.phaser = phaser;
 	}
-	
+
 	public int getReverb() {
 		return this.reverb;
 	}
-	
+
 	public void setReverb(int reverb) {
 		this.reverb = reverb;
 	}
-	
+
 	public int getTremolo() {
 		return this.tremolo;
 	}
-	
+
 	public void setTremolo(int tremolo) {
 		this.tremolo = tremolo;
 	}
-	
+
 	public int getVolume() {
 		return this.volume;
 	}
-	
+
 	public void setVolume(int volume) {
 		this.volume = volume;
 	}
-	
+
 	public int[] getStrings(){
 		return this.strings;
 	}
-	
+
 	public void setStrings(int[] strings){
 		this.strings = strings;
 	}
-	
+
 	public PTTrackInfo getClone(){
 		int[] strings = new int[ this.strings.length ] ;
 		for( int i = 0 ; i < strings.length ; i ++ ){
@@ -113,7 +113,7 @@ public PTTrackInfo getClone(){
 		info.setReverb( getReverb() );
 		info.setTremolo( getTremolo() );
 		info.setStrings( strings );
-		
+
 		return info;
 	}
 }
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackHelper.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackHelper.java
similarity index 98%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackHelper.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackHelper.java
index 423da9d3..77388ef1 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackHelper.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackHelper.java
@@ -4,23 +4,23 @@
 
 
 public class TrackHelper {
-	
+
 	private TrackInfoHelper infoHelper;
 	private TrackStartHelper startHelper;
-	
+
 	public TrackHelper(){
 		this.infoHelper = new TrackInfoHelper();
 		this.startHelper = new TrackStartHelper();
 	}
-	
+
 	public void reset(PTTrackInfo defaultInfo){
 		this.infoHelper.reset(defaultInfo);
 	}
-	
+
 	public TrackInfoHelper getInfoHelper() {
 		return this.infoHelper;
 	}
-	
+
 	public TrackStartHelper getStartHelper() {
 		return this.startHelper;
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackInfoHelper.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackInfoHelper.java
similarity index 83%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackInfoHelper.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackInfoHelper.java
index ed75814a..74410ed8 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackInfoHelper.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackInfoHelper.java
@@ -7,38 +7,38 @@
 import org.herac.tuxguitar.song.models.TGTrack;
 
 public class TrackInfoHelper {
-	
-	private List staffTracks = new ArrayList();
+
+	private List<TGTrack> staffTracks = new ArrayList<TGTrack>();
 	private PTTrackInfo defaultInfo;
-	
+
 	public TrackInfoHelper(){
-		this.staffTracks = new ArrayList();
+		this.staffTracks = new ArrayList<TGTrack>();
 	}
-	
+
 	public void reset(PTTrackInfo defaultInfo){
 		this.defaultInfo = defaultInfo;
 		this.staffTracks.clear();
 	}
-	
+
 	public PTTrackInfo getDefaultInfo() {
 		return this.defaultInfo;
 	}
-	
+
 	public TGTrack getStaffTrack(int staff) {
 		if(staff >= 0 && staff < this.staffTracks.size() ){
-			return (TGTrack)this.staffTracks.get( staff );
+			return this.staffTracks.get( staff );
 		}
 		return null;
 	}
-	
+
 	public int countStaffTracks() {
 		return this.staffTracks.size();
 	}
-	
+
 	public void addStaffTrack(TGTrack track) {
 		this.staffTracks.add( track );
 	}
-	
+
 	public void removeStaffTrack(int staff) {
 		this.staffTracks.remove( staff );
 	}
diff --git a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackStartHelper.java b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackStartHelper.java
similarity index 98%
rename from TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackStartHelper.java
rename to plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackStartHelper.java
index f0610eb3..a0c7941d 100644
--- a/TuxGuitar-ptb/src/org/herac/tuxguitar/io/ptb/helper/TrackStartHelper.java
+++ b/plugins/ptb/src/main/java/org/herac/tuxguitar/io/ptb/helper/TrackStartHelper.java
@@ -3,19 +3,19 @@
 import org.herac.tuxguitar.song.models.TGDuration;
 
 public class TrackStartHelper {
-	
+
 	private int section;
 	private long[][] voices;
 	private boolean measureEmpty;
 	private boolean measureRest;
-	
+
 	private long barStart;
 	private long barLength;
-	
+
 	public TrackStartHelper(){
 		super();
 	}
-	
+
 	public void init(int section,int staffs){
 		this.section = section;
 		this.voices = new long[staffs][2];
@@ -24,11 +24,11 @@ public void init(int section,int staffs){
 		this.barStart = 0;
 		this.barLength = 0;
 	}
-	
+
 	public int getSection(){
 		return this.section;
 	}
-	
+
 	public void initVoices(long start){
 		for(int i = 0; i < this.voices.length; i ++){
 			for(int j = 0; j < this.voices[i].length; j ++){
@@ -38,7 +38,7 @@ public void initVoices(long start){
 		this.measureEmpty = true;
 		this.measureRest = false;
 	}
-	
+
 	public long getMaxStart(){
 		long result = TGDuration.QUARTER_TIME;
 		for(int i = 0; i < this.voices.length; i ++){
@@ -52,36 +52,36 @@ public long getMaxStart(){
 		}
 		return fixValue(result);
 	}
-	
+
 	public long getVoiceStart(int staff,int voice){
 		return this.voices[staff][voice];
 	}
-	
+
 	public void setVoiceStart(int staff,int voice,long start){
 		this.voices[staff][voice] = fixValue(start);
 	}
-	
+
 	public long getBarStart() {
 		return this.barStart;
 	}
-	
+
 	public void setBarStart(long barStart) {
 		this.barStart = barStart;
 	}
-	
+
 	public long getBarLength() {
 		return this.barLength;
 	}
-	
+
 	public void setBarLength(long barLength) {
 		this.barLength = barLength;
 	}
-	
+
 	public void checkBeat( boolean rest ){
 		this.measureEmpty = (this.measureEmpty && rest );
 		this.measureRest = true;
 	}
-	
+
 	public long fixValue(long value){
 		return (((value % (TGDuration.QUARTER_TIME / 2)) + 10  > (TGDuration.QUARTER_TIME / 2))?(value + ((TGDuration.QUARTER_TIME / 2) - (value % (TGDuration.QUARTER_TIME / 2)))):value);
 	}
diff --git a/TuxGuitar-ptb/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/ptb/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-ptb/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/ptb/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/svg/pom.xml b/plugins/svg/pom.xml
new file mode 100644
index 00000000..40893355
--- /dev/null
+++ b/plugins/svg/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-svg</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: SVG</name>
+	<description>SVG plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGColor.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGColor.java
similarity index 93%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGColor.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGColor.java
index 46ff4cff..9ba1d976 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGColor.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGColor.java
@@ -4,41 +4,46 @@
 import org.herac.tuxguitar.graphics.TGColorModel;
 
 public class SVGColor implements TGColor{
-	
+
 	private TGColorModel handle;
-	
+
 	public SVGColor(int red, int green, int blue){
 		this.handle = new TGColorModel(red, green, blue);
 	}
-	
+
+	@Override
 	public void dispose() {
 		this.handle = null;
 	}
-	
+
+	@Override
 	public boolean isDisposed() {
 		return (this.handle == null);
 	}
-	
+
 	public TGColorModel getHandle(){
 		return this.handle;
 	}
-	
+
+	@Override
 	public int getRed() {
 		return this.handle.getRed();
 	}
-	
+
+	@Override
 	public int getGreen() {
 		return this.handle.getGreen();
 	}
-	
+
+	@Override
 	public int getBlue() {
 		return this.handle.getBlue();
 	}
-	
+
 	public String toHexString(){
 		return ("#" + getHexValue(getRed()) + getHexValue(getGreen()) + getHexValue(getBlue()));
 	}
-	
+
 	private String getHexValue( int value ){
 		String hexValue =  Integer.toHexString( value );
 		while( hexValue.length() < 2 ){
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGController.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGController.java
similarity index 97%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGController.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGController.java
index ec1414fe..981193d5 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGController.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGController.java
@@ -16,13 +16,13 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class SVGController implements TGController {
-	
+
 	private SVGExporterStyles tgStyles;
-	
+
 	private TGSongManager tgSongManager;
 	private TGResourceFactory tgResourceFactory;
 	private TGLayoutVertical tgLayout;
-	
+
 	public SVGController(SVGExporterStyles tgStyles){
 		this.tgStyles = tgStyles;
 		this.tgSongManager = new TGSongManager();
@@ -30,36 +30,38 @@ public SVGController(SVGExporterStyles tgStyles){
 		this.tgResourceFactory = new SVGResourceFactory();
 		this.tgLayout = new TGLayoutVertical(this, this.tgStyles.getFlags() );
 	}
-	
+
+	@Override
 	public TGSongManager getSongManager() {
 		return this.tgSongManager;
 	}
-	
+
+	@Override
 	public TGResourceFactory getResourceFactory() {
 		return this.tgResourceFactory;
 	}
-	
+
 	public void load(TGSong song) throws TGFileFormatException {
 		this.tgSongManager.setSong(song);
 		this.tgLayout.loadStyles();
 		this.tgLayout.updateSong();
 	}
-	
-	public void write(StringBuffer svgBuffer) throws Throwable {		
+
+	public void write(StringBuffer svgBuffer) throws Throwable {
 		if( this.tgSongManager.getSong() != null ){
 			// Do a paint to calculate the document height.
 			TGRectangle svgBounds = new TGRectangle(0, 0, 960, 0 );
 			TGPainter svgPainter = new SVGPainter(new StringBuffer());
 			this.tgLayout.paint(svgPainter, svgBounds, 0, 0);
 			svgBounds.setHeight(this.tgLayout.getHeight());
-			
+
 			// Start of SVG document
 			svgBuffer.append("<svg width=\"" + svgBounds.getWidth() + "px\" height=\"" + svgBounds.getHeight() + "px\" xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\">");
 			svgBuffer.append("\r\n");
-			
+
 			// Open the painter
 			svgPainter = new SVGPainter(svgBuffer);
-			
+
 			// Fill the background.
 			TGColor svgBackground = svgPainter.createColor(this.tgStyles.getStyles().getBackgroundColor());
 			svgPainter.setBackground(svgBackground);
@@ -67,19 +69,20 @@ public void write(StringBuffer svgBuffer) throws Throwable {
 			svgPainter.addRectangle(0, 0, svgBounds.getWidth(), svgBounds.getHeight());
 			svgPainter.closePath();
 			svgBackground.dispose();
-			
+
 			// Paint the TGSong
 			this.tgLayout.paint(svgPainter, svgBounds, 0, 0);
-			
+
 			// Closes the painter
 			svgPainter.dispose();
-			
+
 			// End of SVG document
 			svgBuffer.append("\r\n");
 			svgBuffer.append("</svg>");
 		}
 	}
-	
+
+	@Override
 	public void configureStyles(TGLayoutStyles styles) {
 		styles.setBufferEnabled( false );
 		styles.setStringSpacing( this.tgStyles.getStyles().getStringSpacing() );
@@ -117,23 +120,28 @@ public void configureStyles(TGLayoutStyles styles) {
 		styles.setLoopSMarkerColor( this.tgStyles.getStyles().getLoopSMarkerColor());
 		styles.setLoopEMarkerColor( this.tgStyles.getStyles().getLoopEMarkerColor());
 	}
-	
+
+	@Override
 	public int getTrackSelection() {
 		return this.tgStyles.getTrack();
 	}
-	
+
+	@Override
 	public boolean isRunning(TGBeat beat) {
 		return false;
 	}
-	
+
+	@Override
 	public boolean isRunning(TGMeasure measure) {
 		return false;
 	}
-	
+
+	@Override
 	public boolean isLoopSHeader(TGMeasureHeader measureHeader) {
 		return false;
 	}
-	
+
+	@Override
 	public boolean isLoopEHeader(TGMeasureHeader measureHeader) {
 		return false;
 	}
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporter.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporter.java
similarity index 96%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporter.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporter.java
index fbfad297..5f0db457 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporter.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporter.java
@@ -10,22 +10,25 @@
 import org.herac.tuxguitar.song.models.TGSong;
 
 public class SVGExporter implements TGLocalFileExporter {
-	
+
 	private OutputStream stream;
 	private SVGExporterStyles styles;
-	
+
 	public SVGExporter(SVGExporterStyles styles){
 		this.styles = styles;
 	}
-	
+
+	@Override
 	public String getExportName() {
 		return "SVG";
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Scalable Vector Graphics","*.svg");
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults) {
 		if( setDefaults ){
 			this.styles.configureWithDefaults();
@@ -34,20 +37,22 @@ public boolean configure(boolean setDefaults) {
 		}
 		return this.styles.isConfigured();
 	}
-	
+
+	@Override
 	public void init(TGFactory factory, OutputStream stream) {
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public void exportSong(TGSong song) throws TGFileFormatException {
 		try {
 			if( this.styles.isConfigured() ){
 				StringBuffer svgBuffer = new StringBuffer();
-				
+
 				SVGController svgController = new SVGController(this.styles);
 				svgController.load(song.clone(svgController.getSongManager().getFactory()));
 				svgController.write(svgBuffer);
-				
+
 				PrintWriter svgWriter = new PrintWriter(this.stream);
 				svgWriter.write( svgBuffer.toString() );
 				svgWriter.flush();
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterPlugin.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterPlugin.java
similarity index 91%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterPlugin.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterPlugin.java
index 98f4b47a..4dee7e37 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterPlugin.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterPlugin.java
@@ -5,23 +5,28 @@
 import org.herac.tuxguitar.io.base.TGRawExporter;
 
 public class SVGExporterPlugin extends TGExporterPlugin {
-	
+
+	@Override
 	protected TGRawExporter getExporter() throws TGPluginException {
 		return new SVGExporter(new SVGExporterStylesDialog());
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "SVG exporter plugin";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "SVG exporter";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterStyles.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterStyles.java
similarity index 98%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterStyles.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterStyles.java
index 2cf96b01..cc3c14d6 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterStyles.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterStyles.java
@@ -6,55 +6,55 @@
 import org.herac.tuxguitar.graphics.control.TGLayoutStyles;
 
 public class SVGExporterStyles {
-	
+
 	private int track;
 	private int flags;
 	private TGLayoutStyles styles;
-	
+
 	private boolean configured;
-	
+
 	public SVGExporterStyles(){
 		this.track = -1;
 		this.flags = 0;
 		this.styles = new TGLayoutStyles();
 		this.configured = false;
 	}
-	
+
 	public boolean isConfigured() {
 		return this.configured;
 	}
-	
+
 	public void setConfigured(boolean configured) {
 		this.configured = configured;
 	}
-	
+
 	public int getTrack() {
 		return this.track;
 	}
-	
+
 	public void setTrack(int track) {
 		this.track = track;
 	}
-	
+
 	public void setFlags(int flags){
 		this.flags = flags;
 	}
-	
+
 	public int getFlags(){
 		return this.flags;
 	}
-	
+
 	public TGLayoutStyles getStyles(){
 		return this.styles;
 	}
-	
+
 	public void configure() {
 		this.configureWithDefaults();
 	}
-	
+
 	public void configureWithDefaults(){
 		this.setTrack( -1 );
-		
+
 		this.setFlags( 0 );
 		this.setFlags( this.getFlags() | TGLayout.DISPLAY_SCORE );
 		this.setFlags( this.getFlags() | TGLayout.DISPLAY_TABLATURE );
@@ -62,7 +62,7 @@ public void configureWithDefaults(){
 		this.setFlags( this.getFlags() | TGLayout.DISPLAY_COMPACT );
 		this.setFlags( this.getFlags() | TGLayout.DISPLAY_CHORD_NAME );
 		this.setFlags( this.getFlags() | TGLayout.DISPLAY_CHORD_DIAGRAM );
-		
+
 		this.getStyles().setBufferEnabled(true);
 		this.getStyles().setStringSpacing(10);
 		this.getStyles().setScoreLineSpacing(8);
@@ -82,7 +82,7 @@ public void configureWithDefaults(){
 		this.getStyles().setLoopMarkerSpacing(5);
 		this.getStyles().setDivisionTypeSpacing(10);
 		this.getStyles().setEffectSpacing(8);
-		
+
 		this.getStyles().setDefaultFont(new TGFontModel("Default", 10, false, false) );
 		this.getStyles().setNoteFont(new TGFontModel("Default", 10, false, false) );
 		this.getStyles().setTimeSignatureFont(new TGFontModel("Default", 14, true, false) );
@@ -92,7 +92,7 @@ public void configureWithDefaults(){
 		this.getStyles().setGraceFont(new TGFontModel("Default", 8, false, false));
 		this.getStyles().setChordFont(new TGFontModel("Default", 10, false, false));
 		this.getStyles().setChordFretFont(new TGFontModel("Default", 8, false, false));
-		
+
 		this.getStyles().setBackgroundColor( new TGColorModel(255,255,255) );
 		this.getStyles().setLineColor(  new TGColorModel(214,214,214)  );
 		this.getStyles().setScoreNoteColor( new TGColorModel(64,64,64));
@@ -100,7 +100,7 @@ public void configureWithDefaults(){
 		this.getStyles().setPlayNoteColor(new TGColorModel(64,64,64));
 		this.getStyles().setLoopSMarkerColor(new TGColorModel(0,0,0));
 		this.getStyles().setLoopEMarkerColor(new TGColorModel(0,0,0));
-		
+
 		this.setConfigured( true );
 	}
 }
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterStylesDialog.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterStylesDialog.java
similarity index 98%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterStylesDialog.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterStylesDialog.java
index 1f011ab5..9e89d108 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGExporterStylesDialog.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGExporterStylesDialog.java
@@ -16,66 +16,69 @@
 import org.herac.tuxguitar.graphics.control.TGLayout;
 
 public class SVGExporterStylesDialog extends SVGExporterStyles {
-	
+
 	public SVGExporterStylesDialog(){
 		super();
 	}
-	
+
+	@Override
 	public void configure() {
 		final Shell dialog = DialogUtils.newDialog(TuxGuitar.instance().getShell(), SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		dialog.setLayout(new GridLayout());
 		dialog.setText(TuxGuitar.getProperty("options"));
-		
+
 		//------------------TRACK SELECTION------------------
 		Group trackGroup = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		trackGroup.setLayout(new GridLayout(2,false));
 		trackGroup.setLayoutData(getGroupData());
 		trackGroup.setText(TuxGuitar.getProperty("track"));
-		
+
 		final Label trackLabel = new Label(trackGroup, SWT.NULL);
 		trackLabel.setText(TuxGuitar.getProperty("track"));
-		
+
 		final Combo trackCombo = new Combo(trackGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
 		trackCombo.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		for(int number = 1; number <= TuxGuitar.instance().getSongManager().getSong().countTracks(); number ++){
 			trackCombo.add(TuxGuitar.instance().getSongManager().getTrack(number).getName());
 		}
 		trackCombo.select(TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getNumber() - 1);
-		
+
 		final Button trackAllCheck = new Button(trackGroup,SWT.CHECK);
 		trackAllCheck.setLayoutData(new GridData(SWT.FILL,SWT.CENTER,true,true,2,1));
 		trackAllCheck.setText(TuxGuitar.getProperty("export.all-tracks"));
 		trackAllCheck.setSelection(false);
 		trackAllCheck.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent e) {
 				trackLabel.setEnabled( !trackAllCheck.getSelection() );
 				trackCombo.setEnabled( !trackAllCheck.getSelection() );
 			}
 		});
-		
+
 		//------------------CHECK OPTIONS--------------------
 		Group options = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		options.setLayout(new GridLayout());
 		options.setLayoutData(getGroupData());
 		options.setText(TuxGuitar.getProperty("options"));
-		
+
 		final Button tablatureEnabled = new Button(options,SWT.CHECK);
 		tablatureEnabled.setText(TuxGuitar.getProperty("export.tablature-enabled"));
 		tablatureEnabled.setSelection(true);
-		
+
 		final Button scoreEnabled = new Button(options,SWT.CHECK);
 		scoreEnabled.setText(TuxGuitar.getProperty("export.score-enabled"));
 		scoreEnabled.setSelection(true);
-		
+
 		final Button chordNameEnabled = new Button(options,SWT.CHECK);
 		chordNameEnabled.setText(TuxGuitar.getProperty("export.chord-name-enabled"));
 		chordNameEnabled.setSelection(true);
-		
+
 		final Button chordDiagramEnabled = new Button(options,SWT.CHECK);
 		chordDiagramEnabled.setText(TuxGuitar.getProperty("export.chord-diagram-enabled"));
 		chordDiagramEnabled.setSelection(true);
-		
+
 		tablatureEnabled.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!tablatureEnabled.getSelection()){
 					scoreEnabled.setSelection(true);
@@ -83,49 +86,52 @@ public void widgetSelected(SelectionEvent arg0) {
 			}
 		});
 		scoreEnabled.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				if(!scoreEnabled.getSelection()){
 					tablatureEnabled.setSelection(true);
 				}
 			}
 		});
-		
+
 		//------------------BUTTONS--------------------------
 		Composite buttons = new Composite(dialog, SWT.NONE);
 		buttons.setLayout(new GridLayout(2,false));
 		buttons.setLayoutData(new GridData(SWT.END,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(buttons, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(getButtonData());
 		buttonOK.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				int track = (!trackAllCheck.getSelection() ? (trackCombo.getSelectionIndex() + 1) : -1);
 				boolean showScore = scoreEnabled.getSelection();
 				boolean showTablature = tablatureEnabled.getSelection();
 				boolean showChordName = chordNameEnabled.getSelection();
 				boolean showChordDiagram = chordDiagramEnabled.getSelection();
-				
+
 				configure(track, showScore, showTablature, showChordName, showChordDiagram);
-				
+
 				dialog.dispose();
 			}
 		});
-		
+
 		Button buttonCancel = new Button(buttons, SWT.PUSH);
 		buttonCancel.setText(TuxGuitar.getProperty("cancel"));
 		buttonCancel.setLayoutData(getButtonData());
 		buttonCancel.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				dialog.dispose();
 			}
 		});
-		
+
 		dialog.setDefaultButton( buttonOK );
-		
+
 		DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK | DialogUtils.OPEN_STYLE_WAIT);
 	}
-	
+
 	public void configure(int track, boolean showScore,boolean showTablature,boolean showChordName,boolean showChordDiagram) {
 		this.configureWithDefaults();
 		this.setTrack( track );
@@ -147,14 +153,14 @@ public void configure(int track, boolean showScore,boolean showTablature,boolean
 		}
 		this.setConfigured(true);
 	}
-	
+
 	private static GridData getButtonData(){
 		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
 		data.minimumWidth = 80;
 		data.minimumHeight = 25;
 		return data;
 	}
-	
+
 	private static GridData getGroupData(){
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumWidth = 300;
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGFont.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGFont.java
similarity index 90%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGFont.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGFont.java
index 40173c87..573298c3 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGFont.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGFont.java
@@ -4,33 +4,39 @@
 import org.herac.tuxguitar.graphics.TGFontModel;
 
 public class SVGFont implements TGFont {
-	
+
 	private TGFontModel handle;
-	
+
 	public SVGFont(String name, int height, boolean bold, boolean italic){
 		this.handle = new TGFontModel(name, height, bold, italic);
 	}
-	
+
+	@Override
 	public void dispose() {
 		this.handle = null;
 	}
-	
+
+	@Override
 	public boolean isDisposed() {
 		return (this.handle == null);
 	}
-	
+
+	@Override
 	public String getName() {
 		return this.handle.getName();
 	}
-	
+
+	@Override
 	public int getHeight() {
 		return this.handle.getHeight();
 	}
-	
+
+	@Override
 	public boolean isBold() {
 		return this.handle.isBold();
 	}
-	
+
+	@Override
 	public boolean isItalic() {
 		return this.handle.isItalic();
 	}
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGImage.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGImage.java
similarity index 92%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGImage.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGImage.java
index a76a9487..0c9ba83d 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGImage.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGImage.java
@@ -5,45 +5,51 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class SVGImage implements TGImage{
-	
+
 	private StringBuffer buffer;
-	
+
 	private int width;
 	private int height;
-	
+
 	private boolean disposed;
-	
+
 	public SVGImage(int width, int height){
 		this.width = width;
 		this.height = height;
 		this.disposed = false;
 		this.buffer = new StringBuffer();
 	}
-	
+
+	@Override
 	public void dispose() {
 		this.disposed = true;
 	}
-	
+
+	@Override
 	public boolean isDisposed() {
 		return this.disposed;
 	}
-	
+
+	@Override
 	public int getWidth() {
 		return this.width;
 	}
-	
+
+	@Override
 	public int getHeight() {
 		return this.height;
 	}
-	
+
 	public StringBuffer getBuffer(){
 		return this.buffer;
 	}
-	
+
+	@Override
 	public TGPainter createPainter() {
 		return new SVGPainter( this.buffer );
 	}
-	
+
+	@Override
 	public void applyTransparency(TGColor background) {
 		// Not implemented
 	}
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGPainter.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGPainter.java
similarity index 94%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGPainter.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGPainter.java
index 698e2930..8bd45b91 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGPainter.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGPainter.java
@@ -6,7 +6,7 @@
 import org.herac.tuxguitar.graphics.TGPainter;
 
 public class SVGPainter extends SVGResourceFactory implements TGPainter {
-	
+
 	private int svgStrokeWidth;
 	private int svgPathStyle;
 	private SVGFont svgFont;
@@ -14,9 +14,9 @@ public class SVGPainter extends SVGResourceFactory implements TGPainter {
 	private SVGColor svgForeground;
 	private StringBuffer svgPath;
 	private StringBuffer svgBuffer;
-	
+
 	private boolean disposed;
-	
+
 	public SVGPainter( StringBuffer svgBuffer ){
 		this.svgBuffer = svgBuffer;
 		this.svgPath = null;
@@ -27,26 +27,31 @@ public SVGPainter( StringBuffer svgBuffer ){
 		this.svgBackground = new SVGColor(0xff, 0xff, 0xff);
 		this.svgForeground = new SVGColor(0x00, 0x00, 0x00);
 	}
-	
+
+	@Override
 	public void dispose(){
 		this.disposed = true;
 	}
-	
+
+	@Override
 	public boolean isDisposed(){
 		return this.disposed;
 	}
-	
+
+	@Override
 	public void initPath(int style){
 		this.svgPath = new StringBuffer();
 		this.svgPathStyle = style;
-		
+
 		this.setAntialias(true);
 	}
-	
+
+	@Override
 	public void initPath(){
 		this.initPath( PATH_DRAW );
 	}
-	
+
+	@Override
 	public void closePath(){
 		if( this.svgPath != null && this.svgPath.length() > 0 ){
 			this.svgBuffer.append("\r\n");
@@ -61,7 +66,8 @@ public void closePath(){
 		this.svgPathStyle = 0;
 		this.setAntialias(false);
 	}
-	
+
+	@Override
 	public void drawString(String string, int x, int y) {
 		this.setAdvanced(false);
 		this.svgBuffer.append("\r\n");
@@ -75,7 +81,8 @@ public void drawString(String string, int x, int y) {
 		this.svgBuffer.append( string );
 		this.svgBuffer.append("</text>");
 	}
-	
+
+	@Override
 	public void drawString(String string, int x, int y, boolean isTransparent) {
 		this.svgBuffer.append("\r\n");
 		this.svgBuffer.append("<text ");
@@ -88,7 +95,8 @@ public void drawString(String string, int x, int y, boolean isTransparent) {
 		this.svgBuffer.append( string );
 		this.svgBuffer.append("</text>");
 	}
-	
+
+	@Override
 	public void drawImage(TGImage image, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight) {
 		if( image instanceof SVGImage ){
 			this.svgBuffer.append("<g transform=\"translate(" + destX + "," + destY + ")\">");
@@ -96,7 +104,8 @@ public void drawImage(TGImage image, int srcX, int srcY, int srcWidth, int srcHe
 			this.svgBuffer.append("</g>");
 		}
 	}
-	
+
+	@Override
 	public void drawImage(TGImage image, int x, int y) {
 		if( image instanceof SVGImage ){
 			this.svgBuffer.append("<g transform=\"translate(" + x + "," + y + ")\">");
@@ -104,28 +113,32 @@ public void drawImage(TGImage image, int x, int y) {
 			this.svgBuffer.append("</g>");
 		}
 	}
-	
+
+	@Override
 	public void cubicTo(float cx1, float cy1, float cx2, float cy2, float x, float y) {
 		this.svgPath.append("C " + cx1 + " " + cy1 + " " + cx2 + " " + cy2 + " "+ x + " " + y + " ");
 	}
-	
+
+	@Override
 	public void lineTo(float x, float y) {
 		this.svgPath.append("L " + x + " " + y + " ");
 	}
-	
+
+	@Override
 	public void moveTo(float x, float y) {
 		this.svgPath.append("M " + x + " " + y + " ");
 	}
-	
+
+	@Override
 	public void addArc(float x, float y, float width, float height, float startAngle, float arcLength) {
 		double angle1 = Math.toRadians(-startAngle);
 		double x1 = (x + (Math.cos(angle1) * 0.5 + 0.5) * width);
 		double y1 = (y + (Math.sin(angle1) * 0.5 + 0.5) * height);
-		
+
 		double angle2 = Math.toRadians(-startAngle - arcLength);
 		double x2 = (x + (Math.cos(angle2) * 0.5 + 0.5) * width);
 		double y2 = (y + (Math.sin(angle2) * 0.5 + 0.5) * height);
-		
+
 		this.svgPath.append("M " + x1 + " " + y1 + " ");
 		this.svgPath.append("A " + (width / 2) + " " + (height / 2) + " 0 ");
 		this.svgPath.append( ( arcLength > 180 || arcLength < -180 ? "1 " : "0 " ) );
@@ -133,13 +146,15 @@ public void addArc(float x, float y, float width, float height, float startAngle
 		this.svgPath.append(x2 + " " + y2 + " ");
 		this.svgPath.append("M " + x2 + " " + y2 + " ");
 	}
-	
+
+	@Override
 	public void addOval(float x, float y, float w, float h) {
 		this.svgPath.append("M " + x + " " + (y + (h / 2f)) + " a ");
 		this.svgPath.append((w / 2f) + " " + (h / 2f) + " 0 1 0 " + w + " 0 ");
 		this.svgPath.append((w / 2f) + " " + (h / 2f) + " 0 1 0 -" + w + " 0 ");
 	}
-	
+
+	@Override
 	public void addRectangle(float x,float y,float width,float height) {
 		this.svgPath.append("M " + x + " " + y + " ");
 		this.svgPath.append("L " + (x + width) + " " + y + " ");
@@ -147,92 +162,112 @@ public void addRectangle(float x,float y,float width,float height) {
 		this.svgPath.append("L " + x + " " + (y + height) + " ");
 		this.svgPath.append("L " + x + " " + y + " ");
 	}
-	
+
+	@Override
 	public void addString(String text, float x, float y, TGFont font) {
 		TGFont currentFont = this.svgFont;
 		this.setFont(font);
 		this.drawString(text, Math.round(x), Math.round(y));
 		this.setFont(currentFont);
 	}
-	
+
+	@Override
 	public void setFont(TGFont font) {
 		if( font instanceof SVGFont ){
 			this.svgFont = (SVGFont)font;
 		}
 	}
-	
+
+	@Override
 	public void setBackground(TGColor color) {
 		if( color instanceof SVGColor ){
 			this.svgBackground = (SVGColor)color;
 		}
 	}
-	
+
+	@Override
 	public void setForeground(TGColor color) {
 		if( color instanceof SVGColor ){
 			this.svgForeground = (SVGColor)color;
 		}
 	}
-	
+
+	@Override
 	public void setLineWidth(int width) {
 		this.svgStrokeWidth = width;
 	}
-	
+
+	@Override
 	public void setLineStyleSolid(){
 		// Not Implemented
 	}
-	
+
+	@Override
 	public void setLineStyleDot(){
 		// Not Implemented
 	}
-	
+
+	@Override
 	public void setLineStyleDash(){
 		// Not Implemented
 	}
-	
+
+	@Override
 	public void setLineStyleDashDot(){
 		// Not Implemented
 	}
-	
+
+	@Override
 	public void setAntialias(boolean enabled){
 		// Not Implemented
 	}
-	
+
+	@Override
 	public void setAdvanced(boolean advanced){
 		// Not Implemented
 	}
-	
+
+	@Override
 	public int getFontSize(){
 		return this.svgFont.getHeight();
 	}
-	
+
+	@Override
 	public int getFMHeight(){
 		return (getFMAscent() + getFMDescent());
 	}
-	
+
+	@Override
 	public int getFMAscent(){
 		return getFontSize();
 	}
-	
+
+	@Override
 	public int getFMDescent(){
 		return 0;
 	}
-	
+
+	@Override
 	public int getFMWidth( String text ){
 		return ( text != null ? Math.round( text.length() * (0.75f * getFontSize() ) ) : 0 );
 	}
-	
+
+	@Override
 	public void setAlpha(int alpha) {
 		// Not Implemented
 	}
-	
+
+	@Override
 	public void drawPolygon(int[] arg0) {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void fillPolygon(int[] arg0) {
 		// Not implemented
 	}
-	
+
+	@Override
 	public void copyArea(TGImage image, int x, int y) {
 		// Not Implemented
 	}
diff --git a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGResourceFactory.java b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGResourceFactory.java
similarity index 94%
rename from TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGResourceFactory.java
rename to plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGResourceFactory.java
index 7c51ce79..d2d0c8cf 100644
--- a/TuxGuitar-svg/src/org/herac/tuxguitar/io/svg/SVGResourceFactory.java
+++ b/plugins/svg/src/main/java/org/herac/tuxguitar/io/svg/SVGResourceFactory.java
@@ -8,23 +8,28 @@
 import org.herac.tuxguitar.graphics.TGResourceFactory;
 
 public class SVGResourceFactory implements TGResourceFactory{
-	
+
+	@Override
 	public TGImage createImage(int width, int height) {
 		return new SVGImage(width, height);
 	}
-	
+
+	@Override
 	public TGColor createColor(TGColorModel colorModel) {
 		return this.createColor(colorModel.getRed(), colorModel.getGreen(), colorModel.getBlue());
 	}
-	
+
+	@Override
 	public TGColor createColor(int red, int green, int blue) {
 		return new SVGColor(red, green, blue);
 	}
-	
+
+	@Override
 	public TGFont createFont(TGFontModel fontModel) {
 		return createFont(fontModel.getName(), fontModel.getHeight(), fontModel.isBold(), fontModel.isItalic() );
 	}
-	
+
+	@Override
 	public TGFont createFont(String name, int height, boolean bold, boolean italic) {
 		return new SVGFont(name, height, bold, italic);
 	}
diff --git a/TuxGuitar-svg/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/svg/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-svg/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/svg/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/tef/pom.xml b/plugins/tef/pom.xml
new file mode 100644
index 00000000..4396952f
--- /dev/null
+++ b/plugins/tef/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-tef</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: TablEdit format</name>
+	<description>TablEdit format plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEInputStream.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TEInputStream.java
similarity index 98%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEInputStream.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TEInputStream.java
index 215af29b..3d106d41 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEInputStream.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TEInputStream.java
@@ -18,65 +18,65 @@
 import org.herac.tuxguitar.io.tef.base.TETrack;
 
 public class TEInputStream {
-	
+
 	private TESong song;
 	private InputStream stream;
-	
+
 	public TEInputStream(InputStream stream){
 		this.stream = stream;
 	}
-	
+
 	public TESong readSong(){
 		this.song = new TESong();
-		
+
 		this.readInfo();
-		
+
 		this.song.setMeasures((this.readByte() & 0xff));
-		
+
 		this.skip(1);
 		this.readTimeSignature();
-		
+
 		this.skip(15);
 		this.readTempo();
-		
+
 		this.song.setRepeats( (this.readByte() & 0xff) );
-		
+
 		this.skip(5);
 		this.song.setTexts((this.readByte() & 0xff));
-		
+
 		this.skip(5);
 		this.song.setPercussions((this.readByte() & 0xff));
 		this.song.setRhythms((this.readByte() & 0xff));
-		
+
 		this.song.setChords((this.readByte() & 0xff));
-		
+
 		this.skip(1);
 		boolean notes = ((this.readByte() & 0xff) > 0);
-		
+
 		this.skip(1);
 		this.song.setStrings((this.readByte() & 0xff));
-		
+
 		this.song.setTracks((this.readByte() & 0xff) + 1);
-		
+
 		this.skip(14);
 		this.readComponents();
 		this.readRepeats();
 		this.readTexts();
-		
+
 		this.readPercussions();
-		
+
 		this.readChords();
-		
-		
+
+
 		this.readRhythms();
 		this.readNotes(notes);
 		this.readTracks();
-		
+
 		this.close();
-		
+
 		return this.song;
 	}
-	
+
 	private void readInfo(){
 		byte[] info = this.readBytes(200);
 		int offset = 0;
@@ -91,26 +91,26 @@ private void readInfo(){
 		}
 		this.song.setInfo(new TEInfo(strings[0],strings[1],strings[2]));
 	}
-	
+
 	private void readNotes(boolean notes){
 		if(notes){
 			int length = this.readShort();
 			this.song.getInfo().setNotes( new String(this.readBytes(length),1,(length -1)) );
 		}
 	}
-	
+
 	private void readTempo(){
 		int value = this.readShort();
 		this.song.setTempo(new TETempo(value));
 	}
-	
+
 	private void readTimeSignature(){
 		int numerator = this.readByte();
 		this.skip(1);
 		int denominator = this.readByte();
 		this.song.setTimeSignature(new TETimeSignature(numerator,denominator));
 	}
-	
+
 	private void readRepeats(){
 		for(int i = 0; i < this.song.getRepeats().length; i ++){
 			int data1 = this.readByte();
@@ -118,7 +118,7 @@ private void readRepeats(){
 			this.song.setRepeat(i,new TERepeat(data1,data2));
 		}
 	}
-	
+
 	private void readTexts(){
 		for(int i = 0; i < this.song.getTexts().length; i ++){
 			int length = this.readByte();
@@ -127,17 +127,17 @@ private void readTexts(){
 			this.skip(1);
 		}
 	}
-	
+
 	private void readChords(){
 		for(int i = 0; i < this.song.getChords().length; i ++){
 			byte[] strings = this.readBytes(14);
 			byte[] name = this.readBytes(16);
-			
+
 			this.song.setChord(i,new TEChord(strings,new String(name)));
 			this.skip(2);
 		}
 	}
-	
+
 	private void readPercussions(){
 		if(this.song.getPercussions().length > 0){
 			for(int i = 0; i < this.song.getPercussions().length; i ++){
@@ -151,7 +151,7 @@ private void readPercussions(){
 			this.skip(this.song.getMeasures());
 		}
 	}
-	
+
 	private void readRhythms(){
 		if(this.song.getRhythms().length > 0){
 			for(int i = 0; i < this.song.getRhythms().length; i ++){
@@ -166,43 +166,43 @@ private void readRhythms(){
 			this.skip(this.song.getMeasures());
 		}
 	}
-	
+
 	private void readTracks(){
 		for(int i = 0; i < this.song.getTracks().length; i ++){
 			int[] strings = new int[this.readByte()];
-			
+
 			this.skip(5);
 			int type = this.readByte();
-			
+
 			this.skip(1);
 			int instrument = this.readByte();
-			
+
 			this.skip(3);
 			int capo = this.readByte();
-			
+
 			this.skip(1);
-			
+
 			int clefType = this.readByte();
 			int clefNumber = this.readByte();
-			
+
 			this.skip(1);
-			
+
 			int pan = this.readByte();
 			int volume = this.readByte();
 			int flags = this.readByte();
-			
+
 			for(int string = 0; string < strings.length; string ++){
 				strings[string] = (this.readByte() & 0xff);
 			}
 			this.skip(12 - strings.length);
-			
+
 			String name = new String(this.readBytes(16));
-			
+
 			this.song.setTrack(i,new TETrack( (type == 98),instrument,capo, clefType, clefNumber, pan, volume, flags, strings, name));
 			this.skip(2);
 		}
 	}
-	
+
 	private void readComponents(){
 		int tsSize = ( (256 * this.song.getTimeSignature().getNumerator()) / this.song.getTimeSignature().getDenominator() );
 		int tsMove = 0;
@@ -211,7 +211,7 @@ private void readComponents(){
 		int count = this.readShort();
 		for(int i = 0; i < count; i ++){
 			byte[] data = this.readBytes(6);
-			
+
 			int location = ( (data[0] & 0xff) + (256 *  (mData + (data[1] & 0xff))));
 			if( ( location / ( tsSize * this.song.getStrings() ) ) < mIndex ){
 				mData += 256;
@@ -220,10 +220,10 @@ private void readComponents(){
 			int position = (location  %  tsSize);
 			int string = ( (location / tsSize)  % this.song.getStrings()) ;
 			int measure = ( location / ( tsSize * this.song.getStrings() ) );
-			
+
 			tsMove = (mIndex == measure)?tsMove:0;
 			position -= tsMove;
-			
+
 			if( ((data[2] & 0xff) & 0x1f) > 0  && ((data[2] & 0xff) & 0x1f) <= 25 ){
 				int duration = (data[3] & 0xf);
 				int dynamic =  (data[3] >> 4);
@@ -257,10 +257,10 @@ else if( ((data[2] & 0xff) & 0x1f) == 30 ){
 			mIndex = measure;
 		}
 	}
-	
+
+	//-----------------------------------------------------------------------------//
 	//-----------------------------------------------------------------------------//
 	//-----------------------------------------------------------------------------//
-	//-----------------------------------------------------------------------------//	
 	protected byte[] readBytes(int length){
 		byte[] bytes = new byte[length];
 		try {
@@ -270,7 +270,7 @@ protected byte[] readBytes(int length){
 		}
 		return bytes;
 	}
-	
+
 	protected int readByte(){
 		try {
 			return this.stream.read();
@@ -279,7 +279,7 @@ protected int readByte(){
 		}
 		return 0;
 	}
-	
+
 	protected int readShort(){
 		try {
 			byte[] b = new byte[2];
@@ -290,13 +290,13 @@ protected int readShort(){
 		}
 		return 0;
 	}
-	
+
 	protected void skip(int count){
 		for(int i = 0; i < count; i++){
 			readByte();
 		}
 	}
-	
+
 	protected void close(){
 		try {
 			this.stream.close();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEPluginImporter.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TEPluginImporter.java
similarity index 90%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEPluginImporter.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TEPluginImporter.java
index d37d8e49..2c058efa 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TEPluginImporter.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TEPluginImporter.java
@@ -4,23 +4,28 @@
 import org.herac.tuxguitar.io.base.TGRawImporter;
 
 public class TEPluginImporter extends TGImporterPlugin{
-	
+
+	@Override
 	protected TGRawImporter getImporter() {
 		return new TESongImporter();
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "TEF file format importer";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "TEF file format importer";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TESongImporter.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TESongImporter.java
similarity index 95%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TESongImporter.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TESongImporter.java
index c29eddc0..4f118a08 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/TESongImporter.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/TESongImporter.java
@@ -20,6 +20,7 @@
 import org.herac.tuxguitar.song.models.TGBeat;
 import org.herac.tuxguitar.song.models.TGChannel;
 import org.herac.tuxguitar.song.models.TGChord;
+import org.herac.tuxguitar.song.models.TGDivisionType;
 import org.herac.tuxguitar.song.models.TGDuration;
 import org.herac.tuxguitar.song.models.TGMeasure;
 import org.herac.tuxguitar.song.models.TGMeasureHeader;
@@ -28,10 +29,9 @@
 import org.herac.tuxguitar.song.models.TGString;
 import org.herac.tuxguitar.song.models.TGTimeSignature;
 import org.herac.tuxguitar.song.models.TGTrack;
-import org.herac.tuxguitar.song.models.TGDivisionType;
 
 public class TESongImporter implements TGLocalFileImporter{
-	
+
 	private static final int[][] PERCUSSION_TUNINGS = new int[][]{
 		new int[]{ 49, 41, 32 },
 		new int[]{ 49, 51, 42, 50 },
@@ -39,31 +39,36 @@ public class TESongImporter implements TGLocalFileImporter{
 		new int[]{ 49, 51, 42, 50, 45, 37 },
 		new int[]{ 49, 51, 42, 50, 45, 37, 41 },
 	};
-	
+
 	protected TGSongManager manager;
 	protected InputStream stream;
-	
+
 	public TESongImporter(){
 		super();
 	}
-	
+
+	@Override
 	public TGFileFormat getFileFormat() {
 		return new TGFileFormat("Tef","*.tef");
 	}
-	
+
+	@Override
 	public String getImportName() {
 		return "Tef";
 	}
-	
+
+	@Override
 	public boolean configure(boolean setDefaults){
 		return true;
 	}
-	
+
+	@Override
 	public void init(TGFactory factory,InputStream stream) {
 		this.manager = new TGSongManager(factory);
 		this.stream = stream;
 	}
-	
+
+	@Override
 	public TGSong importSong() throws TGFileFormatException {
 		try {
 			if( this.manager != null && this.stream != null ){
@@ -74,21 +79,21 @@ public TGSong importSong() throws TGFileFormatException {
 		}
 		throw new TGFileFormatException();
 	}
-	
+
 	private TGSong parseSong(TESong song){
 		this.sortComponents(song);
 		this.newTGSong(song.getTracks().length,song.getMeasures(),song.getTempo().getValue());
 		this.addMeasureValues(song);
 		this.addTrackValues(song.getTracks());
 		this.addComponents(song);
-		
+
 		return new TGSongAdjuster(this.manager).process();
 	}
-	
+
 	private void newTGSong(int tracks,int measures,int tempo){
 		this.manager.setSong(this.manager.newSong());
 		this.manager.getFirstMeasureHeader().getTempo().setValue(tempo);
-		
+
 		while(this.manager.getSong().countTracks() < tracks){
 			this.manager.addTrack();
 		}
@@ -96,7 +101,7 @@ private void newTGSong(int tracks,int measures,int tempo){
 			this.manager.addNewMeasureBeforeEnd();
 		}
 	}
-	
+
 	private void addMeasureValues(TESong song){
 		TGTimeSignature timeSignature = this.manager.getFactory().newTimeSignature();
 		for(int i = 0; i < this.manager.getSong().countMeasureHeaders(); i ++){
@@ -107,11 +112,11 @@ private void addMeasureValues(TESong song){
 			this.manager.changeTimeSignature(header, timeSignature,false);
 		}
 	}
-	
+
 	private void addTrackValues(TETrack[] tracks){
 		for(int i = 0; i < tracks.length; i ++){
 			TGTrack track = this.manager.getSong().getTrack(i);
-			
+
 			TGChannel tgChannel = this.manager.addChannel();
 			tgChannel.setVolume((short)((  (15 - tracks[i].getVolume()) * 127) / 15));
 			tgChannel.setBalance((short)(( tracks[i].getPan() * 127) / 15));
@@ -120,10 +125,10 @@ private void addTrackValues(TETrack[] tracks){
 				TGChannel.setPercussionChannel(tgChannel);
 			}
 			track.setChannelId(tgChannel.getChannelId());
-			
+
 			track.getStrings().clear();
 			int strings[] = tracks[i].getStrings();
-			
+
 			for(int j = 0; j < strings.length;j ++){
 				if(j >= 7){
 					break;
@@ -135,12 +140,12 @@ private void addTrackValues(TETrack[] tracks){
 			}
 		}
 	}
-	
+
 	private void addComponents(TESong song){
-		Iterator it = song.getComponents().iterator();
+		Iterator<TEComponent> it = song.getComponents().iterator();
 		while(it.hasNext()){
-			TEComponent component = (TEComponent)it.next();
-			
+			TEComponent component = it.next();
+
 			if(component.getMeasure() >= 0 && component.getMeasure() < this.manager.getSong().countMeasureHeaders()){
 				int offset = 0;
 				TETrack[] tracks = song.getTracks();
@@ -162,7 +167,7 @@ else if(component instanceof TEComponentChord){
 			}
 		}
 	}
-	
+
 	private TGBeat getBeat(TGMeasure measure, long start){
 		TGBeat beat = this.manager.getMeasureManager().getBeat(measure, start);
 		if(beat == null){
@@ -172,20 +177,20 @@ private TGBeat getBeat(TGMeasure measure, long start){
 		}
 		return beat;
 	}
-	
+
 	private long getStart(TGDuration duration, TGMeasure measure,int position){
 		float fixedPosition = position;
 		if(duration != null && !duration.getDivision().isEqual(TGDivisionType.NORMAL)){
 			fixedPosition = (( fixedPosition - (fixedPosition % 64)) + ((((fixedPosition % 64) * 2) * 2) / 3) );
 		}
 		long start = ((long) (measure.getStart() + ( (fixedPosition * TGDuration.QUARTER_TIME)  / 64)) );
-		
+
 		return start;
 	}
-	
+
 	private TGDuration getDuration(int duration){
 		TGDuration tgDuration = this.manager.getFactory().newDuration();
-		
+
 		int value = TGDuration.WHOLE;
 		for(int i = 0; i <  ( duration / 3); i ++){
 			value = (value * 2);
@@ -199,10 +204,10 @@ else if( (duration % 3) == 2){
 			tgDuration.getDivision().setTimes(2);
 		}
 		tgDuration.setValue(value);
-		
+
 		return tgDuration;
 	}
-	
+
 	private void addNote(TETrack track,TEComponentNote note,int string,int strings,TGMeasure tgMeasure){
 		int value = note.getFret();
 		if(track.isPercussion() ){
@@ -211,22 +216,22 @@ private void addNote(TETrack track,TEComponentNote note,int string,int strings,T
 				value += PERCUSSION_TUNINGS[tuning][string];
 			}
 		}
-		
+
 		TGNote tgNote = this.manager.getFactory().newNote();
 		tgNote.setString( string + 1 );
 		tgNote.setValue( value );
-		
+
 		TGDuration tgDuration = getDuration( note.getDuration() );
 		TGBeat tgBeat = getBeat(tgMeasure, getStart(tgDuration, tgMeasure, note.getPosition()));
 		tgDuration.copy(tgBeat.getVoice(0).getDuration());
 		tgBeat.getVoice(0).addNote(tgNote);
 	}
-	
+
 	private void addChord(TEChord[] chords,TEComponentChord component,TGTrack tgTrack,TGMeasure tgMeasure){
 		if(component.getChord() >= 0 && component.getChord() < chords.length){
 			TEChord chord = chords[component.getChord()];
 			byte[] strings = chord.getStrings();
-			
+
 			TGChord tgChord = this.manager.getFactory().newChord(tgTrack.stringCount());
 			tgChord.setName(chord.getName());
 			for(int i = 0; i < tgChord.countStrings(); i ++){
@@ -239,14 +244,15 @@ private void addChord(TEChord[] chords,TEComponentChord component,TGTrack tgTrac
 			}
 		}
 	}
-	
+
 	public void sortComponents(TESong song){
-		Collections.sort(song.getComponents(),new Comparator() {
+		Collections.sort(song.getComponents(),new Comparator<Object>() {
+			@Override
 			public int compare(Object o1, Object o2) {
 				if(o1 instanceof TEComponent && o2 instanceof TEComponent){
 					TEComponent c1 = (TEComponent)o1;
 					TEComponent c2 = (TEComponent)o2;
-					
+
 					if ( c1.getMeasure() < c2.getMeasure() ){
 						return -1;
 					}
@@ -273,35 +279,35 @@ public int compare(Object o1, Object o2) {
 }
 
 class TGSongAdjuster{
-	
+
 	protected TGSongManager manager;
-	
+
 	public TGSongAdjuster(TGSongManager manager){
 		this.manager = manager;
 	}
-	
+
 	public TGSong process(){
-		Iterator tracks = this.manager.getSong().getTracks();
+		Iterator<TGTrack> tracks = this.manager.getSong().getTracks();
 		while(tracks.hasNext()){
-			TGTrack track = (TGTrack)tracks.next();
-			Iterator measures = track.getMeasures();
+			TGTrack track = tracks.next();
+			Iterator<TGMeasure> measures = track.getMeasures();
 			while(measures.hasNext()){
-				TGMeasure measure = (TGMeasure)measures.next();
+				TGMeasure measure = measures.next();
 				this.process(measure);
 			}
 		}
 		return this.manager.getSong();
 	}
-	
+
 	public void process(TGMeasure measure){
 		this.manager.getMeasureManager().orderBeats(measure);
 		this.adjustBeats(measure);
 	}
-	
+
 	public void adjustBeats(TGMeasure measure){
 		TGBeat previous = null;
 		boolean finish = true;
-		
+
 		long measureStart = measure.getStart();
 		long measureEnd = (measureStart + measure.getLength());
 		for(int i = 0;i < measure.countBeats();i++){
@@ -311,7 +317,7 @@ public void adjustBeats(TGMeasure measure){
 			if(previous != null){
 				long previousStart = previous.getStart();
 				long previousLength = previous.getVoice(0).getDuration().getTime();
-				
+
 				// check for a chord in a rest beat
 				if( beat.getVoice(0).isRestVoice() && beat.isChordBeat() ){
 					TGBeat candidate = null;
@@ -332,7 +338,7 @@ public void adjustBeats(TGMeasure measure){
 					finish = false;
 					break;
 				}
-				
+
 				// check the duration
 				if(previousStart < beatStart && (previousStart + previousLength) > beatStart){
 					if(beat.getVoice(0).isRestVoice()){
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEChord.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEChord.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEChord.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEChord.java
index fe27eaf6..351389f7 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEChord.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEChord.java
@@ -1,23 +1,24 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TEChord {
-	
+
 	private byte[] strings;
 	private String name;
-	
+
 	public TEChord(byte[] strings,String name){
 		this.strings = strings;
 		this.name = name;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public byte[] getStrings() {
 		return this.strings;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[CHORD]");
 		string += "\n     Name:       " + getName();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponent.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponent.java
similarity index 96%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponent.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponent.java
index 3e3a6254..b6d9973d 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponent.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponent.java
@@ -1,27 +1,27 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public abstract class TEComponent {
-	
+
 	private int position;
-	
+
 	private int measure;
-	
+
 	private int string;
-	
+
 	public TEComponent(int position,int measure, int string) {
 		this.position = position;
 		this.measure = measure;
 		this.string = string;
 	}
-	
+
 	public int getPosition() {
 		return this.position;
 	}
-	
+
 	public int getMeasure() {
 		return this.measure;
 	}
-	
+
 	public int getString() {
 		return this.string;
 	}
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponentChord.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponentChord.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponentChord.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponentChord.java
index 65fc5b28..fcb1d840 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponentChord.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponentChord.java
@@ -1,18 +1,19 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TEComponentChord extends TEComponent{
-	
+
 	private int chord;
-	
+
 	public TEComponentChord(int position,int measure, int string, int chord) {
 		super(position, measure, string);
 		this.chord = chord;
 	}
-	
+
 	public int getChord() {
 		return this.chord;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[NOTE]");
 		string += "\n     Measure:   " + getMeasure();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponentNote.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponentNote.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponentNote.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponentNote.java
index d13d6568..76c9d12e 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEComponentNote.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEComponentNote.java
@@ -1,15 +1,15 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TEComponentNote extends TEComponent{
-	
+
 	private int fret;
-	
+
 	private int duration;
-	
+
 	private int dynamic;
-	
+
 	private int effect;
-	
+
 	public TEComponentNote(int position,int measure, int string, int fret, int duration, int dynamic, int effect) {
 		super(position, measure, string);
 		this.fret = fret;
@@ -17,30 +17,31 @@ public TEComponentNote(int position,int measure, int string, int fret, int durat
 		this.dynamic = dynamic;
 		this.effect = effect;
 	}
-	
+
 	public int getDuration() {
 		return this.duration;
 	}
-	
+
 	public int getDynamic() {
 		return this.dynamic;
 	}
-	
+
 	public int getEffect() {
 		return this.effect;
 	}
-	
+
 	public int getFret() {
 		return this.fret;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[NOTE]");
 		string += "\n     Measure:   " + getMeasure();
 		string += "\n     Position:  " + getPosition();
 		string += "\n     String:    " + getString();
 		string += "\n     Fret:      " + getFret();
-		
+
 		return string;
 	}
 }
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEInfo.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEInfo.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEInfo.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEInfo.java
index 0c251bb0..d1bcc0b3 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEInfo.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEInfo.java
@@ -1,41 +1,42 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TEInfo {
-	
+
 	private String title;
-	
+
 	private String subtitle;
-	
+
 	private String comments;
-	
+
 	private String notes;
-	
+
 	public TEInfo(String title, String subtitle, String comments) {
 		this.title = title;
 		this.subtitle = subtitle;
 		this.comments = comments;
 	}
-	
+
 	public String getComments() {
 		return this.comments;
 	}
-	
+
 	public String getSubtitle() {
 		return this.subtitle;
 	}
-	
+
 	public String getTitle() {
 		return this.title;
 	}
-	
+
 	public String getNotes() {
 		return this.notes;
 	}
-	
+
 	public void setNotes(String notes) {
 		this.notes = notes;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[INFO]");
 		string += "\n     Title:       " + getTitle();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEPercussion.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEPercussion.java
similarity index 96%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEPercussion.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEPercussion.java
index 4bb720e7..9d79c35e 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEPercussion.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEPercussion.java
@@ -1,23 +1,24 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TEPercussion {
-	
+
 	private String name;
 	private int volume;
-	
+
 	public TEPercussion(String name, int volume) {
 		this.name = name;
 		this.volume = volume;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public int getVolume() {
 		return this.volume;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[PERCUSSION]");
 		string += "\n     Name:       " + getName();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TERepeat.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TERepeat.java
similarity index 96%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TERepeat.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TERepeat.java
index a7b26839..7e183098 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TERepeat.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TERepeat.java
@@ -1,24 +1,25 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TERepeat {
-	
+
 	private int data1;
-	
+
 	private int data2;
-	
+
 	public TERepeat(int data1,int data2){
 		this.data1 = data1;
 		this.data2 = data2;
 	}
-	
+
 	public int getData1() {
 		return this.data1;
 	}
-	
+
 	public int getData2() {
 		return this.data2;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[REPEAT]     ");
 		string += (this.getData1() + "-" + this.getData2());
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TERhythm.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TERhythm.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TERhythm.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TERhythm.java
index 987dbd8e..69d35dd5 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TERhythm.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TERhythm.java
@@ -1,29 +1,30 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TERhythm {
-	
+
 	private String name;
 	private int volume;
 	private int instrument;
-	
+
 	public TERhythm(String name, int volume, int instrument) {
 		this.name = name;
 		this.volume = volume;
 		this.instrument = instrument;
 	}
-	
+
 	public int getInstrument() {
 		return this.instrument;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public int getVolume() {
 		return this.volume;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[RHYTHM]     ");
 		string += "\n     Name:       " + getName();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TESong.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TESong.java
similarity index 90%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TESong.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TESong.java
index 3e70dd6d..dd16b0a1 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TESong.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TESong.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 public class TESong {
-	
+
 	private int strings;
 	private int measures;
 	private TEInfo info;
@@ -17,145 +17,146 @@ public class TESong {
 	private TEPercussion[] percussions;
 	private TERhythm[] rhythms;
 	private TETrack[] tracks;
-	private List components;
-	private List tsChanges;
-	
+	private final List<TEComponent> components;
+	private final List<TETimeSignatureChange> tsChanges;
+
 	public TESong(){
-		this.components = new ArrayList();
-		this.tsChanges = new ArrayList();
+		this.components = new ArrayList<TEComponent>();
+		this.tsChanges = new ArrayList<TETimeSignatureChange>();
 	}
-	
+
 	public TERhythm[] getRhythms() {
 		return this.rhythms;
 	}
-	
+
 	public void setRhythms(int length) {
 		this.rhythms = new TERhythm[length];
 	}
-	
+
 	public void setRhythm(int index,TERhythm rhythm) {
 		this.rhythms[index] = rhythm;
 	}
-	
+
 	public TEPercussion[] getPercussions() {
 		return this.percussions;
 	}
-	
+
 	public void setPercussions(int length) {
 		this.percussions = new TEPercussion[length];
 	}
-	
+
 	public void setPercussion(int index,TEPercussion percussions) {
 		this.percussions[index] = percussions;
 	}
-	
+
 	public TEChord[] getChords() {
 		return this.chords;
 	}
-	
+
 	public void setChords(int length) {
 		this.chords = new TEChord[length];
 	}
-	
+
 	public void setChord(int index,TEChord chord) {
 		this.chords[index] = chord;
 	}
-	
+
 	public TEInfo getInfo() {
 		return this.info;
 	}
-	
+
 	public void setInfo(TEInfo info) {
 		this.info = info;
 	}
-	
+
 	public TERepeat[] getRepeats() {
 		return this.repeats;
 	}
-	
+
 	public void setRepeats(int length) {
 		this.repeats = new TERepeat[length];
 	}
-	
+
 	public void setRepeat(int index,TERepeat repeat) {
 		this.repeats[index] = repeat;
 	}
-	
+
 	public TEText[] getTexts() {
 		return this.texts;
 	}
-	
+
 	public void setTexts(int length) {
 		this.texts = new TEText[length];
 	}
-	
+
 	public void setText(int index,TEText text) {
 		this.texts[index] = text;
 	}
-	
+
 	public TETrack[] getTracks() {
 		return this.tracks;
 	}
-	
+
 	public void setTracks(int length) {
 		this.tracks = new TETrack[length];
 	}
-	
+
 	public void setTrack(int index,TETrack track) {
 		this.tracks[index] = track;
 	}
-	
+
 	public TETimeSignature getTimeSignature() {
 		return this.timeSignature;
 	}
-	
+
 	public void setTimeSignature(TETimeSignature timeSignature) {
 		this.timeSignature = timeSignature;
 	}
-	
+
 	public TETempo getTempo() {
 		return this.tempo;
 	}
-	
+
 	public void setTempo(TETempo tempo) {
 		this.tempo = tempo;
 	}
-	
+
 	public int getStrings() {
 		return this.strings;
 	}
-	
+
 	public void setStrings(int strings) {
 		this.strings = strings;
 	}
-	
+
 	public int getMeasures() {
 		return this.measures;
 	}
-	
+
 	public void setMeasures(int measures) {
 		this.measures = measures;
 	}
-	
-	public List getComponents() {
+
+	public List<TEComponent> getComponents() {
 		return this.components;
 	}
-	
+
 	public void addTimeSignatureChange(TETimeSignatureChange tsChange){
 		this.tsChanges.add(tsChange);
 	}
-	
+
 	public TETimeSignature getTimeSignature(int measure){
-		Iterator it = this.tsChanges.iterator();
+		Iterator<TETimeSignatureChange> it = this.tsChanges.iterator();
 		while(it.hasNext()){
-			TETimeSignatureChange change = (TETimeSignatureChange)it.next();
+			TETimeSignatureChange change = it.next();
 			if(change.getMeasure() == measure){
 				return change.getTimeSignature();
 			}
 		}
 		return getTimeSignature();
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[SONG] *** Tabledit file format ***\n");
 		string +=  (this.getInfo().toString() + "\n");
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETempo.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETempo.java
similarity index 95%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETempo.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETempo.java
index 5cca24da..29762705 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETempo.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETempo.java
@@ -1,17 +1,18 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TETempo {
-	
+
 	private int value;
-	
+
 	public TETempo(int value){
 		this.value = value;
 	}
-	
+
 	public int getValue() {
 		return this.value;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TEMPO]");
 		string += "\n     Value:       " + getValue();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEText.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEText.java
similarity index 95%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEText.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEText.java
index b1c13d6c..4bbe2efb 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TEText.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TEText.java
@@ -1,17 +1,18 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TEText {
-	
+
 	private String value;
-	
+
 	public TEText(String value){
 		this.value = value;
 	}
-	
+
 	public String getValue() {
 		return this.value;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TEXT]");
 		string += "\n     Value:       " + getValue();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETimeSignature.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETimeSignature.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETimeSignature.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETimeSignature.java
index 8fc6178e..8ec2943a 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETimeSignature.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETimeSignature.java
@@ -1,19 +1,19 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TETimeSignature {
-	
+
 	private int numerator;
 	private int denominator;
-	
+
 	public TETimeSignature(int numerator, int denominator) {
 		this.numerator = numerator;
 		this.denominator = denominator;
 	}
-	
+
 	public int getDenominator() {
 		return this.denominator;
 	}
-	
+
 	public int getNumerator() {
 		return this.numerator;
 	}
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETimeSignatureChange.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETimeSignatureChange.java
similarity index 97%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETimeSignatureChange.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETimeSignatureChange.java
index c9526c0b..e746a633 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETimeSignatureChange.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETimeSignatureChange.java
@@ -1,23 +1,24 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TETimeSignatureChange{
-	
+
 	private int measure;
 	private TETimeSignature timeSignature;
-	
+
 	public TETimeSignatureChange(int measure, TETimeSignature timeSignature) {
 		this.measure = measure;
 		this.timeSignature = timeSignature;
 	}
-	
+
 	public int getMeasure(){
 		return this.measure;
 	}
-	
+
 	public TETimeSignature getTimeSignature() {
 		return this.timeSignature;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TIME SIGNATURE CHANGE]");
 		string += "\n     Measure:     " + getMeasure();
diff --git a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETrack.java b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETrack.java
similarity index 96%
rename from TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETrack.java
rename to plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETrack.java
index 339eb9a2..74ef157f 100644
--- a/TuxGuitar-tef/src/org/herac/tuxguitar/io/tef/base/TETrack.java
+++ b/plugins/tef/src/main/java/org/herac/tuxguitar/io/tef/base/TETrack.java
@@ -1,37 +1,37 @@
 package org.herac.tuxguitar.io.tef.base;
 
 public class TETrack {
-	
+
 	public static final int FLAG_DOUBLE_STRINGS = 0x01;
-	
+
 	public static final int FLAG_LET_RING = 0x02;
-	
+
 	public static final int FLAG_PEDAL_STEEL_GUITAR = 0x04;
-	
+
 	public static final int FLAG_EFFECT_CHANNEL_DISABLED = 0x08;
-	
+
 	public static final int FLAG_RHYTHM_TRACK = 0x10;
-	
+
 	private boolean percussion;
-	
+
 	private int instrument;
-	
+
 	private int capo;
-	
+
 	private int clefType;
-	
+
 	private int clefNumber;
-	
+
 	private int pan;
-	
+
 	private int volume;
-	
+
 	private int flags;
-	
+
 	private int[] strings;
-	
+
 	private String name;
-	
+
 	public TETrack(boolean percussion,int instrument, int capo, int clefType, int clefNumber, int pan, int volume, int flags, int[] strings, String name) {
 		this.percussion = percussion;
 		this.instrument = instrument;
@@ -44,55 +44,56 @@ public TETrack(boolean percussion,int instrument, int capo, int clefType, int cl
 		this.strings = strings;
 		this.name = name;
 	}
-	
+
 	public int getCapo() {
 		return this.capo;
 	}
-	
+
 	public int getClefNumber() {
 		return this.clefNumber;
 	}
-	
+
 	public int getClefType() {
 		return this.clefType;
 	}
-	
+
 	public int getFlags() {
 		return this.flags;
 	}
-	
+
 	public String getName() {
 		return this.name;
 	}
-	
+
 	public int getPan() {
 		return this.pan;
 	}
-	
+
 	public boolean isPercussion() {
 		return this.percussion;
 	}
-	
+
 	public int[] getStrings() {
 		return this.strings;
 	}
-	
+
 	public int getVolume() {
 		return this.volume;
 	}
-	
+
 	public int getInstrument() {
 		return this.instrument;
 	}
-	
+
+	@Override
 	public String toString(){
 		String string = new String("[TRACK]");
 		string += "\n     "  + this.getName();
-		
+
 		for(int i = 0; i < this.strings.length; i ++){
 			string += "\n     String " + i + ": " + (96 - this.strings[i]);
 		}
-		
+
 		return string;
 	}
 }
diff --git a/TuxGuitar-tef/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/tef/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-tef/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/tef/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/tray/pom.xml b/plugins/tray/pom.xml
new file mode 100644
index 00000000..1c62cdae
--- /dev/null
+++ b/plugins/tray/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-tray</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Tray</name>
+	<description>Tray plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTray.java b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTray.java
similarity index 97%
rename from TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTray.java
rename to plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTray.java
index cfc44ee6..ba9e504f 100644
--- a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTray.java
+++ b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTray.java
@@ -12,13 +12,13 @@
 import org.herac.tuxguitar.app.system.language.LanguageLoader;
 
 public class TGTray implements IconLoader,LanguageLoader{
-	
+
 	private boolean visible;
 	private Display display;
 	private Tray tray;
 	private TGTrayIcon icon;
 	private TGTrayMenu menu;
-	
+
 	public TGTray(){
 		this.display = TuxGuitar.instance().getDisplay();
 		this.tray = this.display.getSystemTray();
@@ -27,7 +27,7 @@ public TGTray(){
 		TuxGuitar.instance().getIconManager().addLoader(this);
 		TuxGuitar.instance().getLanguageManager().addLoader(this);
 	}
-	
+
 	public void removeTray(){
 		if (this.tray != null) {
 			setVisible(true);
@@ -38,7 +38,7 @@ public void removeTray(){
 			this.menu.dispose();
 		}
 	}
-	
+
 	public void addTray() {
 		if (this.tray != null) {
 			this.menu.make();
@@ -46,11 +46,13 @@ public void addTray() {
 			TrayItem item = new TrayItem (this.tray, SWT.NONE);
 			item.setToolTipText(TuxGuitar.APPLICATION_NAME);
 			item.addListener (SWT.Selection, new Listener () {
+				@Override
 				public void handleEvent (Event event) {
 					setVisible();
 				}
 			});
 			item.addListener (SWT.MenuDetect, new Listener () {
+				@Override
 				public void handleEvent (Event event) {
 					showMenu();
 				}
@@ -59,20 +61,22 @@ public void handleEvent (Event event) {
 			this.loadIcons();
 		}
 	}
-	
+
+	@Override
 	public void loadIcons() {
 		this.icon.loadImage();
 		this.menu.loadIcons();
 	}
-	
+
+	@Override
 	public void loadProperties(){
 		this.menu.loadProperties();
 	}
-	
+
 	protected void setVisible(){
 		this.setVisible(!this.visible);
 	}
-	
+
 	protected void setVisible(boolean visible){
 		if (this.tray != null) {
 			Shell shells[] = this.display.getShells();
@@ -82,7 +86,7 @@ protected void setVisible(boolean visible){
 			this.visible = visible;
 		}
 	}
-	
+
 	protected void showMenu(){
 		this.menu.show();
 	}
diff --git a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayIcon.java b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayIcon.java
similarity index 98%
rename from TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayIcon.java
rename to plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayIcon.java
index cba7d2d9..2be32678 100644
--- a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayIcon.java
+++ b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayIcon.java
@@ -4,17 +4,17 @@
 import org.herac.tuxguitar.app.TuxGuitar;
 
 public class TGTrayIcon {
-	
+
 	private TrayItem item;
-	
+
 	public TGTrayIcon(){
 		super();
 	}
-	
+
 	public void setItem(TrayItem item){
 		this.item = item;
 	}
-	
+
 	public void loadImage(){
 		if( this.item != null && !this.item.isDisposed() ){
 			this.item.setImage(TuxGuitar.instance().getIconManager().getAppIcon24());
diff --git a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayMenu.java b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayMenu.java
similarity index 98%
rename from TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayMenu.java
rename to plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayMenu.java
index 6d5b9c19..65e510ec 100644
--- a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayMenu.java
+++ b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayMenu.java
@@ -9,31 +9,31 @@
 import org.herac.tuxguitar.app.actions.transport.TransportStopAction;
 
 public class TGTrayMenu {
-	
+
 	private Menu menu;
 	private MenuItem play;
 	private MenuItem stop;
 	private MenuItem exit;
-	
+
 	public void make(){
 		this.menu = new Menu (TuxGuitar.instance().getShell(), SWT.POP_UP);
-		
+
 		this.play = new MenuItem(this.menu,SWT.PUSH);
 		this.play.addSelectionListener(TuxGuitar.instance().getAction(TransportPlayAction.NAME));
-		
+
 		this.stop = new MenuItem(this.menu, SWT.PUSH);
 		this.stop.addSelectionListener(TuxGuitar.instance().getAction(TransportStopAction.NAME));
-		
+
 		//--SEPARATOR--
 		new MenuItem(this.menu, SWT.SEPARATOR);
-		
+
 		this.exit = new MenuItem(this.menu, SWT.PUSH);
 		this.exit.addSelectionListener(TuxGuitar.instance().getAction(ExitAction.NAME));
-		
+
 		this.loadProperties();
 		this.loadIcons();
 	}
-	
+
 	public void loadProperties(){
 		if(this.menu != null && !this.menu.isDisposed()){
 			this.play.setText(TuxGuitar.getProperty("transport.start"));
@@ -41,24 +41,24 @@ public void loadProperties(){
 			this.exit.setText(TuxGuitar.getProperty("file.exit"));
 		}
 	}
-	
+
 	public void loadIcons(){
 		if(this.menu != null && !this.menu.isDisposed()){
 			this.stop.setImage(TuxGuitar.instance().getIconManager().getTransportIconStop1());
 			this.play.setImage(TuxGuitar.instance().getIconManager().getTransportIconPlay1());
 		}
 	}
-	
+
 	public void show(){
 		if(this.menu != null && !this.menu.isDisposed()){
 			this.menu.setVisible(true);
 		}
 	}
-	
+
 	public void dispose(){
 		if(this.menu != null && !this.menu.isDisposed()){
 			this.menu.dispose();
 		}
 	}
-	
+
 }
diff --git a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayPlugin.java b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayPlugin.java
similarity index 91%
rename from TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayPlugin.java
rename to plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayPlugin.java
index 5dfdb27c..7539a467 100644
--- a/TuxGuitar-tray/src/org/herac/tuxguitar/tray/TGTrayPlugin.java
+++ b/plugins/tray/src/main/java/org/herac/tuxguitar/tray/TGTrayPlugin.java
@@ -3,22 +3,25 @@
 import org.herac.tuxguitar.app.system.plugins.base.TGPluginAdapter;
 
 public class TGTrayPlugin extends TGPluginAdapter {
-	
+
 	private boolean loaded;
 	private TGTray tray;
-	
+
 	public TGTrayPlugin(){
 		super();
 	}
-	
+
+	@Override
 	public void init() {
 		this.tray = new TGTray();
 	}
-	
+
+	@Override
 	public void close() {
 		this.removePlugin();
 	}
-	
+
+	@Override
 	public void setEnabled(boolean enabled) {
 		if(enabled){
 			this.addPlugin();
@@ -26,33 +29,37 @@ public void setEnabled(boolean enabled) {
 			this.removePlugin();
 		}
 	}
-	
+
 	protected void addPlugin(){
 		if(!this.loaded){
 			this.tray.addTray();
 			this.loaded = true;
 		}
 	}
-	
+
 	protected void removePlugin(){
 		if(this.loaded){
 			this.tray.removeTray();
 			this.loaded = false;
 		}
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Julian Casadesus <julian@casadesus.com.ar>";
 	}
-	
+
+	@Override
 	public String getName() {
 		return "System Tray plugin";
 	}
-	
+
+	@Override
 	public String getDescription() {
 		return "System Tray plugin for tuxguitar";
 	}
-	
+
+	@Override
 	public String getVersion() {
 		return "1.0";
 	}
diff --git a/TuxGuitar-tray/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/tray/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-tray/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/tray/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/tuner/pom.xml b/plugins/tuner/pom.xml
new file mode 100644
index 00000000..683a1720
--- /dev/null
+++ b/plugins/tuner/pom.xml
@@ -0,0 +1,36 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-tuner</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>jar</packaging>
+	<name>TuxGuitar :: Plugin :: Tuner</name>
+	<description>Tuner plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/TuxGuitar-tuner/src/craigl/spectrumanalyzer/FFT.java b/plugins/tuner/src/main/java/craigl/spectrumanalyzer/FFT.java
similarity index 95%
rename from TuxGuitar-tuner/src/craigl/spectrumanalyzer/FFT.java
rename to plugins/tuner/src/main/java/craigl/spectrumanalyzer/FFT.java
index a4c3d0c5..f2850501 100644
--- a/TuxGuitar-tuner/src/craigl/spectrumanalyzer/FFT.java
+++ b/plugins/tuner/src/main/java/craigl/spectrumanalyzer/FFT.java
@@ -24,7 +24,7 @@ public class FFT {
 	 */
 
 	private static final double TWOPI = 2.0 * Math.PI;
-	
+
 	// Limits on the number of bits this algorithm can utilize
 	private static final int LOG2_MAXFFTSIZE = 15;
 	private static final int MAXFFTSIZE = 1 << LOG2_MAXFFTSIZE;
@@ -78,7 +78,7 @@ public void doFFT(double [] xr, double [] xi, boolean invFlag) {
 					c = Math.cos(ang);
 					s = Math.sin(ang);
 					kn2 = k + n2;
-					
+
 					if (invFlag)
 						s = -s;
 
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTuner.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTuner.java
similarity index 96%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTuner.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTuner.java
index 31188b49..dc05c9bb 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTuner.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTuner.java
@@ -8,10 +8,10 @@
 
 /**
  * @author Nikola Kolarovic <nikola.kolarovic at gmail.com>
- * 
- * 
+ *
+ *
  * Having great help analizyng project:
- * 
+ *
  * GuitarTuner developed by OpenStudio
  * www.openstudio.fr
  * Copyright (2005) Arnault Pachot.
@@ -25,18 +25,18 @@ public class TGTuner extends Thread {
 	protected TGTunerSettings settings;
 	protected TargetDataLine dataLine;
 	protected TGTunerQueue queue;
-	
+
 	//static final int LOG2_FFTSIZE = 14;
-	//protected int FFT_SIZE; 
+	//protected int FFT_SIZE;
 	protected FFT fft;
 	protected double[] ar;
 	protected double[] ai;
 	protected byte[] data;
 	protected double rate;
-	
+
 	protected double maximumFrequency;
 	protected double minimumFrequency;
-	
+
 	TGTuner(TGTunerListener mainWindow) {
 		this.mainWindow = mainWindow;
 		this.canceled = false;
@@ -50,17 +50,18 @@ public class TGTuner extends Thread {
 		}
 
 		this.setWantedRange();
-		
+
 	}
 
 
+	@Override
 	public void run() {
-		
+
 		// TODO: remove this benchmark
 		int cycles=0;
 		long timePassed=0;
-		
-		
+
+
 		if (this.dataLine!=null) {
 			this.openDataLine();
 		}
@@ -69,70 +70,70 @@ public void run() {
 		  if (this.dataLine!=null)
 			if (!this.paused && this.dataLine.isOpen()) {
 				 synchronized(this) {
-				
+
 					// read from the input
 					this.dataLine.read(this.data,0,this.settings.getBufferSize());
-					
+
 					// preapare the arrays for FFT
 					for (int i=0; i<this.settings.getBufferSize(); i++) {
 						this.ar[i] = this.data[i]; // implicit cast to double
 						this.ai[i] = 0.0f;
 					}
-					
-					// when buffer size is smaller than FFT_SIZE 
+
+					// when buffer size is smaller than FFT_SIZE
 					for (int i=this.settings.getBufferSize(); i<this.settings.getFFTSize(); i++) {
 						this.ar[i] = 0.0f;
 						this.ai[i] = 0.0f;
 					}
-					
+
 					/////////////////////////////////////////////////////////////
 					// TODO: look at the benchmark, uncoment the other one and comment the first one
 					cycles++;
 					long startTime = System.currentTimeMillis();
-					
+
 					if (this.fft!=null)
 						this.fft.doFFT(this.ar, this.ai, false);
 					//TGTuner.computeFFT(1, this.settings.getFFTSize(), this.ar, this.ai);
-					
+
 					timePassed+=System.currentTimeMillis()-startTime;
 					/////////////////////////////////////////////////////////////
-					
-					
+
+
 					// ------ determine the dominant frequency -------
 					double frequency = -1;
 					double maxAmplitude = this.settings.getTreshold(); // noise gate
-					
-					
+
+
 					// TODO: maybe to analyze only the data around the area of interest
 					// start has to be at least 1, because we want to skip the DC component!
-					
+
 					//for (int i=0; i<this.settings.getFFTSize(); i++) {
 					for (int i=(int)Math.round(this.minimumFrequency / this.rate); i < Math.round(this.maximumFrequency / this.rate); i++) {
 						double curFreq = i * this.rate;
 						// z = x*i + y*j  // power = |z| = sqrt(x^2 + y^2)
 						double power = Math.sqrt(Math.pow(this.ar[i], 2) + Math.pow(this.ai[i], 2));
-						
+
 						if (power > maxAmplitude) {
 							maxAmplitude = power;
 							frequency = curFreq;
 						}
-						
+
 					}
-					
+
 					//System.out.println("Max Amplitude: "+maxAmplitude);
-					
+
 					//** buffer the frequency
 					this.queue.add(frequency);
-					
+
 					// fire the frequency event on GUI
 					this.mainWindow.fireFrequency(this.queue.getFreqApproximation());
-					
+
 					// flush the dataline, so the new data is received
 					this.dataLine.flush();
-			
+
 				 }  // end of synchronized block
 			}
-		  
+
 			// sleep thread to get better app response
 		  	try {
 				Thread.sleep(this.settings.getWaitPeriod());
@@ -140,17 +141,17 @@ public void run() {
 				// do nothing?
 			}
 		}
-		
-		
+
+
 		this.closeDataLine();
 		System.out.println(" Average FFT time: "+(double)timePassed/(double)cycles);
-		
+
 	}
-	
-	
+
+
 	protected void computeFFTParams() {
 		if (this.settings!=null) {
-			
+
 			    int number = this.settings.getFFTSize(), log=0;
 				for (int i=0; i<20; i++) { // count log2
 					number/=2;
@@ -163,7 +164,7 @@ protected void computeFFTParams() {
 				this.data = new byte[this.settings.getBufferSize()]; // data buffer
 				this.ar = new double[this.settings.getFFTSize()]; // create real array for FFT
 				this.ai = new double[this.settings.getFFTSize()]; // create imaginary array for FFT
-				
+
 				// TODO: rate is maybe not the best /2 ?
 				this.rate = ((double) this.settings.getSampleRate()) / this.settings.getFFTSize();
 		}
@@ -175,7 +176,7 @@ public void setCanceled(boolean canceled) {
 
 	public void pause() {
 			this.paused = true;
-		
+
 	}
 
 	public void resumeFromPause() {
@@ -201,21 +202,21 @@ public void setSettings(TGTunerSettings settings) {
 	public TGTunerSettings getSettings() {
 			return this.settings;
 	}
-	
+
 	public void setWantedNote(int note) {
 		// TODO: maybe too restrictive? But eliminates fifths harmonics...
 		this.minimumFrequency = getNoteFrequency(note-3);
 		this.maximumFrequency = getNoteFrequency(note+3);
 	}
-	
+
 	public void setWantedRange() {
 		// TODO: maybe to restrict only to 1 or 2 octaves!!!!!!!!!
 		int[] tuning = this.mainWindow.getTuning();
 		this.maximumFrequency = getNoteFrequency(tuning[0]+3); // 3 frets higher that the thiniest string
 		this.minimumFrequency = getNoteFrequency(tuning[tuning.length-1]-3); // 3 frets lower that the thickest string
 	}
-	
-	
+
+
 	public void openDataLine() {
      if (this.dataLine!=null) {
    	  synchronized(this) {
@@ -231,7 +232,7 @@ public void openDataLine() {
 		}
 	  }
 	}
-	
+
 	public void closeDataLine() {
 	  synchronized(this) {
 		if (this.dataLine!=null) {
@@ -240,13 +241,13 @@ public void closeDataLine() {
 			}
 	  }
 	}
-	
+
 	public double getNoteFrequency(int midiNote) {
 		// A = 110Hz = MidiNote(45)
 		return 110 * Math.pow(2.0, (midiNote-45)/12.0 );
 	}
-	
-	
+
+
 	 public static void computeFFT(int sign, int n, double[] ar, double[] ai)
 	   {
 	      double scale = 2.0 / n;
@@ -293,11 +294,11 @@ public static void computeFFT(int sign, int n, double[] ar, double[] ai)
 	         mmax = istep;
 	      }
 	   }
-	
 
-	 
-	 
-	 
+
+
+
+
 	 static class TGTunerException extends Exception {
 
 		private static final long serialVersionUID = -1860514279319403845L;
@@ -305,8 +306,8 @@ static class TGTunerException extends Exception {
 		public TGTunerException(String string) {
 			super(string);
 		}
-		 
+
 	 }
 
-	
+
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerDialog.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerDialog.java
similarity index 91%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerDialog.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerDialog.java
index 29ed0869..0492cce0 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerDialog.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerDialog.java
@@ -13,8 +13,8 @@
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
 import org.herac.tuxguitar.app.TuxGuitar;
 import org.herac.tuxguitar.app.util.DialogUtils;
 import org.herac.tuxguitar.app.util.MessageDialog;
@@ -25,16 +25,16 @@
  *
  */
 public class TGTunerDialog implements TGTunerListener {
-	
+
 	private static final int SHELL_WIDTH = 400;
 	protected TGTuner tuner = null;
 	protected int[] tuning = null;
 	protected Label currentFrequency = null;
 	protected Shell dialog = null;
 	protected TGTunerRoughWidget roughTuner = null;
-	protected ArrayList allStringButtons = null;
+	protected ArrayList<TGTuningString> allStringButtons = null;
 	protected TGTunerFineWidget fineTuner = null;
-	
+
 	TGTunerDialog(int[] tuning) {
 		this.tuning = tuning;
 	}
@@ -48,20 +48,20 @@ public void show() {
 		this.dialog.setText(TuxGuitar.getProperty("tuner.instrument-tuner"));
 		this.dialog.setMinimumSize(SHELL_WIDTH,SWT.DEFAULT);
 		this.dialog.setSize(700, 400);
-		
-		Group group = new Group(this.dialog,SWT.SHADOW_ETCHED_IN);            
+
+		Group group = new Group(this.dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("tuner.tuner"));
-		
+
 		Composite specialComposite = new Composite(group,SWT.NONE);
 		specialComposite.setLayout(new GridLayout(2,false));
 		specialComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		this.allStringButtons = new ArrayList(this.tuning.length);
-		
+		this.allStringButtons = new ArrayList<TGTuningString>(this.tuning.length);
+
 		this.fineTuner = new TGTunerFineWidget(specialComposite);
-		
-		
+
+
 		Composite buttonsComposite = new Composite (specialComposite,SWT.NONE);
 		buttonsComposite.setLayout(new GridLayout(1,false));
 		buttonsComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
@@ -71,39 +71,42 @@ public void show() {
 		Composite tunComposite = new Composite(group,SWT.NONE);
 		tunComposite.setLayout(new GridLayout(1,false));
 		tunComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.currentFrequency = new Label(tunComposite,SWT.LEFT);
 		this.currentFrequency.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		this.roughTuner = new TGTunerRoughWidget(group);
-		
+
 		Composite btnComposite = new Composite(group,SWT.NONE);
 		btnComposite.setLayout(new GridLayout(2,false));
 		btnComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
         final Button buttonSettings = new Button(btnComposite, SWT.PUSH);
         buttonSettings.setText(TuxGuitar.getProperty("settings"));
         buttonSettings.setLayoutData(getGridData(80,25));
         buttonSettings.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
             	TGTunerDialog.this.getTuner().pause();
             	new TGTunerSettingsDialog(TGTunerDialog.this).show();
             }
         });
-        
+
         final Button buttonExit = new Button(btnComposite, SWT.PUSH);
         buttonExit.setText(TuxGuitar.getProperty("close"));
         buttonExit.setLayoutData(getGridData(80,25));
         buttonExit.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
             	TGTunerDialog.this.getTuner().setCanceled(true);
             	TGTunerDialog.this.dialog.dispose();
             }
         });
 
-        
+
         // if closed on [X], set this.tuner.setCanceled(true);
         this.dialog.addDisposeListener(new DisposeListener() {
+			@Override
 			public void widgetDisposed(DisposeEvent arg0) {
             	TGTunerDialog.this.getTuner().setCanceled(true);
             	TGTunerDialog.this.dialog.dispose();
@@ -115,7 +118,7 @@ public void widgetDisposed(DisposeEvent arg0) {
         // start the tuner thread
         this.tuner = new TGTuner(this);
         this.getTuner().start();
-        
+
 	}
 
 	static GridData getGridData(int minimumWidth, int minimumHeight){
@@ -125,12 +128,14 @@ static GridData getGridData(int minimumWidth, int minimumHeight){
 		return data;
 	}
 
-	
+
+	@Override
 	public void fireFrequency(final double freq) {
 		if (!this.dialog.isDisposed()) {
 			 try {
-				 TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {				
-					 public void run() {
+				 TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+					 @Override
+					public void run() {
 						if (!TGTunerDialog.this.dialog.isDisposed() && !TGTunerDialog.this.roughTuner.isDisposed()) {
 							TGTunerDialog.this.currentFrequency.setText(Math.floor(freq)+" Hz");
 							TGTunerDialog.this.roughTuner.setCurrentFrequency(freq);
@@ -145,19 +150,22 @@ public void run() {
 		}
 	}
 
-	
+
 	public TGTuner getTuner() {
 		return this.tuner;
 	}
-	
+
+	@Override
 	public int[] getTuning() {
 		return this.tuning;
 	}
 
 
+	@Override
 	public void fireException(final Exception ex) {
 		try {
 			TGSynchronizer.instance().addRunnable(new TGSynchronizer.TGRunnable() {
+				@Override
 				public void run() {
 					if (!TGTunerDialog.this.dialog.isDisposed())
 						MessageDialog.errorMessage(ex);
@@ -168,7 +176,8 @@ public void run() {
 		}
 	}
 
-	
+
+	@Override
 	public void fireCurrentString(final int string) {
 		this.tuner.pause();
 		if (string == 0) { // TODO: it never happens
@@ -181,25 +190,26 @@ public void fireCurrentString(final int string) {
 		}
 		this.tuner.resumeFromPause();
 	}
-	
-	
-	
+
+
+
 	protected void createTuningString(int midiNote, Composite parent) {
 		TGTuningString tempString = new TGTuningString(midiNote,parent,this);
 		this.allStringButtons.add(tempString);
 		tempString.getStringButton().addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				// disable all others
 				TGTunerDialog.this.fineTuner.setCurrentFrequency(-1);
-				Iterator it = TGTunerDialog.this.allStringButtons.iterator();
+				Iterator<TGTuningString> it = TGTunerDialog.this.allStringButtons.iterator();
 				while (it.hasNext()) {
-					TGTuningString tmp = (TGTuningString)it.next();
+					TGTuningString tmp = it.next();
 					tmp.getStringButton().setSelection(false);
 				}
 			}
 		});
 		tempString.addListener();
-		
+
 	}
-	
+
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerFineWidget.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerFineWidget.java
similarity index 98%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerFineWidget.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerFineWidget.java
index a27a04e7..1eee35d7 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerFineWidget.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerFineWidget.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.app.tools.custom.tuner;
 
@@ -26,7 +26,7 @@ public class TGTunerFineWidget extends Composite {
 	private static final int MIN_HEIGHT = 60;
 	private static final int MIN_WIDTH = 80;
 	private final float bottomY = 10.0f;
-	
+
 	private Composite composite = null;
 	protected String currentNoteString = null;
 	protected int currentNoteValue = -1;
@@ -43,17 +43,18 @@ public TGTunerFineWidget(Composite parent) {
 	protected void init() {
 		this.setLayout(new GridLayout(1,true));
 		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		
-		
+
+
 		this.composite = new Composite(this,SWT.BORDER | SWT.DOUBLE_BUFFERED);
 		this.composite.setBackground(this.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.composite.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				TGTunerFineWidget.this.paintWidget(painter);
 			}
 		});
-		
+
 		GridData data = new GridData(SWT.FILL,SWT.FILL,true,true);
 		data.minimumHeight = MIN_HEIGHT;
 		data.minimumWidth = MIN_WIDTH;
@@ -67,13 +68,13 @@ public void paintControl(PaintEvent e) {
 							);
 
 	}
-	
-	
+
+
 	public void paintWidget(TGPainterImpl painter) {
 		Point compositeSize = this.composite.getSize();
-		
+
 		// margins & stuff
-		
+
 		painter.setForeground(new TGColorImpl(getDisplay().getSystemColor(SWT.COLOR_BLACK)));
 		painter.initPath();
 		painter.setLineWidth(2);
@@ -86,7 +87,7 @@ public void paintWidget(TGPainterImpl painter) {
 		painter.moveTo(compositeSize.x/2-height, compositeSize.y-this.bottomY);
 		painter.lineTo(compositeSize.x/2+height, compositeSize.y-this.bottomY);
 		painter.closePath();
-		
+
 		if (this.isEnabled()) {
 			// tone name
 			painter.setForeground(new TGColorImpl(getDisplay().getSystemColor(SWT.COLOR_BLUE)));
@@ -103,40 +104,41 @@ public void paintWidget(TGPainterImpl painter) {
 			painter.closePath();
 			}
 		}
-		
-		
-		
-	
+
+
+
+
 	}
-	
-	
+
+
 	public void setWantedTone(int tone) {
 		this.setEnabled(true);
 		this.currentNoteValue = tone;
 		this.currentNoteString = TGTunerRoughWidget.TONESSTRING[tone%12]+(int)Math.floor(tone/12);
 		this.redraw();
-		
+
 	}
-	
+
 	public void setCurrentFrequency(double freq) {
 		this.currentFrequency = freq;
 		this.redraw();
 	}
 
+	@Override
 	public void redraw(){
 		super.redraw();
 		this.composite.redraw();
 	}
-	
+
 	protected double getAngleRad() {
 		return Math.PI*( 1 - (this.stickDistance(this.getTone(this.currentFrequency) - this.currentNoteValue) + this.FINE_TUNING_RANGE  )/(2*this.FINE_TUNING_RANGE) );
 	}
 
-	
+
 	private float getTone(double frequency) {
 		return (float)(45+12*(Math.log(frequency/110)/Math.log(2)));
 	}
-	
+
 	private double stickDistance(double diff) {
 		if (Math.abs(diff) > this.FINE_TUNING_RANGE)
 			if (diff > 0)
@@ -146,5 +148,5 @@ private double stickDistance(double diff) {
 		return diff;
 	}
 
-	
+
 }
\ No newline at end of file
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerListener.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerListener.java
similarity index 96%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerListener.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerListener.java
index befb2f6b..b75edc08 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerListener.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerListener.java
@@ -3,11 +3,11 @@
 public interface TGTunerListener {
 
 	public void fireFrequency(double freq);
-	
+
 	public int[] getTuning();
-	
+
 	public void fireException(Exception ex);
-	
+
 	public void fireCurrentString(int string);
-	
+
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerPlugin.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerPlugin.java
similarity index 78%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerPlugin.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerPlugin.java
index a00f1308..16866a71 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerPlugin.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerPlugin.java
@@ -12,42 +12,48 @@
  */
 public class TGTunerPlugin extends org.herac.tuxguitar.app.system.plugins.base.TGToolItemPlugin {
 
-	
+
+	@Override
 	protected void doAction() {
-		List strings = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getStrings();
-		Iterator it = strings.iterator();
+		List<TGString> strings = TuxGuitar.instance().getTablatureEditor().getTablature().getCaret().getTrack().getStrings();
+		Iterator<TGString> it = strings.iterator();
 		int[] tuning = new int[strings.size()];
 		int i=0;
 		while (it.hasNext()) {
-			TGString current = (TGString)it.next();
+			TGString current = it.next();
 			tuning[i] = current.getValue();
 			i++;
 		}
 		TGTunerDialog dialog = new TGTunerDialog(tuning);
 		dialog.show();
-		
+
 	}
 
+	@Override
 	protected String getItemName() {
 		return "Guitar Tuner";
 	}
 
+	@Override
 	public String getName() {
 		return "GuitarTuner";
 	}
-	
+
+	@Override
 	public String getAuthor() {
 		return "Nikola Kolarovic";
 	}
 
+	@Override
 	public String getDescription() {
 		return "Visual tuner that analyses the most dominant frequency from your microphone" +
 			   " and displays it on the tuner scale.";
 	}
 
+	@Override
 	public String getVersion() {
 		return "0.01b";
-	}	
-	
+	}
+
 
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerQueue.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerQueue.java
similarity index 95%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerQueue.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerQueue.java
index 95ca2096..6343dd3f 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerQueue.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerQueue.java
@@ -2,32 +2,32 @@
 
 /**
  * Class that represents a frequency buffer that eliminates large frequency fluctuations.
- * 
+ *
  * It is implemented as a queue list, where you put each frequency, and based on QUEUE_SIZE
  * last frequencies it determines what current dominant frequency should be.
- * 
+ *
  * @author Nikola Kolarovic <johnny47ns@yahoo.com>
  *
  */
 public class TGTunerQueue {
-	
+
 	/** size of the queue */
 	int QUEUE_SIZE = 5;
-	
+
 	/** pointer to index of the newest element */
 	protected int head = 0;
-	
+
 	/** the frequency queue itself */
 	protected double[] queue;
-	
+
 	private double[] similars;
-	
-	
+
+
 	// TODO: tweak the tollerances
 	private final double upperTollerance = 1.05; // +5%
 	private final double lowerTollerance = 0.95; // -5%
-	
-	
+
+
 	public TGTunerQueue() {
 		this.queue = new double[this.QUEUE_SIZE];
 		this.similars = new double[this.QUEUE_SIZE];
@@ -39,67 +39,67 @@ public void add(double newValue) {
 		this.head = (++this.head) % this.QUEUE_SIZE;
 		this.queue[this.head] = newValue;
 	}
-	
-	/** 
-	 * 
-	 * @return approximated frequency 
+
+	/**
+	 *
+	 * @return approximated frequency
 	 */
 	public double getFreqApproximation() {
-		
+
 		for (int i=0; i<this.QUEUE_SIZE; i++)
 			this.similars[i]=-2; // -2, because it will always find 1 exact frequency when i==j
-		
+
 		for (int i=0; i<this.QUEUE_SIZE; i++) {
 			if (this.queue[i]!=-1)
 				for (int j=0; j<this.QUEUE_SIZE; j++) {
 					// exact frequency with tollerance
-					if (this.queue[i] > (this.queue[j]*this.lowerTollerance) && 
+					if (this.queue[i] > (this.queue[j]*this.lowerTollerance) &&
 						this.queue[i] < (this.queue[j]*this.upperTollerance) )
 							this.similars[i]=this.similars[i]+2;
-					
+
 					// half frequency with tollerance
 					if (this.queue[i]/2 > (this.queue[j]*this.lowerTollerance) &&
 						this.queue[i]/2 < (this.queue[j]*this.upperTollerance) )
 							this.similars[i]++;
-					
+
 					// double frequency with tollerance
 					if (this.queue[i]*2 > (this.queue[j]*this.lowerTollerance) &&
 						this.queue[i]*2 < (this.queue[j]*this.upperTollerance) )
 							this.similars[i]++;
 				}
 		}
-		
-		
+
+
 		// find one with max similars
 		int maxIndex = 0;
 		for (int i=1; i<this.QUEUE_SIZE; i++)
 			if (this.similars[i]>=this.similars[maxIndex])
 				maxIndex=i;
-		
-		
-		
-/*		
+
+
+
+/*
 		int test=(this.head+1)%this.QUEUE_SIZE;
 		System.out.print(Math.floor(queue[head])+ " ");
 		while (test!=this.head) {
 			System.out.print(Math.floor(queue[test])+ " ");
 			test = (++test)%this.QUEUE_SIZE;
-		
+
 		}
 		System.out.println(" =  "+queue[maxIndex]%110+" **");
 */
-		
+
 		return this.queue[maxIndex];
 		//return this.queue[head];
-		
+
 	}
-	
-	
+
+
 	/** clears the queue data */
 	public void clear() {
 		for (int i=0; i<this.QUEUE_SIZE; i++)
 			this.queue[i]=-1;
 		this.head = 0;
 	}
-	
+
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerRoughWidget.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerRoughWidget.java
similarity index 98%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerRoughWidget.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerRoughWidget.java
index e92e6386..353837ad 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerRoughWidget.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerRoughWidget.java
@@ -1,12 +1,12 @@
 package org.herac.tuxguitar.app.tools.custom.tuner;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.SWT;
 import org.herac.tuxguitar.app.editors.TGColorImpl;
 import org.herac.tuxguitar.app.editors.TGPainterImpl;
 
@@ -19,7 +19,7 @@ public class TGTunerRoughWidget extends Composite {
 	private static final int MIN_HEIGHT = 25;
 	protected Composite composite = null;
 	protected float currentFrequency = 0;
-	
+
 	/** constants for drawing */
 	private final int startA = 20;
 	private final int endAb = 20;
@@ -27,22 +27,23 @@ public class TGTunerRoughWidget extends Composite {
 	private final int markerHeight = 12;
 	private final int markerWidth = 4;
 	static String[] TONESSTRING = {"C","C#","D","D#", "E", "F", "F#", "G", "G#", "A", "A#", "B"};
-	
-	
+
+
 	public TGTunerRoughWidget(Composite parent) {
 		super(parent, SWT.NONE);
 		this.init();
 	}
-	
+
 	public void init() {
 		this.setLayout(new GridLayout(1,true));
 		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		((GridData)this.getLayoutData()).widthHint = 600;
-		
-		
+
+
 		this.composite = new Composite(this,SWT.BORDER | SWT.DOUBLE_BUFFERED);
 		this.composite.setBackground(this.getDisplay().getSystemColor(SWT.COLOR_WHITE));
 		this.composite.addPaintListener(new PaintListener() {
+			@Override
 			public void paintControl(PaintEvent e) {
 				TGPainterImpl painter = new TGPainterImpl(e.gc);
 				TGTunerRoughWidget.this.paintWidget(painter);
@@ -55,12 +56,12 @@ public void paintControl(PaintEvent e) {
 		this.composite.setLayoutData(data);
 
 	}
-	
-	
+
+
 	private void paintWidget(TGPainterImpl painter) {
-		
+
 		Point compositeSize = this.composite.getSize();
-		
+
 		// lines and tones
 		painter.setForeground(new TGColorImpl(getDisplay().getSystemColor(SWT.COLOR_BLACK)));
 		painter.initPath();
@@ -77,7 +78,7 @@ private void paintWidget(TGPainterImpl painter) {
 			painter.drawString(TONESSTRING[currentTone%12], i, compositeSize.y/2-this.boundaryHeight/2-20);
 			currentTone++;
 		}
-		
+
 		// marker
 		if (this.currentFrequency>0) {
 			painter.setForeground(new TGColorImpl(getDisplay().getSystemColor(SWT.COLOR_BLUE)));
@@ -88,7 +89,7 @@ private void paintWidget(TGPainterImpl painter) {
 			painter.lineTo(markerPos, compositeSize.y/2+this.markerHeight/2);
 			painter.closePath();
 		}
-		
+
 	}
 
 	public void setCurrentFrequency(double currentFrequency) {
@@ -96,18 +97,19 @@ public void setCurrentFrequency(double currentFrequency) {
 		this.redraw();
 	}
 
+	@Override
 	public void redraw(){
 		super.redraw();
 		this.composite.redraw();
 	}
 
-	
+
 	/** formula which gets fine tone position (on scale 0-240)
-	 * in fact, it's inverse formula of inverse of TGTuner::getNoteFrequency() 
+	 * in fact, it's inverse formula of inverse of TGTuner::getNoteFrequency()
 	 */
 	protected int getTone(float frequency) {
 		float midiTone = (float)(45+12*(Math.log(frequency/110)/Math.log(2)));
 		return Math.round(  20 *   (midiTone % 12));
 	}
-	
+
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettings.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettings.java
similarity index 96%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettings.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettings.java
index 9789acb2..d2fb4ed3 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettings.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettings.java
@@ -12,7 +12,7 @@
  *
  */
 public class TGTunerSettings {
-	
+
 	protected int sampleSize;
 	protected float sampleRate;
 	protected String deviceName;
@@ -23,9 +23,9 @@ public class TGTunerSettings {
 	static final int DEFAULT_BUFFER_SIZE = 4096; // 2^12
 	static final int DEFAULT_FFT_SIZE = 16384; // 2^14
 	static final int CHANNELS_NUMBER = 1;
-	
-	
-	
+
+
+
 	/** default settings, if faild to load from properties */
 	public static TGTunerSettings getDefaults() {
 		TGTunerSettings retValue = new TGTunerSettings();
@@ -38,8 +38,8 @@ public static TGTunerSettings getDefaults() {
 		return retValue;
 	}
 
-	
-	
+
+
 	/** gets dataline from format specification */
 	protected static TargetDataLine getDataLine(TGTunerSettings settings) throws TGTuner.TGTunerException {
 		TargetDataLine	targetDataLine = null;
@@ -47,18 +47,18 @@ protected static TargetDataLine getDataLine(TGTunerSettings settings) throws TGT
 		if (settings!=null) {
 			// get info for initialization
 			DataLine.Info info = settings.getDataLineInfo();
-			
+
 			try {
-				
+
 				targetDataLine = (TargetDataLine)AudioSystem.getLine(info);
-				
+
 			} catch (Exception ex) {
 				MessageDialog.errorMessage(ex);
 			}
 		}
-		else 
+		else
 			throw new TGTuner.TGTunerException("Could not retrieve data from the input. Check your system device settings.");
-		
+
 		return targetDataLine;
 	}
 
@@ -66,7 +66,7 @@ protected static TargetDataLine getDataLine(TGTunerSettings settings) throws TGT
 	protected DataLine.Info getDataLineInfo() {
 				return new DataLine.Info(TargetDataLine.class,
 													this.getAudioFormat(), this.getBufferSize());
-				
+
 	}
 
 	/** creates AudioFormat based on settings */
@@ -97,28 +97,28 @@ public void setBufferSize(int bufferSize) {
 		// TODO: adjust size in TGTuner also then
 		this.bufferSize = bufferSize;
 	}
-	
+
 	public int getFFTSize() {
 		return this.fftSize;
 	}
 	public void setFFTSize(int size) {
 		this.fftSize = size;
 	}
-	
-	
-	
+
+
+
 	public float getSampleRate() {
 		return this.sampleRate;
 	}
-	
+
 	public double getTreshold() {
 		return this.treshold;
 	}
-	
+
 	public void setTreshold(double nt) {
 		this.treshold = nt;
 	}
-	
+
 	public void setSampleRate(float sampleRate) {
 		this.sampleRate = sampleRate;
 	}
@@ -143,11 +143,11 @@ public static TGTunerSettings loadTuxGuitarSettings() throws TGTuner.TGTunerExce
 		//return null;
 	}
 
-	
-	
-	
+
+
+
 	/* MAYBE USEFUL CODE
-	 * 
+	 *
 	 * Port lineIn;
 FloatControl volCtrl;
 try {
@@ -156,7 +156,7 @@ public static TGTunerSettings loadTuxGuitarSettings() throws TGTuner.TGTunerExce
   lineIn.open();
   volCtrl = (FloatControl) lineIn.getControl(
       FloatControl.Type.VOLUME);
-  // Assuming getControl call succeeds, 
+  // Assuming getControl call succeeds,
   // we now have our LINE_IN VOLUME control.
 } catch (Exception e) {
   System.out.println("Failed trying to find LINE_IN"
@@ -165,8 +165,8 @@ public static TGTunerSettings loadTuxGuitarSettings() throws TGTuner.TGTunerExce
 float newValue = 2.0F;
 if (volCtrl != null)
   // This changes the volume of the signal flowing though the line that "owns" the control.
-  volCtrl.setValue(newValue); 
-	 * 
+  volCtrl.setValue(newValue);
+	 *
 	 */
-	
+
 }
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettingsDialog.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettingsDialog.java
similarity index 96%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettingsDialog.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettingsDialog.java
index 9c5fcd7f..f2f3038c 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettingsDialog.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTunerSettingsDialog.java
@@ -36,7 +36,7 @@ public class TGTunerSettingsDialog {
 	protected Label noiseGateValue = null;
 	protected Text settingsInfo = null;
 	protected boolean updated;
-	
+
 	public TGTunerSettingsDialog(TGTunerDialog dialog) {
 		this.tunerDialog = dialog;
 		this.updated=false;
@@ -48,21 +48,21 @@ public void show() {
 		dialog.setImage(TuxGuitar.instance().getIconManager().getAppIcon());
 		dialog.setText(TuxGuitar.getProperty("tuner.settings"));
 		dialog.setMinimumSize(SHELL_WIDTH,SWT.DEFAULT);
-		
-		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);            
+
+		Group group = new Group(dialog,SWT.SHADOW_ETCHED_IN);
 		group.setLayout(new GridLayout());
 		group.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		group.setText(TuxGuitar.getProperty("tuner.device-settings"));
-		
+
 /*		this.deviceCombo = new Combo(group, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.deviceCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,false,2,1));
 		this.fillDeviceCombo(dialog);
 		this.deviceCombo.addSelectionListener(new UpdatedListener());
 */
-		
+
 		Composite sampleComposite = this.createGroup(TuxGuitar.getProperty("tuner.sound-format"), group);
 
-		
+
 		new Label(sampleComposite,SWT.LEFT).setText(TuxGuitar.getProperty("tuner.sample-rate"));
 		this.sampleRateCombo = new Combo(sampleComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.sampleRateCombo.add("48000");
@@ -72,7 +72,7 @@ public void show() {
 		this.sampleRateCombo.add("8000");
 		this.sampleRateCombo.addSelectionListener(new UpdatedListener());
 
-		
+
 		new Label(sampleComposite,SWT.LEFT).setText(TuxGuitar.getProperty("tuner.sample-size"));
 		this.sampleSizeCombo = new Combo(sampleComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
 		this.sampleSizeCombo.add("16");
@@ -93,7 +93,7 @@ public void show() {
 		this.bufferSizeCombo.add(new Integer(16348).toString());
 		this.bufferSizeCombo.addSelectionListener(new UpdatedListener());
 
-		
+
 		// FFT buffer size
 		new Label(analyzeComposite,SWT.LEFT).setText(TuxGuitar.getProperty("tuner.fourier-buffer-size"));
 		this.FFTSizeCombo = new Combo(analyzeComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -104,13 +104,14 @@ public void show() {
 		this.FFTSizeCombo.add(new Integer(16384).toString());
 		this.FFTSizeCombo.add(new Integer(32768).toString());
 		this.FFTSizeCombo.addSelectionListener(new UpdatedListener());
-		
+
 		Composite noiseGateComposite = this.createGroup(TuxGuitar.getProperty("tuner.noise-gate"), group);
 		this.noiseGate = new Scale(noiseGateComposite, SWT.BORDER);
 		this.noiseGate.setMaximum(100);
 		this.noiseGate.setIncrement(5);
 		this.noiseGate.setPageIncrement(10);
 		this.noiseGate.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 				TGTunerSettingsDialog.this.noiseGateValue.setText(
 						new Integer(TGTunerSettingsDialog.this.noiseGate.getSelection()).toString()+"%");
@@ -122,9 +123,9 @@ public void widgetSelected(SelectionEvent arg0) {
 		((GridData)this.noiseGate.getLayoutData()).grabExcessHorizontalSpace=true;
 		this.noiseGateValue = new Label(noiseGateComposite,SWT.LEFT);
 		this.noiseGateValue.setText("                       ");
-		
+
 		Composite infoComposite = this.createGroup(TuxGuitar.getProperty("tuner.info"), group);
-		
+
 		this.settingsInfo = new Text(infoComposite, SWT.READ_ONLY | SWT.MULTI );
 		this.settingsInfo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,false,2,1));
 		((GridData)this.settingsInfo.getLayoutData()).heightHint=30;
@@ -135,12 +136,13 @@ public void widgetSelected(SelectionEvent arg0) {
 		Composite btnComposite = new Composite(dialog,SWT.NONE);
 		btnComposite.setLayout(new GridLayout(2,false));
 		btnComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
-		
+
 		final Button buttonOK = new Button(btnComposite, SWT.PUSH);
 		buttonOK.setText(TuxGuitar.getProperty("ok"));
 		buttonOK.setLayoutData(TGTunerDialog.getGridData(80,25));
 		buttonOK.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
             	TGTunerSettingsDialog.this.dispose(dialog,true);
             }
         });
@@ -148,31 +150,32 @@ public void widgetSelected(SelectionEvent arg0) {
         buttonExit.setText(TuxGuitar.getProperty("close"));
         buttonExit.setLayoutData(TGTunerDialog.getGridData(80,25));
         buttonExit.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent arg0) {
+            @Override
+			public void widgetSelected(SelectionEvent arg0) {
             	TGTunerSettingsDialog.this.dispose(dialog,false);
             }
         });
-        
+
         this.loadSettings(this.tunerDialog.getTuner().getSettings(), dialog);
-        
+
         DialogUtils.openDialog(dialog, DialogUtils.OPEN_STYLE_CENTER | DialogUtils.OPEN_STYLE_PACK);
 	}
 
 
 	protected void loadSettings(TGTunerSettings settings, Shell dialog) {
-		
+
 		// TODO: this is no good! vvvvvvvvv
-		
+
 		boolean loadedDefaults=false;
 		if (settings==null) {
 			settings = TGTunerSettings.getDefaults();
 			loadedDefaults=true;
 		}
 		// TODO: this is no good! ^^^^^^^^^
-		
+
 		boolean found = false;
 		int i = 0;
-		
+
 		try {
 			while (!found) {
 				if ( Float.parseFloat(this.sampleRateCombo.getItem(i)) == settings.getSampleRate()  ) {
@@ -182,7 +185,7 @@ protected void loadSettings(TGTunerSettings settings, Shell dialog) {
 				i++;
 			}
 			i=0; found=false;
-		
+
 			while (!found) {
 				if ( Integer.parseInt(this.sampleSizeCombo.getItem(i)) == settings.getSampleSize()  ) {
 							this.sampleSizeCombo.select(i);
@@ -199,7 +202,7 @@ protected void loadSettings(TGTunerSettings settings, Shell dialog) {
 				}
 				i++;
 			}
-			
+
 			this.bufferSizeCombo.setText(new Integer(settings.getBufferSize()).toString());
 			this.noiseGate.setSelection((int)Math.round(settings.getTreshold()*100));
 			this.noiseGateValue.setText(new Integer(this.noiseGate.getSelection()).toString()+"%");
@@ -220,11 +223,11 @@ protected void loadSettings(TGTunerSettings settings, Shell dialog) {
 				loadSettings(TGTunerSettings.getDefaults(),dialog);
 			}
 		}
-		
+
 	}
 
-	
-/*	
+
+/*
 	*//** cycles through available SourceData audio devices *//*
 	private void fillDeviceCombo(Shell dialog) {
 		Mixer.Info[] aInfos = AudioSystem.getMixerInfo();
@@ -243,32 +246,32 @@ private void fillDeviceCombo(Shell dialog) {
 		}
 	}
 
-*/	
+*/
 	protected void dispose(Shell dialog, boolean saveWanted) {
 		try {
 			if (this.updated & saveWanted) {
 				TGTunerSettings settings = new TGTunerSettings();
 				settings.setSampleRate(this.getSampleRate());
 				settings.setSampleSize(Integer.parseInt(this.sampleSizeCombo.getItem(this.sampleSizeCombo.getSelectionIndex())));
-	
+
 				settings.setBufferSize(this.getBufferSize());
 				settings.setFFTSize(this.getFFTSize());
 				settings.setTreshold((float)this.noiseGate.getSelection()/100);
 				settings.setWaitPeriod(100); // TODO: hard coded?
-				
+
 				this.checkBufferValues(settings); // check if they are divisable with buffer size
-				
-	
+
+
 	/*			if (this.deviceCombo.getSelectionIndex()<0) {
 					MessageDialog.errorMessage(dialog,"You didn't set the input device.");
 					return;
 				}
 				settings.setDeviceName(this.deviceCombo.getItem(this.deviceCombo.getSelectionIndex()));
-	*/			
+	*/
 				this.tunerDialog.getTuner().setSettings(settings);
 				// TODO: save the settings in the system
 			}
-			
+
 	    	this.tunerDialog.getTuner().resumeFromPause();
 			dialog.dispose();
 		} catch (Exception ex) {
@@ -276,10 +279,10 @@ protected void dispose(Shell dialog, boolean saveWanted) {
 			MessageDialog.errorMessage(dialog,ex.getMessage());
 		}
 	}
-	
-	
-	
-	
+
+
+
+
 	private float getSampleRate() {
 		return Float.parseFloat(this.sampleRateCombo.getItem(this.sampleRateCombo.getSelectionIndex()));
 	}
@@ -289,32 +292,33 @@ private int getFFTSize() {
 	private int getBufferSize() {
 		return Integer.parseInt(this.bufferSizeCombo.getText());
 	}
-	
-	
+
+
 
 	/** adapter class which sets update flag */
 	protected class UpdatedListener extends SelectionAdapter {
+		@Override
 		public void widgetSelected(SelectionEvent arg0) {
         	TGTunerSettingsDialog.this.updated=true;
         	TGTunerSettingsDialog.this.settingsInfo.setText(" Minimal freq diff = "+this.getMinimalFrequencyDiff()+"Hz   \n Time to fill the buffer = "+ this.getTimeToFillBuffer()+" sec");
         }
-		
+
     	private double getMinimalFrequencyDiff() {
     		return ((double) TGTunerSettingsDialog.this.getSampleRate()) / TGTunerSettingsDialog.this.getFFTSize();
     	}
-    	
+
     	private double getTimeToFillBuffer() {
     		return TGTunerSettingsDialog.this.getBufferSize() / TGTunerSettingsDialog.this.getSampleRate();
     	}
 
 	}
-	
-	
-	
+
+
+
 
 	/** because there are many groups */
 	protected Composite createGroup(String groupCaption, Composite parent) {
-		Group tempGroup = new Group(parent,SWT.SHADOW_ETCHED_IN);            
+		Group tempGroup = new Group(parent,SWT.SHADOW_ETCHED_IN);
 		tempGroup.setLayout(new GridLayout());
 		tempGroup.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		tempGroup.setText(groupCaption);
@@ -323,7 +327,7 @@ protected Composite createGroup(String groupCaption, Composite parent) {
 		groupComposite.setLayoutData(new GridData(SWT.FILL,SWT.FILL,true,true));
 		return groupComposite;
 	}
-	
+
 	protected void checkBufferValues(TGTunerSettings settings) throws Exception {
 		if (settings.bufferSize % settings.sampleSize != 0 ||
 			settings.bufferSize > settings.fftSize	)
diff --git a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTuningString.java b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTuningString.java
similarity index 97%
rename from TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTuningString.java
rename to plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTuningString.java
index ca7672c0..864e1548 100644
--- a/TuxGuitar-tuner/src/org/herac/tuxguitar/app/tools/custom/tuner/TGTuningString.java
+++ b/plugins/tuner/src/main/java/org/herac/tuxguitar/app/tools/custom/tuner/TGTuningString.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package org.herac.tuxguitar.app.tools.custom.tuner;
 
@@ -18,35 +18,36 @@ public class TGTuningString {
 	private int string;
 	private Button stringButton = null;
 	private TGTunerListener listener = null;
-	
-	
-	
+
+
+
 	TGTuningString(int string, Composite parent, TGTunerListener listener) {
 		this.string = string;
 		this.listener = listener;
-		
+
 		this.stringButton = new Button(parent,SWT.TOGGLE);
 		this.stringButton.setText("--------- "+TGTunerRoughWidget.TONESSTRING[string%12]+(int)Math.floor(string/12)+" ---------");
 	}
 
-	
-	
+
+
 	void addListener() {
 		this.stringButton.addSelectionListener(new SelectionAdapter() {
+			@Override
 			public void widgetSelected(SelectionEvent arg0) {
 					TGTuningString.this.stringButton.setSelection(true);
 					TGTuningString.this.listener.fireCurrentString(TGTuningString.this.string);
 			}
-			
+
 		});
 	}
-	
+
 	public int getString() {
 		return this.string;
 	}
-	
+
 	public Button getStringButton() {
 		return this.stringButton;
 	}
-	
+
 }
diff --git a/TuxGuitar-tuner/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/tuner/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-tuner/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/tuner/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/plugins/winmm/CLEAN+TEST b/plugins/winmm/CLEAN+TEST
new file mode 100644
index 00000000..e69de29b
diff --git a/plugins/winmm/pom.xml b/plugins/winmm/pom.xml
new file mode 100644
index 00000000..44ae03da
--- /dev/null
+++ b/plugins/winmm/pom.xml
@@ -0,0 +1,112 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>tuxguitar-winmm</artifactId>
+	<parent>
+		<artifactId>tuxguitar</artifactId>
+		<groupId>org.herac.tuxguitar</groupId>
+		<version>1.3-SNAPSHOT</version>
+	</parent>
+
+	<packaging>dll</packaging>
+	<name>TuxGuitar :: Plugin :: WinMM</name>
+	<description>WinMM plugin for TuxGuitar</description>
+
+	<build>
+		<plugins>
+			<!-- compiler -->
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- generate the jar -->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<executions>
+					<execution>
+					<phase>validate</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- the jar is also an artefact -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<executions>
+				  <execution>
+					<phase>validate</phase>
+					<goals>
+					  <goal>attach-artifact</goal>
+					</goals>
+					<configuration>
+					  <artifacts>
+						<artifact>
+						  <file>${project.build.directory}/${project.artifactId}-${version}.jar</file>
+						  <type>jar</type>
+						</artifact>
+					  </artifacts>
+					</configuration>
+				  </execution>
+				</executions>
+			</plugin>
+
+			<!-- compile C files to a shared library -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>native-maven-plugin</artifactId>
+				<extensions>true</extensions>       
+				<configuration>
+					<compilerProvider>generic</compilerProvider>
+					<compilerStartOptions>
+						<compilerStartOption>-fPIC</compilerStartOption>
+					</compilerStartOptions>
+					<linkerStartOptions>
+						<linkerStartOption>-shared</linkerStartOption> 
+					</linkerStartOptions>
+
+					<javahOS>unix</javahOS>
+
+					<sources>
+						<source>
+							<directory>src/main/native</directory>
+							<includes>
+								<include>**/*.c</include>
+							</includes>
+						</source>
+					</sources>
+				</configuration>
+
+				<executions>
+				</executions>
+
+			</plugin>
+
+
+		</plugins>
+	</build>
+
+	<dependencies>
+	        <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+				    <scope>provided</scope>
+	        </dependency>
+	</dependencies>
+
+</project>
diff --git a/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/JNILibraryLoader.java b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/JNILibraryLoader.java
new file mode 100644
index 00000000..0221cf5b
--- /dev/null
+++ b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/JNILibraryLoader.java
@@ -0,0 +1,52 @@
+package org.herac.tuxguitar.player.impl.midiport.winmm;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.herac.tuxguitar.util.TGClassLoader;
+
+public class JNILibraryLoader {
+
+	private static final String JNI_EXTENSION = ".jnilib";
+
+	private static final String JNI_TMP_PATH = (System.getProperty( "java.io.tmpdir" ) + File.separator);
+
+	public static void loadLibrary(String libname){
+		if(!JNILibraryLoader.loadFromClassPath(libname + JNI_EXTENSION)){
+			System.loadLibrary(libname);
+		}
+	}
+
+	private static boolean loadFromClassPath(String filename){
+		File file = new File(JNI_TMP_PATH + filename);
+		try{
+			if(!file.exists()){
+				InputStream inputStream = TGClassLoader.instance().getClassLoader().getResourceAsStream(filename);
+				if (inputStream != null) {
+					OutputStream outputStream = new FileOutputStream(file);
+
+					int read;
+					byte [] buffer = new byte [4096];
+					while ((read = inputStream.read (buffer)) != -1) {
+						outputStream.write(buffer, 0, read);
+					}
+					outputStream.close();
+					inputStream.close();
+				}
+			}
+			if(file.exists()){
+				System.load(file.getAbsolutePath());
+				return true;
+			}
+		}catch(Throwable throwable){
+			return false;
+		}finally{
+			if(file.exists()){
+				file.delete();
+			}
+		}
+		return false;
+	}
+}
diff --git a/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java
new file mode 100644
index 00000000..a24f1165
--- /dev/null
+++ b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortImpl.java
@@ -0,0 +1,58 @@
+package org.herac.tuxguitar.player.impl.midiport.winmm;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiOutputPortImpl implements MidiOutputPort{
+
+	private int device;
+	private String name;
+	private MidiReceiverImpl receiver;
+
+	public MidiOutputPortImpl(MidiSystem midiSystem,String name,int device){
+		this.name = name;
+		this.device = device;
+		this.receiver = new MidiReceiverImpl(this,midiSystem);
+	}
+
+	@Override
+	public void open(){
+		if(!this.receiver.isConnected()){
+			this.receiver.connect();
+		}
+	}
+
+	@Override
+	public void close(){
+		this.receiver.disconnect();
+	}
+
+	@Override
+	public MidiReceiver getReceiver(){
+		this.open();
+		return this.receiver;
+	}
+
+	@Override
+	public void check(){
+		// Not implemented
+	}
+
+	public int getDevice() {
+		return this.device;
+	}
+
+	public static String toString(int device){
+		return (Integer.toString(device));
+	}
+
+	@Override
+	public String getKey() {
+		return (Integer.toString(this.device));
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+}
\ No newline at end of file
diff --git a/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderImpl.java b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderImpl.java
new file mode 100644
index 00000000..fecf4bc8
--- /dev/null
+++ b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderImpl.java
@@ -0,0 +1,31 @@
+package org.herac.tuxguitar.player.impl.midiport.winmm;
+
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderImpl implements MidiOutputPortProvider{
+
+	private MidiSystem midiSystem;
+
+	public MidiOutputPortProviderImpl(){
+		super();
+	}
+
+	@Override
+	public List<MidiOutputPort> listPorts() {
+		if(this.midiSystem == null){
+			this.midiSystem = new MidiSystem();
+		}
+		return this.midiSystem.findPorts();
+	}
+
+	@Override
+	public void closeAll(){
+		if(this.midiSystem != null){
+			this.midiSystem.finalize();
+			this.midiSystem = null;
+		}
+	}
+}
diff --git a/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderPlugin.java b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderPlugin.java
new file mode 100644
index 00000000..2674760e
--- /dev/null
+++ b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiOutputPortProviderPlugin.java
@@ -0,0 +1,37 @@
+package org.herac.tuxguitar.player.impl.midiport.winmm;
+
+import org.herac.tuxguitar.app.system.plugins.base.TGMidiOutputPortProviderPlugin;
+import org.herac.tuxguitar.player.base.MidiOutputPortProvider;
+
+public class MidiOutputPortProviderPlugin extends TGMidiOutputPortProviderPlugin{
+
+	private MidiOutputPortProviderImpl portReader;
+
+	@Override
+	protected MidiOutputPortProvider getProvider() {
+		if(this.portReader == null){
+			this.portReader = new MidiOutputPortProviderImpl();
+		}
+		return this.portReader;
+	}
+
+	@Override
+	public String getAuthor() {
+		return "Julian Casadesus <julian@casadesus.com.ar>";
+	}
+
+	@Override
+	public String getDescription() {
+		return "WinMM output plugin";
+	}
+
+	@Override
+	public String getName() {
+		return "WinMM output plugin";
+	}
+
+	@Override
+	public String getVersion() {
+		return "1.0";
+	}
+}
diff --git a/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiReceiverImpl.java b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiReceiverImpl.java
new file mode 100644
index 00000000..7d810af9
--- /dev/null
+++ b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiReceiverImpl.java
@@ -0,0 +1,81 @@
+package org.herac.tuxguitar.player.impl.midiport.winmm;
+
+import org.herac.tuxguitar.player.base.MidiControllers;
+import org.herac.tuxguitar.player.base.MidiReceiver;
+
+public class MidiReceiverImpl implements MidiReceiver{
+
+	private boolean connected;
+	private MidiOutputPortImpl midiPort;
+	private MidiSystem midiSystem;
+
+	public MidiReceiverImpl(MidiOutputPortImpl midiPort, MidiSystem midiSystem){
+		this.midiPort = midiPort;
+		this.midiSystem = midiSystem;
+		this.connected = false;
+	}
+
+	public boolean isConnected(){
+		return this.connected;
+	}
+
+	public void connect(){
+		if(!isConnected()){
+			this.midiSystem.openPort(this.midiPort);
+			this.connected = true;
+		}
+	}
+
+	public void disconnect() {
+		if(isConnected()){
+			this.midiSystem.closePort();
+			this.connected = false;
+		}
+	}
+
+	@Override
+	public void sendAllNotesOff() {
+		for(int i = 0; i < 16; i ++){
+			sendControlChange(i,MidiControllers.ALL_NOTES_OFF,0);
+		}
+	}
+
+	@Override
+	public void sendControlChange(int channel, int controller, int value) {
+		if(isConnected()){
+			this.midiSystem.controlChange(channel, controller, value);
+		}
+	}
+
+	@Override
+	public void sendNoteOff(int channel, int key, int velocity) {
+		if(isConnected()){
+			this.midiSystem.noteOff(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendNoteOn(int channel, int key, int velocity) {
+		if(isConnected()){
+			this.midiSystem.noteOn(channel, key, velocity);
+		}
+	}
+
+	@Override
+	public void sendPitchBend(int channel, int value) {
+		if(isConnected()){
+			this.midiSystem.pitchBend(channel, value);
+		}
+	}
+
+	@Override
+	public void sendProgramChange(int channel, int value) {
+		if(isConnected()){
+			this.midiSystem.programChange(channel, value);
+		}
+	}
+
+	public void sendSystemReset() {
+		//not implemented
+	}
+}
diff --git a/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiSystem.java b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiSystem.java
new file mode 100644
index 00000000..ed7c9547
--- /dev/null
+++ b/plugins/winmm/src/main/java/org/herac/tuxguitar/player/impl/midiport/winmm/MidiSystem.java
@@ -0,0 +1,118 @@
+package org.herac.tuxguitar.player.impl.midiport.winmm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.herac.tuxguitar.player.base.MidiOutputPort;
+
+public class MidiSystem{
+
+	private static final String JNI_LIBRARY_NAME = new String("tuxguitar-winmm-jni");
+
+	static{
+		System.loadLibrary(JNI_LIBRARY_NAME);
+	}
+
+	private long instance;
+	private final List<MidiOutputPort> ports;
+	private MidiOutputPortImpl connection;
+
+	public MidiSystem() {
+		this.instance = malloc();
+		this.ports = new ArrayList<MidiOutputPort>();
+		this.connection = null;
+	}
+
+	@Override
+	public void finalize(){
+		if(this.instance != 0 ){
+			this.free(this.instance);
+			this.instance = 0;
+		}
+	}
+
+	public List<MidiOutputPort> findPorts(){
+		this.ports.clear();
+		if(this.instance != 0){
+			this.findPorts(this.instance);
+		}
+		return this.ports;
+	}
+
+	public void openPort(MidiOutputPortImpl port){
+		if(this.instance != 0){
+			this.openPort(this.instance, port.getDevice());
+			this.connection = port;
+		}
+	}
+
+	public void closePort(){
+		if(this.instance != 0){
+			this.closePort(this.instance);
+			this.connection = null;
+		}
+	}
+
+	public void noteOn(int channel,int note,int velocity){
+		if(this.instance != 0){
+			this.noteOn(this.instance, channel, note, velocity);
+		}
+	}
+
+	public void noteOff(int channel,int note,int velocity){
+		if(this.instance != 0){
+			this.noteOff(this.instance, channel, note, velocity);
+		}
+	}
+
+	public void controlChange(int channel,int control,int value){
+		if(this.instance != 0){
+			this.controlChange(this.instance, channel, control, value);
+		}
+	}
+
+	public void programChange(int channel,int program){
+		if(this.instance != 0){
+			this.programChange(this.instance, channel, program);
+		}
+	}
+
+	public void pitchBend(int channel,int value){
+		if(this.instance != 0){
+			this.pitchBend(this.instance, channel, value);
+		}
+	}
+
+	public MidiOutputPortImpl getConnection(){
+		return this.connection;
+	}
+
+	protected void addPort(String name,int device){
+		this.ports.add(new MidiOutputPortImpl(this,name,device));
+	}
+
+	private native long malloc();
+
+	private native void free(long instance);
+
+	protected native void open(long instance,String device);
+
+	protected native void close(long instance);
+
+	protected native void findPorts(long instance);
+
+	protected native void openPort(long instance,int device);
+
+	protected native void closePort(long instance);
+
+	protected native void noteOn(long instance,int channel,int note,int velocity);
+
+	protected native void noteOff(long instance,int channel,int note,int velocity);
+
+	protected native void controlChange(long instance,int channel,int control,int value);
+
+	protected native void programChange(long instance,int channel,int program);
+
+	protected native void pitchBend(long instance,int channel,int value);
+
+}
diff --git a/TuxGuitar-winmm/jni/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.c b/plugins/winmm/src/main/native/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.c
similarity index 100%
rename from TuxGuitar-winmm/jni/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.c
rename to plugins/winmm/src/main/native/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.c
diff --git a/TuxGuitar-winmm/jni/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.h b/plugins/winmm/src/main/native/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.h
similarity index 100%
rename from TuxGuitar-winmm/jni/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.h
rename to plugins/winmm/src/main/native/org_herac_tuxguitar_player_impl_midiport_winmm_MidiSystem.h
diff --git a/TuxGuitar-winmm/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin b/plugins/winmm/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
similarity index 100%
rename from TuxGuitar-winmm/share/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
rename to plugins/winmm/src/main/resources/META-INF/services/org.herac.tuxguitar.app.system.plugins.TGPlugin
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..162b0a32
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,118 @@
+<project
+		xmlns="http://maven.apache.org/POM/4.0.0"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>org.herac.tuxguitar</groupId>
+	<artifactId>tuxguitar</artifactId>
+	<version>1.3-SNAPSHOT</version>
+
+	<packaging>pom</packaging>
+	<name>TuxGuitar</name>
+	<description>TuxGuitar project</description>
+
+	<licenses>
+		<license>
+			<name>GNU LGPL version 2.1 or later</name>
+			<url>LICENSE</url>
+		</license>
+	</licenses>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<tuxguitar.core.version>1.3-SNAPSHOT</tuxguitar.core.version>
+	</properties>
+
+	<build>
+		<pluginManagement>
+			<plugins>
+				<!-- to compile java -->
+				<plugin>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3.2</version>
+					<configuration>
+						<source>1.6</source>
+						<target>1.6</target>
+					</configuration>
+				</plugin>
+
+				<!-- to execute things-->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>exec-maven-plugin</artifactId>
+					<version>1.2.1</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>java</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
+
+				<!-- to test things-->
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.8.1</version>
+				</plugin>
+
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<dependencyManagement>
+		<dependencies>
+		    <dependency>
+					<groupId>org.herac.tuxguitar</groupId>
+					<artifactId>tuxguitar-app</artifactId>
+					<version>1.3-SNAPSHOT</version>
+		    </dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>4.8.1</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<profiles>
+		<profile>
+			<id>viewer</id>
+			<modules>
+				<module>TuxGuitar-viewer</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>no-plugin</id>
+			<modules>
+				<!-- core -->
+				<module>TuxGuitar</module>
+				<module>TuxGuitar-swt</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>only-plugins</id>
+			<modules>
+				<module>plugins</module>
+			</modules>
+		</profile>
+
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<modules>
+				<module>TuxGuitar</module>
+				<module>TuxGuitar-swt</module>
+				<module>plugins</module>
+			</modules>
+		</profile>
+
+	</profiles>
+</project>